aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libempathy-gtk/empathy-chat.c8
-rw-r--r--libempathy-gtk/empathy-contact-widget.c12
2 files changed, 3 insertions, 17 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) {
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);