aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-contact-widget.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-contact-widget.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-contact-widget.c')
-rw-r--r--libempathy-gtk/empathy-contact-widget.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 696a8cda4..9cb493fbe 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -47,7 +47,6 @@
#include "empathy-avatar-chooser.h"
#include "empathy-avatar-image.h"
#include "empathy-ui-utils.h"
-#include "empathy-string-parser.h"
#include "empathy-kludge-label.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
@@ -949,15 +948,8 @@ contact_widget_name_notify_cb (EmpathyContactWidget *information)
static void
contact_widget_presence_notify_cb (EmpathyContactWidget *information)
{
- const gchar *status;
- gchar *markup_text = NULL;
-
- status = empathy_contact_get_status (information->contact);
- if (status != NULL)
- markup_text = empathy_add_link_markup (status);
- gtk_label_set_markup (GTK_LABEL (information->label_status), markup_text);
- g_free (markup_text);
-
+ gtk_label_set_text (GTK_LABEL (information->label_status),
+ empathy_contact_get_status (information->contact));
gtk_image_set_from_icon_name (GTK_IMAGE (information->image_state),
empathy_icon_name_for_contact (information->contact),
GTK_ICON_SIZE_BUTTON);