tp-account-widgets: use TpAW's debugging functions instead of Empathy's

https://bugzilla.gnome.org/show_bug.cgi?id=699492

diff --git a/tp-account-widgets/cheese-camera-device-monitor.c b/tp-account-widgets/cheese-camera-device-monitor.c
index 84e0fc86c5bbda112f70141f5b5acfa0d865f300..76b7fd415dfa0ea2d325a561c0a19488a6435ec6 100644 (file)
--- 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 e6b1a1213628687b8b8b88e86138fff5b6a79a25..fb914397a71f1985c44b3b2805acd655d2ab5a5d 100644 (file)
--- 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 970f3a265ee9495072e7290fc272ae9d29f43368..6aad97f98f699417e859612284577078118bcad6 100644 (file)
--- 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 767ab1d91e05455f00cac753440b5f155ebc8570..d5983ffd790908e2258a869db687cac558913fe7 100644 (file)
--- 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 77d4a0b72b8576f440234991c6d172052f564b8e..9b95f42e588e4a67cf7dbf913c5fb8fed2670796 100644 (file)
--- 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 fc730981df151fcd54793e342053515bf2ee6f45..98b1dbe195cb5a82b5b23c33095cd26646837aab 100644 (file)
--- 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 5d52578541c7b9ac652d4aad70348de55cca306f..8ec703dc67efb1f4e4c6b83c8e23c54a57ce0319 100644 (file)
--- 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 fac91d0e7fe77a48cb3150890c26e572656401fa..4c918d7a04e1984f5ae7fe9c539ac22edbc51841 100644 (file)
--- 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 fc00647969bc05120a7cf514eb55dccfcc30e4ba..33f29f3d1ca186f6f4d8998f285e176896c720be 100644 (file)
--- 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 d962dfb2f8af7b33be25acf8c76e207e183ac3dc..9362ec3c07cb37376629cd4922a5d2b7023c8f82 100644 (file)
--- 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 7181653ae3cea9cc0b4a4df5674e7710eda4b338..88f37c5515d6de6e7f64e0ba25d76427d5627f41 100644 (file)
--- 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 e7f873844b6d3a0886ea7662dc263d5f5a60c5b8..0b72577dba5da417cfa6b30eaeaecb436d67f0c1 100644 (file)
--- 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 0de6f8b5d85d5c523d80ff2477b3a57879434aec..4cebaadd4b113e0891411db9a84c6c1d10ece92a 100644 (file)
--- 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 1b226e92dcf751ca16b4fdec524696371f22528c..1d73f53c44b7b0e007351b05fbafe0a80da795c3 100644 (file)
--- 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 6eb43fe1f222d49c98b213f7199d23a6cc013a47..46c627ab2aecd5a3e6b9c865cd9ad9c1b78de863 100644 (file)
--- 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 5dddd88a0550ec0b0d1e1d21677c55d534d72f96..2cc63411833780b47f9cee19a90487d3c2f7ee03 100644 (file)
--- 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 6ee9cbed1cb038acb086e821b866c8c842a40d0e..70f40868e3f768f096addebe228776e8638d8898 100644 (file)
--- 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 && \