commit evolution

17 May 2006

Hello community,

here is the log from the commit of package evolution
checked in at Thu May 18 01:59:37 CEST 2006.

--------

--- GNOME/evolution/evolution.changes	2006-05-10 08:48:27.000000000 +0200
+++ evolution/evolution.changes	2006-05-17 21:02:09.000000000 +0200
@@ -1,0 +2,6 @@
+Wed May 17 21:01:22 CEST 2006 - fejj@suse.de
+
+- Added bnc-173186.patch: NULL-check the return from dbus_message_get_path 
+  before strcmping it.
+
+-------------------------------------------------------------------

New:
----
  bnc-173186.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ evolution.spec ++++++
--- /var/tmp/diff_new_pack.75PFYB/_old	2006-05-18 01:58:17.000000000 +0200
+++ /var/tmp/diff_new_pack.75PFYB/_new	2006-05-18 01:58:18.000000000 +0200
@@ -21,7 +21,7 @@
 Autoreqprov:    on
 Obsoletes:      bonobo-conf
 Version:        2.6.0
-Release:        49
+Release:        50
 Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
 Source:         ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.6/%{name}-%{version}.tar.bz2
 Source1:        summerdance-about2.png
@@ -94,6 +94,7 @@
 Patch75:        bnc-170076-evo-wrong-mime-lookup.diff
 Patch76:        bnc-171592-evo-alarm-crash.diff
 Patch77:        bnc-171489-evo-evo-crash-start.diff
+Patch78:        bnc-173186.patch
 URL:            http://gnome.org/projects/evolution/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         filesystem gconf2 shared-mime-info
@@ -375,6 +376,7 @@
 %patch75
 %patch76
 %patch77
+%patch78
 
 %build
 rename no nb po/no.*
@@ -496,6 +498,9 @@
 %{prefix}/share/gnome-pilot/conduits/*.conduit
 
 %changelog -n evolution
+* Wed May 17 2006 - fejj@suse.de
+- Added bnc-173186.patch: NULL-check the return from dbus_message_get_path
+  before strcmping it.
 * Wed May 10 2006 - sragavan@novell.com
 - Fixes (bnc)
   171489 - Crash while starting evolution with a command line.

++++++ bnc-173186.patch ++++++
Index: shell/e-shell-nm.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-nm.c,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 e-shell-nm.c
--- shell/e-shell-nm.c	19 Apr 2006 21:14:44 -0000	1.1.2.2
+++ shell/e-shell-nm.c	17 May 2006 18:55:43 -0000
@@ -73,7 +73,7 @@
 	object = dbus_message_get_path (message);
 	
 	if (dbus_message_is_signal (message, DBUS_INTERFACE_LOCAL, "Disconnected") &&
-		 strcmp (dbus_message_get_path (message), DBUS_PATH_LOCAL) == 0) {
+	    object && !strcmp (object, DBUS_PATH_LOCAL)) {
 		dbus_connection_unref (dbus_connection);
 		dbus_connection = NULL;
 		










++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)