From: Xavier Claessens Date: Wed, 3 Apr 2013 08:09:56 +0000 (+0200) Subject: Merge branch 'gnome-3-8' X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=f5d311ec7a8e609dbd94914e15d2bd983f05224c;hp=3af2b86ec550ae1f37f25504afb95c590e7dd085 Merge branch 'gnome-3-8' --- diff --git a/extensions/extensions.h b/extensions/extensions.h index 2dbd79cc..c1c42164 100644 --- a/extensions/extensions.h +++ b/extensions/extensions.h @@ -1,7 +1,6 @@ #ifndef __EMP_EXTENSIONS_H__ #define __EMP_EXTENSIONS_H__ -#include #include #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 41eb8f6e..dc9e036e 100644 --- a/goa-mc-plugin/mcp-account-manager-goa.c +++ b/goa-mc-plugin/mcp-account-manager-goa.c @@ -24,14 +24,11 @@ */ #include "config.h" - -#include +#include "mcp-account-manager-goa.h" #define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */ #include -#include "mcp-account-manager-goa.h" - #define DEBUG g_debug #define GET_PRIVATE(self) (((McpAccountManagerGoa *) self)->priv) #define DECLARE_GASYNC_CALLBACK(name) \ diff --git a/goa-mc-plugin/mission-control-plugin.c b/goa-mc-plugin/mission-control-plugin.c index 40653056..d4e8ae29 100644 --- a/goa-mc-plugin/mission-control-plugin.c +++ b/goa-mc-plugin/mission-control-plugin.c @@ -23,7 +23,7 @@ * Danielle Madeley */ -#include +#include "config.h" #include "mcp-account-manager-goa.h" diff --git a/help/C/add-contact.page b/help/C/add-contact.page index 0bf6a0b5..3426cd6f 100644 --- a/help/C/add-contact.page +++ b/help/C/add-contact.page @@ -5,7 +5,7 @@ - + Add someone to the contact list. diff --git a/help/C/index.page b/help/C/index.page index 5b700188..16e0563c 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -1,5 +1,6 @@ @@ -25,8 +26,8 @@ - <media type="image" mime="image/png" src="figures/empathy-logo.png"> - Empathy Internet Messenger logo + <media type="image" mime="image/png" src="figures/empathy-logo.png" its:translate="no"> + <span its:translate="yes">Empathy Internet Messenger logo</span> </media> Empathy Internet Messenger diff --git a/libempathy-gtk/.gitignore b/libempathy-gtk/.gitignore index 3e3f6f05..3e651d7f 100644 --- a/libempathy-gtk/.gitignore +++ b/libempathy-gtk/.gitignore @@ -1,2 +1,3 @@ +empathy-account-widgets-resources.[ch] empathy-gtk-marshal.* *.gladep diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index 902a5e57..72c27b4b 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -4,8 +4,8 @@ include $(top_srcdir)/tools/flymake.mk AM_CPPFLAGS = \ $(ERROR_CFLAGS) \ - -I. \ - -I$(top_srcdir) \ + -I$(top_srcdir)/libempathy \ + -I$(top_srcdir)/extensions \ -DDATADIR=\""$(datadir)"\" \ -DPKGDATADIR=\""$(pkgdatadir)"\" \ -DGCR_API_SUBJECT_TO_CHANGE \ @@ -22,6 +22,8 @@ AM_CPPFLAGS = \ $(DISABLE_DEPRECATED) BUILT_SOURCES = \ + empathy-account-widgets-resources.c \ + empathy-account-widgets-resources.h \ empathy-gtk-enum-types.h \ empathy-gtk-enum-types.c @@ -209,10 +211,7 @@ check_c_sources = \ include $(top_srcdir)/tools/check-coding-style.mk check-local: check-coding-style -uidir = $(datadir)/empathy -ui_DATA = \ - empathy-contact-widget.ui \ - empathy-contact-blocking-dialog.ui \ +account_widgets_ui_files = \ empathy-account-widget-generic.ui \ empathy-account-widget-jabber.ui \ empathy-account-widget-msn.ui \ @@ -223,6 +222,12 @@ ui_DATA = \ empathy-account-widget-yahoo.ui \ empathy-account-widget-groupwise.ui \ empathy-account-widget-aim.ui \ + $(NULL) + +uidir = $(datadir)/empathy +ui_DATA = \ + empathy-contact-widget.ui \ + empathy-contact-blocking-dialog.ui \ empathy-status-preset-dialog.ui \ empathy-log-window.ui \ empathy-chat.ui \ @@ -240,7 +245,7 @@ stamp-empathy-gtk-enum-types.h: Makefile $(libempathy_gtk_headers) --fhead "G_BEGIN_DECLS\n\n" \ --ftail "G_END_DECLS\n\n" \ --ftail "#endif /* __LIBEMPATHY_GTK_ENUM_TYPES_H__ */\n" \ - --fprod "#include \n" \ + --fprod '#include "@filename@"\n' \ --eprod "#define EMPATHY_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \ --eprod "GType @enum_name@_get_type (void);\n" \ $(libempathy_gtk_headers) ) > xgen-gth \ @@ -267,7 +272,17 @@ empathy-gtk-enum-types.c: Makefile $(libempathy_gtk_headers) && cp xgen-gtc $(@F) \ && rm -f xgen-gtc -EXTRA_DIST = \ +account_widgets_resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir) $(srcdir)/empathy-account-widgets.gresource.xml) + +empathy-account-widgets-resources.c: empathy-account-widgets.gresource.xml $(account_widgets_resource_files) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $< + +empathy-account-widgets-resources.h: empathy-account-widgets.gresource.xml $(account_widgets_resource_files) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $< + +EXTRA_DIST = \ + empathy-account-widgets.gresource.xml \ + $(account_widgets_ui_files) \ $(ui_DATA) if HAVE_GEOCLUE diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c index 03aeacf7..e6f4367c 100644 --- a/libempathy-gtk/empathy-account-chooser.c +++ b/libempathy-gtk/empathy-account-chooser.c @@ -22,14 +22,14 @@ */ #include "config.h" +#include "empathy-account-chooser.h" #include #include "empathy-ui-utils.h" -#include "empathy-account-chooser.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include +#include "empathy-debug.h" /** * SECTION:empathy-account-chooser diff --git a/libempathy-gtk/empathy-account-chooser.h b/libempathy-gtk/empathy-account-chooser.h index d58fcf12..5302ad70 100644 --- a/libempathy-gtk/empathy-account-chooser.h +++ b/libempathy-gtk/empathy-account-chooser.h @@ -25,7 +25,6 @@ #define __EMPATHY_ACCOUNT_CHOOSER_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-account-selector-dialog.c b/libempathy-gtk/empathy-account-selector-dialog.c index 72a7b2ff..0dd67ea7 100644 --- a/libempathy-gtk/empathy-account-selector-dialog.c +++ b/libempathy-gtk/empathy-account-selector-dialog.c @@ -19,7 +19,6 @@ */ #include "config.h" - #include "empathy-account-selector-dialog.h" enum diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c index c027fb25..e86cec41 100644 --- a/libempathy-gtk/empathy-account-widget-irc.c +++ b/libempathy-gtk/empathy-account-widget-irc.c @@ -19,13 +19,13 @@ */ #include "config.h" +#include "empathy-account-widget-irc.h" #include "empathy-account-widget-private.h" -#include "empathy-account-widget-irc.h" #include "empathy-ui-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC -#include +#include "empathy-debug.h" typedef struct { EmpathyAccountWidget *self; @@ -142,7 +142,7 @@ empathy_account_widget_irc_build (EmpathyAccountWidget *self, settings = g_slice_new0 (EmpathyAccountWidgetIrc); settings->self = self; - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "table_irc_settings", table_common_settings, "vbox_irc", box, "table_irc_settings", &settings->vbox_settings, @@ -209,7 +209,7 @@ empathy_account_widget_irc_build_simple (EmpathyAccountWidget *self, settings = g_slice_new0 (EmpathyAccountWidgetIrc); settings->self = self; - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "vbox_irc_simple", box, "alignment_network_simple", &alignment, NULL); diff --git a/libempathy-gtk/empathy-account-widget-irc.h b/libempathy-gtk/empathy-account-widget-irc.h index bcd45b76..c102d6ea 100644 --- a/libempathy-gtk/empathy-account-widget-irc.h +++ b/libempathy-gtk/empathy-account-widget-irc.h @@ -21,9 +21,8 @@ #ifndef __EMPATHY_ACCOUNT_WIDGET_IRC_H__ #define __EMPATHY_ACCOUNT_WIDGET_IRC_H__ -#include -#include -#include +#include "empathy-account-widget.h" +#include "empathy-irc-network-chooser.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-account-widget-private.h b/libempathy-gtk/empathy-account-widget-private.h index 988b0988..044e3a99 100644 --- a/libempathy-gtk/empathy-account-widget-private.h +++ b/libempathy-gtk/empathy-account-widget-private.h @@ -22,9 +22,7 @@ #ifndef __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__ #define __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__ -#include -#include -#include +#include "empathy-account-widget.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-account-widget-sip.c b/libempathy-gtk/empathy-account-widget-sip.c index 4568cf17..b76078d5 100644 --- a/libempathy-gtk/empathy-account-widget-sip.c +++ b/libempathy-gtk/empathy-account-widget-sip.c @@ -20,11 +20,11 @@ */ #include "config.h" +#include "empathy-account-widget-sip.h" #include #include "empathy-account-widget-private.h" -#include "empathy-account-widget-sip.h" #include "empathy-ui-utils.h" typedef struct { @@ -113,7 +113,7 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self, if (is_simple) { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "vbox_sip_simple", &vbox_settings, NULL); @@ -133,7 +133,7 @@ empathy_account_widget_sip_build (EmpathyAccountWidget *self, settings = g_slice_new0 (EmpathyAccountWidgetSip); settings->self = self; - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "grid_common_settings", grid_common_settings, "grid_advanced_sip_settings", &grid_advanced, "vbox_sip_settings", &vbox_settings, diff --git a/libempathy-gtk/empathy-account-widget-sip.h b/libempathy-gtk/empathy-account-widget-sip.h index 84e96e7b..4fed35ec 100644 --- a/libempathy-gtk/empathy-account-widget-sip.h +++ b/libempathy-gtk/empathy-account-widget-sip.h @@ -21,8 +21,7 @@ #ifndef __EMPATHY_ACCOUNT_WIDGET_SIP_H__ #define __EMPATHY_ACCOUNT_WIDGET_SIP_H__ -#include -#include +#include "empathy-account-widget.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index 794e7d52..0751b24a 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -25,20 +25,20 @@ */ #include "config.h" +#include "empathy-account-widget.h" +#include "empathy-account-widget-private.h" #include - -#include - #include +#include "empathy-account-widget-irc.h" #include "empathy-account-widget-private.h" #include "empathy-account-widget-sip.h" -#include "empathy-account-widget-irc.h" #include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyAccountWidget, empathy_account_widget, GTK_TYPE_BOX) @@ -1060,7 +1060,7 @@ account_widget_build_generic (EmpathyAccountWidget *self, { GtkWidget *expander_advanced, *box; - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "grid_common_settings", &self->priv->grid_common_settings, "vbox_generic_settings", &box, "expander_advanced_settings", &expander_advanced, @@ -1086,7 +1086,7 @@ account_widget_build_salut (EmpathyAccountWidget *self, { GtkWidget *expander_advanced, *box; - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "grid_common_settings", &self->priv->grid_common_settings, "vbox_salut_settings", &box, "expander_advanced_settings", &expander_advanced, @@ -1167,7 +1167,7 @@ account_widget_build_msn (EmpathyAccountWidget *self, if (self->priv->simple) { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "vbox_msn_simple", &box, NULL); @@ -1184,7 +1184,7 @@ account_widget_build_msn (EmpathyAccountWidget *self, } else { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "grid_common_msn_settings", &self->priv->grid_common_settings, "vbox_msn_settings", &box, NULL); @@ -1323,7 +1323,7 @@ account_widget_build_jabber (EmpathyAccountWidget *self, if (self->priv->simple && service == NO_SERVICE) { /* Simple widget for XMPP */ - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "vbox_jabber_simple", &box, "label_id_simple", &label_id, "label_id_create", &label_id_create, @@ -1354,7 +1354,7 @@ account_widget_build_jabber (EmpathyAccountWidget *self, else if (self->priv->simple && service == GTALK_SERVICE) { /* Simple widget for Google Talk */ - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "vbox_gtalk_simple", &box, NULL); @@ -1372,7 +1372,7 @@ account_widget_build_jabber (EmpathyAccountWidget *self, else if (self->priv->simple && service == FACEBOOK_SERVICE) { /* Simple widget for Facebook */ - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "vbox_fb_simple", &box, "entry_id_fb_simple", &entry_id, NULL); @@ -1394,7 +1394,7 @@ account_widget_build_jabber (EmpathyAccountWidget *self, ServiceInfo info = services_infos[service]; /* Full widget for XMPP, Google Talk and Facebook*/ - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "grid_common_settings", &self->priv->grid_common_settings, "vbox_jabber_settings", &box, "spinbutton_port", &spinbutton_port, @@ -1474,7 +1474,7 @@ account_widget_build_icq (EmpathyAccountWidget *self, if (self->priv->simple) { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "vbox_icq_simple", &box, NULL); @@ -1491,7 +1491,7 @@ account_widget_build_icq (EmpathyAccountWidget *self, } else { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "grid_common_settings", &self->priv->grid_common_settings, "vbox_icq_settings", &box, "spinbutton_port", &spinbutton_port, @@ -1522,7 +1522,7 @@ account_widget_build_aim (EmpathyAccountWidget *self, if (self->priv->simple) { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "vbox_aim_simple", &box, NULL); @@ -1539,7 +1539,7 @@ account_widget_build_aim (EmpathyAccountWidget *self, } else { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "grid_common_settings", &self->priv->grid_common_settings, "vbox_aim_settings", &box, "spinbutton_port", &spinbutton_port, @@ -1572,7 +1572,7 @@ account_widget_build_yahoo (EmpathyAccountWidget *self, if (self->priv->simple) { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "vbox_yahoo_simple", &box, NULL); @@ -1589,7 +1589,7 @@ account_widget_build_yahoo (EmpathyAccountWidget *self, } else { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "grid_common_settings", &self->priv->grid_common_settings, "vbox_yahoo_settings", &box, NULL); @@ -1620,7 +1620,7 @@ account_widget_build_groupwise (EmpathyAccountWidget *self, if (self->priv->simple) { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "vbox_groupwise_simple", &box, NULL); @@ -1637,7 +1637,7 @@ account_widget_build_groupwise (EmpathyAccountWidget *self, } else { - self->ui_details->gui = empathy_builder_get_file (filename, + self->ui_details->gui = empathy_builder_get_resource (filename, "grid_common_groupwise_settings", &self->priv->grid_common_settings, "vbox_groupwise_settings", &box, NULL); @@ -1808,7 +1808,7 @@ out: } #define WIDGET(cm, proto) \ - { #cm, #proto, "empathy-account-widget-"#proto".ui", \ + { #cm, #proto, ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-"#proto".ui", \ account_widget_build_##proto } static void @@ -1904,7 +1904,7 @@ do_constructed (GObject *obj) const char *file; GtkWidget * (*func)(EmpathyAccountWidget *self, const gchar *filename); } widgets [] = { - { "salut", "local-xmpp", "empathy-account-widget-local-xmpp.ui", + { "salut", "local-xmpp", ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-local-xmpp.ui", account_widget_build_salut }, WIDGET (gabble, jabber), WIDGET (haze, msn), @@ -1928,23 +1928,15 @@ do_constructed (GObject *obj) if (!tp_strdiff (widgets[i].cm_name, cm_name) && !tp_strdiff (widgets[i].protocol, protocol)) { - gchar *filename; - - filename = empathy_file_lookup (widgets[i].file, - "libempathy-gtk"); - box = widgets[i].func (self, filename); - g_free (filename); - + box = widgets[i].func (self, widgets[i].file); break; } } if (i == G_N_ELEMENTS (widgets)) { - gchar *filename = empathy_file_lookup ( - "empathy-account-widget-generic.ui", "libempathy-gtk"); + gchar *filename = ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-generic.ui"; box = account_widget_build_generic (self, filename); - g_free (filename); } gtk_container_add (GTK_CONTAINER (self), box); diff --git a/libempathy-gtk/empathy-account-widget.h b/libempathy-gtk/empathy-account-widget.h index 2f7d5443..65de952c 100644 --- a/libempathy-gtk/empathy-account-widget.h +++ b/libempathy-gtk/empathy-account-widget.h @@ -26,7 +26,7 @@ #include -#include +#include "empathy-account-settings.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-account-widgets.gresource.xml b/libempathy-gtk/empathy-account-widgets.gresource.xml new file mode 100644 index 00000000..093cb2a9 --- /dev/null +++ b/libempathy-gtk/empathy-account-widgets.gresource.xml @@ -0,0 +1,16 @@ + + + + empathy-account-widget-generic.ui + empathy-account-widget-jabber.ui + empathy-account-widget-msn.ui + empathy-account-widget-sip.ui + empathy-account-widget-local-xmpp.ui + empathy-account-widget-irc.ui + empathy-account-widget-icq.ui + empathy-account-widget-yahoo.ui + empathy-account-widget-groupwise.ui + empathy-account-widget-aim.ui + + + diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c index 553dd4f6..19314fe5 100644 --- a/libempathy-gtk/empathy-avatar-chooser.c +++ b/libempathy-gtk/empathy-avatar-chooser.c @@ -21,23 +21,22 @@ */ #include "config.h" +#include "empathy-avatar-chooser.h" #include -#include -#include -#include - -#include "empathy-avatar-chooser.h" -#include "empathy-images.h" -#include "empathy-ui-utils.h" - #ifdef HAVE_CHEESE #include #endif /* HAVE_CHEESE */ +#include "empathy-camera-monitor.h" +#include "empathy-gsettings.h" +#include "empathy-images.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" + #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include +#include "empathy-debug.h" /** * SECTION:empathy-avatar-chooser diff --git a/libempathy-gtk/empathy-avatar-chooser.h b/libempathy-gtk/empathy-avatar-chooser.h index dc82c057..1636e289 100644 --- a/libempathy-gtk/empathy-avatar-chooser.h +++ b/libempathy-gtk/empathy-avatar-chooser.h @@ -26,6 +26,7 @@ #include #include +#include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c index acb0903e..f61c1b23 100644 --- a/libempathy-gtk/empathy-avatar-image.c +++ b/libempathy-gtk/empathy-avatar-image.c @@ -22,13 +22,13 @@ */ #include "config.h" +#include "empathy-avatar-image.h" #include #include -#include -#include "empathy-avatar-image.h" #include "empathy-ui-utils.h" +#include "empathy-utils.h" /** * SECTION:empathy-avatar-image diff --git a/libempathy-gtk/empathy-avatar-image.h b/libempathy-gtk/empathy-avatar-image.h index 9429a287..65f088ec 100644 --- a/libempathy-gtk/empathy-avatar-image.h +++ b/libempathy-gtk/empathy-avatar-image.h @@ -26,6 +26,8 @@ #include +#include "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 a6938b3e..5cdb90d1 100644 --- a/libempathy-gtk/empathy-bad-password-dialog.c +++ b/libempathy-gtk/empathy-bad-password-dialog.c @@ -18,13 +18,12 @@ */ #include "config.h" - #include "empathy-bad-password-dialog.h" #include #define DEBUG_FLAG EMPATHY_DEBUG_SASL -#include +#include "empathy-debug.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 ad517980..a7d0a6f8 100644 --- a/libempathy-gtk/empathy-bad-password-dialog.h +++ b/libempathy-gtk/empathy-bad-password-dialog.h @@ -20,10 +20,7 @@ #ifndef __EMPATHY_BAD_PASSWORD_DIALOG_H__ #define __EMPATHY_BAD_PASSWORD_DIALOG_H__ -#include -#include - -#include +#include "empathy-base-password-dialog.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-base-password-dialog.c b/libempathy-gtk/empathy-base-password-dialog.c index 20238343..9cbb178f 100644 --- a/libempathy-gtk/empathy-base-password-dialog.c +++ b/libempathy-gtk/empathy-base-password-dialog.c @@ -18,14 +18,14 @@ */ #include "config.h" - #include "empathy-base-password-dialog.h" #include +#include "empathy-utils.h" + #define DEBUG_FLAG EMPATHY_DEBUG_SASL -#include -#include +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyBasePasswordDialog, empathy_base_password_dialog, GTK_TYPE_MESSAGE_DIALOG) diff --git a/libempathy-gtk/empathy-base-password-dialog.h b/libempathy-gtk/empathy-base-password-dialog.h index 3f4cfdd5..0c8ff525 100644 --- 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__ -#include #include #include diff --git a/libempathy-gtk/empathy-calendar-button.c b/libempathy-gtk/empathy-calendar-button.c index f4c82eb4..ca96a423 100644 --- a/libempathy-gtk/empathy-calendar-button.c +++ b/libempathy-gtk/empathy-calendar-button.c @@ -18,13 +18,12 @@ */ #include "config.h" +#include "empathy-calendar-button.h" #include -#include "empathy-calendar-button.h" - #define DEBUG_FLAG EMPATHY_DEBUG_OTHER_THING -#include +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyCalendarButton, empathy_calendar_button, GTK_TYPE_BOX) diff --git a/libempathy-gtk/empathy-calendar-button.h b/libempathy-gtk/empathy-calendar-button.h index 3f1aed1f..ecc8c78c 100644 --- 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__ -#include #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c index 9f72ce9b..ebf32047 100644 --- a/libempathy-gtk/empathy-call-utils.c +++ b/libempathy-gtk/empathy-call-utils.c @@ -19,19 +19,15 @@ */ #include "config.h" +#include "empathy-call-utils.h" #include - #include -#include - -#include "empathy-call-utils.h" - -#include +#include "empathy-request-util.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include +#include "empathy-debug.h" static const gchar * get_error_display_message (GError *error) diff --git a/libempathy-gtk/empathy-call-utils.h b/libempathy-gtk/empathy-call-utils.h index 12fca684..788d828f 100644 --- a/libempathy-gtk/empathy-call-utils.h +++ b/libempathy-gtk/empathy-call-utils.h @@ -21,6 +21,8 @@ #ifndef __EMPATHY_CALL_UTILS_H__ #define __EMPATHY_CALL_UTILS_H__ +#include + G_BEGIN_DECLS /* Calls */ diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.c b/libempathy-gtk/empathy-cell-renderer-activatable.c index 3db35093..bdbf1cb0 100644 --- a/libempathy-gtk/empathy-cell-renderer-activatable.c +++ b/libempathy-gtk/empathy-cell-renderer-activatable.c @@ -21,11 +21,10 @@ */ #include "config.h" - -#include - #include "empathy-cell-renderer-activatable.h" +#include "empathy-utils.h" + enum { PATH_ACTIVATED, LAST_SIGNAL diff --git a/libempathy-gtk/empathy-cell-renderer-expander.c b/libempathy-gtk/empathy-cell-renderer-expander.c index f7c87361..8653fae8 100644 --- a/libempathy-gtk/empathy-cell-renderer-expander.c +++ b/libempathy-gtk/empathy-cell-renderer-expander.c @@ -21,9 +21,11 @@ * Authors: Kristian Rietveld */ -#include +#include "config.h" #include "empathy-cell-renderer-expander.h" +#include "empathy-utils.h" + #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererExpander) typedef struct { GtkExpanderStyle expander_style; diff --git a/libempathy-gtk/empathy-cell-renderer-text.c b/libempathy-gtk/empathy-cell-renderer-text.c index 0afd8974..44bbd7ea 100644 --- a/libempathy-gtk/empathy-cell-renderer-text.c +++ b/libempathy-gtk/empathy-cell-renderer-text.c @@ -22,10 +22,10 @@ */ #include "config.h" - -#include #include "empathy-cell-renderer-text.h" +#include "empathy-utils.h" + #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererText) typedef struct { gchar *name; diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index ffd92b1c..ed0d27cc 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -26,33 +26,33 @@ * Xavier Claessens */ -#include "config.h" /* for GCompletion */ #define GLIB_DISABLE_DEPRECATION_WARNINGS 1 -#include +#include "config.h" +#include "empathy-chat.h" -#include -#include -#include -#include -#include +#include -#include "empathy-chat.h" -#include "empathy-spell.h" +#include "empathy-client-factory.h" +#include "empathy-gsettings.h" #include "empathy-individual-information-dialog.h" #include "empathy-individual-store-channel.h" #include "empathy-individual-view.h" #include "empathy-input-text-view.h" +#include "empathy-keyring.h" +#include "empathy-request-util.h" #include "empathy-search-bar.h" -#include "empathy-theme-manager.h" #include "empathy-smiley-manager.h" -#include "empathy-ui-utils.h" +#include "empathy-spell.h" #include "empathy-string-parser.h" -#include "extensions/extensions.h" +#include "empathy-theme-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" +#include "extensions.h" #define DEBUG_FLAG EMPATHY_DEBUG_CHAT -#include +#include "empathy-debug.h" #define IS_ENTER(v) (v == GDK_KEY_Return || v == GDK_KEY_ISO_Enter || v == GDK_KEY_KP_Enter) #define COMPOSING_STOP_TIMEOUT 5 diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h index 269b0059..2a983622 100644 --- a/libempathy-gtk/empathy-chat.h +++ b/libempathy-gtk/empathy-chat.h @@ -30,10 +30,9 @@ #include -#include -#include - -#include +#include "empathy-contact.h" +#include "empathy-theme-adium.h" +#include "empathy-tp-chat.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.c b/libempathy-gtk/empathy-contact-blocking-dialog.c index 9a0498c5..ddcbcf31 100644 --- a/libempathy-gtk/empathy-contact-blocking-dialog.c +++ b/libempathy-gtk/empathy-contact-blocking-dialog.c @@ -21,19 +21,18 @@ * * Authors: Danielle Madeley */ + #include "config.h" +#include "empathy-contact-blocking-dialog.h" #include -#include - -#include -#include - -#include "empathy-contact-blocking-dialog.h" +#include "empathy-account-chooser.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include +#include "empathy-debug.h" #define GET_PRIVATE(o) (EMPATHY_CONTACT_BLOCKING_DIALOG (o)->priv) #define DECLARE_CALLBACK(func) \ diff --git a/libempathy-gtk/empathy-contact-chooser.c b/libempathy-gtk/empathy-contact-chooser.c index 80ea9765..dd81dde4 100644 --- a/libempathy-gtk/empathy-contact-chooser.c +++ b/libempathy-gtk/empathy-contact-chooser.c @@ -10,15 +10,13 @@ */ #include "config.h" - #include "empathy-contact-chooser.h" -#include -#include - -#include -#include -#include +#include "empathy-client-factory.h" +#include "empathy-individual-store-manager.h" +#include "empathy-individual-view.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" G_DEFINE_TYPE (EmpathyContactChooser, empathy_contact_chooser, GTK_TYPE_BOX); diff --git a/libempathy-gtk/empathy-contact-search-dialog.c b/libempathy-gtk/empathy-contact-search-dialog.c index 0b01bf88..2696f5ab 100644 --- a/libempathy-gtk/empathy-contact-search-dialog.c +++ b/libempathy-gtk/empathy-contact-search-dialog.c @@ -22,21 +22,22 @@ * Danielle Madeley * Emilio Pozuelo Monfort */ + #include "config.h" +#include "empathy-contact-search-dialog.h" #include -#include -#include - -#include -#include -#include -#include -#include +#include "empathy-account-chooser.h" +#include "empathy-cell-renderer-activatable.h" +#include "empathy-cell-renderer-text.h" +#include "empathy-client-factory.h" +#include "empathy-images.h" +#include "empathy-individual-information-dialog.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include +#include "empathy-debug.h" #include "empathy-contact-search-dialog.h" diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c index cef06d30..80a1aafb 100644 --- a/libempathy-gtk/empathy-contact-widget.c +++ b/libempathy-gtk/empathy-contact-widget.c @@ -20,20 +20,19 @@ */ #include "config.h" +#include "empathy-contact-widget.h" #include -#include -#include - -#include "empathy-contact-widget.h" #include "empathy-avatar-image.h" +#include "empathy-client-factory.h" #include "empathy-groups-widget.h" -#include "empathy-ui-utils.h" #include "empathy-string-parser.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include +#include "empathy-debug.h" /** * SECTION:empathy-contact-widget diff --git a/libempathy-gtk/empathy-contact-widget.h b/libempathy-gtk/empathy-contact-widget.h index 6f8045d3..5f44adb6 100644 --- a/libempathy-gtk/empathy-contact-widget.h +++ b/libempathy-gtk/empathy-contact-widget.h @@ -24,8 +24,8 @@ #include -#include #include "empathy-account-chooser.h" +#include "empathy-contact.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-contactinfo-utils.c b/libempathy-gtk/empathy-contactinfo-utils.c index 7ec61310..38f64375 100644 --- a/libempathy-gtk/empathy-contactinfo-utils.c +++ b/libempathy-gtk/empathy-contactinfo-utils.c @@ -21,14 +21,13 @@ */ #include "config.h" +#include "empathy-contactinfo-utils.h" #include -#include -#include - -#include "empathy-contactinfo-utils.h" +#include "empathy-request-util.h" #include "empathy-string-parser.h" +#include "empathy-time.h" #include "empathy-ui-utils.h" static gchar * diff --git a/libempathy-gtk/empathy-contactinfo-utils.h b/libempathy-gtk/empathy-contactinfo-utils.h index 80c18ffa..64514f09 100644 --- a/libempathy-gtk/empathy-contactinfo-utils.h +++ b/libempathy-gtk/empathy-contactinfo-utils.h @@ -21,9 +21,7 @@ #ifndef __EMPATHY_CONTACTINFO_UTILS_H__ #define __EMPATHY_CONTACTINFO_UTILS_H__ -#include #include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-dialpad-button.c b/libempathy-gtk/empathy-dialpad-button.c index bddf42bf..792241fd 100644 --- a/libempathy-gtk/empathy-dialpad-button.c +++ b/libempathy-gtk/empathy-dialpad-button.c @@ -20,9 +20,7 @@ * Guillaume Desmottes */ - #include "config.h" - #include "empathy-dialpad-button.h" G_DEFINE_TYPE (EmpathyDialpadButton, empathy_dialpad_button, GTK_TYPE_BUTTON) diff --git a/libempathy-gtk/empathy-dialpad-button.h b/libempathy-gtk/empathy-dialpad-button.h index cca96f3b..cd312bda 100644 --- a/libempathy-gtk/empathy-dialpad-button.h +++ b/libempathy-gtk/empathy-dialpad-button.h @@ -25,7 +25,6 @@ #define __EMPATHY_DIALPAD_BUTTON_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-dialpad-widget.c b/libempathy-gtk/empathy-dialpad-widget.c index 8fd65bdb..6c85c797 100644 --- a/libempathy-gtk/empathy-dialpad-widget.c +++ b/libempathy-gtk/empathy-dialpad-widget.c @@ -20,10 +20,9 @@ */ #include "config.h" - #include "empathy-dialpad-widget.h" -#include +#include "empathy-dialpad-button.h" G_DEFINE_TYPE (EmpathyDialpadWidget, empathy_dialpad_widget, GTK_TYPE_BOX); diff --git a/libempathy-gtk/empathy-geometry.c b/libempathy-gtk/empathy-geometry.c index d171f72f..452952bb 100644 --- a/libempathy-gtk/empathy-geometry.c +++ b/libempathy-gtk/empathy-geometry.c @@ -22,15 +22,15 @@ */ #include "config.h" +#include "empathy-geometry.h" #include -#include "libempathy/empathy-utils.h" -#include "empathy-geometry.h" #include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include +#include "empathy-debug.h" #define GEOMETRY_DIR_CREATE_MODE (S_IRUSR | S_IWUSR | S_IXUSR) #define GEOMETRY_FILE_CREATE_MODE (S_IRUSR | S_IWUSR) diff --git a/libempathy-gtk/empathy-geometry.h b/libempathy-gtk/empathy-geometry.h index f9f85c1c..e1412ab8 100644 --- a/libempathy-gtk/empathy-geometry.h +++ b/libempathy-gtk/empathy-geometry.h @@ -24,7 +24,6 @@ #ifndef __EMPATHY_GEOMETRY_H__ #define __EMPATHY_GEOMETRY_H__ -#include #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-groups-widget.c b/libempathy-gtk/empathy-groups-widget.c index 6b6a0d0d..d1a6febf 100644 --- a/libempathy-gtk/empathy-groups-widget.c +++ b/libempathy-gtk/empathy-groups-widget.c @@ -20,13 +20,12 @@ */ #include "config.h" +#include "empathy-groups-widget.h" #include -#include -#include - -#include "empathy-groups-widget.h" +#include "empathy-utils.h" +#include "empathy-connection-aggregator.h" /** * SECTION:empathy-groups-widget diff --git a/libempathy-gtk/empathy-groups-widget.h b/libempathy-gtk/empathy-groups-widget.h index 1085fac4..2b59db62 100644 --- a/libempathy-gtk/empathy-groups-widget.h +++ b/libempathy-gtk/empathy-groups-widget.h @@ -23,7 +23,6 @@ #define __EMPATHY_GROUPS_WIDGET_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c index 03874c90..ce03d0a2 100644 --- a/libempathy-gtk/empathy-individual-dialogs.c +++ b/libempathy-gtk/empathy-individual-dialogs.c @@ -20,14 +20,13 @@ */ #include "config.h" +#include "empathy-individual-dialogs.h" #include -#include -#include - -#include "empathy-individual-dialogs.h" #include "empathy-contact-widget.h" +#include "empathy-individual-manager.h" +#include "empathy-utils.h" #define BULLET_POINT "\342\200\242" diff --git a/libempathy-gtk/empathy-individual-dialogs.h b/libempathy-gtk/empathy-individual-dialogs.h index e0710567..b603c576 100644 --- a/libempathy-gtk/empathy-individual-dialogs.h +++ b/libempathy-gtk/empathy-individual-dialogs.h @@ -24,7 +24,6 @@ #define __EMPATHY_INDIVIDUAL_DIALOGS_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-individual-edit-dialog.c b/libempathy-gtk/empathy-individual-edit-dialog.c index bd43adeb..dbd01c97 100644 --- a/libempathy-gtk/empathy-individual-edit-dialog.c +++ b/libempathy-gtk/empathy-individual-edit-dialog.c @@ -21,13 +21,12 @@ */ #include "config.h" +#include "empathy-individual-edit-dialog.h" #include -#include - -#include "empathy-individual-edit-dialog.h" #include "empathy-individual-widget.h" +#include "empathy-utils.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualEditDialog) diff --git a/libempathy-gtk/empathy-individual-edit-dialog.h b/libempathy-gtk/empathy-individual-edit-dialog.h index 4f580fb0..747e6824 100644 --- a/libempathy-gtk/empathy-individual-edit-dialog.h +++ b/libempathy-gtk/empathy-individual-edit-dialog.h @@ -23,7 +23,6 @@ #define __EMPATHY_INDIVIDUAL_EDIT_DIALOG_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c index cd6392a9..2b8d64bd 100644 --- a/libempathy-gtk/empathy-individual-information-dialog.c +++ b/libempathy-gtk/empathy-individual-information-dialog.c @@ -22,19 +22,18 @@ */ #include "config.h" +#include "empathy-individual-information-dialog.h" #include -#include -#include -#include - -#include "empathy-individual-information-dialog.h" +#include "empathy-individual-manager.h" #include "empathy-individual-widget.h" +#include "empathy-pkg-kit.h" #include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include +#include "empathy-debug.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualInformationDialog) typedef struct { diff --git a/libempathy-gtk/empathy-individual-information-dialog.h b/libempathy-gtk/empathy-individual-information-dialog.h index cdba07a6..58c22957 100644 --- a/libempathy-gtk/empathy-individual-information-dialog.h +++ b/libempathy-gtk/empathy-individual-information-dialog.h @@ -24,7 +24,6 @@ #define __EMPATHY_INDIVIDUAL_INFORMATION_DIALOG_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c index 4cadf22a..e70146bf 100644 --- a/libempathy-gtk/empathy-individual-menu.c +++ b/libempathy-gtk/empathy-individual-menu.c @@ -21,30 +21,30 @@ */ #include "config.h" +#include "empathy-individual-menu.h" #include -#include -#include -#include -#include -#include - #include "empathy-account-selector-dialog.h" +#include "empathy-call-utils.h" +#include "empathy-camera-monitor.h" +#include "empathy-chatroom-manager.h" +#include "empathy-gtk-enum-types.h" #include "empathy-images.h" -#include "empathy-log-window.h" #include "empathy-individual-dialogs.h" -#include "empathy-gtk-enum-types.h" #include "empathy-individual-dialogs.h" #include "empathy-individual-edit-dialog.h" -#include "empathy-ui-utils.h" -#include "empathy-share-my-desktop.h" -#include "empathy-call-utils.h" -#include "empathy-individual-store-channel.h" #include "empathy-individual-information-dialog.h" +#include "empathy-individual-manager.h" +#include "empathy-individual-store-channel.h" +#include "empathy-log-window.h" +#include "empathy-request-util.h" +#include "empathy-share-my-desktop.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include +#include "empathy-debug.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualMenu) diff --git a/libempathy-gtk/empathy-individual-store-channel.c b/libempathy-gtk/empathy-individual-store-channel.c index 0fefb9c8..16134a61 100644 --- a/libempathy-gtk/empathy-individual-store-channel.c +++ b/libempathy-gtk/empathy-individual-store-channel.c @@ -24,13 +24,12 @@ */ #include "config.h" - -#include - #include "empathy-individual-store-channel.h" +#include "empathy-utils.h" + #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include +#include "empathy-debug.h" struct _EmpathyIndividualStoreChannelPriv { diff --git a/libempathy-gtk/empathy-individual-store-channel.h b/libempathy-gtk/empathy-individual-store-channel.h index 468effe2..07cc096e 100644 --- a/libempathy-gtk/empathy-individual-store-channel.h +++ b/libempathy-gtk/empathy-individual-store-channel.h @@ -27,8 +27,9 @@ #define __EMPATHY_INDIVIDUAL_STORE_CHANNEL_H__ #include +#include -#include +#include "empathy-individual-store.h" G_BEGIN_DECLS #define EMPATHY_TYPE_INDIVIDUAL_STORE_CHANNEL (empathy_individual_store_channel_get_type ()) diff --git a/libempathy-gtk/empathy-individual-store-manager.c b/libempathy-gtk/empathy-individual-store-manager.c index ea872b1d..d080242e 100644 --- a/libempathy-gtk/empathy-individual-store-manager.c +++ b/libempathy-gtk/empathy-individual-store-manager.c @@ -24,11 +24,10 @@ */ #include "config.h" - #include "empathy-individual-store-manager.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include +#include "empathy-debug.h" struct _EmpathyIndividualStoreManagerPriv { diff --git a/libempathy-gtk/empathy-individual-store-manager.h b/libempathy-gtk/empathy-individual-store-manager.h index 7656b50e..d442e7ca 100644 --- a/libempathy-gtk/empathy-individual-store-manager.h +++ b/libempathy-gtk/empathy-individual-store-manager.h @@ -26,11 +26,10 @@ #ifndef __EMPATHY_INDIVIDUAL_STORE_MANAGER_H__ #define __EMPATHY_INDIVIDUAL_STORE_MANAGER_H__ -#include +#include -#include - -#include +#include "empathy-individual-manager.h" +#include "empathy-individual-store.h" G_BEGIN_DECLS #define EMPATHY_TYPE_INDIVIDUAL_STORE_MANAGER (empathy_individual_store_manager_get_type ()) diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c index ddaea26b..3ebe35a6 100644 --- a/libempathy-gtk/empathy-individual-store.c +++ b/libempathy-gtk/empathy-individual-store.c @@ -25,16 +25,16 @@ */ #include "config.h" +#include "empathy-individual-store.h" #include -#include - -#include "empathy-ui-utils.h" #include "empathy-gtk-enum-types.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include +#include "empathy-debug.h" /* Active users are those which have recently changed state * (e.g. online, offline or from normal to a busy state). diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c index 7e36fe19..87fa3d96 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -25,25 +25,25 @@ */ #include "config.h" +#include "empathy-individual-view.h" #include -#include -#include -#include -#include -#include - -#include "empathy-individual-edit-dialog.h" -#include "empathy-images.h" +#include "empathy-cell-renderer-activatable.h" #include "empathy-cell-renderer-expander.h" #include "empathy-cell-renderer-text.h" -#include "empathy-cell-renderer-activatable.h" -#include "empathy-ui-utils.h" +#include "empathy-connection-aggregator.h" +#include "empathy-contact-groups.h" #include "empathy-gtk-enum-types.h" +#include "empathy-images.h" +#include "empathy-individual-edit-dialog.h" +#include "empathy-individual-manager.h" +#include "empathy-request-util.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include +#include "empathy-debug.h" /* Active users are those which have recently changed state * (e.g. online, offline or from normal to a busy state). diff --git a/libempathy-gtk/empathy-individual-view.h b/libempathy-gtk/empathy-individual-view.h index baac701e..e942a42b 100644 --- a/libempathy-gtk/empathy-individual-view.h +++ b/libempathy-gtk/empathy-individual-view.h @@ -28,12 +28,11 @@ #define __EMPATHY_INDIVIDUAL_VIEW_H__ #include - #include -#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 ()) diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c index 12093b57..a267a7d7 100644 --- a/libempathy-gtk/empathy-individual-widget.c +++ b/libempathy-gtk/empathy-individual-widget.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "empathy-individual-widget.h" #include @@ -28,18 +29,17 @@ #include #endif -#include -#include -#include - #include "empathy-avatar-image.h" #include "empathy-contactinfo-utils.h" #include "empathy-groups-widget.h" #include "empathy-gtk-enum-types.h" +#include "empathy-location.h" +#include "empathy-time.h" #include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include +#include "empathy-debug.h" /** * SECTION:empathy-individual-widget diff --git a/libempathy-gtk/empathy-individual-widget.h b/libempathy-gtk/empathy-individual-widget.h index b8156c48..fd63377f 100644 --- a/libempathy-gtk/empathy-individual-widget.h +++ b/libempathy-gtk/empathy-individual-widget.h @@ -22,7 +22,6 @@ #define __EMPATHY_INDIVIDUAL_WIDGET_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-input-text-view.c b/libempathy-gtk/empathy-input-text-view.c index 78502ef8..d7c24a68 100644 --- a/libempathy-gtk/empathy-input-text-view.c +++ b/libempathy-gtk/empathy-input-text-view.c @@ -25,6 +25,7 @@ * Guillaume Desmottes */ +#include "config.h" #include "empathy-input-text-view.h" G_DEFINE_TYPE (EmpathyInputTextView, empathy_input_text_view, diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.c b/libempathy-gtk/empathy-irc-network-chooser-dialog.c index 00e9bf0e..60945aed 100644 --- a/libempathy-gtk/empathy-irc-network-chooser-dialog.c +++ b/libempathy-gtk/empathy-irc-network-chooser-dialog.c @@ -20,17 +20,17 @@ */ #include "config.h" +#include "empathy-irc-network-chooser-dialog.h" #include -#include -#include - #include "empathy-irc-network-dialog.h" +#include "empathy-irc-network-manager.h" #include "empathy-live-search.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC -#include +#include "empathy-debug.h" #include "empathy-irc-network-chooser-dialog.h" diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.h b/libempathy-gtk/empathy-irc-network-chooser-dialog.h index 0d4f24e7..1e465491 100644 --- a/libempathy-gtk/empathy-irc-network-chooser-dialog.h +++ b/libempathy-gtk/empathy-irc-network-chooser-dialog.h @@ -24,8 +24,8 @@ #include -#include -#include +#include "empathy-account-settings.h" +#include "empathy-irc-network.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-irc-network-chooser.c b/libempathy-gtk/empathy-irc-network-chooser.c index e19b3e8a..fab6a3a3 100644 --- a/libempathy-gtk/empathy-irc-network-chooser.c +++ b/libempathy-gtk/empathy-irc-network-chooser.c @@ -20,17 +20,15 @@ */ #include "config.h" +#include "empathy-irc-network-chooser.h" -#include -#include - -#include "empathy-ui-utils.h" #include "empathy-irc-network-chooser-dialog.h" +#include "empathy-irc-network-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC -#include - -#include "empathy-irc-network-chooser.h" +#include "empathy-debug.h" #define DEFAULT_IRC_NETWORK "irc.gimp.org" #define DEFAULT_IRC_PORT 6667 diff --git a/libempathy-gtk/empathy-irc-network-chooser.h b/libempathy-gtk/empathy-irc-network-chooser.h index 3b612505..f4c60328 100644 --- a/libempathy-gtk/empathy-irc-network-chooser.h +++ b/libempathy-gtk/empathy-irc-network-chooser.h @@ -24,8 +24,8 @@ #include -#include -#include +#include "empathy-account-settings.h" +#include "empathy-irc-network.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c index aedb5dc7..35457f59 100644 --- a/libempathy-gtk/empathy-irc-network-dialog.c +++ b/libempathy-gtk/empathy-irc-network-dialog.c @@ -19,16 +19,13 @@ */ #include "config.h" +#include "empathy-irc-network-dialog.h" #include -#include - #include "empathy-ui-utils.h" #include "totem-subtitle-encoding.h" -#include "empathy-irc-network-dialog.h" - typedef struct { EmpathyIrcNetwork *network; @@ -453,7 +450,6 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network, GtkAdjustment *adjustment; GtkTreeSelection *selection; GtkTreeViewColumn *column; - gchar *filename; GtkWidget *sw, *toolbar; GtkStyleContext *context; @@ -472,9 +468,7 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network, dialog->network = network; g_object_ref (dialog->network); - filename = empathy_file_lookup ("empathy-account-widget-irc.ui", - "libempathy-gtk"); - gui = empathy_builder_get_file (filename, + gui = empathy_builder_get_resource (ACCOUNT_WIDGETS_RESOURCES_PREFIX "/empathy-account-widget-irc.ui", "irc_network_dialog", &dialog->dialog, "button_close", &dialog->button_close, "entry_network", &dialog->entry_network, @@ -487,7 +481,6 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network, "scrolledwindow_network_server", &sw, "toolbar_network_server", &toolbar, NULL); - g_free (filename); store = gtk_list_store_new (4, G_TYPE_OBJECT, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_BOOLEAN); diff --git a/libempathy-gtk/empathy-irc-network-dialog.h b/libempathy-gtk/empathy-irc-network-dialog.h index df4a8b15..a49c63da 100644 --- a/libempathy-gtk/empathy-irc-network-dialog.h +++ b/libempathy-gtk/empathy-irc-network-dialog.h @@ -23,7 +23,7 @@ #include -#include +#include "empathy-irc-network.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-live-search.c b/libempathy-gtk/empathy-live-search.c index e65adbe4..51f6a2e0 100644 --- a/libempathy-gtk/empathy-live-search.c +++ b/libempathy-gtk/empathy-live-search.c @@ -22,11 +22,10 @@ */ #include "config.h" - -#include - #include "empathy-live-search.h" +#include "empathy-utils.h" + G_DEFINE_TYPE (EmpathyLiveSearch, empathy_live_search, GTK_TYPE_HBOX) #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyLiveSearch) diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c index b714fa49..f0f6aefe 100644 --- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c +++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c @@ -23,13 +23,12 @@ #include -#include - -#include -#include +#include "empathy-account-widget.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyLocalXmppAssistantWidget, empathy_local_xmpp_assistant_widget, GTK_TYPE_GRID) diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.h b/libempathy-gtk/empathy-local-xmpp-assistant-widget.h index dafd7fb2..efea64d2 100644 --- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.h +++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.h @@ -22,7 +22,6 @@ #define __EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c index ab72fff7..3a97c94c 100644 --- a/libempathy-gtk/empathy-location-manager.c +++ b/libempathy-gtk/empathy-location-manager.c @@ -20,17 +20,16 @@ */ #include "config.h" +#include "empathy-location-manager.h" #include -#include "empathy-location-manager.h" - -#include "libempathy/empathy-gsettings.h" -#include "libempathy/empathy-location.h" -#include "libempathy/empathy-time.h" +#include "empathy-gsettings.h" +#include "empathy-location.h" +#include "empathy-time.h" #define DEBUG_FLAG EMPATHY_DEBUG_LOCATION -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" /* Seconds before updating the location */ #define TIMEOUT 10 diff --git a/libempathy-gtk/empathy-location-manager.h b/libempathy-gtk/empathy-location-manager.h index 525e490b..6ea8b7bf 100644 --- a/libempathy-gtk/empathy-location-manager.h +++ b/libempathy-gtk/empathy-location-manager.h @@ -25,7 +25,6 @@ #include - G_BEGIN_DECLS #define EMPATHY_TYPE_LOCATION_MANAGER (empathy_location_manager_get_type ()) diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index 80733da1..526569a5 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -23,32 +23,28 @@ */ #include "config.h" +#include "empathy-log-window.h" #include -#include - #include -#include - -#include -#include -#include -#include -#include - -#include "empathy-log-window.h" +#include "action-chain-internal.h" #include "empathy-account-chooser.h" #include "empathy-call-utils.h" -#include "empathy-individual-information-dialog.h" +#include "empathy-camera-monitor.h" +#include "empathy-geometry.h" +#include "empathy-gsettings.h" #include "empathy-images.h" +#include "empathy-individual-information-dialog.h" +#include "empathy-request-util.h" #include "empathy-theme-manager.h" #include "empathy-ui-utils.h" +#include "empathy-utils.h" #include "empathy-webkit-utils.h" -#include "empathy-geometry.h" +#include "extensions.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include +#include "empathy-debug.h" #define EMPATHY_NS "http://live.gnome.org/Empathy" diff --git a/libempathy-gtk/empathy-log-window.h b/libempathy-gtk/empathy-log-window.h index f8f76905..48554fc3 100644 --- a/libempathy-gtk/empathy-log-window.h +++ b/libempathy-gtk/empathy-log-window.h @@ -25,6 +25,7 @@ #ifndef __EMPATHY_LOG_WINDOW_H__ #define __EMPATHY_LOG_WINDOW_H__ +#include #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-new-account-dialog.c b/libempathy-gtk/empathy-new-account-dialog.c index c36cfcfc..ed9242b5 100644 --- a/libempathy-gtk/empathy-new-account-dialog.c +++ b/libempathy-gtk/empathy-new-account-dialog.c @@ -22,11 +22,11 @@ #include -#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include +#include "empathy-account-widget.h" +#include "empathy-protocol-chooser.h" -#include -#include +#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyNewAccountDialog, empathy_new_account_dialog, \ GTK_TYPE_DIALOG) diff --git a/libempathy-gtk/empathy-new-account-dialog.h b/libempathy-gtk/empathy-new-account-dialog.h index 07fc22f9..6a5d5c2d 100644 --- a/libempathy-gtk/empathy-new-account-dialog.h +++ b/libempathy-gtk/empathy-new-account-dialog.h @@ -22,7 +22,7 @@ #include -#include +#include "empathy-account-settings.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c index d770d6d9..7dda2f9e 100644 --- a/libempathy-gtk/empathy-new-call-dialog.c +++ b/libempathy-gtk/empathy-new-call-dialog.c @@ -19,21 +19,19 @@ */ #include "config.h" +#include "empathy-new-call-dialog.h" #include -#include -#include +#include "empathy-call-utils.h" +#include "empathy-camera-monitor.h" +#include "empathy-contact-chooser.h" +#include "empathy-images.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include - -#include -#include -#include - -#include "empathy-new-call-dialog.h" -#include "empathy-call-utils.h" +#include "empathy-debug.h" static EmpathyNewCallDialog *dialog_singleton = NULL; diff --git a/libempathy-gtk/empathy-new-call-dialog.h b/libempathy-gtk/empathy-new-call-dialog.h index d3f05e64..e7413568 100644 --- 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__ -#include #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c index c38a1c75..36614725 100644 --- a/libempathy-gtk/empathy-new-message-dialog.c +++ b/libempathy-gtk/empathy-new-message-dialog.c @@ -19,19 +19,17 @@ */ #include "config.h" +#include "empathy-new-message-dialog.h" #include -#include +#include "empathy-request-util.h" +#include "empathy-contact-chooser.h" +#include "empathy-ui-utils.h" +#include "empathy-images.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include - -#include -#include -#include - -#include "empathy-new-message-dialog.h" +#include "empathy-debug.h" static EmpathyNewMessageDialog *dialog_singleton = NULL; diff --git a/libempathy-gtk/empathy-new-message-dialog.h b/libempathy-gtk/empathy-new-message-dialog.h index 390101a2..5adc4cf9 100644 --- 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__ -#include #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c index d142b7fa..033557e8 100644 --- a/libempathy-gtk/empathy-notify-manager.c +++ b/libempathy-gtk/empathy-notify-manager.c @@ -18,18 +18,16 @@ */ #include "config.h" +#include "empathy-notify-manager.h" #include -#include -#include - -#include +#include "empathy-gsettings.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include - -#include "empathy-notify-manager.h" +#include "empathy-debug.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyNotifyManager) diff --git a/libempathy-gtk/empathy-notify-manager.h b/libempathy-gtk/empathy-notify-manager.h index 923ab4a5..7c2fa8c4 100644 --- a/libempathy-gtk/empathy-notify-manager.h +++ b/libempathy-gtk/empathy-notify-manager.h @@ -21,12 +21,10 @@ #ifndef __EMPATHY_NOTIFY_MANAGER_H__ #define __EMPATHY_NOTIFY_MANAGER_H__ -#include - -#include - #include +#include "empathy-contact.h" + G_BEGIN_DECLS #define EMPATHY_NOTIFY_MANAGER_CAP_ACTIONS "actions" diff --git a/libempathy-gtk/empathy-password-dialog.c b/libempathy-gtk/empathy-password-dialog.c index 07fb69fc..ef03061a 100644 --- a/libempathy-gtk/empathy-password-dialog.c +++ b/libempathy-gtk/empathy-password-dialog.c @@ -18,13 +18,12 @@ */ #include "config.h" - #include "empathy-password-dialog.h" #include #define DEBUG_FLAG EMPATHY_DEBUG_SASL -#include +#include "empathy-debug.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 ee1c993b..1b19375a 100644 --- a/libempathy-gtk/empathy-password-dialog.h +++ b/libempathy-gtk/empathy-password-dialog.h @@ -20,12 +20,10 @@ #ifndef __EMPATHY_PASSWORD_DIALOG_H__ #define __EMPATHY_PASSWORD_DIALOG_H__ -#include #include -#include - -#include +#include "empathy-base-password-dialog.h" +#include "empathy-server-sasl-handler.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-plist.c b/libempathy-gtk/empathy-plist.c index ddaa97b7..e1113a07 100644 --- a/libempathy-gtk/empathy-plist.c +++ b/libempathy-gtk/empathy-plist.c @@ -19,13 +19,12 @@ */ #include "config.h" +#include "empathy-plist.h" #include #include #include -#include "empathy-plist.h" - static GValue *empathy_plist_parse_node (xmlNode *a_node); static GValue * diff --git a/libempathy-gtk/empathy-plist.h b/libempathy-gtk/empathy-plist.h index a15ad6a0..216896b4 100644 --- a/libempathy-gtk/empathy-plist.h +++ b/libempathy-gtk/empathy-plist.h @@ -21,7 +21,6 @@ #ifndef __EMPATHY_PLIST_H__ #define __EMPATHY_PLIST_H__ -#include #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c index a047890b..445f79b6 100644 --- a/libempathy-gtk/empathy-presence-chooser.c +++ b/libempathy-gtk/empathy-presence-chooser.c @@ -25,15 +25,16 @@ */ #include "config.h" +#include "empathy-presence-chooser.h" #include -#include -#include -#include +#include "empathy-presence-manager.h" +#include "empathy-status-presets.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include +#include "empathy-debug.h" #include "empathy-ui-utils.h" #include "empathy-presence-chooser.h" diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c index d5b0de7c..a060d9f7 100644 --- a/libempathy-gtk/empathy-protocol-chooser.c +++ b/libempathy-gtk/empathy-protocol-chooser.c @@ -21,17 +21,16 @@ */ #include "config.h" +#include "empathy-protocol-chooser.h" #include -#include -#include - -#include "empathy-protocol-chooser.h" +#include "empathy-connection-managers.h" #include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include +#include "empathy-debug.h" /** * SECTION:empathy-protocol-chooser diff --git a/libempathy-gtk/empathy-protocol-chooser.h b/libempathy-gtk/empathy-protocol-chooser.h index eeaab60c..2ae8017e 100644 --- a/libempathy-gtk/empathy-protocol-chooser.h +++ b/libempathy-gtk/empathy-protocol-chooser.h @@ -23,12 +23,10 @@ #ifndef __EMPATHY_PROTOCOL_CHOOSER_H__ #define __EMPATHY_PROTOCOL_CHOOSER_H__ -#include #include - #include -#include +#include "empathy-account-settings.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-roster-contact.c b/libempathy-gtk/empathy-roster-contact.c index d8410b5e..2db024a3 100644 --- a/libempathy-gtk/empathy-roster-contact.c +++ b/libempathy-gtk/empathy-roster-contact.c @@ -1,13 +1,11 @@ #include "config.h" - -#include - #include "empathy-roster-contact.h" -#include +#include -#include -#include +#include "empathy-images.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" G_DEFINE_TYPE (EmpathyRosterContact, empathy_roster_contact, GTK_TYPE_ALIGNMENT) diff --git a/libempathy-gtk/empathy-roster-group.c b/libempathy-gtk/empathy-roster-group.c index 643fed52..9ca53a8e 100644 --- a/libempathy-gtk/empathy-roster-group.c +++ b/libempathy-gtk/empathy-roster-group.c @@ -1,5 +1,4 @@ #include "config.h" - #include "empathy-roster-group.h" #include diff --git a/libempathy-gtk/empathy-roster-model-aggregator.c b/libempathy-gtk/empathy-roster-model-aggregator.c index a81b2c25..b82fd162 100644 --- a/libempathy-gtk/empathy-roster-model-aggregator.c +++ b/libempathy-gtk/empathy-roster-model-aggregator.c @@ -22,11 +22,10 @@ */ #include "config.h" +#include "empathy-roster-model-aggregator.h" #include -#include "empathy-roster-model-aggregator.h" - /** * SECTION: empathy-roster-model-aggregator * @title: EmpathyRosterModelAggregator diff --git a/libempathy-gtk/empathy-roster-model-aggregator.h b/libempathy-gtk/empathy-roster-model-aggregator.h index e29e36eb..3b9c0202 100644 --- a/libempathy-gtk/empathy-roster-model-aggregator.h +++ b/libempathy-gtk/empathy-roster-model-aggregator.h @@ -23,7 +23,6 @@ #define __EMPATHY_ROSTER_MODEL_AGGREGATOR_H__ #include - #include #include "empathy-roster-model.h" diff --git a/libempathy-gtk/empathy-roster-model-manager.c b/libempathy-gtk/empathy-roster-model-manager.c index 859edb7a..e0fff03e 100644 --- a/libempathy-gtk/empathy-roster-model-manager.c +++ b/libempathy-gtk/empathy-roster-model-manager.c @@ -22,14 +22,12 @@ */ #include "config.h" - #include "empathy-roster-model-manager.h" -#include "empathy-roster-model.h" - #include -#include +#include "empathy-roster-model.h" +#include "empathy-utils.h" static void roster_model_iface_init (EmpathyRosterModelInterface *iface); diff --git a/libempathy-gtk/empathy-roster-model-manager.h b/libempathy-gtk/empathy-roster-model-manager.h index f7ce1f4e..a38e6593 100644 --- a/libempathy-gtk/empathy-roster-model-manager.h +++ b/libempathy-gtk/empathy-roster-model-manager.h @@ -23,7 +23,7 @@ #include -#include +#include "empathy-individual-manager.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-roster-model.c b/libempathy-gtk/empathy-roster-model.c index 3fd84b7f..994ab989 100644 --- a/libempathy-gtk/empathy-roster-model.c +++ b/libempathy-gtk/empathy-roster-model.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include "config.h" - #include "empathy-roster-model.h" G_DEFINE_INTERFACE (EmpathyRosterModel, empathy_roster_model, G_TYPE_OBJECT) diff --git a/libempathy-gtk/empathy-roster-model.h b/libempathy-gtk/empathy-roster-model.h index 27c5482f..1b35f1a1 100644 --- a/libempathy-gtk/empathy-roster-model.h +++ b/libempathy-gtk/empathy-roster-model.h @@ -20,8 +20,6 @@ #ifndef __EMPATHY_ROSTER_MODEL_H__ #define __EMPATHY_ROSTER_MODEL_H__ -#include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-roster-view.c b/libempathy-gtk/empathy-roster-view.c index ed57be3d..657deaa9 100644 --- a/libempathy-gtk/empathy-roster-view.c +++ b/libempathy-gtk/empathy-roster-view.c @@ -1,14 +1,12 @@ #include "config.h" - #include "empathy-roster-view.h" #include -#include - -#include -#include -#include +#include "empathy-contact-groups.h" +#include "empathy-roster-contact.h" +#include "empathy-roster-group.h" +#include "empathy-ui-utils.h" G_DEFINE_TYPE (EmpathyRosterView, empathy_roster_view, EGG_TYPE_LIST_BOX) diff --git a/libempathy-gtk/empathy-roster-view.h b/libempathy-gtk/empathy-roster-view.h index 0077b684..c09d09c3 100644 --- a/libempathy-gtk/empathy-roster-view.h +++ b/libempathy-gtk/empathy-roster-view.h @@ -2,10 +2,9 @@ #ifndef __EMPATHY_ROSTER_VIEW_H__ #define __EMPATHY_ROSTER_VIEW_H__ -#include -#include - -#include +#include "egg-list-box/egg-list-box.h" +#include "empathy-live-search.h" +#include "empathy-roster-model.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-search-bar.c b/libempathy-gtk/empathy-search-bar.c index 018a068a..dce1bdd1 100644 --- a/libempathy-gtk/empathy-search-bar.c +++ b/libempathy-gtk/empathy-search-bar.c @@ -18,13 +18,12 @@ */ #include "config.h" +#include "empathy-search-bar.h" #include -#include - -#include "empathy-search-bar.h" #include "empathy-ui-utils.h" +#include "empathy-utils.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathySearchBar) diff --git a/libempathy-gtk/empathy-search-bar.h b/libempathy-gtk/empathy-search-bar.h index afda250b..a710965b 100644 --- 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__ -#include -#include +#include #include "empathy-theme-adium.h" diff --git a/libempathy-gtk/empathy-share-my-desktop.c b/libempathy-gtk/empathy-share-my-desktop.c index 8b084504..9c29533c 100644 --- a/libempathy-gtk/empathy-share-my-desktop.c +++ b/libempathy-gtk/empathy-share-my-desktop.c @@ -19,11 +19,10 @@ */ #include "config.h" +#include "empathy-share-my-desktop.h" #define DEBUG_FLAG EMPATHY_DEBUG_SHARE_DESKTOP -#include - -#include "empathy-share-my-desktop.h" +#include "empathy-debug.h" static void create_tube_channel_cb (GObject *source, diff --git a/libempathy-gtk/empathy-share-my-desktop.h b/libempathy-gtk/empathy-share-my-desktop.h index 3efeecc1..5953e15e 100644 --- a/libempathy-gtk/empathy-share-my-desktop.h +++ b/libempathy-gtk/empathy-share-my-desktop.h @@ -21,7 +21,7 @@ #ifndef __EMPATHY_SHARE_MY_DESKTOP_H__ #define __EMPATHY_SHARE_MY_DESKTOP_H__ -#include +#include "empathy-contact.h" void empathy_share_my_desktop_share_with_contact (EmpathyContact *contact); diff --git a/libempathy-gtk/empathy-smiley-manager.c b/libempathy-gtk/empathy-smiley-manager.c index 99caa51d..2e8ef3aa 100644 --- a/libempathy-gtk/empathy-smiley-manager.c +++ b/libempathy-gtk/empathy-smiley-manager.c @@ -21,10 +21,10 @@ */ #include "config.h" - -#include #include "empathy-smiley-manager.h" + #include "empathy-ui-utils.h" +#include "empathy-utils.h" typedef struct _SmileyManagerTree SmileyManagerTree; diff --git a/libempathy-gtk/empathy-smiley-manager.h b/libempathy-gtk/empathy-smiley-manager.h index 1d6eaac5..b9e753bf 100644 --- 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__ -#include #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-sound-manager.c b/libempathy-gtk/empathy-sound-manager.c index 3291a9a9..600816f6 100644 --- a/libempathy-gtk/empathy-sound-manager.c +++ b/libempathy-gtk/empathy-sound-manager.c @@ -18,15 +18,15 @@ */ #include "config.h" - #include "empathy-sound-manager.h" #include +#include "empathy-gsettings.h" +#include "empathy-utils.h" + #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include -#include -#include +#include "empathy-debug.h" typedef struct { EmpathySound sound_id; diff --git a/libempathy-gtk/empathy-sound-manager.h b/libempathy-gtk/empathy-sound-manager.h index 99e96c57..b2fd0d29 100644 --- a/libempathy-gtk/empathy-sound-manager.h +++ b/libempathy-gtk/empathy-sound-manager.h @@ -21,8 +21,6 @@ #ifndef __EMPATHY_SOUND_MANAGER_H__ #define __EMPATHY_SOUND_MANAGER_H__ -#include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-spell.c b/libempathy-gtk/empathy-spell.c index 4242b573..27f27f90 100644 --- a/libempathy-gtk/empathy-spell.c +++ b/libempathy-gtk/empathy-spell.c @@ -22,6 +22,7 @@ */ #include "config.h" +#include "empathy-spell.h" #include @@ -29,11 +30,10 @@ #include #endif -#include "empathy-spell.h" +#include "empathy-gsettings.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include -#include +#include "empathy-debug.h" #ifdef HAVE_ENCHANT diff --git a/libempathy-gtk/empathy-status-preset-dialog.c b/libempathy-gtk/empathy-status-preset-dialog.c index 19f1fee6..b122f287 100644 --- a/libempathy-gtk/empathy-status-preset-dialog.c +++ b/libempathy-gtk/empathy-status-preset-dialog.c @@ -35,17 +35,16 @@ */ #include "config.h" +#include "empathy-status-preset-dialog.h" #include -#include -#include +#include "empathy-status-presets.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include - -#include "empathy-ui-utils.h" -#include "empathy-status-preset-dialog.h" +#include "empathy-debug.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyStatusPresetDialog) diff --git a/libempathy-gtk/empathy-status-preset-dialog.h b/libempathy-gtk/empathy-status-preset-dialog.h index 5cf0e339..625547fe 100644 --- a/libempathy-gtk/empathy-status-preset-dialog.h +++ b/libempathy-gtk/empathy-status-preset-dialog.h @@ -28,7 +28,7 @@ #ifndef __EMPATHY_STATUS_PRESET_DIALOG_H__ #define __EMPATHY_STATUS_PRESET_DIALOG_H__ -#include +#include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-string-parser.c b/libempathy-gtk/empathy-string-parser.c index cb7d3c3e..7cbd290f 100644 --- a/libempathy-gtk/empathy-string-parser.c +++ b/libempathy-gtk/empathy-string-parser.c @@ -19,8 +19,8 @@ */ #include "config.h" - #include "empathy-string-parser.h" + #include "empathy-smiley-manager.h" #include "empathy-ui-utils.h" diff --git a/libempathy-gtk/empathy-subscription-dialog.c b/libempathy-gtk/empathy-subscription-dialog.c index 04fae6d1..87883265 100644 --- a/libempathy-gtk/empathy-subscription-dialog.c +++ b/libempathy-gtk/empathy-subscription-dialog.c @@ -19,14 +19,13 @@ */ #include "config.h" - #include "empathy-subscription-dialog.h" -#include -#include - #include +#include "empathy-individual-widget.h" +#include "empathy-utils.h" + G_DEFINE_TYPE (EmpathySubscriptionDialog, empathy_subscription_dialog, GTK_TYPE_MESSAGE_DIALOG) enum diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index 67ec4d08..31715c30 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -20,22 +20,21 @@ */ #include "config.h" +#include "empathy-theme-adium.h" #include -#include -#include -#include - -#include "empathy-theme-adium.h" +#include "empathy-gsettings.h" +#include "empathy-images.h" +#include "empathy-plist.h" #include "empathy-smiley-manager.h" +#include "empathy-time.h" #include "empathy-ui-utils.h" -#include "empathy-plist.h" -#include "empathy-images.h" +#include "empathy-utils.h" #include "empathy-webkit-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CHAT -#include +#include "empathy-debug.h" #define BORING_DPI_DEFAULT 96 diff --git a/libempathy-gtk/empathy-theme-adium.h b/libempathy-gtk/empathy-theme-adium.h index 88066761..698d2846 100644 --- a/libempathy-gtk/empathy-theme-adium.h +++ b/libempathy-gtk/empathy-theme-adium.h @@ -23,7 +23,7 @@ #include -#include +#include "empathy-message.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c index f3d8d67b..81361c1e 100644 --- a/libempathy-gtk/empathy-theme-manager.c +++ b/libempathy-gtk/empathy-theme-manager.c @@ -21,17 +21,12 @@ */ #include "config.h" - -#include - -#include - -#include - #include "empathy-theme-manager.h" +#include "empathy-gsettings.h" + #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include +#include "empathy-debug.h" struct _EmpathyThemeManagerPriv { diff --git a/libempathy-gtk/empathy-theme-manager.h b/libempathy-gtk/empathy-theme-manager.h index 812b0261..590c343f 100644 --- 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__ -#include #include "empathy-theme-adium.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c index 82244403..def31d22 100644 --- a/libempathy-gtk/empathy-tls-dialog.c +++ b/libempathy-gtk/empathy-tls-dialog.c @@ -19,15 +19,15 @@ */ #include "config.h" - #include "empathy-tls-dialog.h" #include #include +#include "empathy-utils.h" + #define DEBUG_FLAG EMPATHY_DEBUG_TLS -#include -#include +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyTLSDialog, empathy_tls_dialog, GTK_TYPE_MESSAGE_DIALOG) diff --git a/libempathy-gtk/empathy-tls-dialog.h b/libempathy-gtk/empathy-tls-dialog.h index a9c37ad5..b85e7d09 100644 --- a/libempathy-gtk/empathy-tls-dialog.h +++ b/libempathy-gtk/empathy-tls-dialog.h @@ -21,9 +21,7 @@ #ifndef __EMPATHY_TLS_DIALOG_H__ #define __EMPATHY_TLS_DIALOG_H__ -#include #include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index 9f430084..86edb3b0 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -30,20 +30,20 @@ */ #include "config.h" +#include "empathy-ui-utils.h" #include #include #include #include -#include "empathy-ui-utils.h" +#include "empathy-ft-factory.h" #include "empathy-images.h" #include "empathy-live-search.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include -#include -#include +#include "empathy-debug.h" void empathy_gtk_init (void) @@ -75,8 +75,15 @@ empathy_gtk_init (void) initialized = TRUE; } +enum _BuilderSource +{ + BUILDER_SOURCE_FILE, + BUILDER_SOURCE_RESOURCE +}; + static GtkBuilder * -builder_get_file_valist (const gchar *filename, +builder_get_valist (const gchar *sourcename, + enum _BuilderSource source, const gchar *first_object, va_list args) { @@ -84,16 +91,29 @@ builder_get_file_valist (const gchar *filename, const gchar *name; GObject **object_ptr; GError *error = NULL; + gboolean success; - DEBUG ("Loading file %s", filename); + DEBUG ("Loading %s '%s'", source == BUILDER_SOURCE_FILE ? "file" : "resource", sourcename); gui = gtk_builder_new (); gtk_builder_set_translation_domain (gui, GETTEXT_PACKAGE); - if (!gtk_builder_add_from_file (gui, filename, &error)) + switch (source) + { + case BUILDER_SOURCE_FILE: + success = gtk_builder_add_from_file (gui, sourcename, &error); + break; + case BUILDER_SOURCE_RESOURCE: + success = gtk_builder_add_from_resource (gui, sourcename, &error); + break; + default: + g_assert_not_reached (); + } + + if (!success) { g_critical ("GtkBuilder Error (%s): %s", - filename, error->message); + sourcename, error->message); g_clear_error (&error); g_object_unref (gui); @@ -134,7 +154,22 @@ empathy_builder_get_file (const gchar *filename, va_list args; va_start (args, first_object); - gui = builder_get_file_valist (filename, first_object, args); + gui = builder_get_valist (filename, BUILDER_SOURCE_FILE, first_object, args); + va_end (args); + + return gui; +} + +GtkBuilder * +empathy_builder_get_resource (const gchar *resourcename, + const gchar *first_object, + ...) +{ + GtkBuilder *gui; + va_list args; + + va_start (args, first_object); + gui = builder_get_valist (resourcename, BUILDER_SOURCE_RESOURCE, first_object, args); va_end (args); return gui; diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h index 73232cf5..baf250e3 100644 --- a/libempathy-gtk/empathy-ui-utils.h +++ b/libempathy-gtk/empathy-ui-utils.h @@ -33,14 +33,15 @@ #define __EMPATHY_UI_UTILS_H__ #include - #include -#include -#include +#include "empathy-contact.h" +#include "empathy-ft-handler.h" G_BEGIN_DECLS +#define ACCOUNT_WIDGETS_RESOURCES_PREFIX "/org/gnome/AccountWidgets" + #define EMPATHY_RECT_IS_ON_SCREEN(x,y,w,h) ((x) + (w) > 0 && \ (y) + (h) > 0 && \ (x) < gdk_screen_width () && \ @@ -57,6 +58,9 @@ void empathy_gtk_init (void); GtkBuilder * empathy_builder_get_file (const gchar *filename, const gchar *first_object, ...); +GtkBuilder * empathy_builder_get_resource (const gchar *resourcename, + const gchar *first_object, + ...); void empathy_builder_connect (GtkBuilder *gui, gpointer user_data, const gchar *first_object, diff --git a/libempathy-gtk/empathy-user-info.c b/libempathy-gtk/empathy-user-info.c index 4c9a2dee..e63f320f 100644 --- a/libempathy-gtk/empathy-user-info.c +++ b/libempathy-gtk/empathy-user-info.c @@ -22,14 +22,14 @@ #include -#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include -#include -#include - #include "empathy-avatar-chooser.h" #include "empathy-calendar-button.h" #include "empathy-contactinfo-utils.h" +#include "empathy-time.h" +#include "empathy-utils.h" + +#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyUserInfo, empathy_user_info, GTK_TYPE_GRID) diff --git a/libempathy-gtk/empathy-user-info.h b/libempathy-gtk/empathy-user-info.h index 117bfd32..a06c7291 100644 --- a/libempathy-gtk/empathy-user-info.h +++ b/libempathy-gtk/empathy-user-info.h @@ -21,7 +21,6 @@ #define __EMPATHY_USER_INFO_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-webkit-utils.c b/libempathy-gtk/empathy-webkit-utils.c index d221e5f9..0fc31908 100644 --- a/libempathy-gtk/empathy-webkit-utils.c +++ b/libempathy-gtk/empathy-webkit-utils.c @@ -19,13 +19,13 @@ */ #include "config.h" +#include "empathy-webkit-utils.h" #include -#include "empathy-webkit-utils.h" #include "empathy-smiley-manager.h" -#include "empathy-ui-utils.h" #include "empathy-theme-adium.h" +#include "empathy-ui-utils.h" #define BORING_DPI_DEFAULT 96 diff --git a/libempathy/.gitignore b/libempathy/.gitignore index 8617dcbd..5cc6b339 100644 --- a/libempathy/.gitignore +++ b/libempathy/.gitignore @@ -1,4 +1,5 @@ empathy-chandler-glue.h +empathy-dtd-resources.[ch] empathy-marshal.* empathy-filter-glue.h tp-stream-engine-gen.h diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index 36de4d6c..5f4059f2 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -2,8 +2,7 @@ include $(top_srcdir)/tools/flymake.mk AM_CPPFLAGS = \ $(ERROR_CFLAGS) \ - -I. \ - -I$(top_srcdir) \ + -I$(top_srcdir)/extensions \ -I$(top_builddir) \ -DDATADIR=\""$(datadir)"\" \ -DLOCALEDIR=\""$(datadir)/locale"\" \ @@ -21,6 +20,8 @@ AM_CPPFLAGS = \ $(DISABLE_DEPRECATED) BUILT_SOURCES = \ + empathy-dtd-resources.c \ + empathy-dtd-resources.h \ empathy-enum-types.h \ empathy-enum-types.c @@ -134,8 +135,7 @@ libempathy_la_LIBADD = \ $(UOA_LIBS) \ $(LIBM) -dtddir = $(datadir)/empathy -dtd_DATA = \ +dtd_resources_files = \ empathy-status-presets.dtd \ empathy-contact-groups.dtd \ empathy-chatroom-manager.dtd \ @@ -145,8 +145,17 @@ ircnetworksdir = $(datadir)/empathy ircnetworks_DATA = \ irc-networks.xml -EXTRA_DIST = \ - $(dtd_DATA) \ +dtd_resource_files: $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/empathy-dtd.gresource.xml) + +empathy-dtd-resources.c: empathy-dtd.gresource.xml $(dtd_resource_files) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $< + +empathy-dtd-resources.h: empathy-dtd.gresource.xml $(dtd_resource_files) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $< + +EXTRA_DIST = \ + empathy-dtd.gresource.xml \ + $(dtd_resources_files) \ $(ircnetworks_DATA) CLEANFILES = \ @@ -189,7 +198,7 @@ stamp-empathy-enum-types.h: $(libempathy_headers) Makefile --fhead "G_BEGIN_DECLS\n\n" \ --ftail "G_END_DECLS\n\n" \ --ftail "#endif /* __LIBEMPATHY_ENUM_TYPES_H__ */\n" \ - --fprod "#include \n" \ + --fprod '#include "@filename@"\n' \ --eprod "#define EMPATHY_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \ --eprod "GType @enum_name@_get_type (void);\n" \ $(libempathy_headers) ) > xgen-gth \ diff --git a/libempathy/cheese-camera-device-monitor.c b/libempathy/cheese-camera-device-monitor.c index 3b937ce9..0e868f2b 100644 --- a/libempathy/cheese-camera-device-monitor.c +++ b/libempathy/cheese-camera-device-monitor.c @@ -69,7 +69,7 @@ G_DEFINE_TYPE (EmpathyCameraDeviceMonitor, empathy_camera_device_monitor, G_TYPE #define EMPATHY_CAMERA_DEVICE_MONITOR_ERROR empathy_camera_device_monitor_error_quark () #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include +#include "empathy-debug.h" enum EmpathyCameraDeviceMonitorError { diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c index 12b28b8b..064d4d21 100644 --- a/libempathy/empathy-account-settings.c +++ b/libempathy/empathy-account-settings.c @@ -19,15 +19,15 @@ */ #include "config.h" - #include "empathy-account-settings.h" + #include "empathy-connection-managers.h" #include "empathy-keyring.h" -#include "empathy-utils.h" #include "empathy-presence-manager.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include +#include "empathy-debug.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAccountSettings) diff --git a/libempathy/empathy-account-settings.h b/libempathy/empathy-account-settings.h index 162def48..6e4713c4 100644 --- a/libempathy/empathy-account-settings.h +++ b/libempathy/empathy-account-settings.h @@ -23,7 +23,6 @@ #include #include - #include G_BEGIN_DECLS diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c index b2f2b802..cba4607a 100644 --- a/libempathy/empathy-auth-factory.c +++ b/libempathy/empathy-auth-factory.c @@ -19,11 +19,8 @@ */ #include "config.h" - #include "empathy-auth-factory.h" -#define DEBUG_FLAG EMPATHY_DEBUG_TLS -#include "empathy-debug.h" #include "empathy-keyring.h" #include "empathy-sasl-mechanisms.h" #include "empathy-server-sasl-handler.h" @@ -38,7 +35,10 @@ #include "empathy-uoa-auth-handler.h" #endif /* HAVE_UOA */ -#include "extensions/extensions.h" +#include "extensions.h" + +#define DEBUG_FLAG EMPATHY_DEBUG_TLS +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyAuthFactory, empathy_auth_factory, TP_TYPE_BASE_CLIENT); diff --git a/libempathy/empathy-auth-factory.h b/libempathy/empathy-auth-factory.h index 16d6ad34..73e90578 100644 --- a/libempathy/empathy-auth-factory.h +++ b/libempathy/empathy-auth-factory.h @@ -22,7 +22,6 @@ #define __EMPATHY_AUTH_FACTORY_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy/empathy-camera-monitor.c b/libempathy/empathy-camera-monitor.c index 1e603e98..6e669112 100644 --- a/libempathy/empathy-camera-monitor.c +++ b/libempathy/empathy-camera-monitor.c @@ -19,8 +19,8 @@ */ #include "config.h" - #include "empathy-camera-monitor.h" + #include "cheese-camera-device-monitor.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c index ebdc5043..3f182861 100644 --- a/libempathy/empathy-chatroom-manager.c +++ b/libempathy/empathy-chatroom-manager.c @@ -22,18 +22,18 @@ */ #include "config.h" +#include "empathy-chatroom-manager.h" #include #include "empathy-client-factory.h" -#include "empathy-chatroom-manager.h" #include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include "empathy-debug.h" #define CHATROOMS_XML_FILENAME "chatrooms.xml" -#define CHATROOMS_DTD_FILENAME "empathy-chatroom-manager.dtd" +#define CHATROOMS_DTD_RESOURCENAME "/org/gnome/Empathy/empathy-chatroom-manager.dtd" #define SAVE_TIMER 4 static EmpathyChatroomManager *chatroom_manager_singleton = NULL; @@ -320,7 +320,7 @@ chatroom_manager_file_parse (EmpathyChatroomManager *manager, return FALSE; } - if (!empathy_xml_validate (doc, CHATROOMS_DTD_FILENAME)) + if (!empathy_xml_validate_from_resource (doc, CHATROOMS_DTD_RESOURCENAME)) { g_warning ("Failed to validate file:'%s'", filename); xmlFreeDoc (doc); diff --git a/libempathy/empathy-chatroom-manager.h b/libempathy/empathy-chatroom-manager.h index b8232dc6..498d225a 100644 --- a/libempathy/empathy-chatroom-manager.h +++ b/libempathy/empathy-chatroom-manager.h @@ -25,7 +25,6 @@ #define __EMPATHY_CHATROOM_MANAGER_H__ #include - #include #include "empathy-chatroom.h" diff --git a/libempathy/empathy-chatroom.c b/libempathy/empathy-chatroom.c index dcc72d5f..32bb4ce3 100644 --- a/libempathy/empathy-chatroom.c +++ b/libempathy/empathy-chatroom.c @@ -20,8 +20,8 @@ */ #include "config.h" - #include "empathy-chatroom.h" + #include "empathy-utils.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyChatroom) diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h index 57ca685c..98ed04b9 100644 --- a/libempathy/empathy-chatroom.h +++ b/libempathy/empathy-chatroom.h @@ -23,10 +23,9 @@ #define __EMPATHY_CHATROOM_H__ #include - #include -#include +#include "empathy-tp-chat.h" G_BEGIN_DECLS diff --git a/libempathy/empathy-client-factory.c b/libempathy/empathy-client-factory.c index 1c8fc58c..39760998 100644 --- a/libempathy/empathy-client-factory.c +++ b/libempathy/empathy-client-factory.c @@ -20,7 +20,6 @@ */ #include "config.h" - #include "empathy-client-factory.h" #include "empathy-tp-chat.h" diff --git a/libempathy/empathy-connection-aggregator.c b/libempathy/empathy-connection-aggregator.c index 83e15f15..763715f9 100644 --- a/libempathy/empathy-connection-aggregator.c +++ b/libempathy/empathy-connection-aggregator.c @@ -19,7 +19,6 @@ */ #include "config.h" - #include "empathy-connection-aggregator.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER diff --git a/libempathy/empathy-connection-aggregator.h b/libempathy/empathy-connection-aggregator.h index 71e6e439..267b2093 100644 --- a/libempathy/empathy-connection-aggregator.h +++ b/libempathy/empathy-connection-aggregator.h @@ -22,7 +22,6 @@ #define __EMPATHY_CONNECTION_AGGREGATOR_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy/empathy-connection-managers.c b/libempathy/empathy-connection-managers.c index abf862bc..b94ac125 100644 --- a/libempathy/empathy-connection-managers.c +++ b/libempathy/empathy-connection-managers.c @@ -19,12 +19,12 @@ */ #include "config.h" - #include "empathy-connection-managers.h" + #include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include +#include "empathy-debug.h" static GObject *managers = NULL; diff --git a/libempathy/empathy-connection-managers.h b/libempathy/empathy-connection-managers.h index d8bcb390..0ed20c93 100644 --- a/libempathy/empathy-connection-managers.h +++ b/libempathy/empathy-connection-managers.h @@ -23,7 +23,6 @@ #include #include - #include G_BEGIN_DECLS diff --git a/libempathy/empathy-contact-groups.c b/libempathy/empathy-contact-groups.c index 8d49f051..81a1b313 100644 --- a/libempathy/empathy-contact-groups.c +++ b/libempathy/empathy-contact-groups.c @@ -21,17 +21,17 @@ */ #include "config.h" +#include "empathy-contact-groups.h" #include #include "empathy-utils.h" -#include "empathy-contact-groups.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT #include "empathy-debug.h" #define CONTACT_GROUPS_XML_FILENAME "contact-groups.xml" -#define CONTACT_GROUPS_DTD_FILENAME "empathy-contact-groups.dtd" +#define CONTACT_GROUPS_DTD_RESOURCENAME "/org/gnome/Empathy/empathy-contact-groups.dtd" typedef struct { gchar *name; @@ -91,7 +91,7 @@ contact_groups_file_parse (const gchar *filename) return; } - if (!empathy_xml_validate (doc, CONTACT_GROUPS_DTD_FILENAME)) { + if (!empathy_xml_validate_from_resource (doc, CONTACT_GROUPS_DTD_RESOURCENAME)) { g_warning ("Failed to validate file:'%s'", filename); xmlFreeDoc (doc); xmlFreeParserCtxt (ctxt); diff --git a/libempathy/empathy-contact-groups.h b/libempathy/empathy-contact-groups.h index 181b2875..0be1c81b 100644 --- a/libempathy/empathy-contact-groups.h +++ b/libempathy/empathy-contact-groups.h @@ -23,10 +23,10 @@ #ifndef __EMPATHY_CONTACT_GROUPS_H__ #define __EMPATHY_CONTACT_GROUPS_H__ -G_BEGIN_DECLS - #include +G_BEGIN_DECLS + void empathy_contact_groups_get_all (void); gboolean empathy_contact_group_get_expanded (const gchar *group); diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index 3c91e631..35610443 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include "empathy-contact.h" #ifdef HAVE_GEOCODE #include diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h index 14c3f644..e7ce10e4 100644 --- a/libempathy/empathy-contact.h +++ b/libempathy/empathy-contact.h @@ -23,7 +23,6 @@ #define __EMPATHY_CONTACT_H__ #include - #include #include #include diff --git a/libempathy/empathy-debug.c b/libempathy/empathy-debug.c index 09573c39..75900f4a 100644 --- a/libempathy/empathy-debug.c +++ b/libempathy/empathy-debug.c @@ -19,7 +19,6 @@ */ #include "config.h" - #include "empathy-debug.h" #ifdef ENABLE_DEBUG diff --git a/libempathy/empathy-debug.h b/libempathy/empathy-debug.h index e6b93cc7..5a600602 100644 --- a/libempathy/empathy-debug.h +++ b/libempathy/empathy-debug.h @@ -21,9 +21,6 @@ #ifndef __EMPATHY_DEBUG_H__ #define __EMPATHY_DEBUG_H__ -#include "config.h" - - #include #include diff --git a/libempathy/empathy-dtd.gresource.xml b/libempathy/empathy-dtd.gresource.xml new file mode 100644 index 00000000..76cc8170 --- /dev/null +++ b/libempathy/empathy-dtd.gresource.xml @@ -0,0 +1,10 @@ + + + + empathy-status-presets.dtd + empathy-contact-groups.dtd + empathy-chatroom-manager.dtd + empathy-irc-networks.dtd + + + diff --git a/libempathy/empathy-ft-factory.c b/libempathy/empathy-ft-factory.c index 9cf90014..855ddb98 100644 --- a/libempathy/empathy-ft-factory.c +++ b/libempathy/empathy-ft-factory.c @@ -21,7 +21,9 @@ /* empathy-ft-factory.c */ +#include "config.h" #include "empathy-ft-factory.h" + #include "empathy-request-util.h" #include "empathy-utils.h" diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c index 30711c7d..96c8e47f 100644 --- a/libempathy/empathy-ft-handler.c +++ b/libempathy/empathy-ft-handler.c @@ -22,10 +22,10 @@ /* empathy-ft-handler.c */ #include "config.h" +#include "empathy-ft-handler.h" #include -#include "empathy-ft-handler.h" #include "empathy-time.h" #include "empathy-utils.h" diff --git a/libempathy/empathy-ft-handler.h b/libempathy/empathy-ft-handler.h index a120f241..2fc1b609 100644 --- a/libempathy/empathy-ft-handler.h +++ b/libempathy/empathy-ft-handler.h @@ -26,7 +26,6 @@ #include #include - #include #include "empathy-contact.h" diff --git a/libempathy/empathy-goa-auth-handler.c b/libempathy/empathy-goa-auth-handler.c index 3659b372..37973000 100644 --- a/libempathy/empathy-goa-auth-handler.c +++ b/libempathy/empathy-goa-auth-handler.c @@ -19,14 +19,15 @@ */ #include "config.h" +#include "empathy-goa-auth-handler.h" #define GOA_API_IS_SUBJECT_TO_CHANGE /* awesome! */ #include +#include "empathy-sasl-mechanisms.h" + #define DEBUG_FLAG EMPATHY_DEBUG_SASL #include "empathy-debug.h" -#include "empathy-goa-auth-handler.h" -#include "empathy-sasl-mechanisms.h" struct _EmpathyGoaAuthHandlerPriv { diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c index f3c7565a..71960b5d 100644 --- a/libempathy/empathy-individual-manager.c +++ b/libempathy/empathy-individual-manager.c @@ -21,8 +21,8 @@ */ #include "config.h" - #include "empathy-individual-manager.h" + #include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT diff --git a/libempathy/empathy-irc-network-manager.c b/libempathy/empathy-irc-network-manager.c index 7f6ed9df..3f53a49a 100644 --- a/libempathy/empathy-irc-network-manager.c +++ b/libempathy/empathy-irc-network-manager.c @@ -19,16 +19,16 @@ */ #include "config.h" +#include "empathy-irc-network-manager.h" #include #include "empathy-utils.h" -#include "empathy-irc-network-manager.h" #define DEBUG_FLAG EMPATHY_DEBUG_IRC #include "empathy-debug.h" -#define IRC_NETWORKS_DTD_FILENAME "empathy-irc-networks.dtd" +#define IRC_NETWORKS_DTD_RESOURCENAME "/org/gnome/Empathy/empathy-irc-networks.dtd" #define IRC_NETWORKS_FILENAME "irc-networks.xml" #define SAVE_TIMER 4 @@ -632,7 +632,7 @@ irc_network_manager_file_parse (EmpathyIrcNetworkManager *self, return FALSE; } - if (!empathy_xml_validate (doc, IRC_NETWORKS_DTD_FILENAME)) { + if (!empathy_xml_validate_from_resource (doc, IRC_NETWORKS_DTD_RESOURCENAME)) { g_warning ("Failed to validate file:'%s'", filename); xmlFreeDoc (doc); xmlFreeParserCtxt (ctxt); diff --git a/libempathy/empathy-irc-network.c b/libempathy/empathy-irc-network.c index e0bc84f7..e01116e9 100644 --- a/libempathy/empathy-irc-network.c +++ b/libempathy/empathy-irc-network.c @@ -20,8 +20,8 @@ */ #include "config.h" - #include "empathy-irc-network.h" + #include "empathy-utils.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIrcNetwork) diff --git a/libempathy/empathy-irc-server.c b/libempathy/empathy-irc-server.c index 5457f23a..75eb016d 100644 --- a/libempathy/empathy-irc-server.c +++ b/libempathy/empathy-irc-server.c @@ -19,8 +19,8 @@ */ #include "config.h" - #include "empathy-irc-server.h" + #include "empathy-utils.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIrcServer) diff --git a/libempathy/empathy-keyring.c b/libempathy/empathy-keyring.c index 837b2d51..e7872f1b 100644 --- a/libempathy/empathy-keyring.c +++ b/libempathy/empathy-keyring.c @@ -17,11 +17,9 @@ */ #include "config.h" - -#include - #include "empathy-keyring.h" +#include #include #ifdef HAVE_UOA diff --git a/libempathy/empathy-keyring.h b/libempathy/empathy-keyring.h index 7e945dc0..6471099f 100644 --- a/libempathy/empathy-keyring.h +++ b/libempathy/empathy-keyring.h @@ -20,7 +20,6 @@ #define __EMPATHY_KEYRING_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c index e19f69b0..1115eddd 100644 --- a/libempathy/empathy-message.c +++ b/libempathy/empathy-message.c @@ -23,11 +23,11 @@ */ #include "config.h" +#include "empathy-message.h" #include #include "empathy-client-factory.h" -#include "empathy-message.h" #include "empathy-time.h" #include "empathy-utils.h" #include "empathy-enum-types.h" diff --git a/libempathy/empathy-pkg-kit.c b/libempathy/empathy-pkg-kit.c index 1d01b931..21f703b6 100644 --- a/libempathy/empathy-pkg-kit.c +++ b/libempathy/empathy-pkg-kit.c @@ -19,8 +19,7 @@ */ #include "config.h" - -#include +#include "empathy-pkg-kit.h" typedef struct { diff --git a/libempathy/empathy-presence-manager.c b/libempathy/empathy-presence-manager.c index cdc45fbe..1c288fb9 100644 --- a/libempathy/empathy-presence-manager.c +++ b/libempathy/empathy-presence-manager.c @@ -19,7 +19,6 @@ */ #include "config.h" - #include "empathy-presence-manager.h" #include "empathy-utils.h" diff --git a/libempathy/empathy-presence-manager.h b/libempathy/empathy-presence-manager.h index 6357aeec..f616647a 100644 --- a/libempathy/empathy-presence-manager.h +++ b/libempathy/empathy-presence-manager.h @@ -22,7 +22,6 @@ #define __EMPATHY_PRESENCE_MANAGER_H__ #include - #include G_BEGIN_DECLS diff --git a/libempathy/empathy-request-util.c b/libempathy/empathy-request-util.c index 8532da57..c5f693f0 100644 --- a/libempathy/empathy-request-util.c +++ b/libempathy/empathy-request-util.c @@ -20,11 +20,10 @@ */ #include "config.h" - #include "empathy-request-util.h" #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER -#include +#include "empathy-debug.h" void empathy_chat_with_contact (EmpathyContact *contact, diff --git a/libempathy/empathy-request-util.h b/libempathy/empathy-request-util.h index 497c65ee..9c168d7a 100644 --- a/libempathy/empathy-request-util.h +++ b/libempathy/empathy-request-util.h @@ -23,7 +23,6 @@ #include #include - #include #include "empathy-contact.h" diff --git a/libempathy/empathy-sasl-mechanisms.c b/libempathy/empathy-sasl-mechanisms.c index 303bf9e3..a6829c45 100644 --- a/libempathy/empathy-sasl-mechanisms.c +++ b/libempathy/empathy-sasl-mechanisms.c @@ -19,13 +19,13 @@ */ #include "config.h" +#include "empathy-sasl-mechanisms.h" #include #define DEBUG_FLAG EMPATHY_DEBUG_SASL #include "empathy-debug.h" #include "empathy-utils.h" -#include "empathy-sasl-mechanisms.h" #define MECH_FACEBOOK "X-FACEBOOK-PLATFORM" #define MECH_WLM "X-MESSENGER-OAUTH2" diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c index bdca7b62..b18d1a73 100644 --- a/libempathy/empathy-server-sasl-handler.c +++ b/libempathy/empathy-server-sasl-handler.c @@ -18,15 +18,14 @@ */ #include "config.h" - #include "empathy-server-sasl-handler.h" -#include +#include "empathy-keyring.h" +#include "empathy-sasl-mechanisms.h" +#include "extensions.h" #define DEBUG_FLAG EMPATHY_DEBUG_SASL #include "empathy-debug.h" -#include "empathy-keyring.h" -#include "empathy-sasl-mechanisms.h" enum { PROP_CHANNEL = 1, diff --git a/libempathy/empathy-server-sasl-handler.h b/libempathy/empathy-server-sasl-handler.h index d25d90ab..8bf7e3b7 100644 --- a/libempathy/empathy-server-sasl-handler.h +++ b/libempathy/empathy-server-sasl-handler.h @@ -22,7 +22,6 @@ #include #include - #include G_BEGIN_DECLS diff --git a/libempathy/empathy-server-tls-handler.c b/libempathy/empathy-server-tls-handler.c index d58155f5..34c3147a 100644 --- a/libempathy/empathy-server-tls-handler.c +++ b/libempathy/empathy-server-tls-handler.c @@ -19,14 +19,13 @@ */ #include "config.h" - #include "empathy-server-tls-handler.h" -#define DEBUG_FLAG EMPATHY_DEBUG_TLS -#include "empathy-debug.h" #include "empathy-utils.h" +#include "extensions.h" -#include "extensions/extensions.h" +#define DEBUG_FLAG EMPATHY_DEBUG_TLS +#include "empathy-debug.h" static void async_initable_iface_init (GAsyncInitableIface *iface); diff --git a/libempathy/empathy-server-tls-handler.h b/libempathy/empathy-server-tls-handler.h index f4caf353..ed19c72f 100644 --- a/libempathy/empathy-server-tls-handler.h +++ b/libempathy/empathy-server-tls-handler.h @@ -23,7 +23,6 @@ #include #include - #include G_BEGIN_DECLS diff --git a/libempathy/empathy-status-presets.c b/libempathy/empathy-status-presets.c index d8faa4fe..0e651f07 100644 --- a/libempathy/empathy-status-presets.c +++ b/libempathy/empathy-status-presets.c @@ -21,17 +21,17 @@ */ #include "config.h" +#include "empathy-status-presets.h" #include #include "empathy-utils.h" -#include "empathy-status-presets.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include "empathy-debug.h" #define STATUS_PRESETS_XML_FILENAME "status-presets.xml" -#define STATUS_PRESETS_DTD_FILENAME "empathy-status-presets.dtd" +#define STATUS_PRESETS_DTD_RESOURCENAME "/org/gnome/Empathy/empathy-status-presets.dtd" #define STATUS_PRESETS_MAX_EACH 15 typedef struct { @@ -92,7 +92,7 @@ status_presets_file_parse (const gchar *filename) return; } - if (!empathy_xml_validate (doc, STATUS_PRESETS_DTD_FILENAME)) { + if (!empathy_xml_validate_from_resource (doc, STATUS_PRESETS_DTD_RESOURCENAME)) { g_warning ("Failed to validate file:'%s'", filename); xmlFreeDoc (doc); xmlFreeParserCtxt (ctxt); diff --git a/libempathy/empathy-time.c b/libempathy/empathy-time.c index cbb6b3bd..d14f2c4c 100644 --- a/libempathy/empathy-time.c +++ b/libempathy/empathy-time.c @@ -20,11 +20,10 @@ */ #include "config.h" +#include "empathy-time.h" #include -#include "empathy-time.h" - /* Note: EmpathyTime is always in UTC. */ gint64 diff --git a/libempathy/empathy-time.h b/libempathy/empathy-time.h index 59bd9269..fc7af28e 100644 --- a/libempathy/empathy-time.h +++ b/libempathy/empathy-time.h @@ -24,7 +24,6 @@ #define __USE_XOPEN #endif #include - #include G_BEGIN_DECLS diff --git a/libempathy/empathy-tls-verifier.c b/libempathy/empathy-tls-verifier.c index 00447cc4..fcbc559b 100644 --- a/libempathy/empathy-tls-verifier.c +++ b/libempathy/empathy-tls-verifier.c @@ -20,14 +20,14 @@ */ #include "config.h" - #include "empathy-tls-verifier.h" #include +#include "empathy-utils.h" + #define DEBUG_FLAG EMPATHY_DEBUG_TLS #include "empathy-debug.h" -#include "empathy-utils.h" G_DEFINE_TYPE (EmpathyTLSVerifier, empathy_tls_verifier, G_TYPE_OBJECT) diff --git a/libempathy/empathy-tls-verifier.h b/libempathy/empathy-tls-verifier.h index 2f66acb9..c25d9756 100644 --- a/libempathy/empathy-tls-verifier.h +++ b/libempathy/empathy-tls-verifier.h @@ -23,7 +23,6 @@ #include #include - #include G_BEGIN_DECLS diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index e15a8c41..4711affc 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -19,8 +19,8 @@ */ #include "config.h" - #include "empathy-tp-chat.h" + #include "empathy-request-util.h" #include "empathy-utils.h" diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h index d8d4ac31..20fb4e1e 100644 --- a/libempathy/empathy-tp-chat.h +++ b/libempathy/empathy-tp-chat.h @@ -22,7 +22,6 @@ #define __EMPATHY_TP_CHAT_H__ #include - #include #include "empathy-message.h" diff --git a/libempathy/empathy-uoa-auth-handler.c b/libempathy/empathy-uoa-auth-handler.c index a57dd633..7e17b708 100644 --- a/libempathy/empathy-uoa-auth-handler.c +++ b/libempathy/empathy-uoa-auth-handler.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "empathy-uoa-auth-handler.h" #include #include @@ -29,14 +30,14 @@ #include #include -#define DEBUG_FLAG EMPATHY_DEBUG_SASL -#include "empathy-debug.h" #include "empathy-keyring.h" #include "empathy-utils.h" -#include "empathy-uoa-auth-handler.h" #include "empathy-uoa-utils.h" #include "empathy-sasl-mechanisms.h" +#define DEBUG_FLAG EMPATHY_DEBUG_SASL +#include "empathy-debug.h" + struct _EmpathyUoaAuthHandlerPriv { AgManager *manager; diff --git a/libempathy/empathy-uoa-utils.c b/libempathy/empathy-uoa-utils.c index f63a1519..6032d36b 100644 --- a/libempathy/empathy-uoa-utils.c +++ b/libempathy/empathy-uoa-utils.c @@ -19,10 +19,10 @@ */ #include "config.h" +#include "empathy-uoa-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT #include "empathy-debug.h" -#include "empathy-uoa-utils.h" static AgManager *singleton = NULL; diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index 74770c15..c9eb5ca6 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -27,17 +27,14 @@ */ #include "config.h" +#include "empathy-utils.h" #include - -#include #include #include "empathy-client-factory.h" -#include "empathy-utils.h" #include "empathy-presence-manager.h" - -#include +#include "extensions.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include "empathy-debug.h" @@ -109,36 +106,36 @@ empathy_init (void) } gboolean -empathy_xml_validate (xmlDoc *doc, - const gchar *dtd_filename) +empathy_xml_validate_from_resource (xmlDoc *doc, + const gchar *dtd_resourcename) { - gchar *path; - xmlChar *escaped; + GBytes *resourcecontents; + gconstpointer resourcedata; + gsize resourcesize; + xmlParserInputBufferPtr buffer; xmlValidCtxt cvp; xmlDtd *dtd; + GError *error = NULL; gboolean ret; - path = g_build_filename (g_getenv ("EMPATHY_SRCDIR"), "libempathy", - dtd_filename, NULL); - if (!g_file_test (path, G_FILE_TEST_EXISTS)) + DEBUG ("Loading dtd resource %s", dtd_resourcename); + + resourcecontents = g_resources_lookup_data (dtd_resourcename, G_RESOURCE_LOOKUP_FLAGS_NONE, &error); + if (error != NULL) { - g_free (path); - path = g_build_filename (DATADIR, "empathy", dtd_filename, NULL); + g_warning ("Unable to load dtd resource '%s': %s", dtd_resourcename, error->message); + g_error_free (error); + return FALSE; } - - DEBUG ("Loading dtd file %s", path); - - /* The list of valid chars is taken from libxml. */ - escaped = xmlURIEscapeStr ((const xmlChar *) path, - (const xmlChar *)":@&=+$,/?;"); - g_free (path); + resourcedata = g_bytes_get_data (resourcecontents, &resourcesize); + buffer = xmlParserInputBufferCreateStatic (resourcedata, resourcesize, XML_CHAR_ENCODING_UTF8); memset (&cvp, 0, sizeof (cvp)); - dtd = xmlParseDTD (NULL, escaped); + dtd = xmlIOParseDTD (NULL, buffer, XML_CHAR_ENCODING_UTF8); ret = xmlValidateDtd (&cvp, doc, dtd); - xmlFree (escaped); xmlFreeDtd (dtd); + g_bytes_unref (resourcecontents); return ret; } diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h index 5fe79e9e..440fe835 100644 --- a/libempathy/empathy-utils.h +++ b/libempathy/empathy-utils.h @@ -27,7 +27,6 @@ #include #include - #include #include #include @@ -44,8 +43,8 @@ G_BEGIN_DECLS void empathy_init (void); /* XML */ -gboolean empathy_xml_validate (xmlDoc *doc, - const gchar *dtd_filename); +gboolean empathy_xml_validate_from_resource (xmlDoc *doc, + const gchar *dtd_resourcename); xmlNodePtr empathy_xml_node_get_child (xmlNodePtr node, const gchar *child_name); xmlChar * empathy_xml_node_get_child_content (xmlNodePtr node, diff --git a/nautilus-sendto-plugin/Makefile.am b/nautilus-sendto-plugin/Makefile.am index 171ba2ed..a28415cc 100644 --- a/nautilus-sendto-plugin/Makefile.am +++ b/nautilus-sendto-plugin/Makefile.am @@ -2,7 +2,8 @@ plugindir = $(libdir)/nautilus-sendto/plugins INCLUDES = \ -I$(top_builddir) \ - -I$(top_srcdir) \ + -I$(top_srcdir)/libempathy \ + -I$(top_srcdir)/libempathy-gtk \ -DLOCALEDIR=\""$(datadir)/locale"\" \ $(NST_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c index 8b1bafb7..de792385 100644 --- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c +++ b/nautilus-sendto-plugin/empathy-nautilus-sendto.c @@ -22,24 +22,16 @@ #include "config.h" -#include #include -#include -#include - -#include - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include + + +#include "empathy-debug.h" +#include "empathy-ft-factory.h" + +#include "empathy-roster-model-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-roster-view.h" +#include "empathy-roster-contact.h" #include "nautilus-sendto-plugin.h" diff --git a/src/Makefile.am b/src/Makefile.am index b52e9ad8..db30af3f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,11 @@ include $(top_srcdir)/tools/flymake.mk CPPFLAGS_COMMON = \ $(EMPATHY_CFLAGS) \ $(ERROR_CFLAGS) \ - -I$(top_srcdir) \ + -I$(top_srcdir)/libempathy-gtk \ + -I$(top_srcdir)/libempathy \ + -I$(top_srcdir)/extensions \ + -I$(top_builddir)/libempathy-gtk \ + -I$(top_builddir)/libempathy \ -DG_LOG_DOMAIN=\"empathy\" \ -DBIN_DIR=\"$(bindir)\" \ $(DISABLE_DEPRECATED) \ @@ -203,14 +207,10 @@ BUILT_SOURCES = \ CLEANFILES = $(BUILT_SOURCES) -empathy-chat-resources.c: empathy-chat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/empathy-chat.gresource.xml) - $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \ - --sourcedir=$(srcdir) \ - --generate-source \ - $< - -empathy-chat-resources.h: empathy-chat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies $(srcdir)/empathy-chat.gresource.xml) - $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ \ - --sourcedir=$(srcdir) \ - --generate-header \ - $< +chat_resource_files: $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir) $(srcdir)/empathy-chat.gresource.xml) + +empathy-chat-resources.c: empathy-chat.gresource.xml $(chat_resource_files) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $< + +empathy-chat-resources.h: empathy-chat.gresource.xml $(chat_resource_files) + $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-header $< diff --git a/src/empathy-about-dialog.c b/src/empathy-about-dialog.c index 2480d756..bd6b2f86 100644 --- a/src/empathy-about-dialog.c +++ b/src/empathy-about-dialog.c @@ -23,11 +23,10 @@ */ #include "config.h" +#include "empathy-about-dialog.h" #include -#include "empathy-about-dialog.h" - #define WEB_SITE "http://live.gnome.org/Empathy" static const char *authors[] = { diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c index 537b43e3..772e6868 100644 --- a/src/empathy-accounts-common.c +++ b/src/empathy-accounts-common.c @@ -25,14 +25,12 @@ */ #include "config.h" - -#include - #include "empathy-accounts-common.h" + #include "empathy-accounts-dialog.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include +#include "empathy-debug.h" gboolean empathy_accounts_has_non_salut_accounts (TpAccountManager *manager) diff --git a/src/empathy-accounts-common.h b/src/empathy-accounts-common.h index 39d094d2..1cb24d7d 100644 --- a/src/empathy-accounts-common.h +++ b/src/empathy-accounts-common.h @@ -22,6 +22,10 @@ #ifndef __EMPATHY_ACCOUNTS_COMMON_H__ #define __EMPATHY_ACCOUNTS_COMMON_H__ +#include + +G_BEGIN_DECLS + gboolean empathy_accounts_has_non_salut_accounts (TpAccountManager *manager); gboolean empathy_accounts_has_accounts (TpAccountManager *manager); @@ -30,4 +34,6 @@ void empathy_accounts_show_accounts_ui (TpAccountManager *manager, TpAccount *account, GApplication *app); +G_END_DECLS + #endif /* __EMPATHY_ACCOUNTS_COMMON_H__ */ diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index f0a2db9a..27f41d37 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -25,25 +25,23 @@ */ #include "config.h" +#include "empathy-accounts-dialog.h" #include -#include -#include - -#include -#include -#include -#include -#include - #include "empathy-accounts-common.h" -#include "empathy-accounts-dialog.h" +#include "empathy-account-widget-sip.h" #include "empathy-import-dialog.h" #include "empathy-import-utils.h" +#include "empathy-local-xmpp-assistant-widget.h" +#include "empathy-new-account-dialog.h" +#include "empathy-pkg-kit.h" +#include "empathy-ui-utils.h" +#include "empathy-user-info.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include +#include "empathy-debug.h" /* Flashing delay for icons (milliseconds). */ #define FLASH_TIMEOUT 500 diff --git a/src/empathy-accounts-dialog.h b/src/empathy-accounts-dialog.h index d436fed0..070cd02e 100644 --- a/src/empathy-accounts-dialog.h +++ b/src/empathy-accounts-dialog.h @@ -25,7 +25,6 @@ #define __EMPATHY_ACCOUNTS_DIALOG_H__ #include - #include G_BEGIN_DECLS diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c index 90d7947e..8e9ce989 100644 --- a/src/empathy-accounts.c +++ b/src/empathy-accounts.c @@ -25,6 +25,7 @@ */ #include "config.h" +#include "empathy-accounts.h" #include @@ -32,13 +33,12 @@ #include #endif -#include -#include - #include "empathy-accounts-common.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include +#include "empathy-debug.h" #define EMPATHY_ACCOUNTS_DBUS_NAME "org.gnome.EmpathyAccounts" diff --git a/src/empathy-audio-sink.c b/src/empathy-audio-sink.c index 0c3693b6..985a1fa3 100644 --- a/src/empathy-audio-sink.c +++ b/src/empathy-audio-sink.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "empathy-audio-sink.h" #ifdef HAVE_GST1 #include @@ -27,10 +28,9 @@ #endif #include "empathy-audio-utils.h" -#include "empathy-audio-sink.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include +#include "empathy-debug.h" G_DEFINE_TYPE(EmpathyGstAudioSink, empathy_audio_sink, GST_TYPE_BIN) diff --git a/src/empathy-audio-sink.h b/src/empathy-audio-sink.h index ceb0bbe3..85b576c4 100644 --- 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__ -#include #include G_BEGIN_DECLS diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c index fe62a6c4..bc3aa50c 100644 --- a/src/empathy-audio-src.c +++ b/src/empathy-audio-src.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "empathy-audio-src.h" #ifdef HAVE_GST1 #include @@ -26,14 +27,12 @@ #include #endif -#include #include "empathy-audio-utils.h" - -#include "empathy-audio-src.h" #include "empathy-mic-monitor.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include +#include "empathy-debug.h" G_DEFINE_TYPE(EmpathyGstAudioSrc, empathy_audio_src, GST_TYPE_BIN) diff --git a/src/empathy-audio-src.h b/src/empathy-audio-src.h index ef87c44c..2d1a6960 100644 --- 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__ -#include #include #include diff --git a/src/empathy-audio-utils.c b/src/empathy-audio-utils.c index 323ef8ed..f7a00378 100644 --- a/src/empathy-audio-utils.c +++ b/src/empathy-audio-utils.c @@ -19,15 +19,14 @@ */ #include "config.h" +#include "empathy-audio-utils.h" #include -#include "empathy-audio-utils.h" - -#include +#include "empathy-gsettings.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include +#include "empathy-debug.h" void empathy_audio_set_stream_properties (GstElement *element, diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c index f1d42b74..be5b13a0 100644 --- a/src/empathy-auth-client.c +++ b/src/empathy-auth-client.c @@ -22,21 +22,19 @@ #include "config.h" #include +#include -#define DEBUG_FLAG EMPATHY_DEBUG_TLS -#include -#include -#include -#include - -#include -#include -#include -#include - +#include "empathy-auth-factory.h" +#include "empathy-bad-password-dialog.h" +#include "empathy-password-dialog.h" #include "empathy-sanity-cleaning.h" +#include "empathy-server-tls-handler.h" +#include "empathy-tls-dialog.h" +#include "empathy-tls-verifier.h" +#include "empathy-ui-utils.h" -#include +#define DEBUG_FLAG EMPATHY_DEBUG_TLS +#include "empathy-debug.h" #define TIMEOUT 60 diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c index dbd5ecf7..60700ac0 100644 --- a/src/empathy-call-factory.c +++ b/src/empathy-call-factory.c @@ -19,15 +19,14 @@ */ #include "config.h" - -#include -#include +#include "empathy-client-factory.h" #include "empathy-call-factory.h" #include "empathy-call-handler.h" +#include "empathy-request-util.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include +#include "empathy-debug.h" G_DEFINE_TYPE(EmpathyCallFactory, empathy_call_factory, TP_TYPE_BASE_CLIENT) diff --git a/src/empathy-call-factory.h b/src/empathy-call-factory.h index 174fbf4b..b913d8e5 100644 --- a/src/empathy-call-factory.h +++ b/src/empathy-call-factory.h @@ -21,7 +21,7 @@ #ifndef __EMPATHY_CALL_FACTORY_H__ #define __EMPATHY_CALL_FACTORY_H__ -#include +#include G_BEGIN_DECLS diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c index b1d4f297..1c4939af 100644 --- a/src/empathy-call-handler.c +++ b/src/empathy-call-handler.c @@ -19,17 +19,15 @@ */ #include "config.h" +#include "empathy-call-handler.h" #include -#include - -#include - -#include "empathy-call-handler.h" +#include "empathy-call-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include +#include "empathy-debug.h" G_DEFINE_TYPE(EmpathyCallHandler, empathy_call_handler, G_TYPE_OBJECT) diff --git a/src/empathy-call-handler.h b/src/empathy-call-handler.h index 36c6cfdc..5050d801 100644 --- a/src/empathy-call-handler.h +++ b/src/empathy-call-handler.h @@ -21,14 +21,10 @@ #ifndef __EMPATHY_CALL_HANDLER_H__ #define __EMPATHY_CALL_HANDLER_H__ -#include - -#include #include - #include -#include +#include "empathy-contact.h" G_BEGIN_DECLS diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c index bf42b055..41e9bdfc 100644 --- a/src/empathy-call-observer.c +++ b/src/empathy-call-observer.c @@ -19,16 +19,15 @@ */ #include "config.h" +#include "empathy-call-observer.h" #include -#include -#include - -#include "empathy-call-observer.h" +#include "empathy-images.h" +#include "empathy-notify-manager.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include +#include "empathy-debug.h" struct _EmpathyCallObserverPriv { EmpathyNotifyManager *notify_mgr; diff --git a/src/empathy-call-observer.h b/src/empathy-call-observer.h index 1d5a58b5..3fdb6b79 100644 --- 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__ -#include #include G_BEGIN_DECLS diff --git a/src/empathy-call-window-fullscreen.c b/src/empathy-call-window-fullscreen.c index ca291472..e6dca486 100644 --- a/src/empathy-call-window-fullscreen.c +++ b/src/empathy-call-window-fullscreen.c @@ -22,10 +22,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "empathy-call-window-fullscreen.h" -#include -#include +#include "empathy-ui-utils.h" +#include "empathy-utils.h" /* The number of seconds for which the "leave fullscreen" popup should be shown */ diff --git a/src/empathy-call-window-fullscreen.h b/src/empathy-call-window-fullscreen.h index 7e9bd63e..56ddf99b 100644 --- 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__ -#include -#include #include "empathy-call-window.h" diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 37090319..979d7e3b 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -19,38 +19,35 @@ */ #include "config.h" +#include "empathy-call-window.h" #include - #include - #include #include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include - -#include "empathy-call-window-fullscreen.h" #include "empathy-about-dialog.h" #include "empathy-audio-sink.h" +#include "empathy-call-utils.h" +#include "empathy-call-window-fullscreen.h" +#include "empathy-camera-menu.h" +#include "empathy-camera-monitor.h" +#include "empathy-dialpad-widget.h" +#include "empathy-geometry.h" +#include "empathy-gsettings.h" +#include "empathy-images.h" #include "empathy-mic-menu.h" #include "empathy-preferences.h" +#include "empathy-request-util.h" #include "empathy-rounded-actor.h" #include "empathy-rounded-rectangle.h" #include "empathy-rounded-texture.h" -#include "empathy-camera-menu.h" +#include "empathy-sound-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" + +#define DEBUG_FLAG EMPATHY_DEBUG_VOIP +#include "empathy-debug.h" #define CONTENT_HBOX_SPACING 3 #define CONTENT_HBOX_CHILDREN_PACKING_PADDING 0 diff --git a/src/empathy-call-window.h b/src/empathy-call-window.h index a5df2dac..2090b1be 100644 --- a/src/empathy-call-window.h +++ b/src/empathy-call-window.h @@ -21,11 +21,10 @@ #ifndef __EMPATHY_CALL_WINDOW_H__ #define __EMPATHY_CALL_WINDOW_H__ -#include #include -#include "empathy-call-handler.h" #include "empathy-audio-src.h" +#include "empathy-call-handler.h" #include "empathy-video-src.h" G_BEGIN_DECLS diff --git a/src/empathy-call.c b/src/empathy-call.c index 9d5ab8a8..8a554969 100644 --- a/src/empathy-call.c +++ b/src/empathy-call.c @@ -23,7 +23,6 @@ #include "config.h" #include - #include #include @@ -31,13 +30,12 @@ #include #endif -#include - -#include "empathy-call-window.h" #include "empathy-call-factory.h" +#include "empathy-call-window.h" +#include "empathy-ui-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include +#include "empathy-debug.h" /* Exit after $TIMEOUT seconds if not displaying any call window */ #define TIMEOUT 60 diff --git a/src/empathy-camera-menu.c b/src/empathy-camera-menu.c index a6f8d3d1..8dc037bd 100644 --- a/src/empathy-camera-menu.c +++ b/src/empathy-camera-menu.c @@ -20,14 +20,13 @@ */ #include "config.h" - -#include -#include - #include "empathy-camera-menu.h" +#include "empathy-camera-monitor.h" +#include "empathy-gsettings.h" + #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include +#include "empathy-debug.h" struct _EmpathyCameraMenuPrivate { diff --git a/src/empathy-camera-menu.h b/src/empathy-camera-menu.h index 92760f67..b55726be 100644 --- 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__ -#include #include "empathy-call-window.h" diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c index 15a4e7a4..02ed0d94 100644 --- a/src/empathy-chat-manager.c +++ b/src/empathy-chat-manager.c @@ -18,23 +18,18 @@ */ #include "config.h" +#include "empathy-chat-manager.h" #include -#include -#include -#include - -#include - +#include "empathy-chatroom-manager.h" #include "empathy-chat-window.h" +#include "empathy-request-util.h" +#include "empathy-ui-utils.h" +#include "extensions.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include - -#include "empathy-chat-manager.h" - -#include +#include "empathy-debug.h" enum { CLOSED_CHATS_CHANGED, diff --git a/src/empathy-chat-manager.h b/src/empathy-chat-manager.h index 7dfd5348..b5516c33 100644 --- a/src/empathy-chat-manager.h +++ b/src/empathy-chat-manager.h @@ -20,9 +20,8 @@ #ifndef __EMPATHY_CHAT_MANAGER_H__ #define __EMPATHY_CHAT_MANAGER_H__ -#include -#include +#include "empathy-chat.h" G_BEGIN_DECLS diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 292c1a9a..480570d0 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -26,31 +26,27 @@ */ #include "config.h" +#include "empathy-chat-window.h" -#include #include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include "empathy-chat-manager.h" -#include "empathy-chat-window.h" #include "empathy-about-dialog.h" +#include "empathy-chat-manager.h" +#include "empathy-chatroom-manager.h" +#include "empathy-client-factory.h" +#include "empathy-geometry.h" +#include "empathy-gsettings.h" +#include "empathy-images.h" #include "empathy-invite-participant-dialog.h" +#include "empathy-notify-manager.h" +#include "empathy-request-util.h" +#include "empathy-smiley-manager.h" +#include "empathy-sound-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CHAT -#include +#include "empathy-debug.h" /* Macro to compare guint32 X timestamps, while accounting for wrapping around */ diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h index 2041634a..ae986cc7 100644 --- a/src/empathy-chat-window.h +++ b/src/empathy-chat-window.h @@ -27,12 +27,11 @@ #ifndef __EMPATHY_CHAT_WINDOW_H__ #define __EMPATHY_CHAT_WINDOW_H__ -#include #include - #include -#include +#include "empathy-chat.h" +#include "empathy-individual-manager.h" G_BEGIN_DECLS diff --git a/src/empathy-chat.c b/src/empathy-chat.c index 0e70885d..e6e8b1b3 100644 --- a/src/empathy-chat.c +++ b/src/empathy-chat.c @@ -23,19 +23,16 @@ #include "config.h" #include - #include -#include - -#include -#include - #include "empathy-chat-manager.h" #include "empathy-chat-resources.h" +#include "empathy-presence-manager.h" +#include "empathy-theme-manager.h" +#include "empathy-ui-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CHAT -#include +#include "empathy-debug.h" /* Exit after $TIMEOUT seconds if not displaying any call window */ #define TIMEOUT 60 diff --git a/src/empathy-chatrooms-window.c b/src/empathy-chatrooms-window.c index a18cccb1..553c9129 100644 --- a/src/empathy-chatrooms-window.c +++ b/src/empathy-chatrooms-window.c @@ -24,16 +24,14 @@ */ #include "config.h" +#include "empathy-chatrooms-window.h" #include -#include -#include - -#include -#include - -#include "empathy-chatrooms-window.h" +#include "empathy-account-chooser.h" +#include "empathy-chatroom-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" typedef struct { EmpathyChatroomManager *manager; diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c index 7d56b684..6cc60098 100644 --- a/src/empathy-debug-window.c +++ b/src/empathy-debug-window.c @@ -20,18 +20,17 @@ */ #include "config.h" +#include "empathy-debug-window.h" #include #include -#define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include -#include - -#include -#include +#include "empathy-geometry.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" -#include "empathy-debug-window.h" +#define DEBUG_FLAG EMPATHY_DEBUG_OTHER +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyDebugWindow, empathy_debug_window, GTK_TYPE_WINDOW) diff --git a/src/empathy-debug-window.h b/src/empathy-debug-window.h index 42bb43ef..c8944bf0 100644 --- a/src/empathy-debug-window.h +++ b/src/empathy-debug-window.h @@ -21,11 +21,10 @@ #ifndef __EMPATHY_DEBUG_WINDOW_H__ #define __EMPATHY_DEBUG_WINDOW_H__ -G_BEGIN_DECLS - -#include #include +G_BEGIN_DECLS + #define EMPATHY_TYPE_DEBUG_WINDOW (empathy_debug_window_get_type ()) #define EMPATHY_DEBUG_WINDOW(object) (G_TYPE_CHECK_INSTANCE_CAST \ ((object), EMPATHY_TYPE_DEBUG_WINDOW, EmpathyDebugWindow)) diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c index 00dc98c8..abb73ac4 100644 --- a/src/empathy-debugger.c +++ b/src/empathy-debugger.c @@ -21,9 +21,8 @@ #include -#include - #include "empathy-debug-window.h" +#include "empathy-ui-utils.h" #define EMPATHY_DEBUGGER_DBUS_NAME "org.gnome.Empathy.Debugger" diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index f652c216..a0171858 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -20,26 +20,24 @@ */ #include "config.h" +#include "empathy-event-manager.h" #include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include "empathy-event-manager.h" +#include "empathy-call-utils.h" +#include "empathy-connection-aggregator.h" +#include "empathy-gsettings.h" +#include "empathy-images.h" +#include "empathy-presence-manager.h" +#include "empathy-sasl-mechanisms.h" +#include "empathy-sound-manager.h" +#include "empathy-subscription-dialog.h" +#include "empathy-tp-chat.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER -#include +#include "empathy-debug.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyEventManager) diff --git a/src/empathy-event-manager.h b/src/empathy-event-manager.h index 70af9a1c..f2878c7c 100644 --- a/src/empathy-event-manager.h +++ b/src/empathy-event-manager.h @@ -22,10 +22,9 @@ #ifndef __EMPATHY_EVENT_MANAGER_H__ #define __EMPATHY_EVENT_MANAGER_H__ -#include #include -#include +#include "empathy-contact.h" G_BEGIN_DECLS diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c index f89004f3..18e05dc1 100644 --- a/src/empathy-ft-manager.c +++ b/src/empathy-ft-manager.c @@ -28,17 +28,16 @@ /* The original file transfer manager code was copied from Epiphany */ #include "config.h" +#include "empathy-ft-manager.h" #include -#define DEBUG_FLAG EMPATHY_DEBUG_FT -#include -#include - -#include -#include +#include "empathy-geometry.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" -#include "empathy-ft-manager.h" +#define DEBUG_FLAG EMPATHY_DEBUG_FT +#include "empathy-debug.h" enum { diff --git a/src/empathy-ft-manager.h b/src/empathy-ft-manager.h index 0ff820f0..be41730e 100644 --- a/src/empathy-ft-manager.h +++ b/src/empathy-ft-manager.h @@ -25,11 +25,9 @@ #ifndef __EMPATHY_FT_MANAGER_H__ #define __EMPATHY_FT_MANAGER_H__ -#include #include -#include -#include +#include "empathy-ft-handler.h" G_BEGIN_DECLS diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c index d4dd70d0..5e6fa8d5 100644 --- a/src/empathy-import-dialog.c +++ b/src/empathy-import-dialog.c @@ -21,15 +21,15 @@ */ #include "config.h" +#include "empathy-import-dialog.h" #include -#include "empathy-import-dialog.h" #include "empathy-import-widget.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include -#include +#include "empathy-debug.h" enum { PROP_PARENT = 1, diff --git a/src/empathy-import-dialog.h b/src/empathy-import-dialog.h index a412037d..87f1198f 100644 --- a/src/empathy-import-dialog.h +++ b/src/empathy-import-dialog.h @@ -25,7 +25,7 @@ #ifndef __EMPATHY_IMPORT_DIALOG_H__ #define __EMPATHY_IMPORT_DIALOG_H__ -#include +#include "empathy-connection-managers.h" G_BEGIN_DECLS diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c index 8fd7eaef..92adb861 100644 --- a/src/empathy-import-pidgin.c +++ b/src/empathy-import-pidgin.c @@ -20,16 +20,16 @@ * */ #include "config.h" +#include "empathy-import-pidgin.h" #include #include #include "empathy-import-utils.h" -#include "empathy-import-pidgin.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include -#include +#include "empathy-debug.h" /* Pidgin to CM map */ typedef struct diff --git a/src/empathy-import-utils.c b/src/empathy-import-utils.c index 7007dee5..c3823364 100644 --- a/src/empathy-import-utils.c +++ b/src/empathy-import-utils.c @@ -19,11 +19,12 @@ * Cosimo Cecchi */ -#include -#include - +#include "config.h" #include "empathy-import-utils.h" + +#include "empathy-connection-managers.h" #include "empathy-import-pidgin.h" +#include "empathy-utils.h" EmpathyImportAccountData * empathy_import_account_data_new (const gchar *source) diff --git a/src/empathy-import-utils.h b/src/empathy-import-utils.h index 59e1cb4d..d860c4ee 100644 --- a/src/empathy-import-utils.h +++ b/src/empathy-import-utils.h @@ -23,7 +23,6 @@ #define __EMPATHY_IMPORT_UTILS_H__ #include -#include G_BEGIN_DECLS diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c index 77048a4b..86dc9515 100644 --- a/src/empathy-import-widget.c +++ b/src/empathy-import-widget.c @@ -23,17 +23,15 @@ /* empathy-import-widget.c */ #include "config.h" - -#include "empathy-import-dialog.h" #include "empathy-import-widget.h" -#define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include -#include +#include -#include +#include "empathy-ui-utils.h" +#include "empathy-utils.h" -#include +#define DEBUG_FLAG EMPATHY_DEBUG_OTHER +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyImportWidget, empathy_import_widget, G_TYPE_OBJECT) diff --git a/src/empathy-import-widget.h b/src/empathy-import-widget.h index 14a01d79..8e9f32f5 100644 --- a/src/empathy-import-widget.h +++ b/src/empathy-import-widget.h @@ -25,10 +25,9 @@ #ifndef __EMPATHY_IMPORT_WIDGET_H__ #define __EMPATHY_IMPORT_WIDGET_H__ -#include - -#include +#include +#include "empathy-connection-managers.h" #include "empathy-import-utils.h" G_BEGIN_DECLS diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c index 0b42ab4a..e562dc56 100644 --- a/src/empathy-invite-participant-dialog.c +++ b/src/empathy-invite-participant-dialog.c @@ -10,14 +10,12 @@ */ #include "config.h" - -#include - #include "empathy-invite-participant-dialog.h" -#include +#include -#include +#include "empathy-contact-chooser.h" +#include "empathy-utils.h" G_DEFINE_TYPE (EmpathyInviteParticipantDialog, empathy_invite_participant_dialog, GTK_TYPE_DIALOG); diff --git a/src/empathy-invite-participant-dialog.h b/src/empathy-invite-participant-dialog.h index 7946fa00..daa3448d 100644 --- a/src/empathy-invite-participant-dialog.h +++ b/src/empathy-invite-participant-dialog.h @@ -13,10 +13,9 @@ #define __EMPATHY_INVITE_PARTICIPANT_DIALOG_H__ #include - #include -#include "libempathy/empathy-tp-chat.h" +#include "empathy-tp-chat.h" G_BEGIN_DECLS diff --git a/src/empathy-mic-menu.c b/src/empathy-mic-menu.c index b86aec4b..612ff34b 100644 --- a/src/empathy-mic-menu.c +++ b/src/empathy-mic-menu.c @@ -20,12 +20,12 @@ */ #include "config.h" - #include "empathy-mic-menu.h" + #include "empathy-mic-monitor.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include +#include "empathy-debug.h" struct _EmpathyMicMenuPrivate { diff --git a/src/empathy-mic-monitor.c b/src/empathy-mic-monitor.c index c06e786e..ae2b0c07 100644 --- a/src/empathy-mic-monitor.c +++ b/src/empathy-mic-monitor.c @@ -18,16 +18,14 @@ */ #include "config.h" +#include "empathy-mic-monitor.h" -#include #include -#include "empathy-mic-monitor.h" - -#include +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include +#include "empathy-debug.h" enum { diff --git a/src/empathy-mic-monitor.h b/src/empathy-mic-monitor.h index 4ad4a28f..73771681 100644 --- a/src/empathy-mic-monitor.h +++ b/src/empathy-mic-monitor.h @@ -19,8 +19,7 @@ #ifndef __EMPATHY_MIC_MONITOR_H__ #define __EMPATHY_MIC_MONITOR_H__ -#include - +#include #include G_BEGIN_DECLS diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c index 5de844bd..f0b6ec64 100644 --- a/src/empathy-new-chatroom-dialog.c +++ b/src/empathy-new-chatroom-dialog.c @@ -22,20 +22,18 @@ */ #include "config.h" +#include "empathy-new-chatroom-dialog.h" #include -#include -#include -#include - -#include -#include - -#include "empathy-new-chatroom-dialog.h" +#include "empathy-account-chooser.h" +#include "empathy-gsettings.h" +#include "empathy-request-util.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyNewChatroomDialog, empathy_new_chatroom_dialog, GTK_TYPE_DIALOG) diff --git a/src/empathy-new-chatroom-dialog.h b/src/empathy-new-chatroom-dialog.h index 02bf3b2a..31212cb5 100644 --- a/src/empathy-new-chatroom-dialog.h +++ b/src/empathy-new-chatroom-dialog.h @@ -24,7 +24,7 @@ #ifndef __EMPATHY_NEW_CHATROOM_DIALOG_H__ #define __EMPATHY_NEW_CHATROOM_DIALOG_H__ -#include +#include G_BEGIN_DECLS diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c index c3c996bd..fb36f2ac 100644 --- a/src/empathy-notifications-approver.c +++ b/src/empathy-notifications-approver.c @@ -18,18 +18,16 @@ */ #include "config.h" +#include "empathy-notifications-approver.h" #include -#include -#include - +#include "empathy-call-utils.h" #include "empathy-event-manager.h" +#include "empathy-notify-manager.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include - -#include "empathy-notifications-approver.h" +#include "empathy-debug.h" struct _EmpathyNotificationsApproverPrivate { diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c index bfeef61b..c2be935b 100644 --- a/src/empathy-preferences.c +++ b/src/empathy-preferences.c @@ -24,21 +24,19 @@ */ #include "config.h" +#include "empathy-preferences.h" #include -#include -#include -#include - -#include -#include -#include - -#include "empathy-preferences.h" +#include "empathy-client-factory.h" +#include "empathy-gsettings.h" +#include "empathy-spell.h" +#include "empathy-theme-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyPreferences, empathy_preferences, GTK_TYPE_DIALOG); diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c index 05d2a1fb..c09094eb 100644 --- a/src/empathy-roster-window.c +++ b/src/empathy-roster-window.c @@ -22,44 +22,42 @@ */ #include "config.h" +#include "empathy-roster-window.h" #include #include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - +#include "empathy-about-dialog.h" #include "empathy-accounts-dialog.h" #include "empathy-call-observer.h" #include "empathy-chat-manager.h" -#include "empathy-roster-window.h" -#include "empathy-preferences.h" -#include "empathy-about-dialog.h" -#include "empathy-new-chatroom-dialog.h" +#include "empathy-chatroom-manager.h" #include "empathy-chatrooms-window.h" +#include "empathy-contact-blocking-dialog.h" +#include "empathy-contact-search-dialog.h" #include "empathy-event-manager.h" #include "empathy-ft-manager.h" +#include "empathy-geometry.h" +#include "empathy-gsettings.h" +#include "empathy-gsettings.h" +#include "empathy-gtk-enum-types.h" +#include "empathy-individual-dialogs.h" +#include "empathy-log-window.h" +#include "empathy-new-call-dialog.h" +#include "empathy-new-chatroom-dialog.h" +#include "empathy-new-message-dialog.h" +#include "empathy-preferences.h" +#include "empathy-presence-chooser.h" +#include "empathy-presence-manager.h" +#include "empathy-request-util.h" +#include "empathy-roster-model-manager.h" +#include "empathy-roster-view.h" +#include "empathy-status-presets.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include +#include "empathy-debug.h" /* Flashing delay for icons (milliseconds). */ #define FLASH_TIMEOUT 500 diff --git a/src/empathy-rounded-actor.c b/src/empathy-rounded-actor.c index 038cb495..89e3144c 100644 --- a/src/empathy-rounded-actor.c +++ b/src/empathy-rounded-actor.c @@ -19,7 +19,6 @@ */ #include "config.h" - #include "empathy-rounded-actor.h" G_DEFINE_TYPE(EmpathyRoundedActor, empathy_rounded_actor, GTK_CLUTTER_TYPE_ACTOR) diff --git a/src/empathy-rounded-actor.h b/src/empathy-rounded-actor.h index 49fc03fd..29a7797a 100644 --- 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__ -#include #include G_BEGIN_DECLS diff --git a/src/empathy-rounded-rectangle.c b/src/empathy-rounded-rectangle.c index 67c0e27c..810fa0df 100644 --- a/src/empathy-rounded-rectangle.c +++ b/src/empathy-rounded-rectangle.c @@ -19,11 +19,10 @@ */ #include "config.h" +#include "empathy-rounded-rectangle.h" #include -#include "empathy-rounded-rectangle.h" - G_DEFINE_TYPE (EmpathyRoundedRectangle, empathy_rounded_rectangle, CLUTTER_TYPE_CAIRO_TEXTURE) diff --git a/src/empathy-rounded-rectangle.h b/src/empathy-rounded-rectangle.h index e4bf72c6..b9988d53 100644 --- 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__ -#include #include G_BEGIN_DECLS diff --git a/src/empathy-rounded-texture.c b/src/empathy-rounded-texture.c index 7ac7d040..46c0b213 100644 --- a/src/empathy-rounded-texture.c +++ b/src/empathy-rounded-texture.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "config.h" #include "empathy-rounded-texture.h" G_DEFINE_TYPE (EmpathyRoundedTexture, diff --git a/src/empathy-rounded-texture.h b/src/empathy-rounded-texture.h index ab75757d..c5d870d0 100644 --- 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__ -#include #include G_BEGIN_DECLS diff --git a/src/empathy-sanity-cleaning.c b/src/empathy-sanity-cleaning.c index f7ac7d99..5af3ff45 100644 --- a/src/empathy-sanity-cleaning.c +++ b/src/empathy-sanity-cleaning.c @@ -22,24 +22,22 @@ */ #include "config.h" - #include "empathy-sanity-cleaning.h" -#include - -#include - #ifdef HAVE_UOA -#include -#include - #include #include #include + +#include "empathy-pkg-kit.h" +#include "empathy-uoa-utils.h" #endif +#include "empathy-gsettings.h" +#include "empathy-theme-manager.h" + #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include +#include "empathy-debug.h" /* * This number has to be increased each time a new task is added or modified. diff --git a/src/empathy-sanity-cleaning.h b/src/empathy-sanity-cleaning.h index 32000163..f7299325 100644 --- a/src/empathy-sanity-cleaning.h +++ b/src/empathy-sanity-cleaning.h @@ -24,10 +24,14 @@ #include +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 diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c index 54e49a30..917fab38 100644 --- a/src/empathy-status-icon.c +++ b/src/empathy-status-icon.c @@ -20,20 +20,18 @@ */ #include "config.h" - -#include -#include - -#include -#include -#include -#include - #include "empathy-status-icon.h" + #include "empathy-event-manager.h" +#include "empathy-gsettings.h" +#include "empathy-new-call-dialog.h" +#include "empathy-new-message-dialog.h" +#include "empathy-presence-chooser.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER -#include +#include "empathy-debug.h" /* Number of ms to wait when blinking */ #define BLINK_TIMEOUT 500 diff --git a/src/empathy-status-icon.h b/src/empathy-status-icon.h index ca21af83..586e651e 100644 --- a/src/empathy-status-icon.h +++ b/src/empathy-status-icon.h @@ -22,7 +22,7 @@ #ifndef __EMPATHY_STATUS_ICON_H__ #define __EMPATHY_STATUS_ICON_H__ -#include +#include G_BEGIN_DECLS diff --git a/src/empathy-video-src.c b/src/empathy-video-src.c index 12f8d6b4..9856efed 100644 --- a/src/empathy-video-src.c +++ b/src/empathy-video-src.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "empathy-video-src.h" #ifdef HAVE_GST1 #include @@ -27,9 +28,7 @@ #endif #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include - -#include "empathy-video-src.h" +#include "empathy-debug.h" G_DEFINE_TYPE(EmpathyGstVideoSrc, empathy_video_src, GST_TYPE_BIN) diff --git a/src/empathy-video-src.h b/src/empathy-video-src.h index e49c79a0..60127ba2 100644 --- 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__ -#include #include G_BEGIN_DECLS diff --git a/src/empathy.c b/src/empathy.c index 90370e62..a8f23e82 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -23,34 +23,31 @@ #include #include +#include #ifdef HAVE_LIBCHAMPLAIN #include #endif -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "empathy-roster-window.h" #include "empathy-accounts-common.h" #include "empathy-accounts-dialog.h" -#include "empathy-status-icon.h" +#include "empathy-chatroom-manager.h" +#include "empathy-client-factory.h" +#include "empathy-connection-aggregator.h" +#include "empathy-ft-factory.h" #include "empathy-ft-manager.h" +#include "empathy-gsettings.h" +#include "empathy-location-manager.h" #include "empathy-notifications-approver.h" +#include "empathy-presence-manager.h" +#include "empathy-request-util.h" +#include "empathy-roster-window.h" +#include "empathy-status-icon.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include +#include "empathy-debug.h" #define EMPATHY_DBUS_NAME "org.gnome.Empathy" diff --git a/tests/Makefile.am b/tests/Makefile.am index fdd67482..67fe5d89 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -10,7 +10,8 @@ EXTRA_DIST = \ AM_CPPFLAGS = \ $(ERROR_CFLAGS) \ - -I$(top_srcdir) \ + -I$(top_srcdir)/libempathy \ + -I$(top_srcdir)/libempathy-gtk \ -DPKGDATADIR=\""$(pkgdatadir)"\" \ -DGCR_API_SUBJECT_TO_CHANGE \ $(EMPATHY_CFLAGS) \ diff --git a/tests/empathy-chatroom-manager-test.c b/tests/empathy-chatroom-manager-test.c index 7ecb82ac..7ebf8780 100644 --- a/tests/empathy-chatroom-manager-test.c +++ b/tests/empathy-chatroom-manager-test.c @@ -1,12 +1,4 @@ -#include -#include -#include -#include - -#include - -#include - +#include "empathy-chatroom-manager.h" #include "test-helper.h" #define CHATROOM_SAMPLE "chatrooms-sample.xml" diff --git a/tests/empathy-chatroom-test.c b/tests/empathy-chatroom-test.c index 3826411a..a64fd2ce 100644 --- a/tests/empathy-chatroom-test.c +++ b/tests/empathy-chatroom-test.c @@ -3,8 +3,7 @@ #include #include "test-helper.h" - -#include +#include "empathy-chatroom.h" #if 0 static EmpathyChatroom * diff --git a/tests/empathy-irc-network-manager-test.c b/tests/empathy-irc-network-manager-test.c index ba01c378..7fb195f0 100644 --- a/tests/empathy-irc-network-manager-test.c +++ b/tests/empathy-irc-network-manager-test.c @@ -3,10 +3,9 @@ #include #include -#include "test-irc-helper.h" +#include "empathy-irc-network-manager.h" #include "test-helper.h" - -#include +#include "test-irc-helper.h" #define GLOBAL_SAMPLE "default-irc-networks-sample.xml" #define USER_SAMPLE "user-irc-networks-sample.xml" diff --git a/tests/empathy-irc-network-test.c b/tests/empathy-irc-network-test.c index 313ab065..5ca4fba7 100644 --- a/tests/empathy-irc-network-test.c +++ b/tests/empathy-irc-network-test.c @@ -2,10 +2,9 @@ #include #include -#include "test-irc-helper.h" +#include "empathy-irc-network.h" #include "test-helper.h" - -#include +#include "test-irc-helper.h" static void test_empathy_irc_network_new (void) diff --git a/tests/empathy-irc-server-test.c b/tests/empathy-irc-server-test.c index 573967e4..225d57bc 100644 --- a/tests/empathy-irc-server-test.c +++ b/tests/empathy-irc-server-test.c @@ -2,10 +2,9 @@ #include #include -#include "test-irc-helper.h" +#include "empathy-irc-server.h" #include "test-helper.h" - -#include +#include "test-irc-helper.h" static void test_empathy_irc_server_new (void) diff --git a/tests/empathy-live-search-test.c b/tests/empathy-live-search-test.c index 6c53f07a..10f0346f 100644 --- a/tests/empathy-live-search-test.c +++ b/tests/empathy-live-search-test.c @@ -4,12 +4,11 @@ #include #include +#include "empathy-live-search.h" #include "test-helper.h" #define DEBUG_FLAG EMPATHY_DEBUG_TESTS -#include - -#include +#include "empathy-debug.h" typedef struct { diff --git a/tests/empathy-parser-test.c b/tests/empathy-parser-test.c index 4ae6f775..0cf03744 100644 --- a/tests/empathy-parser-test.c +++ b/tests/empathy-parser-test.c @@ -3,15 +3,13 @@ #include #include #include +#include +#include "empathy-string-parser.h" #include "test-helper.h" -#include - #define DEBUG_FLAG EMPATHY_DEBUG_TESTS -#include - -#include +#include "empathy-debug.h" static void test_replace_match (const gchar *text, diff --git a/tests/empathy-tls-test.c b/tests/empathy-tls-test.c index 2004383d..2155c68b 100644 --- a/tests/empathy-tls-test.c +++ b/tests/empathy-tls-test.c @@ -1,18 +1,9 @@ -#include -#include -#include - -#include -#include "test-helper.h" -#include "mock-pkcs11.h" - -#include - #include - -#include #include -#include + +#include "empathy-tls-verifier.h" +#include "mock-pkcs11.h" +#include "test-helper.h" #define MOCK_TLS_CERTIFICATE_PATH "/mock/certificate" diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am index 27fdbf7e..4ca1989e 100644 --- a/tests/interactive/Makefile.am +++ b/tests/interactive/Makefile.am @@ -1,6 +1,7 @@ AM_CPPFLAGS = \ $(ERROR_CFLAGS) \ - -I$(top_srcdir) \ + -I$(top_srcdir)/libempathy \ + -I$(top_srcdir)/libempathy-gtk \ -DPKGDATADIR=\""$(pkgdatadir)"\" \ $(EMPATHY_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/tests/interactive/empathy-logs.c b/tests/interactive/empathy-logs.c index 0ed9f95e..613bf751 100644 --- a/tests/interactive/empathy-logs.c +++ b/tests/interactive/empathy-logs.c @@ -19,15 +19,16 @@ * Authors: Xavier Claessens */ -#include +#include "config.h" + #include #include #include -#include -#include -#include -#include +#include "empathy-debug.h" +#include "empathy-log-window.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" static void destroy_cb (GtkWidget *dialog, diff --git a/tests/interactive/test-empathy-account-chooser.c b/tests/interactive/test-empathy-account-chooser.c index 7622a624..159f8fcf 100644 --- a/tests/interactive/test-empathy-account-chooser.c +++ b/tests/interactive/test-empathy-account-chooser.c @@ -1,9 +1,9 @@ -#include +#include "config.h" #include -#include -#include +#include "empathy-account-chooser.h" +#include "empathy-ui-utils.h" static void filter_func (TpAccount *account, diff --git a/tests/interactive/test-empathy-calendar-button.c b/tests/interactive/test-empathy-calendar-button.c index df91f1f2..81241090 100644 --- a/tests/interactive/test-empathy-calendar-button.c +++ b/tests/interactive/test-empathy-calendar-button.c @@ -21,7 +21,7 @@ #include "config.h" -#include +#include "empathy-calendar-button.h" static void date_changed_cb (EmpathyCalendarButton *button, diff --git a/tests/interactive/test-empathy-contact-blocking-dialog.c b/tests/interactive/test-empathy-contact-blocking-dialog.c index 66353f13..185f4e95 100644 --- a/tests/interactive/test-empathy-contact-blocking-dialog.c +++ b/tests/interactive/test-empathy-contact-blocking-dialog.c @@ -19,14 +19,13 @@ * Authors: Danielle Madeley */ -#include +#include "config.h" #include -#include - -#include -#include +#include "empathy-client-factory.h" +#include "empathy-contact-blocking-dialog.h" +#include "empathy-ui-utils.h" static void am_prepare_cb (GObject *source, diff --git a/tests/interactive/test-empathy-dual-roster-view.c b/tests/interactive/test-empathy-dual-roster-view.c index 50903c01..74bb59f1 100644 --- a/tests/interactive/test-empathy-dual-roster-view.c +++ b/tests/interactive/test-empathy-dual-roster-view.c @@ -1,10 +1,9 @@ -#include +#include "config.h" -#include -#include - -#include -#include +#include "empathy-roster-model.h" +#include "empathy-roster-model-manager.h" +#include "empathy-roster-view.h" +#include "empathy-ui-utils.h" static void individual_activated_cb (EmpathyRosterView *self, diff --git a/tests/interactive/test-empathy-presence-chooser.c b/tests/interactive/test-empathy-presence-chooser.c index 12d35b4c..208c9a12 100644 --- a/tests/interactive/test-empathy-presence-chooser.c +++ b/tests/interactive/test-empathy-presence-chooser.c @@ -20,14 +20,13 @@ * Authors: Davyd Madeley */ -#include +#include "config.h" #include -#include - -#include -#include +#include "empathy-presence-chooser.h" +#include "empathy-status-presets.h" +#include "empathy-ui-utils.h" int main (int argc, char **argv) diff --git a/tests/interactive/test-empathy-protocol-chooser.c b/tests/interactive/test-empathy-protocol-chooser.c index 90b1797a..ca548a85 100644 --- a/tests/interactive/test-empathy-protocol-chooser.c +++ b/tests/interactive/test-empathy-protocol-chooser.c @@ -1,9 +1,9 @@ -#include +#include "config.h" #include -#include -#include +#include "empathy-protocol-chooser.h" +#include "empathy-ui-utils.h" int main (int argc, diff --git a/tests/interactive/test-empathy-roster-model-aggregator.c b/tests/interactive/test-empathy-roster-model-aggregator.c index 49f2012f..478b4e6c 100644 --- a/tests/interactive/test-empathy-roster-model-aggregator.c +++ b/tests/interactive/test-empathy-roster-model-aggregator.c @@ -1,10 +1,9 @@ -#include +#include "config.h" -#include -#include - -#include -#include +#include "empathy-roster-model-aggregator.h" +#include "empathy-roster-model.h" +#include "empathy-roster-view.h" +#include "empathy-ui-utils.h" static gboolean show_offline = FALSE; static gboolean show_groups = FALSE; diff --git a/tests/interactive/test-empathy-roster-view.c b/tests/interactive/test-empathy-roster-view.c index 96137c39..f814d965 100644 --- a/tests/interactive/test-empathy-roster-view.c +++ b/tests/interactive/test-empathy-roster-view.c @@ -1,10 +1,9 @@ -#include +#include "config.h" -#include -#include - -#include -#include +#include "empathy-roster-model.h" +#include "empathy-roster-model-manager.h" +#include "empathy-roster-view.h" +#include "empathy-ui-utils.h" static gboolean show_offline = FALSE; static gboolean show_groups = FALSE; diff --git a/tests/interactive/test-empathy-status-preset-dialog.c b/tests/interactive/test-empathy-status-preset-dialog.c index e7185250..2494d78b 100644 --- a/tests/interactive/test-empathy-status-preset-dialog.c +++ b/tests/interactive/test-empathy-status-preset-dialog.c @@ -22,14 +22,13 @@ * Will Thompson */ -#include +#include "config.h" #include -#include - -#include -#include +#include "empathy-status-preset-dialog.h" +#include "empathy-status-presets.h" +#include "empathy-ui-utils.h" int main (int argc, char **argv) diff --git a/tests/mock-pkcs11.c b/tests/mock-pkcs11.c index 4b1219f2..572221ac 100644 --- a/tests/mock-pkcs11.c +++ b/tests/mock-pkcs11.c @@ -19,13 +19,8 @@ */ #include "config.h" - #include "mock-pkcs11.h" -#include - -#include - #include /* diff --git a/tests/mock-pkcs11.h b/tests/mock-pkcs11.h index 67d94bef..aa024fcc 100644 --- a/tests/mock-pkcs11.h +++ b/tests/mock-pkcs11.h @@ -18,12 +18,8 @@ * 02111-1307, USA. */ -#include - -#include - -#include #include +#include #ifndef MOCK_MODULE_H #define MOCK_MODULE_H diff --git a/tests/test-helper.c b/tests/test-helper.c index ca763adb..efe3e3fd 100644 --- a/tests/test-helper.c +++ b/tests/test-helper.c @@ -17,15 +17,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include -#include - -#include - +#include "config.h" #include "test-helper.h" +#include "empathy-ui-utils.h" + void test_init (int argc, char **argv) diff --git a/tests/test-irc-helper.c b/tests/test-irc-helper.c index ade247f3..6fafac80 100644 --- a/tests/test-irc-helper.c +++ b/tests/test-irc-helper.c @@ -1,3 +1,4 @@ +#include "config.h" #include "test-irc-helper.h" void diff --git a/tests/test-irc-helper.h b/tests/test-irc-helper.h index e375f6fb..6010bc18 100644 --- a/tests/test-irc-helper.h +++ b/tests/test-irc-helper.h @@ -1,9 +1,6 @@ -#include #include -#include -#include -#include +#include "empathy-irc-network-manager.h" #ifndef __CHECK_IRC_HELPER_H__ #define __CHECK_IRC_HELPER_H__ diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am b/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am index f76c2fa5..1271f6ec 100644 --- a/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am +++ b/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am @@ -2,7 +2,8 @@ plugindir = $(ACCOUNTS_PROVIDER_PLUGIN_DIR) INCLUDES = \ -I$(top_builddir) \ - -I$(top_srcdir) \ + -I$(top_srcdir)/libempathy \ + -I$(top_srcdir)/libempathy-gtk \ -DLOCALEDIR=\""$(datadir)/locale"\" \ $(UOA_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c index f9081592..58074eec 100644 --- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c +++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c @@ -30,7 +30,7 @@ #include #include -#include +#include "empathy-account-widget.h" G_DEFINE_TYPE (EmpathyAccountsPluginWidget, empathy_accounts_plugin_widget, GTK_TYPE_BOX) diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h index 17963e65..27d114c0 100644 --- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.h +++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.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 - #include G_BEGIN_DECLS diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c index 939912aa..1f322ec5 100644 --- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c +++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c @@ -22,8 +22,8 @@ #include "empathy-accounts-plugin.h" -#include -#include +#include "empathy-client-factory.h" +#include "empathy-uoa-utils.h" #include "empathy-accounts-plugin-widget.h" diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c index 768f0965..6895a04d 100644 --- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c +++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c @@ -27,8 +27,8 @@ #include #include -#include -#include +#include "empathy-contact.h" +#include "empathy-user-info.h" #include "empathy-app-plugin-widget.h" diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.h b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.h index b1bfb28c..aa9d3a20 100644 --- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.h +++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.h @@ -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 - #include G_BEGIN_DECLS diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c index c15a13a7..c22c6d59 100644 --- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c +++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c @@ -22,7 +22,7 @@ #include "empathy-app-plugin.h" -#include +#include "empathy-client-factory.h" #include "empathy-app-plugin-widget.h" diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h index 0167c851..67963967 100644 --- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h +++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.h @@ -22,7 +22,6 @@ #define __EMPATHY_APP_PLUGIN_H__ #include - #include G_BEGIN_DECLS diff --git a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c index 439bbda6..761e2215 100644 --- a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c +++ b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.c @@ -1,13 +1,10 @@ #include "config.h" +#include "empathy-webcredentials-monitor.h" #include - #include - #include -#include "empathy-webcredentials-monitor.h" - G_DEFINE_TYPE (EmpathyWebcredentialsMonitor, empathy_webcredentials_monitor, G_TYPE_OBJECT) #define WEBCRED_BUS_NAME "com.canonical.indicators.webcredentials" diff --git a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h index cf373a2d..1c96f336 100644 --- a/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h +++ b/ubuntu-online-accounts/mc-plugin/empathy-webcredentials-monitor.h @@ -2,7 +2,6 @@ #define __EMPATHY_WEBCREDENTIALS_MONITOR_H__ #include - #include G_BEGIN_DECLS diff --git a/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c b/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c index 8919065e..0607b9e2 100644 --- a/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c +++ b/ubuntu-online-accounts/mc-plugin/mcp-account-manager-uoa.c @@ -20,12 +20,10 @@ #include "mcp-account-manager-uoa.h" #include - #include #include #include #include - #include #include diff --git a/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c b/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c index d7a33fd4..3e61dc3b 100644 --- a/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c +++ b/ubuntu-online-accounts/mc-plugin/mission-control-plugin.c @@ -22,6 +22,8 @@ * Authors: Xavier Claessens */ +#include "config.h" + #include #include "mcp-account-manager-uoa.h"