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

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 4c8f54c1a4b5fba2e26bfa57b239504f6cc9917f..72c27b4b24b1c05e997eb93262a45c4ba506fbc1 100644 (file)
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -4,8 +4,8 @@ include $(top_srcdir)/tools/flymake.mk
 
 AM_CPPFLAGS =                                           \
        $(ERROR_CFLAGS)                                 \
 
 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                     \
        -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" \
                        --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 \
                        --eprod "#define EMPATHY_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
                        --eprod "GType @enum_name@_get_type (void);\n" \
                $(libempathy_gtk_headers) ) > xgen-gth \

diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index 0f3b5b470069b548c2bd79e74f9039b15e051456..a272309e589f222fdcaf9832b568d2eba9d03722 100644 (file)
--- a/libempathy-gtk/empathy-account-chooser.c
+++ b/libempathy-gtk/empathy-account-chooser.c
@@ -29,7 +29,7 @@
 #include "empathy-account-chooser.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-account-chooser.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 /**
  * SECTION:empathy-account-chooser
 
 /**
  * SECTION:empathy-account-chooser

diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c
index fbc0c19cb18fff483bdfffa83046bacd903972c9..e0647a9b850a43f7ec0d65116f9b3134c49ec135 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-irc.c
+++ b/libempathy-gtk/empathy-account-widget-irc.c
@@ -25,7 +25,7 @@
 #include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT | EMPATHY_DEBUG_IRC
 #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;
 
 typedef struct {
   EmpathyAccountWidget *self;

diff --git a/libempathy-gtk/empathy-account-widget-irc.h b/libempathy-gtk/empathy-account-widget-irc.h
index c6e6dec018b4f25efcda60a7fe9854dec1925c80..eba469e8267090c56c9b0e45e313c4d18ff22d68 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-irc.h
+++ b/libempathy-gtk/empathy-account-widget-irc.h
@@ -22,8 +22,8 @@
 #define __EMPATHY_ACCOUNT_WIDGET_IRC_H__
 
 #include <gtk/gtk.h>
 #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
 
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-account-widget-private.h b/libempathy-gtk/empathy-account-widget-private.h
index d987abb7ca56ed401837c87a4fbf03417f8046d0..8da22bdadac6d43628bad58fd957f745dde93582 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-private.h
+++ b/libempathy-gtk/empathy-account-widget-private.h
@@ -22,7 +22,7 @@
 #ifndef __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
 #define __EMPATHY_ACCOUNT_WIDGET_PRIVATE_H__
 
 #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>
 
 #include <glib.h>
 #include <gtk/gtk.h>
 

diff --git a/libempathy-gtk/empathy-account-widget-sip.h b/libempathy-gtk/empathy-account-widget-sip.h
index 62b80da817051203a5650f0137d310ef9e15db51..438ee8372f1242c4f75657057a521520ca8ede87 100644 (file)
--- a/libempathy-gtk/empathy-account-widget-sip.h
+++ b/libempathy-gtk/empathy-account-widget-sip.h
@@ -22,7 +22,7 @@
 #define __EMPATHY_ACCOUNT_WIDGET_SIP_H__
 
 #include <gtk/gtk.h>
 #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
 
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index d8b5b778538bb1090d617485d6aaa5ec015e8418..fb4ab8bf4b0a4a619ee5331977576e57cc394942 100644 (file)
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -28,7 +28,7 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"

 
 #include <dbus/dbus-protocol.h>
 
 
 #include <dbus/dbus-protocol.h>
 


@@ -38,7 +38,7 @@
 #include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #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)
 
 
 G_DEFINE_TYPE (EmpathyAccountWidget, empathy_account_widget, GTK_TYPE_BOX)
 

diff --git a/libempathy-gtk/empathy-account-widget.h b/libempathy-gtk/empathy-account-widget.h
index 57eaa1a3630e0a4e1d12a59583e26825e31dc40f..65de952c7be3fc6599b990e01a970fdc747f4ce5 100644 (file)
--- a/libempathy-gtk/empathy-account-widget.h
+++ b/libempathy-gtk/empathy-account-widget.h
@@ -26,7 +26,7 @@
 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 

-#include "libempathy/empathy-account-settings.h"
+#include "empathy-account-settings.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 240e2211d88f7b4f382563d14eda93333e8f7123..30022c9df7505123b043527396774535c8c6a871 100644 (file)
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -24,9 +24,9 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #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"
 
 #include "empathy-avatar-chooser.h"
 #include "empathy-images.h"


@@ -37,7 +37,7 @@
 #endif /* HAVE_CHEESE */
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #endif /* HAVE_CHEESE */
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 /**
  * SECTION:empathy-avatar-chooser
 
 /**
  * SECTION:empathy-avatar-chooser

diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c
index 4b50eceef780158b8cfaab066090903bdde881d9..f66827f641906f969e6b80eb17a0e715105d2c6a 100644 (file)
--- a/libempathy-gtk/empathy-avatar-image.c
+++ b/libempathy-gtk/empathy-avatar-image.c
@@ -26,7 +26,7 @@
 #include <glib/gi18n-lib.h>
 #include <gdk/gdkx.h>
 
 #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"
 
 #include "empathy-avatar-image.h"
 #include "empathy-ui-utils.h"
 

diff --git a/libempathy-gtk/empathy-bad-password-dialog.c b/libempathy-gtk/empathy-bad-password-dialog.c
index 1e6cbbfd34988fcb5cb177cfb7b0554a68d8a251..228a1497a0d04d183fba17c9e87df19348963ed8 100644 (file)
--- a/libempathy-gtk/empathy-bad-password-dialog.c
+++ b/libempathy-gtk/empathy-bad-password-dialog.c
@@ -24,7 +24,7 @@
 #include <glib/gi18n-lib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #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)
 
 G_DEFINE_TYPE (EmpathyBadPasswordDialog, empathy_bad_password_dialog,
     EMPATHY_TYPE_BASE_PASSWORD_DIALOG)

diff --git a/libempathy-gtk/empathy-bad-password-dialog.h b/libempathy-gtk/empathy-bad-password-dialog.h
index dc04d61bba0cb661386c50ac747a206d97b5da34..0b025af85bc6349fbecca71c0d0c019414257e8d 100644 (file)
--- a/libempathy-gtk/empathy-bad-password-dialog.h
+++ b/libempathy-gtk/empathy-bad-password-dialog.h
@@ -23,7 +23,7 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
 #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
 
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-base-password-dialog.c b/libempathy-gtk/empathy-base-password-dialog.c
index 688bbe8c4cb79e7d23fabf6720d3b1213ff79d0f..b47e5b59d3afdcc796bf4da49c3e07a0658a84e8 100644 (file)
--- a/libempathy-gtk/empathy-base-password-dialog.c
+++ b/libempathy-gtk/empathy-base-password-dialog.c
@@ -24,8 +24,8 @@
 #include <glib/gi18n-lib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #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)
 
 G_DEFINE_TYPE (EmpathyBasePasswordDialog, empathy_base_password_dialog,
     GTK_TYPE_MESSAGE_DIALOG)

diff --git a/libempathy-gtk/empathy-calendar-button.c b/libempathy-gtk/empathy-calendar-button.c
index eace02f8edbb54601927b0acac4481e964faf45b..86cea89d76790b1f0b77bed7284dd6487a3e63de 100644 (file)
--- a/libempathy-gtk/empathy-calendar-button.c
+++ b/libempathy-gtk/empathy-calendar-button.c
@@ -24,7 +24,7 @@
 #include "empathy-calendar-button.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER_THING
 #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)
 
 
 G_DEFINE_TYPE (EmpathyCalendarButton, empathy_calendar_button, GTK_TYPE_BOX)
 

diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c
index 17c03cff27e392c92ddb65f78b349832233e31a9..44fce09e5855882977d1a3d89a03c39a93d79627 100644 (file)
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -28,10 +28,10 @@
 
 #include "empathy-call-utils.h"
 
 
 #include "empathy-call-utils.h"
 

-#include "libempathy/empathy-request-util.h"
+#include "empathy-request-util.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 static const gchar *
 get_error_display_message (GError *error)
 
 static const gchar *
 get_error_display_message (GError *error)

diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.c b/libempathy-gtk/empathy-cell-renderer-activatable.c
index 7f03559015d99e58f5135c383acfaf5a82865063..6a8fe72eeed55e3d72a0b03b8f9a20bb605372f3 100644 (file)
--- a/libempathy-gtk/empathy-cell-renderer-activatable.c
+++ b/libempathy-gtk/empathy-cell-renderer-activatable.c
@@ -22,7 +22,7 @@
 
 #include "config.h"
 
 
 #include "config.h"
 

-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"

 
 #include "empathy-cell-renderer-activatable.h"
 
 
 #include "empathy-cell-renderer-activatable.h"
 

diff --git a/libempathy-gtk/empathy-cell-renderer-expander.c b/libempathy-gtk/empathy-cell-renderer-expander.c
index a72f091321d33d2605a7183ad78efb241314b341..9887b7128bf3a626cb9467c372e63dbf85519c24 100644 (file)
--- a/libempathy-gtk/empathy-cell-renderer-expander.c
+++ b/libempathy-gtk/empathy-cell-renderer-expander.c
@@ -21,7 +21,7 @@
  * Authors: Kristian Rietveld <kris@imendio.com>
  */
 
  * 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)
 #include "empathy-cell-renderer-expander.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererExpander)

diff --git a/libempathy-gtk/empathy-cell-renderer-text.c b/libempathy-gtk/empathy-cell-renderer-text.c
index a4fe92b15c18a296e3ed29992d809a0220da38d0..afefb2af566e22803c957d4653d4e3f5f722cd12 100644 (file)
--- a/libempathy-gtk/empathy-cell-renderer-text.c
+++ b/libempathy-gtk/empathy-cell-renderer-text.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
 
 #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)
 #include "empathy-cell-renderer-text.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyCellRendererText)

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index f18256b97c15ae30920a1d98048810385151f704..f853fb3be468bc8fd4bcb4e332beaeeeac2a166c 100644 (file)
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -32,11 +32,11 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #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"
 
 #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 "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
 
 #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
 
 #define IS_ENTER(v) (v == GDK_KEY_Return || v == GDK_KEY_ISO_Enter || v == GDK_KEY_KP_Enter)
 #define COMPOSING_STOP_TIMEOUT 5

diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h
index d5da3fe3c2e779fb3daa002ec235a02ce5f548ac..cbd69a343720e5bbebfdf41fff4c1d793e38aa46 100644 (file)
--- a/libempathy-gtk/empathy-chat.h
+++ b/libempathy-gtk/empathy-chat.h
@@ -30,10 +30,10 @@
 
 #include <gtk/gtk.h>
 
 
 #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
 
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.c b/libempathy-gtk/empathy-contact-blocking-dialog.c
index 60ab4367102faf5e076a6f7e671dd4c11fb8c591..93f317f2a063ccc8647b1d6f49def1d4e5b64a48 100644 (file)
--- a/libempathy-gtk/empathy-contact-blocking-dialog.c
+++ b/libempathy-gtk/empathy-contact-blocking-dialog.c
@@ -25,7 +25,7 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"

 
 #include "empathy-account-chooser.h"
 #include "empathy-ui-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 "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) \
 
 #define GET_PRIVATE(o) (EMPATHY_CONTACT_BLOCKING_DIALOG (o)->priv)
 #define DECLARE_CALLBACK(func) \

diff --git a/libempathy-gtk/empathy-contact-chooser.c b/libempathy-gtk/empathy-contact-chooser.c
index 701ba66d008d18c2f8633967d68c2a574e04ad1d..d1368e95612dfababb12972387825fcf45140959 100644 (file)
--- a/libempathy-gtk/empathy-contact-chooser.c
+++ b/libempathy-gtk/empathy-contact-chooser.c
@@ -13,8 +13,8 @@
 
 #include "empathy-contact-chooser.h"
 
 
 #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"
 
 #include "empathy-individual-store-manager.h"
 #include "empathy-individual-view.h"

diff --git a/libempathy-gtk/empathy-contact-search-dialog.c b/libempathy-gtk/empathy-contact-search-dialog.c
index b563622c38a90269d005ef30056b6e66449f9629..fd594e8c3c4c67fae164efe6863bc66040595e7e 100644 (file)
--- a/libempathy-gtk/empathy-contact-search-dialog.c
+++ b/libempathy-gtk/empathy-contact-search-dialog.c
@@ -26,8 +26,8 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #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"
 
 #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 "empathy-images.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 #include "empathy-contact-search-dialog.h"
 
 
 #include "empathy-contact-search-dialog.h"
 

diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index cbc034db531fbc473e7f8dc2ae4d1a52750d57bb..fd4d783be182e4f722ca07b32f08d727bbefa291 100644 (file)
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -23,8 +23,8 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #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"
 
 #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 "empathy-string-parser.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 /**
  * SECTION:empathy-contact-widget
 
 /**
  * SECTION:empathy-contact-widget

diff --git a/libempathy-gtk/empathy-contact-widget.h b/libempathy-gtk/empathy-contact-widget.h
index cb70793000812a02dd6d49c6a847a0e4195756d7..9f1f1a70faf83936fe992a2b156bfc206a131206 100644 (file)
--- a/libempathy-gtk/empathy-contact-widget.h
+++ b/libempathy-gtk/empathy-contact-widget.h
@@ -24,7 +24,7 @@
 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 

-#include "libempathy/empathy-contact.h"
+#include "empathy-contact.h"

 #include "empathy-account-chooser.h"
 
 G_BEGIN_DECLS
 #include "empathy-account-chooser.h"
 
 G_BEGIN_DECLS

diff --git a/libempathy-gtk/empathy-contactinfo-utils.c b/libempathy-gtk/empathy-contactinfo-utils.c
index fcf06194330a536ecf1ce8929f2aed27fe2df844..3dca3740ddd46f063788c3d7f81069917c3f150c 100644 (file)
--- a/libempathy-gtk/empathy-contactinfo-utils.c
+++ b/libempathy-gtk/empathy-contactinfo-utils.c
@@ -24,8 +24,8 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #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"
 
 #include "empathy-contactinfo-utils.h"
 #include "empathy-string-parser.h"

diff --git a/libempathy-gtk/empathy-geometry.c b/libempathy-gtk/empathy-geometry.c
index 2c4b501887be28cec5c51987b9bf19677f4420ad..1562001fb0c9e19a3e6920585399a2d003fc60ee 100644 (file)
--- a/libempathy-gtk/empathy-geometry.c
+++ b/libempathy-gtk/empathy-geometry.c
@@ -25,12 +25,12 @@
 
 #include <sys/stat.h>
 
 
 #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 "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)
 
 #define GEOMETRY_DIR_CREATE_MODE  (S_IRUSR | S_IWUSR | S_IXUSR)
 #define GEOMETRY_FILE_CREATE_MODE (S_IRUSR | S_IWUSR)

diff --git a/libempathy-gtk/empathy-groups-widget.c b/libempathy-gtk/empathy-groups-widget.c
index 2292cc53bcf5af7b9c178f97cf16c3684c5963f4..8b66651678fba857f85a5c21ae00ca13000612bd 100644 (file)
--- a/libempathy-gtk/empathy-groups-widget.c
+++ b/libempathy-gtk/empathy-groups-widget.c
@@ -23,8 +23,8 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #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"
 
 
 #include "empathy-groups-widget.h"
 

diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c
index a22ca28e4ca381cb44c850d865e25f57944d1cf7..9f0117753712a3da74abad42e249b943707e732a 100644 (file)
--- a/libempathy-gtk/empathy-individual-dialogs.c
+++ b/libempathy-gtk/empathy-individual-dialogs.c
@@ -23,8 +23,8 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #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"
 
 #include "empathy-individual-dialogs.h"
 #include "empathy-contact-widget.h"

diff --git a/libempathy-gtk/empathy-individual-edit-dialog.c b/libempathy-gtk/empathy-individual-edit-dialog.c
index 21380a5bac63cf3c6dbf4a3a21a5f5218defa05c..457dd95752f0288b26bbc5e48f77e5217e43407b 100644 (file)
--- a/libempathy-gtk/empathy-individual-edit-dialog.c
+++ b/libempathy-gtk/empathy-individual-edit-dialog.c
@@ -24,7 +24,7 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #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"
 
 #include "empathy-individual-edit-dialog.h"
 #include "empathy-individual-widget.h"

diff --git a/libempathy-gtk/empathy-individual-information-dialog.c b/libempathy-gtk/empathy-individual-information-dialog.c
index 4059925dea18354ff7876c6555afeb7614a08f78..f4f8bda928c46161804b3a6c8ad005a054980c33 100644 (file)
--- a/libempathy-gtk/empathy-individual-information-dialog.c
+++ b/libempathy-gtk/empathy-individual-information-dialog.c
@@ -25,16 +25,16 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #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 "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 {
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualInformationDialog)
 typedef struct {

diff --git a/libempathy-gtk/empathy-individual-menu.c b/libempathy-gtk/empathy-individual-menu.c
index cf67101efd8f048eeb94b41d8ee58702cf832525..907c678b363a676d53a75dc66d5b7d0724fa73da 100644 (file)
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -24,11 +24,11 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #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"
 
 #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 "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)
 
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyIndividualMenu)
 

diff --git a/libempathy-gtk/empathy-individual-store-channel.c b/libempathy-gtk/empathy-individual-store-channel.c
index 8ceaf6e5b1db8d0020903cd4fc989134bf3fde93..5db93d5f17fd4a16cbd52eec661fd27886da0a00 100644 (file)
--- a/libempathy-gtk/empathy-individual-store-channel.c
+++ b/libempathy-gtk/empathy-individual-store-channel.c
@@ -25,12 +25,12 @@
 
 #include "config.h"
 
 
 #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 "empathy-individual-store-channel.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 struct _EmpathyIndividualStoreChannelPriv
 {
 
 struct _EmpathyIndividualStoreChannelPriv
 {

diff --git a/libempathy-gtk/empathy-individual-store-channel.h b/libempathy-gtk/empathy-individual-store-channel.h
index 31a6abd8b1ff75cd63b11497dea4fea84131f849..2cc6b5be440bbd108d9b1250dd6980a7067a4fd6 100644 (file)
--- a/libempathy-gtk/empathy-individual-store-channel.h
+++ b/libempathy-gtk/empathy-individual-store-channel.h
@@ -28,7 +28,7 @@
 
 #include <gtk/gtk.h>
 
 
 #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 ())
 
 G_BEGIN_DECLS
 #define EMPATHY_TYPE_INDIVIDUAL_STORE_CHANNEL         (empathy_individual_store_channel_get_type ())

diff --git a/libempathy-gtk/empathy-individual-store-manager.c b/libempathy-gtk/empathy-individual-store-manager.c
index 04c341e5a61584dabc1f4feceebc72a9085eb515..ca0628717c98dac7034610167765752547836ad4 100644 (file)
--- a/libempathy-gtk/empathy-individual-store-manager.c
+++ b/libempathy-gtk/empathy-individual-store-manager.c
@@ -28,7 +28,7 @@
 #include "empathy-individual-store-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include "empathy-individual-store-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 struct _EmpathyIndividualStoreManagerPriv
 {
 
 struct _EmpathyIndividualStoreManagerPriv
 {

diff --git a/libempathy-gtk/empathy-individual-store-manager.h b/libempathy-gtk/empathy-individual-store-manager.h
index 8b56b0c1b921821525e72003072e33b5eb79039d..fac0f31d69b9803df13149d853b2b7207eaf329e 100644 (file)
--- a/libempathy-gtk/empathy-individual-store-manager.h
+++ b/libempathy-gtk/empathy-individual-store-manager.h
@@ -28,9 +28,9 @@
 
 #include <gtk/gtk.h>
 
 
 #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 ())
 
 G_BEGIN_DECLS
 #define EMPATHY_TYPE_INDIVIDUAL_STORE_MANAGER         (empathy_individual_store_manager_get_type ())

diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index 7223e2e9c0d8b88aab50bcfb3a538080e099dbb3..4055091f1f5697f02494432bceed7d57c74310fc 100644 (file)
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -28,13 +28,13 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #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 "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).
 
 /* Active users are those which have recently changed state
  * (e.g. online, offline or from normal to a busy state).

diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index b88fd253d951b8b75dfd90a9fc5dca7f3c088393..d02d3dea2d033a82a3267965b7da0153fa3d0ed5 100644 (file)
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -28,11 +28,11 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #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"
 
 #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 "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).
 
 /* Active users are those which have recently changed state
  * (e.g. online, offline or from normal to a busy state).

diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 87be31f262b50a2e191430f9308ad2d6cdd37114..371ddb1b05437e32f02735654f586f2ea0f20110 100644 (file)
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -28,9 +28,9 @@
 #include <champlain-gtk/champlain-gtk.h>
 #endif
 
 #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"
 
 #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 "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 /**
  * SECTION:empathy-individual-widget
 
 /**
  * SECTION:empathy-individual-widget

diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.c b/libempathy-gtk/empathy-irc-network-chooser-dialog.c
index c4c8e830f84714e72a5e574e4276f8701fedd21c..cb937daa5d235e280bf5dfee073f4fb5ce537c88 100644 (file)
--- a/libempathy-gtk/empathy-irc-network-chooser-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-chooser-dialog.c
@@ -23,14 +23,14 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #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 "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"
 
 
 #include "empathy-irc-network-chooser-dialog.h"
 

diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.h b/libempathy-gtk/empathy-irc-network-chooser-dialog.h
index 8ffb2cbe177f5ad41d9d020640390eaef1cac356..1e46549169d6e418fd7f3d322ee39a7f46a81df7 100644 (file)
--- a/libempathy-gtk/empathy-irc-network-chooser-dialog.h
+++ b/libempathy-gtk/empathy-irc-network-chooser-dialog.h
@@ -24,8 +24,8 @@
 
 #include <gtk/gtk.h>
 
 
 #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
 
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-irc-network-chooser.c b/libempathy-gtk/empathy-irc-network-chooser.c
index 79b54e9859e4d9ae2f9779d79fb1fdc4d527c04a..4945bb7c174cd87fd07751f30fc0f4ec8ae4f1ec 100644 (file)
--- a/libempathy-gtk/empathy-irc-network-chooser.c
+++ b/libempathy-gtk/empathy-irc-network-chooser.c
@@ -21,14 +21,14 @@
 
 #include "config.h"
 
 
 #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 "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"
 
 
 #include "empathy-irc-network-chooser.h"
 

diff --git a/libempathy-gtk/empathy-irc-network-chooser.h b/libempathy-gtk/empathy-irc-network-chooser.h
index 23ecc92fe80eff085ba45cc8e764e0f7711a1a66..f4c603288e4ccaf0f6ad465a58503da57cc445b1 100644 (file)
--- a/libempathy-gtk/empathy-irc-network-chooser.h
+++ b/libempathy-gtk/empathy-irc-network-chooser.h
@@ -24,8 +24,8 @@
 
 #include <gtk/gtk.h>
 
 
 #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
 
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c
index a10b2ca3c9ffbfb1bb345356275a49db2c5d2458..8e4339cf9909e30d182eb415243e1d9ff521f4d4 100644 (file)
--- a/libempathy-gtk/empathy-irc-network-dialog.c
+++ b/libempathy-gtk/empathy-irc-network-dialog.c
@@ -22,7 +22,7 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"

 
 #include "empathy-ui-utils.h"
 #include "totem-subtitle-encoding.h"
 
 #include "empathy-ui-utils.h"
 #include "totem-subtitle-encoding.h"

diff --git a/libempathy-gtk/empathy-irc-network-dialog.h b/libempathy-gtk/empathy-irc-network-dialog.h
index 547e3d668114aa114f4e6df31dccfce685dd0eba..a49c63da9cdcf77fe85682f7674f379b8315a8ab 100644 (file)
--- a/libempathy-gtk/empathy-irc-network-dialog.h
+++ b/libempathy-gtk/empathy-irc-network-dialog.h
@@ -23,7 +23,7 @@
 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 

-#include "libempathy/empathy-irc-network.h"
+#include "empathy-irc-network.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-live-search.c b/libempathy-gtk/empathy-live-search.c
index fe36612768e4c771d5976e1b8bc6dee2c7621332..3047612b03c7764fcaa767c9ee37ae289b3b2a82 100644 (file)
--- a/libempathy-gtk/empathy-live-search.c
+++ b/libempathy-gtk/empathy-live-search.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
 
 #include "config.h"
 

-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"

 
 #include "empathy-live-search.h"
 
 
 #include "empathy-live-search.h"
 

diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
index de2b7ba0ddebd4b01d4c71b7f8639262aba34ce2..dea29762d9e73f37c00d2cfa50a2d6f4859adb12 100644 (file)
--- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
+++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
@@ -23,13 +23,13 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #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 "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)
 
 G_DEFINE_TYPE (EmpathyLocalXmppAssistantWidget,
     empathy_local_xmpp_assistant_widget, GTK_TYPE_GRID)

diff --git a/libempathy-gtk/empathy-location-manager.c b/libempathy-gtk/empathy-location-manager.c
index ab72fff7db967ca781b2959d7df82100744455ce..bb6dfa6da3ef165b4d2c31a61a721da4e4d39987 100644 (file)
--- a/libempathy-gtk/empathy-location-manager.c
+++ b/libempathy-gtk/empathy-location-manager.c
@@ -25,12 +25,12 @@
 
 #include "empathy-location-manager.h"
 
 
 #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
 
 #define DEBUG_FLAG EMPATHY_DEBUG_LOCATION

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 /* Seconds before updating the location */
 #define TIMEOUT 10
 
 /* Seconds before updating the location */
 #define TIMEOUT 10

diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index d49dd558720cc8def53b74b3ffbf3ea119a5cefc..1f091f62d9eda6d117978e145b2b6bfd19c51b76 100644 (file)
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -29,13 +29,13 @@
 
 #include <telepathy-glib/proxy-subclass.h>
 
 
 #include <telepathy-glib/proxy-subclass.h>
 

-#include "extensions/extensions.h"
+#include "extensions.h"

 
 

-#include "libempathy/action-chain-internal.h"
-#include "libempathy/empathy-camera-monitor.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-utils.h"
+#include "action-chain-internal.h"
+#include "empathy-camera-monitor.h"
+#include "empathy-gsettings.h"
+#include "empathy-request-util.h"
+#include "empathy-utils.h"

 
 #include "empathy-log-window.h"
 #include "empathy-account-chooser.h"
 
 #include "empathy-log-window.h"
 #include "empathy-account-chooser.h"


@@ -48,7 +48,7 @@
 #include "empathy-geometry.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-geometry.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 #define EMPATHY_NS "http://live.gnome.org/Empathy"
 
 
 #define EMPATHY_NS "http://live.gnome.org/Empathy"
 

diff --git a/libempathy-gtk/empathy-new-account-dialog.c b/libempathy-gtk/empathy-new-account-dialog.c
index e70f59887c67fc290f8e1189921ed5e8f5238ad5..09f41a4e8b154dbf34733fba408fb64b0d499a80 100644 (file)
--- a/libempathy-gtk/empathy-new-account-dialog.c
+++ b/libempathy-gtk/empathy-new-account-dialog.c
@@ -23,7 +23,7 @@
 #include <glib/gi18n-lib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include <glib/gi18n-lib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 #include "empathy-account-widget.h"
 #include "empathy-protocol-chooser.h"
 
 #include "empathy-account-widget.h"
 #include "empathy-protocol-chooser.h"

diff --git a/libempathy-gtk/empathy-new-account-dialog.h b/libempathy-gtk/empathy-new-account-dialog.h
index c68630d84bf4fc847e8ad6aff33e75b9853aad50..6a5d5c2d51216264b9a0c728c2689a1fe68a3979 100644 (file)
--- a/libempathy-gtk/empathy-new-account-dialog.h
+++ b/libempathy-gtk/empathy-new-account-dialog.h
@@ -22,7 +22,7 @@
 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 

-#include "libempathy/empathy-account-settings.h"
+#include "empathy-account-settings.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c
index 7a76750cd57c14b8a907b2fe6c2dfcaf3037581b..61b3870de48f30c1c89e11a36590ff884d6b25d6 100644 (file)
--- a/libempathy-gtk/empathy-new-call-dialog.c
+++ b/libempathy-gtk/empathy-new-call-dialog.c
@@ -22,11 +22,11 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "libempathy/empathy-camera-monitor.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-camera-monitor.h"
+#include "empathy-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 #include "empathy-contact-chooser.h"
 #include "empathy-ui-utils.h"
 
 #include "empathy-contact-chooser.h"
 #include "empathy-ui-utils.h"

diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index 9aa641289b81094ba1ab7e3e8e763728dd585e1f..7308d147225b58ddf23c2b9a5cf56efe01614f11 100644 (file)
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -22,10 +22,10 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "libempathy/empathy-request-util.h"
+#include "empathy-request-util.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 #include "empathy-contact-chooser.h"
 #include "empathy-ui-utils.h"
 
 #include "empathy-contact-chooser.h"
 #include "empathy-ui-utils.h"

diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c
index aa5f0402e3d1a6be9107b07ed7bddbea421fc68e..b322ac7f94f942f5180ea3a4aecff0b0d04a08df 100644 (file)
--- a/libempathy-gtk/empathy-notify-manager.c
+++ b/libempathy-gtk/empathy-notify-manager.c
@@ -21,13 +21,13 @@
 
 #include <libnotify/notify.h>
 
 
 #include <libnotify/notify.h>
 

-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-gsettings.h"
+#include "empathy-utils.h"

 
 #include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 
 #include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 #include "empathy-notify-manager.h"
 
 
 #include "empathy-notify-manager.h"
 

diff --git a/libempathy-gtk/empathy-notify-manager.h b/libempathy-gtk/empathy-notify-manager.h
index b0100ccb7cd15f4a4fe5a26130c8f613d99917a6..ca8996f7d76e943a919690a7f4ec1886cd8cb2fb 100644 (file)
--- a/libempathy-gtk/empathy-notify-manager.h
+++ b/libempathy-gtk/empathy-notify-manager.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
 
 #include <glib-object.h>
 

-#include "libempathy/empathy-contact.h"
+#include "empathy-contact.h"

 
 #include <libnotify/notification.h>
 
 
 #include <libnotify/notification.h>
 

diff --git a/libempathy-gtk/empathy-password-dialog.c b/libempathy-gtk/empathy-password-dialog.c
index 90550f4f21f6ee8a403bab2efa95ffd7d31ecbeb..e06a724955a06d08fafcb8372821e5bb432f82d1 100644 (file)
--- a/libempathy-gtk/empathy-password-dialog.c
+++ b/libempathy-gtk/empathy-password-dialog.c
@@ -24,7 +24,7 @@
 #include <glib/gi18n-lib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #include <glib/gi18n-lib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 G_DEFINE_TYPE (EmpathyPasswordDialog, empathy_password_dialog,
     EMPATHY_TYPE_BASE_PASSWORD_DIALOG)
 
 G_DEFINE_TYPE (EmpathyPasswordDialog, empathy_password_dialog,
     EMPATHY_TYPE_BASE_PASSWORD_DIALOG)

diff --git a/libempathy-gtk/empathy-password-dialog.h b/libempathy-gtk/empathy-password-dialog.h
index 7511cbda322de8a7fb70288e55c512add37e88c1..9ae16b2812f9764385bf2d5265d7181544f6a78f 100644 (file)
--- a/libempathy-gtk/empathy-password-dialog.h
+++ b/libempathy-gtk/empathy-password-dialog.h
@@ -23,9 +23,9 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
 

-#include "libempathy/empathy-server-sasl-handler.h"
+#include "empathy-server-sasl-handler.h"

 
 

-#include "libempathy-gtk/empathy-base-password-dialog.h"
+#include "empathy-base-password-dialog.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index cc9a4829905d058f8ab462efa8af443a50aced4d..cf2dbdf7712708904203a8625d7a1c255a48dcb4 100644 (file)
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -28,12 +28,12 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "libempathy/empathy-presence-manager.h"
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-status-presets.h"
+#include "empathy-presence-manager.h"
+#include "empathy-utils.h"
+#include "empathy-status-presets.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 #include "empathy-ui-utils.h"
 #include "empathy-presence-chooser.h"
 
 #include "empathy-ui-utils.h"
 #include "empathy-presence-chooser.h"

diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
index 8b3a247315ff9b8cbb377acdf769bba8cfa943c8..4722462fe14dd34f4be1170b88f95dd987a18ed8 100644 (file)
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -24,14 +24,14 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-connection-managers.h"
+#include "empathy-utils.h"
+#include "empathy-connection-managers.h"

 
 #include "empathy-protocol-chooser.h"
 #include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 
 #include "empathy-protocol-chooser.h"
 #include "empathy-ui-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 /**
  * SECTION:empathy-protocol-chooser
 
 /**
  * SECTION:empathy-protocol-chooser

diff --git a/libempathy-gtk/empathy-protocol-chooser.h b/libempathy-gtk/empathy-protocol-chooser.h
index 469f89f32555790ae3bf9961cf5df490c551bcf1..47e4592edfa149fcba00c48843c2c18225f803e4 100644 (file)
--- a/libempathy-gtk/empathy-protocol-chooser.h
+++ b/libempathy-gtk/empathy-protocol-chooser.h
@@ -28,7 +28,7 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
 
 #include <telepathy-glib/telepathy-glib.h>
 

-#include "libempathy/empathy-account-settings.h"
+#include "empathy-account-settings.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-roster-contact.c b/libempathy-gtk/empathy-roster-contact.c
index f7c6f55503b386e784c0a0290a32dc0e3b225937..a560f09534285ce5b880efee83106e545308d5ce 100644 (file)
--- a/libempathy-gtk/empathy-roster-contact.c
+++ b/libempathy-gtk/empathy-roster-contact.c
@@ -4,7 +4,7 @@
 
 #include "empathy-roster-contact.h"
 
 
 #include "empathy-roster-contact.h"
 

-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"

 
 #include "empathy-images.h"
 #include "empathy-ui-utils.h"
 
 #include "empathy-images.h"
 #include "empathy-ui-utils.h"

diff --git a/libempathy-gtk/empathy-roster-model-manager.c b/libempathy-gtk/empathy-roster-model-manager.c
index ff3ff53474fa98d94d00614d9fd9a594a6031249..99c929006c490968832714dac7fdd0bc267ae68b 100644 (file)
--- a/libempathy-gtk/empathy-roster-model-manager.c
+++ b/libempathy-gtk/empathy-roster-model-manager.c
@@ -29,7 +29,7 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"

 
 static void roster_model_iface_init (EmpathyRosterModelInterface *iface);
 
 
 static void roster_model_iface_init (EmpathyRosterModelInterface *iface);
 

diff --git a/libempathy-gtk/empathy-roster-model-manager.h b/libempathy-gtk/empathy-roster-model-manager.h
index 5d5e12f0d6ded9bc3e43b83674f9ec16402529f1..a38e6593a226c810a13bdb570f15531119b22cbc 100644 (file)
--- a/libempathy-gtk/empathy-roster-model-manager.h
+++ b/libempathy-gtk/empathy-roster-model-manager.h
@@ -23,7 +23,7 @@
 
 #include <glib-object.h>
 
 
 #include <glib-object.h>
 

-#include "libempathy/empathy-individual-manager.h"
+#include "empathy-individual-manager.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-roster-view.c b/libempathy-gtk/empathy-roster-view.c
index d9b3c7bf284dccc984cf8c33c14ceaab9de85cf2..336f629c7b95eefab22467486e162818cbb1f465 100644 (file)
--- a/libempathy-gtk/empathy-roster-view.c
+++ b/libempathy-gtk/empathy-roster-view.c
@@ -4,7 +4,7 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "libempathy/empathy-contact-groups.h"
+#include "empathy-contact-groups.h"

 
 #include "empathy-roster-contact.h"
 #include "empathy-roster-group.h"
 
 #include "empathy-roster-contact.h"
 #include "empathy-roster-group.h"

diff --git a/libempathy-gtk/empathy-roster-view.h b/libempathy-gtk/empathy-roster-view.h
index 8a1b6d404a70c27f46023d23407f69e4adc8ba6b..45e240844838e3cc6a38f457d76b5fe88ba17132 100644 (file)
--- a/libempathy-gtk/empathy-roster-view.h
+++ b/libempathy-gtk/empathy-roster-view.h
@@ -2,10 +2,10 @@
 #ifndef __EMPATHY_ROSTER_VIEW_H__
 #define __EMPATHY_ROSTER_VIEW_H__
 
 #ifndef __EMPATHY_ROSTER_VIEW_H__
 #define __EMPATHY_ROSTER_VIEW_H__
 

-#include "libempathy-gtk/egg-list-box/egg-list-box.h"
-#include "libempathy-gtk/empathy-live-search.h"
+#include "egg-list-box/egg-list-box.h"
+#include "empathy-live-search.h"

 
 

-#include "libempathy-gtk/empathy-roster-model.h"
+#include "empathy-roster-model.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-search-bar.c b/libempathy-gtk/empathy-search-bar.c
index 558a125b4210c6915bd4b13ec5cde36d6e80fe1d..cfb595c2792264e5970f0456a0f661aa77bde336 100644 (file)
--- a/libempathy-gtk/empathy-search-bar.c
+++ b/libempathy-gtk/empathy-search-bar.c
@@ -21,7 +21,7 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"

 
 #include "empathy-search-bar.h"
 #include "empathy-ui-utils.h"
 
 #include "empathy-search-bar.h"
 #include "empathy-ui-utils.h"

diff --git a/libempathy-gtk/empathy-share-my-desktop.c b/libempathy-gtk/empathy-share-my-desktop.c
index 5a0737adc0eb23bb0fe8a29e14ff769f45afe328..78bf1472d433ccadba24f099fd33d1d8d2124315 100644 (file)
--- a/libempathy-gtk/empathy-share-my-desktop.c
+++ b/libempathy-gtk/empathy-share-my-desktop.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SHARE_DESKTOP
 #include "config.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SHARE_DESKTOP

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 #include "empathy-share-my-desktop.h"
 
 
 #include "empathy-share-my-desktop.h"
 

diff --git a/libempathy-gtk/empathy-share-my-desktop.h b/libempathy-gtk/empathy-share-my-desktop.h
index 4f11aa8afda52a25e369ef8cad79824a343e05a2..5953e15e8f586891877ee0e221feb938e439085f 100644 (file)
--- a/libempathy-gtk/empathy-share-my-desktop.h
+++ b/libempathy-gtk/empathy-share-my-desktop.h
@@ -21,7 +21,7 @@
 #ifndef __EMPATHY_SHARE_MY_DESKTOP_H__
 #define __EMPATHY_SHARE_MY_DESKTOP_H__
 
 #ifndef __EMPATHY_SHARE_MY_DESKTOP_H__
 #define __EMPATHY_SHARE_MY_DESKTOP_H__
 

-#include "libempathy/empathy-contact.h"
+#include "empathy-contact.h"

 
 void empathy_share_my_desktop_share_with_contact (EmpathyContact *contact);
 
 
 void empathy_share_my_desktop_share_with_contact (EmpathyContact *contact);
 

diff --git a/libempathy-gtk/empathy-smiley-manager.c b/libempathy-gtk/empathy-smiley-manager.c
index 494ae7f6adb7ece2854ed4fd08aca374c4b8d4e9..77ea5b33db4bebaad83ffbaf470d49773df018da 100644 (file)
--- a/libempathy-gtk/empathy-smiley-manager.c
+++ b/libempathy-gtk/empathy-smiley-manager.c
@@ -22,7 +22,7 @@
 
 #include "config.h"
 
 
 #include "config.h"
 

-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"

 #include "empathy-smiley-manager.h"
 #include "empathy-ui-utils.h"
 
 #include "empathy-smiley-manager.h"
 #include "empathy-ui-utils.h"
 

diff --git a/libempathy-gtk/empathy-sound-manager.c b/libempathy-gtk/empathy-sound-manager.c
index 8bcca8bb14739334b02dfc3baac100a5c999bac1..a66e5f4cf5d64c1d3aefc82b93c6ee8caa054a7a 100644 (file)
--- a/libempathy-gtk/empathy-sound-manager.c
+++ b/libempathy-gtk/empathy-sound-manager.c
@@ -24,9 +24,9 @@
 #include <glib/gi18n-lib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include <glib/gi18n-lib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-debug.h"
+#include "empathy-gsettings.h"
+#include "empathy-utils.h"

 
 typedef struct {
   EmpathySound sound_id;
 
 typedef struct {
   EmpathySound sound_id;

diff --git a/libempathy-gtk/empathy-spell.c b/libempathy-gtk/empathy-spell.c
index 206edc192b991f201ade6dd082ca0fe8fe18dcba..409b41bd53f02624333990b0c2f904484b4082d8 100644 (file)
--- a/libempathy-gtk/empathy-spell.c
+++ b/libempathy-gtk/empathy-spell.c
@@ -32,8 +32,8 @@
 #include "empathy-spell.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-spell.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-gsettings.h"
+#include "empathy-debug.h"
+#include "empathy-gsettings.h"

 
 #ifdef HAVE_ENCHANT
 
 
 #ifdef HAVE_ENCHANT
 

diff --git a/libempathy-gtk/empathy-status-preset-dialog.c b/libempathy-gtk/empathy-status-preset-dialog.c
index 6ba1e54d16874d4edb903a377ffa314a5f3bbc9a..91c8160762ec8e39e8cc46dfceac6d8d8f62688e 100644 (file)
--- a/libempathy-gtk/empathy-status-preset-dialog.c
+++ b/libempathy-gtk/empathy-status-preset-dialog.c
@@ -38,11 +38,11 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-status-presets.h"
+#include "empathy-utils.h"
+#include "empathy-status-presets.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 #include "empathy-ui-utils.h"
 #include "empathy-status-preset-dialog.h"
 
 #include "empathy-ui-utils.h"
 #include "empathy-status-preset-dialog.h"

diff --git a/libempathy-gtk/empathy-subscription-dialog.c b/libempathy-gtk/empathy-subscription-dialog.c
index 265ea13a22c66cddec672454cbc90f10dd81f1e5..9f8af521d8c0f7fcfc63960b4329a5fe3f590134 100644 (file)
--- a/libempathy-gtk/empathy-subscription-dialog.c
+++ b/libempathy-gtk/empathy-subscription-dialog.c
@@ -22,7 +22,7 @@
 
 #include "empathy-subscription-dialog.h"
 
 
 #include "empathy-subscription-dialog.h"
 

-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"

 #include "empathy-individual-widget.h"
 
 #include <glib/gi18n-lib.h>
 #include "empathy-individual-widget.h"
 
 #include <glib/gi18n-lib.h>

diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 1762eabd62f1ca01cd1e16f33874118e9c933964..851d7ad40e9e15413a0a73bcbe02e18a2360ea00 100644 (file)
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -23,9 +23,9 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-time.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-gsettings.h"
+#include "empathy-time.h"
+#include "empathy-utils.h"

 
 #include "empathy-theme-adium.h"
 #include "empathy-smiley-manager.h"
 
 #include "empathy-theme-adium.h"
 #include "empathy-smiley-manager.h"


@@ -35,7 +35,7 @@
 #include "empathy-webkit-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
 #include "empathy-webkit-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 #define BORING_DPI_DEFAULT 96
 
 
 #define BORING_DPI_DEFAULT 96
 

diff --git a/libempathy-gtk/empathy-theme-adium.h b/libempathy-gtk/empathy-theme-adium.h
index dee5aef356f987247df280b1605bd74ca3f17150..698d2846cf811499c35b0e86f5373752461ea809 100644 (file)
--- a/libempathy-gtk/empathy-theme-adium.h
+++ b/libempathy-gtk/empathy-theme-adium.h
@@ -23,7 +23,7 @@
 
 #include <webkit/webkitwebview.h>
 
 
 #include <webkit/webkitwebview.h>
 

-#include "libempathy/empathy-message.h"
+#include "empathy-message.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index bb4d229661af627b4fc05f135e43b52a7f924d3f..461aca35b37c3668679025e8aae5bb872f23e71a 100644 (file)
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -26,12 +26,12 @@
 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 

-#include "libempathy/empathy-gsettings.h"
+#include "empathy-gsettings.h"

 
 #include "empathy-theme-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 
 #include "empathy-theme-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 struct _EmpathyThemeManagerPriv
 {
 
 struct _EmpathyThemeManagerPriv
 {

diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c
index 88f22d36df8704b2e194722b37e218563674638e..ee4a943db891f252b9a8fcec451efe73d1cdd293 100644 (file)
--- a/libempathy-gtk/empathy-tls-dialog.c
+++ b/libempathy-gtk/empathy-tls-dialog.c
@@ -26,8 +26,8 @@
 #include <gcr/gcr.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TLS
 #include <gcr/gcr.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TLS

-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-debug.h"
+#include "empathy-utils.h"

 
 G_DEFINE_TYPE (EmpathyTLSDialog, empathy_tls_dialog,
     GTK_TYPE_MESSAGE_DIALOG)
 
 G_DEFINE_TYPE (EmpathyTLSDialog, empathy_tls_dialog,
     GTK_TYPE_MESSAGE_DIALOG)

diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 2ae011429de93a8459a7ffc1bc73f4d995e21f73..1cadaf4176fbbbce85db5747fb861dfba14a7812 100644 (file)
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -41,9 +41,9 @@
 #include "empathy-live-search.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-live-search.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-ft-factory.h"
+#include "empathy-debug.h"
+#include "empathy-utils.h"
+#include "empathy-ft-factory.h"

 
 void
 empathy_gtk_init (void)
 
 void
 empathy_gtk_init (void)

diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h
index 7c505c6681af57374fd1740721313124f45ec40a..a7d86e0bb30a5b96cf6d8637a5cc25f78d9adeb1 100644 (file)
--- a/libempathy-gtk/empathy-ui-utils.h
+++ b/libempathy-gtk/empathy-ui-utils.h
@@ -36,8 +36,8 @@
 
 #include <folks/folks.h>
 
 
 #include <folks/folks.h>
 

-#include "libempathy/empathy-contact.h"
-#include "libempathy/empathy-ft-handler.h"
+#include "empathy-contact.h"
+#include "empathy-ft-handler.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/libempathy-gtk/empathy-user-info.c b/libempathy-gtk/empathy-user-info.c
index 4c447772b39d894fdeb0e2201fe3e4ca49eb3ac4..0bbb57652b216cd8b14ccf99d2e83da6857b15ec 100644 (file)
--- a/libempathy-gtk/empathy-user-info.c
+++ b/libempathy-gtk/empathy-user-info.c
@@ -23,9 +23,9 @@
 #include <glib/gi18n-lib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 #include <glib/gi18n-lib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT

-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-time.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-debug.h"
+#include "empathy-time.h"
+#include "empathy-utils.h"

 
 #include "empathy-avatar-chooser.h"
 #include "empathy-calendar-button.h"
 
 #include "empathy-avatar-chooser.h"
 #include "empathy-calendar-button.h"

diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 1cbd661c76207b3ba3b571987a91b26e39b400e2..5f4059f20b88a978d40b00d2be9d92d32bbe3364 100644 (file)
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -2,8 +2,7 @@ include $(top_srcdir)/tools/flymake.mk
 
 AM_CPPFLAGS =                                           \
        $(ERROR_CFLAGS)                                 \
 
 AM_CPPFLAGS =                                           \
        $(ERROR_CFLAGS)                                 \

-       -I.                                             \
-       -I$(top_srcdir)                                 \
+       -I$(top_srcdir)/extensions                      \

        -I$(top_builddir)                               \
        -DDATADIR=\""$(datadir)"\"                      \
        -DLOCALEDIR=\""$(datadir)/locale"\"             \
        -I$(top_builddir)                               \
        -DDATADIR=\""$(datadir)"\"                      \
        -DLOCALEDIR=\""$(datadir)/locale"\"             \


@@ -199,7 +198,7 @@ stamp-empathy-enum-types.h: $(libempathy_headers) Makefile
                        --fhead "G_BEGIN_DECLS\n\n" \
                        --ftail "G_END_DECLS\n\n" \
                        --ftail "#endif /* __LIBEMPATHY_ENUM_TYPES_H__ */\n" \
                        --fhead "G_BEGIN_DECLS\n\n" \
                        --ftail "G_END_DECLS\n\n" \
                        --ftail "#endif /* __LIBEMPATHY_ENUM_TYPES_H__ */\n" \

-                       --fprod '#include "libempathy/@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_headers) ) > xgen-gth \
                        --eprod "#define EMPATHY_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n" \
                        --eprod "GType @enum_name@_get_type (void);\n" \
                $(libempathy_headers) ) > xgen-gth \

diff --git a/libempathy/empathy-auth-factory.c b/libempathy/empathy-auth-factory.c
index b2f2b802f5868ee88a1aed29bcf5d32ca166cafe..92a59dab28a1f8d84439e52b28df4844fa41a119 100644 (file)
--- a/libempathy/empathy-auth-factory.c
+++ b/libempathy/empathy-auth-factory.c
@@ -38,7 +38,7 @@
 #include "empathy-uoa-auth-handler.h"
 #endif /* HAVE_UOA */
 
 #include "empathy-uoa-auth-handler.h"
 #endif /* HAVE_UOA */
 

-#include "extensions/extensions.h"
+#include "extensions.h"

 
 G_DEFINE_TYPE (EmpathyAuthFactory, empathy_auth_factory, TP_TYPE_BASE_CLIENT);
 
 
 G_DEFINE_TYPE (EmpathyAuthFactory, empathy_auth_factory, TP_TYPE_BASE_CLIENT);
 

diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h
index 48e895841db66a0a1532f00db36a76014d9ebd7a..6701e568f997a43965c74e6cf4764ab97a418fc0 100644 (file)
--- a/libempathy/empathy-chatroom.h
+++ b/libempathy/empathy-chatroom.h
@@ -26,7 +26,7 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
 
 #include <telepathy-glib/telepathy-glib.h>
 

-#include "libempathy/empathy-tp-chat.h"
+#include "empathy-tp-chat.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index 16aaa6bb13dc8eea54deffa1b03403764f5c9791..b9b908ed7a4045a23d71c4d7737a867a9de11a8c 100644 (file)
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -21,7 +21,7 @@
 
 #include "empathy-server-sasl-handler.h"
 
 
 #include "empathy-server-sasl-handler.h"
 

-#include "extensions/extensions.h"
+#include "extensions.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #include "empathy-debug.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #include "empathy-debug.h"

diff --git a/libempathy/empathy-server-tls-handler.c b/libempathy/empathy-server-tls-handler.c
index d58155f5863ad27c4292f2ac30ac83e48b12a1a0..78be2f0a7a3cfdba38f7b9e72ae4887739cd1c70 100644 (file)
--- a/libempathy/empathy-server-tls-handler.c
+++ b/libempathy/empathy-server-tls-handler.c
@@ -26,7 +26,7 @@
 #include "empathy-debug.h"
 #include "empathy-utils.h"
 
 #include "empathy-debug.h"
 #include "empathy-utils.h"
 

-#include "extensions/extensions.h"
+#include "extensions.h"

 
 static void async_initable_iface_init (GAsyncInitableIface *iface);
 
 
 static void async_initable_iface_init (GAsyncInitableIface *iface);
 

diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index b6fd9ce131f007e926138a2365c44177611227c9..f62d1e5f02be243163beac6e37e6ab194df4a8c1 100644 (file)
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -37,7 +37,7 @@
 #include "empathy-utils.h"
 #include "empathy-presence-manager.h"
 
 #include "empathy-utils.h"
 #include "empathy-presence-manager.h"
 

-#include "extensions/extensions.h"
+#include "extensions.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"

diff --git a/nautilus-sendto-plugin/Makefile.am b/nautilus-sendto-plugin/Makefile.am
index 171ba2ed2c6fe70cd4a74757da52d3382fbcf727..a28415cc1fcf5ce7bfe3d2e72d26e2d964f4b794 100644 (file)
--- a/nautilus-sendto-plugin/Makefile.am
+++ b/nautilus-sendto-plugin/Makefile.am
@@ -2,7 +2,8 @@ plugindir = $(libdir)/nautilus-sendto/plugins
 
 INCLUDES =                                     \
        -I$(top_builddir)                       \
 
 INCLUDES =                                     \
        -I$(top_builddir)                       \

-       -I$(top_srcdir)                         \
+       -I$(top_srcdir)/libempathy              \
+       -I$(top_srcdir)/libempathy-gtk          \

        -DLOCALEDIR=\""$(datadir)/locale"\"     \
        $(NST_CFLAGS)                           \
        $(WARN_CFLAGS)                          \
        -DLOCALEDIR=\""$(datadir)/locale"\"     \
        $(NST_CFLAGS)                           \
        $(WARN_CFLAGS)                          \

diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
index fde281dd5b3aa172fd19d5e9235eb9b981dc0ba5..1ae7285468a4d8100602d1cc93d099d5b0766c2f 100644 (file)
--- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c
+++ b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
@@ -29,17 +29,17 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
 
 #include <telepathy-glib/telepathy-glib.h>
 

-#include "libempathy/empathy-contact.h"
-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-ft-factory.h"
-#include "libempathy/empathy-ft-handler.h"
-
-#include "libempathy-gtk/empathy-roster-model.h"
-#include "libempathy-gtk/empathy-roster-model-manager.h"
-#include "libempathy-gtk/empathy-contact-chooser.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-roster-view.h"
-#include "libempathy-gtk/empathy-roster-contact.h"
+#include "empathy-contact.h"
+#include "empathy-debug.h"
+#include "empathy-ft-factory.h"
+#include "empathy-ft-handler.h"
+
+#include "empathy-roster-model.h"
+#include "empathy-roster-model-manager.h"
+#include "empathy-contact-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-roster-view.h"
+#include "empathy-roster-contact.h"

 
 
 #include "nautilus-sendto-plugin.h"
 
 
 #include "nautilus-sendto-plugin.h"

diff --git a/src/Makefile.am b/src/Makefile.am
index b52e9ad8f6d6075651889cdf095c48cbb360410b..0766d95807dc857c32349c004c1800cba10dd9f7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,11 @@ include $(top_srcdir)/tools/flymake.mk
 CPPFLAGS_COMMON =                                      \
        $(EMPATHY_CFLAGS)                               \
        $(ERROR_CFLAGS)                                 \
 CPPFLAGS_COMMON =                                      \
        $(EMPATHY_CFLAGS)                               \
        $(ERROR_CFLAGS)                                 \

-       -I$(top_srcdir)                                 \
+       -I$(top_srcdir)/libempathy-gtk                  \
+       -I$(top_srcdir)/libempathy                      \
+       -I$(top_srcdir)/extensions                      \
+       -I$(top_builddir)/libempathy-gtk                \
+       -I$(top_builddir)/libempathy                    \

        -DG_LOG_DOMAIN=\"empathy\"                      \
        -DBIN_DIR=\"$(bindir)\"                         \
        $(DISABLE_DEPRECATED)                           \
        -DG_LOG_DOMAIN=\"empathy\"                      \
        -DBIN_DIR=\"$(bindir)\"                         \
        $(DISABLE_DEPRECATED)                           \

diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index fcd331aec6aff958e3ea58153d563cf733d13d1e..f84f28dba3454e983b2a387e2283d6b8618d520d 100644 (file)
--- a/src/empathy-accounts-common.c
+++ b/src/empathy-accounts-common.c
@@ -26,13 +26,13 @@
 
 #include "config.h"
 
 
 #include "config.h"
 

-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-ui-utils.h"

 
 #include "empathy-accounts-common.h"
 #include "empathy-accounts-dialog.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 
 #include "empathy-accounts-common.h"
 #include "empathy-accounts-dialog.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 gboolean
 empathy_accounts_has_non_salut_accounts (TpAccountManager *manager)
 
 gboolean
 empathy_accounts_has_non_salut_accounts (TpAccountManager *manager)

diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index acfd9c290e00e2d2a066c50e1ba2134aaf276796..421357c84056dc71bd59bd396f659f08b9c6c150 100644 (file)
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -28,14 +28,14 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-pkg-kit.h"
+#include "empathy-utils.h"
+#include "empathy-pkg-kit.h"

 
 

-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-account-widget-sip.h"
-#include "libempathy-gtk/empathy-user-info.h"
-#include "libempathy-gtk/empathy-local-xmpp-assistant-widget.h"
-#include "libempathy-gtk/empathy-new-account-dialog.h"
+#include "empathy-ui-utils.h"
+#include "empathy-account-widget-sip.h"
+#include "empathy-user-info.h"
+#include "empathy-local-xmpp-assistant-widget.h"
+#include "empathy-new-account-dialog.h"

 
 #include "empathy-accounts-common.h"
 #include "empathy-accounts-dialog.h"
 
 #include "empathy-accounts-common.h"
 #include "empathy-accounts-dialog.h"


@@ -43,7 +43,7 @@
 #include "empathy-import-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-import-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 /* Flashing delay for icons (milliseconds). */
 #define FLASH_TIMEOUT 500
 
 /* Flashing delay for icons (milliseconds). */
 #define FLASH_TIMEOUT 500

diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 57f6968c83f93998b7647c96e6bae7f35ed05505..0cf4c9572bf8ec8af3bc490c35b1dc79d069ce7f 100644 (file)
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -32,13 +32,13 @@
 #include <cheese-gtk.h>
 #endif
 
 #include <cheese-gtk.h>
 #endif
 

-#include "libempathy/empathy-utils.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-utils.h"
+#include "empathy-ui-utils.h"

 
 #include "empathy-accounts-common.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 
 #include "empathy-accounts-common.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 #define EMPATHY_ACCOUNTS_DBUS_NAME "org.gnome.EmpathyAccounts"
 
 
 #define EMPATHY_ACCOUNTS_DBUS_NAME "org.gnome.EmpathyAccounts"
 

diff --git a/src/empathy-audio-sink.c b/src/empathy-audio-sink.c
index 01bc80f53f4c3c1a06a4de263d72d8c5e8863378..0147b870679d56645be19566e0391440724cd399 100644 (file)
--- a/src/empathy-audio-sink.c
+++ b/src/empathy-audio-sink.c
@@ -30,7 +30,7 @@
 #include "empathy-audio-sink.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include "empathy-audio-sink.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 G_DEFINE_TYPE(EmpathyGstAudioSink, empathy_audio_sink, GST_TYPE_BIN)
 
 
 G_DEFINE_TYPE(EmpathyGstAudioSink, empathy_audio_sink, GST_TYPE_BIN)
 

diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c
index 2f919533ecf0b178addf9fe40110332cbfa20fb2..bdb25f80c8ae459eafc39bef340590be7220937a 100644 (file)
--- a/src/empathy-audio-src.c
+++ b/src/empathy-audio-src.c
@@ -26,14 +26,14 @@
 #include <gst/interfaces/streamvolume.h>
 #endif
 
 #include <gst/interfaces/streamvolume.h>
 #endif
 

-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"

 #include "empathy-audio-utils.h"
 
 #include "empathy-audio-src.h"
 #include "empathy-mic-monitor.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include "empathy-audio-utils.h"
 
 #include "empathy-audio-src.h"
 #include "empathy-mic-monitor.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 G_DEFINE_TYPE(EmpathyGstAudioSrc, empathy_audio_src, GST_TYPE_BIN)
 
 
 G_DEFINE_TYPE(EmpathyGstAudioSrc, empathy_audio_src, GST_TYPE_BIN)
 

diff --git a/src/empathy-audio-utils.c b/src/empathy-audio-utils.c
index 89202f54113d95839216e81accded953d5ac0cae..e1f9ec56f26d6dae169cfaf6d9db08c658e1151d 100644 (file)
--- a/src/empathy-audio-utils.c
+++ b/src/empathy-audio-utils.c
@@ -24,10 +24,10 @@
 
 #include "empathy-audio-utils.h"
 
 
 #include "empathy-audio-utils.h"
 

-#include "libempathy/empathy-gsettings.h"
+#include "empathy-gsettings.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 void
 empathy_audio_set_stream_properties (GstElement *element,
 
 void
 empathy_audio_set_stream_properties (GstElement *element,

diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c
index 3636142cca99309808ffbc329eef5be2bd2bbb34..6da465665d410399c4631580f625375c90179ffa 100644 (file)
--- a/src/empathy-auth-client.c
+++ b/src/empathy-auth-client.c
@@ -24,15 +24,15 @@
 #include <glib/gi18n.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TLS
 #include <glib/gi18n.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TLS

-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-auth-factory.h"
-#include "libempathy/empathy-server-tls-handler.h"
-#include "libempathy/empathy-tls-verifier.h"
-
-#include "libempathy-gtk/empathy-bad-password-dialog.h"
-#include "libempathy-gtk/empathy-password-dialog.h"
-#include "libempathy-gtk/empathy-tls-dialog.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-debug.h"
+#include "empathy-auth-factory.h"
+#include "empathy-server-tls-handler.h"
+#include "empathy-tls-verifier.h"
+
+#include "empathy-bad-password-dialog.h"
+#include "empathy-password-dialog.h"
+#include "empathy-tls-dialog.h"
+#include "empathy-ui-utils.h"

 
 #include "empathy-sanity-cleaning.h"
 
 
 #include "empathy-sanity-cleaning.h"
 

diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index 42bd46f508216df3ebe01af01aa751b8e47147bf..865aeace247502b7eb7a679d51c00ff082a692da 100644 (file)
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.c
@@ -20,14 +20,14 @@
 
 #include "config.h"
 
 
 #include "config.h"
 

-#include "libempathy/empathy-client-factory.h"
-#include "libempathy/empathy-request-util.h"
+#include "empathy-client-factory.h"
+#include "empathy-request-util.h"

 
 #include "empathy-call-factory.h"
 #include "empathy-call-handler.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 
 #include "empathy-call-factory.h"
 #include "empathy-call-handler.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 G_DEFINE_TYPE(EmpathyCallFactory, empathy_call_factory, TP_TYPE_BASE_CLIENT)
 
 
 G_DEFINE_TYPE(EmpathyCallFactory, empathy_call_factory, TP_TYPE_BASE_CLIENT)
 

diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c
index 88b166f1f3b5fa5569a3dc7da814e596b6fd048f..28e8cda834de7430ff2446538a62004fedae3d58 100644 (file)
--- a/src/empathy-call-handler.c
+++ b/src/empathy-call-handler.c
@@ -22,14 +22,14 @@
 
 #include <telepathy-farstream/telepathy-farstream.h>
 
 
 #include <telepathy-farstream/telepathy-farstream.h>
 

-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"

 
 

-#include "libempathy-gtk/empathy-call-utils.h"
+#include "empathy-call-utils.h"

 
 #include "empathy-call-handler.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 
 #include "empathy-call-handler.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 G_DEFINE_TYPE(EmpathyCallHandler, empathy_call_handler, G_TYPE_OBJECT)
 
 
 G_DEFINE_TYPE(EmpathyCallHandler, empathy_call_handler, G_TYPE_OBJECT)
 

diff --git a/src/empathy-call-handler.h b/src/empathy-call-handler.h
index 55e4897826a964e64c75e44f70bdd3d768d7afda..0f42209c2486408c2f660387736f442047f6c546 100644 (file)
--- a/src/empathy-call-handler.h
+++ b/src/empathy-call-handler.h
@@ -28,7 +28,7 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
 
 #include <telepathy-glib/telepathy-glib.h>
 

-#include "libempathy/empathy-contact.h"
+#include "empathy-contact.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c
index c0aa04170fc498b94b7808207cdd6852a32dc543..2a60f6fe2a68d452ed794e2c48a3e8b5e7efd80c 100644 (file)
--- a/src/empathy-call-observer.c
+++ b/src/empathy-call-observer.c
@@ -22,13 +22,13 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

-#include "libempathy-gtk/empathy-images.h"
-#include "libempathy-gtk/empathy-notify-manager.h"
+#include "empathy-images.h"
+#include "empathy-notify-manager.h"

 
 #include "empathy-call-observer.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 
 #include "empathy-call-observer.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 struct _EmpathyCallObserverPriv {
   EmpathyNotifyManager *notify_mgr;
 
 struct _EmpathyCallObserverPriv {
   EmpathyNotifyManager *notify_mgr;

diff --git a/src/empathy-call-window-fullscreen.c b/src/empathy-call-window-fullscreen.c
index b678c0a423d3c3769257ab6efcf08d632fab9e0c..6da478fbd653a11b79381dc227e492f6ed604e0a 100644 (file)
--- a/src/empathy-call-window-fullscreen.c
+++ b/src/empathy-call-window-fullscreen.c
@@ -24,8 +24,8 @@
 
 #include "empathy-call-window-fullscreen.h"
 
 
 #include "empathy-call-window-fullscreen.h"
 

-#include "libempathy/empathy-utils.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-utils.h"
+#include "empathy-ui-utils.h"

 
 /* The number of seconds for which the "leave fullscreen" popup should
    be shown */
 
 /* The number of seconds for which the "leave fullscreen" popup should
    be shown */

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 5a24fbcd3b26b734d38d95e68036c41b84d11567..9b67bba4a97948ebb564dcbf32974499900a76bb 100644 (file)
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -27,20 +27,20 @@
 #include <farstream/fs-element-added-notifier.h>
 #include <farstream/fs-utils.h>
 
 #include <farstream/fs-element-added-notifier.h>
 #include <farstream/fs-utils.h>
 

-#include "libempathy/empathy-camera-monitor.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-utils.h"
-
-#include "libempathy-gtk/empathy-dialpad-widget.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-sound-manager.h"
-#include "libempathy-gtk/empathy-geometry.h"
-#include "libempathy-gtk/empathy-images.h"
-#include "libempathy-gtk/empathy-call-utils.h"
+#include "empathy-camera-monitor.h"
+#include "empathy-gsettings.h"
+#include "empathy-request-util.h"
+#include "empathy-utils.h"
+
+#include "empathy-dialpad-widget.h"
+#include "empathy-ui-utils.h"
+#include "empathy-sound-manager.h"
+#include "empathy-geometry.h"
+#include "empathy-images.h"
+#include "empathy-call-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 #include "empathy-call-window-fullscreen.h"
 #include "empathy-about-dialog.h"
 
 #include "empathy-call-window-fullscreen.h"
 #include "empathy-about-dialog.h"

diff --git a/src/empathy-call.c b/src/empathy-call.c
index 47e3f3a835ff7f70b8ecc242d50597a03373fd11..9fccb5650fe4eb9824f52ba48a3a92fdeb6dc40b 100644 (file)
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -31,13 +31,13 @@
 #include <X11/Xlib.h>
 #endif
 
 #include <X11/Xlib.h>
 #endif
 

-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-ui-utils.h"

 
 #include "empathy-call-window.h"
 #include "empathy-call-factory.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 
 #include "empathy-call-window.h"
 #include "empathy-call-factory.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 /* Exit after $TIMEOUT seconds if not displaying any call window */
 #define TIMEOUT 60
 
 /* Exit after $TIMEOUT seconds if not displaying any call window */
 #define TIMEOUT 60

diff --git a/src/empathy-camera-menu.c b/src/empathy-camera-menu.c
index 2bfef6cb73466796654fbbc49a391c4df203a6f1..0674e7076cc5a576cac92ce01263671da015c281 100644 (file)
--- a/src/empathy-camera-menu.c
+++ b/src/empathy-camera-menu.c
@@ -21,13 +21,13 @@
 
 #include "config.h"
 
 
 #include "config.h"
 

-#include "libempathy/empathy-camera-monitor.h"
-#include "libempathy/empathy-gsettings.h"
+#include "empathy-camera-monitor.h"
+#include "empathy-gsettings.h"

 
 #include "empathy-camera-menu.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 
 #include "empathy-camera-menu.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 struct _EmpathyCameraMenuPrivate
 {
 
 struct _EmpathyCameraMenuPrivate
 {

diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index 50292fbd7e086c437f1f1cbade7e5c8c49b6b1bd..bc64cefc8be303a4f60b64cd82ba8affacef6e35 100644 (file)
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -21,20 +21,20 @@
 
 #include <telepathy-glib/proxy-subclass.h>
 
 
 #include <telepathy-glib/proxy-subclass.h>
 

-#include "libempathy/empathy-chatroom-manager.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-individual-manager.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-request-util.h"
+#include "empathy-individual-manager.h"

 
 

-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-ui-utils.h"

 
 #include "empathy-chat-window.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 
 #include "empathy-chat-window.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 #include "empathy-chat-manager.h"
 
 
 #include "empathy-chat-manager.h"
 

-#include "extensions/extensions.h"
+#include "extensions.h"

 
 enum {
   CLOSED_CHATS_CHANGED,
 
 enum {
   CLOSED_CHATS_CHANGED,

diff --git a/src/empathy-chat-manager.h b/src/empathy-chat-manager.h
index 5082e733722e16c8cfaaedc68fbec780ec963daf..ab3817ea92c2487c986dfc6709a4f38ea4369fae 100644 (file)
--- a/src/empathy-chat-manager.h
+++ b/src/empathy-chat-manager.h
@@ -22,7 +22,7 @@
 
 #include <glib-object.h>
 
 
 #include <glib-object.h>
 

-#include "libempathy-gtk/empathy-chat.h"
+#include "empathy-chat.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 59814bdf4c2eabc5b4eb6b9471703a7611ca5604..47f588f08cedcb5d6bf3cdb34caa793127d89e74 100644 (file)
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -30,19 +30,19 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 

-#include "libempathy/empathy-client-factory.h"
-#include "libempathy/empathy-chatroom-manager.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-individual-manager.h"
-
-#include "libempathy-gtk/empathy-images.h"
-#include "libempathy-gtk/empathy-geometry.h"
-#include "libempathy-gtk/empathy-smiley-manager.h"
-#include "libempathy-gtk/empathy-sound-manager.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-notify-manager.h"
+#include "empathy-client-factory.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-gsettings.h"
+#include "empathy-utils.h"
+#include "empathy-request-util.h"
+#include "empathy-individual-manager.h"
+
+#include "empathy-images.h"
+#include "empathy-geometry.h"
+#include "empathy-smiley-manager.h"
+#include "empathy-sound-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-notify-manager.h"

 
 #include "empathy-chat-manager.h"
 #include "empathy-chat-window.h"
 
 #include "empathy-chat-manager.h"
 #include "empathy-chat-window.h"


@@ -50,7 +50,7 @@
 #include "empathy-invite-participant-dialog.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
 #include "empathy-invite-participant-dialog.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 /* Macro to compare guint32 X timestamps, while accounting for wrapping around
  */
 
 /* Macro to compare guint32 X timestamps, while accounting for wrapping around
  */

diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h
index 62f49988f54580f01a0b2d7bca68fb5ca1a002e8..cfd82a1284b31e88211cc6503d1f862e9ee156d7 100644 (file)
--- a/src/empathy-chat-window.h
+++ b/src/empathy-chat-window.h
@@ -32,7 +32,7 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
 
 #include <telepathy-glib/telepathy-glib.h>
 

-#include "libempathy-gtk/empathy-chat.h"
+#include "empathy-chat.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index 1af26b230dc3d9354016705f54b433e345f7a862..9919b6edd5936c5eae1001cffed22e61496f2f0c 100644 (file)
--- a/src/empathy-chat.c
+++ b/src/empathy-chat.c
@@ -26,16 +26,16 @@
 
 #include <libnotify/notify.h>
 
 
 #include <libnotify/notify.h>
 

-#include "libempathy/empathy-presence-manager.h"
+#include "empathy-presence-manager.h"

 
 

-#include "libempathy-gtk/empathy-theme-manager.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-theme-manager.h"
+#include "empathy-ui-utils.h"

 
 #include "empathy-chat-manager.h"
 #include "empathy-chat-resources.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
 
 #include "empathy-chat-manager.h"
 #include "empathy-chat-resources.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 /* Exit after $TIMEOUT seconds if not displaying any call window */
 #define TIMEOUT 60
 
 /* Exit after $TIMEOUT seconds if not displaying any call window */
 #define TIMEOUT 60

diff --git a/src/empathy-chatrooms-window.c b/src/empathy-chatrooms-window.c
index 83f6b99d7756bbb3113b12315a4cffb93dd8838b..ff45bed9c0a93fc3f19fca8318b36245b8a3f893 100644 (file)
--- a/src/empathy-chatrooms-window.c
+++ b/src/empathy-chatrooms-window.c
@@ -27,11 +27,11 @@
 
 #include <glib/gi18n.h>
 
 
 #include <glib/gi18n.h>
 

-#include "libempathy/empathy-chatroom-manager.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-chatroom-manager.h"
+#include "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-chatrooms-window.h"
 
 
 #include "empathy-chatrooms-window.h"
 

diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index c5514b73a6c6c13a92ad7669b6f380676993eee7..546e174068875d4174477037b5d84a23c84e21dc 100644 (file)
--- a/src/empathy-debug-window.c
+++ b/src/empathy-debug-window.c
@@ -25,11 +25,11 @@
 #include <libsoup/soup.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include <libsoup/soup.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-debug.h"
+#include "empathy-utils.h"

 
 

-#include "libempathy-gtk/empathy-geometry.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-geometry.h"
+#include "empathy-ui-utils.h"

 
 #include "empathy-debug-window.h"
 
 
 #include "empathy-debug-window.h"
 

diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c
index cb17e3c71a3518bdbb1a11066f12055c8a9bc31a..ca348f3cd6ec88dc8cf65156d3ce701c8b2276da 100644 (file)
--- a/src/empathy-debugger.c
+++ b/src/empathy-debugger.c
@@ -21,7 +21,7 @@
 
 #include <glib/gi18n.h>
 
 
 #include <glib/gi18n.h>
 

-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-ui-utils.h"

 
 #include "empathy-debug-window.h"
 
 
 #include "empathy-debug-window.h"
 

diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index f95e76bafaf004c0e451591550f5342aee7f785f..c0b802d3bf13105844212eb15a75dc7b8501eaa8 100644 (file)
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -23,23 +23,23 @@
 
 #include <glib/gi18n.h>
 
 
 #include <glib/gi18n.h>
 

-#include "libempathy/empathy-presence-manager.h"
-#include "libempathy/empathy-connection-aggregator.h"
-#include "libempathy/empathy-tp-chat.h"
-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-sasl-mechanisms.h"
-
-#include "libempathy-gtk/empathy-images.h"
-#include "libempathy-gtk/empathy-sound-manager.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-call-utils.h"
-#include "libempathy-gtk/empathy-subscription-dialog.h"
+#include "empathy-presence-manager.h"
+#include "empathy-connection-aggregator.h"
+#include "empathy-tp-chat.h"
+#include "empathy-utils.h"
+#include "empathy-gsettings.h"
+#include "empathy-sasl-mechanisms.h"
+
+#include "empathy-images.h"
+#include "empathy-sound-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-call-utils.h"
+#include "empathy-subscription-dialog.h"

 
 #include "empathy-event-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
 
 #include "empathy-event-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyEventManager)
 
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyEventManager)
 

diff --git a/src/empathy-event-manager.h b/src/empathy-event-manager.h
index ee5daf404860dafc202af0e9a78b8df0cfff0139..511a5ed5785f26b8e62f88dda9986582559aa232 100644 (file)
--- a/src/empathy-event-manager.h
+++ b/src/empathy-event-manager.h
@@ -25,7 +25,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
 #include <glib.h>
 #include <glib-object.h>
 

-#include "libempathy/empathy-contact.h"
+#include "empathy-contact.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index 3cf8744206fe75e2bcf04b20c157ea106eccedd3..9098250bf39ecc81c2d4936e9e5f318db6a8f16c 100644 (file)
--- a/src/empathy-ft-manager.c
+++ b/src/empathy-ft-manager.c
@@ -32,11 +32,11 @@
 #include <glib/gi18n.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_FT
 #include <glib/gi18n.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_FT

-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-debug.h"
+#include "empathy-utils.h"

 
 

-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-geometry.h"
+#include "empathy-ui-utils.h"
+#include "empathy-geometry.h"

 
 #include "empathy-ft-manager.h"
 
 
 #include "empathy-ft-manager.h"
 

diff --git a/src/empathy-ft-manager.h b/src/empathy-ft-manager.h
index 8d81c76612aec7df59efe5c77d67d56b1a2f1783..22d47a76f7b531e4c498e08b8c8aeab6d156c7b5 100644 (file)
--- a/src/empathy-ft-manager.h
+++ b/src/empathy-ft-manager.h
@@ -29,7 +29,7 @@
 #include <glib-object.h>
 #include <glib.h>
 
 #include <glib-object.h>
 #include <glib.h>
 

-#include "libempathy/empathy-ft-handler.h"
+#include "empathy-ft-handler.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c
index 33c40844450f7c575686c189d20845e1dcf9f0bf..ea1ce184147fbdecf92f4a057990daf405509ec0 100644 (file)
--- a/src/empathy-import-dialog.c
+++ b/src/empathy-import-dialog.c
@@ -28,8 +28,8 @@
 #include "empathy-import-widget.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-import-widget.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-debug.h"
+#include "empathy-utils.h"

 
 enum {
   PROP_PARENT = 1,
 
 enum {
   PROP_PARENT = 1,

diff --git a/src/empathy-import-dialog.h b/src/empathy-import-dialog.h
index a074d7a7f21c7a96a7e65ed225a859800b949b93..87f1198f1b8e9f4ee08f753b8fb40d097fb28305 100644 (file)
--- a/src/empathy-import-dialog.h
+++ b/src/empathy-import-dialog.h
@@ -25,7 +25,7 @@
 #ifndef __EMPATHY_IMPORT_DIALOG_H__
 #define __EMPATHY_IMPORT_DIALOG_H__
 
 #ifndef __EMPATHY_IMPORT_DIALOG_H__
 #define __EMPATHY_IMPORT_DIALOG_H__
 

-#include "libempathy/empathy-connection-managers.h"
+#include "empathy-connection-managers.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c
index 394caede4cdcf3199209d25fa064ce2d4474d7df..22116648d4862ee2e35ee835a4d2ce82c8a9bdab 100644 (file)
--- a/src/empathy-import-pidgin.c
+++ b/src/empathy-import-pidgin.c
@@ -28,8 +28,8 @@
 #include "empathy-import-pidgin.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-import-pidgin.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-debug.h"
+#include "empathy-utils.h"

 
 /* Pidgin to CM map */
 typedef struct
 
 /* Pidgin to CM map */
 typedef struct

diff --git a/src/empathy-import-utils.c b/src/empathy-import-utils.c
index 768d493fe927cf1949bbac36b1c8ad184c8f35d4..718c7d1e138772fa5568165bc4bd4fd134ded2b7 100644 (file)
--- a/src/empathy-import-utils.c
+++ b/src/empathy-import-utils.c
@@ -19,8 +19,8 @@
  *          Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
  */
 
  *          Cosimo Cecchi <cosimo.cecchi@collabora.co.uk>
  */
 

-#include "libempathy/empathy-connection-managers.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-connection-managers.h"
+#include "empathy-utils.h"

 
 #include "empathy-import-utils.h"
 #include "empathy-import-pidgin.h"
 
 #include "empathy-import-utils.h"
 #include "empathy-import-pidgin.h"

diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index 938a8f12623bc278395386eb698580b646787f5c..68a71d5ffb1e1011fe91859a93e8b6e766d64f45 100644 (file)
--- a/src/empathy-import-widget.c
+++ b/src/empathy-import-widget.c
@@ -28,10 +28,10 @@
 #include "empathy-import-widget.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-import-widget.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-debug.h"
+#include "empathy-utils.h"

 
 

-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-ui-utils.h"

 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

diff --git a/src/empathy-import-widget.h b/src/empathy-import-widget.h
index f3e552cd22eb01e20dcd258a3e6522ee890318e6..225350e6eb1063ab1526eed69091027792fd6ef5 100644 (file)
--- a/src/empathy-import-widget.h
+++ b/src/empathy-import-widget.h
@@ -27,7 +27,7 @@
 
 #include <glib-object.h>
 
 
 #include <glib-object.h>
 

-#include "libempathy/empathy-connection-managers.h"
+#include "empathy-connection-managers.h"

 
 #include "empathy-import-utils.h"
 
 
 #include "empathy-import-utils.h"
 

diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c
index 783c8324007209038682d75ffffba2f3e9176374..f78052f8c65cfe178b9af2aaf72a5c8073a79bee 100644 (file)
--- a/src/empathy-invite-participant-dialog.c
+++ b/src/empathy-invite-participant-dialog.c
@@ -15,9 +15,9 @@
 
 #include "empathy-invite-participant-dialog.h"
 
 
 #include "empathy-invite-participant-dialog.h"
 

-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"

 
 

-#include "libempathy-gtk/empathy-contact-chooser.h"
+#include "empathy-contact-chooser.h"

 
 G_DEFINE_TYPE (EmpathyInviteParticipantDialog,
     empathy_invite_participant_dialog, GTK_TYPE_DIALOG);
 
 G_DEFINE_TYPE (EmpathyInviteParticipantDialog,
     empathy_invite_participant_dialog, GTK_TYPE_DIALOG);

diff --git a/src/empathy-invite-participant-dialog.h b/src/empathy-invite-participant-dialog.h
index 7946fa0010910dfc272b4ce98c44ab3d36fe9408..da121a49e3f28ccec0c508d7a801446af970859b 100644 (file)
--- a/src/empathy-invite-participant-dialog.h
+++ b/src/empathy-invite-participant-dialog.h
@@ -16,7 +16,7 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
 
 #include <telepathy-glib/telepathy-glib.h>
 

-#include "libempathy/empathy-tp-chat.h"
+#include "empathy-tp-chat.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/src/empathy-mic-menu.c b/src/empathy-mic-menu.c
index da7f800f4baa8dcad8ee4c521856a39f0252941d..0c6ed23a992e934499c9882fff402c9f2c40e7df 100644 (file)
--- a/src/empathy-mic-menu.c
+++ b/src/empathy-mic-menu.c
@@ -25,7 +25,7 @@
 #include "empathy-mic-monitor.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include "empathy-mic-monitor.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 struct _EmpathyMicMenuPrivate
 {
 
 struct _EmpathyMicMenuPrivate
 {

diff --git a/src/empathy-mic-monitor.c b/src/empathy-mic-monitor.c
index ef5b93d0d6bb89b2dd59bea2c27870b1edd0909d..afc526ffa713ebdf38f68543f6f7b0401f53b55f 100644 (file)
--- a/src/empathy-mic-monitor.c
+++ b/src/empathy-mic-monitor.c
@@ -24,10 +24,10 @@
 
 #include "empathy-mic-monitor.h"
 
 
 #include "empathy-mic-monitor.h"
 

-#include "libempathy/empathy-utils.h"
+#include "empathy-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 enum
 {
 
 enum
 {

diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index a255bbcab04a49c3861976396ec7dd8a9d75810b..cca729df928d5dd033bfdf089a4ce1ba8ad0ef6f 100644 (file)
--- a/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@ -25,17 +25,17 @@
 
 #include <glib/gi18n.h>
 
 
 #include <glib/gi18n.h>
 

-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-gsettings.h"
+#include "empathy-utils.h"
+#include "empathy-request-util.h"
+#include "empathy-gsettings.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-new-chatroom-dialog.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 
 #include "empathy-new-chatroom-dialog.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 G_DEFINE_TYPE (EmpathyNewChatroomDialog, empathy_new_chatroom_dialog,
     GTK_TYPE_DIALOG)
 
 G_DEFINE_TYPE (EmpathyNewChatroomDialog, empathy_new_chatroom_dialog,
     GTK_TYPE_DIALOG)

diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c
index b4f77eebbfed3a21835c3d61398244a597d416a9..7e06da1b7a69bd0d543f9d754dfc06a61c9a41e5 100644 (file)
--- a/src/empathy-notifications-approver.c
+++ b/src/empathy-notifications-approver.c
@@ -21,13 +21,13 @@
 
 #include <glib/gi18n.h>
 
 
 #include <glib/gi18n.h>
 

-#include "libempathy-gtk/empathy-notify-manager.h"
-#include "libempathy-gtk/empathy-call-utils.h"
+#include "empathy-notify-manager.h"
+#include "empathy-call-utils.h"

 
 #include "empathy-event-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 
 #include "empathy-event-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 #include "empathy-notifications-approver.h"
 
 
 #include "empathy-notifications-approver.h"
 

diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index 73d2dcc10e9ee4c116b57e26bb1381480c3ba6f4..735ba217504d0a762dcf1aad732d506839592d8e 100644 (file)
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -27,18 +27,18 @@
 
 #include <glib/gi18n.h>
 
 
 #include <glib/gi18n.h>
 

-#include "libempathy/empathy-client-factory.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-client-factory.h"
+#include "empathy-gsettings.h"
+#include "empathy-utils.h"

 
 

-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-theme-manager.h"
-#include "libempathy-gtk/empathy-spell.h"
+#include "empathy-ui-utils.h"
+#include "empathy-theme-manager.h"
+#include "empathy-spell.h"

 
 #include "empathy-preferences.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 
 #include "empathy-preferences.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 G_DEFINE_TYPE (EmpathyPreferences, empathy_preferences, GTK_TYPE_DIALOG);
 
 
 G_DEFINE_TYPE (EmpathyPreferences, empathy_preferences, GTK_TYPE_DIALOG);
 

diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index 15500902298fb5486a6f41ad78c90b59920a376e..2f64d877cfa35d333caed027c5956026b7cf5f53 100644 (file)
--- a/src/empathy-roster-window.c
+++ b/src/empathy-roster-window.c
@@ -26,26 +26,26 @@
 #include <sys/stat.h>
 #include <glib/gi18n.h>
 
 #include <sys/stat.h>
 #include <glib/gi18n.h>
 

-#include "libempathy/empathy-utils.h"
-#include "libempathy/empathy-request-util.h"
-#include "libempathy/empathy-chatroom-manager.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-status-presets.h"
-#include "libempathy/empathy-presence-manager.h"
-
-#include "libempathy-gtk/empathy-contact-blocking-dialog.h"
-#include "libempathy-gtk/empathy-contact-search-dialog.h"
-#include "libempathy-gtk/empathy-geometry.h"
-#include "libempathy-gtk/empathy-gtk-enum-types.h"
-#include "libempathy-gtk/empathy-individual-dialogs.h"
-#include "libempathy-gtk/empathy-roster-model-manager.h"
-#include "libempathy-gtk/empathy-roster-view.h"
-#include "libempathy-gtk/empathy-new-message-dialog.h"
-#include "libempathy-gtk/empathy-new-call-dialog.h"
-#include "libempathy-gtk/empathy-log-window.h"
-#include "libempathy-gtk/empathy-presence-chooser.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-utils.h"
+#include "empathy-request-util.h"
+#include "empathy-chatroom-manager.h"
+#include "empathy-gsettings.h"
+#include "empathy-gsettings.h"
+#include "empathy-status-presets.h"
+#include "empathy-presence-manager.h"
+
+#include "empathy-contact-blocking-dialog.h"
+#include "empathy-contact-search-dialog.h"
+#include "empathy-geometry.h"
+#include "empathy-gtk-enum-types.h"
+#include "empathy-individual-dialogs.h"
+#include "empathy-roster-model-manager.h"
+#include "empathy-roster-view.h"
+#include "empathy-new-message-dialog.h"
+#include "empathy-new-call-dialog.h"
+#include "empathy-log-window.h"
+#include "empathy-presence-chooser.h"
+#include "empathy-ui-utils.h"

 
 #include "empathy-accounts-dialog.h"
 #include "empathy-call-observer.h"
 
 #include "empathy-accounts-dialog.h"
 #include "empathy-call-observer.h"


@@ -59,7 +59,7 @@
 #include "empathy-ft-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-ft-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 /* Flashing delay for icons (milliseconds). */
 #define FLASH_TIMEOUT 500
 
 /* Flashing delay for icons (milliseconds). */
 #define FLASH_TIMEOUT 500

diff --git a/src/empathy-sanity-cleaning.c b/src/empathy-sanity-cleaning.c
index 8e2234fe1cf7783d0518b7f03d4f4f6144cd0f0b..025c9b84178d0d15ead8a416490ba37452e8389f 100644 (file)
--- a/src/empathy-sanity-cleaning.c
+++ b/src/empathy-sanity-cleaning.c
@@ -25,13 +25,13 @@
 
 #include "empathy-sanity-cleaning.h"
 
 
 #include "empathy-sanity-cleaning.h"
 

-#include "libempathy/empathy-gsettings.h"
+#include "empathy-gsettings.h"

 
 

-#include "libempathy-gtk/empathy-theme-manager.h"
+#include "empathy-theme-manager.h"

 
 #ifdef HAVE_UOA
 
 #ifdef HAVE_UOA

-#include "libempathy/empathy-pkg-kit.h"
-#include "libempathy/empathy-uoa-utils.h"
+#include "empathy-pkg-kit.h"
+#include "empathy-uoa-utils.h"

 
 #include <libaccounts-glib/ag-account-service.h>
 #include <libaccounts-glib/ag-manager.h>
 
 #include <libaccounts-glib/ag-account-service.h>
 #include <libaccounts-glib/ag-manager.h>


@@ -39,7 +39,7 @@
 #endif
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #endif
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 /*
  * This number has to be increased each time a new task is added or modified.
 
 /*
  * This number has to be increased each time a new task is added or modified.

diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index eef1f48a48603861c34173d9caa245136e32d697..b40ebed7b3da11abceb8bbe40ae7cb5de1044648 100644 (file)
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -21,19 +21,19 @@
 
 #include "config.h"
 
 
 #include "config.h"
 

-#include "libempathy/empathy-gsettings.h"
-#include "libempathy/empathy-utils.h"
+#include "empathy-gsettings.h"
+#include "empathy-utils.h"

 
 

-#include "libempathy-gtk/empathy-presence-chooser.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-new-message-dialog.h"
-#include "libempathy-gtk/empathy-new-call-dialog.h"
+#include "empathy-presence-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-new-message-dialog.h"
+#include "empathy-new-call-dialog.h"

 
 #include "empathy-status-icon.h"
 #include "empathy-event-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
 
 #include "empathy-status-icon.h"
 #include "empathy-event-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 /* Number of ms to wait when blinking */
 #define BLINK_TIMEOUT 500
 
 /* Number of ms to wait when blinking */
 #define BLINK_TIMEOUT 500

diff --git a/src/empathy-video-src.c b/src/empathy-video-src.c
index b8196023000a2348724e9dfb574a59c9c4c13be0..b3b84d3e74cfb41323e167af3d8cd1f457af5023 100644 (file)
--- a/src/empathy-video-src.c
+++ b/src/empathy-video-src.c
@@ -27,7 +27,7 @@
 #endif
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #endif
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 #include "empathy-video-src.h"
 
 
 #include "empathy-video-src.h"
 

diff --git a/src/empathy.c b/src/empathy.c
index 622dec61dca3f7c40e5d2058ad96bc84f695be6b..610150bbd73e507a01411cb83352c38005191afd 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -30,17 +30,17 @@
 
 #include <libnotify/notify.h>
 
 
 #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"
 
 #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 "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"
 
 
 #define EMPATHY_DBUS_NAME "org.gnome.Empathy"
 

diff --git a/tests/Makefile.am b/tests/Makefile.am
index fdd67482a9cadcfa3eb11d8e5b7d572e2b67844c..67fe5d895d1706ededaacfec0f5c7f4c608b2343 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,7 +10,8 @@ EXTRA_DIST =          \
 
 AM_CPPFLAGS =                                          \
        $(ERROR_CFLAGS)                                 \
 
 AM_CPPFLAGS =                                          \
        $(ERROR_CFLAGS)                                 \

-       -I$(top_srcdir)                                 \
+       -I$(top_srcdir)/libempathy                      \
+       -I$(top_srcdir)/libempathy-gtk                  \

        -DPKGDATADIR=\""$(pkgdatadir)"\"                \
        -DGCR_API_SUBJECT_TO_CHANGE                     \
        $(EMPATHY_CFLAGS)                               \
        -DPKGDATADIR=\""$(pkgdatadir)"\"                \
        -DGCR_API_SUBJECT_TO_CHANGE                     \
        $(EMPATHY_CFLAGS)                               \

diff --git a/tests/empathy-chatroom-manager-test.c b/tests/empathy-chatroom-manager-test.c
index d3b0e7a435b11103695ae86684af8db5b092eb09..e6e8258359a2bd34cd5cf5c8b1d92e27221dfff3 100644 (file)
--- a/tests/empathy-chatroom-manager-test.c
+++ b/tests/empathy-chatroom-manager-test.c
@@ -5,7 +5,7 @@
 
 #include <telepathy-glib/telepathy-glib.h>
 
 
 #include <telepathy-glib/telepathy-glib.h>
 

-#include "libempathy/empathy-chatroom-manager.h"
+#include "empathy-chatroom-manager.h"

 
 #include "test-helper.h"
 
 
 #include "test-helper.h"
 

diff --git a/tests/empathy-chatroom-test.c b/tests/empathy-chatroom-test.c
index 38ea4a14649f6839c2c72e411858bf95442f8c32..4a0f655e3c866a159e52ac09bbed819389912f1a 100644 (file)
--- a/tests/empathy-chatroom-test.c
+++ b/tests/empathy-chatroom-test.c
@@ -4,7 +4,7 @@
 
 #include "test-helper.h"
 
 
 #include "test-helper.h"
 

-#include "libempathy/empathy-chatroom.h"
+#include "empathy-chatroom.h"

 
 #if 0
 static EmpathyChatroom *
 
 #if 0
 static EmpathyChatroom *

diff --git a/tests/empathy-irc-network-manager-test.c b/tests/empathy-irc-network-manager-test.c
index 3bef1fe43c07c4298ba155c1b596933f81cde6f0..9a3c46afeadcb798ec4df86c5d35124da9322a3d 100644 (file)
--- a/tests/empathy-irc-network-manager-test.c
+++ b/tests/empathy-irc-network-manager-test.c
@@ -6,7 +6,7 @@
 #include "test-irc-helper.h"
 #include "test-helper.h"
 
 #include "test-irc-helper.h"
 #include "test-helper.h"
 

-#include "libempathy/empathy-irc-network-manager.h"
+#include "empathy-irc-network-manager.h"

 
 #define GLOBAL_SAMPLE "default-irc-networks-sample.xml"
 #define USER_SAMPLE "user-irc-networks-sample.xml"
 
 #define GLOBAL_SAMPLE "default-irc-networks-sample.xml"
 #define USER_SAMPLE "user-irc-networks-sample.xml"

diff --git a/tests/empathy-irc-network-test.c b/tests/empathy-irc-network-test.c
index 8e9e86bc52642efb7cd906a066c50e4c60d93a0a..d22e04f0545233fd082d6b3ebce99a064b405f29 100644 (file)
--- a/tests/empathy-irc-network-test.c
+++ b/tests/empathy-irc-network-test.c
@@ -5,7 +5,7 @@
 #include "test-irc-helper.h"
 #include "test-helper.h"
 
 #include "test-irc-helper.h"
 #include "test-helper.h"
 

-#include "libempathy/empathy-irc-network.h"
+#include "empathy-irc-network.h"

 
 static void
 test_empathy_irc_network_new (void)
 
 static void
 test_empathy_irc_network_new (void)

diff --git a/tests/empathy-irc-server-test.c b/tests/empathy-irc-server-test.c
index f959aad303ddcae93aa71a578bb853d8228b2d6b..291a34de1abe3ef5e1ec1123751f5c13a33fd3f7 100644 (file)
--- a/tests/empathy-irc-server-test.c
+++ b/tests/empathy-irc-server-test.c
@@ -5,7 +5,7 @@
 #include "test-irc-helper.h"
 #include "test-helper.h"
 
 #include "test-irc-helper.h"
 #include "test-helper.h"
 

-#include "libempathy/empathy-irc-server.h"
+#include "empathy-irc-server.h"

 
 static void
 test_empathy_irc_server_new (void)
 
 static void
 test_empathy_irc_server_new (void)

diff --git a/tests/empathy-live-search-test.c b/tests/empathy-live-search-test.c
index 4428e3c3273e80d432c50c21890ecab732c608e4..0934fe4c7d187015850d6ebd702c65fabe04e099 100644 (file)
--- a/tests/empathy-live-search-test.c
+++ b/tests/empathy-live-search-test.c
@@ -7,9 +7,9 @@
 #include "test-helper.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TESTS
 #include "test-helper.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TESTS

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 

-#include "libempathy-gtk/empathy-live-search.h"
+#include "empathy-live-search.h"

 
 typedef struct
 {
 
 typedef struct
 {

diff --git a/tests/empathy-parser-test.c b/tests/empathy-parser-test.c
index e9983c7f873ec95d21f38a34b387e2a87ffbc092..24cd5d67673c7ded19554359d6507bad1ea210fb 100644 (file)
--- a/tests/empathy-parser-test.c
+++ b/tests/empathy-parser-test.c
@@ -9,9 +9,9 @@
 #include <telepathy-glib/telepathy-glib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TESTS
 #include <telepathy-glib/telepathy-glib.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TESTS

-#include "libempathy/empathy-debug.h"
+#include "empathy-debug.h"

 
 

-#include "libempathy-gtk/empathy-string-parser.h"
+#include "empathy-string-parser.h"

 
 static void
 test_replace_match (const gchar *text,
 
 static void
 test_replace_match (const gchar *text,

diff --git a/tests/empathy-tls-test.c b/tests/empathy-tls-test.c
index efcafcec103dc72aa4b1c9fe2c18f68cf9602797..03cc9d7a8b241e29e443a9ca218a8b1a10b597e0 100644 (file)
--- a/tests/empathy-tls-test.c
+++ b/tests/empathy-tls-test.c
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <string.h>
 

-#include "libempathy/empathy-tls-verifier.h"
+#include "empathy-tls-verifier.h"

 #include "test-helper.h"
 #include "mock-pkcs11.h"
 
 #include "test-helper.h"
 #include "mock-pkcs11.h"
 

diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am
index 27fdbf7e48be8440cf9db3735e3e46b207d70f22..4ca1989eed213a08083264b1246160ad9834e02e 100644 (file)
--- a/tests/interactive/Makefile.am
+++ b/tests/interactive/Makefile.am
@@ -1,6 +1,7 @@
 AM_CPPFLAGS =                                          \
        $(ERROR_CFLAGS)                                 \
 AM_CPPFLAGS =                                          \
        $(ERROR_CFLAGS)                                 \

-       -I$(top_srcdir)                                 \
+       -I$(top_srcdir)/libempathy                      \
+       -I$(top_srcdir)/libempathy-gtk                  \

        -DPKGDATADIR=\""$(pkgdatadir)"\"                \
        $(EMPATHY_CFLAGS)                               \
        $(WARN_CFLAGS)                                  \
        -DPKGDATADIR=\""$(pkgdatadir)"\"                \
        $(EMPATHY_CFLAGS)                               \
        $(WARN_CFLAGS)                                  \

diff --git a/tests/interactive/empathy-logs.c b/tests/interactive/empathy-logs.c
index 96f590a69df407e620628c099b400dd000a35d3d..4a440f9edebd5aea7dc0fb7b9b6924957f2b26cb 100644 (file)
--- a/tests/interactive/empathy-logs.c
+++ b/tests/interactive/empathy-logs.c
@@ -24,10 +24,10 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
 #include <glib.h>
 #include <gtk/gtk.h>
 

-#include "libempathy/empathy-debug.h"
-#include "libempathy/empathy-utils.h"
-#include "libempathy-gtk/empathy-log-window.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-debug.h"
+#include "empathy-utils.h"
+#include "empathy-log-window.h"
+#include "empathy-ui-utils.h"

 
 static void
 destroy_cb (GtkWidget *dialog,
 
 static void
 destroy_cb (GtkWidget *dialog,

diff --git a/tests/interactive/test-empathy-account-chooser.c b/tests/interactive/test-empathy-account-chooser.c
index 7324cbea389992d0fad15048de3548ca4e81fe5d..8a4d08fcf51a8b7ca60c8bf1c7078f9716c0f807 100644 (file)
--- a/tests/interactive/test-empathy-account-chooser.c
+++ b/tests/interactive/test-empathy-account-chooser.c
@@ -2,8 +2,8 @@
 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 

-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-account-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-account-chooser.h"

 
 static void
 filter_func (TpAccount *account,
 
 static void
 filter_func (TpAccount *account,

diff --git a/tests/interactive/test-empathy-calendar-button.c b/tests/interactive/test-empathy-calendar-button.c
index 7fe056698e7b95ce484900bb2793107927a04043..81241090fc57c604a0bab4ba1123cbabde5ab0c6 100644 (file)
--- a/tests/interactive/test-empathy-calendar-button.c
+++ b/tests/interactive/test-empathy-calendar-button.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
 
 #include "config.h"
 

-#include "libempathy-gtk/empathy-calendar-button.h"
+#include "empathy-calendar-button.h"

 
 static void
 date_changed_cb (EmpathyCalendarButton *button,
 
 static void
 date_changed_cb (EmpathyCalendarButton *button,

diff --git a/tests/interactive/test-empathy-contact-blocking-dialog.c b/tests/interactive/test-empathy-contact-blocking-dialog.c
index 87d50f8e4d796d0e75cf22082e0f716463e444f5..d4a76933da0788018b935de36228467e04a061c6 100644 (file)
--- a/tests/interactive/test-empathy-contact-blocking-dialog.c
+++ b/tests/interactive/test-empathy-contact-blocking-dialog.c
@@ -23,10 +23,10 @@
 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 

-#include "libempathy/empathy-client-factory.h"
+#include "empathy-client-factory.h"

 
 

-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-contact-blocking-dialog.h"
+#include "empathy-ui-utils.h"
+#include "empathy-contact-blocking-dialog.h"

 
 static void
 am_prepare_cb (GObject *source,
 
 static void
 am_prepare_cb (GObject *source,

diff --git a/tests/interactive/test-empathy-dual-roster-view.c b/tests/interactive/test-empathy-dual-roster-view.c
index 30fe4aa80f8dacb5e62e0102fdd296685578ee23..d7c54a6479562da498065697e2644e84b87a668f 100644 (file)
--- a/tests/interactive/test-empathy-dual-roster-view.c
+++ b/tests/interactive/test-empathy-dual-roster-view.c
@@ -1,10 +1,10 @@
 #include <config.h>
 
 #include <config.h>
 

-#include "libempathy-gtk/empathy-roster-model.h"
-#include "libempathy-gtk/empathy-roster-model-manager.h"
+#include "empathy-roster-model.h"
+#include "empathy-roster-model-manager.h"

 
 

-#include "libempathy-gtk/empathy-roster-view.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-roster-view.h"
+#include "empathy-ui-utils.h"

 
 static void
 individual_activated_cb (EmpathyRosterView *self,
 
 static void
 individual_activated_cb (EmpathyRosterView *self,

diff --git a/tests/interactive/test-empathy-presence-chooser.c b/tests/interactive/test-empathy-presence-chooser.c
index 39ad1f7b4bce0768970d2bbfd1a4f35b00668b6d..5710fb146918878ea8dd7484ac221e0c41c30e71 100644 (file)
--- a/tests/interactive/test-empathy-presence-chooser.c
+++ b/tests/interactive/test-empathy-presence-chooser.c
@@ -24,10 +24,10 @@
 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 

-#include "libempathy/empathy-status-presets.h"
+#include "empathy-status-presets.h"

 
 

-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-presence-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-presence-chooser.h"

 
 int
 main (int argc, char **argv)
 
 int
 main (int argc, char **argv)

diff --git a/tests/interactive/test-empathy-protocol-chooser.c b/tests/interactive/test-empathy-protocol-chooser.c
index 3e3767a9811aefdaf15f9b99ba42baf64be3940e..f91cb1203257b4f501d5225c46ff69b42c01e05a 100644 (file)
--- a/tests/interactive/test-empathy-protocol-chooser.c
+++ b/tests/interactive/test-empathy-protocol-chooser.c
@@ -2,8 +2,8 @@
 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 

-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-protocol-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-protocol-chooser.h"

 
 int
 main (int argc,
 
 int
 main (int argc,

diff --git a/tests/interactive/test-empathy-roster-model-aggregator.c b/tests/interactive/test-empathy-roster-model-aggregator.c
index 3bbf9e3b3b92c6cbce04ab5506055ad24a6b79c0..bb3195022fefab5bf53bc8a07efc5395c4aadaf3 100644 (file)
--- a/tests/interactive/test-empathy-roster-model-aggregator.c
+++ b/tests/interactive/test-empathy-roster-model-aggregator.c
@@ -1,10 +1,10 @@
 #include <config.h>
 
 #include <config.h>
 

-#include "libempathy-gtk/empathy-roster-model.h"
-#include "libempathy-gtk/empathy-roster-model-aggregator.h"
+#include "empathy-roster-model.h"
+#include "empathy-roster-model-aggregator.h"

 
 

-#include "libempathy-gtk/empathy-roster-view.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-roster-view.h"
+#include "empathy-ui-utils.h"

 
 static gboolean show_offline = FALSE;
 static gboolean show_groups = FALSE;
 
 static gboolean show_offline = FALSE;
 static gboolean show_groups = FALSE;

diff --git a/tests/interactive/test-empathy-roster-view.c b/tests/interactive/test-empathy-roster-view.c
index 0c95c445b1d2807d2d5fe2635b42debec659c080..ff5de0fdcd578d2e892a91a80bc7874907d07897 100644 (file)
--- a/tests/interactive/test-empathy-roster-view.c
+++ b/tests/interactive/test-empathy-roster-view.c
@@ -1,10 +1,10 @@
 #include <config.h>
 
 #include <config.h>
 

-#include "libempathy-gtk/empathy-roster-model.h"
-#include "libempathy-gtk/empathy-roster-model-manager.h"
+#include "empathy-roster-model.h"
+#include "empathy-roster-model-manager.h"

 
 

-#include "libempathy-gtk/empathy-roster-view.h"
-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-roster-view.h"
+#include "empathy-ui-utils.h"

 
 static gboolean show_offline = FALSE;
 static gboolean show_groups = FALSE;
 
 static gboolean show_offline = FALSE;
 static gboolean show_groups = FALSE;

diff --git a/tests/interactive/test-empathy-status-preset-dialog.c b/tests/interactive/test-empathy-status-preset-dialog.c
index 50c6d115cfd180e7f54f8e69fb9a77cb9c7be388..db9cd361d921c1e0810e407b4facb971fcbb1234 100644 (file)
--- a/tests/interactive/test-empathy-status-preset-dialog.c
+++ b/tests/interactive/test-empathy-status-preset-dialog.c
@@ -26,10 +26,10 @@
 
 #include <gtk/gtk.h>
 
 
 #include <gtk/gtk.h>
 

-#include "libempathy/empathy-status-presets.h"
+#include "empathy-status-presets.h"

 
 

-#include "libempathy-gtk/empathy-ui-utils.h"
-#include "libempathy-gtk/empathy-status-preset-dialog.h"
+#include "empathy-ui-utils.h"
+#include "empathy-status-preset-dialog.h"

 
 int
 main (int argc, char **argv)
 
 int
 main (int argc, char **argv)

diff --git a/tests/test-helper.c b/tests/test-helper.c
index d0ff34636b41e15295d4afb1c537fd9a000386e5..f6fc0ffda544bb0e1c665a09a36cdd34c35e87de 100644 (file)
--- a/tests/test-helper.c
+++ b/tests/test-helper.c
@@ -22,7 +22,7 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
 

-#include "libempathy-gtk/empathy-ui-utils.h"
+#include "empathy-ui-utils.h"

 
 #include "test-helper.h"
 
 
 #include "test-helper.h"
 

diff --git a/tests/test-irc-helper.h b/tests/test-irc-helper.h
index ac51d434b0a814536a6204bee8dd48195f83a78c..04271715b679f277c105e515e0c947da1ab2a1fd 100644 (file)
--- a/tests/test-irc-helper.h
+++ b/tests/test-irc-helper.h
@@ -1,9 +1,9 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

-#include "libempathy/empathy-irc-server.h"
-#include "libempathy/empathy-irc-network.h"
-#include "libempathy/empathy-irc-network-manager.h"
+#include "empathy-irc-server.h"
+#include "empathy-irc-network.h"
+#include "empathy-irc-network-manager.h"

 
 #ifndef __CHECK_IRC_HELPER_H__
 #define __CHECK_IRC_HELPER_H__
 
 #ifndef __CHECK_IRC_HELPER_H__
 #define __CHECK_IRC_HELPER_H__

diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am b/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am
index f76c2fa53e4c3e9109fb7e4d77ca6a327e0413b8..1271f6ec32299e09bab884cc92d8991a5a7f248b 100644 (file)
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/Makefile.am
@@ -2,7 +2,8 @@ plugindir = $(ACCOUNTS_PROVIDER_PLUGIN_DIR)
 
 INCLUDES =                                     \
        -I$(top_builddir)                       \
 
 INCLUDES =                                     \
        -I$(top_builddir)                       \

-       -I$(top_srcdir)                         \
+       -I$(top_srcdir)/libempathy              \
+       -I$(top_srcdir)/libempathy-gtk          \

        -DLOCALEDIR=\""$(datadir)/locale"\"     \
        $(UOA_CFLAGS)                           \
        $(WARN_CFLAGS)                          \
        -DLOCALEDIR=\""$(datadir)/locale"\"     \
        $(UOA_CFLAGS)                           \
        $(WARN_CFLAGS)                          \

diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
index 9c2da5af4154f0d73d32ec3ed87e314e5044b79a..d6713f2862974c2c127d5926faa2941988b7001a 100644 (file)
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
@@ -30,7 +30,7 @@
 #include <libaccounts-glib/ag-service.h>
 #include <libaccounts-glib/ag-account-service.h>
 
 #include <libaccounts-glib/ag-service.h>
 #include <libaccounts-glib/ag-account-service.h>
 

-#include "libempathy-gtk/empathy-account-widget.h"
+#include "empathy-account-widget.h"

 
 G_DEFINE_TYPE (EmpathyAccountsPluginWidget, empathy_accounts_plugin_widget, GTK_TYPE_BOX)
 
 
 G_DEFINE_TYPE (EmpathyAccountsPluginWidget, empathy_accounts_plugin_widget, GTK_TYPE_BOX)
 

diff --git a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c
index f49d0fc832b87e05ec59139f96051f0a2e14b765..1f322ec52e1919e7b96c1e00315b5d43956707e0 100644 (file)
--- a/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c
+++ b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c
@@ -22,8 +22,8 @@
 
 #include "empathy-accounts-plugin.h"
 
 
 #include "empathy-accounts-plugin.h"
 

-#include "libempathy/empathy-client-factory.h"
-#include "libempathy/empathy-uoa-utils.h"
+#include "empathy-client-factory.h"
+#include "empathy-uoa-utils.h"

 
 #include "empathy-accounts-plugin-widget.h"
 
 
 #include "empathy-accounts-plugin-widget.h"
 

diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c
index 7e1a5f206108faba544a738fd0dca104ab1eca29..6895a04d520c68135eb6e9200bbd3a0705a911d3 100644 (file)
--- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c
+++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c
@@ -27,8 +27,8 @@
 #include <libaccounts-glib/ag-manager.h>
 #include <libaccounts-glib/ag-provider.h>
 
 #include <libaccounts-glib/ag-manager.h>
 #include <libaccounts-glib/ag-provider.h>
 

-#include "libempathy/empathy-contact.h"
-#include "libempathy-gtk/empathy-user-info.h"
+#include "empathy-contact.h"
+#include "empathy-user-info.h"

 
 #include "empathy-app-plugin-widget.h"
 
 
 #include "empathy-app-plugin-widget.h"
 

diff --git a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c
index 5bbf53db5dc5366045d51168587b8bf1b9be4be9..c22c6d59be9340466f901ff8f22298ba29f56a95 100644 (file)
--- a/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c
+++ b/ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c
@@ -22,7 +22,7 @@
 
 #include "empathy-app-plugin.h"
 
 
 #include "empathy-app-plugin.h"
 

-#include "libempathy/empathy-client-factory.h"
+#include "empathy-client-factory.h"

 
 #include "empathy-app-plugin-widget.h"
 
 
 #include "empathy-app-plugin-widget.h"