aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavyd Madeley <davyd@madeley.id.au>2009-04-11 00:53:42 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-04-11 00:53:42 +0800
commit26b2f0398ec9fa30d55c4774100d94bae11a372f (patch)
tree65866321b051827fc8dfe2c7d5748fadced15347
parent7ff5340a076a91f70ae8ba7a1a40b78d9fe89b1d (diff)
downloadgsoc2013-empathy-26b2f0398ec9fa30d55c4774100d94bae11a372f.tar
gsoc2013-empathy-26b2f0398ec9fa30d55c4774100d94bae11a372f.tar.gz
gsoc2013-empathy-26b2f0398ec9fa30d55c4774100d94bae11a372f.tar.bz2
gsoc2013-empathy-26b2f0398ec9fa30d55c4774100d94bae11a372f.tar.lz
gsoc2013-empathy-26b2f0398ec9fa30d55c4774100d94bae11a372f.tar.xz
gsoc2013-empathy-26b2f0398ec9fa30d55c4774100d94bae11a372f.tar.zst
gsoc2013-empathy-26b2f0398ec9fa30d55c4774100d94bae11a372f.zip
Fix bug where priv->state might be unset
From: Davyd Madeley <davyd@madeley.id.au> svn path=/trunk/; revision=2777
-rw-r--r--libempathy-gtk/empathy-presence-chooser.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index 11ee4f1b9..9359199eb 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -39,6 +39,10 @@
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-status-presets.h>
+// FIXME - what's the correct debug flag?
+#define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
+#include <libempathy/empathy-debug.h>
+
#include "empathy-ui-utils.h"
#include "empathy-images.h"
#include "empathy-presence-chooser.h"
@@ -254,6 +258,10 @@ mc_set_custom_state (EmpathyPresenceChooser *self)
/* update the status with MC */
const char *status = gtk_entry_get_text (GTK_ENTRY (entry));
+ DEBUG ("Sending state to MC-> %s (%s)\n",
+ g_enum_get_value (g_type_class_peek (MC_TYPE_PRESENCE),
+ priv->state)->value_name,
+ status);
empathy_idle_set_presence (priv->idle, priv->state, status);
}
@@ -470,7 +478,7 @@ presence_chooser_presence_changed_cb (EmpathyPresenceChooser *chooser)
priv = GET_PRIV (chooser);
- state = empathy_idle_get_state (priv->idle);
+ priv->state = state = empathy_idle_get_state (priv->idle);
status = empathy_idle_get_status (priv->idle);
flash_state = empathy_idle_get_flash_state (priv->idle);