diff options
Diffstat (limited to 'libempathy-gtk')
65 files changed, 3 insertions, 343 deletions
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c index e5827dc56..03aeacf71 100644 --- a/libempathy-gtk/empathy-account-chooser.c +++ b/libempathy-gtk/empathy-account-chooser.c @@ -23,12 +23,7 @@ #include "config.h" -#include <string.h> - #include <glib/gi18n-lib.h> -#include <gtk/gtk.h> - -#include <libempathy/empathy-utils.h> #include "empathy-ui-utils.h" #include "empathy-account-chooser.h" diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c index 8e6719464..c027fb250 100644 --- a/libempathy-gtk/empathy-account-widget-irc.c +++ b/libempathy-gtk/empathy-account-widget-irc.c @@ -20,18 +20,6 @@ #include "config.h" -#include <stdlib.h> -#include <string.h> -#include <sys/stat.h> - -#include <glib/gi18n-lib.h> -#include <gtk/gtk.h> - -#include <libempathy/empathy-utils.h> - -#include "empathy-irc-network-dialog.h" -#include "empathy-irc-network-chooser.h" -#include "empathy-account-widget.h" #include "empathy-account-widget-private.h" #include "empathy-account-widget-irc.h" #include "empathy-ui-utils.h" diff --git a/libempathy-gtk/empathy-account-widget-sip.c b/libempathy-gtk/empathy-account-widget-sip.c index 9599ce152..4568cf175 100644 --- a/libempathy-gtk/empathy-account-widget-sip.c +++ b/libempathy-gtk/empathy-account-widget-sip.c @@ -21,17 +21,8 @@ #include "config.h" -#include <stdlib.h> -#include <string.h> -#include <sys/stat.h> - #include <glib/gi18n-lib.h> -#include <gtk/gtk.h> - -#include <telepathy-glib/telepathy-glib.h> -#include <libempathy/empathy-utils.h> -#include "empathy-account-widget.h" #include "empathy-account-widget-private.h" #include "empathy-account-widget-sip.h" #include "empathy-ui-utils.h" diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index 8a8475b2f..794e7d524 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -26,19 +26,12 @@ #include "config.h" -#include <string.h> - -#include <gtk/gtk.h> #include <glib/gi18n-lib.h> -#include <gio/gdesktopappinfo.h> - #include <libempathy/empathy-utils.h> -#include <telepathy-glib/telepathy-glib.h> #include <dbus/dbus-protocol.h> -#include "empathy-account-widget.h" #include "empathy-account-widget-private.h" #include "empathy-account-widget-sip.h" #include "empathy-account-widget-irc.h" diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c index 9f2a5e01c..0a4517dec 100644 --- a/libempathy-gtk/empathy-avatar-chooser.c +++ b/libempathy-gtk/empathy-avatar-chooser.c @@ -22,13 +22,8 @@ #include "config.h" -#include <string.h> - #include <glib/gi18n-lib.h> -#include <gtk/gtk.h> -#include <gio/gio.h> -#include <libempathy/empathy-camera-monitor.h> #include <libempathy/empathy-gsettings.h> #include <libempathy/empathy-utils.h> @@ -40,7 +35,6 @@ #include <cheese-avatar-chooser.h> #endif /* HAVE_CHEESE */ - #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include <libempathy/empathy-debug.h> diff --git a/libempathy-gtk/empathy-avatar-chooser.h b/libempathy-gtk/empathy-avatar-chooser.h index fc21a7a39..dc82c0571 100644 --- a/libempathy-gtk/empathy-avatar-chooser.h +++ b/libempathy-gtk/empathy-avatar-chooser.h @@ -24,10 +24,9 @@ #ifndef __EMPATHY_AVATAR_CHOOSER_H__ #define __EMPATHY_AVATAR_CHOOSER_H__ +#include <gio/gio.h> #include <gtk/gtk.h> -#include <libempathy/empathy-contact.h> - G_BEGIN_DECLS #define EMPATHY_TYPE_AVATAR_CHOOSER (empathy_avatar_chooser_get_type ()) diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c index 3fb79692c..acb0903e4 100644 --- a/libempathy-gtk/empathy-avatar-image.c +++ b/libempathy-gtk/empathy-avatar-image.c @@ -24,9 +24,6 @@ #include "config.h" #include <glib/gi18n-lib.h> -#include <gdk/gdkkeysyms.h> -#include <gdk/gdk.h> -#include <gtk/gtk.h> #include <gdk/gdkx.h> #include <libempathy/empathy-utils.h> diff --git a/libempathy-gtk/empathy-avatar-image.h b/libempathy-gtk/empathy-avatar-image.h index 2271ecc72..9429a2874 100644 --- a/libempathy-gtk/empathy-avatar-image.h +++ b/libempathy-gtk/empathy-avatar-image.h @@ -26,8 +26,6 @@ #include <gtk/gtk.h> -#include <libempathy/empathy-contact.h> - G_BEGIN_DECLS #define EMPATHY_TYPE_AVATAR_IMAGE (empathy_avatar_image_get_type ()) diff --git a/libempathy-gtk/empathy-bad-password-dialog.c b/libempathy-gtk/empathy-bad-password-dialog.c index 3a582eac0..a6938b3e5 100644 --- a/libempathy-gtk/empathy-bad-password-dialog.c +++ b/libempathy-gtk/empathy-bad-password-dialog.c @@ -25,7 +25,6 @@ #define DEBUG_FLAG EMPATHY_DEBUG_SASL #include <libempathy/empathy-debug.h> -#include <libempathy/empathy-utils.h> G_DEFINE_TYPE (EmpathyBadPasswordDialog, empathy_bad_password_dialog, EMPATHY_TYPE_BASE_PASSWORD_DIALOG) diff --git a/libempathy-gtk/empathy-bad-password-dialog.h b/libempathy-gtk/empathy-bad-password-dialog.h index 5cf1c71c4..ad5179806 100644 --- a/libempathy-gtk/empathy-bad-password-dialog.h +++ b/libempathy-gtk/empathy-bad-password-dialog.h @@ -25,8 +25,6 @@ #include <libempathy-gtk/empathy-base-password-dialog.h> -#include <extensions/extensions.h> - G_BEGIN_DECLS typedef struct _EmpathyBadPasswordDialog EmpathyBadPasswordDialog; diff --git a/libempathy-gtk/empathy-base-password-dialog.h b/libempathy-gtk/empathy-base-password-dialog.h index c144a665b..3f4cfdd5e 100644 --- a/libempathy-gtk/empathy-base-password-dialog.h +++ b/libempathy-gtk/empathy-base-password-dialog.h @@ -22,10 +22,7 @@ #include <glib-object.h> #include <gtk/gtk.h> - -#include <libempathy/empathy-server-sasl-handler.h> - -#include <extensions/extensions.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-calendar-button.c b/libempathy-gtk/empathy-calendar-button.c index ab13037a7..f4c82eb4e 100644 --- a/libempathy-gtk/empathy-calendar-button.c +++ b/libempathy-gtk/empathy-calendar-button.c @@ -23,8 +23,6 @@ #include "empathy-calendar-button.h" -#include <libempathy/empathy-utils.h> - #define DEBUG_FLAG EMPATHY_DEBUG_OTHER_THING #include <libempathy/empathy-debug.h> diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c index bbbda511c..9f72ce9bb 100644 --- a/libempathy-gtk/empathy-call-utils.c +++ b/libempathy-gtk/empathy-call-utils.c @@ -23,13 +23,11 @@ #include <glib/gi18n-lib.h> #include <gtk/gtk.h> -#include <pulse/pulseaudio.h> #include <telepathy-glib/telepathy-glib.h> #include "empathy-call-utils.h" -#include <libempathy/empathy-gsettings.h> #include <libempathy/empathy-request-util.h> #define DEBUG_FLAG EMPATHY_DEBUG_OTHER diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.c b/libempathy-gtk/empathy-cell-renderer-activatable.c index 72cb4a7be..3db350935 100644 --- a/libempathy-gtk/empathy-cell-renderer-activatable.c +++ b/libempathy-gtk/empathy-cell-renderer-activatable.c @@ -22,8 +22,6 @@ #include "config.h" -#include <gtk/gtk.h> - #include <libempathy/empathy-utils.h> #include "empathy-cell-renderer-activatable.h" diff --git a/libempathy-gtk/empathy-cell-renderer-expander.c b/libempathy-gtk/empathy-cell-renderer-expander.c index 7ed62b41f..f7c873617 100644 --- a/libempathy-gtk/empathy-cell-renderer-expander.c +++ b/libempathy-gtk/empathy-cell-renderer-expander.c @@ -21,8 +21,6 @@ * Authors: Kristian Rietveld <kris@imendio.com> */ -#include <gtk/gtk.h> - #include <libempathy/empathy-utils.h> #include "empathy-cell-renderer-expander.h" diff --git a/libempathy-gtk/empathy-cell-renderer-text.c b/libempathy-gtk/empathy-cell-renderer-text.c index d96ccc403..0afd89748 100644 --- a/libempathy-gtk/empathy-cell-renderer-text.c +++ b/libempathy-gtk/empathy-cell-renderer-text.c @@ -23,8 +23,6 @@ #include "config.h" -#include <string.h> - #include <libempathy/empathy-utils.h> #include "empathy-cell-renderer-text.h" diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index 5a53867e2..ffd92b1cd 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -30,20 +30,12 @@ /* for GCompletion */ #define GLIB_DISABLE_DEPRECATION_WARNINGS 1 -#include <string.h> -#include <stdlib.h> - -#include <gdk/gdkkeysyms.h> #include <glib/gi18n-lib.h> -#include <gtk/gtk.h> -#include <telepathy-glib/telepathy-glib.h> -#include <telepathy-logger/telepathy-logger.h> #include <libempathy/empathy-gsettings.h> #include <libempathy/empathy-keyring.h> #include <libempathy/empathy-utils.h> #include <libempathy/empathy-request-util.h> -#include <libempathy/empathy-chatroom-manager.h> #include <libempathy/empathy-client-factory.h> #include "empathy-chat.h" @@ -54,7 +46,6 @@ #include "empathy-input-text-view.h" #include "empathy-search-bar.h" #include "empathy-theme-manager.h" -#include "empathy-theme-adium.h" #include "empathy-smiley-manager.h" #include "empathy-ui-utils.h" #include "empathy-string-parser.h" diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h index d81b56f48..269b00596 100644 --- a/libempathy-gtk/empathy-chat.h +++ b/libempathy-gtk/empathy-chat.h @@ -31,7 +31,6 @@ #include <gtk/gtk.h> #include <libempathy/empathy-contact.h> -#include <libempathy/empathy-message.h> #include <libempathy/empathy-tp-chat.h> #include <libempathy-gtk/empathy-theme-adium.h> diff --git a/libempathy-gtk/empathy-contact-chooser.c b/libempathy-gtk/empathy-contact-chooser.c index 69cfdef69..80ea9765a 100644 --- a/libempathy-gtk/empathy-contact-chooser.c +++ b/libempathy-gtk/empathy-contact-chooser.c @@ -11,9 +11,6 @@ #include "config.h" -#include <glib/gi18n-lib.h> -#include <folks/folks-telepathy.h> - #include "empathy-contact-chooser.h" #include <libempathy/empathy-utils.h> diff --git a/libempathy-gtk/empathy-contact-chooser.h b/libempathy-gtk/empathy-contact-chooser.h index 20a9b8c44..fa1c703a8 100644 --- a/libempathy-gtk/empathy-contact-chooser.h +++ b/libempathy-gtk/empathy-contact-chooser.h @@ -13,10 +13,7 @@ #define __EMPATHY_CONTACT_CHOOSER_H__ #include <gtk/gtk.h> - -#include <telepathy-glib/telepathy-glib.h> - -#include "libempathy/empathy-tp-chat.h" +#include <folks/folks.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-contact-search-dialog.c b/libempathy-gtk/empathy-contact-search-dialog.c index 0a189b3e1..0b01bf88d 100644 --- a/libempathy-gtk/empathy-contact-search-dialog.c +++ b/libempathy-gtk/empathy-contact-search-dialog.c @@ -26,8 +26,6 @@ #include <glib/gi18n-lib.h> -#include <telepathy-glib/telepathy-glib.h> - #include <libempathy/empathy-utils.h> #include <libempathy/empathy-client-factory.h> diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c index 0acf2a3e6..cef06d309 100644 --- a/libempathy-gtk/empathy-contact-widget.c +++ b/libempathy-gtk/empathy-contact-widget.c @@ -21,23 +21,12 @@ #include "config.h" -#include <string.h> -#include <stdlib.h> - -#include <gtk/gtk.h> #include <glib/gi18n-lib.h> -#include <telepathy-glib/telepathy-glib.h> - -#include <libempathy/empathy-time.h> #include <libempathy/empathy-utils.h> #include <libempathy/empathy-client-factory.h> -#include "empathy-calendar-button.h" #include "empathy-contact-widget.h" -#include "empathy-contactinfo-utils.h" -#include "empathy-account-chooser.h" -#include "empathy-avatar-chooser.h" #include "empathy-avatar-image.h" #include "empathy-groups-widget.h" #include "empathy-ui-utils.h" diff --git a/libempathy-gtk/empathy-contactinfo-utils.c b/libempathy-gtk/empathy-contactinfo-utils.c index 1f3b22135..7ec61310d 100644 --- a/libempathy-gtk/empathy-contactinfo-utils.c +++ b/libempathy-gtk/empathy-contactinfo-utils.c @@ -22,9 +22,6 @@ #include "config.h" -#include <string.h> -#include <stdlib.h> - #include <glib/gi18n-lib.h> #include <libempathy/empathy-time.h> diff --git a/libempathy-gtk/empathy-geometry.c b/libempathy-gtk/empathy-geometry.c index 986015452..d171f72fc 100644 --- a/libempathy-gtk/empathy-geometry.c +++ b/libempathy-gtk/empathy-geometry.c @@ -25,9 +25,6 @@ #include <sys/stat.h> -#include <glib.h> -#include <gdk/gdk.h> - #include "libempathy/empathy-utils.h" #include "empathy-geometry.h" #include "empathy-ui-utils.h" diff --git a/libempathy-gtk/empathy-groups-widget.c b/libempathy-gtk/empathy-groups-widget.c index 2e609cd9f..6b6a0d0dc 100644 --- a/libempathy-gtk/empathy-groups-widget.c +++ b/libempathy-gtk/empathy-groups-widget.c @@ -21,21 +21,12 @@ #include "config.h" -#include <string.h> -#include <stdlib.h> - -#include <gtk/gtk.h> #include <glib/gi18n-lib.h> -#include <telepathy-glib/telepathy-glib.h> - -#include <folks/folks.h> - #include <libempathy/empathy-utils.h> #include <libempathy/empathy-connection-aggregator.h> #include "empathy-groups-widget.h" -#include "empathy-ui-utils.h" /** * SECTION:empathy-groups-widget diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c index 7bbde2659..03874c905 100644 --- a/libempathy-gtk/empathy-individual-dialogs.c +++ b/libempathy-gtk/empathy-individual-dialogs.c @@ -21,22 +21,13 @@ #include "config.h" -#include <string.h> -#include <stdlib.h> - -#include <gtk/gtk.h> #include <glib/gi18n-lib.h> -#include <telepathy-glib/telepathy-glib.h> -#include <folks/folks.h> -#include <folks/folks-telepathy.h> - #include <libempathy/empathy-individual-manager.h> #include <libempathy/empathy-utils.h> #include "empathy-individual-dialogs.h" #include "empathy-contact-widget.h" -#include "empathy-ui-utils.h" #define BULLET_POINT "\342\200\242" diff --git a/libempathy-gtk/empathy-individual-edit-dialog.c b/libempathy-gtk/empathy-individual-edit-dialog.c index ec3bf9a1f..bd43adeb8 100644 --- a/libempathy-gtk/empathy-individual-edit-dialog.c +++ b/libempathy-gtk/empathy-individual-edit-dialog.c @@ -22,21 +22,12 @@ #include "config.h" -#include <string.h> -#include <stdlib.h> - -#include <gtk/gtk.h> #include <glib/gi18n-lib.h> -#include <telepathy-glib/telepathy-glib.h> -#include <folks/folks.h> - -#include <libempathy/empathy-individual-manager.h> #include <libempathy/empathy-utils.h> #include "empathy-individual-edit-dialog.h" #include "empathy-individual-widget.h" -#include "empathy-ui-utils.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualEditDialog) diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c index 88648bdf2..cd6392a9b 100644 --- a/libempathy-gtk/empathy-individual-information-dialog.c +++ b/libempathy-gtk/empathy-individual-information-dialog.c @@ -23,16 +23,7 @@ #include "config.h" -#include <string.h> -#include <stdlib.h> - -#include <gtk/gtk.h> #include <glib/gi18n-lib.h> -#include <gio/gdesktopappinfo.h> - -#include <telepathy-glib/telepathy-glib.h> -#include <folks/folks.h> -#include <folks/folks-telepathy.h> #include <libempathy/empathy-individual-manager.h> #include <libempathy/empathy-utils.h> diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c index 133bd6a80..4cadf22a2 100644 --- a/libempathy-gtk/empathy-individual-menu.c +++ b/libempathy-gtk/empathy-individual-menu.c @@ -22,15 +22,7 @@ #include "config.h" -#include <string.h> - #include <glib/gi18n-lib.h> -#include <gtk/gtk.h> - -#include <telepathy-glib/telepathy-glib.h> - -#include <folks/folks.h> -#include <folks/folks-telepathy.h> #include <libempathy/empathy-camera-monitor.h> #include <libempathy/empathy-request-util.h> @@ -39,7 +31,6 @@ #include <libempathy/empathy-utils.h> #include "empathy-account-selector-dialog.h" -#include "empathy-individual-menu.h" #include "empathy-images.h" #include "empathy-log-window.h" #include "empathy-individual-dialogs.h" diff --git a/libempathy-gtk/empathy-individual-store-channel.c b/libempathy-gtk/empathy-individual-store-channel.c index 389175ebf..0fefb9c85 100644 --- a/libempathy-gtk/empathy-individual-store-channel.c +++ b/libempathy-gtk/empathy-individual-store-channel.c @@ -25,24 +25,10 @@ #include "config.h" -#include <string.h> - -#include <glib.h> -#include <glib/gi18n-lib.h> -#include <gtk/gtk.h> - -#include <folks/folks.h> -#include <folks/folks-telepathy.h> -#include <telepathy-glib/telepathy-glib.h> - #include <libempathy/empathy-utils.h> -#include <libempathy/empathy-enum-types.h> #include "empathy-individual-store-channel.h" -#include "empathy-ui-utils.h" -#include "empathy-gtk-enum-types.h" - #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT #include <libempathy/empathy-debug.h> diff --git a/libempathy-gtk/empathy-individual-store-manager.c b/libempathy-gtk/empathy-individual-store-manager.c index 78d3a07e3..ea872b1d1 100644 --- a/libempathy-gtk/empathy-individual-store-manager.c +++ b/libempathy-gtk/empathy-individual-store-manager.c @@ -25,25 +25,8 @@ #include "config.h" -#include <string.h> - -#include <glib.h> -#include <glib/gi18n-lib.h> -#include <gtk/gtk.h> - -#include <folks/folks.h> -#include <folks/folks-telepathy.h> -#include <telepathy-glib/telepathy-glib.h> - -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-enum-types.h> -#include <libempathy/empathy-individual-manager.h> - #include "empathy-individual-store-manager.h" -#include "empathy-ui-utils.h" -#include "empathy-gtk-enum-types.h" - #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT #include <libempathy/empathy-debug.h> diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c index 444a6c5fd..ddaea26b4 100644 --- a/libempathy-gtk/empathy-individual-store.c +++ b/libempathy-gtk/empathy-individual-store.c @@ -26,20 +26,10 @@ #include "config.h" -#include <string.h> - -#include <glib.h> #include <glib/gi18n-lib.h> -#include <gtk/gtk.h> - -#include <folks/folks.h> -#include <folks/folks-telepathy.h> -#include <telepathy-glib/telepathy-glib.h> #include <libempathy/empathy-utils.h> -#include <libempathy/empathy-enum-types.h> -#include "empathy-individual-store.h" #include "empathy-ui-utils.h" #include "empathy-gtk-enum-types.h" diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index 9cb8b86a9..7e36fe19a 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -26,16 +26,7 @@ #include "config.h" -#include <string.h> - #include <glib/gi18n-lib.h> -#include <gdk/gdkkeysyms.h> -#include <gtk/gtk.h> - -#include <telepathy-glib/telepathy-glib.h> - -#include <folks/folks.h> -#include <folks/folks-telepathy.h> #include <libempathy/empathy-connection-aggregator.h> #include <libempathy/empathy-individual-manager.h> @@ -43,11 +34,7 @@ #include <libempathy/empathy-request-util.h> #include <libempathy/empathy-utils.h> -#include "empathy-individual-view.h" -#include "empathy-individual-menu.h" -#include "empathy-individual-store.h" #include "empathy-individual-edit-dialog.h" -#include "empathy-individual-dialogs.h" #include "empathy-images.h" #include "empathy-cell-renderer-expander.h" #include "empathy-cell-renderer-text.h" diff --git a/libempathy-gtk/empathy-individual-view.h b/libempathy-gtk/empathy-individual-view.h index 87dd20c76..baac701ed 100644 --- a/libempathy-gtk/empathy-individual-view.h +++ b/libempathy-gtk/empathy-individual-view.h @@ -31,8 +31,6 @@ #include <folks/folks.h> -#include <libempathy/empathy-enum-types.h> - #include "empathy-live-search.h" #include "empathy-individual-menu.h" #include "empathy-individual-store.h" diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c index d962939f3..12093b577 100644 --- a/libempathy-gtk/empathy-individual-widget.c +++ b/libempathy-gtk/empathy-individual-widget.c @@ -21,17 +21,8 @@ #include "config.h" -#include <string.h> -#include <stdlib.h> - -#include <gtk/gtk.h> #include <glib/gi18n-lib.h> -#include <telepathy-glib/telepathy-glib.h> - -#include <folks/folks.h> -#include <folks/folks-telepathy.h> - #ifdef HAVE_LIBCHAMPLAIN #include <champlain/champlain.h> #include <champlain-gtk/champlain-gtk.h> @@ -45,7 +36,6 @@ #include "empathy-contactinfo-utils.h" #include "empathy-groups-widget.h" #include "empathy-gtk-enum-types.h" -#include "empathy-individual-widget.h" #include "empathy-ui-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT diff --git a/libempathy-gtk/empathy-individual-widget.h b/libempathy-gtk/empathy-individual-widget.h index 24a7f3dc3..b8156c48a 100644 --- a/libempathy-gtk/empathy-individual-widget.h +++ b/libempathy-gtk/empathy-individual-widget.h @@ -25,8 +25,6 @@ #include <folks/folks.h> -#include "empathy-contact-widget.h" - G_BEGIN_DECLS /** diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.c b/libempathy-gtk/empathy-irc-network-chooser-dialog.c index e5dbe0155..00e9bf0eb 100644 --- a/libempathy-gtk/empathy-irc-network-chooser-dialog.c +++ b/libempathy-gtk/empathy-irc-network-chooser-dialog.c @@ -21,18 +21,12 @@ #include "config.h" -#include <stdlib.h> -#include <string.h> -#include <sys/stat.h> - #include <glib/gi18n-lib.h> -#include <gtk/gtk.h> #include <libempathy/empathy-utils.h> #include <libempathy/empathy-irc-network-manager.h> #include "empathy-irc-network-dialog.h" -#include "empathy-ui-utils.h" #include "empathy-live-search.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC diff --git a/libempathy-gtk/empathy-irc-network-chooser.c b/libempathy-gtk/empathy-irc-network-chooser.c index d6c51aee6..e19b3e8ab 100644 --- a/libempathy-gtk/empathy-irc-network-chooser.c +++ b/libempathy-gtk/empathy-irc-network-chooser.c @@ -21,17 +21,9 @@ #include "config.h" -#include <stdlib.h> -#include <string.h> -#include <sys/stat.h> - -#include <glib/gi18n-lib.h> -#include <gtk/gtk.h> - #include <libempathy/empathy-utils.h> #include <libempathy/empathy-irc-network-manager.h> -#include "empathy-irc-network-dialog.h" #include "empathy-ui-utils.h" #include "empathy-irc-network-chooser-dialog.h" diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c index 65f0a41bb..aedb5dc79 100644 --- a/libempathy-gtk/empathy-irc-network-dialog.c +++ b/libempathy-gtk/empathy-irc-network-dialog.c @@ -20,16 +20,10 @@ #include "config.h" -#include <stdlib.h> -#include <string.h> -#include <sys/stat.h> - #include <glib/gi18n-lib.h> -#include <gtk/gtk.h> #include <libempathy/empathy-utils.h> -#include <libempathy/empathy-irc-network-manager.h> #include "empathy-ui-utils.h" #include "totem-subtitle-encoding.h" diff --git a/libempathy-gtk/empathy-live-search.c b/libempathy-gtk/empathy-live-search.c index 4a5ba8569..e65adbe4c 100644 --- a/libempathy-gtk/empathy-live-search.c +++ b/libempathy-gtk/empathy-live-search.c @@ -22,10 +22,6 @@ */ #include "config.h" -#include <string.h> - -#include <gtk/gtk.h> -#include <gdk/gdkkeysyms.h> #include <libempathy/empathy-utils.h> diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c index 7cdf2517d..ab72fff7d 100644 --- a/libempathy-gtk/empathy-location-manager.c +++ b/libempathy-gtk/empathy-location-manager.c @@ -21,23 +21,12 @@ #include "config.h" -#include <string.h> -#include <time.h> - -#include <glib/gi18n-lib.h> - -#include <telepathy-glib/telepathy-glib.h> - #include <geoclue/geoclue-master.h> -#include <extensions/extensions.h> - #include "empathy-location-manager.h" -#include "libempathy/empathy-enum-types.h" #include "libempathy/empathy-gsettings.h" #include "libempathy/empathy-location.h" -#include "libempathy/empathy-utils.h" #include "libempathy/empathy-time.h" #define DEBUG_FLAG EMPATHY_DEBUG_LOCATION diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index 3bc2967fd..80733da1b 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -24,29 +24,18 @@ #include "config.h" -#include <string.h> -#include <stdlib.h> - #include <glib/gi18n-lib.h> -#include <gtk/gtk.h> #include <webkit/webkit.h> -#include <telepathy-glib/telepathy-glib.h> #include <telepathy-glib/proxy-subclass.h> -#include <telepathy-logger/telepathy-logger.h> - #include <extensions/extensions.h> #include <libempathy/action-chain-internal.h> #include <libempathy/empathy-camera-monitor.h> -#include <libempathy/empathy-chatroom-manager.h> -#include <libempathy/empathy-chatroom.h> #include <libempathy/empathy-gsettings.h> -#include <libempathy/empathy-message.h> #include <libempathy/empathy-request-util.h> #include <libempathy/empathy-utils.h> -#include <libempathy/empathy-time.h> #include "empathy-log-window.h" #include "empathy-account-chooser.h" diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c index 1fff3c7ae..d770d6d98 100644 --- a/libempathy-gtk/empathy-new-call-dialog.c +++ b/libempathy-gtk/empathy-new-call-dialog.c @@ -20,17 +20,10 @@ #include "config.h" -#include <string.h> -#include <stdlib.h> - -#include <gtk/gtk.h> #include <glib/gi18n-lib.h> -#include <telepathy-glib/telepathy-glib.h> - #include <libempathy/empathy-camera-monitor.h> #include <libempathy/empathy-utils.h> -#include <libempathy/empathy-request-util.h> #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT #include <libempathy/empathy-debug.h> @@ -40,7 +33,6 @@ #include <libempathy-gtk/empathy-images.h> #include "empathy-new-call-dialog.h" -#include "empathy-account-chooser.h" #include "empathy-call-utils.h" static EmpathyNewCallDialog *dialog_singleton = NULL; diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c index c12803278..c38a1c75b 100644 --- a/libempathy-gtk/empathy-new-message-dialog.c +++ b/libempathy-gtk/empathy-new-message-dialog.c @@ -20,16 +20,9 @@ #include "config.h" -#include <string.h> -#include <stdlib.h> - -#include <gtk/gtk.h> #include <glib/gi18n-lib.h> -#include <telepathy-glib/telepathy-glib.h> - #include <libempathy/empathy-request-util.h> -#include <libempathy/empathy-utils.h> #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT #include <libempathy/empathy-debug.h> @@ -39,7 +32,6 @@ #include <libempathy-gtk/empathy-images.h> #include "empathy-new-message-dialog.h" -#include "empathy-account-chooser.h" static EmpathyNewMessageDialog *dialog_singleton = NULL; diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c index 383a423c8..d142b7fa3 100644 --- a/libempathy-gtk/empathy-notify-manager.c +++ b/libempathy-gtk/empathy-notify-manager.c @@ -18,13 +18,9 @@ */ #include "config.h" -#include <string.h> -#include <libnotify/notification.h> #include <libnotify/notify.h> -#include <telepathy-glib/telepathy-glib.h> - #include <libempathy/empathy-gsettings.h> #include <libempathy/empathy-utils.h> diff --git a/libempathy-gtk/empathy-password-dialog.c b/libempathy-gtk/empathy-password-dialog.c index a85a9d8e6..07fb69fc0 100644 --- a/libempathy-gtk/empathy-password-dialog.c +++ b/libempathy-gtk/empathy-password-dialog.c @@ -25,7 +25,6 @@ #define DEBUG_FLAG EMPATHY_DEBUG_SASL #include <libempathy/empathy-debug.h> -#include <libempathy/empathy-utils.h> G_DEFINE_TYPE (EmpathyPasswordDialog, empathy_password_dialog, EMPATHY_TYPE_BASE_PASSWORD_DIALOG) diff --git a/libempathy-gtk/empathy-password-dialog.h b/libempathy-gtk/empathy-password-dialog.h index d561af14a..ee1c993b4 100644 --- a/libempathy-gtk/empathy-password-dialog.h +++ b/libempathy-gtk/empathy-password-dialog.h @@ -27,8 +27,6 @@ #include <libempathy-gtk/empathy-base-password-dialog.h> -#include <extensions/extensions.h> - G_BEGIN_DECLS typedef struct _EmpathyPasswordDialog EmpathyPasswordDialog; diff --git a/libempathy-gtk/empathy-plist.c b/libempathy-gtk/empathy-plist.c index be7b23a47..ddaa97b7f 100644 --- a/libempathy-gtk/empathy-plist.c +++ b/libempathy-gtk/empathy-plist.c @@ -21,7 +21,6 @@ #include "config.h" #include <string.h> -#include <libxml/parser.h> #include <libxml/tree.h> #include <telepathy-glib/telepathy-glib.h> diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c index 16b7a54e9..a047890bb 100644 --- a/libempathy-gtk/empathy-presence-chooser.c +++ b/libempathy-gtk/empathy-presence-chooser.c @@ -26,14 +26,7 @@ #include "config.h" -#include <string.h> -#include <stdlib.h> - #include <glib/gi18n-lib.h> -#include <gtk/gtk.h> -#include <gdk/gdkkeysyms.h> - -#include <telepathy-glib/telepathy-glib.h> #include <libempathy/empathy-presence-manager.h> #include <libempathy/empathy-utils.h> @@ -43,7 +36,6 @@ #include <libempathy/empathy-debug.h> #include "empathy-ui-utils.h" -#include "empathy-images.h" #include "empathy-presence-chooser.h" #include "empathy-status-preset-dialog.h" diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c index 50a96da71..d5b0de7c1 100644 --- a/libempathy-gtk/empathy-protocol-chooser.c +++ b/libempathy-gtk/empathy-protocol-chooser.c @@ -22,10 +22,6 @@ #include "config.h" -#include <string.h> - -#include <gtk/gtk.h> - #include <glib/gi18n-lib.h> #include <libempathy/empathy-utils.h> diff --git a/libempathy-gtk/empathy-roster-contact.c b/libempathy-gtk/empathy-roster-contact.c index 7ab808746..d8410b5e6 100644 --- a/libempathy-gtk/empathy-roster-contact.c +++ b/libempathy-gtk/empathy-roster-contact.c @@ -4,8 +4,6 @@ #include "empathy-roster-contact.h" -#include <telepathy-glib/telepathy-glib.h> - #include <libempathy/empathy-utils.h> #include <libempathy-gtk/empathy-images.h> diff --git a/libempathy-gtk/empathy-roster-model-aggregator.c b/libempathy-gtk/empathy-roster-model-aggregator.c index a11a69d39..a81b2c254 100644 --- a/libempathy-gtk/empathy-roster-model-aggregator.c +++ b/libempathy-gtk/empathy-roster-model-aggregator.c @@ -21,10 +21,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - #include "config.h" -#include <folks/folks.h> #include <folks/folks-telepathy.h> #include "empathy-roster-model-aggregator.h" diff --git a/libempathy-gtk/empathy-roster-view.c b/libempathy-gtk/empathy-roster-view.c index c3ae66e25..ed57be3d4 100644 --- a/libempathy-gtk/empathy-roster-view.c +++ b/libempathy-gtk/empathy-roster-view.c @@ -10,8 +10,6 @@ #include <libempathy-gtk/empathy-roster-group.h> #include <libempathy-gtk/empathy-ui-utils.h> -#include <libempathy/empathy-utils.h> - G_DEFINE_TYPE (EmpathyRosterView, empathy_roster_view, EGG_TYPE_LIST_BOX) /* Flashing delay for icons (milliseconds). */ diff --git a/libempathy-gtk/empathy-search-bar.c b/libempathy-gtk/empathy-search-bar.c index 769276b13..018a068ab 100644 --- a/libempathy-gtk/empathy-search-bar.c +++ b/libempathy-gtk/empathy-search-bar.c @@ -19,15 +19,10 @@ #include "config.h" -#include <glib.h> -#include <glib-object.h> #include <glib/gi18n-lib.h> -#include <gtk/gtk.h> -#include <gdk/gdkkeysyms.h> #include <libempathy/empathy-utils.h> -#include "empathy-theme-adium.h" #include "empathy-search-bar.h" #include "empathy-ui-utils.h" diff --git a/libempathy-gtk/empathy-share-my-desktop.c b/libempathy-gtk/empathy-share-my-desktop.c index 0414f7d4b..8b0845048 100644 --- a/libempathy-gtk/empathy-share-my-desktop.c +++ b/libempathy-gtk/empathy-share-my-desktop.c @@ -20,11 +20,6 @@ #include "config.h" -#include <gtk/gtk.h> - -#include <dbus/dbus-glib.h> -#include <telepathy-glib/telepathy-glib.h> - #define DEBUG_FLAG EMPATHY_DEBUG_SHARE_DESKTOP #include <libempathy/empathy-debug.h> diff --git a/libempathy-gtk/empathy-smiley-manager.c b/libempathy-gtk/empathy-smiley-manager.c index 05107d9e1..99caa51d7 100644 --- a/libempathy-gtk/empathy-smiley-manager.c +++ b/libempathy-gtk/empathy-smiley-manager.c @@ -22,8 +22,6 @@ #include "config.h" -#include <string.h> - #include <libempathy/empathy-utils.h> #include "empathy-smiley-manager.h" #include "empathy-ui-utils.h" diff --git a/libempathy-gtk/empathy-sound-manager.c b/libempathy-gtk/empathy-sound-manager.c index 7b68dc0e0..3291a9a92 100644 --- a/libempathy-gtk/empathy-sound-manager.c +++ b/libempathy-gtk/empathy-sound-manager.c @@ -21,9 +21,7 @@ #include "empathy-sound-manager.h" -#include <canberra-gtk.h> #include <glib/gi18n-lib.h> -#include <gtk/gtk.h> #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include <libempathy/empathy-debug.h> diff --git a/libempathy-gtk/empathy-spell.c b/libempathy-gtk/empathy-spell.c index 709d09be0..4242b5738 100644 --- a/libempathy-gtk/empathy-spell.c +++ b/libempathy-gtk/empathy-spell.c @@ -23,9 +23,6 @@ #include "config.h" -#include <string.h> -#include <stdlib.h> - #include <glib/gi18n-lib.h> #ifdef HAVE_ENCHANT diff --git a/libempathy-gtk/empathy-status-preset-dialog.c b/libempathy-gtk/empathy-status-preset-dialog.c index e68f080fb..19f1fee6a 100644 --- a/libempathy-gtk/empathy-status-preset-dialog.c +++ b/libempathy-gtk/empathy-status-preset-dialog.c @@ -37,7 +37,6 @@ #include "config.h" #include <glib/gi18n-lib.h> -#include <gtk/gtk.h> #include <libempathy/empathy-utils.h> #include <libempathy/empathy-status-presets.h> diff --git a/libempathy-gtk/empathy-string-parser.c b/libempathy-gtk/empathy-string-parser.c index 3f4d16fcd..cb7d3c3e1 100644 --- a/libempathy-gtk/empathy-string-parser.c +++ b/libempathy-gtk/empathy-string-parser.c @@ -20,8 +20,6 @@ #include "config.h" -#include <string.h> - #include "empathy-string-parser.h" #include "empathy-smiley-manager.h" #include "empathy-ui-utils.h" diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index d304c5e19..67ec4d08f 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -21,15 +21,8 @@ #include "config.h" -#include <string.h> #include <glib/gi18n-lib.h> -#include <webkit/webkit.h> -#include <telepathy-glib/telepathy-glib.h> - -#include <pango/pango.h> -#include <gdk/gdk.h> - #include <libempathy/empathy-gsettings.h> #include <libempathy/empathy-time.h> #include <libempathy/empathy-utils.h> diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c index e743e2fa5..f3d8d67bc 100644 --- a/libempathy-gtk/empathy-theme-manager.c +++ b/libempathy-gtk/empathy-theme-manager.c @@ -24,16 +24,11 @@ #include <string.h> -#include <glib/gi18n-lib.h> #include <gtk/gtk.h> -#include <telepathy-glib/telepathy-glib.h> - #include <libempathy/empathy-gsettings.h> -#include <libempathy/empathy-utils.h> #include "empathy-theme-manager.h" -#include "empathy-theme-adium.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include <libempathy/empathy-debug.h> diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c index 2ef15f72b..82244403a 100644 --- a/libempathy-gtk/empathy-tls-dialog.c +++ b/libempathy-gtk/empathy-tls-dialog.c @@ -24,9 +24,6 @@ #include <glib/gi18n-lib.h> #include <gcr/gcr.h> -#include <telepathy-glib/telepathy-glib.h> - -#include <gcr/gcr.h> #define DEBUG_FLAG EMPATHY_DEBUG_TLS #include <libempathy/empathy-debug.h> diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index 56b85856e..9f4300840 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -31,21 +31,14 @@ #include "config.h" -#include <string.h> #include <X11/Xatom.h> #include <gdk/gdkx.h> #include <glib/gi18n-lib.h> -#include <gtk/gtk.h> -#include <gio/gio.h> #include <gio/gdesktopappinfo.h> -#include <telepathy-glib/telepathy-glib.h> -#include <folks/folks.h> - #include "empathy-ui-utils.h" #include "empathy-images.h" #include "empathy-live-search.h" -#include "empathy-smiley-manager.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include <libempathy/empathy-debug.h> diff --git a/libempathy-gtk/totem-subtitle-encoding.c b/libempathy-gtk/totem-subtitle-encoding.c index f376ea728..2db1c23c0 100644 --- a/libempathy-gtk/totem-subtitle-encoding.c +++ b/libempathy-gtk/totem-subtitle-encoding.c @@ -30,7 +30,6 @@ #include "config.h" #include <glib/gi18n-lib.h> #include "totem-subtitle-encoding.h" -#include <string.h> typedef enum { |