empathy r2026 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Jan  6 16:46:04 2009
New Revision: 2026
URL: http://svn.gnome.org/viewvc/empathy?rev=2026&view=rev

Log:
Don't set random values in EmpathyIdle init if MC is not running.

Modified:
   trunk/libempathy/empathy-idle.c

Modified: trunk/libempathy/empathy-idle.c
==============================================================================
--- trunk/libempathy/empathy-idle.c	(original)
+++ trunk/libempathy/empathy-idle.c	Tue Jan  6 16:46:04 2009
@@ -402,11 +402,16 @@
 	idle->priv = priv;
 	priv->is_idle = FALSE;
 	priv->mc = empathy_mission_control_new ();
-	priv->state = mission_control_get_presence_actual (priv->mc, NULL);
-	priv->status = mission_control_get_presence_message_actual (priv->mc, NULL);
-	if (G_STR_EMPTY (priv->status)) {
+	priv->state = mission_control_get_presence_actual (priv->mc, &error);
+	if (error) {
+		priv->state = MC_PRESENCE_UNSET;
+		g_clear_error (&error);
+	}
+	priv->status = mission_control_get_presence_message_actual (priv->mc, &error);
+	if (error) {
 		g_free (priv->status);
 		priv->status = NULL;
+		g_clear_error (&error);
 	}
 
 	dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->mc),