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 0d548ce4327e17df01ad36dab7b61caa50bc1795..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-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-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)
 
@@ -576,7 +568,6 @@ event_manager_chat_message_received_cb (EmpathyTpChat *tp_chat,
   EmpathyMessage *message,
   EventManagerApproval *approval)
 {
-  GtkWidget       *window;
   EmpathyContact  *sender;
   const gchar     *header;
   const gchar     *msg;
@@ -604,12 +595,8 @@ event_manager_chat_message_received_cb (EmpathyTpChat *tp_chat,
         EMPATHY_EVENT_TYPE_CHAT, EMPATHY_IMAGE_NEW_MESSAGE, header, msg,
         approval, event_text_channel_process_func, NULL);
 
-  window = empathy_roster_window_dup ();
-
-  empathy_sound_manager_play (priv->sound_mgr, window,
+  empathy_sound_manager_play (priv->sound_mgr, NULL,
       EMPATHY_SOUND_CONVERSATION_NEW);
-
-  g_object_unref (window);
 }
 
 static void
@@ -753,7 +740,6 @@ event_room_channel_process_func (EventPriv *event)
 static void
 display_invite_room_dialog (EventManagerApproval *approval)
 {
-  GtkWidget *window = empathy_roster_window_dup ();
   const gchar *invite_msg;
   gchar *msg;
   TpContact *self_contact;
@@ -780,11 +766,10 @@ display_invite_room_dialog (EventManagerApproval *approval)
       EMPATHY_IMAGE_GROUP_MESSAGE, msg, invite_msg, approval,
       event_room_channel_process_func, NULL);
 
-  empathy_sound_manager_play (priv->sound_mgr, window,
+  empathy_sound_manager_play (priv->sound_mgr, NULL,
       EMPATHY_SOUND_CONVERSATION_NEW);
 
   g_free (msg);
-  g_object_unref (window);
 }
 
 static void
@@ -898,7 +883,6 @@ approve_call_channel (EmpathyEventManager *self,
 {
   TpChannel *channel = TP_CHANNEL (call);
   EmpathyEventManagerPriv *priv = GET_PRIV (approval->manager);
-  GtkWidget *window;
   gchar *header;
   gboolean video;
 
@@ -917,8 +901,6 @@ approve_call_channel (EmpathyEventManager *self,
   approval->handler = g_signal_connect (call, "state-changed",
     G_CALLBACK (event_manager_call_state_changed_cb), approval);
 
-  window = empathy_roster_window_dup ();
-
   g_object_get (G_OBJECT (call), "initial-video", &video, NULL);
 
   header = g_strdup_printf (
@@ -935,10 +917,8 @@ approve_call_channel (EmpathyEventManager *self,
 
   priv->ringing++;
   if (priv->ringing == 1)
-    empathy_sound_manager_start_playing (priv->sound_mgr, window,
+    empathy_sound_manager_start_playing (priv->sound_mgr, NULL,
         EMPATHY_SOUND_PHONE_INCOMING, MS_BETWEEN_RING);
-
-  g_object_unref (window);
 }
 
 static void
@@ -949,7 +929,6 @@ approve_ft_channel (EmpathyEventManager *self,
 {
   TpChannel *channel = TP_CHANNEL (ft);
   EmpathyEventManagerPriv *priv = GET_PRIV (approval->manager);
-  GtkWidget *window;
   gchar *header;
 
   approval->handler_instance = g_object_ref (ft);
@@ -957,8 +936,6 @@ approve_ft_channel (EmpathyEventManager *self,
 
   tp_add_dispatch_operation_context_accept (context);
 
-  window = empathy_roster_window_dup ();
-
   header = g_strdup_printf (_("Incoming file transfer from %s"),
       empathy_contact_get_alias (approval->contact));
 
@@ -968,11 +945,10 @@ approve_ft_channel (EmpathyEventManager *self,
       approval, event_channel_process_func, NULL);
 
   /* FIXME better sound for incoming file transfers ?*/
-  empathy_sound_manager_play (priv->sound_mgr, window,
+  empathy_sound_manager_play (priv->sound_mgr, NULL,
       EMPATHY_SOUND_CONVERSATION_NEW);
 
   g_free (header);
-  g_object_unref (window);
 }
 
 static void
@@ -982,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,
@@ -1079,9 +1047,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
@@ -1156,7 +1133,6 @@ event_manager_presence_changed_cb (EmpathyContact *contact,
   EmpathyEventManagerPriv *priv = GET_PRIV (manager);
   TpAccount *account;
   EmpathyPresenceManager *presence_mgr;
-  GtkWidget *window = empathy_roster_window_dup ();
 
   account = empathy_contact_get_account (contact);
   presence_mgr = empathy_presence_manager_dup_singleton ();
@@ -1172,7 +1148,7 @@ event_manager_presence_changed_cb (EmpathyContact *contact,
           TP_CONNECTION_PRESENCE_TYPE_OFFLINE) <= 0)
         {
           /* someone is logging off */
-          empathy_sound_manager_play (priv->sound_mgr, window,
+          empathy_sound_manager_play (priv->sound_mgr, NULL,
               EMPATHY_SOUND_CONTACT_DISCONNECTED);
 
           if (g_settings_get_boolean (priv->gsettings_notif,
@@ -1193,7 +1169,7 @@ event_manager_presence_changed_cb (EmpathyContact *contact,
             TP_CONNECTION_PRESENCE_TYPE_OFFLINE) > 0)
         {
           /* someone is logging in */
-          empathy_sound_manager_play (priv->sound_mgr, window,
+          empathy_sound_manager_play (priv->sound_mgr, NULL,
               EMPATHY_SOUND_CONTACT_CONNECTED);
 
           if (g_settings_get_boolean (priv->gsettings_notif,
@@ -1210,7 +1186,6 @@ event_manager_presence_changed_cb (EmpathyContact *contact,
 
 out:
   g_object_unref (presence_mgr);
-  g_object_unref (window);
 }
 
 static GObject *