diff options
| author | Johan Dahlin <johan@gnome.org> | 2008-08-06 14:26:42 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2008-08-06 14:26:42 +0000 |
| commit | f7a82eba4709a1671a75b01557e60ac189ced5a1 (patch) | |
| tree | e238f77d008cef1117084d004d03afe650d36f7f | |
| parent | 6bed68913d23d49ea7a774a9e7daebd2e3624b96 (diff) | |
| download | pygobject-f7a82eba4709a1671a75b01557e60ac189ced5a1.tar.gz pygobject-f7a82eba4709a1671a75b01557e60ac189ced5a1.tar.xz pygobject-f7a82eba4709a1671a75b01557e60ac189ced5a1.zip | |
Move the progress callback for move/copy so it's consistent with the
2008-08-06 Johan Dahlin <johan@gnome.org>
* gio/gfile.override:
* gio/gio.defs:
Move the progress callback for move/copy so it's consistent with
the documentation and positional arguments. Update documentation as well
svn path=/trunk/; revision=928
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gio/gfile.override | 12 | ||||
| -rw-r--r-- | gio/gio.defs | 2 |
3 files changed, 15 insertions, 6 deletions
@@ -1,5 +1,12 @@ 2008-08-06 Johan Dahlin <johan@gnome.org> + * gio/gfile.override: + * gio/gio.defs: + Move the progress callback for move/copy so it's consistent with + the documentation and positional arguments. Update documentation as well + +2008-08-06 Johan Dahlin <johan@gnome.org> + * glib/pyglib.c (pyglib_enable_threads): * gobject/gobjectmodule.c (pyg_threads_init), (pygobject_enable_threads): diff --git a/gio/gfile.override b/gio/gfile.override index 19d8681..24785b6 100644 --- a/gio/gfile.override +++ b/gio/gfile.override @@ -1,4 +1,4 @@ -%%/* -*- Mode: C; c-basic-offset: 4 -*- +/* -*- Mode: C; c-basic-offset: 4 -*- * pygobject - Python bindings for GObject * Copyright (C) 2008 Johan Dahlin * @@ -53,7 +53,7 @@ file_progress_callback_marshal(goffset current_num_bytes, Py_DECREF(notify->callback); Py_XDECREF(notify->data); g_slice_free(PyGIONotify, notify); - + pyg_gil_state_release(state); } %% @@ -517,8 +517,8 @@ _wrap_g_file_copy(PyGObject *self, PyObject *args, PyObject *kwargs) { - static char *kwlist[] = { "destination", "flags", - "cancellable", "progress_callback", + static char *kwlist[] = { "destination", "progress_callback", + "flags", "cancellable", "user_data", NULL }; PyGIONotify *notify; PyObject *py_flags = NULL; @@ -587,8 +587,8 @@ _wrap_g_file_move(PyGObject *self, PyObject *args, PyObject *kwargs) { - static char *kwlist[] = { "destination", "flags", - "cancellable", "progress_callback", + static char *kwlist[] = { "destination", "progress_callback", + "flags", "cancellable", "user_data", NULL }; PyGIONotify *notify; PyObject *py_flags = NULL; diff --git a/gio/gio.defs b/gio/gio.defs index 0f4b904..d11eeb5 100644 --- a/gio/gio.defs +++ b/gio/gio.defs @@ -1710,6 +1710,7 @@ (define-method copy (docstring +"F.copy(destination, [callback, flags, cancellable, user_data])\n" "Copies the file source to the location specified by destination.\n" "Can not handle recursive copies of directories.\n" "\n" @@ -1762,6 +1763,7 @@ (define-method move (docstring +"F.move(destination, [callback, flags, cancellable, user_data])\n" "Tries to move the file or directory source to the location\n" "specified by destination. If native move operations are\n" "supported then this is used, otherwise a copy + delete fallback\n" |