Use a flat namespace for internal includes

[empathy.git] / src / empathy-event-manager.c

diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index c4d2e09a9b30bc89387b00ccad21476202c3ac9f..c0b802d3bf13105844212eb15a75dc7b8501eaa8 100644 (file)
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -19,35 +19,27 @@
  *          Sjoerd Simons <sjoerd.simons@collabora.co.uk>
  */
 
-#include <config.h>
+#include "config.h"
 
-#include <string.h>
 #include <glib/gi18n.h>
 
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/simple-approver.h>
+#include "empathy-presence-manager.h"
+#include "empathy-connection-aggregator.h"
+#include "empathy-tp-chat.h"
+#include "empathy-utils.h"
+#include "empathy-gsettings.h"
+#include "empathy-sasl-mechanisms.h"
 
-#include <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 <extensions/extensions.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-images.h"
+#include "empathy-sound-manager.h"
+#include "empathy-ui-utils.h"
+#include "empathy-call-utils.h"
+#include "empathy-subscription-dialog.h"
 
 #include "empathy-event-manager.h"
-#include "empathy-roster-window.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyEventManager)
 
@@ -966,15 +958,7 @@ approve_sasl_channel (EmpathyEventManager *self,
     TpAddDispatchOperationContext *context,
     TpChannel *channel)
 {
-  GHashTable *props;
-  const gchar * const *available_mechanisms;
-
-  props = tp_channel_borrow_immutable_properties (channel);
-  available_mechanisms = tp_asv_get_boxed (props,
-      TP_PROP_CHANNEL_INTERFACE_SASL_AUTHENTICATION_AVAILABLE_MECHANISMS,
-      G_TYPE_STRV);
-
-  if (tp_strv_contains (available_mechanisms, "X-TELEPATHY-PASSWORD"))
+  if (empathy_sasl_channel_supports_mechanism (channel, "X-TELEPATHY-PASSWORD"))
     {
       event_manager_add (approval->manager, account, NULL,
           EMPATHY_EVENT_TYPE_AUTH,