File nm-applet-editor.patch of Package NetworkManager

Overview Repositories Revisions Requests Users Attributes Meta

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

Currently displaying revision b46ac85fd1d429ebe651eb3b0b9e1878 , Show latest

Index: NetworkManager-0.6.5/nm-applet-0.6.5/configure.ac
===================================================================
--- NetworkManager-0.6.5.orig/nm-applet-0.6.5/configure.ac
+++ NetworkManager-0.6.5/nm-applet-0.6.5/configure.ac
@@ -249,6 +249,7 @@ fi
 AC_OUTPUT([
 Makefile
 src/Makefile
+editor/Makefile
 icons/Makefile
 po/Makefile.in
 ])
Index: NetworkManager-0.6.5/nm-applet-0.6.5/Makefile.am
===================================================================
--- NetworkManager-0.6.5.orig/nm-applet-0.6.5/Makefile.am
+++ NetworkManager-0.6.5/nm-applet-0.6.5/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src icons po
+SUBDIRS = src editor icons po
 
 EXTRA_DIST =				\
 	CONTRIBUTING			\
Index: NetworkManager-0.6.5/nm-applet-0.6.5/po/POTFILES.in
===================================================================
--- NetworkManager-0.6.5.orig/nm-applet-0.6.5/po/POTFILES.in
+++ NetworkManager-0.6.5/nm-applet-0.6.5/po/POTFILES.in
@@ -19,3 +19,11 @@ src/wso-wep-hex.c
 src/wso-wep-passphrase.c
 src/wso-wpa-eap.c
 src/wso-wpa-psk.c
+editor/bssid-editor-dialog.c
+editor/editor-app.c
+editor/editor-gconf-helper.c
+editor/editor-keyring-helper.c
+editor/widget-wso-wep.c
+editor/widget-wso-wpa-enterprise.c
+editor/widget-wso-wpa-personal.c
+editor/editor.glade
Index: NetworkManager-0.6.5/nm-applet-0.6.5/src/applet.c
===================================================================
--- NetworkManager-0.6.5.orig/nm-applet-0.6.5/src/applet.c
+++ NetworkManager-0.6.5/nm-applet-0.6.5/src/applet.c
@@ -1614,6 +1614,28 @@ static void nma_menu_add_custom_essid_it
 }
 
 
+static void edit_essid_items_selected (GtkWidget *menu_item, NMApplet *applet)
+{
+    g_spawn_command_line_async ("nm-editor", NULL);
+}
+
+
+static void nma_menu_add_edit_essid_item (GtkWidget *menu, NMApplet *applet)
+{
+    GtkWidget *menu_item;
+    GtkWidget *label;
+
+    menu_item = gtk_menu_item_new ();
+    label = gtk_label_new_with_mnemonic (_("_Edit Wireless Networks..."));
+    gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+    gtk_container_add (GTK_CONTAINER (menu_item), label);
+    gtk_widget_show_all (menu_item);
+    gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+    g_signal_connect (menu_item, "activate", G_CALLBACK (edit_essid_items_selected), applet);
+}
+
+
+
 static void new_network_item_selected (GtkWidget *menu_item, NMApplet *applet)
 {
 	nma_other_network_dialog_run (applet, TRUE);
@@ -2014,6 +2036,7 @@ static void nma_menu_add_devices (GtkWid
 		nma_menu_add_separator_item (menu);
 		nma_menu_add_custom_essid_item (menu, applet);
 		nma_menu_add_create_network_item (menu, applet);
+	        nma_menu_add_edit_essid_item (menu, applet);
 	}
 }
 
Index: NetworkManager-0.6.5/nm-applet-0.6.5/editor/Makefile.am
===================================================================
--- NetworkManager-0.6.5.orig/nm-applet-0.6.5/editor/Makefile.am
+++ NetworkManager-0.6.5/nm-applet-0.6.5/editor/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-INCLUDES = -I${top_srcdir} -I${top_srcdir}/utils -I${top_srcdir}/include -I${top_srcdir}/libnm-util
+INCLUDES = -I${top_srcdir}/../include -I${top_srcdir}/../libnm-util
 
 bin_PROGRAMS = nm-editor
 
@@ -55,8 +55,8 @@ nm_editor_LDADD =						\
 	$(GCONF_LIBS)						\
 	$(LIBGNOMEUI_LIBS)					\
 	$(GNOME_KEYRING_LIBS)				\
-	$(top_builddir)/utils/libnmutils.la	\
-	$(top_builddir)/libnm-util/libnm-util.la	\
+	$(top_builddir)/../utils/libnmutils.la	\
+	$(top_builddir)/../libnm-util/libnm-util.la	\
 	$(NULL)
 
 
Index: NetworkManager-0.6.5/nm-applet-0.6.5/editor/editor-app.c
===================================================================
--- NetworkManager-0.6.5.orig/nm-applet-0.6.5/editor/editor-app.c
+++ NetworkManager-0.6.5/nm-applet-0.6.5/editor/editor-app.c
@@ -197,7 +197,7 @@ gboolean quit_editor(WE_DATA *we_data)
 	if(we_data != NULL)
 	{
 		if(we_data->editor_xml != NULL)
-			g_free(we_data->editor_xml);
+			g_object_unref(we_data->editor_xml);
 		if(we_data->gconf_client != NULL)
 			g_object_unref(we_data->gconf_client);
 		if(we_data->glade_file != NULL)
@@ -894,7 +894,7 @@ void update_security_widget(gint option,
 
 	if(we_data->sub_xml != NULL)
 	{
-		g_free(we_data->sub_xml);
+		g_object_unref(we_data->sub_xml);
 		we_data->sub_xml = NULL;
 	}

Places

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

Places