[telepathy-mission-control/master] McdChannel: mcd_channel_new_request: add proceeding parameter

[Simon McVittie]

This indicates whether D-Bus clients are allowed to call Proceed().
---
 src/mcd-account-requests.c |    3 ++-
 src/mcd-channel.c          |    7 ++++++-
 src/mcd-channel.h          |    3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/mcd-account-requests.c b/src/mcd-account-requests.c
index 5048aad..cdf5564 100644
--- a/src/mcd-account-requests.c
+++ b/src/mcd-account-requests.c
@@ -176,7 +176,8 @@ create_request (McdAccount *account, GHashTable *properties,
      * free it */
     props = _mcd_deepcopy_asv (properties);
     channel = mcd_channel_new_request (account, dgc, props, user_time,
-                                       preferred_handler, use_existing);
+                                       preferred_handler, use_existing,
+                                       proceeding);
     g_hash_table_unref (props);
 
     /* we use connect_after, to make sure that other signals (such as
diff --git a/src/mcd-channel.c b/src/mcd-channel.c
index b1715be..a1c700e 100644
--- a/src/mcd-channel.c
+++ b/src/mcd-channel.c
@@ -87,6 +87,7 @@ struct _McdChannelRequestData
     gchar *preferred_handler;
     McdAccount *account;  /* weak ref */
 
+    gboolean proceeding;
     gboolean use_existing;
 };
 
@@ -1124,6 +1125,8 @@ mcd_channel_get_error (McdChannel *channel)
  * @properties: a #GHashTable of desired channel properties.
  * @user_time: user action time.
  * @preferred_handler: well-known name of preferred handler.
+ * @use_existing: use EnsureChannel if %TRUE or CreateChannel if %FALSE
+ * @proceeding: behave as though Proceed has already been called
  *
  * Create a #McdChannel object holding the given properties. The object can
  * then be used to intiate a channel request, by passing it to
@@ -1137,7 +1140,8 @@ mcd_channel_new_request (McdAccount *account,
                          GHashTable *properties,
                          gint64 user_time,
                          const gchar *preferred_handler,
-                         gboolean use_existing)
+                         gboolean use_existing,
+                         gboolean proceeding)
 {
     McdChannel *channel;
     McdChannelRequestData *crd;
@@ -1154,6 +1158,7 @@ mcd_channel_new_request (McdAccount *account,
     crd->user_time = user_time;
     crd->preferred_handler = g_strdup (preferred_handler);
     crd->use_existing = use_existing;
+    crd->proceeding = proceeding;
 
     /* the McdAccount almost certainly lives longer than we do, but in case it
      * doesn't, use a weak ref here */
diff --git a/src/mcd-channel.h b/src/mcd-channel.h
index 3a4aa6f..268c836 100644
--- a/src/mcd-channel.h
+++ b/src/mcd-channel.h
@@ -102,7 +102,8 @@ McdChannel *mcd_channel_new_request (McdAccount *account,
                                      GHashTable *properties,
                                      gint64 user_time,
                                      const gchar *preferred_handler,
-                                     gboolean use_existing);
+                                     gboolean use_existing,
+                                     gboolean proceeding);
 G_GNUC_INTERNAL McdChannel *_mcd_channel_new_undispatched (void);
 
 G_GNUC_INTERNAL
-- 
1.5.6.5