Commit 15460fa9 authored by Emanuele Aina's avatar Emanuele Aina

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
parent 5c440c4e
......@@ -4,8 +4,8 @@ include $(top_srcdir)/tools/flymake.mk
AM_CPPFLAGS = \
$(ERROR_CFLAGS) \
-I. \
-I$(top_srcdir) \
-I$(top_srcdir)/libempathy \
-I$(top_srcdir)/extensions \
-DDATADIR=\""$(datadir)"\" \
-DPKGDATADIR=\""$(pkgdatadir)"\" \
-DGCR_API_SUBJECT_TO_CHANGE \
......@@ -245,7 +245,7 @@ stamp-empathy-gtk-enum-types.h: Makefile $(libempathy_gtk_headers)
--fhead "G_BEGIN_DECLS\n\n" \
--ftail "G_END_DECLS\n\n" \
--ftail "#endif /* __LIBEMPATHY_GTK_ENUM_TYPES_H__ */\n" \
--fprod '#include "libempathy-gtk/@filename@"\n' \
--fprod '#include "@filename@"\n' \
--eprod "#define EMPATHY_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
--eprod "GType @enum_name@_get_type (void);\n" \
$(libempathy_gtk_headers) ) > xgen-gth \
......
......@@ -29,7 +29,7 @@
#include "empathy-account-chooser.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
/**
* SECTION:empathy-account-chooser
......
......@@ -25,7 +25,7 @@
#include "empathy-ui-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
typedef struct {
EmpathyAccountWidget *self;
......
......@@ -22,8 +22,8 @@
#define __EMPATHY_ACCOUNT_WIDGET_IRC_H__
#include <gtk/gtk.h>
#include "libempathy-gtk/empathy-account-widget.h"
#include "libempathy-gtk/empathy-irc-network-chooser.h"
#include "empathy-account-widget.h"
#include "empathy-irc-network-chooser.h"
G_BEGIN_DECLS
......
......@@ -22,7 +22,7 @@
#ifndef __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
#define __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
#include "libempathy-gtk/empathy-account-widget.h"
#include "empathy-account-widget.h"
#include <glib.h>
#include <gtk/gtk.h>
......
......@@ -22,7 +22,7 @@
#define __EMPATHY_ACCOUNT_WIDGET_SIP_H__
#include <gtk/gtk.h>
#include "libempathy-gtk/empathy-account-widget.h"
#include "empathy-account-widget.h"
G_BEGIN_DECLS
......
......@@ -28,7 +28,7 @@
#include <glib/gi18n-lib.h>
#include "libempathy/empathy-utils.h"
#include "empathy-utils.h"
#include <dbus/dbus-protocol.h>
......@@ -38,7 +38,7 @@
#include "empathy-ui-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
G_DEFINE_TYPE (EmpathyAccountWidget, empathy_account_widget, GTK_TYPE_BOX)
......
......@@ -26,7 +26,7 @@
#include <gtk/gtk.h>
#include "libempathy/empathy-account-settings.h"
#include "empathy-account-settings.h"
G_BEGIN_DECLS
......
......@@ -24,9 +24,9 @@
#include <glib/gi18n-lib.h>
#include "libempathy/empathy-camera-monitor.h"
#include "libempathy/empathy-gsettings.h"
#include "libempathy/empathy-utils.h"
#include "empathy-camera-monitor.h"
#include "empathy-gsettings.h"
#include "empathy-utils.h"
#include "empathy-avatar-chooser.h"
#include "empathy-images.h"
......@@ -37,7 +37,7 @@
#endif /* HAVE_CHEESE */
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
/**
* SECTION:empathy-avatar-chooser
......
......@@ -26,7 +26,7 @@
#include <glib/gi18n-lib.h>
#include <gdk/gdkx.h>
#include "libempathy/empathy-utils.h"
#include "empathy-utils.h"
#include "empathy-avatar-image.h"
#include "empathy-ui-utils.h"
......
......@@ -24,7 +24,7 @@
#include <glib/gi18n-lib.h>
#define DEBUG_FLAG EMPATHY_DEBUG_SASL
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
G_DEFINE_TYPE (EmpathyBadPasswordDialog, empathy_bad_password_dialog,
EMPATHY_TYPE_BASE_PASSWORD_DIALOG)
......
......@@ -23,7 +23,7 @@
#include <glib-object.h>
#include <gtk/gtk.h>
#include "libempathy-gtk/empathy-base-password-dialog.h"
#include "empathy-base-password-dialog.h"
G_BEGIN_DECLS
......
......@@ -24,8 +24,8 @@
#include <glib/gi18n-lib.h>
#define DEBUG_FLAG EMPATHY_DEBUG_SASL
#include "libempathy/empathy-debug.h"
#include "libempathy/empathy-utils.h"
#include "empathy-debug.h"
#include "empathy-utils.h"
G_DEFINE_TYPE (EmpathyBasePasswordDialog, empathy_base_password_dialog,
GTK_TYPE_MESSAGE_DIALOG)
......
......@@ -24,7 +24,7 @@
#include "empathy-calendar-button.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER_THING
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
G_DEFINE_TYPE (EmpathyCalendarButton, empathy_calendar_button, GTK_TYPE_BOX)
......
......@@ -28,10 +28,10 @@
#include "empathy-call-utils.h"
#include "libempathy/empathy-request-util.h"
#include "empathy-request-util.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
static const gchar *
get_error_display_message (GError *error)
......
......@@ -22,7 +22,7 @@
#include "config.h"
#include "libempathy/empathy-utils.h"
#include "empathy-utils.h"
#include "empathy-cell-renderer-activatable.h"
......
......@@ -21,7 +21,7 @@
* Authors: Kristian Rietveld <kris@imendio.com>
*/
#include "libempathy/empathy-utils.h"
#include "empathy-utils.h"
#include "empathy-cell-renderer-expander.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererExpander)
......
......@@ -23,7 +23,7 @@
#include "config.h"
#include "libempathy/empathy-utils.h"
#include "empathy-utils.h"
#include "empathy-cell-renderer-text.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererText)
......
......@@ -32,11 +32,11 @@
#include <glib/gi18n-lib.h>
#include "libempathy/empathy-gsettings.h"
#include "libempathy/empathy-keyring.h"
#include "libempathy/empathy-utils.h"
#include "libempathy/empathy-request-util.h"
#include "libempathy/empathy-client-factory.h"
#include "empathy-gsettings.h"
#include "empathy-keyring.h"
#include "empathy-utils.h"
#include "empathy-request-util.h"
#include "empathy-client-factory.h"
#include "empathy-chat.h"
#include "empathy-spell.h"
......@@ -49,10 +49,10 @@
#include "empathy-smiley-manager.h"
#include "empathy-ui-utils.h"
#include "empathy-string-parser.h"
#include "extensions/extensions.h"
#include "extensions.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CHAT
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
#define IS_ENTER(v) (v == GDK_KEY_Return || v == GDK_KEY_ISO_Enter || v == GDK_KEY_KP_Enter)
#define COMPOSING_STOP_TIMEOUT 5
......
......@@ -30,10 +30,10 @@
#include <gtk/gtk.h>
#include "libempathy/empathy-contact.h"
#include "libempathy/empathy-tp-chat.h"
#include "empathy-contact.h"
#include "empathy-tp-chat.h"
#include "libempathy-gtk/empathy-theme-adium.h"
#include "empathy-theme-adium.h"
G_BEGIN_DECLS
......
......@@ -25,7 +25,7 @@
#include <glib/gi18n-lib.h>
#include "libempathy/empathy-utils.h"
#include "empathy-utils.h"
#include "empathy-account-chooser.h"
#include "empathy-ui-utils.h"
......@@ -33,7 +33,7 @@
#include "empathy-contact-blocking-dialog.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
#define GET_PRIVATE(o) (EMPATHY_CONTACT_BLOCKING_DIALOG (o)->priv)
#define DECLARE_CALLBACK(func) \
......
......@@ -13,8 +13,8 @@
#include "empathy-contact-chooser.h"
#include "libempathy/empathy-utils.h"
#include "libempathy/empathy-client-factory.h"
#include "empathy-utils.h"
#include "empathy-client-factory.h"
#include "empathy-individual-store-manager.h"
#include "empathy-individual-view.h"
......
......@@ -26,8 +26,8 @@
#include <glib/gi18n-lib.h>
#include "libempathy/empathy-utils.h"
#include "libempathy/empathy-client-factory.h"
#include "empathy-utils.h"
#include "empathy-client-factory.h"
#include "empathy-account-chooser.h"
#include "empathy-cell-renderer-text.h"
......@@ -36,7 +36,7 @@
#include "empathy-images.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
#include "empathy-contact-search-dialog.h"
......
......@@ -23,8 +23,8 @@
#include <glib/gi18n-lib.h>
#include "libempathy/empathy-utils.h"
#include "libempathy/empathy-client-factory.h"
#include "empathy-utils.h"
#include "empathy-client-factory.h"
#include "empathy-contact-widget.h"
#include "empathy-avatar-image.h"
......@@ -33,7 +33,7 @@
#include "empathy-string-parser.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
/**
* SECTION:empathy-contact-widget
......
......@@ -24,7 +24,7 @@
#include <gtk/gtk.h>
#include "libempathy/empathy-contact.h"
#include "empathy-contact.h"
#include "empathy-account-chooser.h"
G_BEGIN_DECLS
......
......@@ -24,8 +24,8 @@
#include <glib/gi18n-lib.h>
#include "libempathy/empathy-time.h"
#include "libempathy/empathy-request-util.h"
#include "empathy-time.h"
#include "empathy-request-util.h"
#include "empathy-contactinfo-utils.h"
#include "empathy-string-parser.h"
......
......@@ -25,12 +25,12 @@
#include <sys/stat.h>
#include "libempathy/empathy-utils.h"
#include "empathy-utils.h"
#include "empathy-geometry.h"
#include "empathy-ui-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
#define GEOMETRY_DIR_CREATE_MODE (S_IRUSR | S_IWUSR | S_IXUSR)
#define GEOMETRY_FILE_CREATE_MODE (S_IRUSR | S_IWUSR)
......
......@@ -23,8 +23,8 @@
#include <glib/gi18n-lib.h>
#include "libempathy/empathy-utils.h"
#include "libempathy/empathy-connection-aggregator.h"
#include "empathy-utils.h"
#include "empathy-connection-aggregator.h"
#include "empathy-groups-widget.h"
......
......@@ -23,8 +23,8 @@
#include <glib/gi18n-lib.h>
#include "libempathy/empathy-individual-manager.h"
#include "libempathy/empathy-utils.h"
#include "empathy-individual-manager.h"
#include "empathy-utils.h"
#include "empathy-individual-dialogs.h"
#include "empathy-contact-widget.h"
......
......@@ -24,7 +24,7 @@
#include <glib/gi18n-lib.h>
#include "libempathy/empathy-utils.h"
#include "empathy-utils.h"
#include "empathy-individual-edit-dialog.h"
#include "empathy-individual-widget.h"
......
......@@ -25,16 +25,16 @@
#include <glib/gi18n-lib.h>
#include "libempathy/empathy-individual-manager.h"
#include "libempathy/empathy-utils.h"
#include "libempathy/empathy-pkg-kit.h"
#include "empathy-individual-manager.h"
#include "empathy-utils.h"
#include "empathy-pkg-kit.h"
#include "empathy-individual-information-dialog.h"
#include "empathy-individual-widget.h"
#include "empathy-ui-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualInformationDialog)
typedef struct {
......
......@@ -24,11 +24,11 @@
#include <glib/gi18n-lib.h>
#include "libempathy/empathy-camera-monitor.h"
#include "libempathy/empathy-request-util.h"
#include "libempathy/empathy-individual-manager.h"
#include "libempathy/empathy-chatroom-manager.h"
#include "libempathy/empathy-utils.h"
#include "empathy-camera-monitor.h"
#include "empathy-request-util.h"
#include "empathy-individual-manager.h"
#include "empathy-chatroom-manager.h"
#include "empathy-utils.h"
#include "empathy-account-selector-dialog.h"
#include "empathy-images.h"
......@@ -44,7 +44,7 @@
#include "empathy-individual-information-dialog.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualMenu)
......
......@@ -25,12 +25,12 @@
#include "config.h"
#include "libempathy/empathy-utils.h"
#include "empathy-utils.h"
#include "empathy-individual-store-channel.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
struct _EmpathyIndividualStoreChannelPriv
{
......
......@@ -28,7 +28,7 @@
#include <gtk/gtk.h>
#include "libempathy-gtk/empathy-individual-store.h"
#include "empathy-individual-store.h"
G_BEGIN_DECLS
#define EMPATHY_TYPE_INDIVIDUAL_STORE_CHANNEL (empathy_individual_store_channel_get_type ())
......
......@@ -28,7 +28,7 @@
#include "empathy-individual-store-manager.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
struct _EmpathyIndividualStoreManagerPriv
{
......
......@@ -28,9 +28,9 @@
#include <gtk/gtk.h>
#include "libempathy/empathy-individual-manager.h"
#include "empathy-individual-manager.h"
#include "libempathy-gtk/empathy-individual-store.h"
#include "empathy-individual-store.h"
G_BEGIN_DECLS
#define EMPATHY_TYPE_INDIVIDUAL_STORE_MANAGER (empathy_individual_store_manager_get_type ())
......
......@@ -28,13 +28,13 @@
#include <glib/gi18n-lib.h>
#include "libempathy/empathy-utils.h"
#include "empathy-utils.h"
#include "empathy-ui-utils.h"
#include "empathy-gtk-enum-types.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
/* Active users are those which have recently changed state
* (e.g. online, offline or from normal to a busy state).
......
......@@ -28,11 +28,11 @@
#include <glib/gi18n-lib.h>
#include "libempathy/empathy-connection-aggregator.h"
#include "libempathy/empathy-individual-manager.h"
#include "libempathy/empathy-contact-groups.h"
#include "libempathy/empathy-request-util.h"
#include "libempathy/empathy-utils.h"
#include "empathy-connection-aggregator.h"
#include "empathy-individual-manager.h"
#include "empathy-contact-groups.h"
#include "empathy-request-util.h"
#include "empathy-utils.h"
#include "empathy-individual-edit-dialog.h"
#include "empathy-images.h"
......@@ -43,7 +43,7 @@
#include "empathy-gtk-enum-types.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
/* Active users are those which have recently changed state
* (e.g. online, offline or from normal to a busy state).
......
......@@ -28,9 +28,9 @@
#include <champlain-gtk/champlain-gtk.h>
#endif
#include "libempathy/empathy-utils.h"
#include "libempathy/empathy-location.h"
#include "libempathy/empathy-time.h"
#include "empathy-utils.h"
#include "empathy-location.h"
#include "empathy-time.h"
#include "empathy-avatar-image.h"
#include "empathy-contactinfo-utils.h"
......@@ -39,7 +39,7 @@
#include "empathy-ui-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
/**
* SECTION:empathy-individual-widget
......
......@@ -23,14 +23,14 @@
#include <glib/gi18n-lib.h>
#include "libempathy/empathy-utils.h"
#include "libempathy/empathy-irc-network-manager.h"
#include "empathy-utils.h"
#include "empathy-irc-network-manager.h"
#include "empathy-irc-network-dialog.h"
#include "empathy-live-search.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
#include "empathy-irc-network-chooser-dialog.h"
......
......@@ -24,8 +24,8 @@
#include <gtk/gtk.h>
#include "libempathy/empathy-account-settings.h"
#include "libempathy/empathy-irc-network.h"
#include "empathy-account-settings.h"
#include "empathy-irc-network.h"
G_BEGIN_DECLS
......
......@@ -21,14 +21,14 @@
#include "config.h"
#include "libempathy/empathy-utils.h"
#include "libempathy/empathy-irc-network-manager.h"
#include "empathy-utils.h"
#include "empathy-irc-network-manager.h"
#include "empathy-ui-utils.h"
#include "empathy-irc-network-chooser-dialog.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
#include "empathy-irc-network-chooser.h"
......
......@@ -24,8 +24,8 @@
#include <gtk/gtk.h>
#include "libempathy/empathy-account-settings.h"
#include "libempathy/empathy-irc-network.h"
#include "empathy-account-settings.h"
#include "empathy-irc-network.h"
G_BEGIN_DECLS
......
......@@ -22,7 +22,7 @@
#include <glib/gi18n-lib.h>
#include "libempathy/empathy-utils.h"
#include "empathy-utils.h"
#include "empathy-ui-utils.h"
#include "totem-subtitle-encoding.h"
......
......@@ -23,7 +23,7 @@
#include <gtk/gtk.h>
#include "libempathy/empathy-irc-network.h"
#include "empathy-irc-network.h"
G_BEGIN_DECLS
......
......@@ -23,7 +23,7 @@
#include "config.h"
#include "libempathy/empathy-utils.h"
#include "empathy-utils.h"
#include "empathy-live-search.h"
......
......@@ -23,13 +23,13 @@
#include <glib/gi18n-lib.h>
#include "libempathy/empathy-utils.h"
#include "empathy-utils.h"
#include "empathy-account-widget.h"
#include "empathy-ui-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
G_DEFINE_TYPE (EmpathyLocalXmppAssistantWidget,
empathy_local_xmpp_assistant_widget, GTK_TYPE_GRID)
......
......@@ -25,12 +25,12 @@
#include "empathy-location-manager.h"
#include "libempathy/empathy-gsettings.h"
#include "libempathy/empathy-location.h"
#include "libempathy/empathy-time.h"
#include "empathy-gsettings.h"
#include "empathy-location.h"
#include "empathy-time.h"
#define DEBUG_FLAG EMPATHY_DEBUG_LOCATION
#include "libempathy/empathy-debug.h"
#include "empathy-debug.h"
/* Seconds before updating the location */
#define TIMEOUT 10
......