rpms/NetworkManager/devel NetworkManager-0.7.0-dbus-deprecated.patch, NONE, 1.1 NetworkManager.spec, 1.112, 1.113

[fedora-cvs-commits at redhat.com]

Author: johnp

Update of /cvs/dist/rpms/NetworkManager/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31319

Modified Files:
	NetworkManager.spec 
Added Files:
	NetworkManager-0.7.0-dbus-deprecated.patch 
Log Message:
- Add patch to fix deprecated dbus functions


NetworkManager-0.7.0-dbus-deprecated.patch:
 libnm_glib.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE NetworkManager-0.7.0-dbus-deprecated.patch ---
--- NetworkManager-0.7.0/gnome/libnm_glib/libnm_glib.c.dbus-deprecated	2006-07-19 14:22:42.000000000 -0400
+++ NetworkManager-0.7.0/gnome/libnm_glib/libnm_glib.c	2006-07-19 14:23:30.000000000 -0400
@@ -230,7 +230,7 @@
 	{
 		/* Try to reactivate our connection to dbus on the next pass through the event loop */
 		ctx->nm_state = LIBNM_NO_DBUS;
-		dbus_connection_disconnect (ctx->dbus_con);
+		dbus_connection_close (ctx->dbus_con);
 		libnm_glib_schedule_dbus_watcher (ctx);
 	}
 	else if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
@@ -444,7 +444,7 @@
 		g_main_loop_unref (ctx->g_main_loop);
 
 	if (ctx->dbus_con)
-		dbus_connection_disconnect (ctx->dbus_con);
+		dbus_connection_close (ctx->dbus_con);
 
 	if (ctx->callbacks_lock)
 		g_mutex_free (ctx->callbacks_lock);


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/dist/rpms/NetworkManager/devel/NetworkManager.spec,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- NetworkManager.spec	19 Jul 2006 00:45:48 -0000	1.112
+++ NetworkManager.spec	19 Jul 2006 18:27:19 -0000	1.113
@@ -16,11 +16,12 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Version: 0.7.0
-Release: 0%{?nm_cvs_version}.2
+Release: 0%{?nm_cvs_version}.3
 Group: System Environment/Base
 License: GPL
 URL: http://www.gnome.org/projects/NetworkManager/
 Source: %{name}-%{version}%{?nm_cvs_version}.tar.gz
+Patch0: NetworkManager-0.7.0-dbus-deprecated.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 PreReq:   chkconfig
@@ -116,6 +117,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 .dbus-deprecated
 
 %build
 %configure \
@@ -214,6 +216,9 @@
 
 
 %changelog
+* Wed Jul 19 2006 John (J5) Palmieri <johnp at redhat.com> - 0.7.0-0.cvs20060529.3
+- Add patch to fix deprecated dbus functions
+
 * Tue Jul 18 2006 John (J5) Palmieri <johnp at redhat.com> - 0.7.0-0.cvs20060529.2
 - Add BR for dbus-glib-devel