[telepathy-mission-control/master] _mcd_dispatch_operation_get_account_path: internalize

Simon McVittie simon.mcvittie at collabora.co.uk
Mon Nov 2 06:41:49 PST 2009


---
 src/mcd-dispatch-operation-priv.h |    2 -
 src/mcd-dispatch-operation.c      |   48 ++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/mcd-dispatch-operation-priv.h b/src/mcd-dispatch-operation-priv.h
index 30e9b3c..7bf5934 100644
--- a/src/mcd-dispatch-operation-priv.h
+++ b/src/mcd-dispatch-operation-priv.h
@@ -56,8 +56,6 @@ G_GNUC_INTERNAL GType _mcd_dispatch_operation_get_type (void);
 
 G_GNUC_INTERNAL const gchar *_mcd_dispatch_operation_get_path
     (McdDispatchOperation *operation);
-G_GNUC_INTERNAL const gchar *_mcd_dispatch_operation_get_account_path
-    (McdDispatchOperation *self);
 G_GNUC_INTERNAL GHashTable *_mcd_dispatch_operation_get_properties
     (McdDispatchOperation *operation);
 G_GNUC_INTERNAL gboolean _mcd_dispatch_operation_is_claimed
diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
index 7361e96..0b4ec91 100644
--- a/src/mcd-dispatch-operation.c
+++ b/src/mcd-dispatch-operation.c
@@ -337,6 +337,30 @@ get_connection (TpSvcDBusProperties *self, const gchar *name, GValue *value)
             (MCD_DISPATCH_OPERATION (self)));
 }
 
+/*
+ * _mcd_dispatch_operation_get_account_path:
+ * @operation: the #McdDispatchOperation.
+ *
+ * Returns: the D-Bus object path of the Account associated with @operation,
+ *    or "/" if none.
+ */
+static const gchar *
+_mcd_dispatch_operation_get_account_path (McdDispatchOperation *self)
+{
+    const gchar *path;
+
+    g_return_val_if_fail (MCD_IS_DISPATCH_OPERATION (self), "/");
+
+    if (self->priv->account == NULL)
+        return "/";
+
+    path = mcd_account_get_object_path (self->priv->account);
+
+    g_return_val_if_fail (path != NULL, "/");
+
+    return path;
+}
+
 static void
 get_account (TpSvcDBusProperties *self, const gchar *name, GValue *value)
 {
@@ -989,30 +1013,6 @@ _mcd_dispatch_operation_get_path (McdDispatchOperation *operation)
 }
 
 /*
- * _mcd_dispatch_operation_get_account_path:
- * @operation: the #McdDispatchOperation.
- *
- * Returns: the D-Bus object path of the Account associated with @operation,
- *    or "/" if none.
- */
-const gchar *
-_mcd_dispatch_operation_get_account_path (McdDispatchOperation *self)
-{
-    const gchar *path;
-
-    g_return_val_if_fail (MCD_IS_DISPATCH_OPERATION (self), "/");
-
-    if (self->priv->account == NULL)
-        return "/";
-
-    path = mcd_account_get_object_path (self->priv->account);
-
-    g_return_val_if_fail (path != NULL, "/");
-
-    return path;
-}
-
-/*
  * _mcd_dispatch_operation_get_properties:
  * @operation: the #McdDispatchOperation.
  *
-- 
1.5.6.5




More information about the telepathy-commits mailing list