[Telepathy-commits] [telepathy-mission-control/master] Remove a few deprecated functions and properties.
Alberto Mardegan
alberto.mardegan at nokia.com
Mon Feb 2 00:00:19 PST 2009
---
src/mcd-channel.c | 80 --------------------------------------------------
src/mcd-channel.h | 17 ----------
src/mcd-connection.c | 12 -------
src/mcd-connection.h | 1 -
4 files changed, 0 insertions(+), 110 deletions(-)
diff --git a/src/mcd-channel.c b/src/mcd-channel.c
index b38300f..8658bd1 100644
--- a/src/mcd-channel.c
+++ b/src/mcd-channel.c
@@ -90,9 +90,6 @@ enum _McdChannelPropertyType
{
PROP_TP_CHANNEL = 1,
PROP_OUTGOING,
- PROP_SELF_HANDLE_READY,
- PROP_NAME_READY,
- PROP_INVITER_READY,
};
#define DEPRECATED_PROPERTY_WARNING \
@@ -202,7 +199,6 @@ _mcd_channel_setup_group (McdChannel *channel)
g_signal_connect (priv->tp_chan, "group-members-changed",
G_CALLBACK (on_members_changed), channel);
- g_object_notify ((GObject *)channel, "self-handle-ready");
}
static void
@@ -233,8 +229,6 @@ on_channel_ready (TpChannel *tp_chan, const GError *error, gpointer user_data)
if (valid)
priv->outgoing = requested;
- g_object_notify ((GObject *)channel, "name-ready");
-
priv->has_group_if = tp_proxy_has_interface_by_id (priv->tp_chan,
TP_IFACE_QUARK_CHANNEL_INTERFACE_GROUP);
if (priv->has_group_if)
@@ -324,12 +318,6 @@ _mcd_channel_get_property (GObject * obj, guint prop_id,
case PROP_OUTGOING:
g_value_set_boolean (val, priv->outgoing);
break;
- case PROP_SELF_HANDLE_READY:
- case PROP_NAME_READY:
- DEPRECATED_PROPERTY_WARNING;
- g_value_set_boolean (val, priv->tp_chan &&
- tp_channel_is_ready (priv->tp_chan));
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec);
break;
@@ -436,20 +424,6 @@ mcd_channel_class_init (McdChannelClass * klass)
"True if the channel was requested by us",
FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
- g_object_class_install_property
- (object_class, PROP_SELF_HANDLE_READY,
- g_param_spec_boolean ("self-handle-ready",
- "Self handle ready",
- "Self handle ready",
- FALSE,
- G_PARAM_READABLE));
- g_object_class_install_property
- (object_class, PROP_NAME_READY,
- g_param_spec_boolean ("name-ready",
- "Name ready",
- "Name ready",
- FALSE,
- G_PARAM_READABLE));
}
static void
@@ -464,16 +438,6 @@ mcd_channel_init (McdChannel * obj)
priv->close_on_dispose = TRUE;
}
-McdChannel *
-mcd_channel_new (TpChannel * tp_chan,
- const gchar *type, guint handle,
- TpHandleType handle_type, gboolean outgoing,
- guint requestor_serial, const gchar *requestor_client_id)
-{
- g_warning ("%s is deprecated", G_STRFUNC);
- return NULL;
-}
-
/**
* mcd_channel_new_from_properties:
* @connection: the #TpConnection on which the channel exists.
@@ -591,26 +555,6 @@ _mcd_channel_create_proxy_old (McdChannel *channel, TpConnection *connection,
}
/**
- * mcd_channel_set_object_path:
- * @channel: the #McdChannel.
- * @connection: the #TpConnection on which the channel exists.
- * @object_path: the D-Bus object path of an existing channel.
- *
- * This method makes @channel create a #TpChannel object for @object_path.
- * It must not be called it @channel has already a #TpChannel associated with
- * it.
- *
- * Returns: %TRUE if the #TpChannel has been created, %FALSE otherwise.
- */
-gboolean
-mcd_channel_set_object_path (McdChannel *channel, TpConnection *connection,
- const gchar *object_path)
-{
- g_warning ("%s is deprecated", G_STRFUNC);
- return FALSE;
-}
-
-/**
* mcd_channel_create_proxy:
* @channel: the #McdChannel.
* @connection: the #TpConnection on which the channel exists.
@@ -786,13 +730,6 @@ mcd_channel_get_handle_type (McdChannel *channel)
return handle_type;
}
-GPtrArray*
-mcd_channel_get_members (McdChannel *channel)
-{
- g_warning ("%s called, but shouldn't!", G_STRFUNC);
- return NULL;
-}
-
/**
* mcd_channel_get_name:
* @channel: the #McdChannel.
@@ -879,23 +816,6 @@ mcd_channel_is_missed (McdChannel *channel)
return MCD_CHANNEL_PRIV (channel)->missed;
}
-/**
- * mcd_channel_leave:
- * @channel: the #McdChannel.
- * @reason: a #TelepathyChannelGroupChangeReason.
- *
- * Leaves @channel with reason @reason.
- *
- * Returns: %TRUE for success, %FALSE otherwise.
- */
-gboolean
-mcd_channel_leave (McdChannel *channel, const gchar *message,
- TpChannelGroupChangeReason reason)
-{
- g_warning ("%s called, but shouldn't!", G_STRFUNC);
- return FALSE;
-}
-
/*
* _mcd_channel_get_immutable_properties:
* @channel: the #McdChannel.
diff --git a/src/mcd-channel.h b/src/mcd-channel.h
index 08c49f8..5a3cd24 100644
--- a/src/mcd-channel.h
+++ b/src/mcd-channel.h
@@ -87,14 +87,6 @@ struct _McdChannelClass
GType mcd_channel_get_type (void);
-McdChannel *mcd_channel_new (TpChannel *channel,
- const gchar *channel_type,
- guint channel_handle,
- TpHandleType channel_handle_type,
- gboolean outgoing,
- guint requestor_serial,
- const gchar *requestor_client_id)
- G_GNUC_DEPRECATED;
McdChannel *
mcd_channel_new_from_properties (TpConnection *connection,
const gchar *object_path,
@@ -107,10 +99,6 @@ McdChannel *mcd_channel_new_request (GHashTable *properties,
guint64 user_time,
const gchar *preferred_handler);
-gboolean mcd_channel_set_object_path (McdChannel *channel,
- TpConnection *connection,
- const gchar *object_path)
- G_GNUC_DEPRECATED;
G_GNUC_INTERNAL
gboolean _mcd_channel_create_proxy (McdChannel *channel,
TpConnection *connection,
@@ -127,15 +115,10 @@ void mcd_channel_set_handle (McdChannel *channel, guint handle);
guint mcd_channel_get_handle (McdChannel *channel);
TpHandleType mcd_channel_get_handle_type (McdChannel *channel);
gint mcd_channel_get_flags (McdChannel *channel);
-GPtrArray* mcd_channel_get_members (McdChannel *channel)
- G_GNUC_DEPRECATED;
const gchar *mcd_channel_get_name (McdChannel *channel);
const gchar *mcd_channel_get_inviter (McdChannel *channel);
guint mcd_channel_get_self_handle (McdChannel *channel);
gboolean mcd_channel_is_missed (McdChannel *channel);
-gboolean mcd_channel_leave (McdChannel *channel, const gchar *message,
- TpChannelGroupChangeReason reason)
- G_GNUC_DEPRECATED;
gboolean mcd_channel_is_requested (McdChannel *channel);
McdAccount *mcd_channel_get_account (McdChannel *channel);
TpChannel *mcd_channel_get_tp_channel (McdChannel *channel);
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index a66edfc..3c3b5d5 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -2473,18 +2473,6 @@ mcd_connection_close (McdConnection *connection)
}
/**
- * mcd_connection_restart:
- * @connection: the #McdConnection.
- *
- * DEPRECATED: doesn't do anything.
- */
-void
-mcd_connection_restart (McdConnection *connection)
-{
- g_warning ("%s is deprecated", G_STRFUNC);
-}
-
-/**
* mcd_connection_connect:
* @connection: the #McdConnection.
* @params: a #GHashTable of connection parameters.
diff --git a/src/mcd-connection.h b/src/mcd-connection.h
index 6992942..9112170 100644
--- a/src/mcd-connection.h
+++ b/src/mcd-connection.h
@@ -96,7 +96,6 @@ gboolean mcd_connection_get_telepathy_details (McdConnection * id,
gboolean mcd_connection_remote_avatar_changed (McdConnection *connection,
guint contact_id,
const gchar *token);
-void mcd_connection_restart (McdConnection *connection) G_GNUC_DEPRECATED;
void mcd_connection_set_reconnect (McdConnection *connection,
gboolean reconnect);
--
1.5.6.5
More information about the Telepathy-commits
mailing list