Index: Makefile.am =================================================================== RCS file: /cvs/gnome/gedit/bindings/python/Attic/Makefile.am,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 Makefile.am --- Makefile.am 26 Sep 2005 15:45:30 -0000 1.1.2.1 +++ Makefile.am 4 Dec 2005 13:27:07 -0000 @@ -30,13 +30,15 @@ gedit.c: gedit.defs gedit.override --prefix py$* $( $@ BINDING_HEADERS_SRCDIR_IN = \ + gedit/gedit-app.h \ gedit/gedit-document.h \ gedit/gedit-encodings.h \ gedit/gedit-plugin.h \ - gedit/gedit-view.h \ + gedit/gedit-view.h \ gedit/gedit-tab.h \ gedit/gedit-panel.h \ - gedit/gedit-window.h + gedit/gedit-window.h \ + gedit/gedit-help.h BINDING_HEADERS_BUILDDIR_IN = Index: gedit.defs =================================================================== RCS file: /cvs/gnome/gedit/bindings/python/Attic/gedit.defs,v retrieving revision 1.1.2.8 diff -u -p -r1.1.2.8 gedit.defs --- gedit.defs 21 Nov 2005 14:21:58 -0000 1.1.2.8 +++ gedit.defs 4 Dec 2005 13:27:09 -0000 @@ -1,5 +1,12 @@ ;; -*- scheme -*- ; object definitions ... +(define-object App + (in-module "Gedit") + (parent "GObject") + (c-name "GeditApp") + (gtype-id "GEDIT_TYPE_APP") +) + (define-object Document (in-module "Gedit") (parent "GtkSourceBuffer") @@ -48,6 +55,7 @@ (in-module "Gedit") (c-name "GeditSearchFlags") (values + '("dont-set-flags" "GEDIT_SEARCH_DONT_SET_FLAGS") '("entire-word" "GEDIT_SEARCH_ENTIRE_WORD") '("case-sensitive" "GEDIT_SEARCH_CASE_SENSITIVE") ) @@ -100,6 +108,51 @@ ;; ) ) + +;; From ../../gedit/gedit-app.h + +(define-function gedit_app_get_type + (c-name "gedit_app_get_type") + (return-type "GType") +) + +(define-function gedit_app_get_default + (c-name "gedit_app_get_default") + (return-type "GeditApp*") +) + +(define-method create_window + (of-object "GeditApp") + (c-name "gedit_app_create_window") + (return-type "GeditWindow*") +) + +(define-method get_windows + (of-object "GeditApp") + (c-name "gedit_app_get_windows") + (return-type "const-GList*") +) + +(define-method get_active_window + (of-object "GeditApp") + (c-name "gedit_app_get_active_window") + (return-type "GeditWindow*") +) + +(define-method get_documents + (of-object "GeditApp") + (c-name "gedit_app_get_documents") + (return-type "GList*") +) + +(define-method get_views + (of-object "GeditApp") + (c-name "gedit_app_get_views") + (return-type "GList*") +) + + + ;; From ../../gedit/gedit-document.h (define-function gedit_document_error_quark @@ -230,7 +283,7 @@ (return-type "none") (parameters '("const-gchar*" "text") - '("gint" "flags") + '("guint" "flags") ) ) @@ -239,10 +292,16 @@ (c-name "gedit_document_get_search_text") (return-type "gchar*") (parameters - '("gint*" "flags") + '("guint*" "flags") ) ) +(define-method get_can_search_again + (of-object "GeditDocument") + (c-name "gedit_document_get_can_search_again") + (return-type "gboolean") +) + (define-method search_forward (of-object "GeditDocument") (c-name "gedit_document_search_forward") @@ -255,6 +314,17 @@ ) ) +(define-method replace_all + (of-object "GeditDocument") + (c-name "gedit_document_replace_all") + (return-type "gint") + (parameters + '("const-gchar*" "find") + '("const-gchar*" "replace") + '("guint" "flags") + ) +) + (define-method search_backward (of-object "GeditDocument") (c-name "gedit_document_search_backward") @@ -377,7 +447,7 @@ (define-function help_display (c-name "gedit_help_display") - (return-type "none") + (return-type "gboolean") (parameters '("GtkWindow*" "parent") '("const-gchar*" "file_name") Index: gedit.override =================================================================== RCS file: /cvs/gnome/gedit/bindings/python/Attic/gedit.override,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 gedit.override --- gedit.override 29 Sep 2005 20:01:16 -0000 1.1.2.2 +++ gedit.override 4 Dec 2005 13:27:09 -0000 @@ -5,16 +5,17 @@ headers #include #include "gedit-plugin.h" +#include "gedit-app.h" #include "gedit-encodings.h" void pygedit_register_classes (PyObject *d); void pygedit_add_constants (PyObject *module, const gchar *strip_prefix); static PyObject * -_helper_wrap_gobject_glist (GList *list) +_helper_wrap_gobject_glist (const GList *list) { PyObject *py_list; - GList *tmp; + const GList *tmp; if ((py_list = PyList_New(0)) == NULL) { return NULL; @@ -49,6 +50,52 @@ ignore-glob gedit_document_error_quark gedit_panel_add_item_with_stock_icon %% +override gedit_app_get_windows +static PyObject * +_wrap_gedit_app_get_windows(PyGObject *self) +{ + const GList *list; + PyObject *py_list; + + list = gedit_app_get_windows (GEDIT_APP (self->obj)); + + py_list = _helper_wrap_gobject_glist (list); + + return py_list; +} +%% +override gedit_app_get_views +static PyObject * +_wrap_gedit_app_get_views(PyGObject *self) +{ + GList *list; + PyObject *py_list; + + list = gedit_app_get_views (GEDIT_APP (self->obj)); + + py_list = _helper_wrap_gobject_glist (list); + + g_list_free (list); + + return py_list; +} +%% +override gedit_app_get_documents +static PyObject * +_wrap_gedit_app_get_documents(PyGObject *self) +{ + GList *list; + PyObject *py_list; + + list = gedit_app_get_documents (GEDIT_APP (self->obj)); + + py_list = _helper_wrap_gobject_glist (list); + + g_list_free (list); + + return py_list; +} +%% override gedit_window_get_documents static PyObject * _wrap_gedit_window_get_documents(PyGObject *self) @@ -86,23 +133,23 @@ static PyObject * _wrap_gedit_document_get_search_text(PyGObject *self) { PyObject *tuple, *string; - gint flags = NULL; - gchar *ret; - + guint flags; + gchar *ret; + ret = gedit_document_get_search_text (GEDIT_DOCUMENT (self->obj), &flags); - + tuple = PyTuple_New(2); - if (ret) { - string = PyString_FromString(ret); - PyTuple_SetItem(tuple, 0, string); - Py_DECREF(string); - } else { - PyTuple_SetItem(tuple, 0, Py_None); - } - PyTuple_SetItem(tuple, 1, PyInt_FromLong(flags)); - - g_free(ret); - + if (ret) { + string = PyString_FromString(ret); + PyTuple_SetItem(tuple, 0, string); + Py_DECREF(string); + } else { + PyTuple_SetItem(tuple, 0, Py_None); + } + PyTuple_SetItem(tuple, 1, PyInt_FromLong(flags)); + + g_free(ret); + return tuple; } %%