Attachment 48954 Details for Bug 29022 – fd.o #34025 (ish): if we handle a channel internally, record that fact

[patch] fd.o #34025 (ish): if we handle a channel internally, record that fact

0001-fd.o-34025-ish-if-we-handle-a-channel-internally-rec.patch (text/plain), 2.65 KB, created by Simon McVittie on 2011-07-11 01:39:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-07-11 01:39:29 UTC

Size: 2.65 KB

patch

obsolete

>From 4379430810ab2fddb43c4a7753b79d6705fa2d5d Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 19 May 2011 17:30:12 +0100
>Subject: [PATCH 1/4] fd.o #34025 (ish): if we handle a channel internally,
> record that fact
>
>This means we'll include it in the set of handled channels when we invoke
>Observers with Recover=TRUE.
>
>We don't do this when calling _mcd_request_handle_internally (., ., FALSE)
>since we're not really behaving like a Handler in that case - more like
>an Observer or something.
>---
> src/mcd-dispatch-operation.c |    4 ++++
> src/mcd-handler-map-priv.h   |    4 ++++
> src/mcd-handler-map.c        |   10 +++++++++-
> 3 files changed, 17 insertions(+), 1 deletions(-)
>
>diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
>index cb1e83a..adcecab 100644
>--- a/src/mcd-dispatch-operation.c
>+++ b/src/mcd-dispatch-operation.c
>@@ -501,6 +501,10 @@ _mcd_dispatch_operation_check_client_locks (McdDispatchOperation *self)
>                 continue;
> 
>             DEBUG ("Internal handler for request channel #%u", i);
>+            _mcd_handler_map_set_channel_handled_internally (
>+                self->priv->handler_map,
>+                mcd_channel_get_tp_channel (channel),
>+                _mcd_dispatch_operation_get_account_path (self));
>             _mcd_request_handle_internally (request, channel, TRUE);
>         }
> 
>diff --git a/src/mcd-handler-map-priv.h b/src/mcd-handler-map-priv.h
>index 7de292d..c90603f 100644
>--- a/src/mcd-handler-map-priv.h
>+++ b/src/mcd-handler-map-priv.h
>@@ -86,6 +86,10 @@ GList *_mcd_handler_map_get_handled_channels (McdHandlerMap *self);
> const gchar *_mcd_handler_map_get_channel_account (McdHandlerMap *self,
>                                                    const gchar *channel_path);
> 
>+void _mcd_handler_map_set_channel_handled_internally (McdHandlerMap *self,
>+                                                      TpChannel *channel,
>+                                                      const gchar *account_path);
>+
> G_END_DECLS
> 
> #endif
>diff --git a/src/mcd-handler-map.c b/src/mcd-handler-map.c
>index 3e8e69a..933a0ae 100644
>--- a/src/mcd-handler-map.c
>+++ b/src/mcd-handler-map.c
>@@ -423,4 +423,12 @@ _mcd_handler_map_get_channel_account (McdHandlerMap *self,
>         channel_path);
> }
> 
>-
>+void
>+_mcd_handler_map_set_channel_handled_internally (McdHandlerMap *self,
>+                                                 TpChannel *channel,
>+                                                 const gchar *account_path)
>+{
>+    _mcd_handler_map_set_channel_handled (self, channel,
>+        tp_dbus_daemon_get_unique_name (self->priv->dbus_daemon),
>+        NULL, account_path);
>+}
>-- 
>1.7.5.4
>

Actions: View | Splinter Review

Attachments on bug 29022: 48954 | 48955 | 48956 | 48957

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.