You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
66 lines
2.3 KiB
66 lines
2.3 KiB
7 years ago
|
From d2e1b40ee0bb05a5e7f6b8b208bd2e93a50dd01f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Trent Lloyd <trent@lloyd.id.au>
|
||
|
|
Date: Thu, 16 Jan 2014 12:05:51 +0800
|
||
|
|
Subject: [PATCH] avahi-ui: replace gtk_vbox_new with gtk_box_new for GTK3 due
|
||
|
|
to deprecation
|
||
|
|
|
||
|
|
---
|
||
|
|
avahi-ui/avahi-ui.c | 16 ++++++++++++++++
|
||
|
|
1 file changed, 16 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/avahi-ui/avahi-ui.c b/avahi-ui/avahi-ui.c
|
||
|
|
index 3845066..ff33a89 100644
|
||
|
|
--- a/avahi-ui/avahi-ui.c
|
||
|
|
+++ b/avahi-ui/avahi-ui.c
|
||
|
|
@@ -991,7 +991,11 @@ static void domain_button_clicked(GtkButton *button G_GNUC_UNUSED, gpointer user
|
||
|
|
gtk_dialog_set_has_separator(GTK_DIALOG(p->domain_dialog), FALSE);
|
||
|
|
#endif
|
||
|
|
|
||
|
|
+#if GTK_CHECK_VERSION(3,0,0)
|
||
|
|
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
|
||
|
|
+#else
|
||
|
|
vbox = gtk_vbox_new(FALSE, 8);
|
||
|
|
+#endif
|
||
|
|
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
|
||
|
|
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(p->domain_dialog))), vbox, TRUE, TRUE, 0);
|
||
|
|
|
||
|
|
@@ -1002,7 +1006,11 @@ static void domain_button_clicked(GtkButton *button G_GNUC_UNUSED, gpointer user
|
||
|
|
g_signal_connect(p->domain_entry, "changed", G_CALLBACK(domain_entry_changed_callback), d);
|
||
|
|
gtk_box_pack_start(GTK_BOX(vbox), p->domain_entry, FALSE, FALSE, 0);
|
||
|
|
|
||
|
|
+#if GTK_CHECK_VERSION(3,0,0)
|
||
|
|
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
|
||
|
|
+#else
|
||
|
|
vbox2 = gtk_vbox_new(FALSE, 8);
|
||
|
|
+#endif
|
||
|
|
gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
|
||
|
|
|
||
|
|
scrolled_window = gtk_scrolled_window_new(NULL, NULL);
|
||
|
|
@@ -1113,7 +1121,11 @@ static void aui_service_dialog_init(AuiServiceDialog *d) {
|
||
|
|
|
||
|
|
gtk_container_set_border_width(GTK_CONTAINER(d), 5);
|
||
|
|
|
||
|
|
+#if GTK_CHECK_VERSION(3,0,0)
|
||
|
|
+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
|
||
|
|
+#else
|
||
|
|
vbox = gtk_vbox_new(FALSE, 8);
|
||
|
|
+#endif
|
||
|
|
gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
|
||
|
|
gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(d))), vbox, TRUE, TRUE, 0);
|
||
|
|
|
||
|
|
@@ -1123,7 +1135,11 @@ static void aui_service_dialog_init(AuiServiceDialog *d) {
|
||
|
|
gtk_box_pack_start(GTK_BOX(vbox), p->domain_label, FALSE, FALSE, 0);
|
||
|
|
|
||
|
|
|
||
|
|
+#if GTK_CHECK_VERSION(3,0,0)
|
||
|
|
+ vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 8);
|
||
|
|
+#else
|
||
|
|
vbox2 = gtk_vbox_new(FALSE, 8);
|
||
|
|
+#endif
|
||
|
|
gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
|
||
|
|
|
||
|
|
scrolled_window = gtk_scrolled_window_new(NULL, NULL);
|
||
|
|
--
|
||
|
|
2.7.4
|
||
|
|
|