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

diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.c b/libempathy-gtk/empathy-contact-blocking-dialog.c
index 022e05ba1de40179b2384597c66286ade641c50c..60ab4367102faf5e076a6f7e671dd4c11fb8c591 100644 (file)
--- 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 92922a2297854e4cad8b3af276591895e45234cd..701ba66d008d18c2f8633967d68c2a574e04ad1d 100644 (file)
--- 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 70bafb9896b1053cdb8cbd1f291c5abdef9069df..b563622c38a90269d005ef30056b6e66449f9629 100644 (file)
--- 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 6509e13bafee3fe1efe98d9f9e1ee0113a0766b4..340d6fc07b07f9dd263f104a35ef658d03ea92a6 100644 (file)
--- 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 afb5057d400711d71b42bcc1972eb4344ee21c3d..de2b7ba0ddebd4b01d4c71b7f8639262aba34ce2 100644 (file)
--- 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 eb270d5d6b0aac5f9e63cd3002bd0529eb46c6f9..e70f59887c67fc290f8e1189921ed5e8f5238ad5 100644 (file)
--- 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 27ef7be4dad566fa331034487df6ea5e8f851b75..7a76750cd57c14b8a907b2fe6c2dfcaf3037581b 100644 (file)
--- 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 5709e3a8384fe78067c8ff4d8ec6ef752314f002..9aa641289b81094ba1ab7e3e8e763728dd585e1f 100644 (file)
--- 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 2decbf0648d5fecd3589012ce805c14cb6262be9..aa5f0402e3d1a6be9107b07ed7bddbea421fc68e 100644 (file)
--- 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 587a3481d3bb807d71d3fb366b86f57b237e1af1..f7c6f55503b386e784c0a0290a32dc0e3b225937 100644 (file)
--- 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 9023407e235fb78f10047bcd4bda351d3bc75b2c..d9b3c7bf284dccc984cf8c33c14ceaab9de85cf2 100644 (file)
--- 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 94ebf7c9d2440de817d200489334c10c24bdb578..265ea13a22c66cddec672454cbc90f10dd81f1e5 100644 (file)
--- 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 6f9627da9c6ed75dfaee4992ea2c5d7aa779185b..0e868f2b6f8ad28367c90b400faac0d503be165d 100644 (file)
--- 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 d77a8b08ab90cd6871a481a54376ec1320154284..1a1391e16a754d66e8173f0288ea5dff7f098d46 100644 (file)
--- 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 88ff1d675ac6141ac88c5817675c89ae08588e8f..6f2cd8c53ab25f8b5ae2e14da7d336087f4f90c0 100644 (file)
--- 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 312c24a4a8a51daa531e3f91b06b97c829206cbe..c00ae52a801721c6292a63cc6a393b4df40fcc90 100644 (file)
--- 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 6423fe19af7805153ad78ab928cf1ae48a3a5cf4..d7b53c82cad6cef7bef6270afacab075b983c298 100644 (file)
--- 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,