rpms/evolution/devel evolution-2.5.4-fix-nm-multiple-init.patch, NONE, 1.1 evolution.spec, 1.114, 1.115

[fedora-cvs-commits at redhat.com]

Author: dmalcolm

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25982

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.5.4-fix-nm-multiple-init.patch 
Log Message:
* Thu Jan 12 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.4-8
- avoid multiple initialization of NetworkManager connections (patch 807, 
  gnome bug #326875)



evolution-2.5.4-fix-nm-multiple-init.patch:
 e-shell-nm-glib.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

--- NEW FILE evolution-2.5.4-fix-nm-multiple-init.patch ---
--- evolution-2.5.4/shell/e-shell-nm-glib.c.fix-nm-multiple-init	2006-01-12 23:16:25.000000000 -0500
+++ evolution-2.5.4/shell/e-shell-nm-glib.c	2006-01-12 23:19:28.000000000 -0500
@@ -30,6 +30,7 @@
 #include <NetworkManager/libnm_glib.h>
 #include <e-shell-window.h>
 
+static libnm_glib_ctx *nm_ctx = NULL;
 
 static void e_shell_glib_network_monitor (libnm_glib_ctx *ctx, gpointer user_data)
 {
@@ -59,17 +60,18 @@
 
 int e_shell_nm_glib_initialise (EShellWindow *window )
 {
-	libnm_glib_ctx *ctx;
 	guint id;
 
-	ctx = libnm_glib_init ();
-	if (!ctx)
-	{
-		fprintf (stderr, "Could not initialize libnm.\n");
-		return FALSE;
+	if (!nm_ctx) {
+	        nm_ctx = libnm_glib_init ();
+		if (!nm_ctx)
+		{
+		        fprintf (stderr, "Could not initialize libnm.\n");
+			return FALSE;
+		}
 	}
 
-	id = libnm_glib_register_callback (ctx, e_shell_glib_network_monitor, window, NULL);
+	id = libnm_glib_register_callback (nm_ctx, e_shell_glib_network_monitor, window, NULL);
 	
 	return TRUE;
 }


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- evolution.spec	12 Jan 2006 23:34:45 -0000	1.114
+++ evolution.spec	13 Jan 2006 05:05:05 -0000	1.115
@@ -33,7 +33,7 @@
 
 Name: evolution
 Version: 2.5.4
-Release: 7
+Release: 8
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -93,6 +93,7 @@
 Patch804: evolution-2.4.1-fix-missing-declarations.patch
 Patch805: evolution-2.5.4-fix-missing-declarations.patch
 Patch806: evolution-2.5.4-port-to-new-libnotify-api.patch
+Patch807: evolution-2.5.4-fix-nm-multiple-init.patch
 
 Summary: GNOME's next-generation groupware suite
 Group: Applications/Productivity
@@ -234,6 +235,7 @@
 %patch804 -p1 -b .fix-missing-declarations
 %patch805 -p1 -b .fix-missing-declarations-2-5-4
 %patch806 -p1 -b .port-to-new-libnotify-api
+%patch807 -p1 -b .fix-nm-multiple-init
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -510,6 +512,10 @@
 %{_libdir}/evolution/%{evo_major}/*.so
 
 %changelog
+* Thu Jan 12 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.4-8
+- avoid multiple initialization of NetworkManager connections (patch 807, 
+  gnome bug #326875)
+
 * Thu Jan 12 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.4-7
 - updated alarm notification patch(patch 806, #177546, #177666, #177667, 
   #177670)