Avoid include path overspecifications

If we're under the libempathy directory there's no need to prefix
include file paths with it, and the same is true for libempathy-gtk.

https://bugzilla.gnome.org/show_bug.cgi?id=696950

17 files changed, 33 insertions, 33 deletions

diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.c b/libempathy-gtk/empathy-contact-blocking-dialog.c
index 022e05ba1..60ab43671 100644
--- a/libempathy-gtk/empathy-contact-blocking-dialog.c
+++ b/libempathy-gtk/empathy-contact-blocking-dialog.c
@@ -27,8 +27,8 @@
 
 #include "libempathy/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-contact-blocking-dialog.h"
 
diff --git a/libempathy-gtk/empathy-contact-chooser.c b/libempathy-gtk/empathy-contact-chooser.c
index 92922a229..701ba66d0 100644
--- a/libempathy-gtk/empathy-contact-chooser.c
+++ b/libempathy-gtk/empathy-contact-chooser.c
@@ -16,9 +16,9 @@
 #include "libempathy/empathy-utils.h"
 #include "libempathy/empathy-client-factory.h"
 
-#include "libempathy-gtk/empathy-individual-store-manager.h"
-#include "libempathy-gtk/empathy-individual-view.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-individual-store-manager.h"
+#include "empathy-individual-view.h"
+#include "empathy-ui-utils.h"
 
 G_DEFINE_TYPE (EmpathyContactChooser,
     empathy_contact_chooser, GTK_TYPE_BOX);
diff --git a/libempathy-gtk/empathy-contact-search-dialog.c b/libempathy-gtk/empathy-contact-search-dialog.c
index 70bafb989..b563622c3 100644
--- a/libempathy-gtk/empathy-contact-search-dialog.c
+++ b/libempathy-gtk/empathy-contact-search-dialog.c
@@ -29,11 +29,11 @@
 #include "libempathy/empathy-utils.h"
 #include "libempathy/empathy-client-factory.h"
 
-#include "libempathy-gtk/empathy-account-chooser.h"
-#include "libempathy-gtk/empathy-cell-renderer-text.h"
-#include "libempathy-gtk/empathy-cell-renderer-activatable.h"
-#include "libempathy-gtk/empathy-individual-information-dialog.h"
-#include "libempathy-gtk/empathy-images.h"
+#include "empathy-account-chooser.h"
+#include "empathy-cell-renderer-text.h"
+#include "empathy-cell-renderer-activatable.h"
+#include "empathy-individual-information-dialog.h"
+#include "empathy-images.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "libempathy/empathy-debug.h"
diff --git a/libempathy-gtk/empathy-dialpad-widget.c b/libempathy-gtk/empathy-dialpad-widget.c
index 6509e13ba..340d6fc07 100644
--- a/libempathy-gtk/empathy-dialpad-widget.c
+++ b/libempathy-gtk/empathy-dialpad-widget.c
@@ -23,7 +23,7 @@
 
 #include "empathy-dialpad-widget.h"
 
-#include "libempathy-gtk/empathy-dialpad-button.h"
+#include "empathy-dialpad-button.h"
 
 G_DEFINE_TYPE (EmpathyDialpadWidget, empathy_dialpad_widget, GTK_TYPE_BOX);
 
diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
index afb5057d4..de2b7ba0d 100644
--- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
+++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
@@ -25,8 +25,8 @@
 
 #include "libempathy/empathy-utils.h"
 
-#include "libempathy-gtk/empathy-account-widget.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-account-widget.h"
+#include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "libempathy/empathy-debug.h"
diff --git a/libempathy-gtk/empathy-new-account-dialog.c b/libempathy-gtk/empathy-new-account-dialog.c
index eb270d5d6..e70f59887 100644
--- a/libempathy-gtk/empathy-new-account-dialog.c
+++ b/libempathy-gtk/empathy-new-account-dialog.c
@@ -25,8 +25,8 @@
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "libempathy/empathy-debug.h"
 
-#include "libempathy-gtk/empathy-account-widget.h"
-#include "libempathy-gtk/empathy-protocol-chooser.h"
+#include "empathy-account-widget.h"
+#include "empathy-protocol-chooser.h"
 
 G_DEFINE_TYPE (EmpathyNewAccountDialog, empathy_new_account_dialog, \
     GTK_TYPE_DIALOG)
diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c
index 27ef7be4d..7a76750cd 100644
--- a/libempathy-gtk/empathy-new-call-dialog.c
+++ b/libempathy-gtk/empathy-new-call-dialog.c
@@ -28,9 +28,9 @@
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include "libempathy/empathy-debug.h"
 
-#include "libempathy-gtk/empathy-contact-chooser.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-images.h"
+#include "empathy-contact-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-images.h"
 
 #include "empathy-new-call-dialog.h"
 #include "empathy-call-utils.h"
diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index 5709e3a83..9aa641289 100644
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -27,9 +27,9 @@
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include "libempathy/empathy-debug.h"
 
-#include "libempathy-gtk/empathy-contact-chooser.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-images.h"
+#include "empathy-contact-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-images.h"
 
 #include "empathy-new-message-dialog.h"
 
diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c
index 2decbf064..aa5f0402e 100644
--- a/libempathy-gtk/empathy-notify-manager.c
+++ b/libempathy-gtk/empathy-notify-manager.c
@@ -24,7 +24,7 @@
 #include "libempathy/empathy-gsettings.h"
 #include "libempathy/empathy-utils.h"
 
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "libempathy/empathy-debug.h"
diff --git a/libempathy-gtk/empathy-roster-contact.c b/libempathy-gtk/empathy-roster-contact.c
index 587a3481d..f7c6f5550 100644
--- a/libempathy-gtk/empathy-roster-contact.c
+++ b/libempathy-gtk/empathy-roster-contact.c
@@ -6,8 +6,8 @@
 
 #include "libempathy/empathy-utils.h"
 
-#include "libempathy-gtk/empathy-images.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-images.h"
+#include "empathy-ui-utils.h"
 
 G_DEFINE_TYPE (EmpathyRosterContact, empathy_roster_contact, GTK_TYPE_ALIGNMENT)
 
diff --git a/libempathy-gtk/empathy-roster-view.c b/libempathy-gtk/empathy-roster-view.c
index 9023407e2..d9b3c7bf2 100644
--- a/libempathy-gtk/empathy-roster-view.c
+++ b/libempathy-gtk/empathy-roster-view.c
@@ -6,9 +6,9 @@
 
 #include "libempathy/empathy-contact-groups.h"
 
-#include "libempathy-gtk/empathy-roster-contact.h"
-#include "libempathy-gtk/empathy-roster-group.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-roster-contact.h"
+#include "empathy-roster-group.h"
+#include "empathy-ui-utils.h"
 
 G_DEFINE_TYPE (EmpathyRosterView, empathy_roster_view, EGG_TYPE_LIST_BOX)
 
diff --git a/libempathy-gtk/empathy-subscription-dialog.c b/libempathy-gtk/empathy-subscription-dialog.c
index 94ebf7c9d..265ea13a2 100644
--- a/libempathy-gtk/empathy-subscription-dialog.c
+++ b/libempathy-gtk/empathy-subscription-dialog.c
@@ -23,7 +23,7 @@
 #include "empathy-subscription-dialog.h"
 
 #include "libempathy/empathy-utils.h"
-#include "libempathy-gtk/empathy-individual-widget.h"
+#include "empathy-individual-widget.h"
 
 #include <glib/gi18n-lib.h>
 
diff --git a/libempathy/cheese-camera-device-monitor.c b/libempathy/cheese-camera-device-monitor.c
index 6f9627da9..0e868f2b6 100644
--- a/libempathy/cheese-camera-device-monitor.c
+++ b/libempathy/cheese-camera-device-monitor.c
@@ -69,7 +69,7 @@ G_DEFINE_TYPE (EmpathyCameraDeviceMonitor, empathy_camera_device_monitor, G_TYPE
 #define EMPATHY_CAMERA_DEVICE_MONITOR_ERROR empathy_camera_device_monitor_error_quark ()
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 enum EmpathyCameraDeviceMonitorError
 {
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index d77a8b08a..1a1391e16 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -27,7 +27,7 @@
 #include "empathy-presence-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAccountSettings)
 
diff --git a/libempathy/empathy-connection-managers.c b/libempathy/empathy-connection-managers.c
index 88ff1d675..6f2cd8c53 100644
--- a/libempathy/empathy-connection-managers.c
+++ b/libempathy/empathy-connection-managers.c
@@ -24,7 +24,7 @@
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 static GObject *managers = NULL;
 
diff --git a/libempathy/empathy-pkg-kit.c b/libempathy/empathy-pkg-kit.c
index 312c24a4a..c00ae52a8 100644
--- a/libempathy/empathy-pkg-kit.c
+++ b/libempathy/empathy-pkg-kit.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
-#include "libempathy/empathy-pkg-kit.h"
+#include "empathy-pkg-kit.h"
 
 typedef struct
 {
diff --git a/libempathy/empathy-request-util.c b/libempathy/empathy-request-util.c
index 6423fe19a..d7b53c82c 100644
--- a/libempathy/empathy-request-util.c
+++ b/libempathy/empathy-request-util.c
@@ -24,7 +24,7 @@
 #include "empathy-request-util.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"
 
 void
 empathy_chat_with_contact (EmpathyContact *contact,