|
 |
932fb9 |
From d2e1b40ee0bb05a5e7f6b8b208bd2e93a50dd01f Mon Sep 17 00:00:00 2001
|
|
|
932fb9 |
From: Trent Lloyd <trent@lloyd.id.au>
|
|
|
932fb9 |
Date: Thu, 16 Jan 2014 12:05:51 +0800
|
|
|
932fb9 |
Subject: [PATCH] avahi-ui: replace gtk_vbox_new with gtk_box_new for GTK3 due
|
|
|
932fb9 |
to deprecation
|
|
|
932fb9 |
|
|
|
932fb9 |
---
|
|
|
932fb9 |
avahi-ui/avahi-ui.c | 16 ++++++++++++++++
|
|
|
932fb9 |
1 file changed, 16 insertions(+)
|
|
|
932fb9 |
|
|
|
932fb9 |
diff --git a/avahi-ui/avahi-ui.c b/avahi-ui/avahi-ui.c
|
|
|
932fb9 |
index 3845066..ff33a89 100644
|
|
|
932fb9 |
--- a/avahi-ui/avahi-ui.c
|
|
|
932fb9 |
+++ b/avahi-ui/avahi-ui.c
|
|
|
932fb9 |
@@ -991,7 +991,11 @@ static void domain_button_clicked(GtkButton *button G_GNUC_UNUSED, gpointer user
|
|
|
932fb9 |
gtk_dialog_set_has_separator(GTK_DIALOG(p->domain_dialog), FALSE);
|
|
|
932fb9 |
#endif
|
|
|
932fb9 |
|
|
|
932fb9 |
+#if GTK_CHECK_VERSION(3,0,0)
|
|
|
932fb9 |
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
|
|
|
932fb9 |
+#else
|
|
|
932fb9 |
vbox = gtk_vbox_new(FALSE, 8);
|
|
|
932fb9 |
+#endif
|
|
|
932fb9 |
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
|
|
|
932fb9 |
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(p->domain_dialog))), vbox, TRUE, TRUE, 0);
|
|
|
932fb9 |
|
|
|
932fb9 |
@@ -1002,7 +1006,11 @@ static void domain_button_clicked(GtkButton *button G_GNUC_UNUSED, gpointer user
|
|
|
932fb9 |
g_signal_connect(p->domain_entry, "changed", G_CALLBACK(domain_entry_changed_callback), d);
|
|
|
932fb9 |
gtk_box_pack_start(GTK_BOX(vbox), p->domain_entry, FALSE, FALSE, 0);
|
|
|
932fb9 |
|
|
|
932fb9 |
+#if GTK_CHECK_VERSION(3,0,0)
|
|
|
932fb9 |
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
|
|
|
932fb9 |
+#else
|
|
|
932fb9 |
vbox2 = gtk_vbox_new(FALSE, 8);
|
|
|
932fb9 |
+#endif
|
|
|
932fb9 |
gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
|
|
|
932fb9 |
|
|
|
932fb9 |
scrolled_window = gtk_scrolled_window_new(NULL, NULL);
|
|
|
932fb9 |
@@ -1113,7 +1121,11 @@ static void aui_service_dialog_init(AuiServiceDialog *d) {
|
|
|
932fb9 |
|
|
|
932fb9 |
gtk_container_set_border_width(GTK_CONTAINER(d), 5);
|
|
|
932fb9 |
|
|
|
932fb9 |
+#if GTK_CHECK_VERSION(3,0,0)
|
|
|
932fb9 |
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
|
|
|
932fb9 |
+#else
|
|
|
932fb9 |
vbox = gtk_vbox_new(FALSE, 8);
|
|
|
932fb9 |
+#endif
|
|
|
932fb9 |
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
|
|
|
932fb9 |
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(d))), vbox, TRUE, TRUE, 0);
|
|
|
932fb9 |
|
|
|
932fb9 |
@@ -1123,7 +1135,11 @@ static void aui_service_dialog_init(AuiServiceDialog *d) {
|
|
|
932fb9 |
gtk_box_pack_start(GTK_BOX(vbox), p->domain_label, FALSE, FALSE, 0);
|
|
|
932fb9 |
|
|
|
932fb9 |
|
|
|
932fb9 |
+#if GTK_CHECK_VERSION(3,0,0)
|
|
|
932fb9 |
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
|
|
|
932fb9 |
+#else
|
|
|
932fb9 |
vbox2 = gtk_vbox_new(FALSE, 8);
|
|
|
932fb9 |
+#endif
|
|
|
932fb9 |
gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
|
|
|
932fb9 |
|
|
|
932fb9 |
scrolled_window = gtk_scrolled_window_new(NULL, NULL);
|
|
|
932fb9 |
--
|
|
|
932fb9 |
2.7.4
|
|
|
932fb9 |
|