aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy.c
diff options
context:
space:
mode:
authorEmanuele Aina <emanuele.aina@collabora.com>2013-03-28 19:32:45 +0800
committerEmanuele Aina <emanuele.aina@collabora.com>2013-04-01 18:23:44 +0800
commit15460fa9ae4e6a19e8b6e971014deb50746d90ee (patch)
tree18db9db5b9ea32420080dcc8b8332f4998f9d365 /src/empathy.c
parent5c440c4e08f8102a9b73244697e69ad4855dbdef (diff)
downloadgsoc2013-empathy-15460fa9ae4e6a19e8b6e971014deb50746d90ee.tar.gz
gsoc2013-empathy-15460fa9ae4e6a19e8b6e971014deb50746d90ee.tar.zst
gsoc2013-empathy-15460fa9ae4e6a19e8b6e971014deb50746d90ee.zip
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
Diffstat (limited to 'src/empathy.c')
-rw-r--r--src/empathy.c24
1 files changed, 12 insertions, 12 deletions
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 <libnotify/notify.h>
-#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"