include telepathy-glib.h

tp-glib 1.0 will enforce to only include telepathy-glib.h so best doing it to
reduce the delta with the future stable branch.

diff --git a/extensions/extensions.h b/extensions/extensions.h
index d97dc830cff35e84832467112f741fe9d03ebe95..2dbd79cc637675c5485785f66ab34829e01635c5 100644 (file)
--- a/extensions/extensions.h
+++ b/extensions/extensions.h
@@ -2,7 +2,7 @@
 #define __EMP_EXTENSIONS_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "extensions/_gen/enums.h"
 #include "extensions/_gen/cli-misc.h"

diff --git a/goa-mc-plugin/mcp-account-manager-goa.c b/goa-mc-plugin/mcp-account-manager-goa.c
index 95728516856034fd3b1cd964987b2f0856291e35..4b64e546d988dd54c2b8418349f8edfdff85adea 100644 (file)
--- a/goa-mc-plugin/mcp-account-manager-goa.c
+++ b/goa-mc-plugin/mcp-account-manager-goa.c
@@ -25,7 +25,7 @@
 
 #include "config.h"
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */
 #include <goa/goa.h>

diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index 6e7ec29402aa7517623a4a8d03ed33ef718f4c16..e5827dc560b2b85fb45dc39025bb99925f975c45 100644 (file)
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -28,9 +28,6 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
-
 #include <libempathy/empathy-utils.h>
 
 #include "empathy-ui-utils.h"

diff --git a/libempathy-gtk/empathy-account-widget-sip.c b/libempathy-gtk/empathy-account-widget-sip.c
index 8aa4e89d1fa0aa3fedd811e69436614530d2b520..9599ce152fdc3cb9c66fe00d1472db21ed64d518 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-sip.c
+++ b/libempathy-gtk/empathy-account-widget-sip.c
@@ -28,7 +28,7 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <libempathy/empathy-utils.h>
 
 #include "empathy-account-widget.h"

diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 17ab236ea4a0cc083c64977e9448c105e86482e4..2a98120ec2e4e91ec13676fb1540a1ec7cd8504a 100644 (file)
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -35,10 +35,7 @@
 
 #include <libempathy/empathy-utils.h>
 
-#include <telepathy-glib/account.h>
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/connection-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <dbus/dbus-protocol.h>
 
 #include "empathy-account-widget.h"

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 917f4c02e4c77aac922150fe29dac0adb5847312..9a12d1f0968e6e218f274061d3e45b291118ae69 100644 (file)
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -36,8 +36,7 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-logger/telepathy-logger.h>
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-keyring.h>

diff --git a/libempathy-gtk/empathy-contact-chooser.h b/libempathy-gtk/empathy-contact-chooser.h
index 66c8fbe4e1107f36bf8d0e41be6e96954408baa7..20a9b8c44eb0ea4ec8d5f0b394f89a7acb714a53 100644 (file)
--- a/libempathy-gtk/empathy-contact-chooser.h
+++ b/libempathy-gtk/empathy-contact-chooser.h
@@ -14,7 +14,7 @@
 
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "libempathy/empathy-tp-chat.h"
 

diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 2b770ca170a042676fa4655daa97611b5fcfc6f9..421cb9133096f8152859c14f071ef4e708e77a1c 100644 (file)
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -27,9 +27,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/account.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-time.h>
 #include <libempathy/empathy-utils.h>

diff --git a/libempathy-gtk/empathy-contactinfo-utils.c b/libempathy-gtk/empathy-contactinfo-utils.c
index 67186d2a9a3c720c33c99327f3c34fbe55f0bdf0..5e4fad7877c07121a3a8c4e36834574766cc24e7 100644 (file)
--- a/libempathy-gtk/empathy-contactinfo-utils.c
+++ b/libempathy-gtk/empathy-contactinfo-utils.c
@@ -27,8 +27,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/util.h>
-
 #include <libempathy/empathy-time.h>
 #include <libempathy/empathy-request-util.h>
 

diff --git a/libempathy-gtk/empathy-contactinfo-utils.h b/libempathy-gtk/empathy-contactinfo-utils.h
index b91f419c8f1d03b359cccdab6af4f5e0d1d48253..80c18ffae22e574cc20b86cb68389f9776540ac6 100644 (file)
--- a/libempathy-gtk/empathy-contactinfo-utils.h
+++ b/libempathy-gtk/empathy-contactinfo-utils.h
@@ -24,7 +24,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/connection.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-groups-widget.c b/libempathy-gtk/empathy-groups-widget.c
index 7d231d40378a5be47f6e0b8806ac6a016076c2ce..cc3653bbec762a2d121423c6143a40faeff968e2 100644 (file)
--- a/libempathy-gtk/empathy-groups-widget.c
+++ b/libempathy-gtk/empathy-groups-widget.c
@@ -27,7 +27,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <folks/folks.h>
 

diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c
index 2c5dc274ef2b6bd76d6e0490e4d6fc327a684830..e3b653b32254fa7ad1646c4e9ecf8c307e9e15b2 100644 (file)
--- a/libempathy-gtk/empathy-individual-dialogs.c
+++ b/libempathy-gtk/empathy-individual-dialogs.c
@@ -27,7 +27,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
 

diff --git a/libempathy-gtk/empathy-individual-edit-dialog.c b/libempathy-gtk/empathy-individual-edit-dialog.c
index b49e29f8b67cf26ad724d7e9b506ddde6fe8533e..8fba058f8d9c84f6913c8e4924a51e993ee7dc28 100644 (file)
--- a/libempathy-gtk/empathy-individual-edit-dialog.c
+++ b/libempathy-gtk/empathy-individual-edit-dialog.c
@@ -28,7 +28,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <folks/folks.h>
 
 #include <libempathy/empathy-individual-manager.h>

diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c
index 2e8fcb666a5372aa7a8fb057a4e95e769d606644..65dc68af7fe4e981500982714fff66991c6add94 100644 (file)
--- a/libempathy-gtk/empathy-individual-information-dialog.c
+++ b/libempathy-gtk/empathy-individual-information-dialog.c
@@ -30,7 +30,7 @@
 #include <glib/gi18n-lib.h>
 #include <gio/gdesktopappinfo.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
 

diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index e9edf44fad197a20d1642e4b3cc4388a161ec3bf..e59748129ff9084a5585fbdf5dc5d68e4173fce6 100644 (file)
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -27,7 +27,7 @@
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>

diff --git a/libempathy-gtk/empathy-individual-store-channel.c b/libempathy-gtk/empathy-individual-store-channel.c
index e5edb264268f4414d0b9d33cd44061067bf39302..389175ebf16dc7c4c96d6227ffd1b2ffcae32679 100644 (file)
--- a/libempathy-gtk/empathy-individual-store-channel.c
+++ b/libempathy-gtk/empathy-individual-store-channel.c
@@ -33,7 +33,7 @@
 
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-enum-types.h>

diff --git a/libempathy-gtk/empathy-individual-store-manager.c b/libempathy-gtk/empathy-individual-store-manager.c
index f8610cf167f89abc01d986f0aae2578739845d2f..78d3a07e32bd05c1d665701c7aa4394536369f11 100644 (file)
--- a/libempathy-gtk/empathy-individual-store-manager.c
+++ b/libempathy-gtk/empathy-individual-store-manager.c
@@ -33,7 +33,7 @@
 
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-enum-types.h>

diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index 9199af6b94c877f935f0a01bd524838395dbd422..444a6c5fd7ad5e32ce2047a0410469441c84d136 100644 (file)
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -34,7 +34,7 @@
 
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-enum-types.h>

diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index c143ef23209e84c6d7902d4b55fb1c382cda82ec..9cb8b86a96934889b114d91df9f05de125a5469b 100644 (file)
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -32,8 +32,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>

diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 832d944de60bf74f65f6400261462b12b8c2da31..73539745643ddc66f0673100ac9f3e63ba20e310 100644 (file)
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -27,7 +27,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>

diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index 576ced52949ed0114919e48c84307c65d5a4fa2b..7cdf2517d59f702595821b539af3ea9b88ef6193 100644 (file)
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -26,8 +26,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <geoclue/geoclue-master.h>
 

diff --git a/libempathy-gtk/empathy-log-window.h b/libempathy-gtk/empathy-log-window.h
index 4c1244cc94cf0a3711b6fff075aafb9910d01873..f8f76905af9d356db55c358a39f2a13c25398dec 100644 (file)
--- a/libempathy-gtk/empathy-log-window.h
+++ b/libempathy-gtk/empathy-log-window.h
@@ -25,7 +25,7 @@
 #ifndef __EMPATHY_LOG_WINDOW_H__
 #define __EMPATHY_LOG_WINDOW_H__
 
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c
index 079afe476a2df23993f7fca80970f228dda628e4..c8538b5cf9743dcde1726a3340c7e1dbceec5dbd 100644 (file)
--- a/libempathy-gtk/empathy-new-call-dialog.c
+++ b/libempathy-gtk/empathy-new-call-dialog.c
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-camera-monitor.h>
 #include <libempathy/empathy-utils.h>

diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index 14199578f74816cb486f5102066333d93fa172ff..0b707c4f885cbab3c3b32923ccbce5280574d054 100644 (file)
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-request-util.h>
 #include <libempathy/empathy-utils.h>

diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c
index bccc3e21e87ce89df74f91a2215c33d47dc4e8de..2503542829aaaf33b72d00609270f33984ac5eba 100644 (file)
--- a/libempathy-gtk/empathy-notify-manager.c
+++ b/libempathy-gtk/empathy-notify-manager.c
@@ -23,7 +23,7 @@
 #include <libnotify/notification.h>
 #include <libnotify/notify.h>
 
-#include <telepathy-glib/account-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-utils.h>

diff --git a/libempathy-gtk/empathy-plist.c b/libempathy-gtk/empathy-plist.c
index 1bd4d8ecfb41157e67a2ff6554f34d68ece96679..be7b23a4703f1a87120346c26fdf2824e36aa6a7 100644 (file)
--- a/libempathy-gtk/empathy-plist.c
+++ b/libempathy-gtk/empathy-plist.c
@@ -23,8 +23,7 @@
 #include <string.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/dbus.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-plist.h"
 

diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index 1eb4a48a5acc8eea7f60dc1ecd31b5761ebf3977..16b7a54e9f8706d8597ffd81a92c4adf3d3922f7 100644 (file)
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -33,8 +33,7 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-presence-manager.h>
 #include <libempathy/empathy-utils.h>

diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 8c0df8face1642611653930b4169ed4bec7d80a9..2ff35644f125a41604fde072c00ccef0b5da147c 100644 (file)
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -24,8 +24,6 @@
 
 #include <string.h>
 
-#include <telepathy-glib/util.h>
-
 #include <gtk/gtk.h>
 
 #include <glib/gi18n-lib.h>

diff --git a/libempathy-gtk/empathy-protocol-chooser.h b/libempathy-gtk/empathy-protocol-chooser.h
index 5aa0a4c4da6c35002293087a9e7b26f548535a9c..eeaab60c0977f5fdd56b0cc3e7d955d0955744da 100644 (file)
--- a/libempathy-gtk/empathy-protocol-chooser.h
+++ b/libempathy-gtk/empathy-protocol-chooser.h
@@ -26,7 +26,7 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/connection-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-account-settings.h>
 

diff --git a/libempathy-gtk/empathy-roster-contact.c b/libempathy-gtk/empathy-roster-contact.c
index afb6de4faaab52e5b6a9ab46d9482bbb4eeeda7c..e72ae4494fdacddd7d701449b9aa8de8510c1a94 100644 (file)
--- a/libempathy-gtk/empathy-roster-contact.c
+++ b/libempathy-gtk/empathy-roster-contact.c
@@ -2,7 +2,7 @@
 
 #include "empathy-roster-contact.h"
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-utils.h>
 

diff --git a/libempathy-gtk/empathy-share-my-desktop.c b/libempathy-gtk/empathy-share-my-desktop.c
index 8f14fb6b1ae93dc9fd00a2bb622a710954c68d91..0414f7d4bc002d1868fbc04e060e76f91447905c 100644 (file)
--- a/libempathy-gtk/empathy-share-my-desktop.c
+++ b/libempathy-gtk/empathy-share-my-desktop.c
@@ -23,11 +23,7 @@
 #include <gtk/gtk.h>
 
 #include <dbus/dbus-glib.h>
-#include <telepathy-glib/account-channel-request.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/contact.h>
-#include <telepathy-glib/channel.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SHARE_DESKTOP
 #include <libempathy/empathy-debug.h>

diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 2e243c46d7a3d18539ca37b5be48afb7e83a8ae3..37c8698e443bf4201dbdab07cf218c141ef42ebc 100644 (file)
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -24,8 +24,7 @@
 #include <glib/gi18n-lib.h>
 
 #include <webkit/webkit.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <pango/pango.h>
 #include <gdk/gdk.h>

diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index 7d21b79600658910b3be239a7677701afef809e9..fd58ac49d095bc00dbce7fd5ca6b82dffef765ff 100644 (file)
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -25,10 +25,9 @@
 #include <string.h>
 
 #include <glib/gi18n-lib.h>
-#include <telepathy-glib/dbus.h>
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-utils.h>

diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c
index bf36e9acff57e958d2dd836a741c6dfb4d7cfbd0..34af2f034b0d5eacf018ac0278ac549f9021cf14 100644 (file)
--- a/libempathy-gtk/empathy-tls-dialog.c
+++ b/libempathy-gtk/empathy-tls-dialog.c
@@ -24,7 +24,7 @@
 
 #include <glib/gi18n-lib.h>
 #include <gcr/gcr.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <gcr/gcr.h>
 

diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 967d59cda325f5259b3100037d07f9b44f84435e..97ba5281c0a39991494f9062eec511acb3d62ff8 100644 (file)
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -39,7 +39,7 @@
 #include <gio/gio.h>
 #include <gio/gdesktopappinfo.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <folks/folks.h>
 
 #include "empathy-ui-utils.h"

diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 9c25faf015547a70abf1e05c067a8008a5c78132..8731479be89302c3cfe602e4ca8589d1df6c6f11 100644 (file)
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -23,11 +23,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/gtypes.h>
-
 #include "empathy-account-settings.h"
 #include "empathy-connection-managers.h"
 #include "empathy-keyring.h"

diff --git a/libempathy/empathy-account-settings.h b/libempathy/empathy-account-settings.h
index c54065258d98121a3ccc3cf47f0fbaa2ec1bfd09..162def48c6a0fe2efbc48727baec1dd09d1c9f20 100644 (file)
--- a/libempathy/empathy-account-settings.h
+++ b/libempathy/empathy-account-settings.h
@@ -24,8 +24,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include <telepathy-glib/account.h>
-#include <telepathy-glib/connection-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 

diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c
index a4bc15a62030e0af0a9e3749862fc1d7b1b16ef9..f20ce8a3a4a7767b833959e6a9c2315d7351d7f9 100644 (file)
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -22,8 +22,6 @@
 
 #include "empathy-auth-factory.h"
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #define DEBUG_FLAG EMPATHY_DEBUG_TLS
 #include "empathy-debug.h"
 #include "empathy-keyring.h"

diff --git a/libempathy/empathy-auth-factory.h b/libempathy/empathy-auth-factory.h
index 5d31b1eddcc6fc499d3c9d121369045bbd9ed04d..16d6ad34f0928e906ef8116d965486931eb21675 100644 (file)
--- a/libempathy/empathy-auth-factory.h
+++ b/libempathy/empathy-auth-factory.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-client.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 

diff --git a/libempathy/empathy-camera-monitor.c b/libempathy/empathy-camera-monitor.c
index 977b1f2c6fda614e5327b73798625d0c7c3a6fa0..74fdb44d783780b82fe043e50f83bbe3dbf45138 100644 (file)
--- a/libempathy/empathy-camera-monitor.c
+++ b/libempathy/empathy-camera-monitor.c
@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-camera-monitor.h"
 #include "cheese-camera-device-monitor.h"

diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
index 9a9a7b25013163e0a066187c4e2c9d2f7c9cbd0e..da3c4e20bc96a055f8231815cdceb2285ae602d8 100644 (file)
--- a/libempathy/empathy-chatroom-manager.c
+++ b/libempathy/empathy-chatroom-manager.c
@@ -30,11 +30,6 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/simple-observer.h>
-#include <telepathy-glib/util.h>
-
 #include "empathy-client-factory.h"
 #include "empathy-tp-chat.h"
 #include "empathy-chatroom-manager.h"

diff --git a/libempathy/empathy-chatroom-manager.h b/libempathy/empathy-chatroom-manager.h
index be33015032a02a47aa598d5487be1217dffc2cec..b8232dc647cff42dcad591acd1fe41b40172923c 100644 (file)
--- a/libempathy/empathy-chatroom-manager.h
+++ b/libempathy/empathy-chatroom-manager.h
@@ -26,7 +26,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-chatroom.h"
 

diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c
index 5238af361e4e606c0bf911c74b675082b22df54b..bfa3280de7b90457590d189f1814b6d520d97b3b 100644 (file)
--- a/libempathy/empathy-chatroom.c
+++ b/libempathy/empathy-chatroom.c
@@ -24,7 +24,6 @@
 #include <string.h>
 
 #include <glib.h>
-#include <telepathy-glib/util.h>
 
 #include "empathy-chatroom.h"
 #include "empathy-utils.h"

diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h
index f86f8ca9e6e685f29849b2d09ee2efb4c279032e..57ca685cb6901bd1a194918bd0f27fbfecd2aff4 100644 (file)
--- a/libempathy/empathy-chatroom.h
+++ b/libempathy/empathy-chatroom.h
@@ -24,7 +24,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-tp-chat.h>
 

diff --git a/libempathy/empathy-connection-aggregator.c b/libempathy/empathy-connection-aggregator.c
index f42e18fd1c8f5b5faed06117d59c204b9d89c6f9..32a3bbb0b9ee1ffaff197c91e96a04c2eec51cd8 100644 (file)
--- a/libempathy/empathy-connection-aggregator.c
+++ b/libempathy/empathy-connection-aggregator.c
@@ -22,8 +22,6 @@
 
 #include "empathy-connection-aggregator.h"
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 #include "empathy-utils.h"

diff --git a/libempathy/empathy-connection-aggregator.h b/libempathy/empathy-connection-aggregator.h
index 5f85193c984cebbd3708a785091888278b5e7f2d..71e6e4392596ded66e99e7453b0f7954ff153225 100644 (file)
--- a/libempathy/empathy-connection-aggregator.h
+++ b/libempathy/empathy-connection-aggregator.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/base-client.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 

diff --git a/libempathy/empathy-connection-managers.c b/libempathy/empathy-connection-managers.c
index 93985f5da572f6c20f230bd58d82d1292c28d7f2..cd95a4b246ed62aface2720b2585e1bcc5d5360e 100644 (file)
--- a/libempathy/empathy-connection-managers.c
+++ b/libempathy/empathy-connection-managers.c
@@ -23,9 +23,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <telepathy-glib/connection-manager.h>
-#include <telepathy-glib/util.h>
-
 #include "empathy-connection-managers.h"
 #include "empathy-utils.h"
 

diff --git a/libempathy/empathy-connection-managers.h b/libempathy/empathy-connection-managers.h
index 14833734c7a9e4a0d155a48fe48dcf30660a713f..d8bcb390a382a2340b6bb8ec1f1c343fa6f12aab 100644 (file)
--- a/libempathy/empathy-connection-managers.h
+++ b/libempathy/empathy-connection-managers.h
@@ -24,7 +24,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include <telepathy-glib/connection-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 

diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 562fba45d8d6f82ecca5cbb63daa35904d2d3579..4fe4289575c7463157c0b4498d9efa8ac1b59af4 100644 (file)
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -25,10 +25,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/util.h>
-
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
 

diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h
index 6b15d5ea3f13bacb441166143f28d511d5efa10c..14c3f64404c875faf11ac25bf3d737bc9d04dbc7 100644 (file)
--- a/libempathy/empathy-contact.h
+++ b/libempathy/empathy-contact.h
@@ -24,8 +24,7 @@
 
 #include <glib-object.h>
 
-#include <telepathy-glib/contact.h>
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-logger/telepathy-logger.h>
 #include <folks/folks.h>
 

diff --git a/libempathy/empathy-debug.c b/libempathy/empathy-debug.c
index 038748ff4317813d230917ff6ac17df79e318238..49ee9371f3e37946789bbdcfecd3da3bc61b9ede 100644 (file)
--- a/libempathy/empathy-debug.c
+++ b/libempathy/empathy-debug.c
@@ -29,9 +29,6 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#include <telepathy-glib/debug.h>
-#include <telepathy-glib/debug-sender.h>
-
 #include "empathy-debug.h"
 
 #ifdef ENABLE_DEBUG

diff --git a/libempathy/empathy-debug.h b/libempathy/empathy-debug.h
index 0869e80b1183073c2b582dd6b01aa4512b49ae69..e6b93cc7af215bfba7bec32d775d144ad72df2a4 100644 (file)
--- a/libempathy/empathy-debug.h
+++ b/libempathy/empathy-debug.h
@@ -25,7 +25,7 @@
 
 
 #include <glib.h>
-#include <telepathy-glib/debug.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 

diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c
index 169020d5e55dd5175bee4c3d7655efa23ea4339d..d9d87e20af1a219e23b54a82963bd493efb65307 100644 (file)
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -25,10 +25,6 @@
 
 #include <glib.h>
 #include <glib/gi18n-lib.h>
-#include <telepathy-glib/account-channel-request.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/interfaces.h>
 
 #include "empathy-ft-handler.h"
 #include "empathy-time.h"

diff --git a/libempathy/empathy-ft-handler.h b/libempathy/empathy-ft-handler.h
index 7111cd25b1d304ec0cd9522e4e9d51bc014682ae..a120f241bb7181dcbedaf0461e89e548df6e30ec 100644 (file)
--- a/libempathy/empathy-ft-handler.h
+++ b/libempathy/empathy-ft-handler.h
@@ -27,7 +27,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include <telepathy-glib/file-transfer-channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-contact.h"
 

diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index 97be8b8a71eaa790515c85cae1608e2c2f61f03f..8d14cdf0d7736d3755639af360a4ceb469f258fc 100644 (file)
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -25,10 +25,6 @@
 #include <string.h>
 
 #include <telepathy-glib/telepathy-glib.h>
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/enums.h>
-#include <telepathy-glib/proxy-subclass.h>
-#include <telepathy-glib/util.h>
 
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>

diff --git a/libempathy/empathy-irc-network.c b/libempathy/empathy-irc-network.c
index ec0cfffb1e0abd8c05b44b40afc8e8e3e94bd26b..66c1f49d448af6815947b0197a71b92231b6dc75 100644 (file)
--- a/libempathy/empathy-irc-network.c
+++ b/libempathy/empathy-irc-network.c
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-irc-network.h"
 #include "empathy-utils.h"

diff --git a/libempathy/empathy-irc-server.c b/libempathy/empathy-irc-server.c
index cb1fbfc2fe13daa36339edb2da3b520e8c708712..f0a13d09ff4f56c73b23d4c2941b56a2ced9c4bc 100644 (file)
--- a/libempathy/empathy-irc-server.c
+++ b/libempathy/empathy-irc-server.c
@@ -24,7 +24,7 @@
 #include <glib.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-irc-server.h"
 #include "empathy-utils.h"

diff --git a/libempathy/empathy-keyring.h b/libempathy/empathy-keyring.h
index 05c460e5d136b561b1514751cac12631f31b625b..7e945dc0269de18af346794290929cf166cbfc53 100644 (file)
--- a/libempathy/empathy-keyring.h
+++ b/libempathy/empathy-keyring.h
@@ -21,7 +21,7 @@
 
 #include <gio/gio.h>
 
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 

diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index 0a8ca408b7bb4de72f207a3368306c2c71d661e2..fe1975119b17596f2947204a40b0ad4c642cfad7 100644 (file)
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -28,10 +28,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/account.h>
-#include <telepathy-glib/account-manager.h>
-
 #include "empathy-client-factory.h"
 #include "empathy-message.h"
 #include "empathy-utils.h"

diff --git a/libempathy/empathy-message.h b/libempathy/empathy-message.h
index c49a2840f0ef0f51b636048208c39679833421e7..fa6e07be15544159ea4b94c08d27b1e544645b16 100644 (file)
--- a/libempathy/empathy-message.h
+++ b/libempathy/empathy-message.h
@@ -26,7 +26,7 @@
 #define __EMPATHY_MESSAGE_H__
 
 #include <glib-object.h>
-#include <telepathy-glib/message.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <telepathy-logger/telepathy-logger.h>
 
 #include "empathy-contact.h"

diff --git a/libempathy/empathy-presence-manager.c b/libempathy/empathy-presence-manager.c
index 29af2a107392c661ce5647e208e5b17a89800f33..25039892886c35b222547d752ea55adb6b35bbd4 100644 (file)
--- a/libempathy/empathy-presence-manager.c
+++ b/libempathy/empathy-presence-manager.c
@@ -27,10 +27,6 @@
 #include <glib/gi18n-lib.h>
 #include <dbus/dbus-glib.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/util.h>
-
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

diff --git a/libempathy/empathy-presence-manager.h b/libempathy/empathy-presence-manager.h
index 63599cbfdafd1c591bd2a3f9e69b6d9fe96b3fed..6357aeecd82319e9a56a55c7a916364e081c0b10 100644 (file)
--- a/libempathy/empathy-presence-manager.h
+++ b/libempathy/empathy-presence-manager.h
@@ -23,8 +23,7 @@
 
 #include <glib.h>
 
-#include <telepathy-glib/account.h>
-#include <telepathy-glib/enums.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 

diff --git a/libempathy/empathy-request-util.c b/libempathy/empathy-request-util.c
index 6b53dab9a7583329f5eb789f446d42130c2e61b1..196925b54be4d6502424619f98259fa5a4c5fe48 100644 (file)
--- a/libempathy/empathy-request-util.c
+++ b/libempathy/empathy-request-util.c
@@ -25,8 +25,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #include "empathy-request-util.h"
 #include "empathy-utils.h"
 #include "empathy-utils.h"

diff --git a/libempathy/empathy-request-util.h b/libempathy/empathy-request-util.h
index cdecc631d49fea9156d8fdea932be16cc7bc5b1c..497c65ee5b02d365972a225cfaff9466b695c5fc 100644 (file)
--- a/libempathy/empathy-request-util.h
+++ b/libempathy/empathy-request-util.h
@@ -24,7 +24,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
-#include <telepathy-glib/channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-contact.h"
 

diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index aa0760d63434084e125ef6464a183a7dbc87b6bc..06f7a9e6822eedd7dfa7b1ce3aead558ca570478 100644 (file)
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -21,8 +21,6 @@
 
 #include "empathy-server-sasl-handler.h"
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #include <extensions/extensions.h>
 
 #include <string.h>

diff --git a/libempathy/empathy-server-sasl-handler.h b/libempathy/empathy-server-sasl-handler.h
index 94be69b10f2da9fd0cc5e9696d00e8f8ea0565b6..d25d90ab788a7e39486c385e7564c3d02049f317 100644 (file)
--- a/libempathy/empathy-server-sasl-handler.h
+++ b/libempathy/empathy-server-sasl-handler.h
@@ -23,8 +23,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include <telepathy-glib/account.h>
-#include <telepathy-glib/channel.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 

diff --git a/libempathy/empathy-status-presets.c b/libempathy/empathy-status-presets.c
index 319ca53d9073770af24834f231b7f4f4b79e9f67..940253343c51dde5af430738c329bead1c1cb055 100644 (file)
--- a/libempathy/empathy-status-presets.c
+++ b/libempathy/empathy-status-presets.c
@@ -32,8 +32,6 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-#include <telepathy-glib/util.h>
-
 #include "empathy-utils.h"
 #include "empathy-status-presets.h"
 

diff --git a/libempathy/empathy-status-presets.h b/libempathy/empathy-status-presets.h
index 331c630d50c9b21fad0ee54bf2e2a87290b92d59..5e490221f645badccf03ce6140943f3124b46e66 100644 (file)
--- a/libempathy/empathy-status-presets.h
+++ b/libempathy/empathy-status-presets.h
@@ -23,7 +23,7 @@
 #ifndef __EMPATHY_STATUS_PRESETS_H__
 #define __EMPATHY_STATUS_PRESETS_H__
 
-#include <telepathy-glib/enums.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 

diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index d6a0e13c9837502fa57f4ccb06cf47be7cabed37..39ed8e2ab82fa4ea63db96498bba3122fb5acac0 100644 (file)
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -22,8 +22,6 @@
 
 #include <string.h>
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #include <extensions/extensions.h>
 
 #include "empathy-tp-chat.h"

diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h
index 66fb96d7adc565b3149c4789e5a94756ea309d05..d8d4ac31dea483c1ad2be7e4ee72772bf1b50be1 100644 (file)
--- a/libempathy/empathy-tp-chat.h
+++ b/libempathy/empathy-tp-chat.h
@@ -23,8 +23,7 @@
 
 #include <glib.h>
 
-#include <telepathy-glib/channel.h>
-#include <telepathy-glib/enums.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-message.h"
 #include "empathy-contact.h"

diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index eb1e27f4cc2d3ff841ad51317a546c9a50ec3a01..e33bf3af4e744715f10532f09e6f50009f8c4a03 100644 (file)
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -42,12 +42,6 @@
 
 #include <dbus/dbus-protocol.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/connection.h>
-#include <telepathy-glib/channel.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/util.h>
-
 #include "empathy-client-factory.h"
 #include "empathy-utils.h"
 #include "empathy-individual-manager.h"

diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index c3a5886a3923a2e504d902dd4cc14ffb59c6538c..a310d2b0213a5354b65401aa3044ee7016c2907b 100644 (file)
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -34,7 +34,7 @@
 #include <libxml/tree.h>
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
-#include <telepathy-glib/account-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-contact.h"
 

diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
index 56c55f57af72fe86c1f01ffdf14b555a39278e96..8b1bafb781e140e52ae0a98d3c71d120942f981f 100644 (file)
--- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c
+++ b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
@@ -27,7 +27,7 @@
 #include <gtk/gtk.h>
 #include <gio/gio.h>
 
-#include <telepathy-glib/enums.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-contact.h>
 #include <libempathy/empathy-debug.h>

diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index d975c55b0504807b4a1a53eaee3e1a3bc402dfe5..346803c214da325f7652176c5edc31c5e1126782 100644 (file)
--- a/src/empathy-accounts-common.c
+++ b/src/empathy-accounts-common.c
@@ -32,8 +32,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-connection-managers.h>

diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index f865e8743b91680a932edf155644f32798f3f123..6275e6a8ae2305c25a948ed4b9573dc680cfe866 100644 (file)
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -34,9 +34,7 @@
 #include <dbus/dbus-glib.h>
 #include <gio/gdesktopappinfo.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/defs.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-connection-managers.h>

diff --git a/src/empathy-accounts-dialog.h b/src/empathy-accounts-dialog.h
index 5fe6f51f74380f839e4d9abf9b5b93f0514131f1..d436fed045b70eec219a3fb3b01c3427b91a40ab 100644 (file)
--- a/src/empathy-accounts-dialog.h
+++ b/src/empathy-accounts-dialog.h
@@ -26,7 +26,7 @@
 
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index aa0e5b67b8edac25e85a0a50e0bc5f99d56abd3e..e3bf938a473f77252cb31274d7afeb54f0b9adc8 100644 (file)
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -36,9 +36,7 @@
 #include <cheese-gtk.h>
 #endif
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/defs.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-connection-managers.h>

diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c
index d1f905c4f734400a1175f412d19f47df1cd8c742..578e63f6e136ad4d981ef3be12919a68d37b4400 100644 (file)
--- a/src/empathy-auth-client.c
+++ b/src/empathy-auth-client.c
@@ -26,7 +26,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/debug-sender.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TLS
 #include <libempathy/empathy-debug.h>

diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index 9401ae71b01f7ae2a4467891d449bcfe8602d68e..45469e7b6f82ad9c95dda0e8c260612889b16ad8 100644 (file)
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.c
@@ -23,10 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <telepathy-glib/account-channel-request.h>
-#include <telepathy-glib/simple-handler.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-client-factory.h>
 #include <libempathy/empathy-request-util.h>

diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c
index be0987e95cdefc39648b86677d8538fc6990b822..3b870be07659d512d71c121467fb852f76471be1 100644 (file)
--- a/src/empathy-call-handler.c
+++ b/src/empathy-call-handler.c
@@ -23,9 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <telepathy-glib/account-channel-request.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <telepathy-farstream/telepathy-farstream.h>
 

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 5a3b0d88a5b3498b2ab1b4d7d8f3cc1e2238aca3..db7605bfe358f28f5f365f9f3d8adfdefcaad7ca 100644 (file)
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -34,9 +34,8 @@
 #include <clutter-gtk/clutter-gtk.h>
 #include <clutter-gst/clutter-gst.h>
 
-#include <telepathy-glib/util.h>
 #include <telepathy-farstream/telepathy-farstream.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <farstream/fs-element-added-notifier.h>
 #include <farstream/fs-utils.h>

diff --git a/src/empathy-call.c b/src/empathy-call.c
index 9d7a2b35545d6c3cd84ef73a1d8b5e980bd08798..5b50f9572998cb3c49387b18db22b6ce6e5034d0 100644 (file)
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -34,8 +34,6 @@
 #include <X11/Xlib.h>
 #endif
 
-#include <telepathy-glib/debug-sender.h>
-
 #include <libempathy/empathy-client-factory.h>
 
 #include <libempathy-gtk/empathy-ui-utils.h>

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 6231b57b30d09f7954d7703135db4ef14cab94ae..f21db0335c92b8cc2b12a47c6e7127fed4d28b7d 100644 (file)
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -35,8 +35,6 @@
 #include <glib/gi18n.h>
 #include <libnotify/notification.h>
 
-#include <telepathy-glib/telepathy-glib.h>
-
 #include <libempathy/empathy-client-factory.h>
 #include <libempathy/empathy-contact.h>
 #include <libempathy/empathy-message.h>

diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h
index 7804bd4b93b2d6b31a251cb2ee71dba3120cd56f..d7ddc2b6be8763a0ef3d23be183d45ffbb3975bf 100644 (file)
--- a/src/empathy-chat-window.h
+++ b/src/empathy-chat-window.h
@@ -30,7 +30,7 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy-gtk/empathy-chat.h>
 

diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index 3094b5137015f3063be880cbd336de163416285e..0f7173a9c02266ac43765923620268e4f194aab9 100644 (file)
--- a/src/empathy-chat.c
+++ b/src/empathy-chat.c
@@ -28,8 +28,6 @@
 
 #include <libnotify/notify.h>
 
-#include <telepathy-glib/debug-sender.h>
-
 #include <libempathy/empathy-presence-manager.h>
 #include <libempathy/empathy-individual-manager.h>
 

diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index 159db0b09b50b3a6f32604217fcb88be8616ac8a..33b12627a3a821b643fe2bf6339494f4680c7897 100644 (file)
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -37,11 +37,7 @@
 #include <libempathy-gtk/empathy-geometry.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/proxy-subclass.h>
-#include <telepathy-glib/account-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "extensions/extensions.h"
 

diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 7e34f4ce6b0851f82d6d128576a3dde135039e15..b0017e6093edd0c44fec17e81c39bc69d6d2adb5 100644 (file)
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -24,10 +24,7 @@
 #include <string.h>
 #include <glib/gi18n.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/simple-approver.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-presence-manager.h>
 #include <libempathy/empathy-connection-aggregator.h>

diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c
index 4e00bd11ad64f4adbd65403f78b0199dd58f6fd0..500e82b8b076161049a8d15bc5a8cf3e8caee69f 100644 (file)
--- a/src/empathy-import-dialog.c
+++ b/src/empathy-import-dialog.c
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-import-dialog.h"
 #include "empathy-import-pidgin.h"

diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c
index f50b18365c4002534c8d7c6a2795aca7202bfcaf..56a742d221de755751263b2824c34e7a3f0a8708 100644 (file)
--- a/src/empathy-import-pidgin.c
+++ b/src/empathy-import-pidgin.c
@@ -30,8 +30,7 @@
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/dbus.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "empathy-import-utils.h"
 #include "empathy-import-pidgin.h"

diff --git a/src/empathy-import-utils.c b/src/empathy-import-utils.c
index 2c942b58586eb895bb66b4d56ad0217acb0fe442..7007dee5718cb3d20e541f95f37082b02425af4d 100644 (file)
--- a/src/empathy-import-utils.c
+++ b/src/empathy-import-utils.c
@@ -19,8 +19,6 @@
  *          Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
  */
 
-#include <telepathy-glib/util.h>
-
 #include <libempathy/empathy-connection-managers.h>
 #include <libempathy/empathy-utils.h>
 

diff --git a/src/empathy-import-utils.h b/src/empathy-import-utils.h
index 09b85e0bca83426d18bfa1c25c24522a7f5489e1..59e1cb4d425ec936d9d27ad6d4924e17a64b539c 100644 (file)
--- a/src/empathy-import-utils.h
+++ b/src/empathy-import-utils.h
@@ -22,7 +22,7 @@
 #ifndef __EMPATHY_IMPORT_UTILS_H__
 #define __EMPATHY_IMPORT_UTILS_H__
 
-#include <telepathy-glib/connection-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <glib.h>
 
 G_BEGIN_DECLS

diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index 1994280eefd39dd83fa449b1a366ca18a1a9b00f..93df39630effe6af197ccbde6bf687213d0dbbd8 100644 (file)
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -35,8 +35,7 @@
 
 #include <libempathy-gtk/empathy-ui-utils.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <glib/gi18n-lib.h>
 

diff --git a/src/empathy-invite-participant-dialog.h b/src/empathy-invite-participant-dialog.h
index 7d32bdd8f674d475ac40cb54503b273bf5931c1b..7946fa0010910dfc272b4ce98c44ab3d36fe9408 100644 (file)
--- a/src/empathy-invite-participant-dialog.h
+++ b/src/empathy-invite-participant-dialog.h
@@ -14,7 +14,7 @@
 
 #include <gtk/gtk.h>
 
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include "libempathy/empathy-tp-chat.h"
 

diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 99d920fcd7b9b4291f589912a9e8b0e9ab5ad2d4..02b34dcf0f6919b5865f5baa62ba160e35df95e0 100644 (file)
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -30,8 +30,7 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-client-factory.h>
 #include <libempathy/empathy-gsettings.h>

diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index c6a04fa89b624cf3c50809fa9c7b420643aab0b0..0c0d924383e36c74700ada63f1e6a34869022d2f 100644 (file)
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -28,8 +28,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 #include <folks/folks.h>
 
 #include <libempathy/empathy-contact.h>

diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 517dd1df28a4f6f9d01365a2a26d2ea2e86c0082..b26b925c818ea74d3a4b6f501dd9a67cd16d3680 100644 (file)
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -29,8 +29,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-utils.h>

diff --git a/src/empathy.c b/src/empathy.c
index a75cf3e16a73e20d20701e33dd2354f4bc2696f5..fcfa0bc65e8a9e2d389e2dbc5eaf6716fd0bcb68 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -37,12 +37,7 @@
 
 #include <libnotify/notify.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/debug-sender.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/connection-manager.h>
-#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <telepathy-logger/telepathy-logger.h>
 

diff --git a/tests/empathy-chatroom-manager-test.c b/tests/empathy-chatroom-manager-test.c
index 3ba0239f1208f0817954743b54c5974bb8215b6f..7ecb82ac42b850ea7bd5eeae76d6096a13237218 100644 (file)
--- a/tests/empathy-chatroom-manager-test.c
+++ b/tests/empathy-chatroom-manager-test.c
@@ -3,8 +3,7 @@
 #include <string.h>
 #include <glib/gstdio.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #include <libempathy/empathy-chatroom-manager.h>
 

diff --git a/tests/empathy-parser-test.c b/tests/empathy-parser-test.c
index feef03b515a2efb7996ec3330b3a03ba8dbeb060..4ae6f775af524cd3133324222ab0a118c870bf64 100644 (file)
--- a/tests/empathy-parser-test.c
+++ b/tests/empathy-parser-test.c
@@ -6,7 +6,7 @@
 
 #include "test-helper.h"
 
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TESTS
 #include <libempathy/empathy-debug.h>

diff --git a/tests/test-helper.h b/tests/test-helper.h
index 67e371edc4dc2a2f44860a7a3ff1f0d87dde2b94..cacd18b555e65a3155f0b97b0195c021220fbaa4 100644 (file)
--- a/tests/test-helper.h
+++ b/tests/test-helper.h
@@ -20,7 +20,7 @@
 #ifndef __TEST_HELPER_H__
 #define __TEST_HELPER_H__
 
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
 
 void test_init (int argc,
     char **argv);