From 95684ec0c1ec4c598fdc29a3fd366ff5e7e2e1b2 Mon Sep 17 00:00:00 2001
From: Marco Barisione <marco.barisione@collabora.co.uk>
Date: Fri, 10 May 2013 18:04:54 +0100
Subject: tp-account-widgets: use TpAW's debugging functions instead of
 Empathy's

https://bugzilla.gnome.org/show_bug.cgi?id=699492
---
 tp-account-widgets/cheese-camera-device-monitor.c    | 4 ++--
 tp-account-widgets/tpaw-account-settings.c           | 4 ++--
 tp-account-widgets/tpaw-account-widget-irc.c         | 4 ++--
 tp-account-widgets/tpaw-account-widget.c             | 4 ++--
 tp-account-widgets/tpaw-avatar-chooser.c             | 4 ++--
 tp-account-widgets/tpaw-builder.c                    | 4 ++--
 tp-account-widgets/tpaw-calendar-button.c            | 4 ++--
 tp-account-widgets/tpaw-camera-monitor.c             | 4 ++--
 tp-account-widgets/tpaw-connection-managers.c        | 4 ++--
 tp-account-widgets/tpaw-irc-network-chooser-dialog.c | 4 ++--
 tp-account-widgets/tpaw-irc-network-chooser.c        | 4 ++--
 tp-account-widgets/tpaw-irc-network-manager.c        | 4 ++--
 tp-account-widgets/tpaw-keyring.c                    | 4 ++--
 tp-account-widgets/tpaw-pixbuf-utils.c               | 4 ++--
 tp-account-widgets/tpaw-uoa-utils.c                  | 4 ++--
 tp-account-widgets/tpaw-user-info.c                  | 4 ++--
 tp-account-widgets/tpaw-utils.c                      | 4 ++--
 17 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/tp-account-widgets/cheese-camera-device-monitor.c b/tp-account-widgets/cheese-camera-device-monitor.c
index 84e0fc86c..76b7fd415 100644
--- a/tp-account-widgets/cheese-camera-device-monitor.c
+++ b/tp-account-widgets/cheese-camera-device-monitor.c
@@ -67,8 +67,8 @@ G_DEFINE_TYPE (TpawCameraDeviceMonitor, tpaw_camera_device_monitor, G_TYPE_OBJEC
 
 #define TPAW_CAMERA_DEVICE_MONITOR_ERROR tpaw_camera_device_monitor_error_quark ()
 
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "empathy-debug.h"
+#define DEBUG_FLAG TPAW_DEBUG_OTHER
+#include "tpaw-debug.h"
 
 enum TpawCameraDeviceMonitorError
 {
diff --git a/tp-account-widgets/tpaw-account-settings.c b/tp-account-widgets/tpaw-account-settings.c
index e6b1a1213..fb914397a 100644
--- a/tp-account-widgets/tpaw-account-settings.c
+++ b/tp-account-widgets/tpaw-account-settings.c
@@ -26,8 +26,8 @@
 #include "empathy-utils.h"
 #include "tpaw-utils.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "empathy-debug.h"
+#define DEBUG_FLAG TPAW_DEBUG_ACCOUNT
+#include "tpaw-debug.h"
 
 G_DEFINE_TYPE(TpawAccountSettings, tpaw_account_settings, G_TYPE_OBJECT)
 
diff --git a/tp-account-widgets/tpaw-account-widget-irc.c b/tp-account-widgets/tpaw-account-widget-irc.c
index 970f3a265..6aad97f98 100644
--- a/tp-account-widgets/tpaw-account-widget-irc.c
+++ b/tp-account-widgets/tpaw-account-widget-irc.c
@@ -25,8 +25,8 @@
 #include "tpaw-builder.h"
 #include "empathy-ui-utils.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
-#include "empathy-debug.h"
+#define DEBUG_FLAG TPAW_DEBUG_ACCOUNT | TPAW_DEBUG_IRC
+#include "tpaw-debug.h"
 
 typedef struct {
   TpawAccountWidget *self;
diff --git a/tp-account-widgets/tpaw-account-widget.c b/tp-account-widgets/tpaw-account-widget.c
index 767ab1d91..d5983ffd7 100644
--- a/tp-account-widgets/tpaw-account-widget.c
+++ b/tp-account-widgets/tpaw-account-widget.c
@@ -38,8 +38,8 @@
 #include "empathy-utils.h"
 #include "tpaw-utils.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "empathy-debug.h"
+#define DEBUG_FLAG TPAW_DEBUG_ACCOUNT
+#include "tpaw-debug.h"
 
 G_DEFINE_TYPE (TpawAccountWidget, tpaw_account_widget, GTK_TYPE_BOX)
 
diff --git a/tp-account-widgets/tpaw-avatar-chooser.c b/tp-account-widgets/tpaw-avatar-chooser.c
index 77d4a0b72..9b95f42e5 100644
--- a/tp-account-widgets/tpaw-avatar-chooser.c
+++ b/tp-account-widgets/tpaw-avatar-chooser.c
@@ -37,8 +37,8 @@
 #include "empathy-ui-utils.h"
 #include "empathy-utils.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "empathy-debug.h"
+#define DEBUG_FLAG TPAW_DEBUG_OTHER
+#include "tpaw-debug.h"
 
 /**
  * SECTION:tpaw-avatar-chooser
diff --git a/tp-account-widgets/tpaw-builder.c b/tp-account-widgets/tpaw-builder.c
index fc730981d..98b1dbe19 100644
--- a/tp-account-widgets/tpaw-builder.c
+++ b/tp-account-widgets/tpaw-builder.c
@@ -26,8 +26,8 @@
 #include "config.h"
 #include "tpaw-builder.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "empathy-debug.h"
+#define DEBUG_FLAG TPAW_DEBUG_OTHER
+#include "tpaw-debug.h"
 
 enum _BuilderSource
 {
diff --git a/tp-account-widgets/tpaw-calendar-button.c b/tp-account-widgets/tpaw-calendar-button.c
index 5d5257854..8ec703dc6 100644
--- a/tp-account-widgets/tpaw-calendar-button.c
+++ b/tp-account-widgets/tpaw-calendar-button.c
@@ -22,8 +22,8 @@
 
 #include <glib/gi18n-lib.h>
 
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER_THING
-#include "empathy-debug.h"
+#define DEBUG_FLAG TPAW_DEBUG_OTHER_THING
+#include "tpaw-debug.h"
 
 G_DEFINE_TYPE (TpawCalendarButton, tpaw_calendar_button, GTK_TYPE_BOX)
 
diff --git a/tp-account-widgets/tpaw-camera-monitor.c b/tp-account-widgets/tpaw-camera-monitor.c
index fac91d0e7..4c918d7a0 100644
--- a/tp-account-widgets/tpaw-camera-monitor.c
+++ b/tp-account-widgets/tpaw-camera-monitor.c
@@ -23,8 +23,8 @@
 
 #include <tp-account-widgets/cheese-camera-device-monitor.h>
 
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "empathy-debug.h"
+#define DEBUG_FLAG TPAW_DEBUG_OTHER
+#include "tpaw-debug.h"
 
 struct _TpawCameraMonitorPrivate
 {
diff --git a/tp-account-widgets/tpaw-connection-managers.c b/tp-account-widgets/tpaw-connection-managers.c
index fc0064796..33f29f3d1 100644
--- a/tp-account-widgets/tpaw-connection-managers.c
+++ b/tp-account-widgets/tpaw-connection-managers.c
@@ -24,8 +24,8 @@
 #include "empathy-utils.h"
 #include "tpaw-utils.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "empathy-debug.h"
+#define DEBUG_FLAG TPAW_DEBUG_OTHER
+#include "tpaw-debug.h"
 
 static GObject *managers = NULL;
 
diff --git a/tp-account-widgets/tpaw-irc-network-chooser-dialog.c b/tp-account-widgets/tpaw-irc-network-chooser-dialog.c
index d962dfb2f..9362ec3c0 100644
--- a/tp-account-widgets/tpaw-irc-network-chooser-dialog.c
+++ b/tp-account-widgets/tpaw-irc-network-chooser-dialog.c
@@ -30,8 +30,8 @@
 #include "tpaw-utils.h"
 #include "empathy-utils.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
-#include "empathy-debug.h"
+#define DEBUG_FLAG TPAW_DEBUG_ACCOUNT | TPAW_DEBUG_IRC
+#include "tpaw-debug.h"
 
 #include "tpaw-irc-network-chooser-dialog.h"
 
diff --git a/tp-account-widgets/tpaw-irc-network-chooser.c b/tp-account-widgets/tpaw-irc-network-chooser.c
index 7181653ae..88f37c551 100644
--- a/tp-account-widgets/tpaw-irc-network-chooser.c
+++ b/tp-account-widgets/tpaw-irc-network-chooser.c
@@ -28,8 +28,8 @@
 #include "empathy-ui-utils.h"
 #include "empathy-utils.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
-#include "empathy-debug.h"
+#define DEBUG_FLAG TPAW_DEBUG_ACCOUNT | TPAW_DEBUG_IRC
+#include "tpaw-debug.h"
 
 #define DEFAULT_IRC_NETWORK "irc.gimp.org"
 #define DEFAULT_IRC_PORT 6667
diff --git a/tp-account-widgets/tpaw-irc-network-manager.c b/tp-account-widgets/tpaw-irc-network-manager.c
index e7f873844..0b72577db 100644
--- a/tp-account-widgets/tpaw-irc-network-manager.c
+++ b/tp-account-widgets/tpaw-irc-network-manager.c
@@ -26,8 +26,8 @@
 #include "empathy-utils.h"
 #include "tpaw-utils.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_IRC
-#include "empathy-debug.h"
+#define DEBUG_FLAG TPAW_DEBUG_IRC
+#include "tpaw-debug.h"
 
 #define IRC_NETWORKS_DTD_RESOURCENAME "/org/gnome/AccountWidgets/tpaw-irc-networks.dtd"
 #define IRC_NETWORKS_FILENAME "irc-networks.xml"
diff --git a/tp-account-widgets/tpaw-keyring.c b/tp-account-widgets/tpaw-keyring.c
index 0de6f8b5d..4cebaadd4 100644
--- a/tp-account-widgets/tpaw-keyring.c
+++ b/tp-account-widgets/tpaw-keyring.c
@@ -35,8 +35,8 @@
 #include "empathy-utils.h"
 #include "tpaw-utils.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "empathy-debug.h"
+#define DEBUG_FLAG TPAW_DEBUG_OTHER
+#include "tpaw-debug.h"
 
 /* We cannot change the schema name for compatibility, so it's still
  * referring to Empathy */
diff --git a/tp-account-widgets/tpaw-pixbuf-utils.c b/tp-account-widgets/tpaw-pixbuf-utils.c
index 1b226e92d..1d73f53c4 100644
--- a/tp-account-widgets/tpaw-pixbuf-utils.c
+++ b/tp-account-widgets/tpaw-pixbuf-utils.c
@@ -28,8 +28,8 @@
 
 #include <gdk/gdkx.h>
 
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "empathy-debug.h"
+#define DEBUG_FLAG TPAW_DEBUG_OTHER
+#include "tpaw-debug.h"
 
 GdkPixbuf *
 tpaw_pixbuf_from_data (gchar *data,
diff --git a/tp-account-widgets/tpaw-uoa-utils.c b/tp-account-widgets/tpaw-uoa-utils.c
index 6eb43fe1f..46c627ab2 100644
--- a/tp-account-widgets/tpaw-uoa-utils.c
+++ b/tp-account-widgets/tpaw-uoa-utils.c
@@ -21,8 +21,8 @@
 #include "config.h"
 #include "tpaw-uoa-utils.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "empathy-debug.h"
+#define DEBUG_FLAG TPAW_DEBUG_ACCOUNT
+#include "tpaw-debug.h"
 
 static AgManager *singleton = NULL;
 
diff --git a/tp-account-widgets/tpaw-user-info.c b/tp-account-widgets/tpaw-user-info.c
index 5dddd88a0..2cc634118 100644
--- a/tp-account-widgets/tpaw-user-info.c
+++ b/tp-account-widgets/tpaw-user-info.c
@@ -29,8 +29,8 @@
 
 #include "empathy-utils.h"
 
-#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
-#include "empathy-debug.h"
+#define DEBUG_FLAG TPAW_DEBUG_CONTACT
+#include "tpaw-debug.h"
 
 G_DEFINE_TYPE (TpawUserInfo, tpaw_user_info, GTK_TYPE_GRID)
 
diff --git a/tp-account-widgets/tpaw-utils.c b/tp-account-widgets/tpaw-utils.c
index 6ee9cbed1..70f40868e 100644
--- a/tp-account-widgets/tpaw-utils.c
+++ b/tp-account-widgets/tpaw-utils.c
@@ -35,8 +35,8 @@
 #include <glib/gi18n-lib.h>
 #include <gdk/gdkx.h>
 
-#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "empathy-debug.h"
+#define DEBUG_FLAG TPAW_DEBUG_OTHER
+#include "tpaw-debug.h"
 
 #define TPAW_RECT_IS_ON_SCREEN(x,y,w,h) ((x) + (w) > 0 && \
               (y) + (h) > 0 && \
-- 
cgit v1.2.3