tp-account-widgets: don't include empathy(-ui)-utils.h

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

diff --git a/tp-account-widgets/tpaw-account-settings.c b/tp-account-widgets/tpaw-account-settings.c
index 8820417190962ec76644354b24af66d9921382f0..02abff60d69cff174aed9bc831c41e8718b3aa70 100644 (file)
--- a/tp-account-widgets/tpaw-account-settings.c
+++ b/tp-account-widgets/tpaw-account-settings.c
@@ -23,7 +23,6 @@
 
 #include "tpaw-connection-managers.h"
 #include "tpaw-keyring.h"
-#include "empathy-utils.h"
 #include "tpaw-utils.h"
 
 #define DEBUG_FLAG TPAW_DEBUG_ACCOUNT

diff --git a/tp-account-widgets/tpaw-account-widget-irc.c b/tp-account-widgets/tpaw-account-widget-irc.c
index 6aad97f98f699417e859612284577078118bcad6..b6ef8776d7de4f366e6003cba53707df0af0859d 100644 (file)
--- a/tp-account-widgets/tpaw-account-widget-irc.c
+++ b/tp-account-widgets/tpaw-account-widget-irc.c
@@ -23,7 +23,6 @@
 
 #include "tpaw-account-widget-private.h"
 #include "tpaw-builder.h"
-#include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG TPAW_DEBUG_ACCOUNT | TPAW_DEBUG_IRC
 #include "tpaw-debug.h"

diff --git a/tp-account-widgets/tpaw-account-widget-sip.c b/tp-account-widgets/tpaw-account-widget-sip.c
index 1e48e312cf8065edc6d6bae48cac9527c1c9162d..c3e8fdb32a3ae0a6416e11589a5ad18f553b8ce3 100644 (file)
--- a/tp-account-widgets/tpaw-account-widget-sip.c
+++ b/tp-account-widgets/tpaw-account-widget-sip.c
@@ -26,7 +26,6 @@
 
 #include "tpaw-account-widget-private.h"
 #include "tpaw-builder.h"
-#include "empathy-ui-utils.h"
 
 typedef struct {
   TpawAccountWidget *self;

diff --git a/tp-account-widgets/tpaw-account-widget.c b/tp-account-widgets/tpaw-account-widget.c
index 9080d1129ac33c85de6c6f4457e9001a7de5e61d..f8b82e39f6b286f8fb2f42c914759d1b6e20bc7c 100644 (file)
--- a/tp-account-widgets/tpaw-account-widget.c
+++ b/tp-account-widgets/tpaw-account-widget.c
@@ -34,8 +34,6 @@
 #include "tpaw-account-widget-private.h"
 #include "tpaw-account-widget-sip.h"
 #include "tpaw-builder.h"
-#include "empathy-ui-utils.h"
-#include "empathy-utils.h"
 #include "tpaw-utils.h"
 
 #define DEBUG_FLAG TPAW_DEBUG_ACCOUNT

diff --git a/tp-account-widgets/tpaw-avatar-chooser.c b/tp-account-widgets/tpaw-avatar-chooser.c
index 9b95f42e588e4a67cf7dbf913c5fb8fed2670796..d40666e751d93cb5ed1cf58ef28ac538d77bf046 100644 (file)
--- a/tp-account-widgets/tpaw-avatar-chooser.c
+++ b/tp-account-widgets/tpaw-avatar-chooser.c
@@ -34,9 +34,6 @@
 #include <cheese-avatar-chooser.h>
 #endif /* HAVE_CHEESE */
 
-#include "empathy-ui-utils.h"
-#include "empathy-utils.h"
-
 #define DEBUG_FLAG TPAW_DEBUG_OTHER
 #include "tpaw-debug.h"
 

diff --git a/tp-account-widgets/tpaw-connection-managers.c b/tp-account-widgets/tpaw-connection-managers.c
index 33f29f3d1ca186f6f4d8998f285e176896c720be..d7cd8b69f4b1a38ba35214fb9d1387fda3506227 100644 (file)
--- a/tp-account-widgets/tpaw-connection-managers.c
+++ b/tp-account-widgets/tpaw-connection-managers.c
@@ -21,7 +21,6 @@
 #include "config.h"
 #include "tpaw-connection-managers.h"
 
-#include "empathy-utils.h"
 #include "tpaw-utils.h"
 
 #define DEBUG_FLAG TPAW_DEBUG_OTHER

diff --git a/tp-account-widgets/tpaw-irc-network-chooser-dialog.c b/tp-account-widgets/tpaw-irc-network-chooser-dialog.c
index 9362ec3c07cb37376629cd4922a5d2b7023c8f82..80d76a747adb87be8f7c721280bc16101f561177 100644 (file)
--- a/tp-account-widgets/tpaw-irc-network-chooser-dialog.c
+++ b/tp-account-widgets/tpaw-irc-network-chooser-dialog.c
@@ -28,7 +28,6 @@
 #include "tpaw-irc-network-manager.h"
 #include "tpaw-live-search.h"
 #include "tpaw-utils.h"
-#include "empathy-utils.h"
 
 #define DEBUG_FLAG TPAW_DEBUG_ACCOUNT | TPAW_DEBUG_IRC
 #include "tpaw-debug.h"

diff --git a/tp-account-widgets/tpaw-irc-network-chooser.c b/tp-account-widgets/tpaw-irc-network-chooser.c
index 88f37c5515d6de6e7f64e0ba25d76427d5627f41..977f0ac3e8fb07018ca0bae4c0f96037868c7d77 100644 (file)
--- a/tp-account-widgets/tpaw-irc-network-chooser.c
+++ b/tp-account-widgets/tpaw-irc-network-chooser.c
@@ -25,8 +25,6 @@
 #include "tpaw-irc-network-chooser-dialog.h"
 #include "tpaw-irc-network-manager.h"
 #include "tpaw-utils.h"
-#include "empathy-ui-utils.h"
-#include "empathy-utils.h"
 
 #define DEBUG_FLAG TPAW_DEBUG_ACCOUNT | TPAW_DEBUG_IRC
 #include "tpaw-debug.h"

diff --git a/tp-account-widgets/tpaw-irc-network-dialog.c b/tp-account-widgets/tpaw-irc-network-dialog.c
index e077f56f8f55c1c3f86337ba058dbfc4a56f9035..3a83d947d381b5e585f7f1e66448cae0fd8a083e 100644 (file)
--- a/tp-account-widgets/tpaw-irc-network-dialog.c
+++ b/tp-account-widgets/tpaw-irc-network-dialog.c
@@ -24,7 +24,6 @@
 #include <glib/gi18n-lib.h>
 #include <stdlib.h>
 
-#include "empathy-ui-utils.h"
 #include "tpaw-builder.h"
 #include "tpaw-utils.h"
 #include "totem-subtitle-encoding.h"

diff --git a/tp-account-widgets/tpaw-irc-network-manager.c b/tp-account-widgets/tpaw-irc-network-manager.c
index a2c653667f7df9355aa1fb8713699bc75de8d1a9..8d074509b3dd3a0be78cae3beda93685acadca08 100644 (file)
--- a/tp-account-widgets/tpaw-irc-network-manager.c
+++ b/tp-account-widgets/tpaw-irc-network-manager.c
@@ -23,7 +23,6 @@
 
 #include <sys/stat.h>
 
-#include "empathy-utils.h"
 #include "tpaw-utils.h"
 
 #define DEBUG_FLAG TPAW_DEBUG_IRC

diff --git a/tp-account-widgets/tpaw-irc-network.c b/tp-account-widgets/tpaw-irc-network.c
index 1aa63309fb972c7df7f51546e9d49bf1e501b37c..f7355f3691c769f41937bf7dc85965371d77ca63 100644 (file)
--- a/tp-account-widgets/tpaw-irc-network.c
+++ b/tp-account-widgets/tpaw-irc-network.c
@@ -21,7 +21,6 @@
 #include "config.h"
 #include "tpaw-irc-network.h"
 
-#include "empathy-utils.h"
 #include "tpaw-utils.h"
 
 struct _TpawIrcNetworkPriv

diff --git a/tp-account-widgets/tpaw-irc-server.c b/tp-account-widgets/tpaw-irc-server.c
index f459448cbaafed42459b4cc0171126981b9fa390..1bc3b887520c93a2932768b4fee90f031d6af02d 100644 (file)
--- a/tp-account-widgets/tpaw-irc-server.c
+++ b/tp-account-widgets/tpaw-irc-server.c
@@ -21,7 +21,6 @@
 #include "config.h"
 #include "tpaw-irc-server.h"
 
-#include "empathy-utils.h"
 #include "tpaw-utils.h"
 
 struct _TpawIrcServerPriv

diff --git a/tp-account-widgets/tpaw-keyring.c b/tp-account-widgets/tpaw-keyring.c
index 4cebaadd4b113e0891411db9a84c6c1d10ece92a..533b0da7ae811e6a3be3ff03ac13ac75eb156736 100644 (file)
--- a/tp-account-widgets/tpaw-keyring.c
+++ b/tp-account-widgets/tpaw-keyring.c
@@ -32,7 +32,6 @@
 #include "tpaw-uoa-utils.h"
 #endif
 
-#include "empathy-utils.h"
 #include "tpaw-utils.h"
 
 #define DEBUG_FLAG TPAW_DEBUG_OTHER

diff --git a/tp-account-widgets/tpaw-live-search.c b/tp-account-widgets/tpaw-live-search.c
index e86717e504eebe954e4faa6de9bd8d07d2a1a6f8..99d87f2248f054a69657ef97952adc20e083bc58 100644 (file)
--- a/tp-account-widgets/tpaw-live-search.c
+++ b/tp-account-widgets/tpaw-live-search.c
@@ -24,7 +24,6 @@
 #include "config.h"
 #include "tpaw-live-search.h"
 
-#include "empathy-utils.h"
 #include "tpaw-utils.h"
 
 G_DEFINE_TYPE (TpawLiveSearch, tpaw_live_search, GTK_TYPE_HBOX)

diff --git a/tp-account-widgets/tpaw-string-parser.c b/tp-account-widgets/tpaw-string-parser.c
index 93ed79aedca394fe02b6bba1c08b11528d35bbc3..eb70c06d3e52ee00b9b62747776075170af9c163 100644 (file)
--- a/tp-account-widgets/tpaw-string-parser.c
+++ b/tp-account-widgets/tpaw-string-parser.c
@@ -24,8 +24,6 @@
 #include <string.h>
 #include <tp-account-widgets/tpaw-utils.h>
 
-#include "empathy-ui-utils.h"
-
 #define SCHEMES           "([a-zA-Z\\+]+)"
 #define INVALID_CHARS     "\\s\"<>"
 #define INVALID_CHARS_EXT INVALID_CHARS "\\[\\](){},;:"

diff --git a/tp-account-widgets/tpaw-user-info.c b/tp-account-widgets/tpaw-user-info.c
index 2cc63411833780b47f9cee19a90487d3c2f7ee03..76b2f1d1f99e03b2e5241c75bde299034149eeff 100644 (file)
--- a/tp-account-widgets/tpaw-user-info.c
+++ b/tp-account-widgets/tpaw-user-info.c
@@ -27,8 +27,6 @@
 #include <tp-account-widgets/tpaw-time.h>
 #include <tp-account-widgets/tpaw-utils.h>
 
-#include "empathy-utils.h"
-
 #define DEBUG_FLAG TPAW_DEBUG_CONTACT
 #include "tpaw-debug.h"