[Pkg-telepathy-commits] [telepathy-glib-1] 17/212: Update documentation: we no longer use the starter bus
Simon McVittie
smcv at debian.org
Wed May 14 12:08:46 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian
in repository telepathy-glib-1.
commit a2180e870916fb13bcfa539a60738959f02e8952
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Fri Mar 14 19:23:14 2014 +0000
Update documentation: we no longer use the starter bus
---
telepathy-glib/account-manager.c | 35 ++++++++++++++++----------------
telepathy-glib/base-connection-manager.c | 2 +-
telepathy-glib/base-connection.c | 2 +-
telepathy-glib/debug-sender.c | 6 ++----
telepathy-glib/logger.c | 7 +++----
5 files changed, 24 insertions(+), 28 deletions(-)
diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
index f0202bf..bfe7747 100644
--- a/telepathy-glib/account-manager.c
+++ b/telepathy-glib/account-manager.c
@@ -694,7 +694,7 @@ _tp_account_manager_new_internal (TpClientFactory *factory,
* @bus_daemon.
*
* Use tp_account_manager_dup() instead if you want an account manager proxy
- * on the starter or session bus (which is almost always the right thing for
+ * on the session bus (which is almost always the right thing fo
* Telepathy).
*
* Returns: a new reference to an account manager proxy
@@ -730,7 +730,7 @@ tp_account_manager_new_with_factory (TpClientFactory *factory)
tp_client_factory_get_dbus_daemon (factory));
}
-static gpointer starter_account_manager_proxy = NULL;
+static gpointer default_account_manager_proxy = NULL;
/**
* tp_account_manager_set_default:
@@ -767,16 +767,16 @@ tp_account_manager_set_default (TpAccountManager *manager)
g_return_if_reached ();
}
- if (starter_account_manager_proxy != NULL)
+ if (default_account_manager_proxy != NULL)
{
CRITICAL ("tp_account_manager_set_default() may only be called once and"
"before first call of tp_account_manager_dup()");
g_return_if_reached ();
}
- starter_account_manager_proxy = manager;
- g_object_add_weak_pointer (starter_account_manager_proxy,
- &starter_account_manager_proxy);
+ default_account_manager_proxy = manager;
+ g_object_add_weak_pointer (default_account_manager_proxy,
+ &default_account_manager_proxy);
}
/**
@@ -793,15 +793,14 @@ tp_account_manager_set_default (TpAccountManager *manager)
gboolean
tp_account_manager_can_set_default (void)
{
- return starter_account_manager_proxy == NULL;
+ return default_account_manager_proxy == NULL;
}
/**
* tp_account_manager_dup:
*
- * Returns an account manager proxy on the D-Bus daemon on which this
- * process was activated (if it was launched by D-Bus service activation), or
- * the session bus (otherwise). This account manager will always have
+ * Returns an account manager proxy on the session bus.
+ * This account manager will always have
* the result of tp_dbus_daemon_dup() as its #TpProxy:dbus-daemon.
*
* The returned #TpAccountManager is cached; the same #TpAccountManager object
@@ -814,7 +813,7 @@ tp_account_manager_can_set_default (void)
* will be created the first time this function is called, using a new
* #TpAutomaticClientFactory as its #TpProxy:factory.
*
- * Returns: (transfer full): an account manager proxy on the starter or session
+ * Returns: (transfer full): an account manager proxy on the session
* bus, or %NULL if it wasn't possible to get a dbus daemon proxy for
* the appropriate bus
*
@@ -826,8 +825,8 @@ tp_account_manager_dup (void)
TpDBusDaemon *dbus;
GError *error = NULL;
- if (starter_account_manager_proxy != NULL)
- return g_object_ref (starter_account_manager_proxy);
+ if (default_account_manager_proxy != NULL)
+ return g_object_ref (default_account_manager_proxy);
dbus = tp_dbus_daemon_dup (&error);
if (dbus == NULL)
@@ -837,14 +836,14 @@ tp_account_manager_dup (void)
return NULL;
}
- starter_account_manager_proxy = tp_account_manager_new (dbus);
- g_assert (starter_account_manager_proxy != NULL);
- g_object_add_weak_pointer (starter_account_manager_proxy,
- &starter_account_manager_proxy);
+ default_account_manager_proxy = tp_account_manager_new (dbus);
+ g_assert (default_account_manager_proxy != NULL);
+ g_object_add_weak_pointer (default_account_manager_proxy,
+ &default_account_manager_proxy);
g_object_unref (dbus);
- return starter_account_manager_proxy;
+ return default_account_manager_proxy;
}
static void
diff --git a/telepathy-glib/base-connection-manager.c b/telepathy-glib/base-connection-manager.c
index b21accb..6e5a7b1 100644
--- a/telepathy-glib/base-connection-manager.c
+++ b/telepathy-glib/base-connection-manager.c
@@ -407,7 +407,7 @@ tp_base_connection_manager_class_init (TpBaseConnectionManagerClass *klass)
* Read-only except during construction.
*
* If this property is %NULL or omitted during construction, the object will
- * automatically attempt to connect to the starter or session bus with
+ * automatically attempt to connect to the session bus with
* tp_dbus_daemon_dup() just after it is constructed; if this fails, a
* warning will be logged with g_warning(), and this property will remain
* %NULL.
diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index f932db0..e654826 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -1162,7 +1162,7 @@ tp_base_connection_class_init (TpBaseConnectionClass *klass)
* Read-only except during construction.
*
* If this property is %NULL or omitted during construction, the object will
- * automatically attempt to connect to the starter or session bus with
+ * automatically attempt to connect to the session bus with
* tp_dbus_daemon_dup() just after it is constructed; if this fails, this
* property will remain %NULL, and tp_base_connection_register() will fail.
*
diff --git a/telepathy-glib/debug-sender.c b/telepathy-glib/debug-sender.c
index 6350220..bcb8d3e 100644
--- a/telepathy-glib/debug-sender.c
+++ b/telepathy-glib/debug-sender.c
@@ -337,15 +337,13 @@ tp_debug_sender_init (TpDebugSender *self)
/**
* tp_debug_sender_dup:
*
- * Returns a #TpDebugSender instance on the bus this process was activated by
- * (if it was launched by D-Bus service activation), or the session bus
- * (otherwise).
+ * Returns a #TpDebugSender instance on the session bus.
*
* The returned #TpDebugSender is cached; the same #TpDebugSender object will
* be returned by this function repeatedly, as long as at least one reference
* exists.
*
- * Returns: a reference to the #TpDebugSender instance for the current starter
+ * Returns: a reference to the #TpDebugSender instance for the current session
* bus daemon
*
* Since: 0.7.36
diff --git a/telepathy-glib/logger.c b/telepathy-glib/logger.c
index b53c729..bb1e281 100644
--- a/telepathy-glib/logger.c
+++ b/telepathy-glib/logger.c
@@ -84,16 +84,15 @@ static gpointer logger_singleton = NULL;
/**
* tp_logger_dup:
*
- * Returns an logger proxy on the D-Bus daemon on which this
- * process was activated (if it was launched by D-Bus service activation), or
- * the session bus (otherwise). This logger proxy will always have
+ * Returns an logger proxy on the session bus.
+ * This logger proxy will always have
* the result of tp_dbus_daemon_dup() as its #TpProxy:dbus-daemon.
*
* The returned #TpLogger is cached; the same #TpLogger object
* will be returned by this function repeatedly, as long as at least one
* reference exists.
*
- * Returns: (transfer full): an logger proxy on the starter or session
+ * Returns: (transfer full): an logger proxy on the session
* bus, or %NULL if it wasn't possible to get a dbus daemon proxy for
* the appropriate bus
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-glib-1.git
More information about the Pkg-telepathy-commits
mailing list