[empathy] Cope with status being NULL
- From: Sjoerd Simons <sjoerds src gnome org>
- To: svn-commits-list gnome org
- Subject: [empathy] Cope with status being NULL
- Date: Sat, 30 May 2009 17:49:10 -0400 (EDT)
commit 53013e8534c6e8340a7aefde55eb10164c8a3d61
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date: Sat May 30 22:48:26 2009 +0100
Cope with status being NULL
---
libempathy-gtk/empathy-presence-chooser.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index 4fd524e..9f8c568 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]