File nm-243959.patch of Package NetworkManager

Overview Repositories Revisions Requests Users Attributes Meta

File nm-243959.patch of Package NetworkManager (Revision b46ac85fd1d429ebe651eb3b0b9e1878)

Currently displaying revision b46ac85fd1d429ebe651eb3b0b9e1878 , Show latest

Index: nm-applet-0.6.5/src/applet-dbus-info.c
===================================================================
--- nm-applet-0.6.5/src/applet-dbus-info.c.orig
+++ nm-applet-0.6.5/src/applet-dbus-info.c
@@ -841,6 +841,16 @@ nmi_dbus_get_vpn_connection_routes (DBus
 }
 
 
+static void
+save_network_info_keyring_cb (GnomeKeyringResult result,
+						guint32 val,
+						gpointer user_data)
+{
+	if (result != GNOME_KEYRING_RESULT_OK)
+		nm_warning ("Error saving secret for wireless network '%s' in keyring: %d", (char *) user_data, result);
+}
+
+
 /*
  * nmi_save_network_info
  *
@@ -942,8 +952,6 @@ nmi_save_network_info (NMApplet *applet,
 		GnomeKeyringAttributeList *	attributes;
 		GnomeKeyringAttribute 		attr;		
 		char *					display_name;
-		GnomeKeyringResult			ret;
-		guint32					item_id;
 
 		display_name = g_strdup_printf (_("Passphrase for wireless network %s"), essid);
 
@@ -953,16 +961,15 @@ nmi_save_network_info (NMApplet *applet,
 		attr.value.string = g_strdup (essid);
 		g_array_append_val (attributes, attr);
 
-		ret = gnome_keyring_item_create_sync (NULL,
-									   GNOME_KEYRING_ITEM_GENERIC_SECRET,
-									   display_name,
-									   attributes,
-									   nm_gconf_wso_get_key (gconf_wso),
-									   TRUE,
-									   &item_id);
-		if (ret != GNOME_KEYRING_RESULT_OK)
-			nm_warning ("Error saving secret for wireless network '%s' in keyring: %d", essid, ret);
-
+		gnome_keyring_item_create (NULL,
+							  GNOME_KEYRING_ITEM_GENERIC_SECRET,
+							  display_name,
+							  attributes,
+							  nm_gconf_wso_get_key (gconf_wso),
+							  TRUE,
+							  save_network_info_keyring_cb,
+							  g_strdup (essid),
+							  (GDestroyNotify) g_free);
 		g_free (display_name);
 		gnome_keyring_attribute_list_free (attributes);
 	}

Places

File nm-243959.patch of Package NetworkManager (Revision b46ac85fd1d429ebe651eb3b0b9e1878)

Places