Attachment 85977 Details for Bug 69466 – connection: factor out protocol_info_supports_{avatar,blocking}

[patch] connection: factor out protocol_info_supports_{avatar,blocking}

0001-connection-factor-out-protocol_info_supports_-avatar.patch (text/plain), 1.75 KB, created by Guillaume Desmottes on 2013-09-17 13:30:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2013-09-17 13:30:18 UTC

Size: 1.75 KB

patch

obsolete

>From 3e7585dc14300b7e4ea2daa5363232dbb3fe9dcf Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Tue, 17 Sep 2013 14:34:44 +0200
>Subject: [PATCH 1/5] connection: factor out
> protocol_info_supports_{avatar,blocking}
>
>https://bugs.freedesktop.org/show_bug.cgi?id=69466
>---
> src/connection.c | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
>diff --git a/src/connection.c b/src/connection.c
>index 3c98304..6fd12d3 100644
>--- a/src/connection.c
>+++ b/src/connection.c
>@@ -155,6 +155,18 @@ struct _HazeConnectionPrivate
> #define PC_GET_BASE_CONN(pc) \
>     (ACCOUNT_GET_TP_BASE_CONNECTION (purple_connection_get_account (pc)))
> 
>+static gboolean
>+protocol_info_supports_avatar (PurplePluginProtocolInfo *prpl_info)
>+{
>+    return (prpl_info->icon_spec.format != NULL);
>+}
>+
>+static gboolean
>+protocol_info_supports_blocking (PurplePluginProtocolInfo *prpl_info)
>+{
>+    return (prpl_info->add_deny != NULL);
>+}
>+
> static void
> connected_cb (PurpleConnection *pc)
> {
>@@ -162,7 +174,7 @@ connected_cb (PurpleConnection *pc)
>     HazeConnection *conn = HAZE_CONNECTION (base_conn);
>     PurplePluginProtocolInfo *prpl_info = HAZE_CONNECTION_GET_PRPL_INFO (conn);
> 
>-    if (prpl_info->icon_spec.format != NULL)
>+    if (protocol_info_supports_avatar (prpl_info))
>     {
>         static const gchar *avatar_ifaces[] = {
>             TP_IFACE_CONNECTION_INTERFACE_AVATARS,
>@@ -170,7 +182,7 @@ connected_cb (PurpleConnection *pc)
>         tp_base_connection_add_interfaces (base_conn, avatar_ifaces);
>     }
> 
>-    if (prpl_info->add_deny != NULL)
>+    if (protocol_info_supports_blocking (prpl_info))
>     {
>         static const gchar *blocking_ifaces[] = {
>             TP_IFACE_CONNECTION_INTERFACE_CONTACT_BLOCKING,
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 69466: 85977 | 85978 | 85979 | 85980 | 85981 | 85986 | 85991 | 86039 | 86059

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.