Reorder header inclusions accordingly to the Telepathy coding style

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

diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index d10af58e81205fb269be88588893be7eeae9c1a3..a0171858a24ed04eac37b897d00c00221ebeb3bf 100644 (file)
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -19,35 +19,25 @@
  *          Sjoerd Simons <sjoerd.simons@collabora.co.uk>
  */
 
-#include <config.h>
+#include "config.h"
+#include "empathy-event-manager.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 <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-contact-dialogs.h>
-#include <libempathy-gtk/empathy-sound-manager.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-call-utils.h>
-
-#include "empathy-event-manager.h"
-#include "empathy-roster-window.h"
+#include "empathy-call-utils.h"
+#include "empathy-connection-aggregator.h"
+#include "empathy-gsettings.h"
+#include "empathy-images.h"
+#include "empathy-presence-manager.h"
+#include "empathy-sasl-mechanisms.h"
+#include "empathy-sound-manager.h"
+#include "empathy-subscription-dialog.h"
+#include "empathy-tp-chat.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.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 +956,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,
@@ -1063,9 +1045,18 @@ approve_channels (TpSimpleApprover *approver,
 static void
 event_pending_subscribe_func (EventPriv *event)
 {
-  empathy_subscription_dialog_show (event->public.contact, event->public.header,
-      NULL);
+  GtkWidget *dialog;
+  FolksIndividual *individual;
+
+  individual = empathy_ensure_individual_from_tp_contact (
+      empathy_contact_get_tp_contact (event->public.contact));
+
+  dialog = empathy_subscription_dialog_new (individual, event->public.message);
+  gtk_window_present (GTK_WINDOW (dialog));
+
   event_remove (event);
+
+  g_object_unref (individual);
 }
 
 static void