commit eec2cb1af873f38091671486b5adc5d444e306b7
author Matthias Clasen <mclasen@redhat.com> Mon Jan 10 20:28:17 2011 -0500
committer Matthias Clasen <mclasen@redhat.com> Mon Jan 10 20:29:29 2011 -0500
tree dcfa7065ad440451fc7e069bf0b412546a9f56a4
parent 48f27317607fe117fe9aed0c2fe24ff6ef10a5d5

Avoid a segfault in g_application_register()

Patch by Mikkel Kamstrup Erlandsen
https://bugzilla.gnome.org/show_bug.cgi?id=639177

gio/gapplicationimpl-dbus.c

diff --git a/gio/gapplicationimpl-dbus.c b/gio/gapplicationimpl-dbus.c
index ca072ac..406b839 100644
--- a/gio/gapplicationimpl-dbus.c
+++ b/gio/gapplicationimpl-dbus.c
@@ -668,7 +668,7 @@
           g_free (impl->object_path);
 
           g_slice_free (GApplicationImpl, impl);
-          impl = NULL;
+          return NULL;
         }
     }
 
@@ -676,7 +676,7 @@
    * This also serves as a mechanism to ensure that the primary exists
    * (ie: DBus service files installed correctly, etc).
    */
-  impl->signal_id = 
+  impl->signal_id =
     g_dbus_connection_signal_subscribe (impl->session_bus, impl->bus_name,
                                         "org.gtk.Actions", NULL,
                                         impl->object_path, NULL,