From 15460fa9ae4e6a19e8b6e971014deb50746d90ee Mon Sep 17 00:00:00 2001 From: Emanuele Aina Date: Thu, 28 Mar 2013 12:32:45 +0100 Subject: Use a flat namespace for internal includes Directly add the libempathy, libempathy-gtk and extensions directories to the include search path. This decouples header inclusions from their location and helps when reorganizing the source files layout. https://bugzilla.gnome.org/show_bug.cgi?id=696950 --- libempathy-gtk/Makefile.am | 6 ++-- libempathy-gtk/empathy-account-chooser.c | 2 +- libempathy-gtk/empathy-account-widget-irc.c | 2 +- libempathy-gtk/empathy-account-widget-irc.h | 4 +-- libempathy-gtk/empathy-account-widget-private.h | 2 +- libempathy-gtk/empathy-account-widget-sip.h | 2 +- libempathy-gtk/empathy-account-widget.c | 4 +-- libempathy-gtk/empathy-account-widget.h | 2 +- libempathy-gtk/empathy-avatar-chooser.c | 8 ++--- libempathy-gtk/empathy-avatar-image.c | 2 +- libempathy-gtk/empathy-bad-password-dialog.c | 2 +- libempathy-gtk/empathy-bad-password-dialog.h | 2 +- libempathy-gtk/empathy-base-password-dialog.c | 4 +-- libempathy-gtk/empathy-calendar-button.c | 2 +- libempathy-gtk/empathy-call-utils.c | 4 +-- libempathy-gtk/empathy-cell-renderer-activatable.c | 2 +- libempathy-gtk/empathy-cell-renderer-expander.c | 2 +- libempathy-gtk/empathy-cell-renderer-text.c | 2 +- libempathy-gtk/empathy-chat.c | 14 ++++---- libempathy-gtk/empathy-chat.h | 6 ++-- libempathy-gtk/empathy-contact-blocking-dialog.c | 4 +-- libempathy-gtk/empathy-contact-chooser.c | 4 +-- libempathy-gtk/empathy-contact-search-dialog.c | 6 ++-- libempathy-gtk/empathy-contact-widget.c | 6 ++-- libempathy-gtk/empathy-contact-widget.h | 2 +- libempathy-gtk/empathy-contactinfo-utils.c | 4 +-- libempathy-gtk/empathy-geometry.c | 4 +-- libempathy-gtk/empathy-groups-widget.c | 4 +-- libempathy-gtk/empathy-individual-dialogs.c | 4 +-- libempathy-gtk/empathy-individual-edit-dialog.c | 2 +- .../empathy-individual-information-dialog.c | 8 ++--- libempathy-gtk/empathy-individual-menu.c | 12 +++---- libempathy-gtk/empathy-individual-store-channel.c | 4 +-- libempathy-gtk/empathy-individual-store-channel.h | 2 +- libempathy-gtk/empathy-individual-store-manager.c | 2 +- libempathy-gtk/empathy-individual-store-manager.h | 4 +-- libempathy-gtk/empathy-individual-store.c | 4 +-- libempathy-gtk/empathy-individual-view.c | 12 +++---- libempathy-gtk/empathy-individual-widget.c | 8 ++--- .../empathy-irc-network-chooser-dialog.c | 6 ++-- .../empathy-irc-network-chooser-dialog.h | 4 +-- libempathy-gtk/empathy-irc-network-chooser.c | 6 ++-- libempathy-gtk/empathy-irc-network-chooser.h | 4 +-- libempathy-gtk/empathy-irc-network-dialog.c | 2 +- libempathy-gtk/empathy-irc-network-dialog.h | 2 +- libempathy-gtk/empathy-live-search.c | 2 +- .../empathy-local-xmpp-assistant-widget.c | 4 +-- libempathy-gtk/empathy-location-manager.c | 8 ++--- libempathy-gtk/empathy-log-window.c | 14 ++++---- libempathy-gtk/empathy-new-account-dialog.c | 2 +- libempathy-gtk/empathy-new-account-dialog.h | 2 +- libempathy-gtk/empathy-new-call-dialog.c | 6 ++-- libempathy-gtk/empathy-new-message-dialog.c | 4 +-- libempathy-gtk/empathy-notify-manager.c | 6 ++-- libempathy-gtk/empathy-notify-manager.h | 2 +- libempathy-gtk/empathy-password-dialog.c | 2 +- libempathy-gtk/empathy-password-dialog.h | 4 +-- libempathy-gtk/empathy-presence-chooser.c | 8 ++--- libempathy-gtk/empathy-protocol-chooser.c | 6 ++-- libempathy-gtk/empathy-protocol-chooser.h | 2 +- libempathy-gtk/empathy-roster-contact.c | 2 +- libempathy-gtk/empathy-roster-model-manager.c | 2 +- libempathy-gtk/empathy-roster-model-manager.h | 2 +- libempathy-gtk/empathy-roster-view.c | 2 +- libempathy-gtk/empathy-roster-view.h | 6 ++-- libempathy-gtk/empathy-search-bar.c | 2 +- libempathy-gtk/empathy-share-my-desktop.c | 2 +- libempathy-gtk/empathy-share-my-desktop.h | 2 +- libempathy-gtk/empathy-smiley-manager.c | 2 +- libempathy-gtk/empathy-sound-manager.c | 6 ++-- libempathy-gtk/empathy-spell.c | 4 +-- libempathy-gtk/empathy-status-preset-dialog.c | 6 ++-- libempathy-gtk/empathy-subscription-dialog.c | 2 +- libempathy-gtk/empathy-theme-adium.c | 8 ++--- libempathy-gtk/empathy-theme-adium.h | 2 +- libempathy-gtk/empathy-theme-manager.c | 4 +-- libempathy-gtk/empathy-tls-dialog.c | 4 +-- libempathy-gtk/empathy-ui-utils.c | 6 ++-- libempathy-gtk/empathy-ui-utils.h | 4 +-- libempathy-gtk/empathy-user-info.c | 6 ++-- libempathy/Makefile.am | 5 ++- libempathy/empathy-auth-factory.c | 2 +- libempathy/empathy-chatroom.h | 2 +- libempathy/empathy-server-sasl-handler.c | 2 +- libempathy/empathy-server-tls-handler.c | 2 +- libempathy/empathy-utils.c | 2 +- nautilus-sendto-plugin/Makefile.am | 3 +- nautilus-sendto-plugin/empathy-nautilus-sendto.c | 22 ++++++------ src/Makefile.am | 6 +++- src/empathy-accounts-common.c | 4 +-- src/empathy-accounts-dialog.c | 16 ++++----- src/empathy-accounts.c | 6 ++-- src/empathy-audio-sink.c | 2 +- src/empathy-audio-src.c | 4 +-- src/empathy-audio-utils.c | 4 +-- src/empathy-auth-client.c | 18 +++++----- src/empathy-call-factory.c | 6 ++-- src/empathy-call-handler.c | 6 ++-- src/empathy-call-handler.h | 2 +- src/empathy-call-observer.c | 6 ++-- src/empathy-call-window-fullscreen.c | 4 +-- src/empathy-call-window.c | 24 ++++++------- src/empathy-call.c | 4 +-- src/empathy-camera-menu.c | 6 ++-- src/empathy-chat-manager.c | 12 +++---- src/empathy-chat-manager.h | 2 +- src/empathy-chat-window.c | 28 +++++++-------- src/empathy-chat-window.h | 2 +- src/empathy-chat.c | 8 ++--- src/empathy-chatrooms-window.c | 8 ++--- src/empathy-debug-window.c | 8 ++--- src/empathy-debugger.c | 2 +- src/empathy-event-manager.c | 26 +++++++------- src/empathy-event-manager.h | 2 +- src/empathy-ft-manager.c | 8 ++--- src/empathy-ft-manager.h | 2 +- src/empathy-import-dialog.c | 4 +-- src/empathy-import-dialog.h | 2 +- src/empathy-import-pidgin.c | 4 +-- src/empathy-import-utils.c | 4 +-- src/empathy-import-widget.c | 6 ++-- src/empathy-import-widget.h | 2 +- src/empathy-invite-participant-dialog.c | 4 +-- src/empathy-invite-participant-dialog.h | 2 +- src/empathy-mic-menu.c | 2 +- src/empathy-mic-monitor.c | 4 +-- src/empathy-new-chatroom-dialog.c | 12 +++---- src/empathy-notifications-approver.c | 6 ++-- src/empathy-preferences.c | 14 ++++---- src/empathy-roster-window.c | 42 +++++++++++----------- src/empathy-sanity-cleaning.c | 10 +++--- src/empathy-status-icon.c | 14 ++++---- src/empathy-video-src.c | 2 +- src/empathy.c | 24 ++++++------- tests/Makefile.am | 3 +- tests/empathy-chatroom-manager-test.c | 2 +- tests/empathy-chatroom-test.c | 2 +- tests/empathy-irc-network-manager-test.c | 2 +- tests/empathy-irc-network-test.c | 2 +- tests/empathy-irc-server-test.c | 2 +- tests/empathy-live-search-test.c | 4 +-- tests/empathy-parser-test.c | 4 +-- tests/empathy-tls-test.c | 2 +- tests/interactive/Makefile.am | 3 +- tests/interactive/empathy-logs.c | 8 ++--- tests/interactive/test-empathy-account-chooser.c | 4 +-- tests/interactive/test-empathy-calendar-button.c | 2 +- .../test-empathy-contact-blocking-dialog.c | 6 ++-- tests/interactive/test-empathy-dual-roster-view.c | 8 ++--- tests/interactive/test-empathy-presence-chooser.c | 6 ++-- tests/interactive/test-empathy-protocol-chooser.c | 4 +-- .../test-empathy-roster-model-aggregator.c | 8 ++--- tests/interactive/test-empathy-roster-view.c | 8 ++--- .../test-empathy-status-preset-dialog.c | 6 ++-- tests/test-helper.c | 2 +- tests/test-irc-helper.h | 6 ++-- .../cc-plugins/account-plugins/Makefile.am | 3 +- .../empathy-accounts-plugin-widget.c | 2 +- .../account-plugins/empathy-accounts-plugin.c | 4 +-- .../app-plugin/empathy-app-plugin-widget.c | 4 +-- .../cc-plugins/app-plugin/empathy-app-plugin.c | 2 +- 161 files changed, 440 insertions(+), 433 deletions(-) diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index 4c8f54c1a..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 \ @@ -245,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 \ diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c index 0f3b5b470..a272309e5 100644 --- a/libempathy-gtk/empathy-account-chooser.c +++ b/libempathy-gtk/empathy-account-chooser.c @@ -29,7 +29,7 @@ #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-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c index fbc0c19cb..e0647a9b8 100644 --- a/libempathy-gtk/empathy-account-widget-irc.c +++ b/libempathy-gtk/empathy-account-widget-irc.c @@ -25,7 +25,7 @@ #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; diff --git a/libempathy-gtk/empathy-account-widget-irc.h b/libempathy-gtk/empathy-account-widget-irc.h index c6e6dec01..eba469e82 100644 --- a/libempathy-gtk/empathy-account-widget-irc.h +++ b/libempathy-gtk/empathy-account-widget-irc.h @@ -22,8 +22,8 @@ #define __EMPATHY_ACCOUNT_WIDGET_IRC_H__ #include -#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 d987abb7c..8da22bdad 100644 --- a/libempathy-gtk/empathy-account-widget-private.h +++ b/libempathy-gtk/empathy-account-widget-private.h @@ -22,7 +22,7 @@ #ifndef __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__ #define __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__ -#include "libempathy-gtk/empathy-account-widget.h" +#include "empathy-account-widget.h" #include #include diff --git a/libempathy-gtk/empathy-account-widget-sip.h b/libempathy-gtk/empathy-account-widget-sip.h index 62b80da81..438ee8372 100644 --- a/libempathy-gtk/empathy-account-widget-sip.h +++ b/libempathy-gtk/empathy-account-widget-sip.h @@ -22,7 +22,7 @@ #define __EMPATHY_ACCOUNT_WIDGET_SIP_H__ #include -#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 d8b5b7785..fb4ab8bf4 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -28,7 +28,7 @@ #include -#include "libempathy/empathy-utils.h" +#include "empathy-utils.h" #include @@ -38,7 +38,7 @@ #include "empathy-ui-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) diff --git a/libempathy-gtk/empathy-account-widget.h b/libempathy-gtk/empathy-account-widget.h index 57eaa1a36..65de952c7 100644 --- a/libempathy-gtk/empathy-account-widget.h +++ b/libempathy-gtk/empathy-account-widget.h @@ -26,7 +26,7 @@ #include -#include "libempathy/empathy-account-settings.h" +#include "empathy-account-settings.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c index 240e2211d..30022c9df 100644 --- a/libempathy-gtk/empathy-avatar-chooser.c +++ b/libempathy-gtk/empathy-avatar-chooser.c @@ -24,9 +24,9 @@ #include -#include "libempathy/empathy-camera-monitor.h" -#include "libempathy/empathy-gsettings.h" -#include "libempathy/empathy-utils.h" +#include "empathy-camera-monitor.h" +#include "empathy-gsettings.h" +#include "empathy-utils.h" #include "empathy-avatar-chooser.h" #include "empathy-images.h" @@ -37,7 +37,7 @@ #endif /* HAVE_CHEESE */ #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" /** * SECTION:empathy-avatar-chooser diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c index 4b50eceef..f66827f64 100644 --- a/libempathy-gtk/empathy-avatar-image.c +++ b/libempathy-gtk/empathy-avatar-image.c @@ -26,7 +26,7 @@ #include #include -#include "libempathy/empathy-utils.h" +#include "empathy-utils.h" #include "empathy-avatar-image.h" #include "empathy-ui-utils.h" diff --git a/libempathy-gtk/empathy-bad-password-dialog.c b/libempathy-gtk/empathy-bad-password-dialog.c index 1e6cbbfd3..228a1497a 100644 --- a/libempathy-gtk/empathy-bad-password-dialog.c +++ b/libempathy-gtk/empathy-bad-password-dialog.c @@ -24,7 +24,7 @@ #include #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 dc04d61bb..0b025af85 100644 --- a/libempathy-gtk/empathy-bad-password-dialog.h +++ b/libempathy-gtk/empathy-bad-password-dialog.h @@ -23,7 +23,7 @@ #include #include -#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 688bbe8c4..b47e5b59d 100644 --- a/libempathy-gtk/empathy-base-password-dialog.c +++ b/libempathy-gtk/empathy-base-password-dialog.c @@ -24,8 +24,8 @@ #include #define DEBUG_FLAG EMPATHY_DEBUG_SASL -#include "libempathy/empathy-debug.h" -#include "libempathy/empathy-utils.h" +#include "empathy-debug.h" +#include "empathy-utils.h" G_DEFINE_TYPE (EmpathyBasePasswordDialog, empathy_base_password_dialog, GTK_TYPE_MESSAGE_DIALOG) diff --git a/libempathy-gtk/empathy-calendar-button.c b/libempathy-gtk/empathy-calendar-button.c index eace02f8e..86cea89d7 100644 --- a/libempathy-gtk/empathy-calendar-button.c +++ b/libempathy-gtk/empathy-calendar-button.c @@ -24,7 +24,7 @@ #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-call-utils.c b/libempathy-gtk/empathy-call-utils.c index 17c03cff2..44fce09e5 100644 --- a/libempathy-gtk/empathy-call-utils.c +++ b/libempathy-gtk/empathy-call-utils.c @@ -28,10 +28,10 @@ #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-cell-renderer-activatable.c b/libempathy-gtk/empathy-cell-renderer-activatable.c index 7f0355901..6a8fe72ee 100644 --- a/libempathy-gtk/empathy-cell-renderer-activatable.c +++ b/libempathy-gtk/empathy-cell-renderer-activatable.c @@ -22,7 +22,7 @@ #include "config.h" -#include "libempathy/empathy-utils.h" +#include "empathy-utils.h" #include "empathy-cell-renderer-activatable.h" diff --git a/libempathy-gtk/empathy-cell-renderer-expander.c b/libempathy-gtk/empathy-cell-renderer-expander.c index a72f09132..9887b7128 100644 --- a/libempathy-gtk/empathy-cell-renderer-expander.c +++ b/libempathy-gtk/empathy-cell-renderer-expander.c @@ -21,7 +21,7 @@ * Authors: Kristian Rietveld */ -#include "libempathy/empathy-utils.h" +#include "empathy-utils.h" #include "empathy-cell-renderer-expander.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererExpander) diff --git a/libempathy-gtk/empathy-cell-renderer-text.c b/libempathy-gtk/empathy-cell-renderer-text.c index a4fe92b15..afefb2af5 100644 --- a/libempathy-gtk/empathy-cell-renderer-text.c +++ b/libempathy-gtk/empathy-cell-renderer-text.c @@ -23,7 +23,7 @@ #include "config.h" -#include "libempathy/empathy-utils.h" +#include "empathy-utils.h" #include "empathy-cell-renderer-text.h" #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererText) diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index f18256b97..f853fb3be 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -32,11 +32,11 @@ #include -#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 "empathy-gsettings.h" +#include "empathy-keyring.h" +#include "empathy-utils.h" +#include "empathy-request-util.h" +#include "empathy-client-factory.h" #include "empathy-chat.h" #include "empathy-spell.h" @@ -49,10 +49,10 @@ #include "empathy-smiley-manager.h" #include "empathy-ui-utils.h" #include "empathy-string-parser.h" -#include "extensions/extensions.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 diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h index d5da3fe3c..cbd69a343 100644 --- a/libempathy-gtk/empathy-chat.h +++ b/libempathy-gtk/empathy-chat.h @@ -30,10 +30,10 @@ #include -#include "libempathy/empathy-contact.h" -#include "libempathy/empathy-tp-chat.h" +#include "empathy-contact.h" +#include "empathy-tp-chat.h" -#include "libempathy-gtk/empathy-theme-adium.h" +#include "empathy-theme-adium.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.c b/libempathy-gtk/empathy-contact-blocking-dialog.c index 60ab43671..93f317f2a 100644 --- a/libempathy-gtk/empathy-contact-blocking-dialog.c +++ b/libempathy-gtk/empathy-contact-blocking-dialog.c @@ -25,7 +25,7 @@ #include -#include "libempathy/empathy-utils.h" +#include "empathy-utils.h" #include "empathy-account-chooser.h" #include "empathy-ui-utils.h" @@ -33,7 +33,7 @@ #include "empathy-contact-blocking-dialog.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 701ba66d0..d1368e956 100644 --- a/libempathy-gtk/empathy-contact-chooser.c +++ b/libempathy-gtk/empathy-contact-chooser.c @@ -13,8 +13,8 @@ #include "empathy-contact-chooser.h" -#include "libempathy/empathy-utils.h" -#include "libempathy/empathy-client-factory.h" +#include "empathy-utils.h" +#include "empathy-client-factory.h" #include "empathy-individual-store-manager.h" #include "empathy-individual-view.h" diff --git a/libempathy-gtk/empathy-contact-search-dialog.c b/libempathy-gtk/empathy-contact-search-dialog.c index b563622c3..fd594e8c3 100644 --- a/libempathy-gtk/empathy-contact-search-dialog.c +++ b/libempathy-gtk/empathy-contact-search-dialog.c @@ -26,8 +26,8 @@ #include -#include "libempathy/empathy-utils.h" -#include "libempathy/empathy-client-factory.h" +#include "empathy-utils.h" +#include "empathy-client-factory.h" #include "empathy-account-chooser.h" #include "empathy-cell-renderer-text.h" @@ -36,7 +36,7 @@ #include "empathy-images.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 cbc034db5..fd4d783be 100644 --- a/libempathy-gtk/empathy-contact-widget.c +++ b/libempathy-gtk/empathy-contact-widget.c @@ -23,8 +23,8 @@ #include -#include "libempathy/empathy-utils.h" -#include "libempathy/empathy-client-factory.h" +#include "empathy-utils.h" +#include "empathy-client-factory.h" #include "empathy-contact-widget.h" #include "empathy-avatar-image.h" @@ -33,7 +33,7 @@ #include "empathy-string-parser.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 cb7079300..9f1f1a70f 100644 --- a/libempathy-gtk/empathy-contact-widget.h +++ b/libempathy-gtk/empathy-contact-widget.h @@ -24,7 +24,7 @@ #include -#include "libempathy/empathy-contact.h" +#include "empathy-contact.h" #include "empathy-account-chooser.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-contactinfo-utils.c b/libempathy-gtk/empathy-contactinfo-utils.c index fcf061943..3dca3740d 100644 --- a/libempathy-gtk/empathy-contactinfo-utils.c +++ b/libempathy-gtk/empathy-contactinfo-utils.c @@ -24,8 +24,8 @@ #include -#include "libempathy/empathy-time.h" -#include "libempathy/empathy-request-util.h" +#include "empathy-time.h" +#include "empathy-request-util.h" #include "empathy-contactinfo-utils.h" #include "empathy-string-parser.h" diff --git a/libempathy-gtk/empathy-geometry.c b/libempathy-gtk/empathy-geometry.c index 2c4b50188..1562001fb 100644 --- a/libempathy-gtk/empathy-geometry.c +++ b/libempathy-gtk/empathy-geometry.c @@ -25,12 +25,12 @@ #include -#include "libempathy/empathy-utils.h" +#include "empathy-utils.h" #include "empathy-geometry.h" #include "empathy-ui-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-groups-widget.c b/libempathy-gtk/empathy-groups-widget.c index 2292cc53b..8b6665167 100644 --- a/libempathy-gtk/empathy-groups-widget.c +++ b/libempathy-gtk/empathy-groups-widget.c @@ -23,8 +23,8 @@ #include -#include "libempathy/empathy-utils.h" -#include "libempathy/empathy-connection-aggregator.h" +#include "empathy-utils.h" +#include "empathy-connection-aggregator.h" #include "empathy-groups-widget.h" diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c index a22ca28e4..9f0117753 100644 --- a/libempathy-gtk/empathy-individual-dialogs.c +++ b/libempathy-gtk/empathy-individual-dialogs.c @@ -23,8 +23,8 @@ #include -#include "libempathy/empathy-individual-manager.h" -#include "libempathy/empathy-utils.h" +#include "empathy-individual-manager.h" +#include "empathy-utils.h" #include "empathy-individual-dialogs.h" #include "empathy-contact-widget.h" diff --git a/libempathy-gtk/empathy-individual-edit-dialog.c b/libempathy-gtk/empathy-individual-edit-dialog.c index 21380a5ba..457dd9575 100644 --- a/libempathy-gtk/empathy-individual-edit-dialog.c +++ b/libempathy-gtk/empathy-individual-edit-dialog.c @@ -24,7 +24,7 @@ #include -#include "libempathy/empathy-utils.h" +#include "empathy-utils.h" #include "empathy-individual-edit-dialog.h" #include "empathy-individual-widget.h" diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c index 4059925de..f4f8bda92 100644 --- a/libempathy-gtk/empathy-individual-information-dialog.c +++ b/libempathy-gtk/empathy-individual-information-dialog.c @@ -25,16 +25,16 @@ #include -#include "libempathy/empathy-individual-manager.h" -#include "libempathy/empathy-utils.h" -#include "libempathy/empathy-pkg-kit.h" +#include "empathy-individual-manager.h" +#include "empathy-utils.h" +#include "empathy-pkg-kit.h" #include "empathy-individual-information-dialog.h" #include "empathy-individual-widget.h" #include "empathy-ui-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-menu.c b/libempathy-gtk/empathy-individual-menu.c index cf67101ef..907c678b3 100644 --- a/libempathy-gtk/empathy-individual-menu.c +++ b/libempathy-gtk/empathy-individual-menu.c @@ -24,11 +24,11 @@ #include -#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-camera-monitor.h" +#include "empathy-request-util.h" +#include "empathy-individual-manager.h" +#include "empathy-chatroom-manager.h" +#include "empathy-utils.h" #include "empathy-account-selector-dialog.h" #include "empathy-images.h" @@ -44,7 +44,7 @@ #include "empathy-individual-information-dialog.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 8ceaf6e5b..5db93d5f1 100644 --- a/libempathy-gtk/empathy-individual-store-channel.c +++ b/libempathy-gtk/empathy-individual-store-channel.c @@ -25,12 +25,12 @@ #include "config.h" -#include "libempathy/empathy-utils.h" +#include "empathy-utils.h" #include "empathy-individual-store-channel.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 31a6abd8b..2cc6b5be4 100644 --- a/libempathy-gtk/empathy-individual-store-channel.h +++ b/libempathy-gtk/empathy-individual-store-channel.h @@ -28,7 +28,7 @@ #include -#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 04c341e5a..ca0628717 100644 --- a/libempathy-gtk/empathy-individual-store-manager.c +++ b/libempathy-gtk/empathy-individual-store-manager.c @@ -28,7 +28,7 @@ #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 8b56b0c1b..fac0f31d6 100644 --- a/libempathy-gtk/empathy-individual-store-manager.h +++ b/libempathy-gtk/empathy-individual-store-manager.h @@ -28,9 +28,9 @@ #include -#include "libempathy/empathy-individual-manager.h" +#include "empathy-individual-manager.h" -#include "libempathy-gtk/empathy-individual-store.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 7223e2e9c..4055091f1 100644 --- a/libempathy-gtk/empathy-individual-store.c +++ b/libempathy-gtk/empathy-individual-store.c @@ -28,13 +28,13 @@ #include -#include "libempathy/empathy-utils.h" +#include "empathy-utils.h" #include "empathy-ui-utils.h" #include "empathy-gtk-enum-types.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 b88fd253d..d02d3dea2 100644 --- a/libempathy-gtk/empathy-individual-view.c +++ b/libempathy-gtk/empathy-individual-view.c @@ -28,11 +28,11 @@ #include -#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-connection-aggregator.h" +#include "empathy-individual-manager.h" +#include "empathy-contact-groups.h" +#include "empathy-request-util.h" +#include "empathy-utils.h" #include "empathy-individual-edit-dialog.h" #include "empathy-images.h" @@ -43,7 +43,7 @@ #include "empathy-gtk-enum-types.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-widget.c b/libempathy-gtk/empathy-individual-widget.c index 87be31f26..371ddb1b0 100644 --- a/libempathy-gtk/empathy-individual-widget.c +++ b/libempathy-gtk/empathy-individual-widget.c @@ -28,9 +28,9 @@ #include #endif -#include "libempathy/empathy-utils.h" -#include "libempathy/empathy-location.h" -#include "libempathy/empathy-time.h" +#include "empathy-utils.h" +#include "empathy-location.h" +#include "empathy-time.h" #include "empathy-avatar-image.h" #include "empathy-contactinfo-utils.h" @@ -39,7 +39,7 @@ #include "empathy-ui-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-irc-network-chooser-dialog.c b/libempathy-gtk/empathy-irc-network-chooser-dialog.c index c4c8e830f..cb937daa5 100644 --- a/libempathy-gtk/empathy-irc-network-chooser-dialog.c +++ b/libempathy-gtk/empathy-irc-network-chooser-dialog.c @@ -23,14 +23,14 @@ #include -#include "libempathy/empathy-utils.h" -#include "libempathy/empathy-irc-network-manager.h" +#include "empathy-utils.h" +#include "empathy-irc-network-manager.h" #include "empathy-irc-network-dialog.h" #include "empathy-live-search.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 8ffb2cbe1..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 -#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 79b54e985..4945bb7c1 100644 --- a/libempathy-gtk/empathy-irc-network-chooser.c +++ b/libempathy-gtk/empathy-irc-network-chooser.c @@ -21,14 +21,14 @@ #include "config.h" -#include "libempathy/empathy-utils.h" -#include "libempathy/empathy-irc-network-manager.h" +#include "empathy-utils.h" +#include "empathy-irc-network-manager.h" #include "empathy-ui-utils.h" #include "empathy-irc-network-chooser-dialog.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" #include "empathy-irc-network-chooser.h" diff --git a/libempathy-gtk/empathy-irc-network-chooser.h b/libempathy-gtk/empathy-irc-network-chooser.h index 23ecc92fe..f4c603288 100644 --- a/libempathy-gtk/empathy-irc-network-chooser.h +++ b/libempathy-gtk/empathy-irc-network-chooser.h @@ -24,8 +24,8 @@ #include -#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 a10b2ca3c..8e4339cf9 100644 --- a/libempathy-gtk/empathy-irc-network-dialog.c +++ b/libempathy-gtk/empathy-irc-network-dialog.c @@ -22,7 +22,7 @@ #include -#include "libempathy/empathy-utils.h" +#include "empathy-utils.h" #include "empathy-ui-utils.h" #include "totem-subtitle-encoding.h" diff --git a/libempathy-gtk/empathy-irc-network-dialog.h b/libempathy-gtk/empathy-irc-network-dialog.h index 547e3d668..a49c63da9 100644 --- a/libempathy-gtk/empathy-irc-network-dialog.h +++ b/libempathy-gtk/empathy-irc-network-dialog.h @@ -23,7 +23,7 @@ #include -#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 fe3661276..3047612b0 100644 --- a/libempathy-gtk/empathy-live-search.c +++ b/libempathy-gtk/empathy-live-search.c @@ -23,7 +23,7 @@ #include "config.h" -#include "libempathy/empathy-utils.h" +#include "empathy-utils.h" #include "empathy-live-search.h" diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c index de2b7ba0d..dea29762d 100644 --- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c +++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c @@ -23,13 +23,13 @@ #include -#include "libempathy/empathy-utils.h" +#include "empathy-utils.h" #include "empathy-account-widget.h" #include "empathy-ui-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-location-manager.c b/libempathy-gtk/empathy-location-manager.c index ab72fff7d..bb6dfa6da 100644 --- a/libempathy-gtk/empathy-location-manager.c +++ b/libempathy-gtk/empathy-location-manager.c @@ -25,12 +25,12 @@ #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-log-window.c b/libempathy-gtk/empathy-log-window.c index d49dd5587..1f091f62d 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -29,13 +29,13 @@ #include -#include "extensions/extensions.h" +#include "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 "action-chain-internal.h" +#include "empathy-camera-monitor.h" +#include "empathy-gsettings.h" +#include "empathy-request-util.h" +#include "empathy-utils.h" #include "empathy-log-window.h" #include "empathy-account-chooser.h" @@ -48,7 +48,7 @@ #include "empathy-geometry.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-new-account-dialog.c b/libempathy-gtk/empathy-new-account-dialog.c index e70f59887..09f41a4e8 100644 --- a/libempathy-gtk/empathy-new-account-dialog.c +++ b/libempathy-gtk/empathy-new-account-dialog.c @@ -23,7 +23,7 @@ #include #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" #include "empathy-account-widget.h" #include "empathy-protocol-chooser.h" diff --git a/libempathy-gtk/empathy-new-account-dialog.h b/libempathy-gtk/empathy-new-account-dialog.h index c68630d84..6a5d5c2d5 100644 --- a/libempathy-gtk/empathy-new-account-dialog.h +++ b/libempathy-gtk/empathy-new-account-dialog.h @@ -22,7 +22,7 @@ #include -#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 7a76750cd..61b3870de 100644 --- a/libempathy-gtk/empathy-new-call-dialog.c +++ b/libempathy-gtk/empathy-new-call-dialog.c @@ -22,11 +22,11 @@ #include -#include "libempathy/empathy-camera-monitor.h" -#include "libempathy/empathy-utils.h" +#include "empathy-camera-monitor.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" #include "empathy-contact-chooser.h" #include "empathy-ui-utils.h" diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c index 9aa641289..7308d1472 100644 --- a/libempathy-gtk/empathy-new-message-dialog.c +++ b/libempathy-gtk/empathy-new-message-dialog.c @@ -22,10 +22,10 @@ #include -#include "libempathy/empathy-request-util.h" +#include "empathy-request-util.h" #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" #include "empathy-contact-chooser.h" #include "empathy-ui-utils.h" diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c index aa5f0402e..b322ac7f9 100644 --- a/libempathy-gtk/empathy-notify-manager.c +++ b/libempathy-gtk/empathy-notify-manager.c @@ -21,13 +21,13 @@ #include -#include "libempathy/empathy-gsettings.h" -#include "libempathy/empathy-utils.h" +#include "empathy-gsettings.h" +#include "empathy-utils.h" #include "empathy-ui-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" #include "empathy-notify-manager.h" diff --git a/libempathy-gtk/empathy-notify-manager.h b/libempathy-gtk/empathy-notify-manager.h index b0100ccb7..ca8996f7d 100644 --- a/libempathy-gtk/empathy-notify-manager.h +++ b/libempathy-gtk/empathy-notify-manager.h @@ -23,7 +23,7 @@ #include -#include "libempathy/empathy-contact.h" +#include "empathy-contact.h" #include diff --git a/libempathy-gtk/empathy-password-dialog.c b/libempathy-gtk/empathy-password-dialog.c index 90550f4f2..e06a72495 100644 --- a/libempathy-gtk/empathy-password-dialog.c +++ b/libempathy-gtk/empathy-password-dialog.c @@ -24,7 +24,7 @@ #include #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 7511cbda3..9ae16b281 100644 --- a/libempathy-gtk/empathy-password-dialog.h +++ b/libempathy-gtk/empathy-password-dialog.h @@ -23,9 +23,9 @@ #include #include -#include "libempathy/empathy-server-sasl-handler.h" +#include "empathy-server-sasl-handler.h" -#include "libempathy-gtk/empathy-base-password-dialog.h" +#include "empathy-base-password-dialog.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c index cc9a48299..cf2dbdf77 100644 --- a/libempathy-gtk/empathy-presence-chooser.c +++ b/libempathy-gtk/empathy-presence-chooser.c @@ -28,12 +28,12 @@ #include -#include "libempathy/empathy-presence-manager.h" -#include "libempathy/empathy-utils.h" -#include "libempathy/empathy-status-presets.h" +#include "empathy-presence-manager.h" +#include "empathy-utils.h" +#include "empathy-status-presets.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 8b3a24731..4722462fe 100644 --- a/libempathy-gtk/empathy-protocol-chooser.c +++ b/libempathy-gtk/empathy-protocol-chooser.c @@ -24,14 +24,14 @@ #include -#include "libempathy/empathy-utils.h" -#include "libempathy/empathy-connection-managers.h" +#include "empathy-utils.h" +#include "empathy-connection-managers.h" #include "empathy-protocol-chooser.h" #include "empathy-ui-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 469f89f32..47e4592ed 100644 --- a/libempathy-gtk/empathy-protocol-chooser.h +++ b/libempathy-gtk/empathy-protocol-chooser.h @@ -28,7 +28,7 @@ #include -#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 f7c6f5550..a560f0953 100644 --- a/libempathy-gtk/empathy-roster-contact.c +++ b/libempathy-gtk/empathy-roster-contact.c @@ -4,7 +4,7 @@ #include "empathy-roster-contact.h" -#include "libempathy/empathy-utils.h" +#include "empathy-utils.h" #include "empathy-images.h" #include "empathy-ui-utils.h" diff --git a/libempathy-gtk/empathy-roster-model-manager.c b/libempathy-gtk/empathy-roster-model-manager.c index ff3ff5347..99c929006 100644 --- a/libempathy-gtk/empathy-roster-model-manager.c +++ b/libempathy-gtk/empathy-roster-model-manager.c @@ -29,7 +29,7 @@ #include -#include "libempathy/empathy-utils.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 5d5e12f0d..a38e6593a 100644 --- a/libempathy-gtk/empathy-roster-model-manager.h +++ b/libempathy-gtk/empathy-roster-model-manager.h @@ -23,7 +23,7 @@ #include -#include "libempathy/empathy-individual-manager.h" +#include "empathy-individual-manager.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-roster-view.c b/libempathy-gtk/empathy-roster-view.c index d9b3c7bf2..336f629c7 100644 --- a/libempathy-gtk/empathy-roster-view.c +++ b/libempathy-gtk/empathy-roster-view.c @@ -4,7 +4,7 @@ #include -#include "libempathy/empathy-contact-groups.h" +#include "empathy-contact-groups.h" #include "empathy-roster-contact.h" #include "empathy-roster-group.h" diff --git a/libempathy-gtk/empathy-roster-view.h b/libempathy-gtk/empathy-roster-view.h index 8a1b6d404..45e240844 100644 --- a/libempathy-gtk/empathy-roster-view.h +++ b/libempathy-gtk/empathy-roster-view.h @@ -2,10 +2,10 @@ #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 "egg-list-box/egg-list-box.h" +#include "empathy-live-search.h" -#include "libempathy-gtk/empathy-roster-model.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 558a125b4..cfb595c27 100644 --- a/libempathy-gtk/empathy-search-bar.c +++ b/libempathy-gtk/empathy-search-bar.c @@ -21,7 +21,7 @@ #include -#include "libempathy/empathy-utils.h" +#include "empathy-utils.h" #include "empathy-search-bar.h" #include "empathy-ui-utils.h" diff --git a/libempathy-gtk/empathy-share-my-desktop.c b/libempathy-gtk/empathy-share-my-desktop.c index 5a0737adc..78bf1472d 100644 --- a/libempathy-gtk/empathy-share-my-desktop.c +++ b/libempathy-gtk/empathy-share-my-desktop.c @@ -21,7 +21,7 @@ #include "config.h" #define DEBUG_FLAG EMPATHY_DEBUG_SHARE_DESKTOP -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" #include "empathy-share-my-desktop.h" diff --git a/libempathy-gtk/empathy-share-my-desktop.h b/libempathy-gtk/empathy-share-my-desktop.h index 4f11aa8af..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 494ae7f6a..77ea5b33d 100644 --- a/libempathy-gtk/empathy-smiley-manager.c +++ b/libempathy-gtk/empathy-smiley-manager.c @@ -22,7 +22,7 @@ #include "config.h" -#include "libempathy/empathy-utils.h" +#include "empathy-utils.h" #include "empathy-smiley-manager.h" #include "empathy-ui-utils.h" diff --git a/libempathy-gtk/empathy-sound-manager.c b/libempathy-gtk/empathy-sound-manager.c index 8bcca8bb1..a66e5f4cf 100644 --- a/libempathy-gtk/empathy-sound-manager.c +++ b/libempathy-gtk/empathy-sound-manager.c @@ -24,9 +24,9 @@ #include #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" +#include "empathy-gsettings.h" +#include "empathy-utils.h" typedef struct { EmpathySound sound_id; diff --git a/libempathy-gtk/empathy-spell.c b/libempathy-gtk/empathy-spell.c index 206edc192..409b41bd5 100644 --- a/libempathy-gtk/empathy-spell.c +++ b/libempathy-gtk/empathy-spell.c @@ -32,8 +32,8 @@ #include "empathy-spell.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include "libempathy/empathy-debug.h" -#include "libempathy/empathy-gsettings.h" +#include "empathy-debug.h" +#include "empathy-gsettings.h" #ifdef HAVE_ENCHANT diff --git a/libempathy-gtk/empathy-status-preset-dialog.c b/libempathy-gtk/empathy-status-preset-dialog.c index 6ba1e54d1..91c816076 100644 --- a/libempathy-gtk/empathy-status-preset-dialog.c +++ b/libempathy-gtk/empathy-status-preset-dialog.c @@ -38,11 +38,11 @@ #include -#include "libempathy/empathy-utils.h" -#include "libempathy/empathy-status-presets.h" +#include "empathy-utils.h" +#include "empathy-status-presets.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" #include "empathy-ui-utils.h" #include "empathy-status-preset-dialog.h" diff --git a/libempathy-gtk/empathy-subscription-dialog.c b/libempathy-gtk/empathy-subscription-dialog.c index 265ea13a2..9f8af521d 100644 --- a/libempathy-gtk/empathy-subscription-dialog.c +++ b/libempathy-gtk/empathy-subscription-dialog.c @@ -22,7 +22,7 @@ #include "empathy-subscription-dialog.h" -#include "libempathy/empathy-utils.h" +#include "empathy-utils.h" #include "empathy-individual-widget.h" #include diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c index 1762eabd6..851d7ad40 100644 --- a/libempathy-gtk/empathy-theme-adium.c +++ b/libempathy-gtk/empathy-theme-adium.c @@ -23,9 +23,9 @@ #include -#include "libempathy/empathy-gsettings.h" -#include "libempathy/empathy-time.h" -#include "libempathy/empathy-utils.h" +#include "empathy-gsettings.h" +#include "empathy-time.h" +#include "empathy-utils.h" #include "empathy-theme-adium.h" #include "empathy-smiley-manager.h" @@ -35,7 +35,7 @@ #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 dee5aef35..698d2846c 100644 --- a/libempathy-gtk/empathy-theme-adium.h +++ b/libempathy-gtk/empathy-theme-adium.h @@ -23,7 +23,7 @@ #include -#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 bb4d22966..461aca35b 100644 --- a/libempathy-gtk/empathy-theme-manager.c +++ b/libempathy-gtk/empathy-theme-manager.c @@ -26,12 +26,12 @@ #include -#include "libempathy/empathy-gsettings.h" +#include "empathy-gsettings.h" #include "empathy-theme-manager.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" struct _EmpathyThemeManagerPriv { diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c index 88f22d36d..ee4a943db 100644 --- a/libempathy-gtk/empathy-tls-dialog.c +++ b/libempathy-gtk/empathy-tls-dialog.c @@ -26,8 +26,8 @@ #include #define DEBUG_FLAG EMPATHY_DEBUG_TLS -#include "libempathy/empathy-debug.h" -#include "libempathy/empathy-utils.h" +#include "empathy-debug.h" +#include "empathy-utils.h" G_DEFINE_TYPE (EmpathyTLSDialog, empathy_tls_dialog, GTK_TYPE_MESSAGE_DIALOG) diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c index 2ae011429..1cadaf417 100644 --- a/libempathy-gtk/empathy-ui-utils.c +++ b/libempathy-gtk/empathy-ui-utils.c @@ -41,9 +41,9 @@ #include "empathy-live-search.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" +#include "empathy-utils.h" +#include "empathy-ft-factory.h" void empathy_gtk_init (void) diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h index 7c505c668..a7d86e0bb 100644 --- a/libempathy-gtk/empathy-ui-utils.h +++ b/libempathy-gtk/empathy-ui-utils.h @@ -36,8 +36,8 @@ #include -#include "libempathy/empathy-contact.h" -#include "libempathy/empathy-ft-handler.h" +#include "empathy-contact.h" +#include "empathy-ft-handler.h" G_BEGIN_DECLS diff --git a/libempathy-gtk/empathy-user-info.c b/libempathy-gtk/empathy-user-info.c index 4c447772b..0bbb57652 100644 --- a/libempathy-gtk/empathy-user-info.c +++ b/libempathy-gtk/empathy-user-info.c @@ -23,9 +23,9 @@ #include #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT -#include "libempathy/empathy-debug.h" -#include "libempathy/empathy-time.h" -#include "libempathy/empathy-utils.h" +#include "empathy-debug.h" +#include "empathy-time.h" +#include "empathy-utils.h" #include "empathy-avatar-chooser.h" #include "empathy-calendar-button.h" diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index 1cbd661c7..5f4059f20 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"\" \ @@ -199,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 "libempathy/@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_headers) ) > xgen-gth \ diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c index b2f2b802f..92a59dab2 100644 --- a/libempathy/empathy-auth-factory.c +++ b/libempathy/empathy-auth-factory.c @@ -38,7 +38,7 @@ #include "empathy-uoa-auth-handler.h" #endif /* HAVE_UOA */ -#include "extensions/extensions.h" +#include "extensions.h" G_DEFINE_TYPE (EmpathyAuthFactory, empathy_auth_factory, TP_TYPE_BASE_CLIENT); diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h index 48e895841..6701e568f 100644 --- a/libempathy/empathy-chatroom.h +++ b/libempathy/empathy-chatroom.h @@ -26,7 +26,7 @@ #include -#include "libempathy/empathy-tp-chat.h" +#include "empathy-tp-chat.h" G_BEGIN_DECLS diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c index 16aaa6bb1..b9b908ed7 100644 --- a/libempathy/empathy-server-sasl-handler.c +++ b/libempathy/empathy-server-sasl-handler.c @@ -21,7 +21,7 @@ #include "empathy-server-sasl-handler.h" -#include "extensions/extensions.h" +#include "extensions.h" #define DEBUG_FLAG EMPATHY_DEBUG_SASL #include "empathy-debug.h" diff --git a/libempathy/empathy-server-tls-handler.c b/libempathy/empathy-server-tls-handler.c index d58155f58..78be2f0a7 100644 --- a/libempathy/empathy-server-tls-handler.c +++ b/libempathy/empathy-server-tls-handler.c @@ -26,7 +26,7 @@ #include "empathy-debug.h" #include "empathy-utils.h" -#include "extensions/extensions.h" +#include "extensions.h" static void async_initable_iface_init (GAsyncInitableIface *iface); diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index b6fd9ce13..f62d1e5f0 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -37,7 +37,7 @@ #include "empathy-utils.h" #include "empathy-presence-manager.h" -#include "extensions/extensions.h" +#include "extensions.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER #include "empathy-debug.h" diff --git a/nautilus-sendto-plugin/Makefile.am b/nautilus-sendto-plugin/Makefile.am index 171ba2ed2..a28415cc1 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 fde281dd5..1ae728546 100644 --- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c +++ b/nautilus-sendto-plugin/empathy-nautilus-sendto.c @@ -29,17 +29,17 @@ #include -#include "libempathy/empathy-contact.h" -#include "libempathy/empathy-debug.h" -#include "libempathy/empathy-ft-factory.h" -#include "libempathy/empathy-ft-handler.h" - -#include "libempathy-gtk/empathy-roster-model.h" -#include "libempathy-gtk/empathy-roster-model-manager.h" -#include "libempathy-gtk/empathy-contact-chooser.h" -#include "libempathy-gtk/empathy-ui-utils.h" -#include "libempathy-gtk/empathy-roster-view.h" -#include "libempathy-gtk/empathy-roster-contact.h" +#include "empathy-contact.h" +#include "empathy-debug.h" +#include "empathy-ft-factory.h" +#include "empathy-ft-handler.h" + +#include "empathy-roster-model.h" +#include "empathy-roster-model-manager.h" +#include "empathy-contact-chooser.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 b52e9ad8f..0766d9580 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) \ diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c index fcd331aec..f84f28dba 100644 --- a/src/empathy-accounts-common.c +++ b/src/empathy-accounts-common.c @@ -26,13 +26,13 @@ #include "config.h" -#include "libempathy-gtk/empathy-ui-utils.h" +#include "empathy-ui-utils.h" #include "empathy-accounts-common.h" #include "empathy-accounts-dialog.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" gboolean empathy_accounts_has_non_salut_accounts (TpAccountManager *manager) diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index acfd9c290..421357c84 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -28,14 +28,14 @@ #include -#include "libempathy/empathy-utils.h" -#include "libempathy/empathy-pkg-kit.h" +#include "empathy-utils.h" +#include "empathy-pkg-kit.h" -#include "libempathy-gtk/empathy-ui-utils.h" -#include "libempathy-gtk/empathy-account-widget-sip.h" -#include "libempathy-gtk/empathy-user-info.h" -#include "libempathy-gtk/empathy-local-xmpp-assistant-widget.h" -#include "libempathy-gtk/empathy-new-account-dialog.h" +#include "empathy-ui-utils.h" +#include "empathy-account-widget-sip.h" +#include "empathy-user-info.h" +#include "empathy-local-xmpp-assistant-widget.h" +#include "empathy-new-account-dialog.h" #include "empathy-accounts-common.h" #include "empathy-accounts-dialog.h" @@ -43,7 +43,7 @@ #include "empathy-import-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" /* Flashing delay for icons (milliseconds). */ #define FLASH_TIMEOUT 500 diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c index 57f6968c8..0cf4c9572 100644 --- a/src/empathy-accounts.c +++ b/src/empathy-accounts.c @@ -32,13 +32,13 @@ #include #endif -#include "libempathy/empathy-utils.h" -#include "libempathy-gtk/empathy-ui-utils.h" +#include "empathy-utils.h" +#include "empathy-ui-utils.h" #include "empathy-accounts-common.h" #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT -#include "libempathy/empathy-debug.h" +#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 01bc80f53..0147b8706 100644 --- a/src/empathy-audio-sink.c +++ b/src/empathy-audio-sink.c @@ -30,7 +30,7 @@ #include "empathy-audio-sink.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" G_DEFINE_TYPE(EmpathyGstAudioSink, empathy_audio_sink, GST_TYPE_BIN) diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c index 2f919533e..bdb25f80c 100644 --- a/src/empathy-audio-src.c +++ b/src/empathy-audio-src.c @@ -26,14 +26,14 @@ #include #endif -#include "libempathy/empathy-utils.h" +#include "empathy-utils.h" #include "empathy-audio-utils.h" #include "empathy-audio-src.h" #include "empathy-mic-monitor.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" G_DEFINE_TYPE(EmpathyGstAudioSrc, empathy_audio_src, GST_TYPE_BIN) diff --git a/src/empathy-audio-utils.c b/src/empathy-audio-utils.c index 89202f541..e1f9ec56f 100644 --- a/src/empathy-audio-utils.c +++ b/src/empathy-audio-utils.c @@ -24,10 +24,10 @@ #include "empathy-audio-utils.h" -#include "libempathy/empathy-gsettings.h" +#include "empathy-gsettings.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include "libempathy/empathy-debug.h" +#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 3636142cc..6da465665 100644 --- a/src/empathy-auth-client.c +++ b/src/empathy-auth-client.c @@ -24,15 +24,15 @@ #include #define DEBUG_FLAG EMPATHY_DEBUG_TLS -#include "libempathy/empathy-debug.h" -#include "libempathy/empathy-auth-factory.h" -#include "libempathy/empathy-server-tls-handler.h" -#include "libempathy/empathy-tls-verifier.h" - -#include "libempathy-gtk/empathy-bad-password-dialog.h" -#include "libempathy-gtk/empathy-password-dialog.h" -#include "libempathy-gtk/empathy-tls-dialog.h" -#include "libempathy-gtk/empathy-ui-utils.h" +#include "empathy-debug.h" +#include "empathy-auth-factory.h" +#include "empathy-server-tls-handler.h" +#include "empathy-tls-verifier.h" + +#include "empathy-bad-password-dialog.h" +#include "empathy-password-dialog.h" +#include "empathy-tls-dialog.h" +#include "empathy-ui-utils.h" #include "empathy-sanity-cleaning.h" diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c index 42bd46f50..865aeace2 100644 --- a/src/empathy-call-factory.c +++ b/src/empathy-call-factory.c @@ -20,14 +20,14 @@ #include "config.h" -#include "libempathy/empathy-client-factory.h" -#include "libempathy/empathy-request-util.h" +#include "empathy-client-factory.h" +#include "empathy-request-util.h" #include "empathy-call-factory.h" #include "empathy-call-handler.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" G_DEFINE_TYPE(EmpathyCallFactory, empathy_call_factory, TP_TYPE_BASE_CLIENT) diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c index 88b166f1f..28e8cda83 100644 --- a/src/empathy-call-handler.c +++ b/src/empathy-call-handler.c @@ -22,14 +22,14 @@ #include -#include "libempathy/empathy-utils.h" +#include "empathy-utils.h" -#include "libempathy-gtk/empathy-call-utils.h" +#include "empathy-call-utils.h" #include "empathy-call-handler.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include "libempathy/empathy-debug.h" +#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 55e489782..0f42209c2 100644 --- a/src/empathy-call-handler.h +++ b/src/empathy-call-handler.h @@ -28,7 +28,7 @@ #include -#include "libempathy/empathy-contact.h" +#include "empathy-contact.h" G_BEGIN_DECLS diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c index c0aa04170..2a60f6fe2 100644 --- a/src/empathy-call-observer.c +++ b/src/empathy-call-observer.c @@ -22,13 +22,13 @@ #include -#include "libempathy-gtk/empathy-images.h" -#include "libempathy-gtk/empathy-notify-manager.h" +#include "empathy-images.h" +#include "empathy-notify-manager.h" #include "empathy-call-observer.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" struct _EmpathyCallObserverPriv { EmpathyNotifyManager *notify_mgr; diff --git a/src/empathy-call-window-fullscreen.c b/src/empathy-call-window-fullscreen.c index b678c0a42..6da478fbd 100644 --- a/src/empathy-call-window-fullscreen.c +++ b/src/empathy-call-window-fullscreen.c @@ -24,8 +24,8 @@ #include "empathy-call-window-fullscreen.h" -#include "libempathy/empathy-utils.h" -#include "libempathy-gtk/empathy-ui-utils.h" +#include "empathy-utils.h" +#include "empathy-ui-utils.h" /* The number of seconds for which the "leave fullscreen" popup should be shown */ diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 5a24fbcd3..9b67bba4a 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -27,20 +27,20 @@ #include #include -#include "libempathy/empathy-camera-monitor.h" -#include "libempathy/empathy-gsettings.h" -#include "libempathy/empathy-request-util.h" -#include "libempathy/empathy-utils.h" - -#include "libempathy-gtk/empathy-dialpad-widget.h" -#include "libempathy-gtk/empathy-ui-utils.h" -#include "libempathy-gtk/empathy-sound-manager.h" -#include "libempathy-gtk/empathy-geometry.h" -#include "libempathy-gtk/empathy-images.h" -#include "libempathy-gtk/empathy-call-utils.h" +#include "empathy-camera-monitor.h" +#include "empathy-gsettings.h" +#include "empathy-request-util.h" +#include "empathy-utils.h" + +#include "empathy-dialpad-widget.h" +#include "empathy-ui-utils.h" +#include "empathy-sound-manager.h" +#include "empathy-geometry.h" +#include "empathy-images.h" +#include "empathy-call-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" #include "empathy-call-window-fullscreen.h" #include "empathy-about-dialog.h" diff --git a/src/empathy-call.c b/src/empathy-call.c index 47e3f3a83..9fccb5650 100644 --- a/src/empathy-call.c +++ b/src/empathy-call.c @@ -31,13 +31,13 @@ #include #endif -#include "libempathy-gtk/empathy-ui-utils.h" +#include "empathy-ui-utils.h" #include "empathy-call-window.h" #include "empathy-call-factory.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include "libempathy/empathy-debug.h" +#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 2bfef6cb7..0674e7076 100644 --- a/src/empathy-camera-menu.c +++ b/src/empathy-camera-menu.c @@ -21,13 +21,13 @@ #include "config.h" -#include "libempathy/empathy-camera-monitor.h" -#include "libempathy/empathy-gsettings.h" +#include "empathy-camera-monitor.h" +#include "empathy-gsettings.h" #include "empathy-camera-menu.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" struct _EmpathyCameraMenuPrivate { diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c index 50292fbd7..bc64cefc8 100644 --- a/src/empathy-chat-manager.c +++ b/src/empathy-chat-manager.c @@ -21,20 +21,20 @@ #include -#include "libempathy/empathy-chatroom-manager.h" -#include "libempathy/empathy-request-util.h" -#include "libempathy/empathy-individual-manager.h" +#include "empathy-chatroom-manager.h" +#include "empathy-request-util.h" +#include "empathy-individual-manager.h" -#include "libempathy-gtk/empathy-ui-utils.h" +#include "empathy-ui-utils.h" #include "empathy-chat-window.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" #include "empathy-chat-manager.h" -#include "extensions/extensions.h" +#include "extensions.h" enum { CLOSED_CHATS_CHANGED, diff --git a/src/empathy-chat-manager.h b/src/empathy-chat-manager.h index 5082e7337..ab3817ea9 100644 --- a/src/empathy-chat-manager.h +++ b/src/empathy-chat-manager.h @@ -22,7 +22,7 @@ #include -#include "libempathy-gtk/empathy-chat.h" +#include "empathy-chat.h" G_BEGIN_DECLS diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c index 59814bdf4..47f588f08 100644 --- a/src/empathy-chat-window.c +++ b/src/empathy-chat-window.c @@ -30,19 +30,19 @@ #include #include -#include "libempathy/empathy-client-factory.h" -#include "libempathy/empathy-chatroom-manager.h" -#include "libempathy/empathy-gsettings.h" -#include "libempathy/empathy-utils.h" -#include "libempathy/empathy-request-util.h" -#include "libempathy/empathy-individual-manager.h" - -#include "libempathy-gtk/empathy-images.h" -#include "libempathy-gtk/empathy-geometry.h" -#include "libempathy-gtk/empathy-smiley-manager.h" -#include "libempathy-gtk/empathy-sound-manager.h" -#include "libempathy-gtk/empathy-ui-utils.h" -#include "libempathy-gtk/empathy-notify-manager.h" +#include "empathy-client-factory.h" +#include "empathy-chatroom-manager.h" +#include "empathy-gsettings.h" +#include "empathy-utils.h" +#include "empathy-request-util.h" +#include "empathy-individual-manager.h" + +#include "empathy-images.h" +#include "empathy-geometry.h" +#include "empathy-smiley-manager.h" +#include "empathy-sound-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-notify-manager.h" #include "empathy-chat-manager.h" #include "empathy-chat-window.h" @@ -50,7 +50,7 @@ #include "empathy-invite-participant-dialog.h" #define DEBUG_FLAG EMPATHY_DEBUG_CHAT -#include "libempathy/empathy-debug.h" +#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 62f49988f..cfd82a128 100644 --- a/src/empathy-chat-window.h +++ b/src/empathy-chat-window.h @@ -32,7 +32,7 @@ #include -#include "libempathy-gtk/empathy-chat.h" +#include "empathy-chat.h" G_BEGIN_DECLS diff --git a/src/empathy-chat.c b/src/empathy-chat.c index 1af26b230..9919b6edd 100644 --- a/src/empathy-chat.c +++ b/src/empathy-chat.c @@ -26,16 +26,16 @@ #include -#include "libempathy/empathy-presence-manager.h" +#include "empathy-presence-manager.h" -#include "libempathy-gtk/empathy-theme-manager.h" -#include "libempathy-gtk/empathy-ui-utils.h" +#include "empathy-theme-manager.h" +#include "empathy-ui-utils.h" #include "empathy-chat-manager.h" #include "empathy-chat-resources.h" #define DEBUG_FLAG EMPATHY_DEBUG_CHAT -#include "libempathy/empathy-debug.h" +#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 83f6b99d7..ff45bed9c 100644 --- a/src/empathy-chatrooms-window.c +++ b/src/empathy-chatrooms-window.c @@ -27,11 +27,11 @@ #include -#include "libempathy/empathy-chatroom-manager.h" -#include "libempathy/empathy-utils.h" +#include "empathy-chatroom-manager.h" +#include "empathy-utils.h" -#include "libempathy-gtk/empathy-account-chooser.h" -#include "libempathy-gtk/empathy-ui-utils.h" +#include "empathy-account-chooser.h" +#include "empathy-ui-utils.h" #include "empathy-chatrooms-window.h" diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c index c5514b73a..546e17406 100644 --- a/src/empathy-debug-window.c +++ b/src/empathy-debug-window.c @@ -25,11 +25,11 @@ #include #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include "libempathy/empathy-debug.h" -#include "libempathy/empathy-utils.h" +#include "empathy-debug.h" +#include "empathy-utils.h" -#include "libempathy-gtk/empathy-geometry.h" -#include "libempathy-gtk/empathy-ui-utils.h" +#include "empathy-geometry.h" +#include "empathy-ui-utils.h" #include "empathy-debug-window.h" diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c index cb17e3c71..ca348f3cd 100644 --- a/src/empathy-debugger.c +++ b/src/empathy-debugger.c @@ -21,7 +21,7 @@ #include -#include "libempathy-gtk/empathy-ui-utils.h" +#include "empathy-ui-utils.h" #include "empathy-debug-window.h" diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index f95e76baf..c0b802d3b 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -23,23 +23,23 @@ #include -#include "libempathy/empathy-presence-manager.h" -#include "libempathy/empathy-connection-aggregator.h" -#include "libempathy/empathy-tp-chat.h" -#include "libempathy/empathy-utils.h" -#include "libempathy/empathy-gsettings.h" -#include "libempathy/empathy-sasl-mechanisms.h" - -#include "libempathy-gtk/empathy-images.h" -#include "libempathy-gtk/empathy-sound-manager.h" -#include "libempathy-gtk/empathy-ui-utils.h" -#include "libempathy-gtk/empathy-call-utils.h" -#include "libempathy-gtk/empathy-subscription-dialog.h" +#include "empathy-presence-manager.h" +#include "empathy-connection-aggregator.h" +#include "empathy-tp-chat.h" +#include "empathy-utils.h" +#include "empathy-gsettings.h" +#include "empathy-sasl-mechanisms.h" + +#include "empathy-images.h" +#include "empathy-sound-manager.h" +#include "empathy-ui-utils.h" +#include "empathy-call-utils.h" +#include "empathy-subscription-dialog.h" #include "empathy-event-manager.h" #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER -#include "libempathy/empathy-debug.h" +#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 ee5daf404..511a5ed57 100644 --- a/src/empathy-event-manager.h +++ b/src/empathy-event-manager.h @@ -25,7 +25,7 @@ #include #include -#include "libempathy/empathy-contact.h" +#include "empathy-contact.h" G_BEGIN_DECLS diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c index 3cf874420..9098250bf 100644 --- a/src/empathy-ft-manager.c +++ b/src/empathy-ft-manager.c @@ -32,11 +32,11 @@ #include #define DEBUG_FLAG EMPATHY_DEBUG_FT -#include "libempathy/empathy-debug.h" -#include "libempathy/empathy-utils.h" +#include "empathy-debug.h" +#include "empathy-utils.h" -#include "libempathy-gtk/empathy-ui-utils.h" -#include "libempathy-gtk/empathy-geometry.h" +#include "empathy-ui-utils.h" +#include "empathy-geometry.h" #include "empathy-ft-manager.h" diff --git a/src/empathy-ft-manager.h b/src/empathy-ft-manager.h index 8d81c7661..22d47a76f 100644 --- a/src/empathy-ft-manager.h +++ b/src/empathy-ft-manager.h @@ -29,7 +29,7 @@ #include #include -#include "libempathy/empathy-ft-handler.h" +#include "empathy-ft-handler.h" G_BEGIN_DECLS diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c index 33c408444..ea1ce1841 100644 --- a/src/empathy-import-dialog.c +++ b/src/empathy-import-dialog.c @@ -28,8 +28,8 @@ #include "empathy-import-widget.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include "libempathy/empathy-debug.h" -#include "libempathy/empathy-utils.h" +#include "empathy-debug.h" +#include "empathy-utils.h" enum { PROP_PARENT = 1, diff --git a/src/empathy-import-dialog.h b/src/empathy-import-dialog.h index a074d7a7f..87f1198f1 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 "libempathy/empathy-connection-managers.h" +#include "empathy-connection-managers.h" G_BEGIN_DECLS diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c index 394caede4..22116648d 100644 --- a/src/empathy-import-pidgin.c +++ b/src/empathy-import-pidgin.c @@ -28,8 +28,8 @@ #include "empathy-import-pidgin.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include "libempathy/empathy-debug.h" -#include "libempathy/empathy-utils.h" +#include "empathy-debug.h" +#include "empathy-utils.h" /* Pidgin to CM map */ typedef struct diff --git a/src/empathy-import-utils.c b/src/empathy-import-utils.c index 768d493fe..718c7d1e1 100644 --- a/src/empathy-import-utils.c +++ b/src/empathy-import-utils.c @@ -19,8 +19,8 @@ * Cosimo Cecchi */ -#include "libempathy/empathy-connection-managers.h" -#include "libempathy/empathy-utils.h" +#include "empathy-connection-managers.h" +#include "empathy-utils.h" #include "empathy-import-utils.h" #include "empathy-import-pidgin.h" diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c index 938a8f126..68a71d5ff 100644 --- a/src/empathy-import-widget.c +++ b/src/empathy-import-widget.c @@ -28,10 +28,10 @@ #include "empathy-import-widget.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include "libempathy/empathy-debug.h" -#include "libempathy/empathy-utils.h" +#include "empathy-debug.h" +#include "empathy-utils.h" -#include "libempathy-gtk/empathy-ui-utils.h" +#include "empathy-ui-utils.h" #include diff --git a/src/empathy-import-widget.h b/src/empathy-import-widget.h index f3e552cd2..225350e6e 100644 --- a/src/empathy-import-widget.h +++ b/src/empathy-import-widget.h @@ -27,7 +27,7 @@ #include -#include "libempathy/empathy-connection-managers.h" +#include "empathy-connection-managers.h" #include "empathy-import-utils.h" diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c index 783c83240..f78052f8c 100644 --- a/src/empathy-invite-participant-dialog.c +++ b/src/empathy-invite-participant-dialog.c @@ -15,9 +15,9 @@ #include "empathy-invite-participant-dialog.h" -#include "libempathy/empathy-utils.h" +#include "empathy-utils.h" -#include "libempathy-gtk/empathy-contact-chooser.h" +#include "empathy-contact-chooser.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 7946fa001..da121a49e 100644 --- a/src/empathy-invite-participant-dialog.h +++ b/src/empathy-invite-participant-dialog.h @@ -16,7 +16,7 @@ #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 da7f800f4..0c6ed23a9 100644 --- a/src/empathy-mic-menu.c +++ b/src/empathy-mic-menu.c @@ -25,7 +25,7 @@ #include "empathy-mic-monitor.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" struct _EmpathyMicMenuPrivate { diff --git a/src/empathy-mic-monitor.c b/src/empathy-mic-monitor.c index ef5b93d0d..afc526ffa 100644 --- a/src/empathy-mic-monitor.c +++ b/src/empathy-mic-monitor.c @@ -24,10 +24,10 @@ #include "empathy-mic-monitor.h" -#include "libempathy/empathy-utils.h" +#include "empathy-utils.h" #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" enum { diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c index a255bbcab..cca729df9 100644 --- a/src/empathy-new-chatroom-dialog.c +++ b/src/empathy-new-chatroom-dialog.c @@ -25,17 +25,17 @@ #include -#include "libempathy/empathy-utils.h" -#include "libempathy/empathy-request-util.h" -#include "libempathy/empathy-gsettings.h" +#include "empathy-utils.h" +#include "empathy-request-util.h" +#include "empathy-gsettings.h" -#include "libempathy-gtk/empathy-account-chooser.h" -#include "libempathy-gtk/empathy-ui-utils.h" +#include "empathy-account-chooser.h" +#include "empathy-ui-utils.h" #include "empathy-new-chatroom-dialog.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" G_DEFINE_TYPE (EmpathyNewChatroomDialog, empathy_new_chatroom_dialog, GTK_TYPE_DIALOG) diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c index b4f77eebb..7e06da1b7 100644 --- a/src/empathy-notifications-approver.c +++ b/src/empathy-notifications-approver.c @@ -21,13 +21,13 @@ #include -#include "libempathy-gtk/empathy-notify-manager.h" -#include "libempathy-gtk/empathy-call-utils.h" +#include "empathy-notify-manager.h" +#include "empathy-call-utils.h" #include "empathy-event-manager.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" #include "empathy-notifications-approver.h" diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c index 73d2dcc10..735ba2175 100644 --- a/src/empathy-preferences.c +++ b/src/empathy-preferences.c @@ -27,18 +27,18 @@ #include -#include "libempathy/empathy-client-factory.h" -#include "libempathy/empathy-gsettings.h" -#include "libempathy/empathy-utils.h" +#include "empathy-client-factory.h" +#include "empathy-gsettings.h" +#include "empathy-utils.h" -#include "libempathy-gtk/empathy-ui-utils.h" -#include "libempathy-gtk/empathy-theme-manager.h" -#include "libempathy-gtk/empathy-spell.h" +#include "empathy-ui-utils.h" +#include "empathy-theme-manager.h" +#include "empathy-spell.h" #include "empathy-preferences.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include "libempathy/empathy-debug.h" +#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 155009022..2f64d877c 100644 --- a/src/empathy-roster-window.c +++ b/src/empathy-roster-window.c @@ -26,26 +26,26 @@ #include #include -#include "libempathy/empathy-utils.h" -#include "libempathy/empathy-request-util.h" -#include "libempathy/empathy-chatroom-manager.h" -#include "libempathy/empathy-gsettings.h" -#include "libempathy/empathy-gsettings.h" -#include "libempathy/empathy-status-presets.h" -#include "libempathy/empathy-presence-manager.h" - -#include "libempathy-gtk/empathy-contact-blocking-dialog.h" -#include "libempathy-gtk/empathy-contact-search-dialog.h" -#include "libempathy-gtk/empathy-geometry.h" -#include "libempathy-gtk/empathy-gtk-enum-types.h" -#include "libempathy-gtk/empathy-individual-dialogs.h" -#include "libempathy-gtk/empathy-roster-model-manager.h" -#include "libempathy-gtk/empathy-roster-view.h" -#include "libempathy-gtk/empathy-new-message-dialog.h" -#include "libempathy-gtk/empathy-new-call-dialog.h" -#include "libempathy-gtk/empathy-log-window.h" -#include "libempathy-gtk/empathy-presence-chooser.h" -#include "libempathy-gtk/empathy-ui-utils.h" +#include "empathy-utils.h" +#include "empathy-request-util.h" +#include "empathy-chatroom-manager.h" +#include "empathy-gsettings.h" +#include "empathy-gsettings.h" +#include "empathy-status-presets.h" +#include "empathy-presence-manager.h" + +#include "empathy-contact-blocking-dialog.h" +#include "empathy-contact-search-dialog.h" +#include "empathy-geometry.h" +#include "empathy-gtk-enum-types.h" +#include "empathy-individual-dialogs.h" +#include "empathy-roster-model-manager.h" +#include "empathy-roster-view.h" +#include "empathy-new-message-dialog.h" +#include "empathy-new-call-dialog.h" +#include "empathy-log-window.h" +#include "empathy-presence-chooser.h" +#include "empathy-ui-utils.h" #include "empathy-accounts-dialog.h" #include "empathy-call-observer.h" @@ -59,7 +59,7 @@ #include "empathy-ft-manager.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" /* Flashing delay for icons (milliseconds). */ #define FLASH_TIMEOUT 500 diff --git a/src/empathy-sanity-cleaning.c b/src/empathy-sanity-cleaning.c index 8e2234fe1..025c9b841 100644 --- a/src/empathy-sanity-cleaning.c +++ b/src/empathy-sanity-cleaning.c @@ -25,13 +25,13 @@ #include "empathy-sanity-cleaning.h" -#include "libempathy/empathy-gsettings.h" +#include "empathy-gsettings.h" -#include "libempathy-gtk/empathy-theme-manager.h" +#include "empathy-theme-manager.h" #ifdef HAVE_UOA -#include "libempathy/empathy-pkg-kit.h" -#include "libempathy/empathy-uoa-utils.h" +#include "empathy-pkg-kit.h" +#include "empathy-uoa-utils.h" #include #include @@ -39,7 +39,7 @@ #endif #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" /* * This number has to be increased each time a new task is added or modified. diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c index eef1f48a4..b40ebed7b 100644 --- a/src/empathy-status-icon.c +++ b/src/empathy-status-icon.c @@ -21,19 +21,19 @@ #include "config.h" -#include "libempathy/empathy-gsettings.h" -#include "libempathy/empathy-utils.h" +#include "empathy-gsettings.h" +#include "empathy-utils.h" -#include "libempathy-gtk/empathy-presence-chooser.h" -#include "libempathy-gtk/empathy-ui-utils.h" -#include "libempathy-gtk/empathy-new-message-dialog.h" -#include "libempathy-gtk/empathy-new-call-dialog.h" +#include "empathy-presence-chooser.h" +#include "empathy-ui-utils.h" +#include "empathy-new-message-dialog.h" +#include "empathy-new-call-dialog.h" #include "empathy-status-icon.h" #include "empathy-event-manager.h" #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" /* Number of ms to wait when blinking */ #define BLINK_TIMEOUT 500 diff --git a/src/empathy-video-src.c b/src/empathy-video-src.c index b81960230..b3b84d3e7 100644 --- a/src/empathy-video-src.c +++ b/src/empathy-video-src.c @@ -27,7 +27,7 @@ #endif #define DEBUG_FLAG EMPATHY_DEBUG_VOIP -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" #include "empathy-video-src.h" diff --git a/src/empathy.c b/src/empathy.c index 622dec61d..610150bbd 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -30,17 +30,17 @@ #include -#include "libempathy/empathy-client-factory.h" -#include "libempathy/empathy-connection-aggregator.h" -#include "libempathy/empathy-presence-manager.h" -#include "libempathy/empathy-utils.h" -#include "libempathy/empathy-chatroom-manager.h" -#include "libempathy/empathy-request-util.h" -#include "libempathy/empathy-ft-factory.h" -#include "libempathy/empathy-gsettings.h" - -#include "libempathy-gtk/empathy-ui-utils.h" -#include "libempathy-gtk/empathy-location-manager.h" +#include "empathy-client-factory.h" +#include "empathy-connection-aggregator.h" +#include "empathy-presence-manager.h" +#include "empathy-utils.h" +#include "empathy-chatroom-manager.h" +#include "empathy-request-util.h" +#include "empathy-ft-factory.h" +#include "empathy-gsettings.h" + +#include "empathy-ui-utils.h" +#include "empathy-location-manager.h" #include "empathy-roster-window.h" #include "empathy-accounts-common.h" @@ -50,7 +50,7 @@ #include "empathy-notifications-approver.h" #define DEBUG_FLAG EMPATHY_DEBUG_OTHER -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" #define EMPATHY_DBUS_NAME "org.gnome.Empathy" diff --git a/tests/Makefile.am b/tests/Makefile.am index fdd67482a..67fe5d895 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 d3b0e7a43..e6e825835 100644 --- a/tests/empathy-chatroom-manager-test.c +++ b/tests/empathy-chatroom-manager-test.c @@ -5,7 +5,7 @@ #include -#include "libempathy/empathy-chatroom-manager.h" +#include "empathy-chatroom-manager.h" #include "test-helper.h" diff --git a/tests/empathy-chatroom-test.c b/tests/empathy-chatroom-test.c index 38ea4a146..4a0f655e3 100644 --- a/tests/empathy-chatroom-test.c +++ b/tests/empathy-chatroom-test.c @@ -4,7 +4,7 @@ #include "test-helper.h" -#include "libempathy/empathy-chatroom.h" +#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 3bef1fe43..9a3c46afe 100644 --- a/tests/empathy-irc-network-manager-test.c +++ b/tests/empathy-irc-network-manager-test.c @@ -6,7 +6,7 @@ #include "test-irc-helper.h" #include "test-helper.h" -#include "libempathy/empathy-irc-network-manager.h" +#include "empathy-irc-network-manager.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 8e9e86bc5..d22e04f05 100644 --- a/tests/empathy-irc-network-test.c +++ b/tests/empathy-irc-network-test.c @@ -5,7 +5,7 @@ #include "test-irc-helper.h" #include "test-helper.h" -#include "libempathy/empathy-irc-network.h" +#include "empathy-irc-network.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 f959aad30..291a34de1 100644 --- a/tests/empathy-irc-server-test.c +++ b/tests/empathy-irc-server-test.c @@ -5,7 +5,7 @@ #include "test-irc-helper.h" #include "test-helper.h" -#include "libempathy/empathy-irc-server.h" +#include "empathy-irc-server.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 4428e3c32..0934fe4c7 100644 --- a/tests/empathy-live-search-test.c +++ b/tests/empathy-live-search-test.c @@ -7,9 +7,9 @@ #include "test-helper.h" #define DEBUG_FLAG EMPATHY_DEBUG_TESTS -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" -#include "libempathy-gtk/empathy-live-search.h" +#include "empathy-live-search.h" typedef struct { diff --git a/tests/empathy-parser-test.c b/tests/empathy-parser-test.c index e9983c7f8..24cd5d676 100644 --- a/tests/empathy-parser-test.c +++ b/tests/empathy-parser-test.c @@ -9,9 +9,9 @@ #include #define DEBUG_FLAG EMPATHY_DEBUG_TESTS -#include "libempathy/empathy-debug.h" +#include "empathy-debug.h" -#include "libempathy-gtk/empathy-string-parser.h" +#include "empathy-string-parser.h" static void test_replace_match (const gchar *text, diff --git a/tests/empathy-tls-test.c b/tests/empathy-tls-test.c index efcafcec1..03cc9d7a8 100644 --- a/tests/empathy-tls-test.c +++ b/tests/empathy-tls-test.c @@ -2,7 +2,7 @@ #include #include -#include "libempathy/empathy-tls-verifier.h" +#include "empathy-tls-verifier.h" #include "test-helper.h" #include "mock-pkcs11.h" diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am index 27fdbf7e4..4ca1989ee 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 96f590a69..4a440f9ed 100644 --- a/tests/interactive/empathy-logs.c +++ b/tests/interactive/empathy-logs.c @@ -24,10 +24,10 @@ #include #include -#include "libempathy/empathy-debug.h" -#include "libempathy/empathy-utils.h" -#include "libempathy-gtk/empathy-log-window.h" -#include "libempathy-gtk/empathy-ui-utils.h" +#include "empathy-debug.h" +#include "empathy-utils.h" +#include "empathy-log-window.h" +#include "empathy-ui-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 7324cbea3..8a4d08fcf 100644 --- a/tests/interactive/test-empathy-account-chooser.c +++ b/tests/interactive/test-empathy-account-chooser.c @@ -2,8 +2,8 @@ #include -#include "libempathy-gtk/empathy-ui-utils.h" -#include "libempathy-gtk/empathy-account-chooser.h" +#include "empathy-ui-utils.h" +#include "empathy-account-chooser.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 7fe056698..81241090f 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 "libempathy-gtk/empathy-calendar-button.h" +#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 87d50f8e4..d4a76933d 100644 --- a/tests/interactive/test-empathy-contact-blocking-dialog.c +++ b/tests/interactive/test-empathy-contact-blocking-dialog.c @@ -23,10 +23,10 @@ #include -#include "libempathy/empathy-client-factory.h" +#include "empathy-client-factory.h" -#include "libempathy-gtk/empathy-ui-utils.h" -#include "libempathy-gtk/empathy-contact-blocking-dialog.h" +#include "empathy-ui-utils.h" +#include "empathy-contact-blocking-dialog.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 30fe4aa80..d7c54a647 100644 --- a/tests/interactive/test-empathy-dual-roster-view.c +++ b/tests/interactive/test-empathy-dual-roster-view.c @@ -1,10 +1,10 @@ #include -#include "libempathy-gtk/empathy-roster-model.h" -#include "libempathy-gtk/empathy-roster-model-manager.h" +#include "empathy-roster-model.h" +#include "empathy-roster-model-manager.h" -#include "libempathy-gtk/empathy-roster-view.h" -#include "libempathy-gtk/empathy-ui-utils.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 39ad1f7b4..5710fb146 100644 --- a/tests/interactive/test-empathy-presence-chooser.c +++ b/tests/interactive/test-empathy-presence-chooser.c @@ -24,10 +24,10 @@ #include -#include "libempathy/empathy-status-presets.h" +#include "empathy-status-presets.h" -#include "libempathy-gtk/empathy-ui-utils.h" -#include "libempathy-gtk/empathy-presence-chooser.h" +#include "empathy-ui-utils.h" +#include "empathy-presence-chooser.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 3e3767a98..f91cb1203 100644 --- a/tests/interactive/test-empathy-protocol-chooser.c +++ b/tests/interactive/test-empathy-protocol-chooser.c @@ -2,8 +2,8 @@ #include -#include "libempathy-gtk/empathy-ui-utils.h" -#include "libempathy-gtk/empathy-protocol-chooser.h" +#include "empathy-ui-utils.h" +#include "empathy-protocol-chooser.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 3bbf9e3b3..bb3195022 100644 --- a/tests/interactive/test-empathy-roster-model-aggregator.c +++ b/tests/interactive/test-empathy-roster-model-aggregator.c @@ -1,10 +1,10 @@ #include -#include "libempathy-gtk/empathy-roster-model.h" -#include "libempathy-gtk/empathy-roster-model-aggregator.h" +#include "empathy-roster-model.h" +#include "empathy-roster-model-aggregator.h" -#include "libempathy-gtk/empathy-roster-view.h" -#include "libempathy-gtk/empathy-ui-utils.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 0c95c445b..ff5de0fdc 100644 --- a/tests/interactive/test-empathy-roster-view.c +++ b/tests/interactive/test-empathy-roster-view.c @@ -1,10 +1,10 @@ #include -#include "libempathy-gtk/empathy-roster-model.h" -#include "libempathy-gtk/empathy-roster-model-manager.h" +#include "empathy-roster-model.h" +#include "empathy-roster-model-manager.h" -#include "libempathy-gtk/empathy-roster-view.h" -#include "libempathy-gtk/empathy-ui-utils.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 50c6d115c..db9cd361d 100644 --- a/tests/interactive/test-empathy-status-preset-dialog.c +++ b/tests/interactive/test-empathy-status-preset-dialog.c @@ -26,10 +26,10 @@ #include -#include "libempathy/empathy-status-presets.h" +#include "empathy-status-presets.h" -#include "libempathy-gtk/empathy-ui-utils.h" -#include "libempathy-gtk/empathy-status-preset-dialog.h" +#include "empathy-ui-utils.h" +#include "empathy-status-preset-dialog.h" int main (int argc, char **argv) diff --git a/tests/test-helper.c b/tests/test-helper.c index d0ff34636..f6fc0ffda 100644 --- a/tests/test-helper.c +++ b/tests/test-helper.c @@ -22,7 +22,7 @@ #include #include -#include "libempathy-gtk/empathy-ui-utils.h" +#include "empathy-ui-utils.h" #include "test-helper.h" diff --git a/tests/test-irc-helper.h b/tests/test-irc-helper.h index ac51d434b..04271715b 100644 --- a/tests/test-irc-helper.h +++ b/tests/test-irc-helper.h @@ -1,9 +1,9 @@ #include #include -#include "libempathy/empathy-irc-server.h" -#include "libempathy/empathy-irc-network.h" -#include "libempathy/empathy-irc-network-manager.h" +#include "empathy-irc-server.h" +#include "empathy-irc-network.h" +#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 f76c2fa53..1271f6ec3 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 9c2da5af4..d6713f286 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 "libempathy-gtk/empathy-account-widget.h" +#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.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c index f49d0fc83..1f322ec52 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 "libempathy/empathy-client-factory.h" -#include "libempathy/empathy-uoa-utils.h" +#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 7e1a5f206..6895a04d5 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 "libempathy/empathy-contact.h" -#include "libempathy-gtk/empathy-user-info.h" +#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.c b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c index 5bbf53db5..c22c6d59b 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 "libempathy/empathy-client-factory.h" +#include "empathy-client-factory.h" #include "empathy-app-plugin-widget.h" -- cgit v1.2.3