diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2010-03-08 20:17:57 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2010-03-08 20:19:29 +0800 |
| commit | efb42513359f4db545e3312e3c583d07c6306418 (patch) | |
| tree | 2f6d1df497e3bbd8ba69eda7c37c82f4ab8f55f3 | |
| parent | 1feea908259b4555a08e5e90e0aaa99ef44bf70f (diff) | |
| download | gsoc2013-empathy-efb42513359f4db545e3312e3c583d07c6306418.tar.gz 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
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 8 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-contact-widget.c | 12 |
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); |