From f9a38137925ff6f712afe21961614a1efb3b35ea Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 14 Sep 2012 15:52:54 +0200 Subject: 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. --- extensions/extensions.h | 2 +- goa-mc-plugin/mcp-account-manager-goa.c | 2 +- libempathy-gtk/empathy-account-chooser.c | 3 --- libempathy-gtk/empathy-account-widget-sip.c | 2 +- libempathy-gtk/empathy-account-widget.c | 5 +---- libempathy-gtk/empathy-chat.c | 3 +-- libempathy-gtk/empathy-contact-chooser.h | 2 +- libempathy-gtk/empathy-contact-widget.c | 4 +--- libempathy-gtk/empathy-contactinfo-utils.c | 2 -- libempathy-gtk/empathy-contactinfo-utils.h | 2 +- libempathy-gtk/empathy-groups-widget.c | 2 +- libempathy-gtk/empathy-individual-dialogs.c | 2 +- libempathy-gtk/empathy-individual-edit-dialog.c | 2 +- libempathy-gtk/empathy-individual-information-dialog.c | 2 +- libempathy-gtk/empathy-individual-menu.c | 2 +- libempathy-gtk/empathy-individual-store-channel.c | 2 +- libempathy-gtk/empathy-individual-store-manager.c | 2 +- libempathy-gtk/empathy-individual-store.c | 2 +- libempathy-gtk/empathy-individual-view.c | 3 +-- libempathy-gtk/empathy-individual-widget.c | 2 +- libempathy-gtk/empathy-location-manager.c | 3 +-- libempathy-gtk/empathy-log-window.h | 2 +- libempathy-gtk/empathy-new-call-dialog.c | 2 +- libempathy-gtk/empathy-new-message-dialog.c | 2 +- libempathy-gtk/empathy-notify-manager.c | 2 +- libempathy-gtk/empathy-plist.c | 3 +-- libempathy-gtk/empathy-presence-chooser.c | 3 +-- libempathy-gtk/empathy-protocol-chooser.c | 2 -- libempathy-gtk/empathy-protocol-chooser.h | 2 +- libempathy-gtk/empathy-roster-contact.c | 2 +- libempathy-gtk/empathy-share-my-desktop.c | 6 +----- libempathy-gtk/empathy-theme-adium.c | 3 +-- libempathy-gtk/empathy-theme-manager.c | 3 +-- libempathy-gtk/empathy-tls-dialog.c | 2 +- libempathy-gtk/empathy-ui-utils.c | 2 +- libempathy/empathy-account-settings.c | 5 ----- libempathy/empathy-account-settings.h | 3 +-- libempathy/empathy-auth-factory.c | 2 -- libempathy/empathy-auth-factory.h | 2 +- libempathy/empathy-camera-monitor.c | 2 +- libempathy/empathy-chatroom-manager.c | 5 ----- libempathy/empathy-chatroom-manager.h | 2 +- libempathy/empathy-chatroom.c | 1 - libempathy/empathy-chatroom.h | 2 +- libempathy/empathy-connection-aggregator.c | 2 -- libempathy/empathy-connection-aggregator.h | 2 +- libempathy/empathy-connection-managers.c | 3 --- libempathy/empathy-connection-managers.h | 2 +- libempathy/empathy-contact.c | 4 ---- libempathy/empathy-contact.h | 3 +-- libempathy/empathy-debug.c | 3 --- libempathy/empathy-debug.h | 2 +- libempathy/empathy-ft-handler.c | 4 ---- libempathy/empathy-ft-handler.h | 2 +- libempathy/empathy-individual-manager.c | 4 ---- libempathy/empathy-irc-network.c | 2 +- libempathy/empathy-irc-server.c | 2 +- libempathy/empathy-keyring.h | 2 +- libempathy/empathy-message.c | 4 ---- libempathy/empathy-message.h | 2 +- libempathy/empathy-presence-manager.c | 4 ---- libempathy/empathy-presence-manager.h | 3 +-- libempathy/empathy-request-util.c | 2 -- libempathy/empathy-request-util.h | 2 +- libempathy/empathy-server-sasl-handler.c | 2 -- libempathy/empathy-server-sasl-handler.h | 3 +-- libempathy/empathy-status-presets.c | 2 -- libempathy/empathy-status-presets.h | 2 +- libempathy/empathy-tp-chat.c | 2 -- libempathy/empathy-tp-chat.h | 3 +-- libempathy/empathy-utils.c | 6 ------ libempathy/empathy-utils.h | 2 +- nautilus-sendto-plugin/empathy-nautilus-sendto.c | 2 +- src/empathy-accounts-common.c | 3 +-- src/empathy-accounts-dialog.c | 4 +--- src/empathy-accounts-dialog.h | 2 +- src/empathy-accounts.c | 4 +--- src/empathy-auth-client.c | 2 +- src/empathy-call-factory.c | 5 +---- src/empathy-call-handler.c | 4 +--- src/empathy-call-window.c | 3 +-- src/empathy-call.c | 2 -- src/empathy-chat-window.c | 2 -- src/empathy-chat-window.h | 2 +- src/empathy-chat.c | 2 -- src/empathy-debug-window.c | 6 +----- src/empathy-event-manager.c | 5 +---- src/empathy-import-dialog.c | 2 +- src/empathy-import-pidgin.c | 3 +-- src/empathy-import-utils.c | 2 -- src/empathy-import-utils.h | 2 +- src/empathy-import-widget.c | 3 +-- src/empathy-invite-participant-dialog.h | 2 +- src/empathy-preferences.c | 3 +-- src/empathy-roster-window.c | 3 +-- src/empathy-status-icon.c | 3 +-- src/empathy.c | 7 +------ tests/empathy-chatroom-manager-test.c | 3 +-- tests/empathy-parser-test.c | 2 +- tests/test-helper.h | 2 +- 100 files changed, 76 insertions(+), 196 deletions(-) diff --git a/extensions/extensions.h b/extensions/extensions.h index d97dc830c..2dbd79cc6 100644 --- a/extensions/extensions.h +++ b/extensions/extensions.h @@ -2,7 +2,7 @@ #define __EMP_EXTENSIONS_H__ #include -#include +#include #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 957285168..4b64e546d 100644 --- 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 +#include #define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */ #include diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c index 6e7ec2940..e5827dc56 100644 --- a/libempathy-gtk/empathy-account-chooser.c +++ b/libempathy-gtk/empathy-account-chooser.c @@ -28,9 +28,6 @@ #include #include -#include -#include - #include #include "empathy-ui-utils.h" diff --git a/libempathy-gtk/empathy-account-widget-sip.c b/libempathy-gtk/empathy-account-widget-sip.c index 8aa4e89d1..9599ce152 100644 --- a/libempathy-gtk/empathy-account-widget-sip.c +++ b/libempathy-gtk/empathy-account-widget-sip.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include "empathy-account-widget.h" diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index 17ab236ea..2a98120ec 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -35,10 +35,7 @@ #include -#include -#include -#include -#include +#include #include #include "empathy-account-widget.h" diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 917f4c02e..9a12d1f09 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -36,8 +36,7 @@ #include #include -#include -#include +#include #include #include #include diff --git a/libempathy-gtk/empathy-contact-chooser.h b/libempathy-gtk/empathy-contact-chooser.h index 66c8fbe4e..20a9b8c44 100644 --- a/libempathy-gtk/empathy-contact-chooser.h +++ b/libempathy-gtk/empathy-contact-chooser.h @@ -14,7 +14,7 @@ #include -#include +#include #include "libempathy/empathy-tp-chat.h" diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c index 2b770ca17..421cb9133 100644 --- a/libempathy-gtk/empathy-contact-widget.c +++ b/libempathy-gtk/empathy-contact-widget.c @@ -27,9 +27,7 @@ #include #include -#include -#include -#include +#include #include #include diff --git a/libempathy-gtk/empathy-contactinfo-utils.c b/libempathy-gtk/empathy-contactinfo-utils.c index 67186d2a9..5e4fad787 100644 --- a/libempathy-gtk/empathy-contactinfo-utils.c +++ b/libempathy-gtk/empathy-contactinfo-utils.c @@ -27,8 +27,6 @@ #include -#include - #include #include diff --git a/libempathy-gtk/empathy-contactinfo-utils.h b/libempathy-gtk/empathy-contactinfo-utils.h index b91f419c8..80c18ffae 100644 --- a/libempathy-gtk/empathy-contactinfo-utils.h +++ b/libempathy-gtk/empathy-contactinfo-utils.h @@ -24,7 +24,7 @@ #include #include -#include +#include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-groups-widget.c b/libempathy-gtk/empathy-groups-widget.c index 7d231d403..cc3653bbe 100644 --- a/libempathy-gtk/empathy-groups-widget.c +++ b/libempathy-gtk/empathy-groups-widget.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c index 2c5dc274e..e3b653b32 100644 --- a/libempathy-gtk/empathy-individual-dialogs.c +++ b/libempathy-gtk/empathy-individual-dialogs.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include diff --git a/libempathy-gtk/empathy-individual-edit-dialog.c b/libempathy-gtk/empathy-individual-edit-dialog.c index b49e29f8b..8fba058f8 100644 --- a/libempathy-gtk/empathy-individual-edit-dialog.c +++ b/libempathy-gtk/empathy-individual-edit-dialog.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c index 2e8fcb666..65dc68af7 100644 --- a/libempathy-gtk/empathy-individual-information-dialog.c +++ b/libempathy-gtk/empathy-individual-information-dialog.c @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c index e9edf44fa..e59748129 100644 --- a/libempathy-gtk/empathy-individual-menu.c +++ b/libempathy-gtk/empathy-individual-menu.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include diff --git a/libempathy-gtk/empathy-individual-store-channel.c b/libempathy-gtk/empathy-individual-store-channel.c index e5edb2642..389175ebf 100644 --- a/libempathy-gtk/empathy-individual-store-channel.c +++ b/libempathy-gtk/empathy-individual-store-channel.c @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include diff --git a/libempathy-gtk/empathy-individual-store-manager.c b/libempathy-gtk/empathy-individual-store-manager.c index f8610cf16..78d3a07e3 100644 --- a/libempathy-gtk/empathy-individual-store-manager.c +++ b/libempathy-gtk/empathy-individual-store-manager.c @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c index 9199af6b9..444a6c5fd 100644 --- a/libempathy-gtk/empathy-individual-store.c +++ b/libempathy-gtk/empathy-individual-store.c @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index c143ef232..9cb8b86a9 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -32,8 +32,7 @@ #include #include -#include -#include +#include #include #include diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c index 832d944de..735397456 100644 --- a/libempathy-gtk/empathy-individual-widget.c +++ b/libempathy-gtk/empathy-individual-widget.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c index 576ced529..7cdf2517d 100644 --- a/libempathy-gtk/empathy-location-manager.c +++ b/libempathy-gtk/empathy-location-manager.c @@ -26,8 +26,7 @@ #include -#include -#include +#include #include diff --git a/libempathy-gtk/empathy-log-window.h b/libempathy-gtk/empathy-log-window.h index 4c1244cc9..f8f76905a 100644 --- 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 +#include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c index 079afe476..c8538b5cf 100644 --- a/libempathy-gtk/empathy-new-call-dialog.c +++ b/libempathy-gtk/empathy-new-call-dialog.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c index 14199578f..0b707c4f8 100644 --- a/libempathy-gtk/empathy-new-message-dialog.c +++ b/libempathy-gtk/empathy-new-message-dialog.c @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c index bccc3e21e..250354282 100644 --- a/libempathy-gtk/empathy-notify-manager.c +++ b/libempathy-gtk/empathy-notify-manager.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/libempathy-gtk/empathy-plist.c b/libempathy-gtk/empathy-plist.c index 1bd4d8ecf..be7b23a47 100644 --- a/libempathy-gtk/empathy-plist.c +++ b/libempathy-gtk/empathy-plist.c @@ -23,8 +23,7 @@ #include #include #include -#include -#include +#include #include "empathy-plist.h" diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c index 1eb4a48a5..16b7a54e9 100644 --- a/libempathy-gtk/empathy-presence-chooser.c +++ b/libempathy-gtk/empathy-presence-chooser.c @@ -33,8 +33,7 @@ #include #include -#include -#include +#include #include #include diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c index 8c0df8fac..2ff35644f 100644 --- a/libempathy-gtk/empathy-protocol-chooser.c +++ b/libempathy-gtk/empathy-protocol-chooser.c @@ -24,8 +24,6 @@ #include -#include - #include #include diff --git a/libempathy-gtk/empathy-protocol-chooser.h b/libempathy-gtk/empathy-protocol-chooser.h index 5aa0a4c4d..eeaab60c0 100644 --- a/libempathy-gtk/empathy-protocol-chooser.h +++ b/libempathy-gtk/empathy-protocol-chooser.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include diff --git a/libempathy-gtk/empathy-roster-contact.c b/libempathy-gtk/empathy-roster-contact.c index afb6de4fa..e72ae4494 100644 --- a/libempathy-gtk/empathy-roster-contact.c +++ b/libempathy-gtk/empathy-roster-contact.c @@ -2,7 +2,7 @@ #include "empathy-roster-contact.h" -#include +#include #include diff --git a/libempathy-gtk/empathy-share-my-desktop.c b/libempathy-gtk/empathy-share-my-desktop.c index 8f14fb6b1..0414f7d4b 100644 --- a/libempathy-gtk/empathy-share-my-desktop.c +++ b/libempathy-gtk/empathy-share-my-desktop.c @@ -23,11 +23,7 @@ #include #include -#include -#include -#include -#include -#include +#include #define DEBUG_FLAG EMPATHY_DEBUG_SHARE_DESKTOP #include diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index 2e243c46d..37c8698e4 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -24,8 +24,7 @@ #include #include -#include -#include +#include #include #include diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c index 7d21b7960..fd58ac49d 100644 --- a/libempathy-gtk/empathy-theme-manager.c +++ b/libempathy-gtk/empathy-theme-manager.c @@ -25,10 +25,9 @@ #include #include -#include #include -#include +#include #include #include diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c index bf36e9acf..34af2f034 100644 --- a/libempathy-gtk/empathy-tls-dialog.c +++ b/libempathy-gtk/empathy-tls-dialog.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index 967d59cda..97ba5281c 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include "empathy-ui-utils.h" diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c index 9c25faf01..8731479be 100644 --- a/libempathy/empathy-account-settings.c +++ b/libempathy/empathy-account-settings.c @@ -23,11 +23,6 @@ #include #include -#include -#include -#include -#include - #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 c54065258..162def48c 100644 --- a/libempathy/empathy-account-settings.h +++ b/libempathy/empathy-account-settings.h @@ -24,8 +24,7 @@ #include #include -#include -#include +#include G_BEGIN_DECLS diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c index a4bc15a62..f20ce8a3a 100644 --- a/libempathy/empathy-auth-factory.c +++ b/libempathy/empathy-auth-factory.c @@ -22,8 +22,6 @@ #include "empathy-auth-factory.h" -#include - #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 5d31b1edd..16d6ad34f 100644 --- a/libempathy/empathy-auth-factory.h +++ b/libempathy/empathy-auth-factory.h @@ -23,7 +23,7 @@ #include -#include +#include G_BEGIN_DECLS diff --git a/libempathy/empathy-camera-monitor.c b/libempathy/empathy-camera-monitor.c index 977b1f2c6..74fdb44d7 100644 --- a/libempathy/empathy-camera-monitor.c +++ b/libempathy/empathy-camera-monitor.c @@ -22,7 +22,7 @@ #include -#include +#include #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 9a9a7b250..da3c4e20b 100644 --- a/libempathy/empathy-chatroom-manager.c +++ b/libempathy/empathy-chatroom-manager.c @@ -30,11 +30,6 @@ #include #include -#include -#include -#include -#include - #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 be3301503..b8232dc64 100644 --- a/libempathy/empathy-chatroom-manager.h +++ b/libempathy/empathy-chatroom-manager.h @@ -26,7 +26,7 @@ #include -#include +#include #include "empathy-chatroom.h" diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c index 5238af361..bfa3280de 100644 --- a/libempathy/empathy-chatroom.c +++ b/libempathy/empathy-chatroom.c @@ -24,7 +24,6 @@ #include #include -#include #include "empathy-chatroom.h" #include "empathy-utils.h" diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h index f86f8ca9e..57ca685cb 100644 --- a/libempathy/empathy-chatroom.h +++ b/libempathy/empathy-chatroom.h @@ -24,7 +24,7 @@ #include -#include +#include #include diff --git a/libempathy/empathy-connection-aggregator.c b/libempathy/empathy-connection-aggregator.c index f42e18fd1..32a3bbb0b 100644 --- a/libempathy/empathy-connection-aggregator.c +++ b/libempathy/empathy-connection-aggregator.c @@ -22,8 +22,6 @@ #include "empathy-connection-aggregator.h" -#include - #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 5f85193c9..71e6e4392 100644 --- a/libempathy/empathy-connection-aggregator.h +++ b/libempathy/empathy-connection-aggregator.h @@ -23,7 +23,7 @@ #include -#include +#include G_BEGIN_DECLS diff --git a/libempathy/empathy-connection-managers.c b/libempathy/empathy-connection-managers.c index 93985f5da..cd95a4b24 100644 --- a/libempathy/empathy-connection-managers.c +++ b/libempathy/empathy-connection-managers.c @@ -23,9 +23,6 @@ #include #include -#include -#include - #include "empathy-connection-managers.h" #include "empathy-utils.h" diff --git a/libempathy/empathy-connection-managers.h b/libempathy/empathy-connection-managers.h index 14833734c..d8bcb390a 100644 --- a/libempathy/empathy-connection-managers.h +++ b/libempathy/empathy-connection-managers.h @@ -24,7 +24,7 @@ #include #include -#include +#include G_BEGIN_DECLS diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index 562fba45d..4fe428957 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -25,10 +25,6 @@ #include -#include -#include -#include - #include #include diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h index 6b15d5ea3..14c3f6440 100644 --- a/libempathy/empathy-contact.h +++ b/libempathy/empathy-contact.h @@ -24,8 +24,7 @@ #include -#include -#include +#include #include #include diff --git a/libempathy/empathy-debug.c b/libempathy/empathy-debug.c index 038748ff4..49ee9371f 100644 --- a/libempathy/empathy-debug.c +++ b/libempathy/empathy-debug.c @@ -29,9 +29,6 @@ #include #include -#include -#include - #include "empathy-debug.h" #ifdef ENABLE_DEBUG diff --git a/libempathy/empathy-debug.h b/libempathy/empathy-debug.h index 0869e80b1..e6b93cc7a 100644 --- a/libempathy/empathy-debug.h +++ b/libempathy/empathy-debug.h @@ -25,7 +25,7 @@ #include -#include +#include G_BEGIN_DECLS diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c index 169020d5e..d9d87e20a 100644 --- a/libempathy/empathy-ft-handler.c +++ b/libempathy/empathy-ft-handler.c @@ -25,10 +25,6 @@ #include #include -#include -#include -#include -#include #include "empathy-ft-handler.h" #include "empathy-time.h" diff --git a/libempathy/empathy-ft-handler.h b/libempathy/empathy-ft-handler.h index 7111cd25b..a120f241b 100644 --- a/libempathy/empathy-ft-handler.h +++ b/libempathy/empathy-ft-handler.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include "empathy-contact.h" diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c index 97be8b8a7..8d14cdf0d 100644 --- a/libempathy/empathy-individual-manager.c +++ b/libempathy/empathy-individual-manager.c @@ -25,10 +25,6 @@ #include #include -#include -#include -#include -#include #include #include diff --git a/libempathy/empathy-irc-network.c b/libempathy/empathy-irc-network.c index ec0cfffb1..66c1f49d4 100644 --- a/libempathy/empathy-irc-network.c +++ b/libempathy/empathy-irc-network.c @@ -25,7 +25,7 @@ #include #include -#include +#include #include "empathy-irc-network.h" #include "empathy-utils.h" diff --git a/libempathy/empathy-irc-server.c b/libempathy/empathy-irc-server.c index cb1fbfc2f..f0a13d09f 100644 --- a/libempathy/empathy-irc-server.c +++ b/libempathy/empathy-irc-server.c @@ -24,7 +24,7 @@ #include #include -#include +#include #include "empathy-irc-server.h" #include "empathy-utils.h" diff --git a/libempathy/empathy-keyring.h b/libempathy/empathy-keyring.h index 05c460e5d..7e945dc02 100644 --- a/libempathy/empathy-keyring.h +++ b/libempathy/empathy-keyring.h @@ -21,7 +21,7 @@ #include -#include +#include G_BEGIN_DECLS diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c index 0a8ca408b..fe1975119 100644 --- a/libempathy/empathy-message.c +++ b/libempathy/empathy-message.c @@ -28,10 +28,6 @@ #include -#include -#include -#include - #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 c49a2840f..fa6e07be1 100644 --- a/libempathy/empathy-message.h +++ b/libempathy/empathy-message.h @@ -26,7 +26,7 @@ #define __EMPATHY_MESSAGE_H__ #include -#include +#include #include #include "empathy-contact.h" diff --git a/libempathy/empathy-presence-manager.c b/libempathy/empathy-presence-manager.c index 29af2a107..250398928 100644 --- a/libempathy/empathy-presence-manager.c +++ b/libempathy/empathy-presence-manager.c @@ -27,10 +27,6 @@ #include #include -#include -#include -#include - #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 63599cbfd..6357aeecd 100644 --- a/libempathy/empathy-presence-manager.h +++ b/libempathy/empathy-presence-manager.h @@ -23,8 +23,7 @@ #include -#include -#include +#include G_BEGIN_DECLS diff --git a/libempathy/empathy-request-util.c b/libempathy/empathy-request-util.c index 6b53dab9a..196925b54 100644 --- a/libempathy/empathy-request-util.c +++ b/libempathy/empathy-request-util.c @@ -25,8 +25,6 @@ #include -#include - #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 cdecc631d..497c65ee5 100644 --- a/libempathy/empathy-request-util.h +++ b/libempathy/empathy-request-util.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include "empathy-contact.h" diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c index aa0760d63..06f7a9e68 100644 --- 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 - #include #include diff --git a/libempathy/empathy-server-sasl-handler.h b/libempathy/empathy-server-sasl-handler.h index 94be69b10..d25d90ab7 100644 --- a/libempathy/empathy-server-sasl-handler.h +++ b/libempathy/empathy-server-sasl-handler.h @@ -23,8 +23,7 @@ #include #include -#include -#include +#include G_BEGIN_DECLS diff --git a/libempathy/empathy-status-presets.c b/libempathy/empathy-status-presets.c index 319ca53d9..940253343 100644 --- a/libempathy/empathy-status-presets.c +++ b/libempathy/empathy-status-presets.c @@ -32,8 +32,6 @@ #include #include -#include - #include "empathy-utils.h" #include "empathy-status-presets.h" diff --git a/libempathy/empathy-status-presets.h b/libempathy/empathy-status-presets.h index 331c630d5..5e490221f 100644 --- 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 +#include G_BEGIN_DECLS diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index d6a0e13c9..39ed8e2ab 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -22,8 +22,6 @@ #include -#include - #include #include "empathy-tp-chat.h" diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h index 66fb96d7a..d8d4ac31d 100644 --- a/libempathy/empathy-tp-chat.h +++ b/libempathy/empathy-tp-chat.h @@ -23,8 +23,7 @@ #include -#include -#include +#include #include "empathy-message.h" #include "empathy-contact.h" diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index eb1e27f4c..e33bf3af4 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -42,12 +42,6 @@ #include -#include -#include -#include -#include -#include - #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 c3a5886a3..a310d2b02 100644 --- a/libempathy/empathy-utils.h +++ b/libempathy/empathy-utils.h @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "empathy-contact.h" diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c index 56c55f57a..8b1bafb78 100644 --- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c +++ b/nautilus-sendto-plugin/empathy-nautilus-sendto.c @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c index d975c55b0..346803c21 100644 --- a/src/empathy-accounts-common.c +++ b/src/empathy-accounts-common.c @@ -32,8 +32,7 @@ #include #include -#include -#include +#include #include #include diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index f865e8743..6275e6a8a 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -34,9 +34,7 @@ #include #include -#include -#include -#include +#include #include #include diff --git a/src/empathy-accounts-dialog.h b/src/empathy-accounts-dialog.h index 5fe6f51f7..d436fed04 100644 --- a/src/empathy-accounts-dialog.h +++ b/src/empathy-accounts-dialog.h @@ -26,7 +26,7 @@ #include -#include +#include G_BEGIN_DECLS diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c index aa0e5b67b..e3bf938a4 100644 --- a/src/empathy-accounts.c +++ b/src/empathy-accounts.c @@ -36,9 +36,7 @@ #include #endif -#include -#include -#include +#include #include #include diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c index d1f905c4f..578e63f6e 100644 --- a/src/empathy-auth-client.c +++ b/src/empathy-auth-client.c @@ -26,7 +26,7 @@ #include #include -#include +#include #define DEBUG_FLAG EMPATHY_DEBUG_TLS #include diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c index 9401ae71b..45469e7b6 100644 --- a/src/empathy-call-factory.c +++ b/src/empathy-call-factory.c @@ -23,10 +23,7 @@ #include #include -#include -#include -#include -#include +#include #include #include diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c index be0987e95..3b870be07 100644 --- a/src/empathy-call-handler.c +++ b/src/empathy-call-handler.c @@ -23,9 +23,7 @@ #include #include -#include -#include -#include +#include #include diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 5a3b0d88a..db7605bfe 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -34,9 +34,8 @@ #include #include -#include #include -#include +#include #include #include diff --git a/src/empathy-call.c b/src/empathy-call.c index 9d7a2b355..5b50f9572 100644 --- a/src/empathy-call.c +++ b/src/empathy-call.c @@ -34,8 +34,6 @@ #include #endif -#include - #include #include diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 6231b57b3..f21db0335 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -35,8 +35,6 @@ #include #include -#include - #include #include #include diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h index 7804bd4b9..d7ddc2b6b 100644 --- a/src/empathy-chat-window.h +++ b/src/empathy-chat-window.h @@ -30,7 +30,7 @@ #include #include -#include +#include #include diff --git a/src/empathy-chat.c b/src/empathy-chat.c index 3094b5137..0f7173a9c 100644 --- a/src/empathy-chat.c +++ b/src/empathy-chat.c @@ -28,8 +28,6 @@ #include -#include - #include #include diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c index 159db0b09..33b12627a 100644 --- a/src/empathy-debug-window.c +++ b/src/empathy-debug-window.c @@ -37,11 +37,7 @@ #include #include -#include -#include -#include -#include -#include +#include #include "extensions/extensions.h" diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index 7e34f4ce6..b0017e609 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -24,10 +24,7 @@ #include #include -#include -#include -#include -#include +#include #include #include diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c index 4e00bd11a..500e82b8b 100644 --- a/src/empathy-import-dialog.c +++ b/src/empathy-import-dialog.c @@ -26,7 +26,7 @@ #include #include -#include +#include #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 f50b18365..56a742d22 100644 --- a/src/empathy-import-pidgin.c +++ b/src/empathy-import-pidgin.c @@ -30,8 +30,7 @@ #include #include -#include -#include +#include #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 2c942b585..7007dee57 100644 --- a/src/empathy-import-utils.c +++ b/src/empathy-import-utils.c @@ -19,8 +19,6 @@ * Cosimo Cecchi */ -#include - #include #include diff --git a/src/empathy-import-utils.h b/src/empathy-import-utils.h index 09b85e0bc..59e1cb4d4 100644 --- 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 +#include #include G_BEGIN_DECLS diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c index 1994280ee..93df39630 100644 --- a/src/empathy-import-widget.c +++ b/src/empathy-import-widget.c @@ -35,8 +35,7 @@ #include -#include -#include +#include #include diff --git a/src/empathy-invite-participant-dialog.h b/src/empathy-invite-participant-dialog.h index 7d32bdd8f..7946fa001 100644 --- a/src/empathy-invite-participant-dialog.h +++ b/src/empathy-invite-participant-dialog.h @@ -14,7 +14,7 @@ #include -#include +#include #include "libempathy/empathy-tp-chat.h" diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c index 99d920fcd..02b34dcf0 100644 --- a/src/empathy-preferences.c +++ b/src/empathy-preferences.c @@ -30,8 +30,7 @@ #include #include -#include -#include +#include #include #include diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c index c6a04fa89..0c0d92438 100644 --- a/src/empathy-roster-window.c +++ b/src/empathy-roster-window.c @@ -28,8 +28,7 @@ #include #include -#include -#include +#include #include #include diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c index 517dd1df2..b26b925c8 100644 --- a/src/empathy-status-icon.c +++ b/src/empathy-status-icon.c @@ -29,8 +29,7 @@ #include #include -#include -#include +#include #include #include diff --git a/src/empathy.c b/src/empathy.c index a75cf3e16..fcfa0bc65 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -37,12 +37,7 @@ #include -#include -#include -#include -#include -#include -#include +#include #include diff --git a/tests/empathy-chatroom-manager-test.c b/tests/empathy-chatroom-manager-test.c index 3ba0239f1..7ecb82ac4 100644 --- a/tests/empathy-chatroom-manager-test.c +++ b/tests/empathy-chatroom-manager-test.c @@ -3,8 +3,7 @@ #include #include -#include -#include +#include #include diff --git a/tests/empathy-parser-test.c b/tests/empathy-parser-test.c index feef03b51..4ae6f775a 100644 --- a/tests/empathy-parser-test.c +++ b/tests/empathy-parser-test.c @@ -6,7 +6,7 @@ #include "test-helper.h" -#include +#include #define DEBUG_FLAG EMPATHY_DEBUG_TESTS #include diff --git a/tests/test-helper.h b/tests/test-helper.h index 67e371edc..cacd18b55 100644 --- a/tests/test-helper.h +++ b/tests/test-helper.h @@ -20,7 +20,7 @@ #ifndef __TEST_HELPER_H__ #define __TEST_HELPER_H__ -#include +#include void test_init (int argc, char **argv); -- cgit v1.2.3