Attachment 56140 Details for Bug 45120 – account-mgr: pretend that we are AVAILABLE if the best presence is UNSET

[patch] account-mgr: pretend that we are AVAILABLE if the best presence is UNSET

account-mgr-pretend-that-we-are-AVAILABLE-if-the-b.patch (text/plain), 5.65 KB, created by Guillaume Desmottes on 2012-01-25 04:55:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2012-01-25 04:55:43 UTC

Size: 5.65 KB

patch

obsolete

>From 8e5aa8b6485afad8658c749a3133b5a3ee5700a9 Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Tue, 24 Jan 2012 14:27:24 +0100
>Subject: [PATCH] account-mgr: pretend that we are AVAILABLE if the best
> presence is UNSET
>
>This is what most UI would expect; they just care if we are connected, not if
>SimplePresence is actually implemented by the underlying CM.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=45120
>---
> telepathy-glib/account-manager.c |   51 ++++++++++++++++++++++++++++++++++++-
> tests/dbus/account-manager.c     |    8 +++---
> 2 files changed, 53 insertions(+), 6 deletions(-)
>
>diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
>index e1de320..d166593 100644
>--- a/telepathy-glib/account-manager.c
>+++ b/telepathy-glib/account-manager.c
>@@ -327,6 +327,7 @@ _tp_account_manager_update_most_available_presence (TpAccountManager *manager)
>   TpAccount *account = NULL;
>   GHashTableIter iter;
>   gpointer value;
>+  TpAccount *has_unset_presence = NULL;
> 
>   /* this presence is equal to the presence of the account with the
>    * highest availability */
>@@ -339,6 +340,14 @@ _tp_account_manager_update_most_available_presence (TpAccountManager *manager)
> 
>       p = tp_account_get_current_presence (a, NULL, NULL);
> 
>+      if (p == TP_CONNECTION_PRESENCE_TYPE_UNSET)
>+        {
>+          has_unset_presence = a;
>+          /* There is no point comparing the presence as UNSET is the
>+           * 'smallest' presence of all */
>+          continue;
>+        }
>+
>       if (tp_connection_presence_type_cmp_availability (p, presence) > 0)
>         {
>           account = a;
>@@ -346,6 +355,14 @@ _tp_account_manager_update_most_available_presence (TpAccountManager *manager)
>         }
>     }
> 
>+  if (presence == TP_CONNECTION_PRESENCE_TYPE_OFFLINE &&
>+      has_unset_presence != NULL)
>+    {
>+      /* Use an account having UNSET as presence as the 'best' one,
>+       * see tp_account_manager_get_most_available_presence() */
>+      account = has_unset_presence;
>+    }
>+
>   priv->most_available_account = account;
>   g_free (priv->most_available_status);
>   g_free (priv->most_available_status_message);
>@@ -865,6 +882,9 @@ _tp_account_manager_account_presence_changed_cb (TpAccount *account,
> {
>   TpAccountManager *manager = TP_ACCOUNT_MANAGER (user_data);
>   TpAccountManagerPrivate *priv = manager->priv;
>+  TpConnectionPresenceType p;
>+  gchar *s;
>+  gchar *msg;
> 
>   if (tp_connection_presence_type_cmp_availability (presence,
>           priv->most_available_presence) > 0)
>@@ -888,10 +908,19 @@ _tp_account_manager_account_presence_changed_cb (TpAccount *account,
>     }
> 
>   return;
>+
> signal:
>+  /* Use tp_account_manager_get_most_available_presence() as the effective
>+   * most available presence may differ of the one stored in
>+   * priv->most_available_presence. */
>+  p = tp_account_manager_get_most_available_presence (manager,
>+      &s, &msg);
>+
>   g_signal_emit (manager, signals[MOST_AVAILABLE_PRESENCE_CHANGED], 0,
>-      priv->most_available_presence, priv->most_available_status,
>-      priv->most_available_status_message);
>+      p, s, msg);
>+
>+  g_free (s);
>+  g_free (msg);
> }
> 
> static void
>@@ -1127,6 +1156,10 @@ tp_account_manager_set_all_requested_presences (TpAccountManager *manager,
>  * If no accounts are enabled or valid the output will be
>  * (%TP_CONNECTION_PRESENCE_TYPE_OFFLINE, "offline", "").
>  *
>+ * Since 0.UNRELEASED, if the only connected accounts does not implement
>+ * %TP_IFACE_CONNECTION_INTERFACE_SIMPLE_PRESENCE, the output will be
>+ * (%TP_CONNECTION_PRESENCE_TYPE_AVAILABLE, "available", "").
>+ *
>  * The return value of this function is not guaranteed to have been retrieved
>  * until tp_proxy_prepare_async() has finished; until then, the
>  * value will be the same as if no accounts are enabled or valid.
>@@ -1148,6 +1181,20 @@ tp_account_manager_get_most_available_presence (TpAccountManager *manager,
> 
>   priv = manager->priv;
> 
>+  if (priv->most_available_presence == TP_CONNECTION_PRESENCE_TYPE_UNSET)
>+    {
>+      /* The best we have is an account having UNSET as its presence, which
>+       * means it's connected but does not implement SimplePresence; pretend
>+       * we are available. */
>+      if (status != NULL)
>+        *status = g_strdup ("available");
>+
>+      if (message != NULL)
>+        *message = g_strdup ("");
>+
>+      return TP_CONNECTION_PRESENCE_TYPE_AVAILABLE;
>+    }
>+
>   if (status != NULL)
>     *status = g_strdup (priv->most_available_status);
> 
>diff --git a/tests/dbus/account-manager.c b/tests/dbus/account-manager.c
>index db7594b..9d63c55 100644
>--- a/tests/dbus/account-manager.c
>+++ b/tests/dbus/account-manager.c
>@@ -746,9 +746,9 @@ test_most_available_one_unset (Test *test,
>   script_append_action (test, change_account1_presence,
>       presence_new (TP_CONNECTION_PRESENCE_TYPE_UNSET, "unset", ""));
> 
>-  /* Pretend that we are offline */
>+  /* Pretend that we are available */
>   script_append_action (test, check_presence_action,
>-      presence_new (TP_CONNECTION_PRESENCE_TYPE_OFFLINE, "offline", ""));
>+      presence_new (TP_CONNECTION_PRESENCE_TYPE_AVAILABLE, "available", ""));
> }
> 
> static void
>@@ -770,9 +770,9 @@ test_most_available_two_unset (Test *test,
>   script_append_action (test, change_account2_presence,
>       presence_new (TP_CONNECTION_PRESENCE_TYPE_OFFLINE, "offline", ""));
> 
>-  /* Pretent that we are offline */
>+  /* Pretent that we are available */
>   script_append_action (test, check_presence_action,
>-      presence_new (TP_CONNECTION_PRESENCE_TYPE_OFFLINE, "offline", ""));
>+      presence_new (TP_CONNECTION_PRESENCE_TYPE_AVAILABLE, "available", ""));
> 
>   /* account2 reconnects with busy */
>   script_append_action (test, change_account2_presence,
>-- 
>1.7.7.6

Actions: View | Splinter Review

Attachments on bug 45120: 56034 | 56075 | 56137 | 56138 | 56139 | 56140

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.