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 --- src/empathy-chat-window.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/empathy-chat-window.c') 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 */ -- cgit v1.2.3