Hello community,
here is the log from the commit of package NetworkManager
checked in at Wed Apr 5 00:47:44 CEST 2006.
--------
--- NetworkManager/NetworkManager.changes 2006-03-30 16:45:55.000000000 +0200
+++ NetworkManager/NetworkManager.changes 2006-04-04 21:46:48.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Apr 4 21:45:51 CEST 2006 - rml@suse.de
+
+- nm-applet: Remove 'Remove' option from right-click menu (undo
+ Novell bug #155690)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager.spec ++++++
--- /var/tmp/diff_new_pack.sOqZwf/_old 2006-04-05 00:47:22.000000000 +0200
+++ /var/tmp/diff_new_pack.sOqZwf/_new 2006-04-05 00:47:22.000000000 +0200
@@ -31,7 +31,7 @@
URL: http://www.gnome.org/projects/NetworkManager/
Autoreqprov: on
Version: 0.6.2
-Release: 3
+Release: 4
Summary: Network Link Manager and User Applications
Source0: NetworkManager-%{version}.tar.gz
Source1: nm-icons.tar.gz
@@ -244,6 +244,9 @@
%{_libdir}/libnm_glib.so.0.0.0
%changelog -n NetworkManager
+* Tue Apr 04 2006 - rml@suse.de
+- nm-applet: Remove 'Remove' option from right-click menu (undo
+ Novell bug #155690)
* Wed Mar 29 2006 - rml@suse.de
- Allow VPN modules to specify a per-route MSS value (bug #157988)
- Fix possible crash in strcmp (Novell bug #162104)
++++++ nm-0.6-branch.patch ++++++
--- /var/tmp/diff_new_pack.sOqZwf/_old 2006-04-05 00:47:22.000000000 +0200
+++ /var/tmp/diff_new_pack.sOqZwf/_new 2006-04-05 00:47:22.000000000 +0200
@@ -1,7 +1,8 @@
NETWORKMANAGER_0_6_2_RELEASE to NETWORKMANAGER_0_6_0_RELEASE
- ChangeLog | 57 +++++++
+ ChangeLog | 63 ++++++++
NEWS | 5
+ gnome/applet/applet.c | 87 -----------
gnome/applet/applet.glade | 60 +++----
src/NetworkManagerDbus.c | 6
src/NetworkManagerPolicy.c | 2
@@ -14,12 +15,18 @@
src/nm-netlink-monitor.c | 4
src/vpn-manager/nm-vpn-service.c | 13 +
test/nm-tool.c | 4
- 14 files changed, 304 insertions(+), 193 deletions(-)
+ 15 files changed, 310 insertions(+), 280 deletions(-)
diff -urN NetworkManager-0.6.2/ChangeLog NetworkManager/ChangeLog
--- NetworkManager-0.6.2/ChangeLog 2006-03-27 11:05:17.000000000 -0500
-+++ NetworkManager/ChangeLog 2006-03-29 14:03:00.000000000 -0500
-@@ -1,3 +1,60 @@
++++ NetworkManager/ChangeLog 2006-04-04 15:37:31.000000000 -0400
+@@ -1,3 +1,66 @@
++2006-04-04 Robert Love
++
++ * gnome/applet/applet.c: Remove the 'Remove' option that I added to the
++ applet. It just confuses the crap out of people and does not make a
++ lot of sense, as the daemon still runs.
++
+2006-03-29 Robert Love
+
+ Patch by Vinay R and Robert Love ,
@@ -80,6 +87,110 @@
2006-03-27 Robert Love
* configure.in: Bump version to 0.6.2.
+diff -urN NetworkManager-0.6.2/gnome/applet/applet.c NetworkManager/gnome/applet/applet.c
+--- NetworkManager-0.6.2/gnome/applet/applet.c 2006-03-24 10:54:01.000000000 -0500
++++ NetworkManager/gnome/applet/applet.c 2006-04-04 15:35:18.000000000 -0400
+@@ -374,86 +374,6 @@
+ }
+
+
+-#define AUTOSTART_ENABLE_STR "X-GNOME-Autostart-enabled=true"
+-#define AUTOSTART_ENABLE_STR_LEN 30
+-#define AUTOSTART_DISABLE_STR "X-GNOME-Autostart-enabled=false"
+-#define AUTOSTART_DISABLE_STR_LEN 31
+-static void G_GNUC_NORETURN nma_remove_cb (GtkMenuItem *mi, NMApplet *applet)
+-{
+- char *src;
+- char *dir;
+- char *file;
+- const char *sub;
+- gsize src_len;
+- GtkWidget *dialog;
+-
+- /*
+- * Give the user the option of disabling autostart, if it is enabled. Autostart is in
+- * use if there is an nm-applet.desktop in either the system wide or the per-user
+- * autostart directory and it has "X-GNOME-Autostart-enabled" set to "true". To disable
+- * autostart, we (re)write the autostart file to the per-user location, with the
+- * autostart option set to "false".
+- */
+-
+- dir = g_strdup_printf ("%s/.config/autostart", g_get_home_dir ());
+- file = g_strdup_printf ("%s/nm-applet.desktop", dir);
+-
+- /*
+- * Figure out what our source file is. Try to use the user's nm-applet.desktop, first.
+- * If it does not exist, we use the system-wide autostart file.
+- */
+- if (!g_file_get_contents (file, &src, &src_len, NULL))
+- if (!g_file_get_contents (AUTOSTARTDIR"/nm-applet.desktop", &src, &src_len, NULL))
+- goto out_free_file;
+-
+- /* If autostart is explicitly disabled or not explicitly enabled, we are done. */
+- if (strstr (src, AUTOSTART_DISABLE_STR))
+- goto out_free_src;
+- sub = strstr (src, AUTOSTART_ENABLE_STR);
+- if (!sub)
+- goto out_free_src;
+-
+- dialog = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
+- "%s</span>\n\n%s",
+- _("Stop automatically running the networking applet?"),
+- _("The networking applet will now terminate, but will automatically launch the next time you login. Would you like to stop automatically running the networking applet on login?"));
+- if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES)
+- {
+- char *dst;
+- gsize dst_len;
+- gsize sub_len;
+-
+- src_len += 1;
+- dst_len = src_len + 1;
+- dst = g_malloc (dst_len);
+- sub_len = sub - src;
+-
+- /* memcpy the first chunk, write in our updated string, and memcpy the remaining bytes */
+- memcpy (dst, src, sub_len);
+- g_strlcpy (dst + sub_len, AUTOSTART_DISABLE_STR, dst_len - sub_len);
+- memcpy (dst + sub_len + AUTOSTART_DISABLE_STR_LEN,
+- sub + AUTOSTART_ENABLE_STR_LEN,
+- src_len - sub_len - AUTOSTART_ENABLE_STR_LEN);
+- dst[dst_len-1] = '\0';
+-
+- g_mkdir_with_parents (dir, 0750);
+- g_file_set_contents (file, dst, dst_len, NULL);
+-
+- g_free (dst);
+- }
+-
+- gtk_widget_destroy (dialog);
+-
+-out_free_src:
+- g_free (src);
+-out_free_file:
+- g_free (file);
+- g_free (dir);
+-
+- nma_destroy (applet);
+-}
+-
+-
+ #ifndef ENABLE_NOTIFY
+ /*
+ * nma_show_vpn_failure_dialog
+@@ -2283,13 +2203,6 @@
+ gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+
+- /* Quit */
+- menu_item = gtk_image_menu_item_new_with_mnemonic (_("_Remove"));
+- g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (nma_remove_cb), applet);
+- image = gtk_image_new_from_stock (GTK_STOCK_QUIT, GTK_ICON_SIZE_MENU);
+- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), image);
+- gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item);
+-
+ gtk_widget_show_all (menu);
+
+ return menu;
diff -urN NetworkManager-0.6.2/gnome/applet/applet.glade NetworkManager/gnome/applet/applet.glade
--- NetworkManager-0.6.2/gnome/applet/applet.glade 2006-03-23 10:14:45.000000000 -0500
+++ NetworkManager/gnome/applet/applet.glade 2006-03-27 13:55:09.000000000 -0500
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...