summaryrefslogtreecommitdiff
path: root/libempathy-gtk/empathy-presence-chooser.c
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-05-30 22:48:26 +0100
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-05-30 22:48:26 +0100
commit53013e8534c6e8340a7aefde55eb10164c8a3d61 (patch)
tree0e008cd8ddd33413ae22a26e8df12a4eace51b4a /libempathy-gtk/empathy-presence-chooser.c
parent327b8e56ecbaca67d550802f2fac741a78d81eb8 (diff)
downloadempathy-53013e8534c6e8340a7aefde55eb10164c8a3d61.tar.gz
Cope with status being NULL
Diffstat (limited to 'libempathy-gtk/empathy-presence-chooser.c')
-rw-r--r--libempathy-gtk/empathy-presence-chooser.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index 4fd524e64..9f8c568c5 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -432,7 +432,7 @@ ui_set_custom_state (EmpathyPresenceChooser *self,
gtk_entry_set_icon_from_icon_name (GTK_ENTRY (entry),
GTK_ENTRY_ICON_PRIMARY,
icon_name);
- gtk_entry_set_text (GTK_ENTRY (entry), status);
+ gtk_entry_set_text (GTK_ENTRY (entry), status == NULL ? "" : status);
presence_chooser_set_favorite_icon (self);
priv->block_changed--;
@@ -873,7 +873,7 @@ presence_chooser_presence_changed_cb (EmpathyPresenceChooser *chooser)
COL_STATUS_TEXT, &m_status,
-1);
- match = !strcmp (status, m_status);
+ match = !tp_strdiff (status, m_status);
g_free (m_status);