[network-manager-applet/NETWORKMANAGER_APPLET_0_7] core: GTK+ 2.14 fixes



commit 1cce500385aaa31d18929784bcbdab44ccd03454
Author: David Greaves <david dgreaves com>
Date:   Sun Sep 20 08:21:26 2009 -0700

    core: GTK+ 2.14 fixes

 src/wireless-dialog.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/src/wireless-dialog.c b/src/wireless-dialog.c
index a5cb51f..a75b8e8 100644
--- a/src/wireless-dialog.c
+++ b/src/wireless-dialog.c
@@ -940,7 +940,11 @@ internal_init (NMAWirelessDialog *self,
 	widget = glade_xml_get_widget (priv->xml, "image1");
 	gtk_image_set_from_icon_name (GTK_IMAGE (widget), icon_name, GTK_ICON_SIZE_DIALOG);
 
+#if GTK_CHECK_VERSION (2,14,0)
+	gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (self))), 2);
+#else
 	gtk_box_set_spacing (GTK_BOX (gtk_bin_get_child (GTK_BIN (self))), 2);
+#endif
 
 	widget = gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
 	gtk_box_set_child_packing (GTK_BOX (GTK_DIALOG (self)->action_area), widget,
@@ -970,7 +974,11 @@ internal_init (NMAWirelessDialog *self,
 		return FALSE;
 	}
 
+#if GTK_CHECK_VERSION (2,14,0)
+	gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (self))), widget);
+#else
 	gtk_container_add (GTK_CONTAINER (gtk_bin_get_child (GTK_BIN (self))), widget);
+#endif
 
 	/* If given a valid connection, hide the SSID bits and connection combo */
 	if (specific_connection) {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]