aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog13
-rw-r--r--shell/e-shell-nm.c2
2 files changed, 14 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index f4c0a938d3..cce1e529fc 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,18 @@
2008-02-18 Srinivasa Ragavan <sragavan@novell.com>
+ ** Fix for bnc #173186
+
+ * e-shell-nm.c: (e_shell_network_monitor): Upstreamed Fejj's OpenSUSE
+ patch. Crash while quitting.
+
+2008-02-18 Srinivasa Ragavan <sragavan@novell.com>
+
+ reviewed by: <delete if not using a buddy>
+
+ * e-shell-nm.c: (e_shell_network_monitor):
+
+2008-02-18 Srinivasa Ragavan <sragavan@novell.com>
+
** Fix for bnc #159736. Patch from OpenSUSE.
* e-shell-nm.c: (e_shell_network_monitor):
diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c
index d973a26b22..65b9812632 100644
--- a/shell/e-shell-nm.c
+++ b/shell/e-shell-nm.c
@@ -79,7 +79,7 @@ e_shell_network_monitor (DBusConnection *connection G_GNUC_UNUSED,
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;