[gnome-settings-daemon] power: Do not connect to signals if we failed to connect



commit 4d632281c1b2f42a193c5db1ef9a472347dee2b9
Author: Richard Hughes <richard hughsie com>
Date:   Thu Sep 8 11:43:15 2011 +0100

    power: Do not connect to signals if we failed to connect
    
    This prevents a critial warning on startup when the session is busted.

 plugins/power/gsd-power-manager.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index 34ac6fb..6c0174a 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -3016,6 +3016,7 @@ session_proxy_ready_cb (GObject *source_object,
                 g_warning ("Could not connect to gnome-sesson: %s",
                            error->message);
                 g_error_free (error);
+                return;
         }
         g_signal_connect (manager->priv->session_proxy, "g-signal",
                           G_CALLBACK (idle_dbus_signal_cb), manager);
@@ -3034,6 +3035,7 @@ session_presence_proxy_ready_cb (GObject *source_object,
                 g_warning ("Could not connect to gnome-sesson: %s",
                            error->message);
                 g_error_free (error);
+                return;
         }
         g_signal_connect (manager->priv->session_presence_proxy, "g-signal",
                           G_CALLBACK (idle_dbus_signal_cb), manager);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]