stop using tp_account_manager_is_prepared()

[empathy.git] / libempathy-gtk / empathy-notify-manager.c

diff --git a/libempathy-gtk/empathy-notify-manager.c b/libempathy-gtk/empathy-notify-manager.c
index c3d440622bd974f0bdf8e0b7f83737c14d03e1ea..bbe3a1a4c0c3d7b0061445f3a92de4f0e723f90e 100644 (file)
--- a/libempathy-gtk/empathy-notify-manager.c
+++ b/libempathy-gtk/empathy-notify-manager.c
@@ -17,21 +17,18 @@
  * Authors: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
  */
 
-#include <config.h>
-#include <string.h>
+#include "config.h"
+#include "empathy-notify-manager.h"
 
-#include <libnotify/notification.h>
 #include <libnotify/notify.h>
+#include <tp-account-widgets/tpaw-pixbuf-utils.h>
 
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-conf.h>
+#include "empathy-gsettings.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
-
-#include "empathy-notify-manager.h"
+#include "empathy-debug.h"
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyNotifyManager)
 
@@ -39,8 +36,8 @@ typedef struct
 {
   /* owned (gchar *) => TRUE */
   GHashTable *capabilities;
-
-  gboolean dispose_has_run;
+  TpAccountManager *account_manager;
+  GSettings *gsettings_notif;
 } EmpathyNotifyManagerPriv;
 
 G_DEFINE_TYPE (EmpathyNotifyManager, empathy_notify_manager, G_TYPE_OBJECT);
@@ -71,10 +68,13 @@ notify_manager_dispose (GObject *object)
 {
   EmpathyNotifyManagerPriv *priv = GET_PRIV (object);
 
-  if (priv->dispose_has_run)
-    return;
+  if (priv->account_manager != NULL)
+    {
+      g_object_unref (priv->account_manager);
+      priv->account_manager = NULL;
+    }
 
-  priv->dispose_has_run = TRUE;
+  tp_clear_object (&priv->gsettings_notif);
 
   G_OBJECT_CLASS (empathy_notify_manager_parent_class)->dispose (object);
 }
@@ -84,7 +84,7 @@ notify_manager_finalize (GObject *object)
 {
   EmpathyNotifyManagerPriv *priv = GET_PRIV (object);
 
-  g_hash_table_destroy (priv->capabilities);
+  g_hash_table_unref (priv->capabilities);
 
   G_OBJECT_CLASS (empathy_notify_manager_parent_class)->finalize (object);
 }
@@ -101,6 +101,22 @@ empathy_notify_manager_class_init (EmpathyNotifyManagerClass *klass)
   g_type_class_add_private (object_class, sizeof (EmpathyNotifyManagerPriv));
 }
 
+static void
+account_manager_prepared_cb (GObject *source_object,
+    GAsyncResult *result,
+    gpointer user_data)
+{
+  TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
+  GError *error = NULL;
+
+  if (!tp_proxy_prepare_finish (account_manager, result, &error))
+    {
+      DEBUG ("Failed to prepare account manager: %s", error->message);
+      g_error_free (error);
+      return;
+    }
+}
+
 static void
 empathy_notify_manager_init (EmpathyNotifyManager *self)
 {
@@ -110,6 +126,8 @@ empathy_notify_manager_init (EmpathyNotifyManager *self)
 
   self->priv = priv;
 
+  priv->gsettings_notif = g_settings_new (EMPATHY_PREFS_NOTIFICATIONS_SCHEMA);
+
   priv->capabilities = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
       NULL);
 
@@ -117,29 +135,33 @@ empathy_notify_manager_init (EmpathyNotifyManager *self)
   list = notify_get_server_caps ();
   for (l = list; l != NULL; l = g_list_next (l))
     {
-      gchar *capa = l->data;
+      gchar *cap = l->data;
 
-      DEBUG ("add capability: %s", capa);
+      DEBUG ("add capability: %s", cap);
       /* owernship of the string is transfered to the hash table */
-      g_hash_table_insert (priv->capabilities, capa, GUINT_TO_POINTER (TRUE));
+      g_hash_table_insert (priv->capabilities, cap, GUINT_TO_POINTER (TRUE));
     }
   g_list_free (list);
+
+  priv->account_manager = tp_account_manager_dup ();
+
+  tp_proxy_prepare_async (priv->account_manager, NULL,
+      account_manager_prepared_cb, self);
 }
 
 EmpathyNotifyManager *
 empathy_notify_manager_dup_singleton (void)
 {
-  return EMPATHY_NOTIFY_MANAGER (g_object_new (EMPATHY_TYPE_NOTIFY_MANAGER,
-        NULL));
+  return g_object_new (EMPATHY_TYPE_NOTIFY_MANAGER, NULL);
 }
 
 gboolean
 empathy_notify_manager_has_capability (EmpathyNotifyManager *self,
-    const gchar *capa)
+    const gchar *cap)
 {
   EmpathyNotifyManagerPriv *priv = GET_PRIV (self);
 
-  return g_hash_table_lookup (priv->capabilities, capa) != NULL;
+  return g_hash_table_lookup (priv->capabilities, cap) != NULL;
 }
 
 GdkPixbuf *
@@ -153,7 +175,7 @@ empathy_notify_manager_get_pixbuf_for_notification (EmpathyNotifyManager *self,
     pixbuf = empathy_pixbuf_avatar_from_contact_scaled (contact, 48, 48);
 
   if (pixbuf == NULL)
-    pixbuf = empathy_pixbuf_from_icon_name_sized (icon_name, 48);
+    pixbuf = tpaw_pixbuf_from_icon_name_sized (icon_name, 48);
 
   return pixbuf;
 }
@@ -161,25 +183,47 @@ empathy_notify_manager_get_pixbuf_for_notification (EmpathyNotifyManager *self,
 gboolean
 empathy_notify_manager_notification_is_enabled  (EmpathyNotifyManager *self)
 {
-  EmpathyConf *conf;
-  gboolean res;
-
-  conf = empathy_conf_get ();
-  res = FALSE;
-
-  empathy_conf_get_bool (conf, EMPATHY_PREFS_NOTIFICATIONS_ENABLED, &res);
+  EmpathyNotifyManagerPriv *priv = GET_PRIV (self);
+  TpConnectionPresenceType presence;
 
-  if (!res)
+  if (!g_settings_get_boolean (priv->gsettings_notif,
+        EMPATHY_PREFS_NOTIFICATIONS_ENABLED))
     return FALSE;
 
-  if (!empathy_check_available_state ())
+  if (!tp_proxy_is_prepared (priv->account_manager,
+        TP_ACCOUNT_MANAGER_FEATURE_CORE))
     {
-      empathy_conf_get_bool (conf, EMPATHY_PREFS_NOTIFICATIONS_DISABLED_AWAY,
-          &res);
+      DEBUG ("account manager is not ready yet; display the notification");
+      return TRUE;
+    }
+
+  presence = tp_account_manager_get_most_available_presence (
+      priv->account_manager,
+      NULL, NULL);
 
-      if (res)
+  if (presence != TP_CONNECTION_PRESENCE_TYPE_AVAILABLE &&
+      presence != TP_CONNECTION_PRESENCE_TYPE_UNSET)
+    {
+      if (g_settings_get_boolean (priv->gsettings_notif,
+            EMPATHY_PREFS_NOTIFICATIONS_DISABLED_AWAY))
         return FALSE;
     }
 
   return TRUE;
 }
+
+NotifyNotification *
+empathy_notify_manager_create_notification (const gchar *summary,
+    const char *body,
+    const gchar *icon)
+{
+  NotifyNotification *notification;
+
+  notification = notify_notification_new (summary, body, icon);
+
+  notify_notification_set_hint (notification,
+      EMPATHY_NOTIFY_MANAGER_CAP_DESKTOP_ENTRY,
+      g_variant_new_string ("empathy"));
+
+  return notification;
+}