Merge remote-tracking branch 'origin/gnome-3-8'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 17 Jun 2013 09:58:28 +0000 (11:58 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 17 Jun 2013 09:58:28 +0000 (11:58 +0200)
1  2 
src/empathy-debug-window.c

index 5aaf75ff75c6e6834e070c4150f659b258c74d77,0a1d7f78657de3c751cdb69912e52b9a08021e59..4522c6a02f017ed468343a2892f7b28b6f1e4932
  */
  
  #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);