luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 10:42:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

GDBusConnection: Don't store GCancellable in qdata

Browse Source 
Now that we're using g_simple_async_result_set_check_cancellable() we
no longer need this terrible hack of carrying the GCancellable on the
GSimpleAsyncResult using qdata. See bug 672013 for more details.

https://bugzilla.gnome.org/show_bug.cgi?id=672013

Signed-off-by: David Zeuthen <davidz@redhat.com>
This commit is contained in:
David Zeuthen 2012-03-15 14:04:39 -04:00
parent e3c7fdd7a4
commit f025c9c4f4
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gio/gdbusconnection.c
View File

@ -1954,10 +1954,6 @@ g_dbus_connection_send_message_with_reply_unlocked (GDBusConnection *connect
G_CALLBACK (send_message_with_reply_cancelled_cb), G_CALLBACK (send_message_with_reply_cancelled_cb),
send_message_data_ref (data), send_message_data_ref (data),
(GDestroyNotify) send_message_data_unref); (GDestroyNotify) send_message_data_unref);
g_object_set_data_full (G_OBJECT (simple),
"cancellable",
g_object_ref (cancellable),
(GDestroyNotify) g_object_unref);
} }
if (timeout_msec != G_MAXINT) if (timeout_msec != G_MAXINT)
@ -2078,7 +2074,6 @@ g_dbus_connection_send_message_with_reply_finish (GDBusConnection *connection,
{ {
GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res); GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
GDBusMessage *reply; GDBusMessage *reply;
GCancellable *cancellable;
g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL); g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL);
@ -2091,16 +2086,7 @@ g_dbus_connection_send_message_with_reply_finish (GDBusConnection *connection,
goto out; goto out;
reply = g_object_ref (g_simple_async_result_get_op_res_gpointer (simple)); reply = g_object_ref (g_simple_async_result_get_op_res_gpointer (simple));
cancellable = g_object_get_data (G_OBJECT (simple), "cancellable");
if (cancellable != NULL && g_cancellable_is_cancelled (cancellable))
{
g_object_unref (reply);
reply = NULL;
g_set_error_literal (error,
G_IO_ERROR,
G_IO_ERROR_CANCELLED,
_("Operation was cancelled"));
}
out: out:
return reply; return reply;
} }