aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2007-08-02 18:41:51 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2007-08-02 18:41:51 +0800
commit91fde5430b09201a0e0c0bb6b484c5291392f51e (patch)
treef743611a589d46d0ce5699607447a7fa1646a6f6
parent16d07a076c5c3d9a9e3c656bb905e189e2340bd2 (diff)
downloadgsoc2013-empathy-91fde5430b09201a0e0c0bb6b484c5291392f51e.tar
gsoc2013-empathy-91fde5430b09201a0e0c0bb6b484c5291392f51e.tar.gz
gsoc2013-empathy-91fde5430b09201a0e0c0bb6b484c5291392f51e.tar.bz2
gsoc2013-empathy-91fde5430b09201a0e0c0bb6b484c5291392f51e.tar.lz
gsoc2013-empathy-91fde5430b09201a0e0c0bb6b484c5291392f51e.tar.xz
gsoc2013-empathy-91fde5430b09201a0e0c0bb6b484c5291392f51e.tar.zst
gsoc2013-empathy-91fde5430b09201a0e0c0bb6b484c5291392f51e.zip
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
-rw-r--r--ChangeLog5
-rw-r--r--libempathy-gtk/empathy-group-chat.c6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5864bb6d8..72efb1364 100644
--- 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 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);
}