aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-chat.c
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@gmail.com>2010-03-08 20:17:57 +0800
committerXavier Claessens <xclaesse@gmail.com>2010-03-08 20:19:29 +0800
commitefb42513359f4db545e3312e3c583d07c6306418 (patch)
tree2f6d1df497e3bbd8ba69eda7c37c82f4ab8f55f3 /libempathy-gtk/empathy-chat.c
parent1feea908259b4555a08e5e90e0aaa99ef44bf70f (diff)
downloadgsoc2013-empathy-efb42513359f4db545e3312e3c583d07c6306418.tar
gsoc2013-empathy-efb42513359f4db545e3312e3c583d07c6306418.tar.gz
gsoc2013-empathy-efb42513359f4db545e3312e3c583d07c6306418.tar.bz2
gsoc2013-empathy-efb42513359f4db545e3312e3c583d07c6306418.tar.lz
gsoc2013-empathy-efb42513359f4db545e3312e3c583d07c6306418.tar.xz
gsoc2013-empathy-efb42513359f4db545e3312e3c583d07c6306418.tar.zst
gsoc2013-empathy-efb42513359f4db545e3312e3c583d07c6306418.zip
Revert "Make links clickable in presence message and topics"
This reverts commit 00ab069a55f05f0203bf58f071fa7adc54b6e9ac. Conflicts: libempathy-gtk/empathy-contact-widget.c
Diffstat (limited to 'libempathy-gtk/empathy-chat.c')
-rw-r--r--libempathy-gtk/empathy-chat.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 4db9e455c..bec1d7704 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -56,7 +56,6 @@
#include "empathy-theme-manager.h"
#include "empathy-smiley-manager.h"
#include "empathy-ui-utils.h"
-#include "empathy-string-parser.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CHAT
#include <libempathy/empathy-debug.h>
@@ -1213,12 +1212,7 @@ chat_property_changed_cb (EmpathyTpChat *tp_chat,
if (EMP_STR_EMPTY (priv->subject)) {
gtk_widget_hide (priv->hbox_topic);
} else {
- gchar *markup_text;
-
- markup_text = empathy_add_link_markup (priv->subject);
- gtk_label_set_markup (GTK_LABEL (priv->label_topic), markup_text);
- g_free (markup_text);
-
+ gtk_label_set_text (GTK_LABEL (priv->label_topic), priv->subject);
gtk_widget_show (priv->hbox_topic);
}
if (priv->block_events_timeout_id == 0) {