don't display "Topic set to: (null)". Fixes bug #460205 (Michael Scherer).

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).

svn path=/trunk/; revision=222

diff --git a/ChangeLog b/ChangeLog
index 5864bb6d88af0e57fe710ac82793ce6aad3c54d3..72efb136431c4debd4ac3e338eb7c66f64f813ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 6861dd5cd1c6cd2650aa46bc5ebffb00e2dd241b..4d62d51b68e412bb04acecf8baceab9e7a34d68c 100644 (file)
--- 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);
 }