network-manager-applet r477 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Fri Jan 25 16:59:07 2008
New Revision: 477
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=477&view=rev

Log:
2008-01-25  Dan Williams  <dcbw redhat com>

	* src/wireless-dialog.c
		- (add_device_to_model): fix leak of device name
		- (dialog_init): unconditionalize some code for GTK+ >= 2.6



Modified:
   trunk/ChangeLog
   trunk/src/wireless-dialog.c

Modified: trunk/src/wireless-dialog.c
==============================================================================
--- trunk/src/wireless-dialog.c	(original)
+++ trunk/src/wireless-dialog.c	Fri Jan 25 16:59:07 2008
@@ -285,6 +285,7 @@
 
 	gtk_list_store_append (model, iter);
 	gtk_list_store_set (model, iter, D_NAME_COLUMN, name, D_DEV_COLUMN, device, -1);
+	g_free (name);
 }
 
 static GtkTreeModel *
@@ -583,6 +584,7 @@
 	NMDevice *dev;
 	gboolean success = FALSE;
 	gboolean security_combo_focus = FALSE;
+	GtkWidget *image;
 
 	/* If given a valid connection, hide the SSID bits */
 	if (connection) {
@@ -604,12 +606,8 @@
 	widget = glade_xml_get_widget (xml, "ok_button");
 	gtk_widget_grab_default (widget);
 	gtk_widget_set_sensitive (widget, FALSE);
-#if GTK_CHECK_VERSION(2,6,0)
-	{
-		GtkWidget *image = gtk_image_new_from_stock (GTK_STOCK_CONNECT, GTK_ICON_SIZE_BUTTON);
-		gtk_button_set_image (GTK_BUTTON (widget), image);
-	}
-#endif
+	image = gtk_image_new_from_stock (GTK_STOCK_CONNECT, GTK_ICON_SIZE_BUTTON);
+	gtk_button_set_image (GTK_BUTTON (widget), image);
 
 	group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 	g_object_set_data_full (G_OBJECT (dialog),