aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libempathy-gtk/Makefile.am2
-rw-r--r--libempathy-gtk/empathy-account-chooser.c2
-rw-r--r--libempathy-gtk/empathy-account-widget-irc.c2
-rw-r--r--libempathy-gtk/empathy-account-widget-irc.h4
-rw-r--r--libempathy-gtk/empathy-account-widget-private.h2
-rw-r--r--libempathy-gtk/empathy-account-widget-sip.h2
-rw-r--r--libempathy-gtk/empathy-account-widget.c4
-rw-r--r--libempathy-gtk/empathy-account-widget.h2
-rw-r--r--libempathy-gtk/empathy-avatar-chooser.c8
-rw-r--r--libempathy-gtk/empathy-avatar-image.c2
-rw-r--r--libempathy-gtk/empathy-bad-password-dialog.c2
-rw-r--r--libempathy-gtk/empathy-bad-password-dialog.h2
-rw-r--r--libempathy-gtk/empathy-base-password-dialog.c4
-rw-r--r--libempathy-gtk/empathy-calendar-button.c2
-rw-r--r--libempathy-gtk/empathy-call-utils.c4
-rw-r--r--libempathy-gtk/empathy-cell-renderer-activatable.c2
-rw-r--r--libempathy-gtk/empathy-cell-renderer-expander.c2
-rw-r--r--libempathy-gtk/empathy-cell-renderer-text.c2
-rw-r--r--libempathy-gtk/empathy-chat.c12
-rw-r--r--libempathy-gtk/empathy-chat.h6
-rw-r--r--libempathy-gtk/empathy-contact-blocking-dialog.c8
-rw-r--r--libempathy-gtk/empathy-contact-chooser.c10
-rw-r--r--libempathy-gtk/empathy-contact-search-dialog.c16
-rw-r--r--libempathy-gtk/empathy-contact-widget.c6
-rw-r--r--libempathy-gtk/empathy-contact-widget.h2
-rw-r--r--libempathy-gtk/empathy-contactinfo-utils.c4
-rw-r--r--libempathy-gtk/empathy-dialpad-widget.c2
-rw-r--r--libempathy-gtk/empathy-geometry.c2
-rw-r--r--libempathy-gtk/empathy-groups-widget.c4
-rw-r--r--libempathy-gtk/empathy-individual-dialogs.c4
-rw-r--r--libempathy-gtk/empathy-individual-edit-dialog.c2
-rw-r--r--libempathy-gtk/empathy-individual-information-dialog.c8
-rw-r--r--libempathy-gtk/empathy-individual-menu.c12
-rw-r--r--libempathy-gtk/empathy-individual-store-channel.c4
-rw-r--r--libempathy-gtk/empathy-individual-store-channel.h2
-rw-r--r--libempathy-gtk/empathy-individual-store-manager.c2
-rw-r--r--libempathy-gtk/empathy-individual-store-manager.h4
-rw-r--r--libempathy-gtk/empathy-individual-store.c4
-rw-r--r--libempathy-gtk/empathy-individual-view.c12
-rw-r--r--libempathy-gtk/empathy-individual-widget.c8
-rw-r--r--libempathy-gtk/empathy-irc-network-chooser-dialog.c6
-rw-r--r--libempathy-gtk/empathy-irc-network-chooser-dialog.h4
-rw-r--r--libempathy-gtk/empathy-irc-network-chooser.c6
-rw-r--r--libempathy-gtk/empathy-irc-network-chooser.h4
-rw-r--r--libempathy-gtk/empathy-irc-network-dialog.c2
-rw-r--r--libempathy-gtk/empathy-irc-network-dialog.h2
-rw-r--r--libempathy-gtk/empathy-live-search.c2
-rw-r--r--libempathy-gtk/empathy-local-xmpp-assistant-widget.c8
-rw-r--r--libempathy-gtk/empathy-log-window.c14
-rw-r--r--libempathy-gtk/empathy-new-account-dialog.c6
-rw-r--r--libempathy-gtk/empathy-new-account-dialog.h2
-rw-r--r--libempathy-gtk/empathy-new-call-dialog.c12
-rw-r--r--libempathy-gtk/empathy-new-message-dialog.c10
-rw-r--r--libempathy-gtk/empathy-notify-manager.c8
-rw-r--r--libempathy-gtk/empathy-notify-manager.h2
-rw-r--r--libempathy-gtk/empathy-password-dialog.c2
-rw-r--r--libempathy-gtk/empathy-password-dialog.h4
-rw-r--r--libempathy-gtk/empathy-presence-chooser.c8
-rw-r--r--libempathy-gtk/empathy-protocol-chooser.c6
-rw-r--r--libempathy-gtk/empathy-protocol-chooser.h2
-rw-r--r--libempathy-gtk/empathy-roster-contact.c6
-rw-r--r--libempathy-gtk/empathy-roster-model-manager.c2
-rw-r--r--libempathy-gtk/empathy-roster-model-manager.h2
-rw-r--r--libempathy-gtk/empathy-roster-view.c8
-rw-r--r--libempathy-gtk/empathy-roster-view.h6
-rw-r--r--libempathy-gtk/empathy-search-bar.c2
-rw-r--r--libempathy-gtk/empathy-share-my-desktop.c2
-rw-r--r--libempathy-gtk/empathy-share-my-desktop.h2
-rw-r--r--libempathy-gtk/empathy-smiley-manager.c2
-rw-r--r--libempathy-gtk/empathy-sound-manager.c6
-rw-r--r--libempathy-gtk/empathy-spell.c4
-rw-r--r--libempathy-gtk/empathy-status-preset-dialog.c6
-rw-r--r--libempathy-gtk/empathy-subscription-dialog.c4
-rw-r--r--libempathy-gtk/empathy-theme-adium.c8
-rw-r--r--libempathy-gtk/empathy-theme-adium.h2
-rw-r--r--libempathy-gtk/empathy-theme-manager.c4
-rw-r--r--libempathy-gtk/empathy-tls-dialog.c4
-rw-r--r--libempathy-gtk/empathy-ui-utils.c6
-rw-r--r--libempathy-gtk/empathy-ui-utils.h4
-rw-r--r--libempathy-gtk/empathy-user-info.c6
-rw-r--r--libempathy/Makefile.am2
-rw-r--r--libempathy/cheese-camera-device-monitor.c2
-rw-r--r--libempathy/empathy-account-settings.c2
-rw-r--r--libempathy/empathy-chatroom.h2
-rw-r--r--libempathy/empathy-connection-managers.c2
-rw-r--r--libempathy/empathy-pkg-kit.c2
-rw-r--r--libempathy/empathy-request-util.c2
-rw-r--r--libempathy/empathy-server-sasl-handler.c2
-rw-r--r--libempathy/empathy-utils.c2
-rw-r--r--nautilus-sendto-plugin/empathy-nautilus-sendto.c22
-rw-r--r--src/empathy-accounts-common.c4
-rw-r--r--src/empathy-accounts-dialog.c16
-rw-r--r--src/empathy-accounts.c6
-rw-r--r--src/empathy-audio-sink.c2
-rw-r--r--src/empathy-audio-src.c4
-rw-r--r--src/empathy-audio-utils.c4
-rw-r--r--src/empathy-auth-client.c18
-rw-r--r--src/empathy-call-factory.c6
-rw-r--r--src/empathy-call-handler.c6
-rw-r--r--src/empathy-call-handler.h2
-rw-r--r--src/empathy-call-observer.c6
-rw-r--r--src/empathy-call-window-fullscreen.c4
-rw-r--r--src/empathy-call-window.c24
-rw-r--r--src/empathy-call.c4
-rw-r--r--src/empathy-camera-menu.c6
-rw-r--r--src/empathy-chat-manager.c12
-rw-r--r--src/empathy-chat-manager.h2
-rw-r--r--src/empathy-chat-window.c28
-rw-r--r--src/empathy-chat-window.h2
-rw-r--r--src/empathy-chat.c8
-rw-r--r--src/empathy-chatrooms-window.c8
-rw-r--r--src/empathy-debug-window.c8
-rw-r--r--src/empathy-debugger.c2
-rw-r--r--src/empathy-event-manager.c26
-rw-r--r--src/empathy-event-manager.h2
-rw-r--r--src/empathy-ft-manager.c8
-rw-r--r--src/empathy-ft-manager.h2
-rw-r--r--src/empathy-import-dialog.c4
-rw-r--r--src/empathy-import-dialog.h2
-rw-r--r--src/empathy-import-pidgin.c4
-rw-r--r--src/empathy-import-utils.c4
-rw-r--r--src/empathy-import-widget.c6
-rw-r--r--src/empathy-import-widget.h2
-rw-r--r--src/empathy-invite-participant-dialog.c4
-rw-r--r--src/empathy-mic-menu.c2
-rw-r--r--src/empathy-mic-monitor.c4
-rw-r--r--src/empathy-new-chatroom-dialog.c12
-rw-r--r--src/empathy-notifications-approver.c6
-rw-r--r--src/empathy-preferences.c14
-rw-r--r--src/empathy-roster-window.c42
-rw-r--r--src/empathy-sanity-cleaning.c10
-rw-r--r--src/empathy-status-icon.c14
-rw-r--r--src/empathy-video-src.c2
-rw-r--r--src/empathy.c24
-rw-r--r--tests/empathy-chatroom-manager-test.c2
-rw-r--r--tests/empathy-chatroom-test.c2
-rw-r--r--tests/empathy-irc-network-manager-test.c2
-rw-r--r--tests/empathy-irc-network-test.c2
-rw-r--r--tests/empathy-irc-server-test.c2
-rw-r--r--tests/empathy-live-search-test.c4
-rw-r--r--tests/empathy-parser-test.c4
-rw-r--r--tests/empathy-tls-test.c2
-rw-r--r--tests/interactive/empathy-logs.c8
-rw-r--r--tests/interactive/test-empathy-account-chooser.c4
-rw-r--r--tests/interactive/test-empathy-calendar-button.c2
-rw-r--r--tests/interactive/test-empathy-contact-blocking-dialog.c6
-rw-r--r--tests/interactive/test-empathy-dual-roster-view.c8
-rw-r--r--tests/interactive/test-empathy-presence-chooser.c6
-rw-r--r--tests/interactive/test-empathy-protocol-chooser.c4
-rw-r--r--tests/interactive/test-empathy-roster-model-aggregator.c8
-rw-r--r--tests/interactive/test-empathy-roster-view.c8
-rw-r--r--tests/interactive/test-empathy-status-preset-dialog.c6
-rw-r--r--tests/test-helper.c2
-rw-r--r--tests/test-irc-helper.h6
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c2
-rw-r--r--ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin.c4
-rw-r--r--ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c4
-rw-r--r--ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin.c2
158 files changed, 448 insertions, 448 deletions
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 2de397a57..4c8f54c1a 100644
--- 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" \
- --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 \
diff --git a/libempathy-gtk/empathy-account-chooser.c b/libempathy-gtk/empathy-account-chooser.c
index 03aeacf71..0f3b5b470 100644
--- 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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
/**
* SECTION:empathy-account-chooser
diff --git a/libempathy-gtk/empathy-account-widget-irc.c b/libempathy-gtk/empathy-account-widget-irc.c
index be9c99301..fbc0c19cb 100644
--- 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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
typedef struct {
EmpathyAccountWidget *self;
diff --git a/libempathy-gtk/empathy-account-widget-irc.h b/libempathy-gtk/empathy-account-widget-irc.h
index bcd45b76a..c6e6dec01 100644
--- 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>
-#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
diff --git a/libempathy-gtk/empathy-account-widget-private.h b/libempathy-gtk/empathy-account-widget-private.h
index 988b09883..d987abb7c 100644
--- 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__
-#include <libempathy-gtk/empathy-account-widget.h>
+#include "libempathy-gtk/empathy-account-widget.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 84e96e7b6..62b80da81 100644
--- 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>
-#include <libempathy-gtk/empathy-account-widget.h>
+#include "libempathy-gtk/empathy-account-widget.h"
G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index 9fa8c1eaf..d8b5b7785 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -28,7 +28,7 @@
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-utils.h>
+#include "libempathy/empathy-utils.h"
#include <dbus/dbus-protocol.h>
@@ -38,7 +38,7 @@
#include "empathy-ui-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
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 2f7d54431..57eaa1a36 100644
--- a/libempathy-gtk/empathy-account-widget.h
+++ b/libempathy-gtk/empathy-account-widget.h
@@ -26,7 +26,7 @@
#include <gtk/gtk.h>
-#include <libempathy/empathy-account-settings.h>
+#include "libempathy/empathy-account-settings.h"
G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 553dd4f6e..240e2211d 100644
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -24,9 +24,9 @@
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-camera-monitor.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-utils.h>
+#include "libempathy/empathy-camera-monitor.h"
+#include "libempathy/empathy-gsettings.h"
+#include "libempathy/empathy-utils.h"
#include "empathy-avatar-chooser.h"
#include "empathy-images.h"
@@ -37,7 +37,7 @@
#endif /* HAVE_CHEESE */
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
/**
* SECTION:empathy-avatar-chooser
diff --git a/libempathy-gtk/empathy-avatar-image.c b/libempathy-gtk/empathy-avatar-image.c
index acb0903e4..4b50eceef 100644
--- 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 <libempathy/empathy-utils.h>
+#include "libempathy/empathy-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 a6938b3e5..1e6cbbfd3 100644
--- 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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
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 ad5179806..dc04d61bb 100644
--- 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 <libempathy-gtk/empathy-base-password-dialog.h>
+#include "libempathy-gtk/empathy-base-password-dialog.h"
G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-base-password-dialog.c b/libempathy-gtk/empathy-base-password-dialog.c
index 20238343d..688bbe8c4 100644
--- 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 <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)
diff --git a/libempathy-gtk/empathy-calendar-button.c b/libempathy-gtk/empathy-calendar-button.c
index f4c82eb4e..eace02f8e 100644
--- 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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
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 9f72ce9bb..17c03cff2 100644
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -28,10 +28,10 @@
#include "empathy-call-utils.h"
-#include <libempathy/empathy-request-util.h>
+#include "libempathy/empathy-request-util.h"
#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)
diff --git a/libempathy-gtk/empathy-cell-renderer-activatable.c b/libempathy-gtk/empathy-cell-renderer-activatable.c
index 3db350935..7f0355901 100644
--- a/libempathy-gtk/empathy-cell-renderer-activatable.c
+++ b/libempathy-gtk/empathy-cell-renderer-activatable.c
@@ -22,7 +22,7 @@
#include "config.h"
-#include <libempathy/empathy-utils.h>
+#include "libempathy/empathy-utils.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 f7c873617..a72f09132 100644
--- 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>
*/
-#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)
diff --git a/libempathy-gtk/empathy-cell-renderer-text.c b/libempathy-gtk/empathy-cell-renderer-text.c
index 0afd89748..a4fe92b15 100644
--- a/libempathy-gtk/empathy-cell-renderer-text.c
+++ b/libempathy-gtk/empathy-cell-renderer-text.c
@@ -23,7 +23,7 @@
#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)
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index ffd92b1cd..f18256b97 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -32,11 +32,11 @@
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-keyring.h>
-#include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-client-factory.h>
+#include "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"
@@ -52,7 +52,7 @@
#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
diff --git a/libempathy-gtk/empathy-chat.h b/libempathy-gtk/empathy-chat.h
index 269b00596..d5da3fe3c 100644
--- a/libempathy-gtk/empathy-chat.h
+++ b/libempathy-gtk/empathy-chat.h
@@ -30,10 +30,10 @@
#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
diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.c b/libempathy-gtk/empathy-contact-blocking-dialog.c
index 9a0498c5a..022e05ba1 100644
--- 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 <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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
#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 80ea9765a..92922a229 100644
--- a/libempathy-gtk/empathy-contact-chooser.c
+++ b/libempathy-gtk/empathy-contact-chooser.c
@@ -13,12 +13,12 @@
#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);
diff --git a/libempathy-gtk/empathy-contact-search-dialog.c b/libempathy-gtk/empathy-contact-search-dialog.c
index 0b01bf88d..70bafb989 100644
--- 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 <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
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
#include "empathy-contact-search-dialog.h"
diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index cef06d309..cbc034db5 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -23,8 +23,8 @@
#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"
@@ -33,7 +33,7 @@
#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
diff --git a/libempathy-gtk/empathy-contact-widget.h b/libempathy-gtk/empathy-contact-widget.h
index 6f8045d3e..cb7079300 100644
--- a/libempathy-gtk/empathy-contact-widget.h
+++ b/libempathy-gtk/empathy-contact-widget.h
@@ -24,7 +24,7 @@
#include <gtk/gtk.h>
-#include <libempathy/empathy-contact.h>
+#include "libempathy/empathy-contact.h"
#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 7ec61310d..fcf061943 100644
--- a/libempathy-gtk/empathy-contactinfo-utils.c
+++ b/libempathy-gtk/empathy-contactinfo-utils.c
@@ -24,8 +24,8 @@
#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"
diff --git a/libempathy-gtk/empathy-dialpad-widget.c b/libempathy-gtk/empathy-dialpad-widget.c
index 8fd65bdb2..6509e13ba 100644
--- a/libempathy-gtk/empathy-dialpad-widget.c
+++ b/libempathy-gtk/empathy-dialpad-widget.c
@@ -23,7 +23,7 @@
#include "empathy-dialpad-widget.h"
-#include <libempathy-gtk/empathy-dialpad-button.h>
+#include "libempathy-gtk/empathy-dialpad-button.h"
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 d171f72fc..2c4b50188 100644
--- 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 <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)
diff --git a/libempathy-gtk/empathy-groups-widget.c b/libempathy-gtk/empathy-groups-widget.c
index 6b6a0d0dc..2292cc53b 100644
--- a/libempathy-gtk/empathy-groups-widget.c
+++ b/libempathy-gtk/empathy-groups-widget.c
@@ -23,8 +23,8 @@
#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"
diff --git a/libempathy-gtk/empathy-individual-dialogs.c b/libempathy-gtk/empathy-individual-dialogs.c
index 03874c905..a22ca28e4 100644
--- a/libempathy-gtk/empathy-individual-dialogs.c
+++ b/libempathy-gtk/empathy-individual-dialogs.c
@@ -23,8 +23,8 @@
#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"
diff --git a/libempathy-gtk/empathy-individual-edit-dialog.c b/libempathy-gtk/empathy-individual-edit-dialog.c
index bd43adeb8..21380a5ba 100644
--- 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 <libempathy/empathy-utils.h>
+#include "libempathy/empathy-utils.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 cd6392a9b..4059925de 100644
--- 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 <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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
#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 4cadf22a2..cf67101ef 100644
--- a/libempathy-gtk/empathy-individual-menu.c
+++ b/libempathy-gtk/empathy-individual-menu.c
@@ -24,11 +24,11 @@
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-camera-monitor.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-individual-manager.h>
-#include <libempathy/empathy-chatroom-manager.h>
-#include <libempathy/empathy-utils.h>
+#include "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"
@@ -44,7 +44,7 @@
#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)
diff --git a/libempathy-gtk/empathy-individual-store-channel.c b/libempathy-gtk/empathy-individual-store-channel.c
index 0fefb9c85..8ceaf6e5b 100644
--- a/libempathy-gtk/empathy-individual-store-channel.c
+++ b/libempathy-gtk/empathy-individual-store-channel.c
@@ -25,12 +25,12 @@
#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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
struct _EmpathyIndividualStoreChannelPriv
{
diff --git a/libempathy-gtk/empathy-individual-store-channel.h b/libempathy-gtk/empathy-individual-store-channel.h
index 468effe21..31a6abd8b 100644
--- 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 <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 ())
diff --git a/libempathy-gtk/empathy-individual-store-manager.c b/libempathy-gtk/empathy-individual-store-manager.c
index ea872b1d1..04c341e5a 100644
--- 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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
struct _EmpathyIndividualStoreManagerPriv
{
diff --git a/libempathy-gtk/empathy-individual-store-manager.h b/libempathy-gtk/empathy-individual-store-manager.h
index 7656b50ea..8b56b0c1b 100644
--- 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 <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 ())
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index ddaea26b4..7223e2e9c 100644
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -28,13 +28,13 @@
#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 <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).
diff --git a/libempathy-gtk/empathy-individual-view.c b/libempathy-gtk/empathy-individual-view.c
index 7e36fe19a..b88fd253d 100644
--- a/libempathy-gtk/empathy-individual-view.c
+++ b/libempathy-gtk/empathy-individual-view.c
@@ -28,11 +28,11 @@
#include <glib/gi18n-lib.h>
-#include <libempathy/empathy-connection-aggregator.h>
-#include <libempathy/empathy-individual-manager.h>
-#include <libempathy/empathy-contact-groups.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-utils.h>
+#include "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"
@@ -43,7 +43,7 @@
#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).
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 12093b577..87be31f26 100644
--- 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 <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"
@@ -39,7 +39,7 @@
#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
diff --git a/libempathy-gtk/empathy-irc-network-chooser-dialog.c b/libempathy-gtk/empathy-irc-network-chooser-dialog.c
index 00e9bf0eb..c4c8e830f 100644
--- 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 <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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.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 0d4f24e7f..8ffb2cbe1 100644
--- 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 <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
diff --git a/libempathy-gtk/empathy-irc-network-chooser.c b/libempathy-gtk/empathy-irc-network-chooser.c
index e19b3e8ab..79b54e985 100644
--- a/libempathy-gtk/empathy-irc-network-chooser.c
+++ b/libempathy-gtk/empathy-irc-network-chooser.c
@@ -21,14 +21,14 @@
#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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.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 3b6125050..23ecc92fe 100644
--- 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 <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
diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c
index fe26ceb34..a10b2ca3c 100644
--- 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 <libempathy/empathy-utils.h>
+#include "libempathy/empathy-utils.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 df4a8b152..547e3d668 100644
--- 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 <libempathy/empathy-irc-network.h>
+#include "libempathy/empathy-irc-network.h"
G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-live-search.c b/libempathy-gtk/empathy-live-search.c
index e65adbe4c..fe3661276 100644
--- a/libempathy-gtk/empathy-live-search.c
+++ b/libempathy-gtk/empathy-live-search.c
@@ -23,7 +23,7 @@
#include "config.h"
-#include <libempathy/empathy-utils.h>
+#include "libempathy/empathy-utils.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 b714fa499..afb5057d4 100644
--- 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 <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
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
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 80733da1b..d49dd5587 100644
--- 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 <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"
@@ -48,7 +48,7 @@
#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"
diff --git a/libempathy-gtk/empathy-new-account-dialog.c b/libempathy-gtk/empathy-new-account-dialog.c
index c36cfcfce..eb270d5d6 100644
--- 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 <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)
diff --git a/libempathy-gtk/empathy-new-account-dialog.h b/libempathy-gtk/empathy-new-account-dialog.h
index 07fc22f98..c68630d84 100644
--- 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 <libempathy/empathy-account-settings.h>
+#include "libempathy/empathy-account-settings.h"
G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-new-call-dialog.c b/libempathy-gtk/empathy-new-call-dialog.c
index d770d6d98..27ef7be4d 100644
--- 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 <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
-#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"
diff --git a/libempathy-gtk/empathy-new-message-dialog.c b/libempathy-gtk/empathy-new-message-dialog.c
index c38a1c75b..5709e3a83 100644
--- 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 <libempathy/empathy-request-util.h>
+#include "libempathy/empathy-request-util.h"
#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"
diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c
index d142b7fa3..2decbf064 100644
--- a/libempathy-gtk/empathy-notify-manager.c
+++ b/libempathy-gtk/empathy-notify-manager.c
@@ -21,13 +21,13 @@
#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
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
#include "empathy-notify-manager.h"
diff --git a/libempathy-gtk/empathy-notify-manager.h b/libempathy-gtk/empathy-notify-manager.h
index 923ab4a54..b0100ccb7 100644
--- a/libempathy-gtk/empathy-notify-manager.h
+++ b/libempathy-gtk/empathy-notify-manager.h
@@ -23,7 +23,7 @@
#include <glib-object.h>
-#include <libempathy/empathy-contact.h>
+#include "libempathy/empathy-contact.h"
#include <libnotify/notification.h>
diff --git a/libempathy-gtk/empathy-password-dialog.c b/libempathy-gtk/empathy-password-dialog.c
index 07fb69fc0..90550f4f2 100644
--- 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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
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 ee1c993b4..7511cbda3 100644
--- 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 <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
diff --git a/libempathy-gtk/empathy-presence-chooser.c b/libempathy-gtk/empathy-presence-chooser.c
index a047890bb..cc9a48299 100644
--- a/libempathy-gtk/empathy-presence-chooser.c
+++ b/libempathy-gtk/empathy-presence-chooser.c
@@ -28,12 +28,12 @@
#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
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.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 d5b0de7c1..8b3a24731 100644
--- a/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@ -24,14 +24,14 @@
#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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
/**
* SECTION:empathy-protocol-chooser
diff --git a/libempathy-gtk/empathy-protocol-chooser.h b/libempathy-gtk/empathy-protocol-chooser.h
index eeaab60c0..469f89f32 100644
--- 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 <libempathy/empathy-account-settings.h>
+#include "libempathy/empathy-account-settings.h"
G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-roster-contact.c b/libempathy-gtk/empathy-roster-contact.c
index d8410b5e6..587a3481d 100644
--- a/libempathy-gtk/empathy-roster-contact.c
+++ b/libempathy-gtk/empathy-roster-contact.c
@@ -4,10 +4,10 @@
#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)
diff --git a/libempathy-gtk/empathy-roster-model-manager.c b/libempathy-gtk/empathy-roster-model-manager.c
index 859edb7a9..ff3ff5347 100644
--- 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 <libempathy/empathy-utils.h>
+#include "libempathy/empathy-utils.h"
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 f7ce1f4e5..5d5e12f0d 100644
--- 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 <libempathy/empathy-individual-manager.h>
+#include "libempathy/empathy-individual-manager.h"
G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-roster-view.c b/libempathy-gtk/empathy-roster-view.c
index ed57be3d4..9023407e2 100644
--- a/libempathy-gtk/empathy-roster-view.c
+++ b/libempathy-gtk/empathy-roster-view.c
@@ -4,11 +4,11 @@
#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)
diff --git a/libempathy-gtk/empathy-roster-view.h b/libempathy-gtk/empathy-roster-view.h
index 0077b6843..8a1b6d404 100644
--- 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__
-#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
diff --git a/libempathy-gtk/empathy-search-bar.c b/libempathy-gtk/empathy-search-bar.c
index 018a068ab..558a125b4 100644
--- a/libempathy-gtk/empathy-search-bar.c
+++ b/libempathy-gtk/empathy-search-bar.c
@@ -21,7 +21,7 @@
#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"
diff --git a/libempathy-gtk/empathy-share-my-desktop.c b/libempathy-gtk/empathy-share-my-desktop.c
index 8b0845048..5a0737adc 100644
--- 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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.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 3efeecc14..4f11aa8af 100644
--- 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__
-#include <libempathy/empathy-contact.h>
+#include "libempathy/empathy-contact.h"
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 99caa51d7..494ae7f6a 100644
--- a/libempathy-gtk/empathy-smiley-manager.c
+++ b/libempathy-gtk/empathy-smiley-manager.c
@@ -22,7 +22,7 @@
#include "config.h"
-#include <libempathy/empathy-utils.h>
+#include "libempathy/empathy-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 3291a9a92..8bcca8bb1 100644
--- 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 <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;
diff --git a/libempathy-gtk/empathy-spell.c b/libempathy-gtk/empathy-spell.c
index 4242b5738..206edc192 100644
--- 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 <libempathy/empathy-debug.h>
-#include <libempathy/empathy-gsettings.h>
+#include "libempathy/empathy-debug.h"
+#include "libempathy/empathy-gsettings.h"
#ifdef HAVE_ENCHANT
diff --git a/libempathy-gtk/empathy-status-preset-dialog.c b/libempathy-gtk/empathy-status-preset-dialog.c
index 19f1fee6a..6ba1e54d1 100644
--- 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 <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
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.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 04fae6d18..94ebf7c9d 100644
--- a/libempathy-gtk/empathy-subscription-dialog.c
+++ b/libempathy-gtk/empathy-subscription-dialog.c
@@ -22,8 +22,8 @@
#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>
diff --git a/libempathy-gtk/empathy-theme-adium.c b/libempathy-gtk/empathy-theme-adium.c
index 67ec4d08f..1762eabd6 100644
--- a/libempathy-gtk/empathy-theme-adium.c
+++ b/libempathy-gtk/empathy-theme-adium.c
@@ -23,9 +23,9 @@
#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"
@@ -35,7 +35,7 @@
#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
diff --git a/libempathy-gtk/empathy-theme-adium.h b/libempathy-gtk/empathy-theme-adium.h
index 880667615..dee5aef35 100644
--- a/libempathy-gtk/empathy-theme-adium.h
+++ b/libempathy-gtk/empathy-theme-adium.h
@@ -23,7 +23,7 @@
#include <webkit/webkitwebview.h>
-#include <libempathy/empathy-message.h>
+#include "libempathy/empathy-message.h"
G_BEGIN_DECLS
diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c
index f3d8d67bc..bb4d22966 100644
--- a/libempathy-gtk/empathy-theme-manager.c
+++ b/libempathy-gtk/empathy-theme-manager.c
@@ -26,12 +26,12 @@
#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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
struct _EmpathyThemeManagerPriv
{
diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c
index 82244403a..88f22d36d 100644
--- 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 <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)
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index 32f1fe389..2ae011429 100644
--- 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 <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)
diff --git a/libempathy-gtk/empathy-ui-utils.h b/libempathy-gtk/empathy-ui-utils.h
index d1712f595..7c505c668 100644
--- a/libempathy-gtk/empathy-ui-utils.h
+++ b/libempathy-gtk/empathy-ui-utils.h
@@ -36,8 +36,8 @@
#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
diff --git a/libempathy-gtk/empathy-user-info.c b/libempathy-gtk/empathy-user-info.c
index 4c9a2deee..4c447772b 100644
--- 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 <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"
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index 77484d2f1..1cbd661c7 100644
--- 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" \
- --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 \
diff --git a/libempathy/cheese-camera-device-monitor.c b/libempathy/cheese-camera-device-monitor.c
index 3b937ce9a..6f9627da9 100644
--- a/libempathy/cheese-camera-device-monitor.c
+++ b/libempathy/cheese-camera-device-monitor.c
@@ -69,7 +69,7 @@ G_DEFINE_TYPE (EmpathyCameraDeviceMonitor, empathy_camera_device_monitor, G_TYPE
#define EMPATHY_CAMERA_DEVICE_MONITOR_ERROR empathy_camera_device_monitor_error_quark ()
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
enum EmpathyCameraDeviceMonitorError
{
diff --git a/libempathy/empathy-account-settings.c b/libempathy/empathy-account-settings.c
index 12b28b8ba..d77a8b08a 100644
--- a/libempathy/empathy-account-settings.c
+++ b/libempathy/empathy-account-settings.c
@@ -27,7 +27,7 @@
#include "empathy-presence-manager.h"
#define DEBUG_FLAG EMPATHY_DEBUG_ACCOUNT
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyAccountSettings)
diff --git a/libempathy/empathy-chatroom.h b/libempathy/empathy-chatroom.h
index 57ca685cb..48e895841 100644
--- a/libempathy/empathy-chatroom.h
+++ b/libempathy/empathy-chatroom.h
@@ -26,7 +26,7 @@
#include <telepathy-glib/telepathy-glib.h>
-#include <libempathy/empathy-tp-chat.h>
+#include "libempathy/empathy-tp-chat.h"
G_BEGIN_DECLS
diff --git a/libempathy/empathy-connection-managers.c b/libempathy/empathy-connection-managers.c
index abf862bca..88ff1d675 100644
--- a/libempathy/empathy-connection-managers.c
+++ b/libempathy/empathy-connection-managers.c
@@ -24,7 +24,7 @@
#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
static GObject *managers = NULL;
diff --git a/libempathy/empathy-pkg-kit.c b/libempathy/empathy-pkg-kit.c
index 1d01b931d..312c24a4a 100644
--- a/libempathy/empathy-pkg-kit.c
+++ b/libempathy/empathy-pkg-kit.c
@@ -20,7 +20,7 @@
#include "config.h"
-#include <libempathy/empathy-pkg-kit.h>
+#include "libempathy/empathy-pkg-kit.h"
typedef struct
{
diff --git a/libempathy/empathy-request-util.c b/libempathy/empathy-request-util.c
index 8532da57b..6423fe19a 100644
--- a/libempathy/empathy-request-util.c
+++ b/libempathy/empathy-request-util.c
@@ -24,7 +24,7 @@
#include "empathy-request-util.h"
#define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
void
empathy_chat_with_contact (EmpathyContact *contact,
diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index bdca7b623..16aaa6bb1 100644
--- 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 <extensions/extensions.h>
+#include "extensions/extensions.h"
#define DEBUG_FLAG EMPATHY_DEBUG_SASL
#include "empathy-debug.h"
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 235b02246..b6fd9ce13 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -37,7 +37,7 @@
#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"
diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
index 8b1bafb78..fde281dd5 100644
--- 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 <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"
diff --git a/src/empathy-accounts-common.c b/src/empathy-accounts-common.c
index 537b43e3d..fcd331aec 100644
--- a/src/empathy-accounts-common.c
+++ b/src/empathy-accounts-common.c
@@ -26,13 +26,13 @@
#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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
gboolean
empathy_accounts_has_non_salut_accounts (TpAccountManager *manager)
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index f0a2db9a2..acfd9c290 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -28,14 +28,14 @@
#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"
@@ -43,7 +43,7 @@
#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
diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 90d7947e9..57f6968c8 100644
--- a/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@ -32,13 +32,13 @@
#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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
#define EMPATHY_ACCOUNTS_DBUS_NAME "org.gnome.EmpathyAccounts"
diff --git a/src/empathy-audio-sink.c b/src/empathy-audio-sink.c
index 0c3693b6f..01bc80f53 100644
--- 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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
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 fe62a6c4b..2f919533e 100644
--- a/src/empathy-audio-src.c
+++ b/src/empathy-audio-src.c
@@ -26,14 +26,14 @@
#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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
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 323ef8edf..89202f541 100644
--- a/src/empathy-audio-utils.c
+++ b/src/empathy-audio-utils.c
@@ -24,10 +24,10 @@
#include "empathy-audio-utils.h"
-#include <libempathy/empathy-gsettings.h>
+#include "libempathy/empathy-gsettings.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
void
empathy_audio_set_stream_properties (GstElement *element,
diff --git a/src/empathy-auth-client.c b/src/empathy-auth-client.c
index f1d42b74c..3636142cc 100644
--- 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 <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"
diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c
index dbd5ecf77..42bd46f50 100644
--- a/src/empathy-call-factory.c
+++ b/src/empathy-call-factory.c
@@ -20,14 +20,14 @@
#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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
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 b1d4f2977..88b166f1f 100644
--- a/src/empathy-call-handler.c
+++ b/src/empathy-call-handler.c
@@ -22,14 +22,14 @@
#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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
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 36c6cfdc2..55e489782 100644
--- a/src/empathy-call-handler.h
+++ b/src/empathy-call-handler.h
@@ -28,7 +28,7 @@
#include <telepathy-glib/telepathy-glib.h>
-#include <libempathy/empathy-contact.h>
+#include "libempathy/empathy-contact.h"
G_BEGIN_DECLS
diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c
index bf42b055a..c0aa04170 100644
--- a/src/empathy-call-observer.c
+++ b/src/empathy-call-observer.c
@@ -22,13 +22,13 @@
#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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
struct _EmpathyCallObserverPriv {
EmpathyNotifyManager *notify_mgr;
diff --git a/src/empathy-call-window-fullscreen.c b/src/empathy-call-window-fullscreen.c
index ca2914724..b678c0a42 100644
--- 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 <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 */
diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index 37090319b..5a24fbcd3 100644
--- 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 <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
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.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 9d5ab8a83..47e3f3a83 100644
--- a/src/empathy-call.c
+++ b/src/empathy-call.c
@@ -31,13 +31,13 @@
#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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
/* 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 a6f8d3d12..2bfef6cb7 100644
--- a/src/empathy-camera-menu.c
+++ b/src/empathy-camera-menu.c
@@ -21,13 +21,13 @@
#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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
struct _EmpathyCameraMenuPrivate
{
diff --git a/src/empathy-chat-manager.c b/src/empathy-chat-manager.c
index 15a4e7a4f..50292fbd7 100644
--- a/src/empathy-chat-manager.c
+++ b/src/empathy-chat-manager.c
@@ -21,20 +21,20 @@
#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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
#include "empathy-chat-manager.h"
-#include <extensions/extensions.h>
+#include "extensions/extensions.h"
enum {
CLOSED_CHATS_CHANGED,
diff --git a/src/empathy-chat-manager.h b/src/empathy-chat-manager.h
index 7dfd53480..5082e7337 100644
--- a/src/empathy-chat-manager.h
+++ b/src/empathy-chat-manager.h
@@ -22,7 +22,7 @@
#include <glib-object.h>
-#include <libempathy-gtk/empathy-chat.h>
+#include "libempathy-gtk/empathy-chat.h"
G_BEGIN_DECLS
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 292c1a9a7..59814bdf4 100644
--- 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 <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"
@@ -50,7 +50,7 @@
#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
*/
diff --git a/src/empathy-chat-window.h b/src/empathy-chat-window.h
index 2041634aa..62f49988f 100644
--- a/src/empathy-chat-window.h
+++ b/src/empathy-chat-window.h
@@ -32,7 +32,7 @@
#include <telepathy-glib/telepathy-glib.h>
-#include <libempathy-gtk/empathy-chat.h>
+#include "libempathy-gtk/empathy-chat.h"
G_BEGIN_DECLS
diff --git a/src/empathy-chat.c b/src/empathy-chat.c
index 0e70885d7..1af26b230 100644
--- a/src/empathy-chat.c
+++ b/src/empathy-chat.c
@@ -26,16 +26,16 @@
#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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
/* 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 a18cccb1f..83f6b99d7 100644
--- a/src/empathy-chatrooms-window.c
+++ b/src/empathy-chatrooms-window.c
@@ -27,11 +27,11 @@
#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"
diff --git a/src/empathy-debug-window.c b/src/empathy-debug-window.c
index 7d56b6849..c5514b73a 100644
--- 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 <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"
diff --git a/src/empathy-debugger.c b/src/empathy-debugger.c
index 00dc98c8d..cb17e3c71 100644
--- a/src/empathy-debugger.c
+++ b/src/empathy-debugger.c
@@ -21,7 +21,7 @@
#include <glib/gi18n.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
+#include "libempathy-gtk/empathy-ui-utils.h"
#include "empathy-debug-window.h"
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index f652c2164..f95e76baf 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -23,23 +23,23 @@
#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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyEventManager)
diff --git a/src/empathy-event-manager.h b/src/empathy-event-manager.h
index 70af9a1c2..ee5daf404 100644
--- a/src/empathy-event-manager.h
+++ b/src/empathy-event-manager.h
@@ -25,7 +25,7 @@
#include <glib.h>
#include <glib-object.h>
-#include <libempathy/empathy-contact.h>
+#include "libempathy/empathy-contact.h"
G_BEGIN_DECLS
diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index f89004f32..3cf874420 100644
--- 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 <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"
diff --git a/src/empathy-ft-manager.h b/src/empathy-ft-manager.h
index 0ff820f06..8d81c7661 100644
--- a/src/empathy-ft-manager.h
+++ b/src/empathy-ft-manager.h
@@ -29,7 +29,7 @@
#include <glib-object.h>
#include <glib.h>
-#include <libempathy/empathy-ft-handler.h>
+#include "libempathy/empathy-ft-handler.h"
G_BEGIN_DECLS
diff --git a/src/empathy-import-dialog.c b/src/empathy-import-dialog.c
index d4dd70d01..33c408444 100644
--- 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 <libempathy/empathy-debug.h>
-#include <libempathy/empathy-utils.h>
+#include "libempathy/empathy-debug.h"
+#include "libempathy/empathy-utils.h"
enum {
PROP_PARENT = 1,
diff --git a/src/empathy-import-dialog.h b/src/empathy-import-dialog.h
index a412037d1..a074d7a7f 100644
--- 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__
-#include <libempathy/empathy-connection-managers.h>
+#include "libempathy/empathy-connection-managers.h"
G_BEGIN_DECLS
diff --git a/src/empathy-import-pidgin.c b/src/empathy-import-pidgin.c
index 8fd7eaef4..394caede4 100644
--- 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 <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
diff --git a/src/empathy-import-utils.c b/src/empathy-import-utils.c
index 7007dee57..768d493fe 100644
--- a/src/empathy-import-utils.c
+++ b/src/empathy-import-utils.c
@@ -19,8 +19,8 @@
* 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"
diff --git a/src/empathy-import-widget.c b/src/empathy-import-widget.c
index 77048a4b7..938a8f126 100644
--- 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 <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>
diff --git a/src/empathy-import-widget.h b/src/empathy-import-widget.h
index 14a01d79d..f3e552cd2 100644
--- a/src/empathy-import-widget.h
+++ b/src/empathy-import-widget.h
@@ -27,7 +27,7 @@
#include <glib-object.h>
-#include <libempathy/empathy-connection-managers.h>
+#include "libempathy/empathy-connection-managers.h"
#include "empathy-import-utils.h"
diff --git a/src/empathy-invite-participant-dialog.c b/src/empathy-invite-participant-dialog.c
index 0b42ab4a7..783c83240 100644
--- 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 <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);
diff --git a/src/empathy-mic-menu.c b/src/empathy-mic-menu.c
index b86aec4be..da7f800f4 100644
--- 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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
struct _EmpathyMicMenuPrivate
{
diff --git a/src/empathy-mic-monitor.c b/src/empathy-mic-monitor.c
index c06e786ed..ef5b93d0d 100644
--- a/src/empathy-mic-monitor.c
+++ b/src/empathy-mic-monitor.c
@@ -24,10 +24,10 @@
#include "empathy-mic-monitor.h"
-#include <libempathy/empathy-utils.h>
+#include "libempathy/empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
enum
{
diff --git a/src/empathy-new-chatroom-dialog.c b/src/empathy-new-chatroom-dialog.c
index 5de844bd4..a255bbcab 100644
--- a/src/empathy-new-chatroom-dialog.c
+++ b/src/empathy-new-chatroom-dialog.c
@@ -25,17 +25,17 @@
#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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
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 c3c996bd6..b4f77eebb 100644
--- a/src/empathy-notifications-approver.c
+++ b/src/empathy-notifications-approver.c
@@ -21,13 +21,13 @@
#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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
#include "empathy-notifications-approver.h"
diff --git a/src/empathy-preferences.c b/src/empathy-preferences.c
index bfeef61b6..73d2dcc10 100644
--- a/src/empathy-preferences.c
+++ b/src/empathy-preferences.c
@@ -27,18 +27,18 @@
#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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
G_DEFINE_TYPE (EmpathyPreferences, empathy_preferences, GTK_TYPE_DIALOG);
diff --git a/src/empathy-roster-window.c b/src/empathy-roster-window.c
index 05d2a1fba..155009022 100644
--- 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 <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"
@@ -59,7 +59,7 @@
#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
diff --git a/src/empathy-sanity-cleaning.c b/src/empathy-sanity-cleaning.c
index f7ac7d996..8e2234fe1 100644
--- a/src/empathy-sanity-cleaning.c
+++ b/src/empathy-sanity-cleaning.c
@@ -25,13 +25,13 @@
#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
-#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>
@@ -39,7 +39,7 @@
#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.
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 54e49a30e..eef1f48a4 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -21,19 +21,19 @@
#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 <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
/* 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 12f8d6b47..b81960230 100644
--- a/src/empathy-video-src.c
+++ b/src/empathy-video-src.c
@@ -27,7 +27,7 @@
#endif
#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
#include "empathy-video-src.h"
diff --git a/src/empathy.c b/src/empathy.c
index 90370e621..622dec61d 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -30,17 +30,17 @@
#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"
@@ -50,7 +50,7 @@
#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"
diff --git a/tests/empathy-chatroom-manager-test.c b/tests/empathy-chatroom-manager-test.c
index 7ecb82ac4..d3b0e7a43 100644
--- 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 <libempathy/empathy-chatroom-manager.h>
+#include "libempathy/empathy-chatroom-manager.h"
#include "test-helper.h"
diff --git a/tests/empathy-chatroom-test.c b/tests/empathy-chatroom-test.c
index 3826411a5..38ea4a146 100644
--- a/tests/empathy-chatroom-test.c
+++ b/tests/empathy-chatroom-test.c
@@ -4,7 +4,7 @@
#include "test-helper.h"
-#include <libempathy/empathy-chatroom.h>
+#include "libempathy/empathy-chatroom.h"
#if 0
static EmpathyChatroom *
diff --git a/tests/empathy-irc-network-manager-test.c b/tests/empathy-irc-network-manager-test.c
index ba01c3782..3bef1fe43 100644
--- 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 <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"
diff --git a/tests/empathy-irc-network-test.c b/tests/empathy-irc-network-test.c
index 313ab0651..8e9e86bc5 100644
--- 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 <libempathy/empathy-irc-network.h>
+#include "libempathy/empathy-irc-network.h"
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 573967e43..f959aad30 100644
--- 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 <libempathy/empathy-irc-server.h>
+#include "libempathy/empathy-irc-server.h"
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 6c53f07ad..4428e3c32 100644
--- 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 <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
{
diff --git a/tests/empathy-parser-test.c b/tests/empathy-parser-test.c
index 4ae6f775a..e9983c7f8 100644
--- 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 <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,
diff --git a/tests/empathy-tls-test.c b/tests/empathy-tls-test.c
index 2004383d6..efcafcec1 100644
--- a/tests/empathy-tls-test.c
+++ b/tests/empathy-tls-test.c
@@ -2,7 +2,7 @@
#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"
diff --git a/tests/interactive/empathy-logs.c b/tests/interactive/empathy-logs.c
index 0ed9f95e4..96f590a69 100644
--- a/tests/interactive/empathy-logs.c
+++ b/tests/interactive/empathy-logs.c
@@ -24,10 +24,10 @@
#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,
diff --git a/tests/interactive/test-empathy-account-chooser.c b/tests/interactive/test-empathy-account-chooser.c
index 7622a6248..7324cbea3 100644
--- 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 <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,
diff --git a/tests/interactive/test-empathy-calendar-button.c b/tests/interactive/test-empathy-calendar-button.c
index df91f1f2d..7fe056698 100644
--- a/tests/interactive/test-empathy-calendar-button.c
+++ b/tests/interactive/test-empathy-calendar-button.c
@@ -21,7 +21,7 @@
#include "config.h"
-#include <libempathy-gtk/empathy-calendar-button.h>
+#include "libempathy-gtk/empathy-calendar-button.h"
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 66353f13d..87d50f8e4 100644
--- 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 <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,
diff --git a/tests/interactive/test-empathy-dual-roster-view.c b/tests/interactive/test-empathy-dual-roster-view.c
index 50903c01f..30fe4aa80 100644
--- 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 <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,
diff --git a/tests/interactive/test-empathy-presence-chooser.c b/tests/interactive/test-empathy-presence-chooser.c
index 12d35b4c6..39ad1f7b4 100644
--- 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 <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)
diff --git a/tests/interactive/test-empathy-protocol-chooser.c b/tests/interactive/test-empathy-protocol-chooser.c
index 90b1797a3..3e3767a98 100644
--- 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 <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,
diff --git a/tests/interactive/test-empathy-roster-model-aggregator.c b/tests/interactive/test-empathy-roster-model-aggregator.c
index 49f2012f0..3bbf9e3b3 100644
--- 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 <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;
diff --git a/tests/interactive/test-empathy-roster-view.c b/tests/interactive/test-empathy-roster-view.c
index 96137c395..0c95c445b 100644
--- a/tests/interactive/test-empathy-roster-view.c
+++ b/tests/interactive/test-empathy-roster-view.c
@@ -1,10 +1,10 @@
#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;
diff --git a/tests/interactive/test-empathy-status-preset-dialog.c b/tests/interactive/test-empathy-status-preset-dialog.c
index e71852509..50c6d115c 100644
--- 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 <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)
diff --git a/tests/test-helper.c b/tests/test-helper.c
index ca763adb4..d0ff34636 100644
--- a/tests/test-helper.c
+++ b/tests/test-helper.c
@@ -22,7 +22,7 @@
#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"
diff --git a/tests/test-irc-helper.h b/tests/test-irc-helper.h
index e375f6fb6..ac51d434b 100644
--- a/tests/test-irc-helper.h
+++ b/tests/test-irc-helper.h
@@ -1,9 +1,9 @@
#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__
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 28b4716ab..9c2da5af4 100644
--- 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 <libempathy-gtk/empathy-account-widget.h>
+#include "libempathy-gtk/empathy-account-widget.h"
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 939912aad..f49d0fc83 100644
--- 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 <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"
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 768f0965d..7e1a5f206 100644
--- 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 <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"
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 c15a13a7a..5bbf53db5 100644
--- 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 <libempathy/empathy-client-factory.h>
+#include "libempathy/empathy-client-factory.h"
#include "empathy-app-plugin-widget.h"