From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 9 Sep 2013 14:24:21 +0000 (+0200)
Subject: Merge branch 'gnome-3-8'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=d121d6a9b9d4d3a654dfd2b0e900be216f161dba;hp=-c

Merge branch 'gnome-3-8'

Conflicts:
	NEWS
	configure.ac
---

d121d6a9b9d4d3a654dfd2b0e900be216f161dba
diff --combined src/empathy-debug-window.c
index 9c9c5c3a,f5115aea..e4f5e21d
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@@ -20,18 -20,18 +20,18 @@@
  */
  
  #include "config.h"
 +#include "empathy-debug-window.h"
  
  #include <glib/gi18n.h>
  #include <libsoup/soup.h>
 +#include <tp-account-widgets/tpaw-utils.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)
@@@ -376,7 -376,7 +376,7 @@@ debug_window_get_messages_cb (GObject *
    messages = tp_debug_client_get_messages_finish (debug, result, &error);
    if (messages == NULL)
      {
-       DEBUG ("Failed to get debug messsages: %s", error->message);
+       DEBUG ("Failed to get debug messages: %s", error->message);
        g_error_free (error);
  
        /* We want to set the window sensitivity to false only when proxy for the
@@@ -1006,7 -1006,7 +1006,7 @@@ debug_window_name_owner_changed_cb (TpD
        return;
      }
  
 -  if (EMP_STR_EMPTY (arg1) && !EMP_STR_EMPTY (arg2))
 +  if (TPAW_STR_EMPTY (arg1) && !TPAW_STR_EMPTY (arg2))
      {
        GtkTreeIter *found_at_iter = NULL;
        gchar *display_name;
@@@ -1086,7 -1086,7 +1086,7 @@@
  
        g_free (display_name);
      }
 -  else if (!EMP_STR_EMPTY (arg1) && EMP_STR_EMPTY (arg2))
 +  else if (!TPAW_STR_EMPTY (arg1) && TPAW_STR_EMPTY (arg2))
      {
        /* A service died */
        GtkTreeIter *iter = NULL;
@@@ -1298,7 -1298,7 +1298,7 @@@ debug_window_menu_copy_activate_cb (Gtk
  
    message = tp_debug_message_get_message (msg);
  
 -  if (EMP_STR_EMPTY (message))
 +  if (TPAW_STR_EMPTY (message))
      {
        DEBUG ("Log message is empty");
        return;