[NetworkManager/f15/master] Fix the applet bus name harder

[Daniel Williams]

commit 3869e5ef89458330b84383dcf009bb2101182298
Author: Dan Williams <dcbw at redhat.com>
Date:   Wed Mar 9 13:36:46 2011 -0600

    Fix the applet bus name harder

 NetworkManager.spec      |    5 ++++-
 nm-applet-bus-name.patch |   18 +++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 8f24968..05b1e3e 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -20,7 +20,7 @@ Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.8.995
-Release: 3%{snapshot}%{?dist}
+Release: 4%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -435,6 +435,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Wed Mar  9 2011 Dan Williams <dcbw at redhat.com> - 0.8.995-4.git20110308
+- applet: fix bus name more
+
 * Wed Mar  9 2011 Dan Williams <dcbw at redhat.com> - 0.8.995-3.git20110308
 - applet: fix bus name
 
diff --git a/nm-applet-bus-name.patch b/nm-applet-bus-name.patch
index 804a35a..60e917b 100644
--- a/nm-applet-bus-name.patch
+++ b/nm-applet-bus-name.patch
@@ -1,6 +1,6 @@
-diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/applet.c.foo NetworkManager-0.8.995/network-manager-applet-0.8.995/src/applet.c
---- NetworkManager-0.8.995/network-manager-applet-0.8.995/src/applet.c.foo	2011-03-09 11:49:55.791538667 -0600
-+++ NetworkManager-0.8.995/network-manager-applet-0.8.995/src/applet.c	2011-03-09 11:50:10.646352961 -0600
+diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/applet.c.applet-bus-name NetworkManager-0.8.995/network-manager-applet-0.8.995/src/applet.c
+--- NetworkManager-0.8.995/network-manager-applet-0.8.995/src/applet.c.applet-bus-name	2011-03-07 09:51:48.000000000 -0600
++++ NetworkManager-0.8.995/network-manager-applet-0.8.995/src/applet.c	2011-03-09 11:52:29.864612493 -0600
 @@ -3104,7 +3104,7 @@ dbus_setup (NMApplet *applet, GError **e
  		return FALSE;
  
@@ -19,3 +19,15 @@ diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/applet.c.foo
  	                             G_TYPE_UINT, DBUS_NAME_FLAG_DO_NOT_QUEUE,
  	                             G_TYPE_INVALID,
  	                             G_TYPE_UINT, &result,
+diff -up NetworkManager-0.8.995/network-manager-applet-0.8.995/src/nm-applet-introspection.xml.applet-bus-name NetworkManager-0.8.995/network-manager-applet-0.8.995/src/nm-applet-introspection.xml
+--- NetworkManager-0.8.995/network-manager-applet-0.8.995/src/nm-applet-introspection.xml.applet-bus-name	2011-03-09 13:35:25.530406045 -0600
++++ NetworkManager-0.8.995/network-manager-applet-0.8.995/src/nm-applet-introspection.xml	2011-03-09 13:35:41.121211133 -0600
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8" ?>
+-<node name="/org/gnome/network-manager-applet">
+-  <interface name="org.gnome.network-manager-applet">
++<node name="/org/gnome/network_manager_applet">
++  <interface name="org.gnome.network_manager_applet">
+     <method name="ConnectToHiddenNetwork">
+       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_dbus_connect_to_hidden_network"/>
+     </method>