From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 17 Jun 2013 09:58:28 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/gnome-3-8'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=b7c6186d4b17e1ee7064de7b3c5255988304bc33;hp=-c

Merge remote-tracking branch 'origin/gnome-3-8'
---

b7c6186d4b17e1ee7064de7b3c5255988304bc33
diff --combined src/empathy-debug-window.c
index 5aaf75ff,0a1d7f78..4522c6a0
--- a/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)
@@@ -409,6 -410,7 +409,7 @@@ debug_window_get_messages_cb (GObject *
            COL_PROXY, debug,
            -1);
      }
+   g_ptr_array_unref (messages);
  
    g_free (proxy_service_name);