diff options
-rw-r--r-- | libempathy/empathy-utils.c | 110 | ||||
-rw-r--r-- | libempathy/empathy-utils.h | 5 |
2 files changed, 0 insertions, 115 deletions
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index c025f26da..325cd6ca6 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -414,116 +414,6 @@ empathy_channel_get_account (TpChannel *channel) return account; } -typedef void (*AccountStatusChangedFunc) (MissionControl *mc, - TpConnectionStatus status, - McPresence presence, - TpConnectionStatusReason reason, - const gchar *unique_name, - gpointer user_data); - -typedef struct { - AccountStatusChangedFunc handler; - gpointer user_data; - GClosureNotify free_func; - MissionControl *mc; -} AccountStatusChangedData; - -typedef struct { - TpConnectionStatus status; - McPresence presence; - TpConnectionStatusReason reason; - gchar *unique_name; - AccountStatusChangedData *data; -} InvocationData; - -static void -account_status_changed_data_free (gpointer ptr, - GClosure *closure) -{ - AccountStatusChangedData *data = ptr; - - if (data->free_func) { - data->free_func (data->user_data, closure); - } - g_object_unref (data->mc); - g_slice_free (AccountStatusChangedData, data); -} - -static gboolean -account_status_changed_invoke_callback (gpointer data) -{ - InvocationData *invocation_data = data; - - invocation_data->data->handler (invocation_data->data->mc, - invocation_data->status, - invocation_data->presence, - invocation_data->reason, - invocation_data->unique_name, - invocation_data->data->user_data); - - g_free (invocation_data->unique_name); - g_slice_free (InvocationData, invocation_data); - - return FALSE; -} - -static void -account_status_changed_cb (MissionControl *mc, - TpConnectionStatus status, - McPresence presence, - TpConnectionStatusReason reason, - const gchar *unique_name, - AccountStatusChangedData *data) -{ - InvocationData *invocation_data; - - invocation_data = g_slice_new (InvocationData); - invocation_data->status = status; - invocation_data->presence = presence; - invocation_data->reason = reason; - invocation_data->unique_name = g_strdup (unique_name); - invocation_data->data = data; - - g_idle_add_full (G_PRIORITY_HIGH, - account_status_changed_invoke_callback, - invocation_data, NULL); -} - -gpointer -empathy_connect_to_account_status_changed (MissionControl *mc, - GCallback handler, - gpointer user_data, - GClosureNotify free_func) -{ - AccountStatusChangedData *data; - - g_return_val_if_fail (IS_MISSIONCONTROL (mc), NULL); - g_return_val_if_fail (handler != NULL, NULL); - - data = g_slice_new (AccountStatusChangedData); - data->handler = (AccountStatusChangedFunc) handler; - data->user_data = user_data; - data->free_func = free_func; - data->mc = g_object_ref (mc); - - dbus_g_proxy_connect_signal (DBUS_G_PROXY (mc), "AccountStatusChanged", - G_CALLBACK (account_status_changed_cb), - data, account_status_changed_data_free); - - return data; -} - -void -empathy_disconnect_account_status_changed (gpointer token) -{ - AccountStatusChangedData *data = token; - - dbus_g_proxy_disconnect_signal (DBUS_G_PROXY (data->mc), - "AccountStatusChanged", - G_CALLBACK (account_status_changed_cb), - data); -} - guint empathy_proxy_hash (gconstpointer key) { diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h index 9147b6991..3175f23aa 100644 --- a/libempathy/empathy-utils.h +++ b/libempathy/empathy-utils.h @@ -84,11 +84,6 @@ void empathy_run_until_ready_full (gpointer object, gpointer user_data, GMainLoop **loop); McAccount * empathy_channel_get_account (TpChannel *channel); -gpointer empathy_connect_to_account_status_changed (MissionControl *mc, - GCallback handler, - gpointer user_data, - GClosureNotify free_func); -void empathy_disconnect_account_status_changed (gpointer token); gboolean empathy_proxy_equal (gconstpointer a, gconstpointer b); guint empathy_proxy_hash (gconstpointer key); |