Merge branch 'trivia'

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>

4 files changed, 43 insertions, 9 deletions

diff --git a/NEWS b/NEWS
index 2c96279f..e8c748cc 100644
--- a/NEWS
+++ b/NEWS
@@ -5,9 +5,18 @@ Dependencies:
 
 * GLib, GObject and GIO ≥ 2.22 are now required
 
+Deprecations:
+
+* fd.o #22206: all the re-entrant functions (of the form tp_FOO_run_until_ready
+  and tp_cli_FOO_run_BAR) are deprecated in this version, please use
+  asynchronous calls instead (smcv)
+
+* fd.o #24114: tp_get_bus() is deprecated, please use tp_dbus_daemon_dup()
+  followed by tp_proxy_get_dbus_connection() (smcv)
+
 Enhancements:
 
-* Update to telepathy-spec 0.19.1 (smcv)
+* Update to telepathy-spec 0.19.3 (smcv)
   - generate code for Connection.Interface.Balance
 
 * Add an example connection manager for the experimental Call API that will
@@ -20,6 +29,8 @@ Enhancements:
 
 * Add tp_value_array_unpack, the inverse of tp_value_array_build (danni)
 
+* Make various minor improvements to the tests (smcv)
+
 Fixes:
 
 * tp_account_set_nickname_async: set the right source_tag (cassidy)
@@ -27,6 +38,13 @@ Fixes:
 * fd.o #27281: clarify documentation for tp_message_mixin_sent, using
   telepathy-spec 0.19.2 as a reference (Maiku)
 
+* Avoid using re-entrant functions, other than in regression tests (smcv)
+
+* fd.o #21956: clean up documentation/defaults of TpContact properties (smcv)
+
+* telepathy.am: if copied into a project where CHECK_FOR_UNRELEASED is empty,
+  don't hang waiting for input (smcv)
+
 telepathy-glib 0.10.2 (2010-03-31)
 ==================================
 
diff --git a/telepathy-glib/contact.c b/telepathy-glib/contact.c
index 846d9b25..7c93b62a 100644
--- a/telepathy-glib/contact.c
+++ b/telepathy-glib/contact.c
@@ -509,7 +509,10 @@ tp_contact_class_init (TpContactClass *klass)
    *
    * The contact's identifier in the instant messaging protocol (e.g.
    * XMPP JID, SIP URI, AOL screenname or IRC nick - whatever the underlying
-   * protocol uses to identify a user). This is never %NULL.
+   * protocol uses to identify a user).
+   *
+   * This is never %NULL for contact objects that are visible to library-user
+   * code.
    */
   param_spec = g_param_spec_string ("identifier",
       "IM protocol identifier",
@@ -524,11 +527,14 @@ tp_contact_class_init (TpContactClass *klass)
    *
    * The contact's alias if available, falling back to their
    * #TpContact:identifier if no alias is available or if the #TpContact has
-   * not been set up to track %TP_CONTACT_FEATURE_ALIAS. This is never %NULL.
+   * not been set up to track %TP_CONTACT_FEATURE_ALIAS.
    *
    * This alias may have been supplied by the contact themselves, or by the
    * local user, so it does not necessarily unambiguously identify the contact.
    * However, it is suitable for use as a main "display name" for the contact.
+   *
+   * This is never %NULL for contact objects that are visible to library-user
+   * code.
    */
   param_spec = g_param_spec_string ("alias",
       "Alias",
@@ -571,7 +577,7 @@ tp_contact_class_init (TpContactClass *klass)
   param_spec = g_param_spec_uint ("presence-type",
       "Presence type",
       "The TpConnectionPresenceType for this contact",
-      0, G_MAXUINT32, 0,
+      0, G_MAXUINT32, TP_CONNECTION_PRESENCE_TYPE_UNSET,
       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_PRESENCE_TYPE,
       param_spec);
@@ -590,7 +596,7 @@ tp_contact_class_init (TpContactClass *klass)
       "Presence status",
       "Possibly connection-manager-specific string representing the "
         "contact's presence status",
-      NULL,
+      "",
       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_PRESENCE_STATUS,
       param_spec);
@@ -610,7 +616,7 @@ tp_contact_class_init (TpContactClass *klass)
   param_spec = g_param_spec_string ("presence-message",
       "Presence message",
       "User-defined status message, or an empty string",
-      NULL,
+      "",
       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_PRESENCE_MESSAGE,
       param_spec);
diff --git a/telepathy-glib/dbus.c b/telepathy-glib/dbus.c
index f08e36e9..17b8ab12 100644
--- a/telepathy-glib/dbus.c
+++ b/telepathy-glib/dbus.c
@@ -121,6 +121,8 @@ _tp_dbus_starter_bus_conn (GError **error)
  * Most processes should use tp_dbus_daemon_dup() instead.
  *
  * Returns: a connection to the starter or session D-Bus daemon.
+ *
+ * Deprecated: 0.11.UNRELEASED: Use tp_dbus_daemon_dup() in new code.
  */
 DBusGConnection *
 tp_get_bus (void)
@@ -140,7 +142,8 @@ tp_get_bus (void)
 /**
  * tp_get_bus_proxy:
  *
- * Return a #DBusGProxy for the bus daemon object.
+ * Return a #DBusGProxy for the bus daemon object. The same caveats as for
+ * tp_get_bus() apply.
  *
  * Returns: a proxy for the bus daemon object on the starter or session bus.
  *
@@ -153,7 +156,14 @@ tp_get_bus_proxy (void)
 
   if (bus_proxy == NULL)
     {
-      DBusGConnection *bus = tp_get_bus ();
+      GError *error = NULL;
+      DBusGConnection *bus = _tp_dbus_starter_bus_conn (&error);
+
+      if (bus == NULL)
+        {
+          g_warning ("Failed to connect to starter bus: %s", error->message);
+          exit (1);
+        }
 
       bus_proxy = dbus_g_proxy_new_for_name (bus,
                                             "org.freedesktop.DBus",
diff --git a/telepathy-glib/dbus.h b/telepathy-glib/dbus.h
index 0da7d6a0..c29d2c9d 100644
--- a/telepathy-glib/dbus.h
+++ b/telepathy-glib/dbus.h
@@ -29,7 +29,6 @@
 G_BEGIN_DECLS
 
 void tp_dbus_g_method_return_not_implemented (DBusGMethodInvocation *context);
-DBusGConnection * tp_get_bus (void);
 
 typedef enum
 {
@@ -128,6 +127,7 @@ void tp_asv_set_strv (GHashTable *asv, const gchar *key, gchar **value);
 void tp_asv_dump (GHashTable *asv);
 
 #ifndef TP_DISABLE_DEPRECATED
+DBusGConnection * tp_get_bus (void) _TP_GNUC_DEPRECATED;
 DBusGProxy * tp_get_bus_proxy (void) _TP_GNUC_DEPRECATED;
 #endif