Commit b25bcd66 authored by Emanuele Aina's avatar Emanuele Aina

Clean up #include directives in headers

Reorder some inclusions and remove a few blank lines.

https://bugzilla.gnome.org/show_bug.cgi?id=697076
parent 0d137b74
......@@ -25,7 +25,6 @@
#define __EMPATHY_ACCOUNT_CHOOSER_H__
#include <gtk/gtk.h>
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
......
......@@ -22,6 +22,7 @@
#define __EMPATHY_ACCOUNT_WIDGET_IRC_H__
#include <gtk/gtk.h>
#include "empathy-account-widget.h"
#include "empathy-irc-network-chooser.h"
......
......@@ -22,10 +22,11 @@
#ifndef __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
#define __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
#include "empathy-account-widget.h"
#include <glib.h>
#include <gtk/gtk.h>
#include "empathy-account-widget.h"
G_BEGIN_DECLS
struct _EmpathyAccountWidgetUIDetails {
......
......@@ -22,6 +22,7 @@
#define __EMPATHY_ACCOUNT_WIDGET_SIP_H__
#include <gtk/gtk.h>
#include "empathy-account-widget.h"
G_BEGIN_DECLS
......
......@@ -31,9 +31,8 @@
#include <gtk/gtk.h>
#include "empathy-contact.h"
#include "empathy-tp-chat.h"
#include "empathy-theme-adium.h"
#include "empathy-tp-chat.h"
G_BEGIN_DECLS
......
......@@ -24,8 +24,8 @@
#include <gtk/gtk.h>
#include "empathy-contact.h"
#include "empathy-account-chooser.h"
#include "empathy-contact.h"
G_BEGIN_DECLS
......
......@@ -23,7 +23,6 @@
#include <glib.h>
#include <gtk/gtk.h>
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
......
......@@ -25,7 +25,6 @@
#define __EMPATHY_DIALPAD_BUTTON_H__
#include <gtk/gtk.h>
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
......
......@@ -23,7 +23,6 @@
#define __EMPATHY_GROUPS_WIDGET_H__
#include <gtk/gtk.h>
#include <folks/folks.h>
G_BEGIN_DECLS
......
......@@ -24,7 +24,6 @@
#define __EMPATHY_INDIVIDUAL_DIALOGS_H__
#include <gtk/gtk.h>
#include <folks/folks.h>
G_BEGIN_DECLS
......
......@@ -23,7 +23,6 @@
#define __EMPATHY_INDIVIDUAL_EDIT_DIALOG_H__
#include <gtk/gtk.h>
#include <folks/folks.h>
G_BEGIN_DECLS
......
......@@ -24,7 +24,6 @@
#define __EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_H__
#include <gtk/gtk.h>
#include <folks/folks.h>
G_BEGIN_DECLS
......
......@@ -29,7 +29,6 @@
#include <gtk/gtk.h>
#include "empathy-individual-manager.h"
#include "empathy-individual-store.h"
G_BEGIN_DECLS
......
......@@ -28,12 +28,11 @@
#define __EMPATHY_INDIVIDUAL_VIEW_H__
#include <gtk/gtk.h>
#include <folks/folks.h>
#include "empathy-live-search.h"
#include "empathy-individual-menu.h"
#include "empathy-individual-store.h"
#include "empathy-live-search.h"
G_BEGIN_DECLS
#define EMPATHY_TYPE_INDIVIDUAL_VIEW (empathy_individual_view_get_type ())
......
......@@ -22,7 +22,6 @@
#define __EMPATHY_INDIVIDUAL_WIDGET_H__
#include <gtk/gtk.h>
#include <folks/folks.h>
G_BEGIN_DECLS
......
......@@ -22,7 +22,6 @@
#define __EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET_H__
#include <gtk/gtk.h>
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
......
......@@ -25,7 +25,6 @@
#include <glib-object.h>
G_BEGIN_DECLS
#define EMPATHY_TYPE_LOCATION_MANAGER (empathy_location_manager_get_type ())
......
......@@ -22,11 +22,10 @@
#define __EMPATHY_NOTIFY_MANAGER_H__
#include <glib-object.h>
#include <libnotify/notification.h>
#include "empathy-contact.h"
#include <libnotify/notification.h>
G_BEGIN_DECLS
#define EMPATHY_NOTIFY_MANAGER_CAP_ACTIONS "actions"
......
......@@ -23,9 +23,8 @@
#include <glib-object.h>
#include <gtk/gtk.h>
#include "empathy-server-sasl-handler.h"
#include "empathy-base-password-dialog.h"
#include "empathy-server-sasl-handler.h"
G_BEGIN_DECLS
......
......@@ -25,7 +25,6 @@
#include <glib-object.h>
#include <gtk/gtk.h>
#include <telepathy-glib/telepathy-glib.h>
#include "empathy-account-settings.h"
......
......@@ -23,7 +23,6 @@
#define __EMPATHY_ROSTER_MODEL_AGGREGATOR_H__
#include <glib-object.h>
#include <folks/folks.h>
#include "empathy-roster-model.h"
......
......@@ -21,7 +21,6 @@
#define __EMPATHY_ROSTER_MODEL_H__
#include <glib-object.h>
#include <folks/folks.h>
G_BEGIN_DECLS
......
......@@ -4,7 +4,6 @@
#include "egg-list-box/egg-list-box.h"
#include "empathy-live-search.h"
#include "empathy-roster-model.h"
G_BEGIN_DECLS
......
......@@ -22,7 +22,6 @@
#define __EMPATHY_SOUND_MANAGER_H__
#include <gtk/gtk.h>
#include <canberra-gtk.h>
G_BEGIN_DECLS
......
......@@ -23,7 +23,6 @@
#include <glib-object.h>
#include <gtk/gtk.h>
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
......
......@@ -33,7 +33,6 @@
#define __EMPATHY_UI_UTILS_H__
#include <gtk/gtk.h>
#include <folks/folks.h>
#include "empathy-contact.h"
......
......@@ -21,7 +21,6 @@
#define __EMPATHY_USER_INFO_H__
#include <gtk/gtk.h>
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
......
......@@ -23,7 +23,6 @@
#include <glib-object.h>
#include <gio/gio.h>
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
......
......@@ -22,7 +22,6 @@
#define __EMPATHY_AUTH_FACTORY_H__
#include <glib-object.h>
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
......
......@@ -25,7 +25,6 @@
#define __EMPATHY_CHATROOM_MANAGER_H__
#include <glib-object.h>
#include <telepathy-glib/telepathy-glib.h>
#include "empathy-chatroom.h"
......
......@@ -23,7 +23,6 @@
#define __EMPATHY_CHATROOM_H__
#include <glib-object.h>
#include <telepathy-glib/telepathy-glib.h>
#include "empathy-tp-chat.h"
......
......@@ -22,7 +22,6 @@
#define __EMPATHY_CONNECTION_AGGREGATOR_H__
#include <glib-object.h>
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
......
......@@ -23,7 +23,6 @@
#include <glib-object.h>
#include <gio/gio.h>
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
......
......@@ -23,7 +23,6 @@
#define __EMPATHY_CONTACT_H__
#include <glib-object.h>
#include <telepathy-glib/telepathy-glib.h>
#include <telepathy-logger/telepathy-logger.h>
#include <folks/folks.h>
......
......@@ -21,9 +21,6 @@
#ifndef __EMPATHY_DEBUG_H__
#define __EMPATHY_DEBUG_H__
#include "config.h"
#include <glib.h>
#include <telepathy-glib/telepathy-glib.h>
......
......@@ -26,7 +26,6 @@
#include <glib-object.h>
#include <gio/gio.h>
#include <telepathy-glib/telepathy-glib.h>
#include "empathy-contact.h"
......
......@@ -20,7 +20,6 @@
#define __EMPATHY_KEYRING_H__
#include <gio/gio.h>
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
......
......@@ -22,7 +22,6 @@
#define __EMPATHY_PRESENCE_MANAGER_H__
#include <glib.h>
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
......
......@@ -23,7 +23,6 @@
#include <glib.h>
#include <gio/gio.h>
#include <telepathy-glib/telepathy-glib.h>
#include "empathy-contact.h"
......
......@@ -22,7 +22,6 @@
#include <glib-object.h>
#include <gio/gio.h>
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
......
......@@ -23,7 +23,6 @@
#include <glib-object.h>
#include <gio/gio.h>
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
......
......@@ -24,7 +24,6 @@
#define __USE_XOPEN
#endif
#include <time.h>
#include <glib.h>
G_BEGIN_DECLS
......
......@@ -23,7 +23,6 @@
#include <glib-object.h>
#include <gio/gio.h>
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
......
......@@ -22,7 +22,6 @@
#define __EMPATHY_TP_CHAT_H__
#include <glib.h>
#include <telepathy-glib/telepathy-glib.h>
#include "empathy-message.h"
......
......@@ -27,7 +27,6 @@
#include <glib.h>
#include <glib-object.h>
#include <gnutls/x509.h>
#include <libxml/tree.h>
#include <folks/folks.h>
......
......@@ -25,7 +25,6 @@
#define __EMPATHY_ACCOUNTS_DIALOG_H__
#include <gtk/gtk.h>
#include <telepathy-glib/telepathy-glib.h>
G_BEGIN_DECLS
......
......@@ -22,10 +22,8 @@
#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 "empathy-contact.h"
......
......@@ -24,8 +24,8 @@
#include <glib-object.h>
#include <gtk/gtk.h>
#include "empathy-call-handler.h"
#include "empathy-audio-src.h"
#include "empathy-call-handler.h"
#include "empathy-video-src.h"
G_BEGIN_DECLS
......
......@@ -13,7 +13,6 @@
#define __EMPATHY_INVITE_PARTICIPANT_DIALOG_H__
#include <gtk/gtk.h>
#include <telepathy-glib/telepathy-glib.h>
#include "empathy-tp-chat.h"
......
......@@ -24,10 +24,14 @@
#include <gio/gio.h>
G_BEGIN_DECLS
void empathy_sanity_checking_run_async (GAsyncReadyCallback callback,
gpointer user_data);
gboolean empathy_sanity_checking_run_finish (GAsyncResult *result,
GError **error);
G_END_DECLS
#endif
......@@ -19,11 +19,9 @@
*/
#include <glib.h>
#include <gck/pkcs11x.h>
#include <gcr/gcr.h>
#include <p11-kit/pkcs11.h>
#include <gck/pkcs11x.h>
#ifndef MOCK_MODULE_H
#define MOCK_MODULE_H
......
#include <stdlib.h>
#include <string.h>
#include "empathy-irc-server.h"
#include "empathy-irc-network.h"
#include "empathy-irc-network-manager.h"
#include "empathy-irc-server.h"
#ifndef __CHECK_IRC_HELPER_H__
#define __CHECK_IRC_HELPER_H__
......
......@@ -18,12 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __EMPATHY_ACCOUNTS_PLUGIN_WIDGET_H__
#define __EMPATHY_ACCOUNTS_PLUGIN_WIDGET_H__
#include <gtk/gtk.h>
#include <libaccounts-glib/ag-account.h>
G_BEGIN_DECLS
......
......@@ -18,12 +18,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef __EMPATHY_APP_PLUGIN_WIDGET_H__
#define __EMPATHY_APP_PLUGIN_WIDGET_H__
#include <gtk/gtk.h>
#include <libaccounts-glib/ag-account.h>
G_BEGIN_DECLS
......
......@@ -22,7 +22,6 @@
#define __EMPATHY_APP_PLUGIN_H__
#include <glib-object.h>
#include <libaccount-plugin/application-plugin.h>
G_BEGIN_DECLS
......
......@@ -2,7 +2,6 @@
#define __EMPATHY_WEBCREDENTIALS_MONITOR_H__
#include <glib-object.h>
#include <libaccounts-glib/ag-manager.h>
G_BEGIN_DECLS
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment