Commit 5c440c4e authored by Emanuele Aina's avatar Emanuele Aina

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
parent 2ea4af7e
......@@ -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"
......
......@@ -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);
......
......@@ -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"
......
......@@ -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);
......
......@@ -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"
......
......@@ -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)
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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)
......
......@@ -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)
......
......@@ -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>
......
......@@ -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
{
......
......@@ -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)
......
......@@ -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;
......
......@@ -20,7 +20,7 @@
#include "config.h"
#include "libempathy/empathy-pkg-kit.h"
#include "empathy-pkg-kit.h"
typedef struct
{
......
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment