Use double quotes for all internal headers

This makes a bit more obvious which headers come from public libraries
and which ones come from uninstalled utility libraries.

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

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 2de397a57dbe46a12c201b5d6fb810974beb1545..4c8f54c1a4b5fba2e26bfa57b239504f6cc9917f 100644 (file)
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -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 "libempathy-gtk/@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 03aeacf7113ebbb4bba0d689e7cdffa37ff0839f..0f3b5b470069b548c2bd79e74f9039b15e051456 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 "libempathy/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 be9c99301990c64f696eb26ebed20b67e3e5f100..fbc0c19cb18fff483bdfffa83046bacd903972c9 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 "libempathy/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 bcd45b76a66dee947ce1da016d10c389562a814e..c6e6dec018b4f25efcda60a7fe9854dec1925c80 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 "libempathy-gtk/empathy-account-widget.h"
+#include "libempathy-gtk/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 988b09883e48bb39b0c5ca7ced44c3d7d028bb8c..d987abb7ca56ed401837c87a4fbf03417f8046d0 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 "libempathy-gtk/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 84e96e7b63d5e3d4cd6e0b01fbc612b21e7d0d89..62b80da817051203a5650f0137d310ef9e15db51 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 "libempathy-gtk/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 9fa8c1eafd0edad35dbd2278e1f0d68a1734f493..d8b5b778538bb1090d617485d6aaa5ec015e8418 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 "libempathy/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 "libempathy/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 2f7d54431ae7e73e6e48052b45e9556cec037bda..57eaa1a3630e0a4e1d12a59583e26825e31dc40f 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 "libempathy/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 553dd4f6e92ff4890949ee7f4719eb53592a8f13..240e2211d88f7b4f382563d14eda93333e8f7123 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 "libempathy/empathy-camera-monitor.h"
+#include "libempathy/empathy-gsettings.h"
+#include "libempathy/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 "libempathy/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 acb0903e47bd77c234bfd76734b5d63abcf72f9a..4b50eceef780158b8cfaab066090903bdde881d9 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 "libempathy/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 a6938b3e5eff30d0fd06ae8b10ce44534438d40c..1e6cbbfd34988fcb5cb177cfb7b0554a68d8a251 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 "libempathy/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 ad5179806253af520e1a1c4ca440727c25dd7ba9..dc04d61bba0cb661386c50ac747a206d97b5da34 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 "libempathy-gtk/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 20238343df4ac7a463676fe08b46e1645b25336f..688bbe8c4cb79e7d23fabf6720d3b1213ff79d0f 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 "libempathy/empathy-debug.h"
+#include "libempathy/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 f4c82eb4e81fc2700b737cedc48168092020d565..eace02f8edbb54601927b0acac4481e964faf45b 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 "libempathy/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 9f72ce9bbe203e54e117ff15881171395add9403..17c03cff27e392c92ddb65f78b349832233e31a9 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 "libempathy/empathy-request-util.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include <libempathy/empathy-debug.h>
+#include "libempathy/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 3db350935d8daaef72375baa76db36827a0f40a0..7f03559015d99e58f5135c383acfaf5a82865063 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 "libempathy/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 f7c8736172e957559d8c2ade29ebb359e573c258..a72f091321d33d2605a7183ad78efb241314b341 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 "libempathy/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 0afd89748b521cbf6ed20bc7d64e6e59661a82f2..a4fe92b15c18a296e3ed29992d809a0220da38d0 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 "libempathy/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 ffd92b1cdc7de824dc8f3cbfad9f245050508527..f18256b97c15ae30920a1d98048810385151f704 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 "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-chat.h"
 #include "empathy-spell.h"
 
 #include "empathy-chat.h"
 #include "empathy-spell.h"


@@ -52,7 +52,7 @@
 #include "extensions/extensions.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT
 #include "extensions/extensions.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CHAT

-#include <libempathy/empathy-debug.h>
+#include "libempathy/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 269b00596eb4c49847f981e826ce191af3828ada..d5da3fe3c2e779fb3daa002ec235a02ce5f548ac 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 "libempathy/empathy-contact.h"
+#include "libempathy/empathy-tp-chat.h"

 
 

-#include <libempathy-gtk/empathy-theme-adium.h>
+#include "libempathy-gtk/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 9a0498c5a89ecd3468c9f231c6aa9955b5ea8380..022e05ba1de40179b2384597c66286ade641c50c 100644 (file)
--- a/libempathy-gtk/empathy-contact-blocking-dialog.c
+++ b/libempathy-gtk/empathy-contact-blocking-dialog.c
@@ -25,15 +25,15 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

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

 
 

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

 
 #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 "libempathy/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 80ea9765afc3661e49228fb2e1f6206095852e8f..92922a2297854e4cad8b3af276591895e45234cd 100644 (file)
--- a/libempathy-gtk/empathy-contact-chooser.c
+++ b/libempathy-gtk/empathy-contact-chooser.c
@@ -13,12 +13,12 @@
 
 #include "empathy-contact-chooser.h"
 
 
 #include "empathy-contact-chooser.h"
 

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

 
 

-#include <libempathy-gtk/empathy-individual-store-manager.h>
-#include <libempathy-gtk/empathy-individual-view.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/empathy-individual-store-manager.h"
+#include "libempathy-gtk/empathy-individual-view.h"
+#include "libempathy-gtk/empathy-ui-utils.h"

 
 G_DEFINE_TYPE (EmpathyContactChooser,
     empathy_contact_chooser, GTK_TYPE_BOX);
 
 G_DEFINE_TYPE (EmpathyContactChooser,
     empathy_contact_chooser, GTK_TYPE_BOX);

diff --git a/libempathy-gtk/empathy-contact-search-dialog.c b/libempathy-gtk/empathy-contact-search-dialog.c
index 0b01bf88d6df7af0c0036afdcba0d8f13b5d120c..70bafb9896b1053cdb8cbd1f291c5abdef9069df 100644 (file)
--- a/libempathy-gtk/empathy-contact-search-dialog.c
+++ b/libempathy-gtk/empathy-contact-search-dialog.c
@@ -26,17 +26,17 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

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

 
 

-#include <libempathy-gtk/empathy-account-chooser.h>
-#include <libempathy-gtk/empathy-cell-renderer-text.h>
-#include <libempathy-gtk/empathy-cell-renderer-activatable.h>
-#include <libempathy-gtk/empathy-individual-information-dialog.h>
-#include <libempathy-gtk/empathy-images.h>
+#include "libempathy-gtk/empathy-account-chooser.h"
+#include "libempathy-gtk/empathy-cell-renderer-text.h"
+#include "libempathy-gtk/empathy-cell-renderer-activatable.h"
+#include "libempathy-gtk/empathy-individual-information-dialog.h"
+#include "libempathy-gtk/empathy-images.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include <libempathy/empathy-debug.h>
+#include "libempathy/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 cef06d309ceae5f438c3f60246f6d0b39d95c156..cbc034db531fbc473e7f8dc2ae4d1a52750d57bb 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 "libempathy/empathy-utils.h"
+#include "libempathy/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 "libempathy/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 6f8045d3ede8814d61ce7c0053f489f0eaf4f871..cb70793000812a02dd6d49c6a847a0e4195756d7 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 "libempathy/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 7ec61310db7e0f71237f3e70cc46b08ca1f0f899..fcf06194330a536ecf1ce8929f2aed27fe2df844 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 "libempathy/empathy-time.h"
+#include "libempathy/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-dialpad-widget.c b/libempathy-gtk/empathy-dialpad-widget.c
index 8fd65bdb26349217f4077925252b0653944c5a13..6509e13bafee3fe1efe98d9f9e1ee0113a0766b4 100644 (file)
--- a/libempathy-gtk/empathy-dialpad-widget.c
+++ b/libempathy-gtk/empathy-dialpad-widget.c
@@ -23,7 +23,7 @@
 
 #include "empathy-dialpad-widget.h"
 
 
 #include "empathy-dialpad-widget.h"
 

-#include <libempathy-gtk/empathy-dialpad-button.h>
+#include "libempathy-gtk/empathy-dialpad-button.h"

 
 G_DEFINE_TYPE (EmpathyDialpadWidget, empathy_dialpad_widget, GTK_TYPE_BOX);
 
 
 G_DEFINE_TYPE (EmpathyDialpadWidget, empathy_dialpad_widget, GTK_TYPE_BOX);
 

diff --git a/libempathy-gtk/empathy-geometry.c b/libempathy-gtk/empathy-geometry.c
index d171f72fc442a0496105d5c2d12c962957967701..2c4b501887be28cec5c51987b9bf19677f4420ad 100644 (file)
--- a/libempathy-gtk/empathy-geometry.c
+++ b/libempathy-gtk/empathy-geometry.c
@@ -30,7 +30,7 @@
 #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 "libempathy/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 6b6a0d0dc770691b460040917020882931cbb3b8..2292cc53bcf5af7b9c178f97cf16c3684c5963f4 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 "libempathy/empathy-utils.h"
+#include "libempathy/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 03874c90569330ac1af692707be7bc7f351d7ad6..a22ca28e4ca381cb44c850d865e25f57944d1cf7 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 "libempathy/empathy-individual-manager.h"
+#include "libempathy/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 bd43adeb8112beca10101900cd2fb7b7ee259f55..21380a5bac63cf3c6dbf4a3a21a5f5218defa05c 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 "libempathy/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 cd6392a9b1b8663a3997d45c872ce537d4c9f7a4..4059925dea18354ff7876c6555afeb7614a08f78 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 "libempathy/empathy-individual-manager.h"
+#include "libempathy/empathy-utils.h"
+#include "libempathy/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 "libempathy/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 4cadf22a2c6eb360de9e9ba2c3ff1e010381a80a..cf67101efd8f048eeb94b41d8ee58702cf832525 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 "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-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 "libempathy/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 0fefb9c85837885209611b64db1feaa880a8bf3e..8ceaf6e5b1db8d0020903cd4fc989134bf3fde93 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 "libempathy/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 "libempathy/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 468effe21f176b7cd2fd68a4d9c8daf33de68687..31a6abd8b1ff75cd63b11497dea4fea84131f849 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 "libempathy-gtk/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 ea872b1d1d2a79b31bb56001c1af4bac2173ec19..04c341e5a61584dabc1f4feceebc72a9085eb515 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 "libempathy/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 7656b50eaf20d74cc062d6395b42924fada76765..8b56b0c1b921821525e72003072e33b5eb79039d 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 "libempathy/empathy-individual-manager.h"

 
 

-#include <libempathy-gtk/empathy-individual-store.h>
+#include "libempathy-gtk/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 ddaea26b48144fc4f85027cd898a48c98fe869f4..7223e2e9c0d8b88aab50bcfb3a538080e099dbb3 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 "libempathy/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 "libempathy/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 7e36fe19a8a9706fa1644cafa5cb1eca0de3ed94..b88fd253d951b8b75dfd90a9fc5dca7f3c088393 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 "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-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 "libempathy/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 12093b5771c3358a8527d5d7784e13180b8cec64..87be31f262b50a2e191430f9308ad2d6cdd37114 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 "libempathy/empathy-utils.h"
+#include "libempathy/empathy-location.h"
+#include "libempathy/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 "libempathy/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 00e9bf0eba36e16be58af257db9d0296975dd695..c4c8e830f84714e72a5e574e4276f8701fedd21c 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 "libempathy/empathy-utils.h"
+#include "libempathy/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 "libempathy/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 0d4f24e7f8638bc4683cc0f6cbbb99c1acc3fd47..8ffb2cbe177f5ad41d9d020640390eaef1cac356 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 "libempathy/empathy-account-settings.h"
+#include "libempathy/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 e19b3e8abd6be7f0c28222ab8c430d96bc61bad3..79b54e9859e4d9ae2f9779d79fb1fdc4d527c04a 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 "libempathy/empathy-utils.h"
+#include "libempathy/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 "libempathy/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 3b612505044265eaf947fce0aae1586fe2b4de8f..23ecc92fe80eff085ba45cc8e764e0f7711a1a66 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 "libempathy/empathy-account-settings.h"
+#include "libempathy/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 fe26ceb34e4a35d3eda9515ca5af500d68de38a4..a10b2ca3c9ffbfb1bb345356275a49db2c5d2458 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 "libempathy/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 df4a8b152a4b4caf1c4a45f440aeb723b4f42bd5..547e3d668114aa114f4e6df31dccfce685dd0eba 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 "libempathy/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 e65adbe4c6ca3538447f36c693fd3ad79f112e71..fe36612768e4c771d5976e1b8bc6dee2c7621332 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 "libempathy/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 b714fa499a421e0e99f660208eb222a403e36618..afb5057d400711d71b42bcc1972eb4344ee21c3d 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 "libempathy/empathy-utils.h"

 
 

-#include <libempathy-gtk/empathy-account-widget.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/empathy-account-widget.h"
+#include "libempathy-gtk/empathy-ui-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT

-#include <libempathy/empathy-debug.h>
+#include "libempathy/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-log-window.c b/libempathy-gtk/empathy-log-window.c
index 80733da1b1a8e595b258ba12b18b5b1deefe8e57..d49dd558720cc8def53b74b3ffbf3ea119a5cefc 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/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 "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 "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 "libempathy/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 c36cfcfce6d79270a8ff3f9f194782eee81cec7b..eb270d5d6b0aac5f9e63cd3002bd0529eb46c6f9 100644 (file)
--- a/libempathy-gtk/empathy-new-account-dialog.c
+++ b/libempathy-gtk/empathy-new-account-dialog.c
@@ -23,10 +23,10 @@
 #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 "libempathy/empathy-debug.h"

 
 

-#include <libempathy-gtk/empathy-account-widget.h>
-#include <libempathy-gtk/empathy-protocol-chooser.h>
+#include "libempathy-gtk/empathy-account-widget.h"
+#include "libempathy-gtk/empathy-protocol-chooser.h"

 
 G_DEFINE_TYPE (EmpathyNewAccountDialog, empathy_new_account_dialog, \
     GTK_TYPE_DIALOG)
 
 G_DEFINE_TYPE (EmpathyNewAccountDialog, empathy_new_account_dialog, \
     GTK_TYPE_DIALOG)

diff --git a/libempathy-gtk/empathy-new-account-dialog.h b/libempathy-gtk/empathy-new-account-dialog.h
index 07fc22f98076a903546615e8ef4f220a86735b4d..c68630d84bf4fc847e8ad6aff33e75b9853aad50 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 "libempathy/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 d770d6d988b36dd569981d4d49baa5b7fcda5d4a..27ef7be4dad566fa331034487df6ea5e8f851b75 100644 (file)
--- a/libempathy-gtk/empathy-new-call-dialog.c
+++ b/libempathy-gtk/empathy-new-call-dialog.c
@@ -22,15 +22,15 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

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

 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT

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

 
 

-#include <libempathy-gtk/empathy-contact-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-images.h>
+#include "libempathy-gtk/empathy-contact-chooser.h"
+#include "libempathy-gtk/empathy-ui-utils.h"
+#include "libempathy-gtk/empathy-images.h"

 
 #include "empathy-new-call-dialog.h"
 #include "empathy-call-utils.h"
 
 #include "empathy-new-call-dialog.h"
 #include "empathy-call-utils.h"

diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index c38a1c75b7ec491ac4caf38ee72e30593cb97629..5709e3a8384fe78067c8ff4d8ec6ef752314f002 100644 (file)
--- a/libempathy-gtk/empathy-new-message-dialog.c
+++ b/libempathy-gtk/empathy-new-message-dialog.c
@@ -22,14 +22,14 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

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

 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT
 
 #define DEBUG_FLAG EMPATHY_DEBUG_CONTACT

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

 
 

-#include <libempathy-gtk/empathy-contact-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-images.h>
+#include "libempathy-gtk/empathy-contact-chooser.h"
+#include "libempathy-gtk/empathy-ui-utils.h"
+#include "libempathy-gtk/empathy-images.h"

 
 #include "empathy-new-message-dialog.h"
 
 
 #include "empathy-new-message-dialog.h"
 

diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c
index d142b7fa30f49f6bae0c89f18a6b67304216458e..2decbf0648d5fecd3589012ce805c14cb6262be9 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 "libempathy/empathy-gsettings.h"
+#include "libempathy/empathy-utils.h"

 
 

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

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include <libempathy/empathy-debug.h>
+#include "libempathy/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 923ab4a54a80188cff0e4eea3c769268cbb1fbcf..b0100ccb7cd15f4a4fe5a26130c8f613d99917a6 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 "libempathy/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 07fb69fc0e0dcee04c8a10abbed7bc508f5a3f42..90550f4f21f6ee8a403bab2efa95ffd7d31ecbeb 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 "libempathy/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 ee1c993b419ddd03cfb98627e9ec5225a9f28f0d..7511cbda322de8a7fb70288e55c512add37e88c1 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 "libempathy/empathy-server-sasl-handler.h"

 
 

-#include <libempathy-gtk/empathy-base-password-dialog.h>
+#include "libempathy-gtk/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 a047890bb445509b97975286aecff5d2840e9f9b..cc9a4829905d058f8ab462efa8af443a50aced4d 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 "libempathy/empathy-presence-manager.h"
+#include "libempathy/empathy-utils.h"
+#include "libempathy/empathy-status-presets.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include <libempathy/empathy-debug.h>
+#include "libempathy/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 d5b0de7c1ca337319af5887a4316a3b4239c1c8c..8b3a247315ff9b8cbb377acdf769bba8cfa943c8 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 "libempathy/empathy-utils.h"
+#include "libempathy/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 "libempathy/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 eeaab60c0977f5fdd56b0cc3e7d955d0955744da..469f89f32555790ae3bf9961cf5df490c551bcf1 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 "libempathy/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 d8410b5e648523ba55f8f80d6dcd8e8720959b61..587a3481d3bb807d71d3fb366b86f57b237e1af1 100644 (file)
--- a/libempathy-gtk/empathy-roster-contact.c
+++ b/libempathy-gtk/empathy-roster-contact.c
@@ -4,10 +4,10 @@
 
 #include "empathy-roster-contact.h"
 
 
 #include "empathy-roster-contact.h"
 

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

 
 

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

 
 G_DEFINE_TYPE (EmpathyRosterContact, empathy_roster_contact, GTK_TYPE_ALIGNMENT)
 
 
 G_DEFINE_TYPE (EmpathyRosterContact, empathy_roster_contact, GTK_TYPE_ALIGNMENT)
 

diff --git a/libempathy-gtk/empathy-roster-model-manager.c b/libempathy-gtk/empathy-roster-model-manager.c
index 859edb7a99f4edaba732e77f4eb4f583bfa7e8ce..ff3ff53474fa98d94d00614d9fd9a594a6031249 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 "libempathy/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 f7ce1f4e53cf1a368f66fb4d9764b6df5979a747..5d5e12f0d6ded9bc3e43b83674f9ec16402529f1 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 "libempathy/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 ed57be3d43138543f5109708826d7fe26c41da1d..9023407e235fb78f10047bcd4bda351d3bc75b2c 100644 (file)
--- a/libempathy-gtk/empathy-roster-view.c
+++ b/libempathy-gtk/empathy-roster-view.c
@@ -4,11 +4,11 @@
 
 #include <glib/gi18n-lib.h>
 
 
 #include <glib/gi18n-lib.h>
 

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

 
 

-#include <libempathy-gtk/empathy-roster-contact.h>
-#include <libempathy-gtk/empathy-roster-group.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/empathy-roster-contact.h"
+#include "libempathy-gtk/empathy-roster-group.h"
+#include "libempathy-gtk/empathy-ui-utils.h"

 
 G_DEFINE_TYPE (EmpathyRosterView, empathy_roster_view, EGG_TYPE_LIST_BOX)
 
 
 G_DEFINE_TYPE (EmpathyRosterView, empathy_roster_view, EGG_TYPE_LIST_BOX)
 

diff --git a/libempathy-gtk/empathy-roster-view.h b/libempathy-gtk/empathy-roster-view.h
index 0077b6843a534c0e7336bda09afaf0152854002c..8a1b6d404a70c27f46023d23407f69e4adc8ba6b 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 "libempathy-gtk/egg-list-box/egg-list-box.h"
+#include "libempathy-gtk/empathy-live-search.h"

 
 

-#include <libempathy-gtk/empathy-roster-model.h>
+#include "libempathy-gtk/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 018a068abdc349dd0765195238cbed311c736136..558a125b4210c6915bd4b13ec5cde36d6e80fe1d 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 "libempathy/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 8b0845048f354bf276c271b3d75b74489039c486..5a0737adc0eb23bb0fe8a29e14ff769f45afe328 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 "libempathy/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 3efeecc14aa0eea858a4942ac34ad1aff5d7d3df..4f11aa8afda52a25e369ef8cad79824a343e05a2 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 "libempathy/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 99caa51d7f41113e35ab5d3483889bbbed4f8326..494ae7f6adb7ece2854ed4fd08aca374c4b8d4e9 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 "libempathy/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 3291a9a92838ea51d810304a3a020d49bd9802d4..8bcca8bb14739334b02dfc3baac100a5c999bac1 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 "libempathy/empathy-debug.h"
+#include "libempathy/empathy-gsettings.h"
+#include "libempathy/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 4242b5738cb8f32d1e9f3435b954bdfef36d7d4c..206edc192b991f201ade6dd082ca0fe8fe18dcba 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 "libempathy/empathy-debug.h"
+#include "libempathy/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 19f1fee6a6c97cd0882970c4fbdbf26dacdd4f51..6ba1e54d16874d4edb903a377ffa314a5f3bbc9a 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 "libempathy/empathy-utils.h"
+#include "libempathy/empathy-status-presets.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include <libempathy/empathy-debug.h>
+#include "libempathy/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 04fae6d181b577482801b29dc706c18da10b62e3..94ebf7c9d2440de817d200489334c10c24bdb578 100644 (file)
--- a/libempathy-gtk/empathy-subscription-dialog.c
+++ b/libempathy-gtk/empathy-subscription-dialog.c
@@ -22,8 +22,8 @@
 
 #include "empathy-subscription-dialog.h"
 
 
 #include "empathy-subscription-dialog.h"
 

-#include <libempathy/empathy-utils.h>
-#include <libempathy-gtk/empathy-individual-widget.h>
+#include "libempathy/empathy-utils.h"
+#include "libempathy-gtk/empathy-individual-widget.h"

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

diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 67ec4d08f73f81ec5a5a4613c7be860e8e9571f4..1762eabd62f1ca01cd1e16f33874118e9c933964 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 "libempathy/empathy-gsettings.h"
+#include "libempathy/empathy-time.h"
+#include "libempathy/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 "libempathy/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 88066761583f46d168890d22df801ead7ffa7855..dee5aef356f987247df280b1605bd74ca3f17150 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 "libempathy/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 f3d8d67bcb1f093ab7249afb2474a74a3177c997..bb4d229661af627b4fc05f135e43b52a7f924d3f 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 "libempathy/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 "libempathy/empathy-debug.h"

 
 struct _EmpathyThemeManagerPriv
 {
 
 struct _EmpathyThemeManagerPriv
 {

diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c
index 82244403af026e27cd72de785dbc03883d2a09ee..88f22d36df8704b2e194722b37e218563674638e 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 "libempathy/empathy-debug.h"
+#include "libempathy/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 32f1fe38925f58ffdf8a634621b6aafcc3b9b656..2ae011429de93a8459a7ffc1bc73f4d995e21f73 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 "libempathy/empathy-debug.h"
+#include "libempathy/empathy-utils.h"
+#include "libempathy/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 d1712f59590a64d78e05262f63df7791bb0afa24..7c505c6681af57374fd1740721313124f45ec40a 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 "libempathy/empathy-contact.h"
+#include "libempathy/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 4c9a2deee7f62207c0f2b4392a59aeb6fc8518ca..4c447772b39d894fdeb0e2201fe3e4ca49eb3ac4 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 "libempathy/empathy-debug.h"
+#include "libempathy/empathy-time.h"
+#include "libempathy/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 77484d2f12e379efe16e156ad2cbdac0fa9a26c5..1cbd661c76207b3ba3b571987a91b26e39b400e2 100644 (file)
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -199,7 +199,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 "libempathy/@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/cheese-camera-device-monitor.c b/libempathy/cheese-camera-device-monitor.c
index 3b937ce9a24609fd176784a4f0e1ba94cd43fd2f..6f9627da9c6ed75dfaee4992ea2c5d7aa779185b 100644 (file)
--- a/libempathy/cheese-camera-device-monitor.c
+++ b/libempathy/cheese-camera-device-monitor.c
@@ -69,7 +69,7 @@ G_DEFINE_TYPE (EmpathyCameraDeviceMonitor, empathy_camera_device_monitor, G_TYPE
 #define EMPATHY_CAMERA_DEVICE_MONITOR_ERROR empathy_camera_device_monitor_error_quark ()
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #define EMPATHY_CAMERA_DEVICE_MONITOR_ERROR empathy_camera_device_monitor_error_quark ()
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

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

 
 enum EmpathyCameraDeviceMonitorError
 {
 
 enum EmpathyCameraDeviceMonitorError
 {

diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 12b28b8ba245dd9eee6d549b50467aa8040198ea..d77a8b08ab90cd6871a481a54376ec1320154284 100644 (file)
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -27,7 +27,7 @@
 #include "empathy-presence-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
 #include "empathy-presence-manager.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT

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

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

diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h
index 57ca685cb6901bd1a194918bd0f27fbfecd2aff4..48e895841db66a0a1532f00db36a76014d9ebd7a 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 "libempathy/empathy-tp-chat.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/libempathy/empathy-connection-managers.c b/libempathy/empathy-connection-managers.c
index abf862bca1a21a45c41d75f5a4aee86f5f007768..88ff1d675ac6141ac88c5817675c89ae08588e8f 100644 (file)
--- a/libempathy/empathy-connection-managers.c
+++ b/libempathy/empathy-connection-managers.c
@@ -24,7 +24,7 @@
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

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

 
 static GObject *managers = NULL;
 
 
 static GObject *managers = NULL;
 

diff --git a/libempathy/empathy-pkg-kit.c b/libempathy/empathy-pkg-kit.c
index 1d01b931df6648edad15c974c5e32954ad8c5aec..312c24a4a8a51daa531e3f91b06b97c829206cbe 100644 (file)
--- a/libempathy/empathy-pkg-kit.c
+++ b/libempathy/empathy-pkg-kit.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 
 
 #include "config.h"
 

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

 
 typedef struct
 {
 
 typedef struct
 {

diff --git a/libempathy/empathy-request-util.c b/libempathy/empathy-request-util.c
index 8532da57bbb62d2b59d9fb45f79b21e2bee399cc..6423fe19af7805153ad78ab928cf1ae48a3a5cf4 100644 (file)
--- a/libempathy/empathy-request-util.c
+++ b/libempathy/empathy-request-util.c
@@ -24,7 +24,7 @@
 #include "empathy-request-util.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
 #include "empathy-request-util.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER

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

 
 void
 empathy_chat_with_contact (EmpathyContact *contact,
 
 void
 empathy_chat_with_contact (EmpathyContact *contact,

diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index bdca7b623c8c9b5dac8c20e17dae015c3b679d15..16aaa6bb13dc8eea54deffa1b03403764f5c9791 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/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-utils.c b/libempathy/empathy-utils.c
index 235b0224659ea83cc83abab5340a071c4bf828db..b6fd9ce131f007e926138a2365c44177611227c9 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/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/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
index 8b1bafb781e140e52ae0a98d3c71d120942f981f..fde281dd5b3aa172fd19d5e9235eb9b981dc0ba5 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 "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 "nautilus-sendto-plugin.h"
 
 
 #include "nautilus-sendto-plugin.h"

diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index 537b43e3df77a90f7a89696a58de08d1b9f58f57..fcd331aec6aff958e3ea58153d563cf733d13d1e 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 "libempathy-gtk/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 "libempathy/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 f0a2db9a25a6f758614060bf13b32b591997ef0e..acfd9c290e00e2d2a066c50e1ba2134aaf276796 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 "libempathy/empathy-utils.h"
+#include "libempathy/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 "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-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 "libempathy/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 90d7947e9549c82e8377ad720abe2b8e22f10572..57f6968c83f93998b7647c96e6bae7f35ed05505 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 "libempathy/empathy-utils.h"
+#include "libempathy-gtk/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 "libempathy/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 0c3693b6fd2d4936d51359f28b38d7a33bc9bb7c..01bc80f53f4c3c1a06a4de263d72d8c5e8863378 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 "libempathy/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 fe62a6c4bf0a2fec3e3f241816844e4930b6f1b9..2f919533ecf0b178addf9fe40110332cbfa20fb2 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 "libempathy/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 "libempathy/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 323ef8edff6e6ee94f340e1b38d6f67d068f1fff..89202f54113d95839216e81accded953d5ac0cae 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 "libempathy/empathy-gsettings.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER

-#include <libempathy/empathy-debug.h>
+#include "libempathy/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 f1d42b74cf8fa6c4d09ff57319829548a5ade042..3636142cca99309808ffbc329eef5be2bd2bbb34 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 "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-sanity-cleaning.h"
 
 
 #include "empathy-sanity-cleaning.h"
 

diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index dbd5ecf7774937e2101e828501ad17bc6611db31..42bd46f508216df3ebe01af01aa751b8e47147bf 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 "libempathy/empathy-client-factory.h"
+#include "libempathy/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 "libempathy/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 b1d4f2977724d0e1c58d1d188955fc4a2dfac025..88b166f1f3b5fa5569a3dc7da814e596b6fd048f 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 "libempathy/empathy-utils.h"

 
 

-#include <libempathy-gtk/empathy-call-utils.h>
+#include "libempathy-gtk/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 "libempathy/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 36c6cfdc2d6fd17a2650a677e0cd66314b24e860..55e4897826a964e64c75e44f70bdd3d768d7afda 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 "libempathy/empathy-contact.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c
index bf42b055a38f90d2b9437c19df74db187f68b2e3..c0aa04170fc498b94b7808207cdd6852a32dc543 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 "libempathy-gtk/empathy-images.h"
+#include "libempathy-gtk/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 "libempathy/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 ca291472425ec7ed9d1b4ca285bde89ef453ad87..b678c0a423d3c3769257ab6efcf08d632fab9e0c 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 "libempathy/empathy-utils.h"
+#include "libempathy-gtk/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 37090319bd0825ac8f725ec8bd365e9d2e62ca15..5a24fbcd3b26b734d38d95e68036c41b84d11567 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 "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"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP

-#include <libempathy/empathy-debug.h>
+#include "libempathy/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 9d5ab8a83f64b6b51141ac3b11dd874f1a68f2ea..47e3f3a835ff7f70b8ecc242d50597a03373fd11 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 "libempathy-gtk/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 "libempathy/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 a6f8d3d12ef1ac356d888be2daa17f451c0344f4..2bfef6cb73466796654fbbc49a391c4df203a6f1 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 "libempathy/empathy-camera-monitor.h"
+#include "libempathy/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 "libempathy/empathy-debug.h"

 
 struct _EmpathyCameraMenuPrivate
 {
 
 struct _EmpathyCameraMenuPrivate
 {

diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index 15a4e7a4fa7f4e85e2566a1c17d9afb433413650..50292fbd7e086c437f1f1cbade7e5c8c49b6b1bd 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 "libempathy/empathy-chatroom-manager.h"
+#include "libempathy/empathy-request-util.h"
+#include "libempathy/empathy-individual-manager.h"

 
 

-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/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 "libempathy/empathy-debug.h"

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

-#include <extensions/extensions.h>
+#include "extensions/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 7dfd53480a04460ad4b643d7a00a2b4a9e03c8ad..5082e733722e16c8cfaaedc68fbec780ec963daf 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 "libempathy-gtk/empathy-chat.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 292c1a9a7a4f399e656a716e5acb7dd968ae976a..59814bdf4c2eabc5b4eb6b9471703a7611ca5604 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 "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-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 "libempathy/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 2041634aaa63f508edd1d970ba69962da8faa105..62f49988f54580f01a0b2d7bca68fb5ca1a002e8 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 "libempathy-gtk/empathy-chat.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index 0e70885d730aa3ea643e5a6230c1592356542390..1af26b230dc3d9354016705f54b433e345f7a862 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 "libempathy/empathy-presence-manager.h"

 
 

-#include <libempathy-gtk/empathy-theme-manager.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/empathy-theme-manager.h"
+#include "libempathy-gtk/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 "libempathy/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 a18cccb1fc176c65e052eabe29c708c6bd911c5f..83f6b99d7756bbb3113b12315a4cffb93dd8838b 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 "libempathy/empathy-chatroom-manager.h"
+#include "libempathy/empathy-utils.h"

 
 

-#include <libempathy-gtk/empathy-account-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/empathy-account-chooser.h"
+#include "libempathy-gtk/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 7d56b684926806686a9ba5ea74420064574d6018..c5514b73a6c6c13a92ad7669b6f380676993eee7 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 "libempathy/empathy-debug.h"
+#include "libempathy/empathy-utils.h"

 
 

-#include <libempathy-gtk/empathy-geometry.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/empathy-geometry.h"
+#include "libempathy-gtk/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 00dc98c8da4701f0fad0e0d6519efae9567f37c7..cb17e3c71a3518bdbb1a11066f12055c8a9bc31a 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 "libempathy-gtk/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 f652c2164bb9d7a6f72a5074f5546bcd43edd862..f95e76bafaf004c0e451591550f5342aee7f785f 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 "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-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 "libempathy/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 70af9a1c271d22f926aa5bd52b7f4b78d466b511..ee5daf404860dafc202af0e9a78b8df0cfff0139 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 "libempathy/empathy-contact.h"

 
 G_BEGIN_DECLS
 
 
 G_BEGIN_DECLS
 

diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index f89004f32c6cb4246f34bcecf0b73f89a6517171..3cf8744206fe75e2bcf04b20c157ea106eccedd3 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 "libempathy/empathy-debug.h"
+#include "libempathy/empathy-utils.h"

 
 

-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-geometry.h>
+#include "libempathy-gtk/empathy-ui-utils.h"
+#include "libempathy-gtk/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 0ff820f06b9f0357ac85b8313c911ec23a34e6ff..8d81c76612aec7df59efe5c77d67d56b1a2f1783 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 "libempathy/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 d4dd70d01c275403c8db81612c4a8ee34bcad16e..33c40844450f7c575686c189d20845e1dcf9f0bf 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 "libempathy/empathy-debug.h"
+#include "libempathy/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 a412037d1bcbe9d69b56755bfc930bed6cfaacbf..a074d7a7f21c7a96a7e65ed225a859800b949b93 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 "libempathy/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 8fd7eaef42cf7f5139c959203118d16b28d767fa..394caede4cdcf3199209d25fa064ce2d4474d7df 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 "libempathy/empathy-debug.h"
+#include "libempathy/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 7007dee5718cb3d20e541f95f37082b02425af4d..768d493fe927cf1949bbac36b1c8ad184c8f35d4 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 "libempathy/empathy-connection-managers.h"
+#include "libempathy/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 77048a4b7fa87aa82eef3d31eac29456b5c8ceae..938a8f12623bc278395386eb698580b646787f5c 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 "libempathy/empathy-debug.h"
+#include "libempathy/empathy-utils.h"

 
 

-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/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 14a01d79d7c451b5676192d738eeaa828d8a28b1..f3e552cd22eb01e20dcd258a3e6522ee890318e6 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 "libempathy/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 0b42ab4a754aa7b7558c6073303875b9781f64c7..783c8324007209038682d75ffffba2f3e9176374 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 "libempathy/empathy-utils.h"

 
 

-#include <libempathy-gtk/empathy-contact-chooser.h>
+#include "libempathy-gtk/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-mic-menu.c b/src/empathy-mic-menu.c
index b86aec4be9ca6b696376cf3ac2ff53e1ed8656a4..da7f800f4baa8dcad8ee4c521856a39f0252941d 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 "libempathy/empathy-debug.h"

 
 struct _EmpathyMicMenuPrivate
 {
 
 struct _EmpathyMicMenuPrivate
 {

diff --git a/src/empathy-mic-monitor.c b/src/empathy-mic-monitor.c
index c06e786ed78ccd8a68b8ca90b72604b76d012a7b..ef5b93d0d6bb89b2dd59bea2c27870b1edd0909d 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 "libempathy/empathy-utils.h"

 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP

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

 
 enum
 {
 
 enum
 {

diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index 5de844bd41e60343eff7e8183330483f07e9d7a3..a255bbcab04a49c3861976396ec7dd8a9d75810b 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 "libempathy/empathy-utils.h"
+#include "libempathy/empathy-request-util.h"
+#include "libempathy/empathy-gsettings.h"

 
 

-#include <libempathy-gtk/empathy-account-chooser.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/empathy-account-chooser.h"
+#include "libempathy-gtk/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 "libempathy/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 c3c996bd64fe0bd77c91314debb3ac1d2f20ae51..b4f77eebbfed3a21835c3d61398244a597d416a9 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 "libempathy-gtk/empathy-notify-manager.h"
+#include "libempathy-gtk/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 "libempathy/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 bfeef61b69b8684e1fdc4b0ff1067a15d177d2f9..73d2dcc10e9ee4c116b57e26bb1381480c3ba6f4 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 "libempathy/empathy-client-factory.h"
+#include "libempathy/empathy-gsettings.h"
+#include "libempathy/empathy-utils.h"

 
 

-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-theme-manager.h>
-#include <libempathy-gtk/empathy-spell.h>
+#include "libempathy-gtk/empathy-ui-utils.h"
+#include "libempathy-gtk/empathy-theme-manager.h"
+#include "libempathy-gtk/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 "libempathy/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 05d2a1fbac2052a1c13eda5bd450beefd6956607..15500902298fb5486a6f41ad78c90b59920a376e 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 "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-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 "libempathy/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 f7ac7d9964500e31c625279ac9a32a43136cc61c..8e2234fe1cf7783d0518b7f03d4f4f6144cd0f0b 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 "libempathy/empathy-gsettings.h"

 
 

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

 
 #ifdef HAVE_UOA
 
 #ifdef HAVE_UOA

-#include <libempathy/empathy-pkg-kit.h>
-#include <libempathy/empathy-uoa-utils.h>
+#include "libempathy/empathy-pkg-kit.h"
+#include "libempathy/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 "libempathy/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 54e49a30e57f33b285d769396c19b6281d44ea65..eef1f48a48603861c34173d9caa245136e32d697 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 "libempathy/empathy-gsettings.h"
+#include "libempathy/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 "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-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 "libempathy/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 12f8d6b478dcf69c359b1f1751acfb26a11e648a..b8196023000a2348724e9dfb574a59c9c4c13be0 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 "libempathy/empathy-debug.h"

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

diff --git a/src/empathy.c b/src/empathy.c
index 90370e6211c5e66107f53ab86cd501ab7df68b65..622dec61dca3f7c40e5d2058ad96bc84f695be6b 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 "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-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 "libempathy/empathy-debug.h"

 
 #define EMPATHY_DBUS_NAME "org.gnome.Empathy"
 
 
 #define EMPATHY_DBUS_NAME "org.gnome.Empathy"
 

diff --git a/tests/empathy-chatroom-manager-test.c b/tests/empathy-chatroom-manager-test.c
index 7ecb82ac42b850ea7bd5eeae76d6096a13237218..d3b0e7a435b11103695ae86684af8db5b092eb09 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 "libempathy/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 3826411a52430b9e731917a7c08af1d919d89e21..38ea4a14649f6839c2c72e411858bf95442f8c32 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 "libempathy/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 ba01c3782ed8e81138700f539a1aa858add4b2d2..3bef1fe43c07c4298ba155c1b596933f81cde6f0 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 "libempathy/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 313ab0651835236684204869a3f12e85c2a98859..8e9e86bc52642efb7cd906a066c50e4c60d93a0a 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 "libempathy/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 573967e436a4f1e78672e617485b0a743b9083cf..f959aad303ddcae93aa71a578bb853d8228b2d6b 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 "libempathy/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 6c53f07ad6431f08ce64c424160c8f12d88c8946..4428e3c3273e80d432c50c21890ecab732c608e4 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 "libempathy/empathy-debug.h"

 
 

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

 
 typedef struct
 {
 
 typedef struct
 {

diff --git a/tests/empathy-parser-test.c b/tests/empathy-parser-test.c
index 4ae6f775af524cd3133324222ab0a118c870bf64..e9983c7f873ec95d21f38a34b387e2a87ffbc092 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 "libempathy/empathy-debug.h"

 
 

-#include <libempathy-gtk/empathy-string-parser.h>
+#include "libempathy-gtk/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 2004383d64060ec11f716ce8e527d06ac045e263..efcafcec103dc72aa4b1c9fe2c18f68cf9602797 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 "libempathy/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/empathy-logs.c b/tests/interactive/empathy-logs.c
index 0ed9f95e4f775ca8cd9221b72ab4bc8c66ae9d0d..96f590a69df407e620628c099b400dd000a35d3d 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 "libempathy/empathy-debug.h"
+#include "libempathy/empathy-utils.h"
+#include "libempathy-gtk/empathy-log-window.h"
+#include "libempathy-gtk/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 7622a62489584f7551f58b7dfcb674a91f4c95b0..7324cbea389992d0fad15048de3548ca4e81fe5d 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 "libempathy-gtk/empathy-ui-utils.h"
+#include "libempathy-gtk/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 df91f1f2d0cf930c7f1bfbf9f1ed982f51e0b1ae..7fe056698e7b95ce484900bb2793107927a04043 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 "libempathy-gtk/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 66353f13dfd98769faca77d6d4d9ab27899de3d8..87d50f8e4d796d0e75cf22082e0f716463e444f5 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 "libempathy/empathy-client-factory.h"

 
 

-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-contact-blocking-dialog.h>
+#include "libempathy-gtk/empathy-ui-utils.h"
+#include "libempathy-gtk/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 50903c01f5b56f050c8aa6fe857bbbe24badd954..30fe4aa80f8dacb5e62e0102fdd296685578ee23 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 "libempathy-gtk/empathy-roster-model.h"
+#include "libempathy-gtk/empathy-roster-model-manager.h"

 
 

-#include <libempathy-gtk/empathy-roster-view.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/empathy-roster-view.h"
+#include "libempathy-gtk/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 12d35b4c623f90b4052bd24170f240be3b626fc2..39ad1f7b4bce0768970d2bbfd1a4f35b00668b6d 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 "libempathy/empathy-status-presets.h"

 
 

-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-presence-chooser.h>
+#include "libempathy-gtk/empathy-ui-utils.h"
+#include "libempathy-gtk/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 90b1797a3e5b211d28751481d76ec9558018e062..3e3767a9811aefdaf15f9b99ba42baf64be3940e 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 "libempathy-gtk/empathy-ui-utils.h"
+#include "libempathy-gtk/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 49f2012f052e671e2bd0dcb6a980eb6a7c319e03..3bbf9e3b3b92c6cbce04ab5506055ad24a6b79c0 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 "libempathy-gtk/empathy-roster-model.h"
+#include "libempathy-gtk/empathy-roster-model-aggregator.h"

 
 

-#include <libempathy-gtk/empathy-roster-view.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/empathy-roster-view.h"
+#include "libempathy-gtk/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 96137c395fa37ae38e929a3d141cb5b4dfc90690..0c95c445b1d2807d2d5fe2635b42debec659c080 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 "libempathy-gtk/empathy-roster-model.h"
+#include "libempathy-gtk/empathy-roster-model-manager.h"

 
 

-#include <libempathy-gtk/empathy-roster-view.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/empathy-roster-view.h"
+#include "libempathy-gtk/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 e71852509278bfac838f0f692e5e5e2574a4110e..50c6d115cfd180e7f54f8e69fb9a77cb9c7be388 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 "libempathy/empathy-status-presets.h"

 
 

-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-status-preset-dialog.h>
+#include "libempathy-gtk/empathy-ui-utils.h"
+#include "libempathy-gtk/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 ca763adb4cf1dde470d817084fd9c610e78c6875..d0ff34636b41e15295d4afb1c537fd9a000386e5 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 "libempathy-gtk/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 e375f6fb65f49b575741d609701d98572b77c667..ac51d434b0a814536a6204bee8dd48195f83a78c 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 "libempathy/empathy-irc-server.h"
+#include "libempathy/empathy-irc-network.h"
+#include "libempathy/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/empathy-accounts-plugin-widget.c b/ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c
index 28b4716ab76a9bf7a28f01b3687e31b1d5686efb..9c2da5af4154f0d73d32ec3ed87e314e5044b79a 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 "libempathy-gtk/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 939912aadbd4134d15c5add3c379c5c69f633bc3..f49d0fc832b87e05ec59139f96051f0a2e14b765 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 "libempathy/empathy-client-factory.h"
+#include "libempathy/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 768f0965de6f5d9dff7b42aaa9913d8b66348e90..7e1a5f206108faba544a738fd0dca104ab1eca29 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 "libempathy/empathy-contact.h"
+#include "libempathy-gtk/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 c15a13a7ab2edfd3d0aa13be7e16ae8393bac4d0..5bbf53db5dc5366045d51168587b8bf1b9be4be9 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 "libempathy/empathy-client-factory.h"

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