summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--gio/gfile.override19
2 files changed, 14 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index eb98ec6..7d6dcef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-14 Gian Mario Tagliaretti <gianmt@gnome.org>
+
+ * gio/gfile.override: (_wrap_g_file_copy_async) change argument order
+ to keep it consistent with the other methods.
+
2009-04-13 Paul Pogonyshev <pogonyshev@gmx.net>
Bug 578870 – memory leak in gio.File.copy_async
diff --git a/gio/gfile.override b/gio/gfile.override
index 99c6395..52fc263 100644
--- a/gio/gfile.override
+++ b/gio/gfile.override
@@ -589,10 +589,9 @@ _wrap_g_file_copy_async(PyGObject *self,
PyObject *args,
PyObject *kwargs)
{
- /* FIXME: Double-check argument order. */
- static char *kwlist[] = { "destination", "callback", "flags", "io_priority",
- "user_data", "cancellable", "progress_callback",
- "progress_callback_data", NULL };
+ static char *kwlist[] = { "destination", "callback", "progress_callback",
+ "flags", "io_priority", "cancellable",
+ "user_data", "progress_callback_data", NULL };
PyGIONotify *notify, *progress_notify;
PyObject *py_flags = NULL;
PyGObject *destination = NULL;
@@ -609,16 +608,16 @@ _wrap_g_file_copy_async(PyGObject *self,
progress_notify = pygio_notify_new_slave(notify);
if (!PyArg_ParseTupleAndKeywords(args, kwargs,
- "O!O|OiOOOO:File.copy_async",
+ "O!O|OOiOOO:File.copy_async",
kwlist,
- &PyGFile_Type,
- &destination,
+ &PyGFile_Type,
+ &destination,
&notify->callback,
- &py_flags,
+ &progress_notify->callback,
+ &py_flags,
&io_priority,
- &notify->data,
&pycancellable,
- &progress_notify->callback,
+ &notify->data,
&progress_notify->data))
goto error;