Merge branch 'escape-notifications'

Fixes #580134

Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

diff --combined src/empathy-chat-window.c
index 6dbbc0b3b6844597601d23f85b0f8ada7851d60a,bde0e215e889b46efdf4353e14bd68ba7acaa245..e818e42402bf39bc4add3a924f071605c0e0ab30
--- 1/src/empathy-chat-window.c
--- 2/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@@ -969,28 -969,26 +969,26 @@@ chat_window_show_or_update_notificatio
        body = empathy_message_get_body (message);
        escaped = g_markup_escape_text (body, -1);
  
-       pixbuf = empathy_misc_get_pixbuf_for_notification (sender, EMPATHY_IMAGE_NEW_MESSAGE);
- 
        if (priv->notification != NULL) {
                notify_notification_update (priv->notification,
                                            header, escaped, NULL);
-               /* if icon doesn't exist libnotify will crash */
-               if (pixbuf != NULL)
-                       notify_notification_set_icon_from_pixbuf (priv->notification, pixbuf);
        } else {
                priv->notification = notify_notification_new (header, escaped, NULL, NULL);
                notify_notification_set_timeout (priv->notification, NOTIFY_EXPIRES_DEFAULT);
-               /* if icon doesn't exist libnotify will crash */
-               if (pixbuf != NULL)
-                       notify_notification_set_icon_from_pixbuf (priv->notification, pixbuf);
  
                g_signal_connect (priv->notification, "closed",
                                  G_CALLBACK (chat_window_notification_closed_cb), cb_data);
        }
  
+       pixbuf = empathy_misc_get_pixbuf_for_notification (sender, EMPATHY_IMAGE_NEW_MESSAGE);
+ 
+       if (pixbuf != NULL) {
+               notify_notification_set_icon_from_pixbuf (priv->notification, pixbuf);
+               g_object_unref (pixbuf);
+       }
+ 
        notify_notification_show (priv->notification, NULL);
  
-       g_object_unref (pixbuf);
        g_free (escaped);
  }
  
@@@ -1003,8 -1001,7 +1001,8 @@@ chat_window_set_highlight_room_tab_labe
        if (!empathy_chat_is_room (chat))
                return;
  
 -      markup = g_markup_printf_escaped ("<span color=\"red\">%s</span>",
 +      markup = g_markup_printf_escaped (
 +              "<span color=\"red\" weight=\"bold\">%s</span>",
                empathy_chat_get_name (chat));
  
        widget = g_object_get_data (G_OBJECT (chat), "chat-window-tab-label");