Merge branch 'gnome-3-8'

Conflicts:
	NEWS
	configure.ac

diff --combined libempathy-gtk/empathy-log-window.c
index 526569a510fd78e6da29ab7945f81ef64654dde6,cba8ae2c729397f172a05be5714343099db2e441..4eb44c9b35977e3951d4b105c459f254ad2f8f50
--- 1/libempathy-gtk/empathy-log-window.c
--- 2/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@@ -23,28 -23,32 +23,28 @@@
   */
  
  #include "config.h"
 +#include "empathy-log-window.h"
  
  #include <glib/gi18n-lib.h>
 -#include <webkit/webkit.h>
 -
  #include <telepathy-glib/proxy-subclass.h>
  
 -#include <extensions/extensions.h>
 -
 -#include <libempathy/action-chain-internal.h>
 -#include <libempathy/empathy-camera-monitor.h>
 -#include <libempathy/empathy-gsettings.h>
 -#include <libempathy/empathy-request-util.h>
 -#include <libempathy/empathy-utils.h>
 -
 -#include "empathy-log-window.h"
 +#include "action-chain-internal.h"
  #include "empathy-account-chooser.h"
  #include "empathy-call-utils.h"
 -#include "empathy-individual-information-dialog.h"
 +#include "empathy-camera-monitor.h"
 +#include "empathy-geometry.h"
 +#include "empathy-gsettings.h"
  #include "empathy-images.h"
 +#include "empathy-individual-information-dialog.h"
 +#include "empathy-request-util.h"
  #include "empathy-theme-manager.h"
  #include "empathy-ui-utils.h"
 +#include "empathy-utils.h"
  #include "empathy-webkit-utils.h"
 -#include "empathy-geometry.h"
 +#include "extensions.h"
  
  #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 -#include <libempathy/empathy-debug.h>
 +#include "empathy-debug.h"
  
  #define EMPATHY_NS "http://live.gnome.org/Empathy"
  
@@@ -1244,7 -1248,6 +1244,6 @@@ log_window_append_chat_message (TplEven
    GtkTreeStore *store = log_window->priv->store_events;
    GtkTreeIter iter, parent;
    gchar *pretty_date, *alias, *body;
-   gchar *msg_escaped;
    GDateTime *date;
    EmpathyStringParser *parsers;
    GString *msg;
@@@ -1268,23 -1271,19 +1267,19 @@@
    empathy_string_parser_substr (empathy_message_get_body (message), -1,
        parsers, msg);
  
-   msg_escaped = g_strescape (msg->str, NULL);
- 
    if (tpl_text_event_get_message_type (TPL_TEXT_EVENT (event))
        == TP_CHANNEL_TEXT_MESSAGE_TYPE_ACTION)
      {
        /* Translators: this is an emote: '* Danielle waves' */
-       body = g_strdup_printf (_("<i>* %s %s</i>"), alias, msg_escaped);
+       body = g_strdup_printf (_("<i>* %s %s</i>"), alias, msg->str);
      }
    else
      {
        /* Translators: this is a message: 'Danielle: hello'
         * The string in bold is the sender's name */
-       body = g_strdup_printf (_("<b>%s:</b> %s"), alias, msg_escaped);
+       body = g_strdup_printf (_("<b>%s:</b> %s"), alias, msg->str);
      }
  
-   g_free (msg_escaped);
- 
    gtk_tree_store_append (store, &iter, &parent);
    gtk_tree_store_set (store, &iter,
        COL_EVENTS_TS, tpl_event_get_timestamp (event),

diff --combined src/empathy-debug-window.c
index 6cc60098f97dbbb03a651059eff54017244f4b7f,37640f6c80b8bf372ea0195607649fe9b825cef7..5aaf75ff75c6e6834e070c4150f659b258c74d77
--- 1/src/empathy-debug-window.c
--- 2/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@@ -20,17 -20,18 +20,17 @@@
  */
  
  #include "config.h"
 +#include "empathy-debug-window.h"
  
  #include <glib/gi18n.h>
  #include <libsoup/soup.h>
  
 -#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 -#include <libempathy/empathy-debug.h>
 -#include <libempathy/empathy-utils.h>
 -
 -#include <libempathy-gtk/empathy-geometry.h>
 -#include <libempathy-gtk/empathy-ui-utils.h>
 +#include "empathy-geometry.h"
 +#include "empathy-ui-utils.h"
 +#include "empathy-utils.h"
  
 -#include "empathy-debug-window.h"
 +#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 +#include "empathy-debug.h"
  
  G_DEFINE_TYPE (EmpathyDebugWindow, empathy_debug_window,
      GTK_TYPE_WINDOW)
@@@ -2045,7 -2046,7 +2045,7 @@@ am_prepared_cb (GObject *am
        G_CALLBACK (debug_window_button_press_event_cb), object);
  
    renderer = gtk_cell_renderer_text_new ();
-   g_object_set (renderer, "yalign", 0, NULL);
+   g_object_set (renderer, "yalign", (gfloat) 0, NULL);
  
    gtk_tree_view_insert_column_with_data_func (GTK_TREE_VIEW (self->priv->view),
        -1, _("Time"), renderer,

diff --combined src/empathy-new-chatroom-dialog.c
index f0b6ec64132cd5537437d8a200fc3ce0f97d7d4b,58cc3fde5ed00acf647285a57ecc6be946686b73..6ff365ce91ef0f3400d9b027bde7113c88104930
--- 1/src/empathy-new-chatroom-dialog.c
--- 2/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@@ -22,18 -22,20 +22,18 @@@
   */
  
  #include "config.h"
 +#include "empathy-new-chatroom-dialog.h"
  
  #include <glib/gi18n.h>
  
 -#include <libempathy/empathy-utils.h>
 -#include <libempathy/empathy-request-util.h>
 -#include <libempathy/empathy-gsettings.h>
 -
 -#include <libempathy-gtk/empathy-account-chooser.h>
 -#include <libempathy-gtk/empathy-ui-utils.h>
 -
 -#include "empathy-new-chatroom-dialog.h"
 +#include "empathy-account-chooser.h"
 +#include "empathy-gsettings.h"
 +#include "empathy-request-util.h"
 +#include "empathy-ui-utils.h"
 +#include "empathy-utils.h"
  
  #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 -#include <libempathy/empathy-debug.h>
 +#include "empathy-debug.h"
  
  G_DEFINE_TYPE (EmpathyNewChatroomDialog, empathy_new_chatroom_dialog,
      GTK_TYPE_DIALOG)
@@@ -504,12 -506,12 +504,12 @@@ new_room_list_cb (GObject *source
        return;
      }
  
-   g_signal_connect (self->priv->room_list, "got-room",
-       G_CALLBACK (new_chatroom_dialog_got_room_cb), self);
-   g_signal_connect (self->priv->room_list, "failed",
-       G_CALLBACK (listing_failed_cb), self);
-   g_signal_connect (self->priv->room_list, "notify::listing",
-       G_CALLBACK (new_chatroom_dialog_listing_cb), self);
+   tp_g_signal_connect_object (self->priv->room_list, "got-room",
+       G_CALLBACK (new_chatroom_dialog_got_room_cb), self, 0);
+   tp_g_signal_connect_object (self->priv->room_list, "failed",
+       G_CALLBACK (listing_failed_cb), self, 0);
+   tp_g_signal_connect_object (self->priv->room_list, "notify::listing",
+       G_CALLBACK (new_chatroom_dialog_listing_cb), self, 0);
  
    if (gtk_expander_get_expanded (GTK_EXPANDER (self->priv->expander_browse)))
      {