[gnome-power-manager/gnome-2-26] Don't segfault if org.gnome.Session is not present on the bus. Fixes #581425

[Richard Hughes <rhughes src gnome org>]

commit 979f360f6067394804bc710f8251c34056ecabdd
Author: Richard Hughes <richard hughsie com>
Date:   Tue May 5 18:05:16 2009 +0100

    Don't segfault if org.gnome.Session is not present on the bus. Fixes #581425
---
 src/gpm-session.c |   40 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/gpm-session.c b/src/gpm-session.c
index 7537e77..aa91656 100644
--- a/src/gpm-session.c
+++ b/src/gpm-session.c
@@ -90,6 +90,13 @@ gboolean
 gpm_session_logout (GpmSession *session)
 {
 	g_return_val_if_fail (GPM_IS_SESSION (session), FALSE);
+
+	/* no gnome-session */
+	if (session->priv->proxy == NULL) {
+		egg_warning ("no gnome-session");
+		return FALSE;
+	}
+
 	/* we have to use no reply, as the SM calls into g-p-m to get the can_suspend property */
 	dbus_g_proxy_call_no_reply (session->priv->proxy, "Shutdown", G_TYPE_INVALID);
 	return TRUE;
@@ -137,10 +144,16 @@ static gboolean
 gpm_session_is_idle (GpmSession *session)
 {
 	gboolean ret;
-	gboolean is_idle;
+	gboolean is_idle = FALSE;
 	GError *error = NULL;
 	GValue *value;
 
+	/* no gnome-session */
+	if (session->priv->proxy_prop == NULL) {
+		egg_warning ("no gnome-session");
+		goto out;
+	}
+
 	value = g_new0(GValue, 1);
 	/* find out if this change altered the inhibited state */
 	ret = dbus_g_proxy_call (session->priv->proxy_prop, "Get", &error,
@@ -168,9 +181,15 @@ static gboolean
 gpm_session_is_inhibited (GpmSession *session)
 {
 	gboolean ret;
-	gboolean is_inhibited;
+	gboolean is_inhibited = FALSE;
 	GError *error = NULL;
 
+	/* no gnome-session */
+	if (session->priv->proxy == NULL) {
+		egg_warning ("no gnome-session");
+		goto out;
+	}
+
 	/* find out if this change altered the inhibited state */
 	ret = dbus_g_proxy_call (session->priv->proxy, "IsInhibited", &error,
 				 G_TYPE_UINT, GPM_SESSION_INHIBIT_MASK_IDLE,
@@ -182,6 +201,7 @@ gpm_session_is_inhibited (GpmSession *session)
 		g_error_free (error);
 		is_inhibited = FALSE;
 	}
+out:
 	return is_inhibited;
 }
 
@@ -221,12 +241,18 @@ gpm_session_end_session_cb (DBusGProxy *proxy, guint flags, GpmSession *session)
 gboolean
 gpm_session_end_session_response (GpmSession *session, gboolean is_okay, const gchar *reason)
 {
-	gboolean ret;
+	gboolean ret = FALSE;
 	GError *error = NULL;
 
 	g_return_val_if_fail (GPM_IS_SESSION (session), FALSE);
 	g_return_val_if_fail (session->priv->proxy_client_private != NULL, FALSE);
 
+	/* no gnome-session */
+	if (session->priv->proxy_client_private == NULL) {
+		egg_warning ("no gnome-session proxy");
+		goto out;
+	}
+
 	/* send response */
 	ret = dbus_g_proxy_call (session->priv->proxy_client_private, "EndSessionResponse", &error,
 				 G_TYPE_BOOLEAN, is_okay,
@@ -248,13 +274,19 @@ out:
 gboolean
 gpm_session_register_client (GpmSession *session, const gchar *app_id, const gchar *client_startup_id)
 {
-	gboolean ret;
+	gboolean ret = FALSE;
 	gchar *client_id = NULL;
 	GError *error = NULL;
 	DBusGConnection *connection;
 
 	g_return_val_if_fail (GPM_IS_SESSION (session), FALSE);
 
+	/* no gnome-session */
+	if (session->priv->proxy == NULL) {
+		egg_warning ("no gnome-session");
+		goto out;
+	}
+
 	/* find out if this change altered the inhibited state */
 	ret = dbus_g_proxy_call (session->priv->proxy, "RegisterClient", &error,
 				 G_TYPE_STRING, app_id,