Clean up #include directives in source files

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

diff --git a/extensions/extensions.h b/extensions/extensions.h
index 2dbd79cc637675c5485785f66ab34829e01635c5..c1c421643a9ef938d5775636f1d2c768ed4c5c95 100644 (file)
--- a/extensions/extensions.h
+++ b/extensions/extensions.h
@@ -1,7 +1,6 @@
 #ifndef __EMP_EXTENSIONS_H__
 #define __EMP_EXTENSIONS_H__
 
 #ifndef __EMP_EXTENSIONS_H__
 #define __EMP_EXTENSIONS_H__
 

-#include <glib-object.h>

 #include <telepathy-glib/telepathy-glib.h>
 
 #include "extensions/_gen/enums.h"
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "extensions/_gen/enums.h"

diff --git a/goa-mc-plugin/mcp-account-manager-goa.c b/goa-mc-plugin/mcp-account-manager-goa.c
index 4af7828a347ed265042681a881fa376cf4fc6272..dc9e036ee6db02aaa47d6b26a36f681e60f8807f 100644 (file)
--- a/goa-mc-plugin/mcp-account-manager-goa.c
+++ b/goa-mc-plugin/mcp-account-manager-goa.c
@@ -28,7 +28,6 @@
 
 #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 <telepathy-glib/telepathy-glib.h>

 
 #define DEBUG g_debug
 #define GET_PRIVATE(self) (((McpAccountManagerGoa *) self)->priv)
 
 #define DEBUG g_debug
 #define GET_PRIVATE(self) (((McpAccountManagerGoa *) self)->priv)

diff --git a/goa-mc-plugin/mission-control-plugin.c b/goa-mc-plugin/mission-control-plugin.c
index 3431d0ec86c899eaa4db063d2ee9a622025c755e..d4e8ae29720e0d20b5a75efe943bd7c47bca77ef 100644 (file)
--- a/goa-mc-plugin/mission-control-plugin.c
+++ b/goa-mc-plugin/mission-control-plugin.c
@@ -25,8 +25,6 @@
 
 #include "config.h"
 
 
 #include "config.h"
 

-#include <mission-control-plugins/mission-control-plugins.h>
-

 #include "mcp-account-manager-goa.h"
 
 GObject *
 #include "mcp-account-manager-goa.h"
 
 GObject *

diff --git a/libempathy-gtk/empathy-account-widget-irc.h b/libempathy-gtk/empathy-account-widget-irc.h
index 4be6d61a9b2f9246981b1f5b32a93cd45584371f..c102d6ea62d05529d4acecbbdbd4039d83f08f09 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-irc.h
+++ b/libempathy-gtk/empathy-account-widget-irc.h
@@ -21,8 +21,6 @@
 #ifndef __EMPATHY_ACCOUNT_WIDGET_IRC_H__
 #define __EMPATHY_ACCOUNT_WIDGET_IRC_H__
 
 #ifndef __EMPATHY_ACCOUNT_WIDGET_IRC_H__
 #define __EMPATHY_ACCOUNT_WIDGET_IRC_H__
 

-#include <gtk/gtk.h>
-

 #include "empathy-account-widget.h"
 #include "empathy-irc-network-chooser.h"
 
 #include "empathy-account-widget.h"
 #include "empathy-irc-network-chooser.h"
 

diff --git a/libempathy-gtk/empathy-account-widget-private.h b/libempathy-gtk/empathy-account-widget-private.h
index 4fc9a319716a59d2f3ff79dfb4fdd94aac355d58..044e3a9918e1b384458deb8515ddcbbf2384284b 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-private.h
+++ b/libempathy-gtk/empathy-account-widget-private.h
@@ -22,9 +22,6 @@
 #ifndef __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
 #define __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
 
 #ifndef __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
 #define __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
 

-#include <glib.h>
-#include <gtk/gtk.h>
-

 #include "empathy-account-widget.h"
 
 G_BEGIN_DECLS
 #include "empathy-account-widget.h"
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-account-widget-sip.h b/libempathy-gtk/empathy-account-widget-sip.h
index 807d57dffe540e630701eded74180e16861a5e32..4fed35ec989ad7e33d77efa0a5ef85862797b31d 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-sip.h
+++ b/libempathy-gtk/empathy-account-widget-sip.h
@@ -21,8 +21,6 @@
 #ifndef __EMPATHY_ACCOUNT_WIDGET_SIP_H__
 #define __EMPATHY_ACCOUNT_WIDGET_SIP_H__
 
 #ifndef __EMPATHY_ACCOUNT_WIDGET_SIP_H__
 #define __EMPATHY_ACCOUNT_WIDGET_SIP_H__
 

-#include <gtk/gtk.h>
-

 #include "empathy-account-widget.h"
 
 G_BEGIN_DECLS
 #include "empathy-account-widget.h"
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-bad-password-dialog.h b/libempathy-gtk/empathy-bad-password-dialog.h
index 0b025af85bc6349fbecca71c0d0c019414257e8d..a7d0a6f8cb303e2b7a4d595d429af2a66bc6ab3d 100644 (file)
--- a/libempathy-gtk/empathy-bad-password-dialog.h
+++ b/libempathy-gtk/empathy-bad-password-dialog.h
@@ -20,9 +20,6 @@
 #ifndef __EMPATHY_BAD_PASSWORD_DIALOG_H__
 #define __EMPATHY_BAD_PASSWORD_DIALOG_H__
 
 #ifndef __EMPATHY_BAD_PASSWORD_DIALOG_H__
 #define __EMPATHY_BAD_PASSWORD_DIALOG_H__
 

-#include <glib-object.h>
-#include <gtk/gtk.h>
-

 #include "empathy-base-password-dialog.h"
 
 G_BEGIN_DECLS
 #include "empathy-base-password-dialog.h"
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-base-password-dialog.h b/libempathy-gtk/empathy-base-password-dialog.h
index 3f4cfdd5e2db83b0e4774629b491ff572ae0be42..0c8ff5251be9a091387971807536840130aec650 100644 (file)
--- a/libempathy-gtk/empathy-base-password-dialog.h
+++ b/libempathy-gtk/empathy-base-password-dialog.h
@@ -20,7 +20,6 @@
 #ifndef __EMPATHY_BASE_PASSWORD_DIALOG_H__
 #define __EMPATHY_BASE_PASSWORD_DIALOG_H__
 
 #ifndef __EMPATHY_BASE_PASSWORD_DIALOG_H__
 #define __EMPATHY_BASE_PASSWORD_DIALOG_H__
 

-#include <glib-object.h>

 #include <gtk/gtk.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 #include <gtk/gtk.h>
 #include <telepathy-glib/telepathy-glib.h>
 

diff --git a/libempathy-gtk/empathy-calendar-button.h b/libempathy-gtk/empathy-calendar-button.h
index 3f1aed1f12f0a27856513388cb0dfe24ced184b9..ecc8c78c51843c53840497639c8cdfddd80d522b 100644 (file)
--- a/libempathy-gtk/empathy-calendar-button.h
+++ b/libempathy-gtk/empathy-calendar-button.h
@@ -20,7 +20,6 @@
 #ifndef __EMPATHY_CALENDAR_BUTTON_H__
 #define __EMPATHY_CALENDAR_BUTTON_H__
 
 #ifndef __EMPATHY_CALENDAR_BUTTON_H__
 #define __EMPATHY_CALENDAR_BUTTON_H__
 

-#include <glib-object.h>

 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c
index cbcfdce8949c1cf9576fdbd57d606ef2ddf4f126..ebf320471eaa8b56bfd97a92497128ccf857f55b 100644 (file)
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -23,7 +23,6 @@
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>

-#include <telepathy-glib/telepathy-glib.h>

 
 #include "empathy-request-util.h"
 
 
 #include "empathy-request-util.h"
 

diff --git a/libempathy-gtk/empathy-call-utils.h b/libempathy-gtk/empathy-call-utils.h
index 7e342d819f70d8e12dcb3e07c55c758e1be2ef90..788d828f56ca470e5aa6407c5a55e829554bae1c 100644 (file)
--- a/libempathy-gtk/empathy-call-utils.h
+++ b/libempathy-gtk/empathy-call-utils.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_CALL_UTILS_H__
 #define __EMPATHY_CALL_UTILS_H__
 
 #ifndef __EMPATHY_CALL_UTILS_H__
 #define __EMPATHY_CALL_UTILS_H__
 

-#include <glib.h>

 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-contactinfo-utils.h b/libempathy-gtk/empathy-contactinfo-utils.h
index c102c5dd0b3520e820da2bddd2085dacc24fcbbc..64514f09ddf4b0bcfd51c8f42bc0f8181084eb06 100644 (file)
--- a/libempathy-gtk/empathy-contactinfo-utils.h
+++ b/libempathy-gtk/empathy-contactinfo-utils.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_CONTACTINFO_UTILS_H__
 #define __EMPATHY_CONTACTINFO_UTILS_H__
 
 #ifndef __EMPATHY_CONTACTINFO_UTILS_H__
 #define __EMPATHY_CONTACTINFO_UTILS_H__
 

-#include <glib.h>

 #include <gtk/gtk.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 #include <gtk/gtk.h>
 #include <telepathy-glib/telepathy-glib.h>
 

diff --git a/libempathy-gtk/empathy-geometry.h b/libempathy-gtk/empathy-geometry.h
index f9f85c1c9826a4c561fbd84d25974b8f78167a20..e1412ab8a23e4afe4cdbc5331911ee62351c5599 100644 (file)
--- a/libempathy-gtk/empathy-geometry.h
+++ b/libempathy-gtk/empathy-geometry.h
@@ -24,7 +24,6 @@
 #ifndef __EMPATHY_GEOMETRY_H__
 #define __EMPATHY_GEOMETRY_H__
 
 #ifndef __EMPATHY_GEOMETRY_H__
 #define __EMPATHY_GEOMETRY_H__
 

-#include <glib.h>

 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-individual-store-manager.h b/libempathy-gtk/empathy-individual-store-manager.h
index 8726c1fd19c60448df2cea8c654030d385d4882e..d442e7ca5d26848d5066c8a7a4e34491f6d8cbda 100644 (file)
--- a/libempathy-gtk/empathy-individual-store-manager.h
+++ b/libempathy-gtk/empathy-individual-store-manager.h
@@ -26,7 +26,7 @@
 #ifndef __EMPATHY_INDIVIDUAL_STORE_MANAGER_H__
 #define __EMPATHY_INDIVIDUAL_STORE_MANAGER_H__
 
 #ifndef __EMPATHY_INDIVIDUAL_STORE_MANAGER_H__
 #define __EMPATHY_INDIVIDUAL_STORE_MANAGER_H__
 

-#include <gtk/gtk.h>
+#include <glib-object.h>

 
 #include "empathy-individual-manager.h"
 #include "empathy-individual-store.h"
 
 #include "empathy-individual-manager.h"
 #include "empathy-individual-store.h"

diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c
index fc3cc1fb3ea5e3fef481e9160cfb13423b5c6935..35457f5923f7da69acd5ffd0db61672362d8152b 100644 (file)
--- a/libempathy-gtk/empathy-irc-network-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-dialog.c
@@ -24,7 +24,6 @@
 #include <glib/gi18n-lib.h>
 
 #include "empathy-ui-utils.h"
 #include <glib/gi18n-lib.h>
 
 #include "empathy-ui-utils.h"

-#include "empathy-utils.h"

 #include "totem-subtitle-encoding.h"
 
 typedef struct {
 #include "totem-subtitle-encoding.h"
 
 typedef struct {

diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 3650a33c3a04a619d98064ddf4cdc4c4f1bf5ffe..526569a510fd78e6da29ab7945f81ef64654dde6 100644 (file)
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -27,7 +27,6 @@
 
 #include <glib/gi18n-lib.h>
 #include <telepathy-glib/proxy-subclass.h>
 
 #include <glib/gi18n-lib.h>
 #include <telepathy-glib/proxy-subclass.h>

-#include <webkit/webkit.h>

 
 #include "action-chain-internal.h"
 #include "empathy-account-chooser.h"
 
 #include "action-chain-internal.h"
 #include "empathy-account-chooser.h"

diff --git a/libempathy-gtk/empathy-new-call-dialog.h b/libempathy-gtk/empathy-new-call-dialog.h
index d3f05e64e0b80b6bcea5c2c429ed9bd49eaf92dd..e7413568c8f9a6d84c446210fe7fe34b5ecba09e 100644 (file)
--- a/libempathy-gtk/empathy-new-call-dialog.h
+++ b/libempathy-gtk/empathy-new-call-dialog.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_NEW_CALL_DIALOG_H__
 #define __EMPATHY_NEW_CALL_DIALOG_H__
 
 #ifndef __EMPATHY_NEW_CALL_DIALOG_H__
 #define __EMPATHY_NEW_CALL_DIALOG_H__
 

-#include <glib-object.h>

 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-new-message-dialog.h b/libempathy-gtk/empathy-new-message-dialog.h
index 390101a2bd224b15b8ab53beb0220734c808cc55..5adc4cf9e22ac4d8794a46380a015c047348744f 100644 (file)
--- a/libempathy-gtk/empathy-new-message-dialog.h
+++ b/libempathy-gtk/empathy-new-message-dialog.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_NEW_MESSAGE_DIALOG_H__
 #define __EMPATHY_NEW_MESSAGE_DIALOG_H__
 
 #ifndef __EMPATHY_NEW_MESSAGE_DIALOG_H__
 #define __EMPATHY_NEW_MESSAGE_DIALOG_H__
 

-#include <glib-object.h>

 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-notify-manager.h b/libempathy-gtk/empathy-notify-manager.h
index ee01e7ab98c21f22cc2175b1acc3e8247df6fc46..7c2fa8c4a36dd7f7930108e8786d427376049dcc 100644 (file)
--- a/libempathy-gtk/empathy-notify-manager.h
+++ b/libempathy-gtk/empathy-notify-manager.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_NOTIFY_MANAGER_H__
 #define __EMPATHY_NOTIFY_MANAGER_H__
 
 #ifndef __EMPATHY_NOTIFY_MANAGER_H__
 #define __EMPATHY_NOTIFY_MANAGER_H__
 

-#include <glib-object.h>

 #include <libnotify/notification.h>
 
 #include "empathy-contact.h"
 #include <libnotify/notification.h>
 
 #include "empathy-contact.h"

diff --git a/libempathy-gtk/empathy-password-dialog.h b/libempathy-gtk/empathy-password-dialog.h
index fe84019f3c84869cb194487f1edf9bb773e2bc29..1b19375a3b6560818a8f995382598256bf8087b9 100644 (file)
--- a/libempathy-gtk/empathy-password-dialog.h
+++ b/libempathy-gtk/empathy-password-dialog.h
@@ -20,7 +20,6 @@
 #ifndef __EMPATHY_PASSWORD_DIALOG_H__
 #define __EMPATHY_PASSWORD_DIALOG_H__
 
 #ifndef __EMPATHY_PASSWORD_DIALOG_H__
 #define __EMPATHY_PASSWORD_DIALOG_H__
 

-#include <glib-object.h>

 #include <gtk/gtk.h>
 
 #include "empathy-base-password-dialog.h"
 #include <gtk/gtk.h>
 
 #include "empathy-base-password-dialog.h"

diff --git a/libempathy-gtk/empathy-plist.h b/libempathy-gtk/empathy-plist.h
index a15ad6a01da2738010ac773386727fd148ec3cc4..216896b4226282fa5f95f7b6b55059c7d3942d8c 100644 (file)
--- a/libempathy-gtk/empathy-plist.h
+++ b/libempathy-gtk/empathy-plist.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_PLIST_H__
 #define __EMPATHY_PLIST_H__
 
 #ifndef __EMPATHY_PLIST_H__
 #define __EMPATHY_PLIST_H__
 

-#include <glib.h>

 #include <glib-object.h>
 
 G_BEGIN_DECLS
 #include <glib-object.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-protocol-chooser.h b/libempathy-gtk/empathy-protocol-chooser.h
index efa3089e5ee44185010aa17bd78b01076617ef8d..2ae8017ef362c99565528f3706ee6ea96f981fd8 100644 (file)
--- a/libempathy-gtk/empathy-protocol-chooser.h
+++ b/libempathy-gtk/empathy-protocol-chooser.h
@@ -23,7 +23,6 @@
 #ifndef __EMPATHY_PROTOCOL_CHOOSER_H__
 #define __EMPATHY_PROTOCOL_CHOOSER_H__
 
 #ifndef __EMPATHY_PROTOCOL_CHOOSER_H__
 #define __EMPATHY_PROTOCOL_CHOOSER_H__
 

-#include <glib-object.h>

 #include <gtk/gtk.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 #include <gtk/gtk.h>
 #include <telepathy-glib/telepathy-glib.h>
 

diff --git a/libempathy-gtk/empathy-roster-model.h b/libempathy-gtk/empathy-roster-model.h
index 9a211946dd35dce85c89650a2f876bba0e0c257b..1b35f1a1c881de7266c2635e6b31cd57ece99732 100644 (file)
--- a/libempathy-gtk/empathy-roster-model.h
+++ b/libempathy-gtk/empathy-roster-model.h
@@ -20,7 +20,6 @@
 #ifndef __EMPATHY_ROSTER_MODEL_H__
 #define __EMPATHY_ROSTER_MODEL_H__
 
 #ifndef __EMPATHY_ROSTER_MODEL_H__
 #define __EMPATHY_ROSTER_MODEL_H__
 

-#include <glib-object.h>

 #include <folks/folks.h>
 
 G_BEGIN_DECLS
 #include <folks/folks.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-search-bar.h b/libempathy-gtk/empathy-search-bar.h
index afda250b22ca78818dc57825323fae432cba097c..a710965b5df823cc368ff61e69218e4994f23109 100644 (file)
--- a/libempathy-gtk/empathy-search-bar.h
+++ b/libempathy-gtk/empathy-search-bar.h
@@ -20,8 +20,7 @@
 #ifndef __EMPATHY_SEARCH_BAR_H__
 #define __EMPATHY_SEARCH_BAR_H__
 
 #ifndef __EMPATHY_SEARCH_BAR_H__
 #define __EMPATHY_SEARCH_BAR_H__
 

-#include <glib.h>
-#include <glib-object.h>
+#include <gtk/gtk.h>

 
 #include "empathy-theme-adium.h"
 
 
 #include "empathy-theme-adium.h"
 

diff --git a/libempathy-gtk/empathy-smiley-manager.h b/libempathy-gtk/empathy-smiley-manager.h
index 1d6eaac545819aad4d5094a36509eaed41f33444..b9e753bf689957316246ad989930912a37dbb1c7 100644 (file)
--- a/libempathy-gtk/empathy-smiley-manager.h
+++ b/libempathy-gtk/empathy-smiley-manager.h
@@ -23,7 +23,6 @@
 #ifndef __EMPATHY_SMILEY_MANAGER__H__
 #define __EMPATHY_SMILEY_MANAGER_H__
 
 #ifndef __EMPATHY_SMILEY_MANAGER__H__
 #define __EMPATHY_SMILEY_MANAGER_H__
 

-#include <glib-object.h>

 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-sound-manager.h b/libempathy-gtk/empathy-sound-manager.h
index 5e592186ba62453c529dca1d7677a1c1ecb22998..b2fd0d291e61ef0af1d1de84997d273c9ea7faa0 100644 (file)
--- a/libempathy-gtk/empathy-sound-manager.h
+++ b/libempathy-gtk/empathy-sound-manager.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_SOUND_MANAGER_H__
 #define __EMPATHY_SOUND_MANAGER_H__
 
 #ifndef __EMPATHY_SOUND_MANAGER_H__
 #define __EMPATHY_SOUND_MANAGER_H__
 

-#include <gtk/gtk.h>

 #include <canberra-gtk.h>
 
 G_BEGIN_DECLS
 #include <canberra-gtk.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-status-preset-dialog.h b/libempathy-gtk/empathy-status-preset-dialog.h
index 5de6071e34a09466c274d9d48f87856fa0fb0076..625547fe5f7e1f397f31164c46fab0d0c0055443 100644 (file)
--- a/libempathy-gtk/empathy-status-preset-dialog.h
+++ b/libempathy-gtk/empathy-status-preset-dialog.h
@@ -28,7 +28,6 @@
 #ifndef __EMPATHY_STATUS_PRESET_DIALOG_H__
 #define __EMPATHY_STATUS_PRESET_DIALOG_H__
 
 #ifndef __EMPATHY_STATUS_PRESET_DIALOG_H__
 #define __EMPATHY_STATUS_PRESET_DIALOG_H__
 

-#include <glib.h>

 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index d921372abe80cadec7551ab02b15ec60c9da7179..81361c1ef87c25505ed6d16e4c2936415f4149a1 100644 (file)
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -23,9 +23,6 @@
 #include "config.h"
 #include "empathy-theme-manager.h"
 
 #include "config.h"
 #include "empathy-theme-manager.h"
 

-#include <string.h>
-#include <gtk/gtk.h>
-

 #include "empathy-gsettings.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-gsettings.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

diff --git a/libempathy-gtk/empathy-theme-manager.h b/libempathy-gtk/empathy-theme-manager.h
index 812b02616e0d3f80a12ab9a4ec0663bc9e6f7871..590c343f3c445e23170b3ca20d5f6ebed2c1863d 100644 (file)
--- a/libempathy-gtk/empathy-theme-manager.h
+++ b/libempathy-gtk/empathy-theme-manager.h
@@ -23,7 +23,6 @@
 #ifndef __EMPATHY_THEME_MANAGER_H__
 #define __EMPATHY_THEME_MANAGER_H__
 
 #ifndef __EMPATHY_THEME_MANAGER_H__
 #define __EMPATHY_THEME_MANAGER_H__
 

-#include <glib-object.h>

 #include "empathy-theme-adium.h"
 
 G_BEGIN_DECLS
 #include "empathy-theme-adium.h"
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-tls-dialog.h b/libempathy-gtk/empathy-tls-dialog.h
index 6b08ee399a0e75c6efbbd1d24944b48b91acef8a..b85e7d097253af4a89daed1521af62fb84cc3137 100644 (file)
--- a/libempathy-gtk/empathy-tls-dialog.h
+++ b/libempathy-gtk/empathy-tls-dialog.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_TLS_DIALOG_H__
 #define __EMPATHY_TLS_DIALOG_H__
 
 #ifndef __EMPATHY_TLS_DIALOG_H__
 #define __EMPATHY_TLS_DIALOG_H__
 

-#include <glib-object.h>

 #include <gtk/gtk.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 #include <gtk/gtk.h>
 #include <telepathy-glib/telepathy-glib.h>
 

diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 962246f5242ba0483ada325159839f5a05a5f18e..c9eb5ca6f9b9a2d016fa1bc6f1390516723fcae9 100644 (file)
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -30,7 +30,6 @@
 #include "empathy-utils.h"
 
 #include <glib/gi18n-lib.h>
 #include "empathy-utils.h"
 
 #include <glib/gi18n-lib.h>

-#include <libxml/uri.h>

 #include <dbus/dbus-protocol.h>
 
 #include "empathy-client-factory.h"
 #include <dbus/dbus-protocol.h>
 
 #include "empathy-client-factory.h"

diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
index 1ae7285468a4d8100602d1cc93d099d5b0766c2f..de792385880fdcad15ed4198ab964d5d1192e620 100644 (file)
--- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c
+++ b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
@@ -22,21 +22,13 @@
 
 #include "config.h"
 
 
 #include "config.h"
 

-#include <glib.h>

 #include <glib/gi18n-lib.h>
 #include <glib/gi18n-lib.h>

-#include <gtk/gtk.h>
-#include <gio/gio.h>

 
 

-#include <telepathy-glib/telepathy-glib.h>

 
 

-#include "empathy-contact.h"

 #include "empathy-debug.h"
 #include "empathy-ft-factory.h"
 #include "empathy-debug.h"
 #include "empathy-ft-factory.h"

-#include "empathy-ft-handler.h"

 
 

-#include "empathy-roster-model.h"

 #include "empathy-roster-model-manager.h"
 #include "empathy-roster-model-manager.h"

-#include "empathy-contact-chooser.h"

 #include "empathy-ui-utils.h"
 #include "empathy-roster-view.h"
 #include "empathy-roster-contact.h"
 #include "empathy-ui-utils.h"
 #include "empathy-roster-view.h"
 #include "empathy-roster-contact.h"

diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index ccbaab9d8042b8807464f047819d97a45c2f1db8..772e6868e16bc892972fe843a06b4f1fc36756e0 100644 (file)
--- a/src/empathy-accounts-common.c
+++ b/src/empathy-accounts-common.c
@@ -28,7 +28,6 @@
 #include "empathy-accounts-common.h"
 
 #include "empathy-accounts-dialog.h"
 #include "empathy-accounts-common.h"
 
 #include "empathy-accounts-dialog.h"

-#include "empathy-ui-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-debug.h"

diff --git a/src/empathy-accounts-common.h b/src/empathy-accounts-common.h
index e4a4a6626414547b62cc4d2c021437b4431a2eec..1cb24d7dd13c9d08cff10bffce027b1c5cdd606e 100644 (file)
--- a/src/empathy-accounts-common.h
+++ b/src/empathy-accounts-common.h
@@ -22,7 +22,6 @@
 #ifndef __EMPATHY_ACCOUNTS_COMMON_H__
 #define __EMPATHY_ACCOUNTS_COMMON_H__
 
 #ifndef __EMPATHY_ACCOUNTS_COMMON_H__
 #define __EMPATHY_ACCOUNTS_COMMON_H__
 

-#include <glib.h>

 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS

diff --git a/src/empathy-audio-sink.h b/src/empathy-audio-sink.h
index ceb0bbe360d8c2b38c96c6b8252b297062563ea6..85b576c4289ffcf6ffe918f70da4488440bc6216 100644 (file)
--- a/src/empathy-audio-sink.h
+++ b/src/empathy-audio-sink.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_GST_AUDIO_SINK_H__
 #define __EMPATHY_GST_AUDIO_SINK_H__
 
 #ifndef __EMPATHY_GST_AUDIO_SINK_H__
 #define __EMPATHY_GST_AUDIO_SINK_H__
 

-#include <glib-object.h>

 #include <gst/gst.h>
 
 G_BEGIN_DECLS
 #include <gst/gst.h>
 
 G_BEGIN_DECLS

diff --git a/src/empathy-audio-src.h b/src/empathy-audio-src.h
index ef87c44c4b13d7c402a9d6b721d19a277ae73e68..2d1a6960dc11d2f441e6c87b54769308c1328cae 100644 (file)
--- a/src/empathy-audio-src.h
+++ b/src/empathy-audio-src.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_GST_AUDIO_SRC_H__
 #define __EMPATHY_GST_AUDIO_SRC_H__
 
 #ifndef __EMPATHY_GST_AUDIO_SRC_H__
 #define __EMPATHY_GST_AUDIO_SRC_H__
 

-#include <glib-object.h>

 #include <gst/gst.h>
 #include <gio/gio.h>
 
 #include <gst/gst.h>
 #include <gio/gio.h>
 

diff --git a/src/empathy-call-factory.h b/src/empathy-call-factory.h
index c400fc2fa3fb51762721b8fc7ed591624f76e29c..b913d8e573db60f289981ee4de6e79a2eb4e02df 100644 (file)
--- a/src/empathy-call-factory.h
+++ b/src/empathy-call-factory.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_CALL_FACTORY_H__
 #define __EMPATHY_CALL_FACTORY_H__
 
 #ifndef __EMPATHY_CALL_FACTORY_H__
 #define __EMPATHY_CALL_FACTORY_H__
 

-#include <glib-object.h>

 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS
 #include <telepathy-glib/telepathy-glib.h>
 
 G_BEGIN_DECLS

diff --git a/src/empathy-call-handler.h b/src/empathy-call-handler.h
index face008875d0717c2f55fd55ec5bf3c1eb3d7f81..5050d801e4c04df5c5bef8a58d784d6cc57fcca4 100644 (file)
--- a/src/empathy-call-handler.h
+++ b/src/empathy-call-handler.h
@@ -21,8 +21,6 @@
 #ifndef __EMPATHY_CALL_HANDLER_H__
 #define __EMPATHY_CALL_HANDLER_H__
 
 #ifndef __EMPATHY_CALL_HANDLER_H__
 #define __EMPATHY_CALL_HANDLER_H__
 

-#include <glib-object.h>
-#include <gst/gst.h>

 #include <farstream/fs-conference.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 #include <farstream/fs-conference.h>
 #include <telepathy-glib/telepathy-glib.h>
 

diff --git a/src/empathy-call-observer.h b/src/empathy-call-observer.h
index 1d5a58b579f7b6426d7ca075b91f04c03ffaac82..3fdb6b797f196a580aa99dc38a0aec66f9be7bcd 100644 (file)
--- a/src/empathy-call-observer.h
+++ b/src/empathy-call-observer.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_CALL_OBSERVER_H__
 #define __EMPATHY_CALL_OBSERVER_H__
 
 #ifndef __EMPATHY_CALL_OBSERVER_H__
 #define __EMPATHY_CALL_OBSERVER_H__
 

-#include <glib.h>

 #include <glib-object.h>
 
 G_BEGIN_DECLS
 #include <glib-object.h>
 
 G_BEGIN_DECLS

diff --git a/src/empathy-call-window-fullscreen.h b/src/empathy-call-window-fullscreen.h
index 7e9bd63e57ac25d52896799baa1b9907ff369ec7..56ddf99b8f5c82bed694e2a50b41606aed5f98c6 100644 (file)
--- a/src/empathy-call-window-fullscreen.h
+++ b/src/empathy-call-window-fullscreen.h
@@ -20,8 +20,6 @@
 #ifndef __EMPATHY_CALL_WINDOW_FULLSCREEN_H__
 #define __EMPATHY_CALL_WINDOW_FULLSCREEN_H__
 
 #ifndef __EMPATHY_CALL_WINDOW_FULLSCREEN_H__
 #define __EMPATHY_CALL_WINDOW_FULLSCREEN_H__
 

-#include <glib-object.h>
-#include <gtk/gtk.h>

 
 #include "empathy-call-window.h"
 
 
 #include "empathy-call-window.h"
 

diff --git a/src/empathy-call-window.h b/src/empathy-call-window.h
index d4d1b7cb3c8bccd9b83742fde15a93d6d5d26ca9..2090b1beb21132a652bff46f6730ca3f9ca56e86 100644 (file)
--- a/src/empathy-call-window.h
+++ b/src/empathy-call-window.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_CALL_WINDOW_H__
 #define __EMPATHY_CALL_WINDOW_H__
 
 #ifndef __EMPATHY_CALL_WINDOW_H__
 #define __EMPATHY_CALL_WINDOW_H__
 

-#include <glib-object.h>

 #include <gtk/gtk.h>
 
 #include "empathy-audio-src.h"
 #include <gtk/gtk.h>
 
 #include "empathy-audio-src.h"

diff --git a/src/empathy-camera-menu.h b/src/empathy-camera-menu.h
index 92760f67d06facb9a66adc6dd3a75686d96c07b7..b55726bed3415e85b26a2457805c4cfcc4946db1 100644 (file)
--- a/src/empathy-camera-menu.h
+++ b/src/empathy-camera-menu.h
@@ -19,7 +19,6 @@
 #ifndef __EMPATHY_CAMERA_MENU_H__
 #define __EMPATHY_CAMERA_MENU_H__
 
 #ifndef __EMPATHY_CAMERA_MENU_H__
 #define __EMPATHY_CAMERA_MENU_H__
 

-#include <glib-object.h>

 
 #include "empathy-call-window.h"
 
 
 #include "empathy-call-window.h"
 

diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index 89f230dc31e2a366f0f06e8ccf63f751d3596e56..02ed0d9492945d7572771381033accb4e033881d 100644 (file)
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -24,7 +24,6 @@
 
 #include "empathy-chatroom-manager.h"
 #include "empathy-chat-window.h"
 
 #include "empathy-chatroom-manager.h"
 #include "empathy-chat-window.h"

-#include "empathy-individual-manager.h"

 #include "empathy-request-util.h"
 #include "empathy-ui-utils.h"
 #include "extensions.h"
 #include "empathy-request-util.h"
 #include "empathy-ui-utils.h"
 #include "extensions.h"

diff --git a/src/empathy-chat-manager.h b/src/empathy-chat-manager.h
index ab3817ea92c2487c986dfc6709a4f38ea4369fae..b5516c33d768b0330b7ad70182e3e77f18fce275 100644 (file)
--- a/src/empathy-chat-manager.h
+++ b/src/empathy-chat-manager.h
@@ -20,7 +20,6 @@
 #ifndef __EMPATHY_CHAT_MANAGER_H__
 #define __EMPATHY_CHAT_MANAGER_H__
 
 #ifndef __EMPATHY_CHAT_MANAGER_H__
 #define __EMPATHY_CHAT_MANAGER_H__
 

-#include <glib-object.h>

 
 #include "empathy-chat.h"
 
 
 #include "empathy-chat.h"
 

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 9dafa5fe2c95ceae4926f9d164e796c652f14ee2..480570d0bff124ae59ba4593aa7c0c749d4b2a43 100644 (file)
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -28,7 +28,6 @@
 #include "config.h"
 #include "empathy-chat-window.h"
 
 #include "config.h"
 #include "empathy-chat-window.h"
 

-#include <gtk/gtk.h>

 #include <glib/gi18n.h>
 
 #include "empathy-about-dialog.h"
 #include <glib/gi18n.h>
 
 #include "empathy-about-dialog.h"


@@ -38,7 +37,6 @@
 #include "empathy-geometry.h"
 #include "empathy-gsettings.h"
 #include "empathy-images.h"
 #include "empathy-geometry.h"
 #include "empathy-gsettings.h"
 #include "empathy-images.h"

-#include "empathy-individual-manager.h"

 #include "empathy-invite-participant-dialog.h"
 #include "empathy-notify-manager.h"
 #include "empathy-request-util.h"
 #include "empathy-invite-participant-dialog.h"
 #include "empathy-notify-manager.h"
 #include "empathy-request-util.h"

diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h
index 8c59559722e95d9032dca4289bfff7b21348face..ae986cc7f07a0c4f72ede53fc00983facbfc8cd5 100644 (file)
--- a/src/empathy-chat-window.h
+++ b/src/empathy-chat-window.h
@@ -27,7 +27,6 @@
 #ifndef __EMPATHY_CHAT_WINDOW_H__
 #define __EMPATHY_CHAT_WINDOW_H__
 
 #ifndef __EMPATHY_CHAT_WINDOW_H__
 #define __EMPATHY_CHAT_WINDOW_H__
 

-#include <glib-object.h>

 #include <gtk/gtk.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 #include <gtk/gtk.h>
 #include <telepathy-glib/telepathy-glib.h>
 

diff --git a/src/empathy-debug-window.h b/src/empathy-debug-window.h
index 5269bcfc52d9e4390e4f6add24ae823ad070be85..c8944bf03007b43cb872ba39fa1bd61f7983217c 100644 (file)
--- a/src/empathy-debug-window.h
+++ b/src/empathy-debug-window.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_DEBUG_WINDOW_H__
 #define __EMPATHY_DEBUG_WINDOW_H__
 
 #ifndef __EMPATHY_DEBUG_WINDOW_H__
 #define __EMPATHY_DEBUG_WINDOW_H__
 

-#include <glib-object.h>

 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS

diff --git a/src/empathy-event-manager.h b/src/empathy-event-manager.h
index 511a5ed5785f26b8e62f88dda9986582559aa232..f2878c7ca55eb931df1782648f39bfc389b5f766 100644 (file)
--- a/src/empathy-event-manager.h
+++ b/src/empathy-event-manager.h
@@ -22,7 +22,6 @@
 #ifndef __EMPATHY_EVENT_MANAGER_H__
 #define __EMPATHY_EVENT_MANAGER_H__
 
 #ifndef __EMPATHY_EVENT_MANAGER_H__
 #define __EMPATHY_EVENT_MANAGER_H__
 

-#include <glib.h>

 #include <glib-object.h>
 
 #include "empathy-contact.h"
 #include <glib-object.h>
 
 #include "empathy-contact.h"

diff --git a/src/empathy-ft-manager.h b/src/empathy-ft-manager.h
index 22d47a76f7b531e4c498e08b8c8aeab6d156c7b5..be41730ebeba12b380b5e1cbe0b1b6e70f4a2528 100644 (file)
--- a/src/empathy-ft-manager.h
+++ b/src/empathy-ft-manager.h
@@ -25,9 +25,7 @@
 #ifndef __EMPATHY_FT_MANAGER_H__
 #define __EMPATHY_FT_MANAGER_H__
 
 #ifndef __EMPATHY_FT_MANAGER_H__
 #define __EMPATHY_FT_MANAGER_H__
 

-#include <gtk/gtk.h>

 #include <glib-object.h>
 #include <glib-object.h>

-#include <glib.h>

 
 #include "empathy-ft-handler.h"
 
 
 #include "empathy-ft-handler.h"
 

diff --git a/src/empathy-import-utils.h b/src/empathy-import-utils.h
index 59e1cb4d425ec936d9d27ad6d4924e17a64b539c..d860c4ee89c20ed995dec9f35c6ee542bea5bbc4 100644 (file)
--- a/src/empathy-import-utils.h
+++ b/src/empathy-import-utils.h
@@ -23,7 +23,6 @@
 #define __EMPATHY_IMPORT_UTILS_H__
 
 #include <telepathy-glib/telepathy-glib.h>
 #define __EMPATHY_IMPORT_UTILS_H__
 
 #include <telepathy-glib/telepathy-glib.h>

-#include <glib.h>

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index a572ad0c6c872c2baeae90990233cdfcbaa2a891..86dc9515058d896453f7e17b9008aa5fafb07978 100644 (file)
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -27,7 +27,6 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "empathy-import-dialog.h"

 #include "empathy-ui-utils.h"
 #include "empathy-utils.h"
 
 #include "empathy-ui-utils.h"
 #include "empathy-utils.h"
 

diff --git a/src/empathy-import-widget.h b/src/empathy-import-widget.h
index 508706fb819c15440682e4b8d952c4f851bd6175..8e9f32f5a2b8a0c7262b53044f4b33f8093950d0 100644 (file)
--- a/src/empathy-import-widget.h
+++ b/src/empathy-import-widget.h
@@ -25,7 +25,6 @@
 #ifndef __EMPATHY_IMPORT_WIDGET_H__
 #define __EMPATHY_IMPORT_WIDGET_H__
 
 #ifndef __EMPATHY_IMPORT_WIDGET_H__
 #define __EMPATHY_IMPORT_WIDGET_H__
 

-#include <glib-object.h>

 #include <gtk/gtk.h>
 
 #include "empathy-connection-managers.h"
 #include <gtk/gtk.h>
 
 #include "empathy-connection-managers.h"

diff --git a/src/empathy-mic-monitor.c b/src/empathy-mic-monitor.c
index 90d1088ff812d02ca22c0543d5182f9e2385795c..ae2b0c071de60cb5fe185efb6c7df080d45706bd 100644 (file)
--- a/src/empathy-mic-monitor.c
+++ b/src/empathy-mic-monitor.c
@@ -20,7 +20,6 @@
 #include "config.h"
 #include "empathy-mic-monitor.h"
 
 #include "config.h"
 #include "empathy-mic-monitor.h"
 

-#include <gtk/gtk.h>

 #include <pulse/glib-mainloop.h>
 
 #include "empathy-utils.h"
 #include <pulse/glib-mainloop.h>
 
 #include "empathy-utils.h"

diff --git a/src/empathy-mic-monitor.h b/src/empathy-mic-monitor.h
index 6d545483ed8a0276681b1e8f5ea67a4ff9715a96..73771681a1a2cf2a78edcb49c4bb846d86c5baf8 100644 (file)
--- a/src/empathy-mic-monitor.h
+++ b/src/empathy-mic-monitor.h
@@ -19,7 +19,6 @@
 #ifndef __EMPATHY_MIC_MONITOR_H__
 #define __EMPATHY_MIC_MONITOR_H__
 
 #ifndef __EMPATHY_MIC_MONITOR_H__
 #define __EMPATHY_MIC_MONITOR_H__
 

-#include <glib-object.h>

 #include <gio/gio.h>
 #include <pulse/pulseaudio.h>
 
 #include <gio/gio.h>
 #include <pulse/pulseaudio.h>
 

diff --git a/src/empathy-new-chatroom-dialog.h b/src/empathy-new-chatroom-dialog.h
index 9f7796dbeac3edea92f1e2296633554aee8b09d5..31212cb569719bd075048dff7e2bd01b0220a353 100644 (file)
--- a/src/empathy-new-chatroom-dialog.h
+++ b/src/empathy-new-chatroom-dialog.h
@@ -24,7 +24,6 @@
 #ifndef __EMPATHY_NEW_CHATROOM_DIALOG_H__
 #define __EMPATHY_NEW_CHATROOM_DIALOG_H__
 
 #ifndef __EMPATHY_NEW_CHATROOM_DIALOG_H__
 #define __EMPATHY_NEW_CHATROOM_DIALOG_H__
 

-#include <glib-object.h>

 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS

diff --git a/src/empathy-rounded-actor.h b/src/empathy-rounded-actor.h
index 49fc03fd3f89cb7ebbfa0e848d49fae31b83ebe9..29a7797a6a12091d28a4bff9c40353ac15f63ca7 100644 (file)
--- a/src/empathy-rounded-actor.h
+++ b/src/empathy-rounded-actor.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_ROUNDED_ACTOR_H__
 #define __EMPATHY_ROUNDED_ACTOR_H__
 
 #ifndef __EMPATHY_ROUNDED_ACTOR_H__
 #define __EMPATHY_ROUNDED_ACTOR_H__
 

-#include <glib-object.h>

 #include <clutter-gtk/clutter-gtk.h>
 
 G_BEGIN_DECLS
 #include <clutter-gtk/clutter-gtk.h>
 
 G_BEGIN_DECLS

diff --git a/src/empathy-rounded-rectangle.h b/src/empathy-rounded-rectangle.h
index e4bf72c6ef7d54c6a7222862e6c0755696229f88..b9988d53cd574a812a67d5d49e80d189df4fc32a 100644 (file)
--- a/src/empathy-rounded-rectangle.h
+++ b/src/empathy-rounded-rectangle.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_ROUNDED_RECTANGLE_H__
 #define __EMPATHY_ROUNDED_RECTANGLE_H__
 
 #ifndef __EMPATHY_ROUNDED_RECTANGLE_H__
 #define __EMPATHY_ROUNDED_RECTANGLE_H__
 

-#include <glib-object.h>

 #include <clutter/clutter.h>
 
 G_BEGIN_DECLS
 #include <clutter/clutter.h>
 
 G_BEGIN_DECLS

diff --git a/src/empathy-rounded-texture.h b/src/empathy-rounded-texture.h
index ab75757ddf353c05a9b60b0cb033732779b7cbcc..c5d870d03b017beaf9dc482b01aea23e74ccd96c 100644 (file)
--- a/src/empathy-rounded-texture.h
+++ b/src/empathy-rounded-texture.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_ROUNDED_TEXTURE_H__
 #define __EMPATHY_ROUNDED_TEXTURE_H__
 
 #ifndef __EMPATHY_ROUNDED_TEXTURE_H__
 #define __EMPATHY_ROUNDED_TEXTURE_H__
 

-#include <glib-object.h>

 #include <clutter/clutter.h>
 
 G_BEGIN_DECLS
 #include <clutter/clutter.h>
 
 G_BEGIN_DECLS

diff --git a/src/empathy-status-icon.h b/src/empathy-status-icon.h
index 44a0b125316f613e95be201c0c5583768ef47a86..586e651e2928587c66c4a06f0596b270e1d8c9d0 100644 (file)
--- a/src/empathy-status-icon.h
+++ b/src/empathy-status-icon.h
@@ -22,7 +22,6 @@
 #ifndef __EMPATHY_STATUS_ICON_H__
 #define __EMPATHY_STATUS_ICON_H__
 
 #ifndef __EMPATHY_STATUS_ICON_H__
 #define __EMPATHY_STATUS_ICON_H__
 

-#include <glib.h>

 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 #include <gtk/gtk.h>
 
 G_BEGIN_DECLS

diff --git a/src/empathy-video-src.h b/src/empathy-video-src.h
index e49c79a00ba41006d54242ec26fa3751a0e822e1..60127ba2dcc9651f22ebb81f303d8565f60b5ac8 100644 (file)
--- a/src/empathy-video-src.h
+++ b/src/empathy-video-src.h
@@ -21,7 +21,6 @@
 #ifndef __EMPATHY_GST_VIDEO_SRC_H__
 #define __EMPATHY_GST_VIDEO_SRC_H__
 
 #ifndef __EMPATHY_GST_VIDEO_SRC_H__
 #define __EMPATHY_GST_VIDEO_SRC_H__
 

-#include <glib-object.h>

 #include <gst/gst.h>
 
 G_BEGIN_DECLS
 #include <gst/gst.h>
 
 G_BEGIN_DECLS

diff --git a/tests/empathy-chatroom-manager-test.c b/tests/empathy-chatroom-manager-test.c
index 323bbb98b9428941f6649854a66d9d1a9006b389..7ebf87803cb49e43308266383b033b1ce1bbaa59 100644 (file)
--- a/tests/empathy-chatroom-manager-test.c
+++ b/tests/empathy-chatroom-manager-test.c
@@ -1,9 +1,3 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <glib/gstdio.h>
-#include <telepathy-glib/telepathy-glib.h>
-

 #include "empathy-chatroom-manager.h"
 #include "test-helper.h"
 
 #include "empathy-chatroom-manager.h"
 #include "test-helper.h"
 

diff --git a/tests/empathy-tls-test.c b/tests/empathy-tls-test.c
index 3e5706c6a1c16f1e6d81180701e60cbee65dbae1..2155c68b27addf05ec8896fb244e075eb7b9130e 100644 (file)
--- a/tests/empathy-tls-test.c
+++ b/tests/empathy-tls-test.c
@@ -1,11 +1,5 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <gcr/gcr.h>

 #include <gnutls/gnutls.h>
 #include <gnutls/gnutls.h>

-#include <telepathy-glib/telepathy-glib.h>

 #include <telepathy-glib/svc-tls.h>
 #include <telepathy-glib/svc-tls.h>

-#include <telepathy-glib/svc-generic.h>

 
 #include "empathy-tls-verifier.h"
 #include "mock-pkcs11.h"
 
 #include "empathy-tls-verifier.h"
 #include "mock-pkcs11.h"

diff --git a/tests/mock-pkcs11.c b/tests/mock-pkcs11.c
index 997b3311c543ac2b537388db22cb1f4c51b709c7..572221acc6f4fc8776866fb5e927caf2595be70d 100644 (file)
--- a/tests/mock-pkcs11.c
+++ b/tests/mock-pkcs11.c
@@ -21,8 +21,6 @@
 #include "config.h"
 #include "mock-pkcs11.h"
 
 #include "config.h"
 #include "mock-pkcs11.h"
 

-#include <gcr/gcr.h>
-#include <glib.h>

 #include <string.h>
 
 /*
 #include <string.h>
 
 /*

diff --git a/tests/mock-pkcs11.h b/tests/mock-pkcs11.h
index 11b219d48953f160886421ff021bd459c81678f4..aa024fcc95a974d6a4d328afc8334c05c6291e2a 100644 (file)
--- a/tests/mock-pkcs11.h
+++ b/tests/mock-pkcs11.h
@@ -18,10 +18,8 @@
  * 02111-1307, USA.
  */
 
  * 02111-1307, USA.
  */
 

-#include <glib.h>

 #include <gck/pkcs11x.h>
 #include <gcr/gcr.h>
 #include <gck/pkcs11x.h>
 #include <gcr/gcr.h>

-#include <p11-kit/pkcs11.h>

 
 #ifndef MOCK_MODULE_H
 #define MOCK_MODULE_H
 
 #ifndef MOCK_MODULE_H
 #define MOCK_MODULE_H

diff --git a/tests/test-helper.c b/tests/test-helper.c
index 8d7be5f4a0c120cc1c4e73435c3bd56d74fdaf2c..efe3e3fd6a023d3b9b4f90057dcaeb9745813e47 100644 (file)
--- a/tests/test-helper.c
+++ b/tests/test-helper.c
@@ -20,11 +20,6 @@
 #include "config.h"
 #include "test-helper.h"
 
 #include "config.h"
 #include "test-helper.h"
 

-#include <stdlib.h>
-#include <glib.h>
-#include <glib-object.h>
-#include <gtk/gtk.h>
-

 #include "empathy-ui-utils.h"
 
 void
 #include "empathy-ui-utils.h"
 
 void

diff --git a/tests/test-irc-helper.h b/tests/test-irc-helper.h
index ed7a6924e9de7f88f4c052ef16f4691a46893f7d..6010bc186600384614f57bfda025078774f648d3 100644 (file)
--- a/tests/test-irc-helper.h
+++ b/tests/test-irc-helper.h
@@ -1,9 +1,6 @@
-#include <stdlib.h>

 #include <string.h>
 
 #include <string.h>
 

-#include "empathy-irc-network.h"

 #include "empathy-irc-network-manager.h"
 #include "empathy-irc-network-manager.h"

-#include "empathy-irc-server.h"

 
 #ifndef __CHECK_IRC_HELPER_H__
 #define __CHECK_IRC_HELPER_H__
 
 #ifndef __CHECK_IRC_HELPER_H__
 #define __CHECK_IRC_HELPER_H__