pygobject r928 - in trunk: . gio

[johan svn gnome org]

Author: johan
Date: Wed Aug  6 14:26:42 2008
New Revision: 928
URL: http://svn.gnome.org/viewvc/pygobject?rev=928&view=rev

Log:
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



Modified:
   trunk/ChangeLog
   trunk/gio/gfile.override
   trunk/gio/gio.defs

Modified: trunk/gio/gfile.override
==============================================================================
--- trunk/gio/gfile.override	(original)
+++ trunk/gio/gfile.override	Wed Aug  6 14:26:42 2008
@@ -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 @@
     Py_DECREF(notify->callback);
     Py_XDECREF(notify->data);
     g_slice_free(PyGIONotify, notify);
-
+    
     pyg_gil_state_release(state);
 }
 %%
@@ -517,8 +517,8 @@
 		  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 @@
 		  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;

Modified: trunk/gio/gio.defs
==============================================================================
--- trunk/gio/gio.defs	(original)
+++ trunk/gio/gio.defs	Wed Aug  6 14:26:42 2008
@@ -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"