[next] telepathy-glib: Remove deprecated tp_connection_parse_object_path()

[Xavier Claessens]

Module: telepathy-glib
Branch: next
Commit: 5215d7cf50b97b886924e1fcfe8707564f94dc46
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=5215d7cf50b97b886924e1fcfe8707564f94dc46

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Fri May 18 18:11:20 2012 +0200

Remove deprecated tp_connection_parse_object_path()

---

 telepathy-glib/connection.c |   38 --------------------------------------
 telepathy-glib/connection.h |    6 ------
 2 files changed, 0 insertions(+), 44 deletions(-)

diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c
index 6d61e34..ab92e7e 100644
--- a/telepathy-glib/connection.c
+++ b/telepathy-glib/connection.c
@@ -307,8 +307,6 @@ tp_connection_get_property (GObject *object,
 {
   TpConnection *self = TP_CONNECTION (object);
 
-  /* Deprecated properties uses deprecated getters */
-  G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   switch (property_id)
     {
     case PROP_CONNECTION_MANAGER_NAME:
@@ -372,7 +370,6 @@ tp_connection_get_property (GObject *object,
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
     }
-  G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 static void
@@ -2639,41 +2636,6 @@ tp_connection_presence_type_cmp_availability (TpConnectionPresenceType p1,
   return 0;
 }
 
-
-/**
- * tp_connection_parse_object_path:
- * @self: a connection
- * @protocol: (out) (transfer full): If not NULL, used to return the protocol
- *  of the connection
- * @cm_name: (out) (transfer full): If not NULL, used to return the connection
- *  manager name of the connection
- *
- * If the object path of @connection is in the correct form, set
- * @protocol and @cm_name, return TRUE. Otherwise leave them unchanged and
- * return FALSE.
- *
- * Returns: TRUE if the object path was correctly parsed, FALSE otherwise.
- *
- * Since: 0.7.27
- * Deprecated: Use tp_connection_get_protocol_name() and
- *  tp_connection_get_connection_manager_name() instead.
- */
-gboolean
-tp_connection_parse_object_path (TpConnection *self,
-                                 gchar **protocol,
-                                 gchar **cm_name)
-{
-  g_return_val_if_fail (TP_IS_CONNECTION (self), FALSE);
-
-  if (protocol != NULL)
-    *protocol = g_strdup (self->priv->proto_name);
-
-  if (cm_name != NULL)
-    *cm_name = g_strdup (self->priv->cm_name);
-
-  return TRUE;
-}
-
 /* Can return a contact that's not meant to be visible to library users
  * because it lacks an identifier */
 TpContact *
diff --git a/telepathy-glib/connection.h b/telepathy-glib/connection.h
index 3a7c405..9c86d6a 100644
--- a/telepathy-glib/connection.h
+++ b/telepathy-glib/connection.h
@@ -179,12 +179,6 @@ void tp_connection_init_known_interfaces (void);
 gint tp_connection_presence_type_cmp_availability (TpConnectionPresenceType p1,
   TpConnectionPresenceType p2);
 
-#ifndef TP_DISABLE_DEPRECATED
-_TP_DEPRECATED_IN_UNRELEASED_FOR(tp_connection_get_protocol_name)
-gboolean tp_connection_parse_object_path (TpConnection *self, gchar **protocol,
-    gchar **cm_name);
-#endif
-
 _TP_AVAILABLE_IN_0_20
 const gchar *tp_connection_get_detailed_error (TpConnection *self,
     const GHashTable **details);