diff options
Diffstat (limited to 'libempathy-gtk')
123 files changed, 411 insertions, 454 deletions
diff --git a/libempathy-gtk/.gitignore b/libempathy-gtk/.gitignore index 3e3f6f051..3e651d7f4 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 902a5e57f..72c27b4b2 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 <libempathy-gtk/@filename@>\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 03aeacf71..e6f4367c9 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 <glib/gi18n-lib.h> #include "empathy-ui-utils.h" -#include "empathy-account-chooser.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> +#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 d58fcf12f..5302ad702 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 <gtk/gtk.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-account-selector-dialog.c b/libempathy-gtk/empathy-account-selector-dialog.c index 72a7b2ffd..0dd67ea7c 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 c027fb250..e86cec417 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 <libempathy/empathy-debug.h> +#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 bcd45b76a..c102d6ea6 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 <gtk/gtk.h> -#include <libempathy-gtk/empathy-account-widget.h> -#include <libempathy-gtk/empathy-irc-network-chooser.h> +#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 988b09883..044e3a991 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 <libempathy-gtk/empathy-account-widget.h> -#include <glib.h> -#include <gtk/gtk.h> +#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 4568cf175..b76078d5c 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 <glib/gi18n-lib.h> #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 84e96e7b6..4fed35ec9 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 <gtk/gtk.h> -#include <libempathy-gtk/empathy-account-widget.h> +#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 794e7d524..0751b24a4 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 <glib/gi18n-lib.h> - -#include <libempathy/empathy-utils.h> - #include <dbus/dbus-protocol.h> +#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 <libempathy/empathy-debug.h> +#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 2f7d54431..65de952c7 100644 --- a/libempathy-gtk/empathy-account-widget.h +++ b/libempathy-gtk/empathy-account-widget.h @@ -26,7 +26,7 @@ #include <gtk/gtk.h> -#include <libempathy/empathy-account-settings.h> +#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 000000000..093cb2a93 --- /dev/null +++ b/libempathy-gtk/empathy-account-widgets.gresource.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<gresources> + <gresource prefix="/org/gnome/AccountWidgets"> + <file compressed="true">empathy-account-widget-generic.ui</file> + <file compressed="true">empathy-account-widget-jabber.ui</file> + <file compressed="true">empathy-account-widget-msn.ui</file> + <file compressed="true">empathy-account-widget-sip.ui</file> + <file compressed="true">empathy-account-widget-local-xmpp.ui</file> + <file compressed="true">empathy-account-widget-irc.ui</file> + <file compressed="true">empathy-account-widget-icq.ui</file> + <file compressed="true">empathy-account-widget-yahoo.ui</file> + <file compressed="true">empathy-account-widget-groupwise.ui</file> + <file compressed="true">empathy-account-widget-aim.ui</file> + </gresource> +</gresources> + diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c index 553dd4f6e..4c58a1aa5 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 <glib/gi18n-lib.h> -#include <libempathy/empathy-camera-monitor.h> -#include <libempathy/empathy-gsettings.h> -#include <libempathy/empathy-utils.h> - -#include "empathy-avatar-chooser.h" -#include "empathy-images.h" -#include "empathy-ui-utils.h" - #ifdef HAVE_CHEESE #include <cheese-avatar-chooser.h> #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 <libempathy/empathy-debug.h> +#include "empathy-debug.h" /** * SECTION:empathy-avatar-chooser @@ -854,7 +853,7 @@ avatar_chooser_update_preview_cb (GtkFileChooser *file_chooser, else { gtk_image_set_from_stock (GTK_IMAGE (image), - "gtk-dialog-question", + "dialog-question", GTK_ICON_SIZE_DIALOG); } diff --git a/libempathy-gtk/empathy-avatar-chooser.h b/libempathy-gtk/empathy-avatar-chooser.h index dc82c0571..1636e2896 100644 --- a/libempathy-gtk/empathy-avatar-chooser.h +++ b/libempathy-gtk/empathy-avatar-chooser.h @@ -26,6 +26,7 @@ #include <gio/gio.h> #include <gtk/gtk.h> +#include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c index acb0903e4..f61c1b236 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 <glib/gi18n-lib.h> #include <gdk/gdkx.h> -#include <libempathy/empathy-utils.h> -#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 9429a2874..65f088ecd 100644 --- a/libempathy-gtk/empathy-avatar-image.h +++ b/libempathy-gtk/empathy-avatar-image.h @@ -26,6 +26,8 @@ #include <gtk/gtk.h> +#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 a6938b3e5..5cdb90d1e 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 <glib/gi18n-lib.h> #define DEBUG_FLAG EMPATHY_DEBUG_SASL -#include <libempathy/empathy-debug.h> +#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 ad5179806..a7d0a6f8c 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 <glib-object.h> -#include <gtk/gtk.h> - -#include <libempathy-gtk/empathy-base-password-dialog.h> +#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 20238343d..9cbb178f0 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 <glib/gi18n-lib.h> +#include "empathy-utils.h" + #define DEBUG_FLAG EMPATHY_DEBUG_SASL -#include <libempathy/empathy-debug.h> -#include <libempathy/empathy-utils.h> +#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 3f4cfdd5e..0c8ff5251 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 <glib-object.h> #include <gtk/gtk.h> #include <telepathy-glib/telepathy-glib.h> diff --git a/libempathy-gtk/empathy-calendar-button.c b/libempathy-gtk/empathy-calendar-button.c index f4c82eb4e..ca96a423a 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 <glib/gi18n-lib.h> -#include "empathy-calendar-button.h" - #define DEBUG_FLAG EMPATHY_DEBUG_OTHER_THING -#include <libempathy/empathy-debug.h> +#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 3f1aed1f1..ecc8c78c5 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 <glib-object.h> #include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c index 9f72ce9bb..ebf320471 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 <glib/gi18n-lib.h> - #include <gtk/gtk.h> -#include <telepathy-glib/telepathy-glib.h> - -#include "empathy-call-utils.h" - -#include <libempathy/empathy-request-util.h> +#include "empathy-request-util.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> +#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 12fca684e..788d828f5 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 <telepathy-glib/telepathy-glib.h> + G_BEGIN_DECLS /* Calls */ diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.c b/libempathy-gtk/empathy-cell-renderer-activatable.c index 3db350935..bdbf1cb09 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 <libempathy/empathy-utils.h> - #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 f7c873617..8653fae80 100644 --- a/libempathy-gtk/empathy-cell-renderer-expander.c +++ b/libempathy-gtk/empathy-cell-renderer-expander.c @@ -21,9 +21,11 @@ * Authors: Kristian Rietveld <kris@imendio.com> */ -#include <libempathy/empathy-utils.h> +#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 0afd89748..44bbd7eab 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 <libempathy/empathy-utils.h> #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 ffd92b1cd..63364b3a2 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -26,33 +26,33 @@ * Xavier Claessens <xclaesse@gmail.com> */ -#include "config.h" /* for GCompletion */ #define GLIB_DISABLE_DEPRECATION_WARNINGS 1 -#include <glib/gi18n-lib.h> +#include "config.h" +#include "empathy-chat.h" -#include <libempathy/empathy-gsettings.h> -#include <libempathy/empathy-keyring.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-request-util.h> -#include <libempathy/empathy-client-factory.h> +#include <glib/gi18n-lib.h> -#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 <libempathy/empathy-debug.h> +#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 @@ -3855,14 +3855,8 @@ provide_password_cb (GObject *tp_chat, return; } - if (empathy_keyring_is_available ()) { - /* ask whether they want to save the password */ - chat_prompt_to_save_password (self, data); - } else { - /* Get rid of the password info bar finally */ - gtk_widget_destroy (data->info_bar); - g_slice_free (PasswordData, data); - } + /* ask whether they want to save the password */ + chat_prompt_to_save_password (self, data); /* Room joined */ gtk_widget_set_sensitive (priv->hpaned, TRUE); diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h index 269b00596..2a983622b 100644 --- a/libempathy-gtk/empathy-chat.h +++ b/libempathy-gtk/empathy-chat.h @@ -30,10 +30,9 @@ #include <gtk/gtk.h> -#include <libempathy/empathy-contact.h> -#include <libempathy/empathy-tp-chat.h> - -#include <libempathy-gtk/empathy-theme-adium.h> +#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 9a0498c5a..ddcbcf315 100644 --- a/libempathy-gtk/empathy-contact-blocking-dialog.c +++ b/libempathy-gtk/empathy-contact-blocking-dialog.c @@ -21,19 +21,18 @@ * * Authors: Danielle Madeley <danielle.madeley@collabora.co.uk> */ + #include "config.h" +#include "empathy-contact-blocking-dialog.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> - -#include <libempathy-gtk/empathy-account-chooser.h> -#include <libempathy-gtk/empathy-ui-utils.h> - -#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 <libempathy/empathy-debug.h> +#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 80ea9765a..dd81dde41 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 <libempathy/empathy-utils.h> -#include <libempathy/empathy-client-factory.h> - -#include <libempathy-gtk/empathy-individual-store-manager.h> -#include <libempathy-gtk/empathy-individual-view.h> -#include <libempathy-gtk/empathy-ui-utils.h> +#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 0b01bf88d..2696f5abb 100644 --- a/libempathy-gtk/empathy-contact-search-dialog.c +++ b/libempathy-gtk/empathy-contact-search-dialog.c @@ -22,21 +22,22 @@ * Danielle Madeley <danielle.madeley@collabora.co.uk> * Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> */ + #include "config.h" +#include "empathy-contact-search-dialog.h" #include <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-client-factory.h> - -#include <libempathy-gtk/empathy-account-chooser.h> -#include <libempathy-gtk/empathy-cell-renderer-text.h> -#include <libempathy-gtk/empathy-cell-renderer-activatable.h> -#include <libempathy-gtk/empathy-individual-information-dialog.h> -#include <libempathy-gtk/empathy-images.h> +#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 <libempathy/empathy-debug.h> +#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 cef06d309..80a1aafb4 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 <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-client-factory.h> - -#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 <libempathy/empathy-debug.h> +#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 6f8045d3e..5f44adb6b 100644 --- a/libempathy-gtk/empathy-contact-widget.h +++ b/libempathy-gtk/empathy-contact-widget.h @@ -24,8 +24,8 @@ #include <gtk/gtk.h> -#include <libempathy/empathy-contact.h> #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 7ec61310d..38f64375a 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 <glib/gi18n-lib.h> -#include <libempathy/empathy-time.h> -#include <libempathy/empathy-request-util.h> - -#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 80c18ffae..64514f09d 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 <glib.h> #include <gtk/gtk.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-dialpad-button.c b/libempathy-gtk/empathy-dialpad-button.c index bddf42bf2..792241fd8 100644 --- a/libempathy-gtk/empathy-dialpad-button.c +++ b/libempathy-gtk/empathy-dialpad-button.c @@ -20,9 +20,7 @@ * Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> */ - #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 cca96f3b2..cd312bda1 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 <gtk/gtk.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-dialpad-widget.c b/libempathy-gtk/empathy-dialpad-widget.c index 8fd65bdb2..6c85c7971 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 <libempathy-gtk/empathy-dialpad-button.h> +#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 d171f72fc..452952bb8 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 <sys/stat.h> -#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 <libempathy/empathy-debug.h> +#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 f9f85c1c9..e1412ab8a 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 <glib.h> #include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-groups-widget.c b/libempathy-gtk/empathy-groups-widget.c index 6b6a0d0dc..d1a6febfa 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 <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-connection-aggregator.h> - -#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 1085fac4f..2b59db62c 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 <gtk/gtk.h> - #include <folks/folks.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c index 03874c905..ce03d0a28 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 <glib/gi18n-lib.h> -#include <libempathy/empathy-individual-manager.h> -#include <libempathy/empathy-utils.h> - -#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 e07105676..b603c5765 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 <gtk/gtk.h> - #include <folks/folks.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-individual-edit-dialog.c b/libempathy-gtk/empathy-individual-edit-dialog.c index bd43adeb8..dbd01c970 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 <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> - -#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 4f580fb03..747e6824f 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 <gtk/gtk.h> - #include <folks/folks.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c index cd6392a9b..2b8d64bd3 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 <glib/gi18n-lib.h> -#include <libempathy/empathy-individual-manager.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-pkg-kit.h> - -#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 <libempathy/empathy-debug.h> +#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 cdba07a61..58c229577 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 <gtk/gtk.h> - #include <folks/folks.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c index 4cadf22a2..e70146bf7 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 <glib/gi18n-lib.h> -#include <libempathy/empathy-camera-monitor.h> -#include <libempathy/empathy-request-util.h> -#include <libempathy/empathy-individual-manager.h> -#include <libempathy/empathy-chatroom-manager.h> -#include <libempathy/empathy-utils.h> - #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 <libempathy/empathy-debug.h> +#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 0fefb9c85..16134a61c 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 <libempathy/empathy-utils.h> - #include "empathy-individual-store-channel.h" +#include "empathy-utils.h" + #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include <libempathy/empathy-debug.h> +#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 468effe21..07cc096ee 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 <gtk/gtk.h> +#include <telepathy-glib/telepathy-glib.h> -#include <libempathy-gtk/empathy-individual-store.h> +#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 ea872b1d1..d080242ea 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 <libempathy/empathy-debug.h> +#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 7656b50ea..d442e7ca5 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 <gtk/gtk.h> +#include <glib-object.h> -#include <libempathy/empathy-individual-manager.h> - -#include <libempathy-gtk/empathy-individual-store.h> +#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 ddaea26b4..3ebe35a6b 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 <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> - -#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 <libempathy/empathy-debug.h> +#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 7e36fe19a..87fa3d966 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 <glib/gi18n-lib.h> -#include <libempathy/empathy-connection-aggregator.h> -#include <libempathy/empathy-individual-manager.h> -#include <libempathy/empathy-contact-groups.h> -#include <libempathy/empathy-request-util.h> -#include <libempathy/empathy-utils.h> - -#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 <libempathy/empathy-debug.h> +#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 baac701ed..e942a42b5 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 <gtk/gtk.h> - #include <folks/folks.h> -#include "empathy-live-search.h" #include "empathy-individual-menu.h" #include "empathy-individual-store.h" +#include "empathy-live-search.h" G_BEGIN_DECLS #define EMPATHY_TYPE_INDIVIDUAL_VIEW (empathy_individual_view_get_type ()) diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c index 12093b577..a267a7d79 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 <glib/gi18n-lib.h> @@ -28,18 +29,17 @@ #include <champlain-gtk/champlain-gtk.h> #endif -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-location.h> -#include <libempathy/empathy-time.h> - #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 <libempathy/empathy-debug.h> +#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 b8156c48a..fd63377f2 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 <gtk/gtk.h> - #include <folks/folks.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-input-text-view.c b/libempathy-gtk/empathy-input-text-view.c index 78502ef83..d7c24a68d 100644 --- a/libempathy-gtk/empathy-input-text-view.c +++ b/libempathy-gtk/empathy-input-text-view.c @@ -25,6 +25,7 @@ * Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> */ +#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 00e9bf0eb..60945aed6 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 <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-irc-network-manager.h> - #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 <libempathy/empathy-debug.h> +#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 0d4f24e7f..1e4654916 100644 --- a/libempathy-gtk/empathy-irc-network-chooser-dialog.h +++ b/libempathy-gtk/empathy-irc-network-chooser-dialog.h @@ -24,8 +24,8 @@ #include <gtk/gtk.h> -#include <libempathy/empathy-account-settings.h> -#include <libempathy/empathy-irc-network.h> +#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 e19b3e8ab..fab6a3a3f 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 <libempathy/empathy-utils.h> -#include <libempathy/empathy-irc-network-manager.h> - -#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 <libempathy/empathy-debug.h> - -#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 3b6125050..f4c603288 100644 --- a/libempathy-gtk/empathy-irc-network-chooser.h +++ b/libempathy-gtk/empathy-irc-network-chooser.h @@ -24,8 +24,8 @@ #include <gtk/gtk.h> -#include <libempathy/empathy-account-settings.h> -#include <libempathy/empathy-irc-network.h> +#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 aedb5dc79..35457f592 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 <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> - #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 df4a8b152..a49c63da9 100644 --- a/libempathy-gtk/empathy-irc-network-dialog.h +++ b/libempathy-gtk/empathy-irc-network-dialog.h @@ -23,7 +23,7 @@ #include <gtk/gtk.h> -#include <libempathy/empathy-irc-network.h> +#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 e65adbe4c..51f6a2e07 100644 --- a/libempathy-gtk/empathy-live-search.c +++ b/libempathy-gtk/empathy-live-search.c @@ -22,11 +22,10 @@ */ #include "config.h" - -#include <libempathy/empathy-utils.h> - #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 b714fa499..f0f6aefec 100644 --- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c +++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c @@ -23,13 +23,12 @@ #include <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> - -#include <libempathy-gtk/empathy-account-widget.h> -#include <libempathy-gtk/empathy-ui-utils.h> +#include "empathy-account-widget.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include <libempathy/empathy-debug.h> +#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 dafd7fb2a..efea64d29 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 <gtk/gtk.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c index ab72fff7d..3a97c94cf 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 <geoclue/geoclue-master.h> -#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 525e490bb..6ea8b7bf9 100644 --- a/libempathy-gtk/empathy-location-manager.h +++ b/libempathy-gtk/empathy-location-manager.h @@ -25,7 +25,6 @@ #include <glib-object.h> - 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 80733da1b..526569a51 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 <glib/gi18n-lib.h> -#include <webkit/webkit.h> - #include <telepathy-glib/proxy-subclass.h> -#include <extensions/extensions.h> - -#include <libempathy/action-chain-internal.h> -#include <libempathy/empathy-camera-monitor.h> -#include <libempathy/empathy-gsettings.h> -#include <libempathy/empathy-request-util.h> -#include <libempathy/empathy-utils.h> - -#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 <libempathy/empathy-debug.h> +#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 f8f76905a..48554fc3e 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 <gtk/gtk.h> #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-new-account-dialog.c b/libempathy-gtk/empathy-new-account-dialog.c index c36cfcfce..ed9242b58 100644 --- a/libempathy-gtk/empathy-new-account-dialog.c +++ b/libempathy-gtk/empathy-new-account-dialog.c @@ -22,11 +22,11 @@ #include <glib/gi18n-lib.h> -#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include <libempathy/empathy-debug.h> +#include "empathy-account-widget.h" +#include "empathy-protocol-chooser.h" -#include <libempathy-gtk/empathy-account-widget.h> -#include <libempathy-gtk/empathy-protocol-chooser.h> +#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 07fc22f98..6a5d5c2d5 100644 --- a/libempathy-gtk/empathy-new-account-dialog.h +++ b/libempathy-gtk/empathy-new-account-dialog.h @@ -22,7 +22,7 @@ #include <gtk/gtk.h> -#include <libempathy/empathy-account-settings.h> +#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 d770d6d98..7dda2f9e8 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 <glib/gi18n-lib.h> -#include <libempathy/empathy-camera-monitor.h> -#include <libempathy/empathy-utils.h> +#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 <libempathy/empathy-debug.h> - -#include <libempathy-gtk/empathy-contact-chooser.h> -#include <libempathy-gtk/empathy-ui-utils.h> -#include <libempathy-gtk/empathy-images.h> - -#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 d3f05e64e..e7413568c 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 <glib-object.h> #include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c index c38a1c75b..366147259 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 <glib/gi18n-lib.h> -#include <libempathy/empathy-request-util.h> +#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 <libempathy/empathy-debug.h> - -#include <libempathy-gtk/empathy-contact-chooser.h> -#include <libempathy-gtk/empathy-ui-utils.h> -#include <libempathy-gtk/empathy-images.h> - -#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 390101a2b..5adc4cf9e 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 <glib-object.h> #include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c index d142b7fa3..033557e81 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 <libnotify/notify.h> -#include <libempathy/empathy-gsettings.h> -#include <libempathy/empathy-utils.h> - -#include <libempathy-gtk/empathy-ui-utils.h> +#include "empathy-gsettings.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> - -#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 923ab4a54..7c2fa8c4a 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 <glib-object.h> - -#include <libempathy/empathy-contact.h> - #include <libnotify/notification.h> +#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 07fb69fc0..ef03061a6 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 <glib/gi18n-lib.h> #define DEBUG_FLAG EMPATHY_DEBUG_SASL -#include <libempathy/empathy-debug.h> +#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 ee1c993b4..1b19375a3 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 <glib-object.h> #include <gtk/gtk.h> -#include <libempathy/empathy-server-sasl-handler.h> - -#include <libempathy-gtk/empathy-base-password-dialog.h> +#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 ddaa97b7f..e1113a073 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 <string.h> #include <libxml/tree.h> #include <telepathy-glib/telepathy-glib.h> -#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 a15ad6a01..216896b42 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 <glib.h> #include <glib-object.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c index a047890bb..445f79b63 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 <glib/gi18n-lib.h> -#include <libempathy/empathy-presence-manager.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-status-presets.h> +#include "empathy-presence-manager.h" +#include "empathy-status-presets.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> +#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 d5b0de7c1..a060d9f7e 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 <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-connection-managers.h> - -#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 <libempathy/empathy-debug.h> +#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 eeaab60c0..2ae8017ef 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 <glib-object.h> #include <gtk/gtk.h> - #include <telepathy-glib/telepathy-glib.h> -#include <libempathy/empathy-account-settings.h> +#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 d8410b5e6..2db024a3d 100644 --- a/libempathy-gtk/empathy-roster-contact.c +++ b/libempathy-gtk/empathy-roster-contact.c @@ -1,13 +1,11 @@ #include "config.h" - -#include <glib/gi18n-lib.h> - #include "empathy-roster-contact.h" -#include <libempathy/empathy-utils.h> +#include <glib/gi18n-lib.h> -#include <libempathy-gtk/empathy-images.h> -#include <libempathy-gtk/empathy-ui-utils.h> +#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 643fed526..9ca53a8e9 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 <telepathy-glib/telepathy-glib.h> diff --git a/libempathy-gtk/empathy-roster-model-aggregator.c b/libempathy-gtk/empathy-roster-model-aggregator.c index a81b2c254..b82fd1620 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 <folks/folks-telepathy.h> -#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 e29e36eb0..3b9c0202b 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 <glib-object.h> - #include <folks/folks.h> #include "empathy-roster-model.h" diff --git a/libempathy-gtk/empathy-roster-model-manager.c b/libempathy-gtk/empathy-roster-model-manager.c index 859edb7a9..e0fff03e9 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 <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> +#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 f7ce1f4e5..a38e6593a 100644 --- a/libempathy-gtk/empathy-roster-model-manager.h +++ b/libempathy-gtk/empathy-roster-model-manager.h @@ -23,7 +23,7 @@ #include <glib-object.h> -#include <libempathy/empathy-individual-manager.h> +#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 3fd84b7fc..994ab9896 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 27c5482f3..1b35f1a1c 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 <glib-object.h> - #include <folks/folks.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-roster-view.c b/libempathy-gtk/empathy-roster-view.c index ed57be3d4..657deaa96 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 <glib/gi18n-lib.h> -#include <libempathy/empathy-contact-groups.h> - -#include <libempathy-gtk/empathy-roster-contact.h> -#include <libempathy-gtk/empathy-roster-group.h> -#include <libempathy-gtk/empathy-ui-utils.h> +#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 0077b6843..c09d09c3a 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 <libempathy-gtk/egg-list-box/egg-list-box.h> -#include <libempathy-gtk/empathy-live-search.h> - -#include <libempathy-gtk/empathy-roster-model.h> +#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 018a068ab..dce1bdd1b 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 <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> - -#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 afda250b2..a710965b5 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 <glib.h> -#include <glib-object.h> +#include <gtk/gtk.h> #include "empathy-theme-adium.h" diff --git a/libempathy-gtk/empathy-share-my-desktop.c b/libempathy-gtk/empathy-share-my-desktop.c index 8b0845048..9c29533c7 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 <libempathy/empathy-debug.h> - -#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 3efeecc14..5953e15e8 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 <libempathy/empathy-contact.h> +#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 99caa51d7..2e8ef3aa5 100644 --- a/libempathy-gtk/empathy-smiley-manager.c +++ b/libempathy-gtk/empathy-smiley-manager.c @@ -21,10 +21,10 @@ */ #include "config.h" - -#include <libempathy/empathy-utils.h> #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 1d6eaac54..b9e753bf6 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 <glib-object.h> #include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-sound-manager.c b/libempathy-gtk/empathy-sound-manager.c index 3291a9a92..600816f67 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 <glib/gi18n-lib.h> +#include "empathy-gsettings.h" +#include "empathy-utils.h" + #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> -#include <libempathy/empathy-gsettings.h> -#include <libempathy/empathy-utils.h> +#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 99e96c571..b2fd0d291 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 <gtk/gtk.h> - #include <canberra-gtk.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-spell.c b/libempathy-gtk/empathy-spell.c index 4242b5738..27f27f902 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 <glib/gi18n-lib.h> @@ -29,11 +30,10 @@ #include <enchant.h> #endif -#include "empathy-spell.h" +#include "empathy-gsettings.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> -#include <libempathy/empathy-gsettings.h> +#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 19f1fee6a..b122f287e 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 <glib/gi18n-lib.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-status-presets.h> +#include "empathy-status-presets.h" +#include "empathy-ui-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> - -#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 5cf0e3397..625547fe5 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 <glib.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-string-parser.c b/libempathy-gtk/empathy-string-parser.c index cb7d3c3e1..7cbd290f3 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 04fae6d18..878832657 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 <libempathy/empathy-utils.h> -#include <libempathy-gtk/empathy-individual-widget.h> - #include <glib/gi18n-lib.h> +#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 67ec4d08f..31715c305 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 <glib/gi18n-lib.h> -#include <libempathy/empathy-gsettings.h> -#include <libempathy/empathy-time.h> -#include <libempathy/empathy-utils.h> - -#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 <libempathy/empathy-debug.h> +#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 880667615..698d2846c 100644 --- a/libempathy-gtk/empathy-theme-adium.h +++ b/libempathy-gtk/empathy-theme-adium.h @@ -23,7 +23,7 @@ #include <webkit/webkitwebview.h> -#include <libempathy/empathy-message.h> +#include "empathy-message.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c index f3d8d67bc..81361c1ef 100644 --- a/libempathy-gtk/empathy-theme-manager.c +++ b/libempathy-gtk/empathy-theme-manager.c @@ -21,17 +21,12 @@ */ #include "config.h" - -#include <string.h> - -#include <gtk/gtk.h> - -#include <libempathy/empathy-gsettings.h> - #include "empathy-theme-manager.h" +#include "empathy-gsettings.h" + #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include <libempathy/empathy-debug.h> +#include "empathy-debug.h" struct _EmpathyThemeManagerPriv { diff --git a/libempathy-gtk/empathy-theme-manager.h b/libempathy-gtk/empathy-theme-manager.h index 812b02616..590c343f3 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 <glib-object.h> #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 82244403a..def31d224 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 <glib/gi18n-lib.h> #include <gcr/gcr.h> +#include "empathy-utils.h" + #define DEBUG_FLAG EMPATHY_DEBUG_TLS -#include <libempathy/empathy-debug.h> -#include <libempathy/empathy-utils.h> +#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 a9c37ad5e..b85e7d097 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 <glib-object.h> #include <gtk/gtk.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index 9f4300840..86edb3b0a 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 <X11/Xatom.h> #include <gdk/gdkx.h> #include <glib/gi18n-lib.h> #include <gio/gdesktopappinfo.h> -#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 <libempathy/empathy-debug.h> -#include <libempathy/empathy-utils.h> -#include <libempathy/empathy-ft-factory.h> +#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 73232cf52..baf250e32 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 <gtk/gtk.h> - #include <folks/folks.h> -#include <libempathy/empathy-contact.h> -#include <libempathy/empathy-ft-handler.h> +#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 77b0798f2..451caec8e 100644 --- a/libempathy-gtk/empathy-user-info.c +++ b/libempathy-gtk/empathy-user-info.c @@ -22,14 +22,14 @@ #include <glib/gi18n-lib.h> -#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include <libempathy/empathy-debug.h> -#include <libempathy/empathy-time.h> -#include <libempathy/empathy-utils.h> - #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 117bfd325..a06c72911 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 <gtk/gtk.h> - #include <telepathy-glib/telepathy-glib.h> G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-webkit-utils.c b/libempathy-gtk/empathy-webkit-utils.c index d221e5f98..0fc319088 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 <glib/gi18n-lib.h> -#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 |