SOURCES: NetworkManager-dbus.patch - proper version above major = ...

czarny czarny at pld-linux.org
Sat Jan 13 11:46:34 CET 2007


Author: czarny                       Date: Sat Jan 13 10:46:34 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- proper version above major = 0 recognition

---- Files affected:
SOURCES:
   NetworkManager-dbus.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/NetworkManager-dbus.patch
diff -u SOURCES/NetworkManager-dbus.patch:1.1 SOURCES/NetworkManager-dbus.patch:1.2
--- SOURCES/NetworkManager-dbus.patch:1.1	Wed Aug 23 21:16:44 2006
+++ SOURCES/NetworkManager-dbus.patch	Sat Jan 13 11:46:28 2007
@@ -1,5 +1,6 @@
---- NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c~	2006-05-05 17:36:46.000000000 +0200
-+++ NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c	2006-08-23 21:12:31.491904000 +0200
+diff -urN NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c NetworkManager-0.6.4.new/gnome/libnm_glib/libnm_glib.c
+--- NetworkManager-0.6.4/gnome/libnm_glib/libnm_glib.c	2006-05-05 17:36:46.000000000 +0200
++++ NetworkManager-0.6.4.new/gnome/libnm_glib/libnm_glib.c	2007-01-13 11:41:16.978873626 +0100
 @@ -230,7 +230,7 @@
  	{
  		/* Try to reactivate our connection to dbus on the next pass through the event loop */
@@ -18,3 +19,15 @@
  
  	if (ctx->callbacks_lock)
  		g_mutex_free (ctx->callbacks_lock);
+diff -urN NetworkManager-0.6.4/src/NetworkManagerDbus.c NetworkManager-0.6.4.new/src/NetworkManagerDbus.c
+--- NetworkManager-0.6.4/src/NetworkManagerDbus.c	2006-05-21 19:28:02.000000000 +0200
++++ NetworkManager-0.6.4.new/src/NetworkManagerDbus.c	2007-01-13 11:41:34.618873626 +0100
+@@ -831,7 +831,7 @@
+ 	}
+ 
+ 	dbus_error_init (&error);
+-#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
++#if ((DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) || DBUS_VERSION_MAJOR > 0)
+ 	flags = DBUS_NAME_FLAG_DO_NOT_QUEUE;	/* Prohibit replacement is now the default */
+ #else
+ 	flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/NetworkManager-dbus.patch?r1=1.1&r2=1.2&f=u



More information about the pld-cvs-commit mailing list