Release 0.19.3

13 files changed, 42 insertions, 26 deletions

diff --git a/NEWS b/NEWS
index 6f8958325..8376dc454 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,19 @@
-telepathy-glib 0.19.3 (UNRELEASED)
+telepathy-glib 0.19.3 (2012-07-05)
 ==================================
 
 Deprecations:
 
 • tp_account_new(), tp_connection_new() and tp_*_channel_new() have been
   deprecated. Those proxies should be created using corresponding
-  TpSimpleClientFactory APIs.
+  TpSimpleClientFactory APIs. (Xavier)
+
+• TpAccount, TpConnection and TpConnectionManager: deprecate
+  "connection-manager" and "protocol" properties and replace them by "cm-name"
+  and "protocol-name" to be more consistent. Ditto for their getters. (Xavier)
+
+Fixes:
+
+• fdo#51444 - Crash in TpBaseClient (Xavier)
 
 telepathy-glib 0.19.2 (2012-06-28)
 ==================================
diff --git a/configure.ac b/configure.ac
index d561b87c8..4161eb06a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,8 +11,8 @@ AC_PREREQ([2.59])
 
 m4_define([tp_glib_major_version], [0])
 m4_define([tp_glib_minor_version], [19])
-m4_define([tp_glib_micro_version], [2])
-m4_define([tp_glib_nano_version], [1])
+m4_define([tp_glib_micro_version], [3])
+m4_define([tp_glib_nano_version], [0])
 
 # If library source has changed since last release, increment revision
 # If interfaces have been added, removed or changed since last release,
@@ -26,9 +26,9 @@ m4_define([tp_glib_nano_version], [1])
 # (we don't guarantee that we won't add ABI then remove it again, if it was
 # never seen in a release).
 
-m4_define([tp_glib_lt_current], [72])
+m4_define([tp_glib_lt_current], [73])
 m4_define([tp_glib_lt_revision], [0])
-m4_define([tp_glib_lt_age], [72])
+m4_define([tp_glib_lt_age], [73])
 
 # Some magic
 m4_define([tp_glib_base_version],
diff --git a/telepathy-glib/abi.am b/telepathy-glib/abi.am
index 438023aad..f3526dcd7 100644
--- a/telepathy-glib/abi.am
+++ b/telepathy-glib/abi.am
@@ -88,6 +88,7 @@ ABI_LISTS = \
     versions/0.19.0.abi \
     versions/0.19.1.abi \
     versions/0.19.2.abi \
+    versions/0.19.3.abi \
     $(NULL)
 
 # The quoting here is unnecessary but harmless, and has the useful side-effect
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index 6a313a6f4..ba8669384 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -1562,7 +1562,7 @@ tp_account_class_init (TpAccountClass *klass)
    *
    * The account's connection manager name.
    *
-   * Since: 0.UNRELEASED
+   * Since: 0.19.3
    */
   g_object_class_install_property (object_class, PROP_CM_NAME,
       g_param_spec_string ("cm-name",
@@ -1578,7 +1578,7 @@ tp_account_class_init (TpAccountClass *klass)
    * "local-xmpp". Recommended names for most protocols can be found in the
    * Telepathy D-Bus Interface Specification.
    *
-   * Since: 0.UNRELEASED
+   * Since: 0.19.3
    */
   g_object_class_install_property (object_class, PROP_PROTOCOL_NAME,
       g_param_spec_string ("protocol-name",
@@ -2361,7 +2361,7 @@ tp_account_get_protocol (TpAccount *account)
  *
  * Returns: the same as the #TpAccount:cm-name property
  *
- * Since: 0.UNRELEASED
+ * Since: 0.19.3
  */
 const gchar *
 tp_account_get_cm_name (TpAccount *account)
@@ -2379,7 +2379,7 @@ tp_account_get_cm_name (TpAccount *account)
  *
  * Returns: the same as the #TpAccount:protocol-name property
  *
- * Since: 0.UNRELEASED
+ * Since: 0.19.3
  */
 const gchar *
 tp_account_get_protocol_name (TpAccount *account)
diff --git a/telepathy-glib/account.h b/telepathy-glib/account.h
index 851826391..faf2492a2 100644
--- a/telepathy-glib/account.h
+++ b/telepathy-glib/account.h
@@ -86,7 +86,7 @@ GQuark tp_account_get_feature_quark_connection (void) G_GNUC_CONST;
 GQuark tp_account_get_feature_quark_storage (void) G_GNUC_CONST;
 GQuark tp_account_get_feature_quark_addressing (void) G_GNUC_CONST;
 
-_TP_DEPRECATED_IN_UNRELEASED_FOR(tp_simple_client_factory_ensure_account)
+_TP_DEPRECATED_IN_0_20_FOR(tp_simple_client_factory_ensure_account)
 TpAccount *tp_account_new (TpDBusDaemon *bus_daemon, const gchar *object_path,
     GError **error) G_GNUC_WARN_UNUSED_RESULT;
 
@@ -110,16 +110,16 @@ TpConnection *tp_account_ensure_connection (TpAccount *account,
 const gchar *tp_account_get_display_name (TpAccount *account);
 
 #ifndef TP_DISABLE_DEPRECATED
-_TP_DEPRECATED_IN_UNRELEASED_FOR(tp_account_get_cm_name)
+_TP_DEPRECATED_IN_0_20_FOR(tp_account_get_cm_name)
 const gchar *tp_account_get_connection_manager (TpAccount *account);
-_TP_DEPRECATED_IN_UNRELEASED_FOR(tp_account_get_protocol_name)
+_TP_DEPRECATED_IN_0_20_FOR(tp_account_get_protocol_name)
 const gchar *tp_account_get_protocol (TpAccount *account);
 #endif
 
-_TP_AVAILABLE_IN_UNRELEASED
+_TP_AVAILABLE_IN_0_20
 const gchar *tp_account_get_cm_name (TpAccount *account);
 
-_TP_AVAILABLE_IN_UNRELEASED
+_TP_AVAILABLE_IN_0_20
 const gchar *tp_account_get_protocol_name (TpAccount *account);
 
 const gchar *tp_account_get_service (TpAccount *self);
diff --git a/telepathy-glib/channel.h b/telepathy-glib/channel.h
index d72ad740d..85b023716 100644
--- a/telepathy-glib/channel.h
+++ b/telepathy-glib/channel.h
@@ -77,13 +77,13 @@ GQuark tp_errors_removed_from_group_quark (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CHANNEL, \
                               TpChannelClass))
 
-_TP_DEPRECATED_IN_UNRELEASED_FOR(tp_simple_client_factory_ensure_channel)
+_TP_DEPRECATED_IN_0_20_FOR(tp_simple_client_factory_ensure_channel)
 TpChannel *tp_channel_new (TpConnection *conn,
     const gchar *object_path, const gchar *optional_channel_type,
     TpHandleType optional_handle_type, TpHandle optional_handle,
     GError **error) G_GNUC_WARN_UNUSED_RESULT;
 
-_TP_DEPRECATED_IN_UNRELEASED_FOR(tp_simple_client_factory_ensure_channel)
+_TP_DEPRECATED_IN_0_20_FOR(tp_simple_client_factory_ensure_channel)
 TpChannel *tp_channel_new_from_properties (TpConnection *conn,
     const gchar *object_path, const GHashTable *immutable_properties,
     GError **error) G_GNUC_WARN_UNUSED_RESULT;
diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
index 4760daa22..7130f6298 100644
--- a/telepathy-glib/connection-manager.c
+++ b/telepathy-glib/connection-manager.c
@@ -1471,7 +1471,7 @@ tp_connection_manager_class_init (TpConnectionManagerClass *klass)
    *
    * The name of the connection manager, e.g. "gabble" (read-only).
    *
-   * Since: 0.UNRELEASED
+   * Since: 0.19.3
    */
   param_spec = g_param_spec_string ("cm-name", "CM name",
       "The name of the connection manager, e.g. \"gabble\" (read-only)",
diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c
index f92936537..1dce574a7 100644
--- a/telepathy-glib/connection.c
+++ b/telepathy-glib/connection.c
@@ -1780,7 +1780,7 @@ tp_connection_class_init (TpConnectionClass *klass)
    *
    * This connection's connection manager name.
    *
-   * Since: 0.UNRELEASED
+   * Since: 0.19.3
    */
   g_object_class_install_property (object_class, PROP_CM_NAME,
       g_param_spec_string ("cm-name",
@@ -2566,7 +2566,7 @@ tp_connection_get_connection_manager_name (TpConnection *self)
  *
  * Returns: the same as the #TpConnection:cm-name property
  *
- * Since: 0.UNRELEASED
+ * Since: 0.19.3
  *
  */
 const gchar *
diff --git a/telepathy-glib/connection.h b/telepathy-glib/connection.h
index d4a0508d0..def45fc8a 100644
--- a/telepathy-glib/connection.h
+++ b/telepathy-glib/connection.h
@@ -140,7 +140,7 @@ GQuark tp_errors_disconnected_quark (void);
   (G_TYPE_INSTANCE_GET_CLASS ((obj), TP_TYPE_CONNECTION, \
                               TpConnectionClass))
 
-_TP_DEPRECATED_IN_UNRELEASED_FOR(tp_simple_client_factory_ensure_connection)
+_TP_DEPRECATED_IN_0_20_FOR(tp_simple_client_factory_ensure_connection)
 TpConnection *tp_connection_new (TpDBusDaemon *dbus, const gchar *bus_name,
     const gchar *object_path, GError **error) G_GNUC_WARN_UNUSED_RESULT;
 
@@ -151,11 +151,11 @@ TpConnectionStatus tp_connection_get_status (TpConnection *self,
     TpConnectionStatusReason *reason);
 
 #ifndef TP_DISABLE_DEPRECATED
-_TP_DEPRECATED_IN_UNRELEASED_FOR (tp_connection_get_cm_name)
+_TP_DEPRECATED_IN_0_20_FOR (tp_connection_get_cm_name)
 const gchar *tp_connection_get_connection_manager_name (TpConnection *self);
 #endif
 
-_TP_AVAILABLE_IN_UNRELEASED
+_TP_AVAILABLE_IN_0_20
 const gchar *tp_connection_get_cm_name (TpConnection *self);
 
 const gchar *tp_connection_get_protocol_name (TpConnection *self);
diff --git a/telepathy-glib/file-transfer-channel.h b/telepathy-glib/file-transfer-channel.h
index eed4fe612..60b81c7b6 100644
--- a/telepathy-glib/file-transfer-channel.h
+++ b/telepathy-glib/file-transfer-channel.h
@@ -68,7 +68,7 @@ GType tp_file_transfer_channel_get_type (void);
 /* Methods */
 
 _TP_AVAILABLE_IN_0_16
-_TP_DEPRECATED_IN_UNRELEASED_FOR(tp_simple_client_factory_ensure_channel)
+_TP_DEPRECATED_IN_0_20_FOR(tp_simple_client_factory_ensure_channel)
 TpFileTransferChannel * tp_file_transfer_channel_new (TpConnection *conn,
     const gchar *object_path,
     const GHashTable *immutable_properties,
diff --git a/telepathy-glib/stream-tube-channel.h b/telepathy-glib/stream-tube-channel.h
index 62b23f675..53548d081 100644
--- a/telepathy-glib/stream-tube-channel.h
+++ b/telepathy-glib/stream-tube-channel.h
@@ -59,7 +59,7 @@ struct _TpStreamTubeChannelClass
 
 GType tp_stream_tube_channel_get_type (void);
 
-_TP_DEPRECATED_IN_UNRELEASED_FOR(tp_simple_client_factory_ensure_channel)
+_TP_DEPRECATED_IN_0_20_FOR(tp_simple_client_factory_ensure_channel)
 TpStreamTubeChannel *tp_stream_tube_channel_new (TpConnection *conn,
     const gchar *object_path,
     const GHashTable *immutable_properties,
diff --git a/telepathy-glib/text-channel.h b/telepathy-glib/text-channel.h
index 2b07a7d1a..047482215 100644
--- a/telepathy-glib/text-channel.h
+++ b/telepathy-glib/text-channel.h
@@ -60,7 +60,7 @@ struct _TpTextChannelClass
 
 GType tp_text_channel_get_type (void);
 
-_TP_DEPRECATED_IN_UNRELEASED_FOR(tp_simple_client_factory_ensure_channel)
+_TP_DEPRECATED_IN_0_20_FOR(tp_simple_client_factory_ensure_channel)
 TpTextChannel *tp_text_channel_new (TpConnection *conn,
     const gchar *object_path,
     const GHashTable *immutable_properties,
diff --git a/telepathy-glib/versions/0.19.3.abi b/telepathy-glib/versions/0.19.3.abi
new file mode 100644
index 000000000..57a140866
--- /dev/null
+++ b/telepathy-glib/versions/0.19.3.abi
@@ -0,0 +1,7 @@
+Version: TELEPATHY_GLIB_0.19.3
+Extends: TELEPATHY_GLIB_0.19.2
+Release: 0.19.3
+
+tp_account_get_cm_name
+tp_account_get_protocol_name
+tp_connection_get_cm_name