diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | libempathy-gtk/empathy-group-chat.c | 6 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2007-08-02 Xavier Claessens <xclaesse@gmail.com> + + * libempathy-gtk/empathy-group-chat.c: don't display + "Topic set to: (null)". Fixes bug #460205 (Michael Scherer). + 2007-07-30 Xavier Claessens <xclaesse@gmail.com> * autogen.sh: Added back, it calls gnome-autogen.sh. diff --git a/libempathy-gtk/empathy-group-chat.c b/libempathy-gtk/empathy-group-chat.c index 6861dd5cd..4d62d51b6 100644 --- a/libempathy-gtk/empathy-group-chat.c +++ b/libempathy-gtk/empathy-group-chat.c @@ -569,7 +569,11 @@ group_chat_subject_notify_cb (EmpathyTpChat *tp_chat, g_object_get (priv->tp_chat, "subject", &priv->topic, NULL); gtk_label_set_text (GTK_LABEL (priv->label_topic), priv->topic); - str = g_strdup_printf (_("Topic set to: %s"), priv->topic); + if (!G_STR_EMPTY (priv->topic)) { + str = g_strdup_printf (_("Topic set to: %s"), priv->topic); + } else { + str = g_strdup (_("No topic defined")); + } empathy_chat_view_append_event (EMPATHY_CHAT (chat)->view, str); g_free (str); } |