Attachment 93132 Details for Bug 71093 – [MC 5/9] Simplify the account connection pipeline, and make it private

[patch] [MC 5/9] Simplify the account connection pipeline, and make it private

0005-Simplify-the-account-connection-pipeline-and-make-it.patch (text/plain), 2.26 KB, created by Simon McVittie on 2014-01-31 12:44:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2014-01-31 12:44:04 UTC

Size: 2.26 KB

patch

obsolete

>From e77619e113d0bac51b2cc43998e80baf823c781b Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 30 Jan 2014 15:19:14 +0000
>Subject: [PATCH 5/9] Simplify the account connection pipeline, and make it
> private
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71093
>---
> src/mcd-account.c | 14 ++++++--------
> src/mcd-account.h |  4 ----
> 2 files changed, 6 insertions(+), 12 deletions(-)
>
>diff --git a/src/mcd-account.c b/src/mcd-account.c
>index 77ef5df..aea13e2 100644
>--- a/src/mcd-account.c
>+++ b/src/mcd-account.c
>@@ -3301,6 +3301,9 @@ _mcd_account_constructor (GType type, guint n_params,
>     return (GObject *) account;
> }
> 
>+static void mcd_account_connection_proceed_with_reason
>+    (McdAccount *account, gboolean success, TpConnectionStatusReason reason);
>+
> static void
> monitor_state_changed_cb (
>     McdConnectivityMonitor *monitor,
>@@ -4982,7 +4985,9 @@ _mcd_account_connection_begin (McdAccount *account,
>                                         TP_CONNECTION_STATUS_REASON_REQUESTED,
>                                         NULL, NULL, NULL);
>     account->priv->connection_context = ctx;
>-    mcd_account_connection_proceed (account, TRUE);
>+
>+    mcd_account_connection_proceed_with_reason
>+        (account, TRUE, TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED);
> }
> 
> void
>@@ -5048,10 +5053,3 @@ mcd_account_connection_proceed_with_reason (McdAccount *account,
>             _mcd_account_connection_context_free);
>     }
> }
>-
>-void
>-mcd_account_connection_proceed (McdAccount *account, gboolean success)
>-{
>-    mcd_account_connection_proceed_with_reason
>-        (account, success, TP_CONNECTION_STATUS_REASON_NONE_SPECIFIED);
>-}
>diff --git a/src/mcd-account.h b/src/mcd-account.h
>index 30763c9..86d2b82 100644
>--- a/src/mcd-account.h
>+++ b/src/mcd-account.h
>@@ -152,10 +152,6 @@ gboolean mcd_account_get_waiting_for_connectivity (McdAccount *self);
> void mcd_account_set_waiting_for_connectivity (McdAccount *self,
>     gboolean waiting);
> 
>-void mcd_account_connection_proceed (McdAccount *account, gboolean success);
>-void mcd_account_connection_proceed_with_reason
>-    (McdAccount *account, gboolean success, TpConnectionStatusReason reason);
>-
> McpAccountStorage *mcd_account_get_storage_plugin (McdAccount *account);
> 
> G_END_DECLS
>-- 
>1.9.rc1
>

Actions: View | Splinter Review

Attachments on bug 71093: 93126 | 93127 | 93128 | 93129 | 93130 | 93131 | 93132 | 93133 | 93134 | 93137 | 93138 | 93316 | 93317 | 93318 | 93319 | 93320 | 93476 | 93477

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.