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.
100 files changed:
#define __EMP_EXTENSIONS_H__
#include <glib-object.h>
#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"
#include "extensions/_gen/enums.h"
#include "extensions/_gen/cli-misc.h"
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
#define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */
#include <goa/goa.h>
#define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */
#include <goa/goa.h>
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
#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"
#include <libempathy/empathy-utils.h>
#include "empathy-ui-utils.h"
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
#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"
#include <libempathy/empathy-utils.h>
#include "empathy-account-widget.h"
#include <libempathy/empathy-utils.h>
#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"
#include <dbus/dbus-protocol.h>
#include "empathy-account-widget.h"
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
#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>
#include <telepathy-logger/telepathy-logger.h>
#include <libempathy/empathy-gsettings.h>
#include <libempathy/empathy-keyring.h>
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
#include "libempathy/empathy-tp-chat.h"
#include "libempathy/empathy-tp-chat.h"
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#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>
#include <libempathy/empathy-time.h>
#include <libempathy/empathy-utils.h>
#include <glib/gi18n-lib.h>
#include <glib/gi18n-lib.h>
-#include <telepathy-glib/util.h>
-
#include <libempathy/empathy-time.h>
#include <libempathy/empathy-request-util.h>
#include <libempathy/empathy-time.h>
#include <libempathy/empathy-request-util.h>
#include <glib.h>
#include <gtk/gtk.h>
#include <glib.h>
#include <gtk/gtk.h>
-#include <telepathy-glib/connection.h>
+#include <telepathy-glib/telepathy-glib.h>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#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>
#include <folks/folks.h>
#include <folks/folks-telepathy.h>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#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>
#include <folks/folks.h>
#include <libempathy/empathy-individual-manager.h>
#include <glib/gi18n-lib.h>
#include <gio/gdesktopappinfo.h>
#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>
#include <folks/folks.h>
#include <folks/folks-telepathy.h>
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
#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>
#include <folks/folks.h>
#include <folks/folks-telepathy.h>
#include <folks/folks.h>
#include <folks/folks-telepathy.h>
#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>
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-enum-types.h>
#include <folks/folks.h>
#include <folks/folks-telepathy.h>
#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>
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-enum-types.h>
#include <folks/folks.h>
#include <folks/folks-telepathy.h>
#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>
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-enum-types.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
#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>
#include <folks/folks.h>
#include <folks/folks-telepathy.h>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#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>
#include <folks/folks.h>
#include <folks/folks-telepathy.h>
#include <glib/gi18n-lib.h>
#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>
#include <geoclue/geoclue-master.h>
#ifndef __EMPATHY_LOG_WINDOW_H__
#define __EMPATHY_LOG_WINDOW_H__
#ifndef __EMPATHY_LOG_WINDOW_H__
#define __EMPATHY_LOG_WINDOW_H__
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#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>
#include <libempathy/empathy-camera-monitor.h>
#include <libempathy/empathy-utils.h>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#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>
#include <libempathy/empathy-request-util.h>
#include <libempathy/empathy-utils.h>
#include <libnotify/notification.h>
#include <libnotify/notify.h>
#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>
#include <libempathy/empathy-gsettings.h>
#include <libempathy/empathy-utils.h>
#include <string.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
#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"
#include "empathy-plist.h"
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#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>
#include <libempathy/empathy-presence-manager.h>
#include <libempathy/empathy-utils.h>
-#include <telepathy-glib/util.h>
-
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#include <glib-object.h>
#include <gtk/gtk.h>
#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>
#include <libempathy/empathy-account-settings.h>
#include "empathy-roster-contact.h"
#include "empathy-roster-contact.h"
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-utils.h>
#include <gtk/gtk.h>
#include <dbus/dbus-glib.h>
#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>
#define DEBUG_FLAG EMPATHY_DEBUG_SHARE_DESKTOP
#include <libempathy/empathy-debug.h>
#include <glib/gi18n-lib.h>
#include <webkit/webkit.h>
#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>
#include <pango/pango.h>
#include <gdk/gdk.h>
#include <string.h>
#include <glib/gi18n-lib.h>
#include <string.h>
#include <glib/gi18n-lib.h>
-#include <telepathy-glib/dbus.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
#include <libempathy/empathy-gsettings.h>
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-gsettings.h>
#include <libempathy/empathy-utils.h>
#include <glib/gi18n-lib.h>
#include <gcr/gcr.h>
#include <glib/gi18n-lib.h>
#include <gcr/gcr.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
#include <gio/gio.h>
#include <gio/gdesktopappinfo.h>
#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"
#include <folks/folks.h>
#include "empathy-ui-utils.h"
#include <stdio.h>
#include <stdlib.h>
#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"
#include "empathy-account-settings.h"
#include "empathy-connection-managers.h"
#include "empathy-keyring.h"
#include <glib-object.h>
#include <gio/gio.h>
#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>
#include "empathy-auth-factory.h"
#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"
#define DEBUG_FLAG EMPATHY_DEBUG_TLS
#include "empathy-debug.h"
#include "empathy-keyring.h"
-#include <telepathy-glib/base-client.h>
+#include <telepathy-glib/telepathy-glib.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
#include "empathy-camera-monitor.h"
#include "cheese-camera-device-monitor.h"
#include "empathy-camera-monitor.h"
#include "cheese-camera-device-monitor.h"
#include <libxml/parser.h>
#include <libxml/tree.h>
#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"
#include "empathy-client-factory.h"
#include "empathy-tp-chat.h"
#include "empathy-chatroom-manager.h"
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
#include "empathy-chatroom.h"
#include "empathy-chatroom.h"
#include <string.h>
#include <glib.h>
#include <string.h>
#include <glib.h>
-#include <telepathy-glib/util.h>
#include "empathy-chatroom.h"
#include "empathy-utils.h"
#include "empathy-chatroom.h"
#include "empathy-utils.h"
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
#include <libempathy/empathy-tp-chat.h>
#include <libempathy/empathy-tp-chat.h>
#include "empathy-connection-aggregator.h"
#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"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "empathy-debug.h"
#include "empathy-utils.h"
-#include <telepathy-glib/base-client.h>
+#include <telepathy-glib/telepathy-glib.h>
#include <stdio.h>
#include <stdlib.h>
#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"
#include "empathy-connection-managers.h"
#include "empathy-utils.h"
#include <glib-object.h>
#include <gio/gio.h>
#include <glib-object.h>
#include <gio/gio.h>
-#include <telepathy-glib/connection-manager.h>
+#include <telepathy-glib/telepathy-glib.h>
#include <glib/gi18n-lib.h>
#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>
#include <folks/folks.h>
#include <folks/folks-telepathy.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>
#include <telepathy-logger/telepathy-logger.h>
#include <folks/folks.h>
#include <glib.h>
#include <glib/gstdio.h>
#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
#include "empathy-debug.h"
#ifdef ENABLE_DEBUG
-#include <telepathy-glib/debug.h>
+#include <telepathy-glib/telepathy-glib.h>
#include <glib.h>
#include <glib/gi18n-lib.h>
#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"
#include "empathy-ft-handler.h"
#include "empathy-time.h"
#include <glib-object.h>
#include <gio/gio.h>
#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"
#include "empathy-contact.h"
#include <string.h>
#include <telepathy-glib/telepathy-glib.h>
#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>
#include <folks/folks.h>
#include <folks/folks-telepathy.h>
#include <glib.h>
#include <glib/gi18n-lib.h>
#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"
#include "empathy-irc-network.h"
#include "empathy-utils.h"
#include <glib.h>
#include <glib/gi18n-lib.h>
#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"
#include "empathy-irc-server.h"
#include "empathy-utils.h"
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
#include <glib/gi18n-lib.h>
#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"
#include "empathy-client-factory.h"
#include "empathy-message.h"
#include "empathy-utils.h"
#define __EMPATHY_MESSAGE_H__
#include <glib-object.h>
#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"
#include <telepathy-logger/telepathy-logger.h>
#include "empathy-contact.h"
#include <glib/gi18n-lib.h>
#include <dbus/dbus-glib.h>
#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
#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <telepathy-glib/account.h>
-#include <telepathy-glib/enums.h>
+#include <telepathy-glib/telepathy-glib.h>
#include <glib/gi18n-lib.h>
#include <glib/gi18n-lib.h>
-#include <telepathy-glib/telepathy-glib.h>
-
#include "empathy-request-util.h"
#include "empathy-utils.h"
#include "empathy-utils.h"
#include "empathy-request-util.h"
#include "empathy-utils.h"
#include "empathy-utils.h"
#include <glib.h>
#include <gio/gio.h>
#include <glib.h>
#include <gio/gio.h>
-#include <telepathy-glib/channel.h>
+#include <telepathy-glib/telepathy-glib.h>
#include "empathy-contact.h"
#include "empathy-contact.h"
#include "empathy-server-sasl-handler.h"
#include "empathy-server-sasl-handler.h"
-#include <telepathy-glib/telepathy-glib.h>
-
#include <extensions/extensions.h>
#include <string.h>
#include <extensions/extensions.h>
#include <string.h>
#include <glib-object.h>
#include <gio/gio.h>
#include <glib-object.h>
#include <gio/gio.h>
-#include <telepathy-glib/account.h>
-#include <telepathy-glib/channel.h>
+#include <telepathy-glib/telepathy-glib.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
-#include <telepathy-glib/util.h>
-
#include "empathy-utils.h"
#include "empathy-status-presets.h"
#include "empathy-utils.h"
#include "empathy-status-presets.h"
#ifndef __EMPATHY_STATUS_PRESETS_H__
#define __EMPATHY_STATUS_PRESETS_H__
#ifndef __EMPATHY_STATUS_PRESETS_H__
#define __EMPATHY_STATUS_PRESETS_H__
-#include <telepathy-glib/enums.h>
+#include <telepathy-glib/telepathy-glib.h>
-#include <telepathy-glib/telepathy-glib.h>
-
#include <extensions/extensions.h>
#include "empathy-tp-chat.h"
#include <extensions/extensions.h>
#include "empathy-tp-chat.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"
#include "empathy-message.h"
#include "empathy-contact.h"
#include <dbus/dbus-protocol.h>
#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"
#include "empathy-client-factory.h"
#include "empathy-utils.h"
#include "empathy-individual-manager.h"
#include <libxml/tree.h>
#include <folks/folks.h>
#include <folks/folks-telepathy.h>
#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"
#include "empathy-contact.h"
#include <gtk/gtk.h>
#include <gio/gio.h>
#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>
#include <libempathy/empathy-contact.h>
#include <libempathy/empathy-debug.h>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#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>
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-connection-managers.h>
#include <dbus/dbus-glib.h>
#include <gio/gdesktopappinfo.h>
#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>
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-connection-managers.h>
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
#include <cheese-gtk.h>
#endif
#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>
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-connection-managers.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#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>
#define DEBUG_FLAG EMPATHY_DEBUG_TLS
#include <libempathy/empathy-debug.h>
#include <stdio.h>
#include <stdlib.h>
#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>
#include <libempathy/empathy-client-factory.h>
#include <libempathy/empathy-request-util.h>
#include <stdio.h>
#include <stdlib.h>
#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>
#include <telepathy-farstream/telepathy-farstream.h>
#include <clutter-gtk/clutter-gtk.h>
#include <clutter-gst/clutter-gst.h>
#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-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>
#include <farstream/fs-element-added-notifier.h>
#include <farstream/fs-utils.h>
#include <X11/Xlib.h>
#endif
#include <X11/Xlib.h>
#endif
-#include <telepathy-glib/debug-sender.h>
-
#include <libempathy/empathy-client-factory.h>
#include <libempathy-gtk/empathy-ui-utils.h>
#include <libempathy/empathy-client-factory.h>
#include <libempathy-gtk/empathy-ui-utils.h>
#include <glib/gi18n.h>
#include <libnotify/notification.h>
#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>
#include <libempathy/empathy-client-factory.h>
#include <libempathy/empathy-contact.h>
#include <libempathy/empathy-message.h>
#include <glib-object.h>
#include <gtk/gtk.h>
#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>
#include <libempathy-gtk/empathy-chat.h>
#include <libnotify/notify.h>
#include <libnotify/notify.h>
-#include <telepathy-glib/debug-sender.h>
-
#include <libempathy/empathy-presence-manager.h>
#include <libempathy/empathy-individual-manager.h>
#include <libempathy/empathy-presence-manager.h>
#include <libempathy/empathy-individual-manager.h>
#include <libempathy-gtk/empathy-geometry.h>
#include <libempathy-gtk/empathy-ui-utils.h>
#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"
#include "extensions/extensions.h"
#include <string.h>
#include <glib/gi18n.h>
#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>
#include <libempathy/empathy-presence-manager.h>
#include <libempathy/empathy-connection-aggregator.h>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#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"
#include "empathy-import-dialog.h"
#include "empathy-import-pidgin.h"
#include <libxml/parser.h>
#include <libxml/tree.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-import-utils.h"
#include "empathy-import-pidgin.h"
#include "empathy-import-utils.h"
#include "empathy-import-pidgin.h"
* Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
*/
* Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
*/
-#include <telepathy-glib/util.h>
-
#include <libempathy/empathy-connection-managers.h>
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-connection-managers.h>
#include <libempathy/empathy-utils.h>
#ifndef __EMPATHY_IMPORT_UTILS_H__
#define __EMPATHY_IMPORT_UTILS_H__
#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
#include <glib.h>
G_BEGIN_DECLS
#include <libempathy-gtk/empathy-ui-utils.h>
#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>
#include <glib/gi18n-lib.h>
-#include <telepathy-glib/account.h>
+#include <telepathy-glib/telepathy-glib.h>
#include "libempathy/empathy-tp-chat.h"
#include "libempathy/empathy-tp-chat.h"
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#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>
#include <libempathy/empathy-client-factory.h>
#include <libempathy/empathy-gsettings.h>
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
#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>
#include <folks/folks.h>
#include <libempathy/empathy-contact.h>
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
#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>
#include <libempathy/empathy-gsettings.h>
#include <libempathy/empathy-utils.h>
#include <libnotify/notify.h>
#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>
#include <telepathy-logger/telepathy-logger.h>
#include <string.h>
#include <glib/gstdio.h>
#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>
#include <libempathy/empathy-chatroom-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
#define DEBUG_FLAG EMPATHY_DEBUG_TESTS
#include <libempathy/empathy-debug.h>
#define DEBUG_FLAG EMPATHY_DEBUG_TESTS
#include <libempathy/empathy-debug.h>
#ifndef __TEST_HELPER_H__
#define __TEST_HELPER_H__
#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);
void test_init (int argc,
char **argv);