[Xfce4-commits] <pyxfce:master> prepare PyXfce for Xfce 4.8.
Danny Milosavljevic
noreply at xfce.org
Sun Jan 2 20:34:01 CET 2011
Updating branch refs/heads/master
to 5ccce1e7e29304735b8074843b8aece1017feb43 (commit)
from c397903391346d2078219ba03488f2ffa27cac6c (commit)
commit 5ccce1e7e29304735b8074843b8aece1017feb43
Author: Danny Milosavljevic <dannym at xfce.org>
Date: Sun Jan 2 20:23:55 2011 +0100
prepare PyXfce for Xfce 4.8.
Makefile.am | 4 +-
__init__.py | 2 +-
configure.ac | 11 +-
gui/GET_FUNCTIONS | 7 -
gui/Makefile.am | 116 ---
gui/TODO | 2 -
gui/aboutdialog.c | 364 ---------
gui/aboutdialog.defs | 306 --------
gui/aboutdialog.override | 26 -
gui/appmenuitem.c | 410 ----------
gui/appmenuitem.defs | 175 -----
gui/appmenuitem.override | 26 -
gui/clock.c | 386 ----------
gui/clock.defs | 175 -----
gui/clock.override | 33 -
gui/colorbutton.c | 77 --
gui/colorbutton.defs | 87 ---
gui/colorbutton.override | 23 -
gui/decorbutton.c | 161 ----
gui/decorbutton.defs | 39 -
gui/decorbutton.override | 30 -
gui/decortoggle.c | 209 -----
gui/decortoggle.defs | 59 --
gui/decortoggle.override | 29 -
gui/dialogs.c | 279 -------
gui/dialogs.defs | 223 ------
gui/filechooser.c | 70 --
gui/filechooser.defs | 267 -------
gui/filechooser.override | 26 -
gui/framebox.c | 171 -----
gui/framebox.defs | 39 -
gui/framebox.override | 29 -
gui/gdk-extensions.defs | 78 --
gui/gdk_extensions.c | 141 ----
gui/gdk_extensions.defs | 78 --
gui/gen | 119 ---
gui/gtk-extensions.defs | 26 -
gui/gtk_extensions.c | 116 ---
gui/gtk_extensions.defs | 26 -
gui/gtk_style.c | 108 ---
gui/gtk_style.defs | 44 --
gui/gtk_style.override | 24 -
gui/gtktoxevent.c | 144 ----
gui/gtktoxevent.defs | 110 ---
gui/gtktoxevent.override | 27 -
gui/gui.py | 78 --
gui/guimodule.c | 206 -----
gui/iconbutton.c | 195 -----
gui/iconbutton.defs | 43 --
gui/iconbutton.override | 29 -
gui/icons.c | 228 ------
gui/icons.defs | 144 ----
gui/icons.override | 27 -
gui/icontheme.defs | 171 -----
gui/icontheme.override | 128 ----
gui/libxfcegui4-config.defs | 8 -
gui/libxfcegui4.defs | 8 -
gui/libxfcegui4_config.defs | 8 -
gui/menubutton.c | 237 ------
gui/menubutton.defs | 74 --
gui/menubutton.override | 29 -
gui/movehandler.c | 144 ----
gui/movehandler.defs | 47 --
gui/movehandler.override | 28 -
gui/scaled_image.c | 196 -----
gui/scaled_image.defs | 43 --
gui/scaled_image.override | 30 -
gui/session_client.c | 74 --
gui/session_client.defs | 103 ---
gui/session_client.override | 28 -
gui/sessionclient.c | 218 ------
gui/startup-notification.defs | 42 -
gui/startup-notification.override | 44 --
gui/systemtray.c | 244 ------
gui/systemtray.defs | 55 --
gui/systemtray.override | 106 ---
gui/tests/testaboutdialog.py | 37 -
gui/tests/testappmenuitem.py | 38 -
gui/tests/testdecorbutton.py | 21 -
gui/tests/testdecortoggle.py | 23 -
gui/tests/testfilechooser.py | 9 -
gui/tests/testframebox.py | 24 -
gui/tests/testiconbutton.py | 22 -
gui/tests/testicontheme.py | 22 -
gui/tests/testmenubutton.py | 27 -
gui/tests/testmovehandler.py | 20 -
gui/tests/testscaledimage.py | 23 -
gui/tests/testsessionclient.py | 11 -
gui/tests/testsystemtray.py | 49 --
gui/tests/testtogglebutton.py | 23 -
gui/titled_dialog.defs | 53 --
gui/togglebutton.c | 178 -----
gui/togglebutton.defs | 44 --
gui/togglebutton.override | 28 -
netk/GET_FUNCTIONS | 7 -
netk/Makefile.am | 77 --
netk/application.c | 255 -------
netk/application.defs | 82 --
netk/application.override | 58 --
netk/class_group.c | 273 -------
netk/class_group.defs | 92 ---
netk/class_group.override | 63 --
netk/enum_types.c | 55 --
netk/enum_types.defs | 33 -
netk/enum_types.override | 25 -
netk/gen | 79 --
netk/marshal.defs | 8 -
netk/netkmodule.c | 146 ----
netk/pager.c | 251 -------
netk/pager.defs | 93 ---
netk/pager.override | 27 -
netk/screen.c | 465 ------------
netk/screen.defs | 180 -----
netk/screen.override | 144 ----
netk/tasklist.c | 332 --------
netk/tasklist.defs | 144 ----
netk/tasklist.override | 46 --
netk/template.override | 23 -
netk/tests/getbackground.py | 44 --
netk/tests/iwindowlist.py | 57 --
netk/tests/netkwindowgettwice.py | 9 -
netk/tests/testtrayicon.py | 18 -
netk/trayicon.c | 239 ------
netk/trayicon.defs | 54 --
netk/trayicon.override | 89 ---
netk/util.c | 71 --
netk/util.defs | 250 ------
netk/util.override | 26 -
netk/window.c | 792 --------------------
netk/window.defs | 459 ------------
netk/window.override | 55 --
netk/window_action_menu.c | 74 --
netk/window_action_menu.defs | 16 -
netk/window_action_menu.override | 28 -
netk/window_menu.c | 55 --
netk/window_menu.defs | 16 -
netk/window_menu.override | 23 -
netk/workspace.c | 208 -----
netk/workspace.defs | 77 --
netk/workspace.override | 23 -
panel/Makefile.am | 26 +-
panel/arrow_button.c | 67 ++-
panel/arrow_button.defs | 25 +-
panel/{window.override => convenience.override} | 7 +-
panel/external_plugin.c | 225 +-----
panel/external_plugin.defs | 33 -
panel/external_plugin.override | 103 ---
panel/gen | 43 +-
panel/{arrow_button.override => hvbox.override} | 7 +-
panel/itembar.c | 446 -----------
panel/itembar.defs | 181 -----
panel/panel.py | 38 +-
panel/panelmodule.c | 30 +-
panel/{plugin_iface.override => plugin.override} | 8 +-
panel/plugin_iface.c | 456 -----------
panel/plugin_iface.defs | 184 -----
.../{itembar.override => plugin_provider.override} | 6 +-
panel/window.c | 283 -------
panel/window.defs | 127 ----
panel/xfce-panel-macros-47.h | 449 +++++++++++
ui/Makefile.am | 74 ++
{gui => ui}/dialogs.override | 2 +-
{gui => ui}/gdk_extensions.override | 2 +-
ui/gen | 61 ++
{gui => ui}/gtk_extensions.override | 3 +-
gui/template.override => ui/sm_client.override | 8 +-
{gui => ui}/titled_dialog.override | 3 +-
netk/netk.py => ui/ui.py | 3 +-
ui/uimodule.c | 87 +++
xfconf/binding.c | 70 ++
xfconf/binding.defs | 58 ++
171 files changed, 1004 insertions(+), 16321 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 810c84d..7b3fd10 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,8 +13,8 @@ if HAVE_MIGHTY_MOUSE
SUBDIR_MIGHTY_MOUSE = panel
endif
-SUBDIRS = gui netk util xfconf $(SUBDIR_MIGHTY_MOUSE)
-DIST_SUBDIRS = gui netk util xfconf $(SUBDIR_MIGHTY_MOUSE)
+SUBDIRS = ui util xfconf $(SUBDIR_MIGHTY_MOUSE)
+DIST_SUBDIRS = ui util xfconf $(SUBDIR_MIGHTY_MOUSE)
PLATFORM_VERSION = 4.2
PLATFORM_WIN32 =
diff --git a/__init__.py b/__init__.py
index ab8916f..4dc9cc5 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,5 +1,5 @@
-__all__ = [ "gui", "menu", "netk", "panel", "util" ]
+__all__ = [ "ui", "menu", "panel", "util", "xfconf" ]
#import util
#import gui
diff --git a/configure.ac b/configure.ac
index fe10f1e..2d63d0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,13 +44,13 @@ export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec)
BM_DEPEND([XFCE4_UTIL], [libxfce4util-1.0], [4.1.0])
BM_DEPEND([XFCE4_XFCONF], [libxfconf-0], [4.6.2])
-BM_DEPEND([XFCE4_GUI], [libxfcegui4-1.0], [4.3.90])
+BM_DEPEND([XFCE4_UI], [libxfce4ui-1], [4.7.5])
-# new panel
+dnl new panel
-# HAVE_MIGHTY_MOUSE
+dnl HAVE_MIGHTY_MOUSE
-BM_DEPEND_CHECK([MIGHTY_MOUSE], [libxfce4panel-1.0], [4.3.17], [mighty-mouse], [the new panel], [yes])
+BM_DEPEND_CHECK([MIGHTY_MOUSE], [libxfce4panel-1.0], [4.7.6], [mighty-mouse], [the new panel], [yes])
dnl AM_CONDITIONAL([HAVE_MIGHTY_MOUSE], [test x"$ac_cv_MIGHTY_MOUSE_check" = x"yes"])
AM_CONDITIONAL([HAVE_MIGHTY_MOUSE], [test ! -z "$MIGHTY_MOUSE_FOUND" ])
@@ -84,8 +84,7 @@ dnl codegen/Makefile
AC_CONFIG_FILES(
Makefile
pyxfce-1.0.pc
- gui/Makefile
- netk/Makefile
+ ui/Makefile
panel/Makefile
util/Makefile
xfconf/Makefile
diff --git a/gui/GET_FUNCTIONS b/gui/GET_FUNCTIONS
deleted file mode 100644
index 00d23aa..0000000
--- a/gui/GET_FUNCTIONS
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-cat *.c |grep _functions |grep "{" |sed 's; = {;;' |sed 's@^\(.*\)$@extern \1;@'
-cat *.c |grep _classes |grep -v ";" |sed 's@^\(.*\)$@void \1;@' |grep -v "/\*"
-
-
-
diff --git a/gui/Makefile.am b/gui/Makefile.am
deleted file mode 100644
index 04c56da..0000000
--- a/gui/Makefile.am
+++ /dev/null
@@ -1,116 +0,0 @@
- at SET_MAKE@
-
-PLATFORM_VERSION = 4.2
-
-CODEGEN_PATH = @CODEGEN_PATH@
-
-common_ldflags = -module -avoid-version -export-symbols-regex init_gui
-if PLATFORM_WIN32
-common_ldflags += -no-undefined
-endif
-
-INCLUDES = $(PYTHON_INCLUDES)
-
-pyxfceexecdir = $(pyexecdir)/xfce4
-pyxfceexec_LTLIBRARIES = _gui.la
-pyxfceexec_PYTHON = gui.py
-
-_gui_la_CFLAGS = $(XFCE4_GUI_CFLAGS) $(PYTHON_CFLAGS) $(PYGTK_CFLAGS)
-_gui_la_LDFLAGS = $(common_ldflags)
-_gui_la_LIBADD = $(XFCE4_GUI_LIBS)
-#-export-symbols-regex
-_gui_la_SOURCES = \
- aboutdialog.c \
- appmenuitem.c \
- clock.c \
- colorbutton.c \
- decorbutton.c \
- decortoggle.c \
- dialogs.c \
- filechooser.c \
- framebox.c \
- gdk_extensions.c \
- gtk_extensions.c \
- gtk_style.c \
- gtktoxevent.c \
- iconbutton.c \
- icontheme.c \
- icons.c \
- menubutton.c \
- movehandler.c \
- scaled_image.c \
- session_client.c \
- systemtray.c \
- titled_dialog.c \
- togglebutton.c \
- guimodule.c \
- startup-notification.c
-
-defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs
-defs_DATA = \
- aboutdialog.defs \
- appmenuitem.defs \
- clock.defs \
- colorbutton.defs \
- decorbutton.defs \
- decortoggle.defs \
- dialogs.defs \
- filechooser.defs \
- framebox.defs \
- gdk_extensions.defs \
- gtk_extensions.defs \
- gtk_style.defs \
- gtktoxevent.defs \
- iconbutton.defs \
- icontheme.defs \
- icons.defs \
- menubutton.defs \
- movehandler.defs \
- scaled_image.defs \
- session_client.defs \
- systemtray.defs \
- titled_dialog.defs \
- togglebutton.defs \
- startup-notification.defs
-
-gui_overrides = aboutdialog.override framebox.override menubutton.override \
-appmenuitem.override gdk_extensions.override movehandler.override \
-clock.override gtk_extensions.override scaled_image.override \
-colorbutton.override gtk_style.override session_client.override \
-decorbutton.override gtktoxevent.override systemtray.override \
-decortoggle.override iconbutton.override template.override \
-dialogs.override icons.override togglebutton.override \
-filechooser.override startup-notification.override icontheme.override \
-titled_dialog.override
-
-
-EXTRA_DIST = $(defs_DATA) $(gui_overrides) gen
-
-nodist__gui_la_SOURCES =
-
-PYGTK_DEFS="`pkg-config --variable=defsdir pygtk-2.0`"
-
-.defs.c:
- (cd $(srcdir) \
- && $(PYTHON) $(CODEGEN_PATH)/codegen.py \
- $(PYGTK_CODEGEN_DEFINES) \
- --override $*.override \
- --register $(PYGTK_DEFS)/gtk-types.defs \
- --register $(PYGTK_DEFS)/gdk-types.defs \
- --register ../util/desktopentry.defs \
- --prefix py$* $*.defs) > gen-$*.c \
- && cp gen-$*.c $*.c \
- && rm -f gen-$*.c
-
-startup-notification.c: startup-notification.defs
- (cd $(srcdir) \
- && $(PYTHON) $(CODEGEN_PATH)/codegen.py \
- $(PYGTK_CODEGEN_DEFINES) \
- --override $*.override \
- --register $(PYGTK_DEFS)/gtk-types.defs \
- --register $(PYGTK_DEFS)/gdk-types.defs \
- --register ../util/desktopentry.defs \
- --prefix pystartup_notification $*.defs) > gen-$*.c \
- && cp gen-$*.c $*.c \
- && rm -f gen-$*.c
-
diff --git a/gui/TODO b/gui/TODO
deleted file mode 100644
index 955eb60..0000000
--- a/gui/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-preview filesel after its fixed
-gtktoxevent close_event_filter, init_event_filter, ....
diff --git a/gui/aboutdialog.c b/gui/aboutdialog.c
deleted file mode 100644
index ab70dfd..0000000
--- a/gui/aboutdialog.c
+++ /dev/null
@@ -1,364 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "aboutdialog.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <gtk/gtkdialog.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#line 14 "aboutdialog.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGtkDialog_Type;
-#define PyGtkDialog_Type (*_PyGtkDialog_Type)
-static PyTypeObject *_PyGdkPixbuf_Type;
-#define PyGdkPixbuf_Type (*_PyGdkPixbuf_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceAboutDialog_Type;
-
-#line 29 "aboutdialog.c"
-
-
-
-/* ----------- XfceAboutDialog ----------- */
-
-static int
-_wrap_xfce_about_dialog_new_empty(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char* kwlist[] = { NULL };
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, ":aboutdialog.AboutDialog.__init__", kwlist))
- return -1;
-
- pygobject_constructv(self, 0, NULL);
-
- if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create %(typename)s object");
- return -1;
- }
-
- return 0;
-}
-
-
-static PyObject *
-_wrap_xfce_about_dialog_set_program(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "value", NULL };
- char *value;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceAboutDialog.set_program", kwlist, &value))
- return NULL;
- xfce_about_dialog_set_program(XFCE_ABOUT_DIALOG(self->obj), value);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_about_dialog_set_version(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "value", NULL };
- char *value;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceAboutDialog.set_version", kwlist, &value))
- return NULL;
- xfce_about_dialog_set_version(XFCE_ABOUT_DIALOG(self->obj), value);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_about_dialog_set_description(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "value", NULL };
- char *value;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceAboutDialog.set_description", kwlist, &value))
- return NULL;
- xfce_about_dialog_set_description(XFCE_ABOUT_DIALOG(self->obj), value);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_about_dialog_set_copyright(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "value", NULL };
- char *value;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceAboutDialog.set_copyright", kwlist, &value))
- return NULL;
- xfce_about_dialog_set_copyright(XFCE_ABOUT_DIALOG(self->obj), value);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_about_dialog_set_license(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "value", NULL };
- char *value;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceAboutDialog.set_license", kwlist, &value))
- return NULL;
- xfce_about_dialog_set_license(XFCE_ABOUT_DIALOG(self->obj), value);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_about_dialog_set_homepage(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "value", NULL };
- char *value;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceAboutDialog.set_homepage", kwlist, &value))
- return NULL;
- xfce_about_dialog_set_homepage(XFCE_ABOUT_DIALOG(self->obj), value);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_about_dialog_set_icon(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "icon", NULL };
- PyGObject *icon;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:XfceAboutDialog.set_icon", kwlist, &PyGdkPixbuf_Type, &icon))
- return NULL;
- xfce_about_dialog_set_icon(XFCE_ABOUT_DIALOG(self->obj), GDK_PIXBUF(icon->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_about_dialog_add_credit(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "name", "mail", "task", NULL };
- char *name, *mail, *task;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sss:XfceAboutDialog.add_credit", kwlist, &name, &mail, &task))
- return NULL;
- xfce_about_dialog_add_credit(XFCE_ABOUT_DIALOG(self->obj), name, mail, task);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_about_dialog_get_program(PyGObject *self)
-{
- const gchar *ret;
-
- ret = xfce_about_dialog_get_program(XFCE_ABOUT_DIALOG(self->obj));
- if (ret)
- return PyString_FromString(ret);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_about_dialog_get_version(PyGObject *self)
-{
- const gchar *ret;
-
- ret = xfce_about_dialog_get_version(XFCE_ABOUT_DIALOG(self->obj));
- if (ret)
- return PyString_FromString(ret);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_about_dialog_get_description(PyGObject *self)
-{
- const gchar *ret;
-
- ret = xfce_about_dialog_get_description(XFCE_ABOUT_DIALOG(self->obj));
- if (ret)
- return PyString_FromString(ret);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_about_dialog_get_copyright(PyGObject *self)
-{
- const gchar *ret;
-
- ret = xfce_about_dialog_get_copyright(XFCE_ABOUT_DIALOG(self->obj));
- if (ret)
- return PyString_FromString(ret);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_about_dialog_get_license(PyGObject *self)
-{
- const gchar *ret;
-
- ret = xfce_about_dialog_get_license(XFCE_ABOUT_DIALOG(self->obj));
- if (ret)
- return PyString_FromString(ret);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_about_dialog_get_homepage(PyGObject *self)
-{
- const gchar *ret;
-
- ret = xfce_about_dialog_get_homepage(XFCE_ABOUT_DIALOG(self->obj));
- if (ret)
- return PyString_FromString(ret);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_about_dialog_get_icon(PyGObject *self)
-{
- GdkPixbuf *ret;
-
- ret = xfce_about_dialog_get_icon(XFCE_ABOUT_DIALOG(self->obj));
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyMethodDef _PyXfceAboutDialog_methods[] = {
- { "set_program", (PyCFunction)_wrap_xfce_about_dialog_set_program, METH_VARARGS|METH_KEYWORDS },
- { "set_version", (PyCFunction)_wrap_xfce_about_dialog_set_version, METH_VARARGS|METH_KEYWORDS },
- { "set_description", (PyCFunction)_wrap_xfce_about_dialog_set_description, METH_VARARGS|METH_KEYWORDS },
- { "set_copyright", (PyCFunction)_wrap_xfce_about_dialog_set_copyright, METH_VARARGS|METH_KEYWORDS },
- { "set_license", (PyCFunction)_wrap_xfce_about_dialog_set_license, METH_VARARGS|METH_KEYWORDS },
- { "set_homepage", (PyCFunction)_wrap_xfce_about_dialog_set_homepage, METH_VARARGS|METH_KEYWORDS },
- { "set_icon", (PyCFunction)_wrap_xfce_about_dialog_set_icon, METH_VARARGS|METH_KEYWORDS },
- { "add_credit", (PyCFunction)_wrap_xfce_about_dialog_add_credit, METH_VARARGS|METH_KEYWORDS },
- { "get_program", (PyCFunction)_wrap_xfce_about_dialog_get_program, METH_NOARGS },
- { "get_version", (PyCFunction)_wrap_xfce_about_dialog_get_version, METH_NOARGS },
- { "get_description", (PyCFunction)_wrap_xfce_about_dialog_get_description, METH_NOARGS },
- { "get_copyright", (PyCFunction)_wrap_xfce_about_dialog_get_copyright, METH_NOARGS },
- { "get_license", (PyCFunction)_wrap_xfce_about_dialog_get_license, METH_NOARGS },
- { "get_homepage", (PyCFunction)_wrap_xfce_about_dialog_get_homepage, METH_NOARGS },
- { "get_icon", (PyCFunction)_wrap_xfce_about_dialog_get_icon, METH_NOARGS },
- { NULL, NULL, 0 }
-};
-
-PyTypeObject PyXfceAboutDialog_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "aboutdialog.AboutDialog", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceAboutDialog_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_about_dialog_new_empty, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-PyMethodDef pyaboutdialog_functions[] = {
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pyaboutdialog_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkDialog_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Dialog");
- if (_PyGtkDialog_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Dialog from gtk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return;
- }
- if ((module = PyImport_ImportModule("gtk.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkPixbuf_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Pixbuf");
- if (_PyGdkPixbuf_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Pixbuf from gtk.gdk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk.gdk");
- return;
- }
-
-
-#line 362 "aboutdialog.c"
- pygobject_register_class(d, "XfceAboutDialog", XFCE_TYPE_ABOUT_DIALOG, &PyXfceAboutDialog_Type, Py_BuildValue("(O)", &PyGtkDialog_Type));
- pyg_set_object_has_new_constructor(XFCE_TYPE_ABOUT_DIALOG);
-}
diff --git a/gui/aboutdialog.defs b/gui/aboutdialog.defs
deleted file mode 100644
index 23ba278..0000000
--- a/gui/aboutdialog.defs
+++ /dev/null
@@ -1,306 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object AboutDialog
- (in-module "Xfce")
- (parent "GtkDialog")
- (c-name "XfceAboutDialog")
- (gtype-id "XFCE_TYPE_ABOUT_DIALOG")
-)
-
-;; Enumerations and flags ...
-
-
-;; From xfce_aboutdialog.h
-
-(define-function about_info_get_type
- (c-name "xfce_about_info_get_type")
- (return-type "GType")
-)
-
-(define-function about_info_new
- (c-name "xfce_about_info_new")
- (is-constructor-of "XfceAboutInfo")
- (return-type "XfceAboutInfo*")
- (parameters
- '("const-gchar*" "program")
- '("const-gchar*" "version")
- '("const-gchar*" "description")
- '("const-gchar*" "copyright")
- '("const-gchar*" "license")
- )
-)
-
-(define-method copy
- (of-object "XfceAboutInfo")
- (c-name "xfce_about_info_copy")
- (return-type "XfceAboutInfo*")
-)
-
-(define-method free
- (of-object "XfceAboutInfo")
- (c-name "xfce_about_info_free")
- (return-type "none")
-)
-
-(define-method get_program
- (of-object "XfceAboutInfo")
- (c-name "xfce_about_info_get_program")
- (return-type "const-gchar*")
-)
-
-(define-method set_program
- (of-object "XfceAboutInfo")
- (c-name "xfce_about_info_set_program")
- (return-type "none")
- (parameters
- '("const-gchar*" "program")
- )
-)
-
-(define-method get_version
- (of-object "XfceAboutInfo")
- (c-name "xfce_about_info_get_version")
- (return-type "const-gchar*")
-)
-
-(define-method set_version
- (of-object "XfceAboutInfo")
- (c-name "xfce_about_info_set_version")
- (return-type "none")
- (parameters
- '("const-gchar*" "version")
- )
-)
-
-(define-method get_description
- (of-object "XfceAboutInfo")
- (c-name "xfce_about_info_get_description")
- (return-type "const-gchar*")
-)
-
-(define-method set_description
- (of-object "XfceAboutInfo")
- (c-name "xfce_about_info_set_description")
- (return-type "none")
- (parameters
- '("const-gchar*" "description")
- )
-)
-
-(define-method get_copyright
- (of-object "XfceAboutInfo")
- (c-name "xfce_about_info_get_copyright")
- (return-type "const-gchar*")
-)
-
-(define-method set_copyright
- (of-object "XfceAboutInfo")
- (c-name "xfce_about_info_set_copyright")
- (return-type "none")
- (parameters
- '("const-gchar*" "copyright")
- )
-)
-
-(define-method get_license
- (of-object "XfceAboutInfo")
- (c-name "xfce_about_info_get_license")
- (return-type "const-gchar*")
-)
-
-(define-method set_license
- (of-object "XfceAboutInfo")
- (c-name "xfce_about_info_set_license")
- (return-type "none")
- (parameters
- '("const-gchar*" "license")
- )
-)
-
-(define-method get_homepage
- (of-object "XfceAboutInfo")
- (c-name "xfce_about_info_get_homepage")
- (return-type "const-gchar*")
-)
-
-(define-method set_homepage
- (of-object "XfceAboutInfo")
- (c-name "xfce_about_info_set_homepage")
- (return-type "none")
- (parameters
- '("const-gchar*" "homepage")
- )
-)
-
-(define-method add_credit
- (of-object "XfceAboutInfo")
- (c-name "xfce_about_info_add_credit")
- (return-type "none")
- (parameters
- '("const-gchar*" "name")
- '("const-gchar*" "mail")
- '("const-gchar*" "task")
- )
-)
-
-(define-function about_dialog_get_type
- (c-name "xfce_about_dialog_get_type")
- (return-type "GType")
-)
-
-(define-function about_dialog_new_with_values
- (c-name "xfce_about_dialog_new_with_values")
- (return-type "GtkWidget*")
- (parameters
- '("GtkWindow*" "parent")
- '("const-XfceAboutInfo*" "info")
- '("GdkPixbuf*" "icon")
- )
-)
-
-(define-function about_dialog_new
- (c-name "xfce_about_dialog_new")
- (return-type "GtkWidget*")
- (parameters
- '("GtkWindow*" "parent")
- '("const-XfceAboutInfo*" "info")
- '("GdkPixbuf*" "icon")
- )
-)
-
-(define-function about_dialog_new_empty
- (c-name "xfce_about_dialog_new_empty")
- (is-constructor-of "XfceAboutDialog")
- (return-type "GtkWidget*")
-)
-
-(define-method set_program
- (of-object "XfceAboutDialog")
- (c-name "xfce_about_dialog_set_program")
- (return-type "none")
- (parameters
- '("const-gchar*" "value")
- )
-)
-
-(define-method set_version
- (of-object "XfceAboutDialog")
- (c-name "xfce_about_dialog_set_version")
- (return-type "none")
- (parameters
- '("const-gchar*" "value")
- )
-)
-
-(define-method set_description
- (of-object "XfceAboutDialog")
- (c-name "xfce_about_dialog_set_description")
- (return-type "none")
- (parameters
- '("const-gchar*" "value")
- )
-)
-
-(define-method set_copyright
- (of-object "XfceAboutDialog")
- (c-name "xfce_about_dialog_set_copyright")
- (return-type "none")
- (parameters
- '("const-gchar*" "value")
- )
-)
-
-(define-method set_license
- (of-object "XfceAboutDialog")
- (c-name "xfce_about_dialog_set_license")
- (return-type "none")
- (parameters
- '("const-gchar*" "value")
- )
-)
-
-(define-method set_homepage
- (of-object "XfceAboutDialog")
- (c-name "xfce_about_dialog_set_homepage")
- (return-type "none")
- (parameters
- '("const-gchar*" "value")
- )
-)
-
-(define-method set_icon
- (of-object "XfceAboutDialog")
- (c-name "xfce_about_dialog_set_icon")
- (return-type "none")
- (parameters
- '("GdkPixbuf*" "icon")
- )
-)
-
-(define-method add_credit
- (of-object "XfceAboutDialog")
- (c-name "xfce_about_dialog_add_credit")
- (return-type "none")
- (parameters
- '("const-gchar*" "name")
- '("const-gchar*" "mail")
- '("const-gchar*" "task")
- )
-)
-
-(define-method get_program
- (of-object "XfceAboutDialog")
- (c-name "xfce_about_dialog_get_program")
- (return-type "const-gchar*")
-)
-
-(define-method get_version
- (of-object "XfceAboutDialog")
- (c-name "xfce_about_dialog_get_version")
- (return-type "const-gchar*")
-)
-
-(define-method get_description
- (of-object "XfceAboutDialog")
- (c-name "xfce_about_dialog_get_description")
- (return-type "const-gchar*")
-)
-
-(define-method get_copyright
- (of-object "XfceAboutDialog")
- (c-name "xfce_about_dialog_get_copyright")
- (return-type "const-gchar*")
-)
-
-(define-method get_license
- (of-object "XfceAboutDialog")
- (c-name "xfce_about_dialog_get_license")
- (return-type "const-gchar*")
-)
-
-(define-method get_homepage
- (of-object "XfceAboutDialog")
- (c-name "xfce_about_dialog_get_homepage")
- (return-type "const-gchar*")
-)
-
-(define-method get_icon
- (of-object "XfceAboutDialog")
- (c-name "xfce_about_dialog_get_icon")
- (return-type "GdkPixbuf*")
-)
-
-
-
-(object AboutDialog
- (in-module (Xfce))
- (parent Dialog (Gtk))
- (c-name XfceIconTheme)
- (field (type-and-name gchar* program) (access readwrite))
- (field (type-and-name gchar* version) (access readwrite))
- (field (type-and-name GdkPixbuf* icon) (access readwrite))
- (field (type-and-name gchar* description) (access readwrite))
- (field (type-and-name gchar* copyright) (access readwrite))
- (field (type-and-name gchar* license) (access readwrite))
- (field (type-and-name gchar* homepage) (access readwrite))
-)
diff --git a/gui/aboutdialog.override b/gui/aboutdialog.override
deleted file mode 100644
index 0e01707..0000000
--- a/gui/aboutdialog.override
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <gtk/gtkdialog.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-%%
-include
-%%
-modulename aboutdialog
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.Dialog as PyGtkDialog_Type
-import gtk.gdk.Pixbuf as PyGdkPixbuf_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/gui/appmenuitem.c b/gui/appmenuitem.c
deleted file mode 100644
index 5bdfac8..0000000
--- a/gui/appmenuitem.c
+++ /dev/null
@@ -1,410 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "appmenuitem.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <gtk/gtkdialog.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#line 14 "appmenuitem.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGtkImageMenuItem_Type;
-#define PyGtkImageMenuItem_Type (*_PyGtkImageMenuItem_Type)
-static PyTypeObject *_PyXfceDesktopEntry_Type;
-#define PyXfceDesktopEntry_Type (*_PyXfceDesktopEntry_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceAppMenuItem_Type;
-
-#line 29 "appmenuitem.c"
-
-
-
-/* ----------- XfceAppMenuItem ----------- */
-
-static int
-_wrap_xfce_app_menu_item_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char* kwlist[] = { NULL };
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, ":appmenuitem.AppMenuItem.__init__", kwlist))
- return -1;
-
- pygobject_constructv(self, 0, NULL);
-
- if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create %(typename)s object");
- return -1;
- }
-
- return 0;
-}
-
-
-static PyObject *
-_wrap_xfce_app_menu_item_set_name(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "name", NULL };
- char *name;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceAppMenuItem.set_name", kwlist, &name))
- return NULL;
- xfce_app_menu_item_set_name(XFCE_APP_MENU_ITEM(self->obj), name);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_app_menu_item_set_icon_name(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "filename", NULL };
- char *filename;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceAppMenuItem.set_icon_name", kwlist, &filename))
- return NULL;
- xfce_app_menu_item_set_icon_name(XFCE_APP_MENU_ITEM(self->obj), filename);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_app_menu_item_set_command(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "command", NULL };
- char *command;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceAppMenuItem.set_command", kwlist, &command))
- return NULL;
- xfce_app_menu_item_set_command(XFCE_APP_MENU_ITEM(self->obj), command);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_app_menu_item_set_needs_term(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "needs_term", NULL };
- int needs_term;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:XfceAppMenuItem.set_needs_term", kwlist, &needs_term))
- return NULL;
- xfce_app_menu_item_set_needs_term(XFCE_APP_MENU_ITEM(self->obj), needs_term);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_app_menu_item_set_startup_notification(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "snotify", NULL };
- int snotify;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:XfceAppMenuItem.set_startup_notification", kwlist, &snotify))
- return NULL;
- xfce_app_menu_item_set_startup_notification(XFCE_APP_MENU_ITEM(self->obj), snotify);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_app_menu_item_get_name(PyGObject *self)
-{
- const gchar *ret;
-
- ret = xfce_app_menu_item_get_name(XFCE_APP_MENU_ITEM(self->obj));
- if (ret)
- return PyString_FromString(ret);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_app_menu_item_get_icon_name(PyGObject *self)
-{
- const gchar *ret;
-
- ret = xfce_app_menu_item_get_icon_name(XFCE_APP_MENU_ITEM(self->obj));
- if (ret)
- return PyString_FromString(ret);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_app_menu_item_get_command(PyGObject *self)
-{
- const gchar *ret;
-
- ret = xfce_app_menu_item_get_command(XFCE_APP_MENU_ITEM(self->obj));
- if (ret)
- return PyString_FromString(ret);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_app_menu_item_get_needs_term(PyGObject *self)
-{
- int ret;
-
- ret = xfce_app_menu_item_get_needs_term(XFCE_APP_MENU_ITEM(self->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_xfce_app_menu_item_get_startup_notification(PyGObject *self)
-{
- int ret;
-
- ret = xfce_app_menu_item_get_startup_notification(XFCE_APP_MENU_ITEM(self->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyMethodDef _PyXfceAppMenuItem_methods[] = {
- { "set_name", (PyCFunction)_wrap_xfce_app_menu_item_set_name, METH_VARARGS|METH_KEYWORDS },
- { "set_icon_name", (PyCFunction)_wrap_xfce_app_menu_item_set_icon_name, METH_VARARGS|METH_KEYWORDS },
- { "set_command", (PyCFunction)_wrap_xfce_app_menu_item_set_command, METH_VARARGS|METH_KEYWORDS },
- { "set_needs_term", (PyCFunction)_wrap_xfce_app_menu_item_set_needs_term, METH_VARARGS|METH_KEYWORDS },
- { "set_startup_notification", (PyCFunction)_wrap_xfce_app_menu_item_set_startup_notification, METH_VARARGS|METH_KEYWORDS },
- { "get_name", (PyCFunction)_wrap_xfce_app_menu_item_get_name, METH_NOARGS },
- { "get_icon_name", (PyCFunction)_wrap_xfce_app_menu_item_get_icon_name, METH_NOARGS },
- { "get_command", (PyCFunction)_wrap_xfce_app_menu_item_get_command, METH_NOARGS },
- { "get_needs_term", (PyCFunction)_wrap_xfce_app_menu_item_get_needs_term, METH_NOARGS },
- { "get_startup_notification", (PyCFunction)_wrap_xfce_app_menu_item_get_startup_notification, METH_NOARGS },
- { NULL, NULL, 0 }
-};
-
-PyTypeObject PyXfceAppMenuItem_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "appmenuitem.AppMenuItem", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceAppMenuItem_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_app_menu_item_new, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_xfce_app_menu_item_new_with_label(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "label", NULL };
- char *label;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:app_menu_item_new_with_label", kwlist, &label))
- return NULL;
- ret = xfce_app_menu_item_new_with_label(label);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_xfce_app_menu_item_new_with_mnemonic(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "label", NULL };
- char *label;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:app_menu_item_new_with_mnemonic", kwlist, &label))
- return NULL;
- ret = xfce_app_menu_item_new_with_mnemonic(label);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_xfce_app_menu_item_new_with_command(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "label", "command", NULL };
- char *label, *command;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ss:app_menu_item_new_with_command", kwlist, &label, &command))
- return NULL;
- ret = xfce_app_menu_item_new_with_command(label, command);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_xfce_app_menu_item_new_full(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "label", "command", "icon_filename", "needs_term", "snotify", NULL };
- char *label, *command, *icon_filename;
- int needs_term, snotify;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sssii:app_menu_item_new_full", kwlist, &label, &command, &icon_filename, &needs_term, &snotify))
- return NULL;
- ret = xfce_app_menu_item_new_full(label, command, icon_filename, needs_term, snotify);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_xfce_app_menu_item_new_from_desktop_entry(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "entry", "show_icon", NULL };
- PyGObject *entry;
- int show_icon;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!i:app_menu_item_new_from_desktop_entry", kwlist, &PyXfceDesktopEntry_Type, &entry, &show_icon))
- return NULL;
- ret = xfce_app_menu_item_new_from_desktop_entry(XFCE_DESKTOP_ENTRY(entry->obj), show_icon);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_xfce_app_menu_item_set_icon_size(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "icon_size", NULL };
- PyObject *py_icon_size = NULL;
- guint icon_size = 0;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:app_menu_item_set_icon_size", kwlist, &py_icon_size))
- return NULL;
- if (py_icon_size) {
- if (PyLong_Check(py_icon_size))
- icon_size = PyLong_AsUnsignedLong(py_icon_size);
- else if (PyInt_Check(py_icon_size))
- icon_size = PyInt_AsLong(py_icon_size);
- else
- PyErr_SetString(PyExc_TypeError, "Parameter 'icon_size' must be an int or a long");
- if (PyErr_Occurred())
- return NULL;
- }
- xfce_app_menu_item_set_icon_size(icon_size);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_app_menu_item_set_icon_theme_name(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "theme_name", NULL };
- char *theme_name;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:app_menu_item_set_icon_theme_name", kwlist, &theme_name))
- return NULL;
- xfce_app_menu_item_set_icon_theme_name(theme_name);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-PyMethodDef pyappmenuitem_functions[] = {
- { "app_menu_item_new_with_label", (PyCFunction)_wrap_xfce_app_menu_item_new_with_label, METH_VARARGS|METH_KEYWORDS },
- { "app_menu_item_new_with_mnemonic", (PyCFunction)_wrap_xfce_app_menu_item_new_with_mnemonic, METH_VARARGS|METH_KEYWORDS },
- { "app_menu_item_new_with_command", (PyCFunction)_wrap_xfce_app_menu_item_new_with_command, METH_VARARGS|METH_KEYWORDS },
- { "app_menu_item_new_full", (PyCFunction)_wrap_xfce_app_menu_item_new_full, METH_VARARGS|METH_KEYWORDS },
- { "app_menu_item_new_from_desktop_entry", (PyCFunction)_wrap_xfce_app_menu_item_new_from_desktop_entry, METH_VARARGS|METH_KEYWORDS },
- { "app_menu_item_set_icon_size", (PyCFunction)_wrap_xfce_app_menu_item_set_icon_size, METH_VARARGS|METH_KEYWORDS },
- { "app_menu_item_set_icon_theme_name", (PyCFunction)_wrap_xfce_app_menu_item_set_icon_theme_name, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pyappmenuitem_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("xfce4.util")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyXfceDesktopEntry_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "DesktopEntry");
- if (_PyXfceDesktopEntry_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name DesktopEntry from xfce4.util");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import xfce4.util");
- return;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkImageMenuItem_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "ImageMenuItem");
- if (_PyGtkImageMenuItem_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name ImageMenuItem from gtk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return;
- }
-
-
-#line 408 "appmenuitem.c"
- pygobject_register_class(d, "XfceAppMenuItem", XFCE_TYPE_APP_MENU_ITEM, &PyXfceAppMenuItem_Type, Py_BuildValue("(O)", &PyGtkImageMenuItem_Type));
- pyg_set_object_has_new_constructor(XFCE_TYPE_APP_MENU_ITEM);
-}
diff --git a/gui/appmenuitem.defs b/gui/appmenuitem.defs
deleted file mode 100644
index 19385c7..0000000
--- a/gui/appmenuitem.defs
+++ /dev/null
@@ -1,175 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object AppMenuItem
- (in-module "Xfce")
- (parent "GtkImageMenuItem")
- (c-name "XfceAppMenuItem")
- (gtype-id "XFCE_TYPE_APP_MENU_ITEM")
-)
-
-;; Enumerations and flags ...
-
-
-;; From /usr/local/include/xfce4/libxfcegui4/xfce-appmenuitem.h
-
-(define-function app_menu_item_get_type
- (c-name "xfce_app_menu_item_get_type")
- (return-type "GType")
- (parameters
- )
-)
-
-(define-function app_menu_item_new
- (c-name "xfce_app_menu_item_new")
- (is-constructor-of "XfceAppMenuItem")
- (return-type "GtkWidget*")
- (parameters
- )
-)
-
-(define-function app_menu_item_new_with_label
- (c-name "xfce_app_menu_item_new_with_label")
- (return-type "GtkWidget*")
- (parameters
- '("const-gchar*" "label")
- )
-)
-
-(define-function app_menu_item_new_with_mnemonic
- (c-name "xfce_app_menu_item_new_with_mnemonic")
- (return-type "GtkWidget*")
- (parameters
- '("const-gchar*" "label")
- )
-)
-
-(define-function app_menu_item_new_with_command
- (c-name "xfce_app_menu_item_new_with_command")
- (return-type "GtkWidget*")
- (parameters
- '("const-gchar*" "label")
- '("const-gchar*" "command")
- )
-)
-
-(define-function app_menu_item_new_full
- (c-name "xfce_app_menu_item_new_full")
- (return-type "GtkWidget*")
- (parameters
- '("const-gchar*" "label")
- '("const-gchar*" "command")
- '("const-gchar*" "icon_filename")
- '("gboolean" "needs_term")
- '("gboolean" "snotify")
- )
-)
-
-(define-function app_menu_item_new_from_desktop_entry
- (c-name "xfce_app_menu_item_new_from_desktop_entry")
- (return-type "GtkWidget*")
- (parameters
- '("XfceDesktopEntry*" "entry")
- '("gboolean" "show_icon")
- )
-)
-
-(define-method set_name
- (of-object "XfceAppMenuItem")
- (c-name "xfce_app_menu_item_set_name")
- (return-type "none")
- (parameters
- '("const-gchar*" "name")
- )
-)
-
-(define-method set_icon_name
- (of-object "XfceAppMenuItem")
- (c-name "xfce_app_menu_item_set_icon_name")
- (return-type "none")
- (parameters
- '("const-gchar*" "filename")
- )
-)
-
-(define-method set_command
- (of-object "XfceAppMenuItem")
- (c-name "xfce_app_menu_item_set_command")
- (return-type "none")
- (parameters
- '("const-gchar*" "command")
- )
-)
-
-(define-method set_needs_term
- (of-object "XfceAppMenuItem")
- (c-name "xfce_app_menu_item_set_needs_term")
- (return-type "none")
- (parameters
- '("gboolean" "needs_term")
- )
-)
-
-(define-method set_startup_notification
- (of-object "XfceAppMenuItem")
- (c-name "xfce_app_menu_item_set_startup_notification")
- (return-type "none")
- (parameters
- '("gboolean" "snotify")
- )
-)
-
-(define-method get_name
- (of-object "XfceAppMenuItem")
- (c-name "xfce_app_menu_item_get_name")
- (return-type "const-gchar*")
-)
-
-(define-method get_icon_name
- (of-object "XfceAppMenuItem")
- (c-name "xfce_app_menu_item_get_icon_name")
- (return-type "const-gchar*")
-)
-
-(define-method get_command
- (of-object "XfceAppMenuItem")
- (c-name "xfce_app_menu_item_get_command")
- (return-type "const-gchar*")
-)
-
-(define-method get_needs_term
- (of-object "XfceAppMenuItem")
- (c-name "xfce_app_menu_item_get_needs_term")
- (return-type "gboolean")
-)
-
-(define-method get_startup_notification
- (of-object "XfceAppMenuItem")
- (c-name "xfce_app_menu_item_get_startup_notification")
- (return-type "gboolean")
-)
-
-(define-function app_menu_item_set_icon_size
- (c-name "xfce_app_menu_item_set_icon_size")
- (return-type "none")
- (parameters
- '("guint" "icon_size")
- )
-)
-
-(define-function app_menu_item_set_icon_theme_name
- (c-name "xfce_app_menu_item_set_icon_theme_name")
- (return-type "none")
- (parameters
- '("const-gchar*" "theme_name")
- )
-)
-
-
-(object AppMenuItem
- (in-module (gui))
- (parent Object)
- (c-name XfceAppMenuItem)
- (field (type-and-name gchar* needs_term) (access readwrite))
- (field (type-and-name gchar* command) (access readwrite))
- (field (type-and-name gchar* icon_name) (access readwrite))
-)
diff --git a/gui/appmenuitem.override b/gui/appmenuitem.override
deleted file mode 100644
index 7d91922..0000000
--- a/gui/appmenuitem.override
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <gtk/gtkdialog.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-%%
-include
-%%
-modulename appmenuitem
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.ImageMenuItem as PyGtkImageMenuItem_Type
-import xfce4.util.DesktopEntry as PyXfceDesktopEntry_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/gui/clock-types.defs b/gui/clock-types.defs
deleted file mode 100644
index e69de29..0000000
diff --git a/gui/clock.c b/gui/clock.c
deleted file mode 100644
index 4b97c4f..0000000
--- a/gui/clock.c
+++ /dev/null
@@ -1,386 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "clock.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-#include <libxfcegui4/gui-enum-types.h>
-
-#ifndef XFCE_TYPE_CLOCK
-#define XFCE_TYPE_CLOCK (xfce_clock_get_type ())
-#endif
-
-#define XFCE_TYPE_CLOCK_MODE GUI_TYPE_CLOCK_MODE
-#define XFCE_TYPE_CLOCK_LED_SIZE GUI_TYPE_CLOCK_LED_SIZE
-
-
-#line 22 "clock.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGtkWidget_Type;
-#define PyGtkWidget_Type (*_PyGtkWidget_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceClock_Type;
-
-#line 35 "clock.c"
-
-
-
-/* ----------- XfceClock ----------- */
-
-static int
-_wrap_xfce_clock_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char* kwlist[] = { NULL };
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, ":clock.Clock.__init__", kwlist))
- return -1;
-
- pygobject_constructv(self, 0, NULL);
-
- if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create %(typename)s object");
- return -1;
- }
-
- return 0;
-}
-
-
-static PyObject *
-_wrap_xfce_clock_show_ampm(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "show", NULL };
- int show;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:XfceClock.show_ampm", kwlist, &show))
- return NULL;
- xfce_clock_show_ampm(XFCE_CLOCK(self->obj), show);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_clock_ampm_toggle(PyGObject *self)
-{
- xfce_clock_ampm_toggle(XFCE_CLOCK(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_clock_ampm_shown(PyGObject *self)
-{
- int ret;
-
- ret = xfce_clock_ampm_shown(XFCE_CLOCK(self->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_xfce_clock_show_secs(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "show", NULL };
- int show;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:XfceClock.show_secs", kwlist, &show))
- return NULL;
- xfce_clock_show_secs(XFCE_CLOCK(self->obj), show);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_clock_secs_toggle(PyGObject *self)
-{
- xfce_clock_secs_toggle(XFCE_CLOCK(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_clock_secs_shown(PyGObject *self)
-{
- int ret;
-
- ret = xfce_clock_secs_shown(XFCE_CLOCK(self->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_xfce_clock_show_military(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "show", NULL };
- int show;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:XfceClock.show_military", kwlist, &show))
- return NULL;
- xfce_clock_show_military(XFCE_CLOCK(self->obj), show);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_clock_military_toggle(PyGObject *self)
-{
- xfce_clock_military_toggle(XFCE_CLOCK(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_clock_military_shown(PyGObject *self)
-{
- int ret;
-
- ret = xfce_clock_military_shown(XFCE_CLOCK(self->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_xfce_clock_set_interval(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "interval", NULL };
- PyObject *py_interval = NULL;
- guint interval = 0;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:XfceClock.set_interval", kwlist, &py_interval))
- return NULL;
- if (py_interval) {
- if (PyLong_Check(py_interval))
- interval = PyLong_AsUnsignedLong(py_interval);
- else if (PyInt_Check(py_interval))
- interval = PyInt_AsLong(py_interval);
- else
- PyErr_SetString(PyExc_TypeError, "Parameter 'interval' must be an int or a long");
- if (PyErr_Occurred())
- return NULL;
- }
- xfce_clock_set_interval(XFCE_CLOCK(self->obj), interval);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_clock_get_interval(PyGObject *self)
-{
- guint ret;
-
- ret = xfce_clock_get_interval(XFCE_CLOCK(self->obj));
- return PyLong_FromUnsignedLong(ret);
-}
-
-static PyObject *
-_wrap_xfce_clock_set_led_size(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "size", NULL };
- XfceClockLedSize size;
- PyObject *py_size = NULL;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:XfceClock.set_led_size", kwlist, &py_size))
- return NULL;
- if (pyg_enum_get_value(XFCE_TYPE_CLOCK_LED_SIZE, py_size, (gint *)&size))
- return NULL;
- xfce_clock_set_led_size(XFCE_CLOCK(self->obj), size);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_clock_get_led_size(PyGObject *self)
-{
- gint ret;
-
- ret = xfce_clock_get_led_size(XFCE_CLOCK(self->obj));
- return pyg_enum_from_gtype(XFCE_TYPE_CLOCK_LED_SIZE, ret);
-}
-
-static PyObject *
-_wrap_xfce_clock_suspend(PyGObject *self)
-{
- xfce_clock_suspend(XFCE_CLOCK(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_clock_resume(PyGObject *self)
-{
- xfce_clock_resume(XFCE_CLOCK(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_clock_set_mode(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "mode", NULL };
- XfceClockMode mode;
- PyObject *py_mode = NULL;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:XfceClock.set_mode", kwlist, &py_mode))
- return NULL;
- if (pyg_enum_get_value(XFCE_TYPE_CLOCK_MODE, py_mode, (gint *)&mode))
- return NULL;
- xfce_clock_set_mode(XFCE_CLOCK(self->obj), mode);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_clock_toggle_mode(PyGObject *self)
-{
- xfce_clock_toggle_mode(XFCE_CLOCK(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_clock_get_mode(PyGObject *self)
-{
- gint ret;
-
- ret = xfce_clock_get_mode(XFCE_CLOCK(self->obj));
- return pyg_enum_from_gtype(XFCE_TYPE_CLOCK_MODE, ret);
-}
-
-static PyMethodDef _PyXfceClock_methods[] = {
- { "show_ampm", (PyCFunction)_wrap_xfce_clock_show_ampm, METH_VARARGS|METH_KEYWORDS },
- { "ampm_toggle", (PyCFunction)_wrap_xfce_clock_ampm_toggle, METH_NOARGS },
- { "ampm_shown", (PyCFunction)_wrap_xfce_clock_ampm_shown, METH_NOARGS },
- { "show_secs", (PyCFunction)_wrap_xfce_clock_show_secs, METH_VARARGS|METH_KEYWORDS },
- { "secs_toggle", (PyCFunction)_wrap_xfce_clock_secs_toggle, METH_NOARGS },
- { "secs_shown", (PyCFunction)_wrap_xfce_clock_secs_shown, METH_NOARGS },
- { "show_military", (PyCFunction)_wrap_xfce_clock_show_military, METH_VARARGS|METH_KEYWORDS },
- { "military_toggle", (PyCFunction)_wrap_xfce_clock_military_toggle, METH_NOARGS },
- { "military_shown", (PyCFunction)_wrap_xfce_clock_military_shown, METH_NOARGS },
- { "set_interval", (PyCFunction)_wrap_xfce_clock_set_interval, METH_VARARGS|METH_KEYWORDS },
- { "get_interval", (PyCFunction)_wrap_xfce_clock_get_interval, METH_NOARGS },
- { "set_led_size", (PyCFunction)_wrap_xfce_clock_set_led_size, METH_VARARGS|METH_KEYWORDS },
- { "get_led_size", (PyCFunction)_wrap_xfce_clock_get_led_size, METH_NOARGS },
- { "suspend", (PyCFunction)_wrap_xfce_clock_suspend, METH_NOARGS },
- { "resume", (PyCFunction)_wrap_xfce_clock_resume, METH_NOARGS },
- { "set_mode", (PyCFunction)_wrap_xfce_clock_set_mode, METH_VARARGS|METH_KEYWORDS },
- { "toggle_mode", (PyCFunction)_wrap_xfce_clock_toggle_mode, METH_NOARGS },
- { "get_mode", (PyCFunction)_wrap_xfce_clock_get_mode, METH_NOARGS },
- { NULL, NULL, 0 }
-};
-
-PyTypeObject PyXfceClock_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "clock.Clock", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceClock_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_clock_new, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-PyMethodDef pyclock_functions[] = {
- { NULL, NULL, 0 }
-};
-
-
-/* ----------- enums and flags ----------- */
-
-void
-pyclock_add_constants(PyObject *module, const gchar *strip_prefix)
-{
- pyg_enum_add(module, "ClockMode", strip_prefix, XFCE_TYPE_CLOCK_MODE);
- pyg_enum_add(module, "ClockLedSize", strip_prefix, XFCE_TYPE_CLOCK_LED_SIZE);
-
- if (PyErr_Occurred())
- PyErr_Print();
-}
-
-/* initialise stuff extension classes */
-void
-pyclock_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkWidget_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Widget");
- if (_PyGtkWidget_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Widget from gtk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return;
- }
-
-
-#line 384 "clock.c"
- pygobject_register_class(d, "XfceClock", XFCE_TYPE_CLOCK, &PyXfceClock_Type, Py_BuildValue("(O)", &PyGtkWidget_Type));
- pyg_set_object_has_new_constructor(XFCE_TYPE_CLOCK);
-}
diff --git a/gui/clock.defs b/gui/clock.defs
deleted file mode 100644
index 81d827f..0000000
--- a/gui/clock.defs
+++ /dev/null
@@ -1,175 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object Clock
- (in-module "Xfce")
- (parent "GtkWidget")
- (c-name "XfceClock")
- (gtype-id "XFCE_TYPE_CLOCK")
-)
-
-;; Enumerations and flags ...
-
-(define-enum ClockMode
- (in-module "Xfce")
- (c-name "XfceClockMode")
- (gtype-id "XFCE_TYPE_CLOCK_MODE")
- (values
- '("analog" "XFCE_CLOCK_ANALOG")
- '("digital" "XFCE_CLOCK_DIGITAL")
- '("leds" "XFCE_CLOCK_LEDS")
- )
-)
-
-(define-enum ClockLedSize
- (in-module "Xfce")
- (c-name "XfceClockLedSize")
- (gtype-id "XFCE_TYPE_CLOCK_LED_SIZE")
- (values
- '("small" "DIGIT_SMALL")
- '("medium" "DIGIT_MEDIUM")
- '("large" "DIGIT_LARGE")
- '("huge" "DIGIT_HUGE")
- )
-)
-
-
-;; From /usr/local/include/xfce4/libxfcegui4/xfce_clock.h
-
-(define-function clock_get_type
- (c-name "xfce_clock_get_type")
- (return-type "GtkType")
-)
-
-(define-function clock_new
- (c-name "xfce_clock_new")
- (is-constructor-of "XfceClock")
- (return-type "GtkWidget*")
-)
-
-(define-method show_ampm
- (of-object "XfceClock")
- (c-name "xfce_clock_show_ampm")
- (return-type "none")
- (parameters
- '("gboolean" "show")
- )
-)
-
-(define-method ampm_toggle
- (of-object "XfceClock")
- (c-name "xfce_clock_ampm_toggle")
- (return-type "none")
-)
-
-(define-method ampm_shown
- (of-object "XfceClock")
- (c-name "xfce_clock_ampm_shown")
- (return-type "gboolean")
-)
-
-(define-method show_secs
- (of-object "XfceClock")
- (c-name "xfce_clock_show_secs")
- (return-type "none")
- (parameters
- '("gboolean" "show")
- )
-)
-
-(define-method secs_toggle
- (of-object "XfceClock")
- (c-name "xfce_clock_secs_toggle")
- (return-type "none")
-)
-
-(define-method secs_shown
- (of-object "XfceClock")
- (c-name "xfce_clock_secs_shown")
- (return-type "gboolean")
-)
-
-(define-method show_military
- (of-object "XfceClock")
- (c-name "xfce_clock_show_military")
- (return-type "none")
- (parameters
- '("gboolean" "show")
- )
-)
-
-(define-method military_toggle
- (of-object "XfceClock")
- (c-name "xfce_clock_military_toggle")
- (return-type "none")
-)
-
-(define-method military_shown
- (of-object "XfceClock")
- (c-name "xfce_clock_military_shown")
- (return-type "gboolean")
-)
-
-(define-method set_interval
- (of-object "XfceClock")
- (c-name "xfce_clock_set_interval")
- (return-type "none")
- (parameters
- '("guint" "interval")
- )
-)
-
-(define-method get_interval
- (of-object "XfceClock")
- (c-name "xfce_clock_get_interval")
- (return-type "guint")
-)
-
-(define-method set_led_size
- (of-object "XfceClock")
- (c-name "xfce_clock_set_led_size")
- (return-type "none")
- (parameters
- '("XfceClockLedSize" "size")
- )
-)
-
-(define-method get_led_size
- (of-object "XfceClock")
- (c-name "xfce_clock_get_led_size")
- (return-type "XfceClockLedSize")
-)
-
-(define-method suspend
- (of-object "XfceClock")
- (c-name "xfce_clock_suspend")
- (return-type "none")
-)
-
-(define-method resume
- (of-object "XfceClock")
- (c-name "xfce_clock_resume")
- (return-type "none")
-)
-
-(define-method set_mode
- (of-object "XfceClock")
- (c-name "xfce_clock_set_mode")
- (return-type "none")
- (parameters
- '("XfceClockMode" "mode")
- )
-)
-
-(define-method toggle_mode
- (of-object "XfceClock")
- (c-name "xfce_clock_toggle_mode")
- (return-type "none")
-)
-
-(define-method get_mode
- (of-object "XfceClock")
- (c-name "xfce_clock_get_mode")
- (return-type "XfceClockMode")
-)
-
-
diff --git a/gui/clock.override b/gui/clock.override
deleted file mode 100644
index 38a3ceb..0000000
--- a/gui/clock.override
+++ /dev/null
@@ -1,33 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-#include <libxfcegui4/gui-enum-types.h>
-
-#ifndef XFCE_TYPE_CLOCK
-#define XFCE_TYPE_CLOCK (xfce_clock_get_type ())
-#endif
-
-#define XFCE_TYPE_CLOCK_MODE GUI_TYPE_CLOCK_MODE
-#define XFCE_TYPE_CLOCK_LED_SIZE GUI_TYPE_CLOCK_LED_SIZE
-
-
-%%
-include
-%%
-modulename clock
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.Widget as PyGtkWidget_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/gui/colorbutton.c b/gui/colorbutton.c
deleted file mode 100644
index 032cc48..0000000
--- a/gui/colorbutton.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "colorbutton.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#line 13 "colorbutton.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 23 "colorbutton.c"
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_xfce_color_button_new_with_color(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "color", NULL };
- PyObject *py_color;
- GdkColor *color = NULL;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:color_button_new_with_color", kwlist, &py_color))
- return NULL;
- if (pyg_boxed_check(py_color, GDK_TYPE_COLOR))
- color = pyg_boxed_get(py_color, GdkColor);
- else {
- PyErr_SetString(PyExc_TypeError, "color should be a GdkColor");
- return NULL;
- }
- ret = xfce_color_button_new_with_color(color);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-PyMethodDef pycolorbutton_functions[] = {
- { "color_button_new_with_color", (PyCFunction)_wrap_xfce_color_button_new_with_color, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pycolorbutton_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
-
-
-#line 77 "colorbutton.c"
-}
diff --git a/gui/colorbutton.defs b/gui/colorbutton.defs
deleted file mode 100644
index 32654f2..0000000
--- a/gui/colorbutton.defs
+++ /dev/null
@@ -1,87 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-
-;; From xfce-colorbutton.h
-
-(define-function color_button_new
- (c-name "xfce_color_button_new")
- (is-constructor-of "XfceColorButton")
- (return-type "GtkWidget*")
- (parameters
- )
-)
-
-(define-function color_button_new_with_color
- (c-name "xfce_color_button_new_with_color")
- (return-type "GtkWidget*")
- (parameters
- '("const-GdkColor*" "color")
- )
-)
-
-(define-method set_color
- (of-object "XfceColorButton")
- (c-name "xfce_color_button_set_color")
- (return-type "none")
- (parameters
- '("const-GdkColor*" "color")
- )
-)
-
-(define-method get_color
- (of-object "XfceColorButton")
- (c-name "xfce_color_button_get_color")
- (return-type "none")
- (parameters
- '("GdkColor*" "color")
- )
-)
-
-(define-method set_alpha
- (of-object "XfceColorButton")
- (c-name "xfce_color_button_set_alpha")
- (return-type "none")
- (parameters
- '("guint16" "alpha")
- )
-)
-
-(define-method get_alpha
- (of-object "XfceColorButton")
- (c-name "xfce_color_button_get_alpha")
- (return-type "guint16")
-)
-
-(define-method set_use_alpha
- (of-object "XfceColorButton")
- (c-name "xfce_color_button_set_use_alpha")
- (return-type "none")
- (parameters
- '("gboolean" "use_alpha")
- )
-)
-
-(define-method get_use_alpha
- (of-object "XfceColorButton")
- (c-name "xfce_color_button_get_use_alpha")
- (return-type "gboolean")
-)
-
-(define-method set_title
- (of-object "XfceColorButton")
- (c-name "xfce_color_button_set_title")
- (return-type "none")
- (parameters
- '("const-gchar*" "title")
- )
-)
-
-(define-method get_title
- (of-object "XfceColorButton")
- (c-name "xfce_color_button_get_title")
- (return-type "const-gchar*")
-)
-
-
diff --git a/gui/colorbutton.override b/gui/colorbutton.override
deleted file mode 100644
index 9c4498b..0000000
--- a/gui/colorbutton.override
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-%%
-include
-%%
-modulename colorbutton
-%%
-import gobject.GObject as PyGObject_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/gui/decorbutton.c b/gui/decorbutton.c
deleted file mode 100644
index 58d79d9..0000000
--- a/gui/decorbutton.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "decorbutton.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-#include <libxfcegui4/gui-enum-types.h>
-
-#ifndef XFCE_TYPE_DECORBUTTON
-#define XFCE_TYPE_DECORBUTTON (xfce_decorbutton_get_type ())
-#endif
-#define XFCE_TYPE_DECORBUTTON_TYPE GUI_TYPE_DECORBUTTON_TYPE
-
-#line 19 "decorbutton.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGtkMisc_Type;
-#define PyGtkMisc_Type (*_PyGtkMisc_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceDecorbutton_Type;
-
-#line 32 "decorbutton.c"
-
-
-
-/* ----------- XfceDecorbutton ----------- */
-
-static int
-_wrap_xfce_decorbutton_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "type", NULL };
- PyObject *py_type = NULL;
- XfceDecorbuttonType type;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:XfceDecorbutton.__init__", kwlist, &py_type))
- return -1;
- if (pyg_enum_get_value(XFCE_TYPE_DECORBUTTON_TYPE, py_type, (gint *)&type))
- return -1;
- self->obj = (GObject *)xfce_decorbutton_new(type);
-
- if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create XfceDecorbutton object");
- return -1;
- }
- pygobject_register_wrapper((PyObject *)self);
- return 0;
-}
-
-PyTypeObject PyXfceDecorbutton_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "clock.Decorbutton", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- NULL, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_decorbutton_new, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-PyMethodDef pydecorbutton_functions[] = {
- { NULL, NULL, 0 }
-};
-
-
-/* ----------- enums and flags ----------- */
-
-void
-pydecorbutton_add_constants(PyObject *module, const gchar *strip_prefix)
-{
- pyg_enum_add(module, "DecorbuttonType", strip_prefix, XFCE_TYPE_DECORBUTTON_TYPE);
-
- if (PyErr_Occurred())
- PyErr_Print();
-}
-
-/* initialise stuff extension classes */
-void
-pydecorbutton_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkMisc_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Misc");
- if (_PyGtkMisc_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Misc from gtk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return;
- }
-
-
-#line 160 "decorbutton.c"
- pygobject_register_class(d, "XfceDecorbutton", XFCE_TYPE_DECORBUTTON, &PyXfceDecorbutton_Type, Py_BuildValue("(O)", &PyGtkMisc_Type));
-}
diff --git a/gui/decorbutton.defs b/gui/decorbutton.defs
deleted file mode 100644
index f56775e..0000000
--- a/gui/decorbutton.defs
+++ /dev/null
@@ -1,39 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object Decorbutton
- (in-module "Xfce")
- (parent "GtkMisc")
- (c-name "XfceDecorbutton")
- (gtype-id "XFCE_TYPE_DECORBUTTON")
-)
-
-;; Enumerations and flags ...
-
-(define-enum DecorbuttonType
- (in-module "Xfce")
- (c-name "XfceDecorbuttonType")
- (gtype-id "XFCE_TYPE_DECORBUTTON_TYPE")
- (values
- '("close" "XFCE_DECORBUTTON_CLOSE")
- '("hide" "XFCE_DECORBUTTON_HIDE")
- )
-)
-
-
-;; From xfce_decorbutton.h
-
-(define-function decorbutton_get_type
- (c-name "xfce_decorbutton_get_type")
- (return-type "GtkType")
-)
-
-(define-function decorbutton_new
- (c-name "xfce_decorbutton_new")
- (is-constructor-of "XfceDecorbutton")
- (return-type "GtkWidget*")
- (parameters
- '("XfceDecorbuttonType" "type")
- )
-)
-
-
diff --git a/gui/decorbutton.override b/gui/decorbutton.override
deleted file mode 100644
index da6f8be..0000000
--- a/gui/decorbutton.override
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-#include <libxfcegui4/gui-enum-types.h>
-
-#ifndef XFCE_TYPE_DECORBUTTON
-#define XFCE_TYPE_DECORBUTTON (xfce_decorbutton_get_type ())
-#endif
-#define XFCE_TYPE_DECORBUTTON_TYPE GUI_TYPE_DECORBUTTON_TYPE
-
-%%
-include
-%%
-modulename clock
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.Misc as PyGtkMisc_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/gui/decortoggle.c b/gui/decortoggle.c
deleted file mode 100644
index cf04606..0000000
--- a/gui/decortoggle.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "decortoggle.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#ifndef XFCE_TYPE_DECORTOGGLE
-#define XFCE_TYPE_DECORTOGGLE (xfce_decortoggle_get_type ())
-#endif
-
-#line 17 "decortoggle.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGtkMisc_Type;
-#define PyGtkMisc_Type (*_PyGtkMisc_Type)
-static PyTypeObject *_PyGtkArrow_Type;
-#define PyGtkArrow_Type (*_PyGtkArrow_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceDecortoggle_Type;
-
-#line 32 "decortoggle.c"
-
-
-
-/* ----------- XfceDecortoggle ----------- */
-
-static int
-_wrap_xfce_decortoggle_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "arrow_type", NULL };
- PyObject *py_arrow_type = NULL;
- GtkArrowType arrow_type;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:XfceDecortoggle.__init__", kwlist, &py_arrow_type))
- return -1;
- if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_arrow_type, (gint *)&arrow_type))
- return -1;
- self->obj = (GObject *)xfce_decortoggle_new(arrow_type);
-
- if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create XfceDecortoggle object");
- return -1;
- }
- pygobject_register_wrapper((PyObject *)self);
- return 0;
-}
-
-static PyObject *
-_wrap_xfce_decortoggle_toggled(PyGObject *self)
-{
- xfce_decortoggle_toggled(XFCE_DECORTOGGLE(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_decortoggle_set_active(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "is_active", NULL };
- int is_active;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:XfceDecortoggle.set_active", kwlist, &is_active))
- return NULL;
- xfce_decortoggle_set_active(XFCE_DECORTOGGLE(self->obj), is_active);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_decortoggle_set_arrow_type(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "arrow_type", NULL };
- PyObject *py_arrow_type = NULL;
- GtkArrowType arrow_type;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:XfceDecortoggle.set_arrow_type", kwlist, &py_arrow_type))
- return NULL;
- if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_arrow_type, (gint *)&arrow_type))
- return NULL;
- xfce_decortoggle_set_arrow_type(XFCE_DECORTOGGLE(self->obj), arrow_type);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_decortoggle_get_arrow_type(PyGObject *self)
-{
- gint ret;
-
- ret = xfce_decortoggle_get_arrow_type(XFCE_DECORTOGGLE(self->obj));
- return pyg_enum_from_gtype(GTK_TYPE_ARROW_TYPE, ret);
-}
-
-static PyMethodDef _PyXfceDecortoggle_methods[] = {
- { "toggled", (PyCFunction)_wrap_xfce_decortoggle_toggled, METH_NOARGS },
- { "set_active", (PyCFunction)_wrap_xfce_decortoggle_set_active, METH_VARARGS|METH_KEYWORDS },
- { "set_arrow_type", (PyCFunction)_wrap_xfce_decortoggle_set_arrow_type, METH_VARARGS|METH_KEYWORDS },
- { "get_arrow_type", (PyCFunction)_wrap_xfce_decortoggle_get_arrow_type, METH_NOARGS },
- { NULL, NULL, 0 }
-};
-
-PyTypeObject PyXfceDecortoggle_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "decortoggle.Decortoggle", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceDecortoggle_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_decortoggle_new, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-PyMethodDef pydecortoggle_functions[] = {
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pydecortoggle_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkMisc_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Misc");
- if (_PyGtkMisc_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Misc from gtk");
- return;
- }
- _PyGtkArrow_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Arrow");
- if (_PyGtkArrow_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Arrow from gtk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return;
- }
-
-
-#line 208 "decortoggle.c"
- pygobject_register_class(d, "XfceDecortoggle", XFCE_TYPE_DECORTOGGLE, &PyXfceDecortoggle_Type, Py_BuildValue("(O)", &PyGtkMisc_Type));
-}
diff --git a/gui/decortoggle.defs b/gui/decortoggle.defs
deleted file mode 100644
index 44dafcd..0000000
--- a/gui/decortoggle.defs
+++ /dev/null
@@ -1,59 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object Decortoggle
- (in-module "Xfce")
- (parent "GtkMisc")
- (c-name "XfceDecortoggle")
- (gtype-id "XFCE_TYPE_DECORTOGGLE")
-)
-
-;; Enumerations and flags ...
-
-
-;; From xfce_decortoggle.h
-
-(define-function decortoggle_get_type
- (c-name "xfce_decortoggle_get_type")
- (return-type "GtkType")
-)
-
-(define-function decortoggle_new
- (c-name "xfce_decortoggle_new")
- (is-constructor-of "XfceDecortoggle")
- (return-type "GtkWidget*")
- (parameters
- '("GtkArrowType" "arrow_type")
- )
-)
-
-(define-method toggled
- (of-object "XfceDecortoggle")
- (c-name "xfce_decortoggle_toggled")
- (return-type "none")
-)
-
-(define-method set_active
- (of-object "XfceDecortoggle")
- (c-name "xfce_decortoggle_set_active")
- (return-type "none")
- (parameters
- '("gboolean" "is_active")
- )
-)
-
-(define-method set_arrow_type
- (of-object "XfceDecortoggle")
- (c-name "xfce_decortoggle_set_arrow_type")
- (return-type "none")
- (parameters
- '("GtkArrowType" "arrow_type")
- )
-)
-
-(define-method get_arrow_type
- (of-object "XfceDecortoggle")
- (c-name "xfce_decortoggle_get_arrow_type")
- (return-type "GtkArrowType")
-)
-
-
diff --git a/gui/decortoggle.override b/gui/decortoggle.override
deleted file mode 100644
index f23f53b..0000000
--- a/gui/decortoggle.override
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#ifndef XFCE_TYPE_DECORTOGGLE
-#define XFCE_TYPE_DECORTOGGLE (xfce_decortoggle_get_type ())
-#endif
-
-%%
-include
-%%
-modulename decortoggle
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.Misc as PyGtkMisc_Type
-import gtk.Arrow as PyGtkArrow_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/gui/dialogs.c b/gui/dialogs.c
deleted file mode 100644
index 8bca9e8..0000000
--- a/gui/dialogs.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "dialogs.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-#line 12 "dialogs.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGdkPixbuf_Type;
-#define PyGdkPixbuf_Type (*_PyGdkPixbuf_Type)
-static PyTypeObject *_PyGtkWidget_Type;
-#define PyGtkWidget_Type (*_PyGtkWidget_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 26 "dialogs.c"
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_show_info(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "text", NULL };
- char *text;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:show_info", kwlist, &text))
- return NULL;
- show_info(text);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_show_warning(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "text", NULL };
- char *text;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:show_warning", kwlist, &text))
- return NULL;
- show_warning(text);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_show_error(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "text", NULL };
- char *text;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:show_error", kwlist, &text))
- return NULL;
- show_error(text);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_create_header(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "icon", "text", NULL };
- PyGObject *icon;
- char *text;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!s:create_header", kwlist, &PyGdkPixbuf_Type, &icon, &text))
- return NULL;
- ret = create_header(GDK_PIXBUF(icon->obj), text);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_create_header_with_image(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "image", "text", NULL };
- PyGObject *image;
- char *text;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!s:create_header_with_image", kwlist, &PyGtkWidget_Type, &image, &text))
- return NULL;
- ret = create_header_with_image(GTK_WIDGET(image->obj), text);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_small_label(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "text", NULL };
- char *text;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:small_label", kwlist, &text))
- return NULL;
- ret = small_label(text);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_exec_command(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "command", NULL };
- char *command;
- int ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:exec_command", kwlist, &command))
- return NULL;
- ret = exec_command(command);
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_xfce_confirm(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "text", "stock_id", "action", NULL };
- char *text, *stock_id, *action;
- int ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sss:confirm", kwlist, &text, &stock_id, &action))
- return NULL;
- ret = xfce_confirm(text, stock_id, action);
- return PyBool_FromLong(ret);
-
-}
-
-#line 27 "dialogs.override"
-static PyObject *
-_wrap_xfce_create_header(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "icon", "text", NULL };
- PyGObject *icon;
- char *text;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Os:create_header", kwlist, &icon, &text)) {
- return NULL;
- }
-
- if ((PyObject*) icon == Py_None) {
- ret = create_header(NULL, text);
- } else if (pygobject_check(icon, &PyGdkPixbuf_Type)) {
- ret = create_header(GDK_PIXBUF(icon->obj), text);
- } else {
- PyErr_SetString(PyExc_TypeError, "icon: expected a Pixbuf or None");
- return NULL;
- }
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-#line 167 "dialogs.c"
-
-
-static PyObject *
-_wrap_xfce_create_header_with_image(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "image", "text", NULL };
- PyGObject *image;
- char *text;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!s:create_header_with_image", kwlist, &PyGtkWidget_Type, &image, &text))
- return NULL;
- ret = xfce_create_header_with_image(GTK_WIDGET(image->obj), text);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_xfce_create_small_label(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "text", NULL };
- char *text;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:create_small_label", kwlist, &text))
- return NULL;
- ret = xfce_create_small_label(text);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_xfce_create_mixed_button(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "stock", "text", NULL };
- char *stock, *text;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ss:create_mixed_button", kwlist, &stock, &text))
- return NULL;
- ret = xfce_create_mixed_button(stock, text);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-PyMethodDef pydialogs_functions[] = {
- { "show_info", (PyCFunction)_wrap_show_info, METH_VARARGS|METH_KEYWORDS },
- { "show_warning", (PyCFunction)_wrap_show_warning, METH_VARARGS|METH_KEYWORDS },
- { "show_error", (PyCFunction)_wrap_show_error, METH_VARARGS|METH_KEYWORDS },
- { "create_header", (PyCFunction)_wrap_create_header, METH_VARARGS|METH_KEYWORDS },
- { "create_header_with_image", (PyCFunction)_wrap_create_header_with_image, METH_VARARGS|METH_KEYWORDS },
- { "small_label", (PyCFunction)_wrap_small_label, METH_VARARGS|METH_KEYWORDS },
- { "exec_command", (PyCFunction)_wrap_exec_command, METH_VARARGS|METH_KEYWORDS },
- { "confirm", (PyCFunction)_wrap_xfce_confirm, METH_VARARGS|METH_KEYWORDS },
- { "create_header", (PyCFunction)_wrap_xfce_create_header, METH_VARARGS|METH_KEYWORDS },
- { "create_header_with_image", (PyCFunction)_wrap_xfce_create_header_with_image, METH_VARARGS|METH_KEYWORDS },
- { "create_small_label", (PyCFunction)_wrap_xfce_create_small_label, METH_VARARGS|METH_KEYWORDS },
- { "create_mixed_button", (PyCFunction)_wrap_xfce_create_mixed_button, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pydialogs_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkWidget_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Widget");
- if (_PyGtkWidget_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Widget from gtk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return;
- }
- if ((module = PyImport_ImportModule("gtk.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkPixbuf_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Pixbuf");
- if (_PyGdkPixbuf_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Pixbuf from gtk.gdk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk.gdk");
- return;
- }
-
-
-#line 279 "dialogs.c"
-}
diff --git a/gui/dialogs.defs b/gui/dialogs.defs
deleted file mode 100644
index f8f7b61..0000000
--- a/gui/dialogs.defs
+++ /dev/null
@@ -1,223 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-
-;; From dialogs.h
-
-(define-function show_info
- (c-name "show_info")
- (return-type "none")
- (parameters
- '("const-char*" "text")
- )
-)
-
-(define-function show_warning
- (c-name "show_warning")
- (return-type "none")
- (parameters
- '("const-char*" "text")
- )
-)
-
-(define-function show_error
- (c-name "show_error")
- (return-type "none")
- (parameters
- '("const-char*" "text")
- )
-)
-
-(define-function confirm
- (c-name "confirm")
- (return-type "gboolean")
- (parameters
- '("const-char*" "text")
- '("const-char*" "stock")
- '("const-char*" "action")
- )
-)
-
-(define-function create_header
- (c-name "create_header")
- (return-type "GtkWidget*")
- (parameters
- '("GdkPixbuf*" "icon")
- '("const-char*" "text")
- )
-)
-
-(define-function create_header_with_image
- (c-name "create_header_with_image")
- (return-type "GtkWidget*")
- (parameters
- '("GtkWidget*" "image")
- '("const-char*" "text")
- )
-)
-
-(define-function small_label
- (c-name "small_label")
- (return-type "GtkWidget*")
- (parameters
- '("const-char*" "text")
- )
-)
-
-(define-function mixed_button_new
- (c-name "mixed_button_new")
- (is-constructor-of "MixedButton")
- (return-type "GtkWidget*")
- (parameters
- '("const-char*" "stock")
- '("const-char*" "text")
- )
-)
-
-(define-function exec_command
- (c-name "exec_command")
- (return-type "gboolean")
- (parameters
- '("gchar*" "command")
- )
-)
-
-(define-function exec_command_full_with_envp
- (c-name "exec_command_full_with_envp")
- (return-type "gboolean")
- (parameters
- '("gchar**" "argv")
- '("gchar**" "envp")
- )
-)
-
-(define-function err
- (c-name "xfce_err")
- (return-type "none")
- (parameters
- '("const-gchar*" "format")
- )
- (varargs #t)
-)
-
-(define-function verr
- (c-name "xfce_verr")
- (return-type "none")
- (parameters
- '("const-gchar*" "format")
- '("va_list" "ap")
- )
-)
-
-(define-function warn
- (c-name "xfce_warn")
- (return-type "none")
- (parameters
- '("const-gchar*" "format")
- )
- (varargs #t)
-)
-
-(define-function vwarn
- (c-name "xfce_vwarn")
- (return-type "none")
- (parameters
- '("const-gchar*" "format")
- '("va_list" "ap")
- )
-)
-
-(define-function info
- (c-name "xfce_info")
- (return-type "none")
- (parameters
- '("const-gchar*" "format")
- )
- (varargs #t)
-)
-
-(define-function vinfo
- (c-name "xfce_vinfo")
- (return-type "none")
- (parameters
- '("const-gchar*" "format")
- '("va_list" "ap")
- )
-)
-
-(define-function confirm
- (c-name "xfce_confirm")
- (return-type "gboolean")
- (parameters
- '("const-gchar*" "text")
- '("const-gchar*" "stock_id")
- '("const-gchar*" "action")
- )
-)
-
-(define-function message_dialog
- (c-name "xfce_message_dialog")
- (return-type "gint")
- (parameters
- '("GtkWindow*" "parent")
- '("const-gchar*" "title")
- '("const-gchar*" "icon_id")
- '("const-gchar*" "primary_text")
- '("const-gchar*" "secondary_text")
- '("const-gchar*" "first_button_type")
- )
- (varargs #t)
-)
-
-(define-function message_dialog_new
- (c-name "xfce_message_dialog_new")
- (is-constructor-of "XfceMessageDialog")
- (return-type "GtkWidget*")
- (parameters
- '("GtkWindow*" "parent")
- '("const-gchar*" "title")
- '("const-gchar*" "icon_id")
- '("const-gchar*" "primary_text")
- '("const-gchar*" "secondary_text")
- '("const-gchar*" "first_button_type")
- )
- (varargs #t)
-)
-
-(define-function create_header
- (c-name "xfce_create_header")
- (return-type "GtkWidget*")
- (parameters
- '("GdkPixbuf*" "icon")
- '("const-gchar*" "text")
- )
-)
-
-(define-function create_header_with_image
- (c-name "xfce_create_header_with_image")
- (return-type "GtkWidget*")
- (parameters
- '("GtkWidget*" "image")
- '("const-gchar*" "text")
- )
-)
-
-(define-function create_small_label
- (c-name "xfce_create_small_label")
- (return-type "GtkWidget*")
- (parameters
- '("const-gchar*" "text")
- )
-)
-
-(define-function create_mixed_button
- (c-name "xfce_create_mixed_button")
- (return-type "GtkWidget*")
- (parameters
- '("const-gchar*" "stock")
- '("const-gchar*" "text")
- )
-)
-
-
diff --git a/gui/filechooser.c b/gui/filechooser.c
deleted file mode 100644
index 406d953..0000000
--- a/gui/filechooser.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "filechooser.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-#include <libxfcegui4/gui-enum-types.h>
-
-#define XFCE_TYPE_FILE_CHOOSER_ACTION GUI_TYPE_FILE_CHOOSER_ACTION
-
-#line 16 "filechooser.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 26 "filechooser.c"
-
-
-
-/* ----------- functions ----------- */
-
-PyMethodDef pyfilechooser_functions[] = {
- { NULL, NULL, 0 }
-};
-
-
-/* ----------- enums and flags ----------- */
-
-void
-pyfilechooser_add_constants(PyObject *module, const gchar *strip_prefix)
-{
- pyg_enum_add(module, "FileChooserAction", strip_prefix, XFCE_TYPE_FILE_CHOOSER_ACTION);
-
- if (PyErr_Occurred())
- PyErr_Print();
-}
-
-/* initialise stuff extension classes */
-void
-pyfilechooser_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
-
-
-#line 70 "filechooser.c"
-}
diff --git a/gui/filechooser.defs b/gui/filechooser.defs
deleted file mode 100644
index 9cfa072..0000000
--- a/gui/filechooser.defs
+++ /dev/null
@@ -1,267 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-(define-enum FileChooserAction
- (in-module "Xfce")
- (c-name "XfceFileChooserAction")
- (gtype-id "XFCE_TYPE_FILE_CHOOSER_ACTION")
- (values
- '("open" "XFCE_FILE_CHOOSER_ACTION_OPEN")
- '("save" "XFCE_FILE_CHOOSER_ACTION_SAVE")
- '("select-folder" "XFCE_FILE_CHOOSER_ACTION_SELECT_FOLDER")
- '("create-folder" "XFCE_FILE_CHOOSER_ACTION_CREATE_FOLDER")
- )
-)
-
-
-;; From xfce-filechooser.h
-
-(define-function file_chooser_new
- (c-name "xfce_file_chooser_new")
- (is-constructor-of "XfceFileChooser")
- (return-type "GtkWidget*")
- (parameters
- '("const-gchar*" "title")
- '("GtkWindow*" "parent")
- '("XfceFileChooserAction" "action")
- '("const-gchar*" "first_button_text")
- )
- (varargs #t)
-)
-
-(define-method set_select_multiple
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_set_select_multiple")
- (return-type "none")
- (parameters
- '("gboolean" "select_multiple")
- )
-)
-
-(define-method get_select_multiple
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_get_select_multiple")
- (return-type "gboolean")
-)
-
-(define-method set_current_name
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_set_current_name")
- (return-type "none")
- (parameters
- '("const-gchar*" "name")
- )
-)
-
-(define-method get_filename
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_get_filename")
- (return-type "gchar*")
-)
-
-(define-method set_filename
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_set_filename")
- (return-type "gboolean")
- (parameters
- '("const-gchar*" "filename")
- )
-)
-
-(define-method get_filenames
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_get_filenames")
- (return-type "GSList*")
-)
-
-(define-method set_current_folder
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_set_current_folder")
- (return-type "gboolean")
- (parameters
- '("const-gchar*" "filename")
- )
-)
-
-(define-method get_current_folder
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_get_current_folder")
- (return-type "gchar*")
-)
-
-(define-method set_preview_widget
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_set_preview_widget")
- (return-type "none")
- (parameters
- '("GtkWidget*" "preview_widget")
- )
-)
-
-(define-method get_preview_widget
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_get_preview_widget")
- (return-type "GtkWidget*")
-)
-
-(define-method set_preview_callback
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_set_preview_callback")
- (return-type "none")
- (parameters
- '("PreviewUpdateFunc" "func")
- '("gpointer" "user_data")
- )
-)
-
-(define-method set_preview_widget_active
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_set_preview_widget_active")
- (return-type "none")
- (parameters
- '("gboolean" "active")
- )
-)
-
-(define-method get_preview_widget_active
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_get_preview_widget_active")
- (return-type "gboolean")
-)
-
-(define-method set_use_preview_label
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_set_use_preview_label")
- (return-type "none")
- (parameters
- '("gboolean" "use_label")
- )
-)
-
-(define-method set_extra_widget
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_set_extra_widget")
- (return-type "none")
- (parameters
- '("GtkWidget*" "extra_widget")
- )
-)
-
-(define-method get_extra_widget
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_get_extra_widget")
- (return-type "GtkWidget*")
-)
-
-(define-method add_filter
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_add_filter")
- (return-type "none")
- (parameters
- '("XfceFileFilter*" "filter")
- )
-)
-
-(define-method remove_filter
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_remove_filter")
- (return-type "none")
- (parameters
- '("XfceFileFilter*" "filter")
- )
-)
-
-(define-method set_filter
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_set_filter")
- (return-type "none")
- (parameters
- '("XfceFileFilter*" "filter")
- )
-)
-
-(define-method add_shortcut_folder
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_add_shortcut_folder")
- (return-type "gboolean")
- (parameters
- '("const-gchar*" "folder")
- '("GError**" "error")
- )
-)
-
-(define-method remove_shortcut_folder
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_remove_shortcut_folder")
- (return-type "gboolean")
- (parameters
- '("const-gchar*" "folder")
- '("GError**" "error")
- )
-)
-
-(define-function file_filter_new
- (c-name "xfce_file_filter_new")
- (is-constructor-of "XfceFileFilter")
- (return-type "XfceFileFilter*")
- (parameters
- )
-)
-
-(define-method set_name
- (of-object "XfceFileFilter")
- (c-name "xfce_file_filter_set_name")
- (return-type "none")
- (parameters
- '("const-gchar*" "name")
- )
-)
-
-(define-method add_mime_type
- (of-object "XfceFileFilter")
- (c-name "xfce_file_filter_add_mime_type")
- (return-type "none")
- (parameters
- '("const-gchar*" "mime_type")
- )
-)
-
-(define-method add_pattern
- (of-object "XfceFileFilter")
- (c-name "xfce_file_filter_add_pattern")
- (return-type "none")
- (parameters
- '("const-gchar*" "pattern")
- )
-)
-
-(define-function file_chooser_dialog_new
- (c-name "xfce_file_chooser_dialog_new")
- (is-constructor-of "XfceFileChooserDialog")
- (return-type "GtkWidget*")
- (parameters
- '("const-gchar*" "title")
- '("GtkWindow*" "parent")
- '("XfceFileChooserAction" "action")
- '("const-gchar*" "first_button_text")
- )
- (varargs #t)
-)
-
-(define-method set_local_only
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_set_local_only")
- (return-type "none")
- (parameters
- '("gboolean" "local_only")
- )
-)
-
-(define-method get_local_only
- (of-object "XfceFileChooser")
- (c-name "xfce_file_chooser_get_local_only")
- (return-type "gboolean")
-)
-
-
diff --git a/gui/filechooser.override b/gui/filechooser.override
deleted file mode 100644
index 3696fd6..0000000
--- a/gui/filechooser.override
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-#include <libxfcegui4/gui-enum-types.h>
-
-#define XFCE_TYPE_FILE_CHOOSER_ACTION GUI_TYPE_FILE_CHOOSER_ACTION
-
-%%
-include
-%%
-modulename filechooser
-%%
-import gobject.GObject as PyGObject_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/gui/framebox.c b/gui/framebox.c
deleted file mode 100644
index 3e462ba..0000000
--- a/gui/framebox.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "framebox.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#ifndef XFCE_TYPE_FRAMEBOX
-#define XFCE_TYPE_FRAMEBOX (xfce_framebox_get_type ())
-#endif
-
-#line 17 "framebox.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGtkFrame_Type;
-#define PyGtkFrame_Type (*_PyGtkFrame_Type)
-static PyTypeObject *_PyGtkWidget_Type;
-#define PyGtkWidget_Type (*_PyGtkWidget_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceFramebox_Type;
-
-#line 32 "framebox.c"
-
-
-
-/* ----------- XfceFramebox ----------- */
-
-static int
-_wrap_xfce_framebox_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "text", "indent", NULL };
- char *text;
- int indent;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "si:XfceFramebox.__init__", kwlist, &text, &indent))
- return -1;
- self->obj = (GObject *)xfce_framebox_new(text, indent);
-
- if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create XfceFramebox object");
- return -1;
- }
- pygobject_register_wrapper((PyObject *)self);
- return 0;
-}
-
-static PyObject *
-_wrap_xfce_framebox_add(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "widget", NULL };
- PyGObject *widget;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:XfceFramebox.add", kwlist, &PyGtkWidget_Type, &widget))
- return NULL;
- xfce_framebox_add(XFCE_FRAMEBOX(self->obj), GTK_WIDGET(widget->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyMethodDef _PyXfceFramebox_methods[] = {
- { "add", (PyCFunction)_wrap_xfce_framebox_add, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-PyTypeObject PyXfceFramebox_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "framebox.Framebox", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceFramebox_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_framebox_new, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-PyMethodDef pyframebox_functions[] = {
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pyframebox_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkFrame_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Frame");
- if (_PyGtkFrame_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Frame from gtk");
- return;
- }
- _PyGtkWidget_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Widget");
- if (_PyGtkWidget_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Widget from gtk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return;
- }
-
-
-#line 170 "framebox.c"
- pygobject_register_class(d, "XfceFramebox", XFCE_TYPE_FRAMEBOX, &PyXfceFramebox_Type, Py_BuildValue("(O)", &PyGtkFrame_Type));
-}
diff --git a/gui/framebox.defs b/gui/framebox.defs
deleted file mode 100644
index c6e05d0..0000000
--- a/gui/framebox.defs
+++ /dev/null
@@ -1,39 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object Framebox
- (in-module "Xfce")
- (parent "GtkFrame")
- (c-name "XfceFramebox")
- (gtype-id "XFCE_TYPE_FRAMEBOX")
-)
-
-;; Enumerations and flags ...
-
-
-;; From xfce_framebox.h
-
-(define-function framebox_get_type
- (c-name "xfce_framebox_get_type")
- (return-type "GType")
-)
-
-(define-function framebox_new
- (c-name "xfce_framebox_new")
- (is-constructor-of "XfceFramebox")
- (return-type "GtkWidget*")
- (parameters
- '("const-gchar*" "text")
- '("gboolean" "indent")
- )
-)
-
-(define-method add
- (of-object "XfceFramebox")
- (c-name "xfce_framebox_add")
- (return-type "none")
- (parameters
- '("GtkWidget*" "widget")
- )
-)
-
-
diff --git a/gui/framebox.override b/gui/framebox.override
deleted file mode 100644
index 7f1a038..0000000
--- a/gui/framebox.override
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#ifndef XFCE_TYPE_FRAMEBOX
-#define XFCE_TYPE_FRAMEBOX (xfce_framebox_get_type ())
-#endif
-
-%%
-include
-%%
-modulename framebox
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.Frame as PyGtkFrame_Type
-import gtk.Widget as PyGtkWidget_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/gui/gdk-extensions.defs b/gui/gdk-extensions.defs
deleted file mode 100644
index b42ea24..0000000
--- a/gui/gdk-extensions.defs
+++ /dev/null
@@ -1,78 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-
-;; From /usr/local/include/xfce4/libxfcegui4/xfce-gdk-extensions.h
-
-(define-function gdk_display_get_fullname
- (c-name "xfce_gdk_display_get_fullname")
- (return-type "gchar*")
- (parameters
- '("GdkDisplay*" "display")
- )
-)
-
-(define-function gdk_display_locate_monitor_with_pointer
- (c-name "xfce_gdk_display_locate_monitor_with_pointer")
- (return-type "GdkScreen*")
- (parameters
- '("GdkDisplay*" "display")
- '("gint*" "monitor_return")
- )
-)
-
-(define-function gdk_screen_get_fullname
- (c-name "xfce_gdk_screen_get_fullname")
- (return-type "gchar*")
- (parameters
- '("GdkScreen*" "screen")
- )
-)
-
-(define-function gdk_spawn_on_screen
- (c-name "xfce_gdk_spawn_on_screen")
- (return-type "gboolean")
- (parameters
- '("GdkScreen*" "screen")
- '("const-gchar*" "working_directory")
- '("gchar**" "argv")
- '("gchar**" "envp")
- '("GSpawnFlags" "flags")
- '("GSpawnChildSetupFunc" "child_setup")
- '("gpointer" "user_data")
- '("gint*" "child_pid")
- '("GError**" "error")
- )
-)
-
-(define-function gdk_spawn_on_screen_with_pipes
- (c-name "xfce_gdk_spawn_on_screen_with_pipes")
- (return-type "gboolean")
- (parameters
- '("GdkScreen*" "screen")
- '("const-gchar*" "working_directory")
- '("gchar**" "argv")
- '("gchar**" "envp")
- '("GSpawnFlags" "flags")
- '("GSpawnChildSetupFunc" "child_setup")
- '("gpointer" "user_data")
- '("gint*" "child_pid")
- '("gint*" "standard_input")
- '("gint*" "standard_output")
- '("gint*" "standard_error")
- '("GError**" "error")
- )
-)
-
-(define-function gdk_spawn_command_line_on_screen
- (c-name "xfce_gdk_spawn_command_line_on_screen")
- (return-type "gboolean")
- (parameters
- '("GdkScreen*" "screen")
- '("const-gchar*" "command_line")
- '("GError**" "error")
- )
-)
-
-
diff --git a/gui/gdk_extensions.c b/gui/gdk_extensions.c
deleted file mode 100644
index 9cf6183..0000000
--- a/gui/gdk_extensions.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "gdk_extensions.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#undef GDK_DISPLAY
-#define GDK_DISPLAY(object) (GDK_DISPLAY_OBJECT(object))
-
-#line 16 "gdk_extensions.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGdkDisplay_Type;
-#define PyGdkDisplay_Type (*_PyGdkDisplay_Type)
-static PyTypeObject *_PyGdkScreen_Type;
-#define PyGdkScreen_Type (*_PyGdkScreen_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 30 "gdk_extensions.c"
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_xfce_gdk_display_get_fullname(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "display", NULL };
- PyGObject *display;
- gchar *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:gdk_display_get_fullname", kwlist, &PyGdkDisplay_Type, &display))
- return NULL;
- ret = xfce_gdk_display_get_fullname(GDK_DISPLAY(display->obj));
- if (ret) {
- PyObject *py_ret = PyString_FromString(ret);
- g_free(ret);
- return py_ret;
- }
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_gdk_screen_get_fullname(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "screen", NULL };
- PyGObject *screen;
- gchar *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:gdk_screen_get_fullname", kwlist, &PyGdkScreen_Type, &screen))
- return NULL;
- ret = xfce_gdk_screen_get_fullname(GDK_SCREEN(screen->obj));
- if (ret) {
- PyObject *py_ret = PyString_FromString(ret);
- g_free(ret);
- return py_ret;
- }
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_gdk_spawn_command_line_on_screen(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "screen", "command_line", NULL };
- PyGObject *screen;
- char *command_line;
- int ret;
- GError *error = NULL;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!s:gdk_spawn_command_line_on_screen", kwlist, &PyGdkScreen_Type, &screen, &command_line))
- return NULL;
- ret = xfce_gdk_spawn_command_line_on_screen(GDK_SCREEN(screen->obj), command_line, &error);
- if (pyg_error_check(&error))
- return NULL;
- return PyBool_FromLong(ret);
-
-}
-
-PyMethodDef pygdk_extensions_functions[] = {
- { "gdk_display_get_fullname", (PyCFunction)_wrap_xfce_gdk_display_get_fullname, METH_VARARGS|METH_KEYWORDS },
- { "gdk_screen_get_fullname", (PyCFunction)_wrap_xfce_gdk_screen_get_fullname, METH_VARARGS|METH_KEYWORDS },
- { "gdk_spawn_command_line_on_screen", (PyCFunction)_wrap_xfce_gdk_spawn_command_line_on_screen, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pygdk_extensions_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkDisplay_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Display");
- if (_PyGdkDisplay_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Display from gtk.gdk");
- return;
- }
- _PyGdkScreen_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Screen");
- if (_PyGdkScreen_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Screen from gtk.gdk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk.gdk");
- return;
- }
-
-
-#line 141 "gdk_extensions.c"
-}
diff --git a/gui/gdk_extensions.defs b/gui/gdk_extensions.defs
deleted file mode 100644
index 47d5392..0000000
--- a/gui/gdk_extensions.defs
+++ /dev/null
@@ -1,78 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-
-;; From xfce-gdk-extensions.h
-
-(define-function gdk_display_get_fullname
- (c-name "xfce_gdk_display_get_fullname")
- (return-type "gchar*")
- (parameters
- '("GdkDisplay*" "display")
- )
-)
-
-(define-function gdk_display_locate_monitor_with_pointer
- (c-name "xfce_gdk_display_locate_monitor_with_pointer")
- (return-type "GdkScreen*")
- (parameters
- '("GdkDisplay*" "display")
- '("gint*" "monitor_return")
- )
-)
-
-(define-function gdk_screen_get_fullname
- (c-name "xfce_gdk_screen_get_fullname")
- (return-type "gchar*")
- (parameters
- '("GdkScreen*" "screen")
- )
-)
-
-(define-function gdk_spawn_on_screen
- (c-name "xfce_gdk_spawn_on_screen")
- (return-type "gboolean")
- (parameters
- '("GdkScreen*" "screen")
- '("const-gchar*" "working_directory")
- '("gchar**" "argv")
- '("gchar**" "envp")
- '("GSpawnFlags" "flags")
- '("GSpawnChildSetupFunc" "child_setup")
- '("gpointer" "user_data")
- '("gint*" "child_pid")
- '("GError**" "error")
- )
-)
-
-(define-function gdk_spawn_on_screen_with_pipes
- (c-name "xfce_gdk_spawn_on_screen_with_pipes")
- (return-type "gboolean")
- (parameters
- '("GdkScreen*" "screen")
- '("const-gchar*" "working_directory")
- '("gchar**" "argv")
- '("gchar**" "envp")
- '("GSpawnFlags" "flags")
- '("GSpawnChildSetupFunc" "child_setup")
- '("gpointer" "user_data")
- '("gint*" "child_pid")
- '("gint*" "standard_input")
- '("gint*" "standard_output")
- '("gint*" "standard_error")
- '("GError**" "error")
- )
-)
-
-(define-function gdk_spawn_command_line_on_screen
- (c-name "xfce_gdk_spawn_command_line_on_screen")
- (return-type "gboolean")
- (parameters
- '("GdkScreen*" "screen")
- '("const-gchar*" "command_line")
- '("GError**" "error")
- )
-)
-
-
diff --git a/gui/gen b/gui/gen
deleted file mode 100755
index 91b8e3d..0000000
--- a/gui/gen
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-
-inc="`pkg-config --variable=includedir libxfcegui4-1.0`"/xfce4
-
-for s in "${inc}"/libxfcegui4/*.h
-do
- t="${s##*/}"
-
- t="${t%.h}"
-
- if [ "${t#netk-}" = "$t" ]
- then
- defs="${t/-/_}.defs"
- defs="${defs/-/_}"
- python /usr/share/pygtk/2.0/codegen/h2def.py "$s" >"${defs}"
- fi
-done
-rm -f util.defs
-
-for s in xfce_*.defs
-do
- t="${s#xfce_}"
- mv "$s" "$t"
-done
-
-#mmv -o 'xfce-*.defs' '#1.defs'
-#rm -f libxfce4util.defs
-#rm -f libxfce4util-config.defs
-#rm -f generics.defs
-#rm -f debug.defs
-
-rm -f libnetk.defs
-rm -f marshal.defs
-rm -f preview_filesel.* # totally weird
-rm -f xinerama* # obsolete
-# rm -f icontheme.defs # ?
-
-# fix up the enums:
-
-#egrep -v '(gtype-id "(XFCE_TYPE_CLOCK_LED_SIZE|XFCE_TYPE_CLOCK_MODE)")' clock.defs >clock.defs.new && mv clock.defs.new clock.defs
-#egrep -v '(gtype-id "XFCE_TYPE_DECORBUTTON_TYPE")' decorbutton.defs >decorbutton.defs.new && mv decorbutton.defs.new decorbutton.defs
-#egrep -v '(gtype-id "XFCE_TYPE_FILE_CHOOSER_ACTION")' filechooser.defs >filechooser.defs.new && mv filechooser.defs.new filechooser.defs
-#egrep -v '(gtype-id "XFCE_TYPE_FILTER_STATUS")' gtktoxevent.defs >gtktoxevent.defs.new && mv gtktoxevent.defs.new gtktoxevent.defs
-#egrep -v '(gtype-id "XFCE_TYPE_ICON_THEME_CATEGORY")' icontheme.defs \
-# |sed -e 's;"icon-category-;";' \
-# |grep -v "n-builtin-icon-categories" \
-# >icontheme.defs.new && mv icontheme.defs.new icontheme.defs
-#egrep -v '(gtype-id "(SESSION_TYPE_INTERACT_STYLE|SESSION_TYPE_RESTART_STYLE|SESSION_TYPE_CLIENT_STATE)")' \
-# session_client.defs >session_client.defs.new && mv session_client.defs.new session_client.defs
-sed -e 's;(define-function xfce_themed_icon_lookup;(define-function themed_icon_lookup;' \
- -e 's;(define-function xfce_themed_icon_add_search_path;(define-function themed_icon_add_search_path;' \
- -e 's;(define-function xfce_set_icon_theme;(define-function themed_icon_set_icon_theme;' \
- icons.defs >icons.defs.new && mv icons.defs.new icons.defs
-
-sed \
- -e 's;(define-function xfce_confirm;(define-function confirm;' \
- dialogs.defs > dialogs.defs.new && mv dialogs.defs.new dialogs.defs
-
-sed \
- -e 's;(define-function xfce_app_menu_item_set_icon_size;(define-function app_menu_item_set_icon_size;' \
- -e 's;(define-function xfce_app_menu_item_set_icon_theme_name;(define-function app_menu_item_set_icon_theme_name;' \
- appmenuitem.defs >appmenuitem.defs.new && mv appmenuitem.defs.new appmenuitem.defs
-
-for s in *.defs
-do
- sed -e 's;(define-function xfce_;(define-function ;' "$s" >"${s}.new" && mv "${s}.new" "$s"
-done
-
-cat >>icontheme.defs << EOF
-
-(define-function icon_theme_new
- (c-name "xfce_icon_theme_new")
- (is-constructor-of "XfceIconTheme")
- (return-type "XfceIconTheme*")
- (parameters
- '("GdkScreen*" "screen")
- )
-)
-
-(object IconTheme
- (in-module (Xfce))
- (parent Object)
- (c-name XfceIconTheme)
-)
-EOF
-
-cat >>aboutdialog.defs << EOF
-
-(object AboutDialog
- (in-module (Xfce))
- (parent Dialog (Gtk))
- (c-name XfceIconTheme)
- (field (type-and-name gchar* program) (access readwrite))
- (field (type-and-name gchar* version) (access readwrite))
- (field (type-and-name GdkPixbuf* icon) (access readwrite))
- (field (type-and-name gchar* description) (access readwrite))
- (field (type-and-name gchar* copyright) (access readwrite))
- (field (type-and-name gchar* license) (access readwrite))
- (field (type-and-name gchar* homepage) (access readwrite))
-)
-EOF
-# TODO: credits
-
-cat >>appmenuitem.defs << EOF
-(object AppMenuItem
- (in-module (gui))
- (parent Object)
- (c-name XfceAppMenuItem)
- (field (type-and-name gchar* needs_term) (access readwrite))
- (field (type-and-name gchar* command) (access readwrite))
- (field (type-and-name gchar* icon_name) (access readwrite))
-)
-EOF
-
-grep -v '(is-constructor-of "XfceAboutDialog")' aboutdialog.defs \
- |sed -e 's;(c-name "xfce_about_dialog_new_empty");(c-name "xfce_about_dialog_new_empty")\
- (is-constructor-of "XfceAboutDialog");' \
- >aboutdialog.defs.new && mv aboutdialog.defs.new aboutdialog.defs
-
diff --git a/gui/gen-libnetk.c b/gui/gen-libnetk.c
deleted file mode 100644
index e69de29..0000000
diff --git a/gui/gen-marshal.c b/gui/gen-marshal.c
deleted file mode 100644
index e69de29..0000000
diff --git a/gui/gen-session-client.c b/gui/gen-session-client.c
deleted file mode 100644
index e69de29..0000000
diff --git a/gui/gtk-extensions.defs b/gui/gtk-extensions.defs
deleted file mode 100644
index 2ea65e9..0000000
--- a/gui/gtk-extensions.defs
+++ /dev/null
@@ -1,26 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-
-;; From /usr/local/include/xfce4/libxfcegui4/xfce-gtk-extensions.h
-
-(define-function gtk_window_center_on_monitor
- (c-name "xfce_gtk_window_center_on_monitor")
- (return-type "none")
- (parameters
- '("GtkWindow*" "window")
- '("GdkScreen*" "screen")
- '("gint" "monitor")
- )
-)
-
-(define-function gtk_window_center_on_monitor_with_pointer
- (c-name "xfce_gtk_window_center_on_monitor_with_pointer")
- (return-type "none")
- (parameters
- '("GtkWindow*" "window")
- )
-)
-
-
diff --git a/gui/gtk_extensions.c b/gui/gtk_extensions.c
deleted file mode 100644
index 09dbed5..0000000
--- a/gui/gtk_extensions.c
+++ /dev/null
@@ -1,116 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "gtk_extensions.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#line 13 "gtk_extensions.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGtkWindow_Type;
-#define PyGtkWindow_Type (*_PyGtkWindow_Type)
-static PyTypeObject *_PyGdkScreen_Type;
-#define PyGdkScreen_Type (*_PyGdkScreen_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 27 "gtk_extensions.c"
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_xfce_gtk_window_center_on_monitor(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "window", "screen", "monitor", NULL };
- PyGObject *window, *screen;
- int monitor;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!O!i:gtk_window_center_on_monitor", kwlist, &PyGtkWindow_Type, &window, &PyGdkScreen_Type, &screen, &monitor))
- return NULL;
- xfce_gtk_window_center_on_monitor(GTK_WINDOW(window->obj), GDK_SCREEN(screen->obj), monitor);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_gtk_window_center_on_monitor_with_pointer(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "window", NULL };
- PyGObject *window;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:gtk_window_center_on_monitor_with_pointer", kwlist, &PyGtkWindow_Type, &window))
- return NULL;
- xfce_gtk_window_center_on_monitor_with_pointer(GTK_WINDOW(window->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-PyMethodDef pygtk_extensions_functions[] = {
- { "gtk_window_center_on_monitor", (PyCFunction)_wrap_xfce_gtk_window_center_on_monitor, METH_VARARGS|METH_KEYWORDS },
- { "gtk_window_center_on_monitor_with_pointer", (PyCFunction)_wrap_xfce_gtk_window_center_on_monitor_with_pointer, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pygtk_extensions_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkWindow_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Window");
- if (_PyGtkWindow_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Window from gtk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return;
- }
- if ((module = PyImport_ImportModule("gtk.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkScreen_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Screen");
- if (_PyGdkScreen_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Screen from gtk.gdk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk.gdk");
- return;
- }
-
-
-#line 116 "gtk_extensions.c"
-}
diff --git a/gui/gtk_extensions.defs b/gui/gtk_extensions.defs
deleted file mode 100644
index 3524590..0000000
--- a/gui/gtk_extensions.defs
+++ /dev/null
@@ -1,26 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-
-;; From xfce-gtk-extensions.h
-
-(define-function gtk_window_center_on_monitor
- (c-name "xfce_gtk_window_center_on_monitor")
- (return-type "none")
- (parameters
- '("GtkWindow*" "window")
- '("GdkScreen*" "screen")
- '("gint" "monitor")
- )
-)
-
-(define-function gtk_window_center_on_monitor_with_pointer
- (c-name "xfce_gtk_window_center_on_monitor_with_pointer")
- (return-type "none")
- (parameters
- '("GtkWindow*" "window")
- )
-)
-
-
diff --git a/gui/gtk_style.c b/gui/gtk_style.c
deleted file mode 100644
index 44c7a5d..0000000
--- a/gui/gtk_style.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "gtk_style.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#line 13 "gtk_style.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGtkWidget_Type;
-#define PyGtkWidget_Type (*_PyGtkWidget_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 25 "gtk_style.c"
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_get_style(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "widget", "name", "state", NULL };
- PyGObject *widget;
- char *name, *state;
- gchar *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!ss:get_style", kwlist, &PyGtkWidget_Type, &widget, &name, &state))
- return NULL;
- ret = get_style(GTK_WIDGET(widget->obj), name, state);
- if (ret) {
- PyObject *py_ret = PyString_FromString(ret);
- g_free(ret);
- return py_ret;
- }
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_get_style_gc(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "widget", "state", "style", NULL };
- PyGObject *widget;
- char *state, *style;
- GdkGC *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!ss:get_style_gc", kwlist, &PyGtkWidget_Type, &widget, &state, &style))
- return NULL;
- ret = get_style_gc(GTK_WIDGET(widget->obj), state, style);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-PyMethodDef pygtk_style_functions[] = {
- { "get_style", (PyCFunction)_wrap_get_style, METH_VARARGS|METH_KEYWORDS },
- { "get_style_gc", (PyCFunction)_wrap_get_style_gc, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pygtk_style_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkWidget_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Widget");
- if (_PyGtkWidget_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Widget from gtk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return;
- }
-
-
-#line 108 "gtk_style.c"
-}
diff --git a/gui/gtk_style.defs b/gui/gtk_style.defs
deleted file mode 100644
index 038ede5..0000000
--- a/gui/gtk_style.defs
+++ /dev/null
@@ -1,44 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-
-;; From gtk_style.h
-
-(define-function get_style
- (c-name "get_style")
- (return-type "gchar*")
- (parameters
- '("GtkWidget*" "widget")
- '("const-gchar*" "name")
- '("const-gchar*" "state")
- )
-)
-
-(define-function get_style_gc
- (c-name "get_style_gc")
- (return-type "GdkGC*")
- (parameters
- '("GtkWidget*" "widget")
- '("const-gchar*" "state")
- '("const-gchar*" "style")
- )
-)
-
-(define-function get_font_desc
- (c-name "get_font_desc")
- (return-type "PangoFontDescription*")
- (parameters
- '("GtkWidget*" "widget")
- )
-)
-
-(define-function pango_get_context
- (c-name "pango_get_context")
- (return-type "PangoContext*")
- (parameters
- '("GtkWidget*" "widget")
- )
-)
-
-
diff --git a/gui/gtk_style.override b/gui/gtk_style.override
deleted file mode 100644
index 58df928..0000000
--- a/gui/gtk_style.override
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-%%
-include
-%%
-modulename gtkstyle
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.Widget as PyGtkWidget_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/gui/gtktoxevent.c b/gui/gtktoxevent.c
deleted file mode 100644
index 4a7e181..0000000
--- a/gui/gtktoxevent.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "gtktoxevent.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-#include <libxfcegui4/gui-enum-types.h>
-
-#define XFCE_TYPE_FILTER_STATUS GUI_TYPE_FILTER_STATUS
-
-#line 16 "gtktoxevent.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGdkScreen_Type;
-#define PyGdkScreen_Type (*_PyGdkScreen_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 28 "gtktoxevent.c"
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_xfce_add_event_win(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "gscr", "event_mask", NULL };
- PyGObject *gscr;
- GdkWindow *ret;
- long event_mask;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!l:add_event_win", kwlist, &PyGdkScreen_Type, &gscr, &event_mask))
- return NULL;
- ret = xfce_add_event_win(GDK_SCREEN(gscr->obj), event_mask);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_closeEventFilter(PyObject *self)
-{
- closeEventFilter();
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_getDefaultGtkWidget(PyObject *self)
-{
- GtkWidget *ret;
-
- ret = getDefaultGtkWidget();
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_getGdkEventWindow(PyObject *self)
-{
- GdkWindow *ret;
-
- ret = getGdkEventWindow();
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_getDefaultGdkWindow(PyObject *self)
-{
- GdkWindow *ret;
-
- ret = getDefaultGdkWindow();
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-PyMethodDef pygtktoxevent_functions[] = {
- { "add_event_win", (PyCFunction)_wrap_xfce_add_event_win, METH_VARARGS|METH_KEYWORDS },
- { "closeEventFilter", (PyCFunction)_wrap_closeEventFilter, METH_NOARGS },
- { "getDefaultGtkWidget", (PyCFunction)_wrap_getDefaultGtkWidget, METH_NOARGS },
- { "getGdkEventWindow", (PyCFunction)_wrap_getGdkEventWindow, METH_NOARGS },
- { "getDefaultGdkWindow", (PyCFunction)_wrap_getDefaultGdkWindow, METH_NOARGS },
- { NULL, NULL, 0 }
-};
-
-
-/* ----------- enums and flags ----------- */
-
-void
-pygtktoxevent_add_constants(PyObject *module, const gchar *strip_prefix)
-{
- pyg_enum_add(module, "FilterStatus", strip_prefix, XFCE_TYPE_FILTER_STATUS);
-
- if (PyErr_Occurred())
- PyErr_Print();
-}
-
-/* initialise stuff extension classes */
-void
-pygtktoxevent_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkScreen_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Screen");
- if (_PyGdkScreen_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Screen from gtk.gdk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk.gdk");
- return;
- }
-
-
-#line 144 "gtktoxevent.c"
-}
diff --git a/gui/gtktoxevent.defs b/gui/gtktoxevent.defs
deleted file mode 100644
index 6d6f7a2..0000000
--- a/gui/gtktoxevent.defs
+++ /dev/null
@@ -1,110 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-(define-enum FilterStatus
- (in-module "Xfce")
- (c-name "XfceFilterStatus")
- (gtype-id "XFCE_TYPE_FILTER_STATUS")
- (values
- '("stop" "XEV_FILTER_STOP")
- '("continue" "XEV_FILTER_CONTINUE")
- )
-)
-
-
-;; From gtktoxevent.h
-
-(define-function push_event_filter
- (c-name "xfce_push_event_filter")
- (return-type "XfceFilterStack*")
- (parameters
- '("XfceFilterSetup*" "setup")
- '("XfceFilter" "filter")
- '("gpointer" "data")
- )
-)
-
-(define-function pop_event_filter
- (c-name "xfce_pop_event_filter")
- (return-type "XfceFilterStack*")
- (parameters
- '("XfceFilterSetup*" "setup")
- )
-)
-
-(define-function add_event_win
- (c-name "xfce_add_event_win")
- (return-type "GdkWindow*")
- (parameters
- '("GdkScreen*" "gscr")
- '("long" "event_mask")
- )
-)
-
-(define-function init_event_filter
- (c-name "xfce_init_event_filter")
- (return-type "XfceFilterSetup*")
- (parameters
- '("gpointer" "data")
- )
-)
-
-(define-function close_event_filter
- (c-name "xfce_close_event_filter")
- (return-type "none")
- (parameters
- '("XfceFilterSetup*" "setup")
- )
-)
-
-(define-function pushEventFilter
- (c-name "pushEventFilter")
- (return-type "GtkToXEventFilterStack*")
- (parameters
- '("GtkToXEventFilter" "filter")
- '("gpointer" "data")
- )
-)
-
-(define-function popEventFilter
- (c-name "popEventFilter")
- (return-type "GtkToXEventFilterStack*")
-)
-
-(define-function initEventFilter
- (c-name "initEventFilter")
- (return-type "GtkToXEventFilterStack*")
- (parameters
- '("long" "event_mask")
- '("gpointer" "data")
- '("const-gchar*" "widget_name")
- )
-)
-
-(define-function closeEventFilter
- (c-name "closeEventFilter")
- (return-type "none")
-)
-
-(define-function getDefaultGtkWidget
- (c-name "getDefaultGtkWidget")
- (return-type "GtkWidget*")
-)
-
-(define-function getDefaultXWindow
- (c-name "getDefaultXWindow")
- (return-type "Window")
-)
-
-(define-function getGdkEventWindow
- (c-name "getGdkEventWindow")
- (return-type "GdkWindow*")
-)
-
-(define-function getDefaultGdkWindow
- (c-name "getDefaultGdkWindow")
- (return-type "GdkWindow*")
-)
-
-
diff --git a/gui/gtktoxevent.override b/gui/gtktoxevent.override
deleted file mode 100644
index 545ea89..0000000
--- a/gui/gtktoxevent.override
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-#include <libxfcegui4/gui-enum-types.h>
-
-#define XFCE_TYPE_FILTER_STATUS GUI_TYPE_FILTER_STATUS
-
-%%
-include
-%%
-modulename gtktoxevent
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.gdk.Screen as PyGdkScreen_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/gui/gui.py b/gui/gui.py
deleted file mode 100644
index b5b78bb..0000000
--- a/gui/gui.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env python
-
-from _gui import *
-
-#!/usr/bin/env python
-
-import xfce4
-import gtk
-import os
-
-def spawn_xyz(name, spawner, use_startup_notification = True, screen = None, environment = None):
- if screen == None:
- screen = gtk.gdk.screen_get_default()
-
- if use_startup_notification == True:
- id = xfce4.gui.startup_notification_start(screen, name)
- else:
- id = None
-
- if environment == None:
- environment = os.environ
-
- new_environment = environment.copy()
- if id != None: # want startup notification
- new_environment[xfce4.gui.STARTUP_NOTIFICATION_ID_KEY] = id
-
- ret = spawner(new_environment)
- if ret < 0:
- if id != None:
- xfce4.gui.startup_notification_cancel(id)
-
- return ret
-
-def spawn_command_line_cb(command_line, new_environment):
- old_environment = os.environ
- os.environ = new_environment
- ret = os.system(command_line)
- os.environ = old_environment
- return ret
-
-def get_executable_by_command_line(command_line):
- if isinstance(command_line, list):
- if len(command_line) > 0:
- executable = command_line[0]
- else:
- return None
- else:
- foo = command_line.split(" ")
- if len(foo) >= 1:
- executable = foo[0]
- else:
- return None
-
- if executable.startswith("\""):
- executable = executable[1:]
- if executable.startswith("'"):
- executable = executable[1:]
- if executable.endswith("\""):
- executable = executable[:-1]
- if executable.endswith("'"):
- executable = executable[:-1]
-
- return executable
-
-def spawn_command_line(command_line, in_terminal = False, use_startup_notification = True, screen = None, environment = None):
- name = get_executable_by_command_line(command_line)
- if name == None:
- name = "???"
-
- if in_terminal == True:
- command_line = "xfterm4 -e " + command_line
-
- return spawn_xyz(name, lambda x: spawn_command_line_cb(command_line + " &", x), use_startup_notification, screen, environment)
-
-def spawn_args(args, use_startup_notification = True, screen = None, environment = None):
- name = args[0]
- return spawn_xyz(name, lambda x: os.spawnle(os.P_NOWAIT, args[0], args, x), use_startup_notification, screen, environment)
-
diff --git a/gui/guimodule.c b/gui/guimodule.c
deleted file mode 100644
index 72da958..0000000
--- a/gui/guimodule.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <locale.h>
-
-/* include this first, before NO_IMPORT_PYGOBJECT is defined */
-#include <pygobject.h>
-#include <pyerrors.h>
-
-#include <libxfcegui4/libxfcegui4.h>
-
-extern PyMethodDef pyaboutdialog_functions[];
-extern PyMethodDef pyappmenuitem_functions[];
-extern PyMethodDef pyclock_functions[];
-extern PyMethodDef pycolorbutton_functions[];
-extern PyMethodDef pydecorbutton_functions[];
-extern PyMethodDef pydecortoggle_functions[];
-extern PyMethodDef pydialogs_functions[];
-extern PyMethodDef pyfilechooser_functions[];
-extern PyMethodDef pyframebox_functions[];
-extern PyMethodDef pygdk_extensions_functions[];
-extern PyMethodDef pygtk_extensions_functions[];
-extern PyMethodDef pygtk_style_functions[];
-extern PyMethodDef pygtktoxevent_functions[];
-extern PyMethodDef pyiconbutton_functions[];
-extern PyMethodDef pyicons_functions[];
-extern PyMethodDef pyicontheme_functions[];
-extern PyMethodDef pymenubutton_functions[];
-extern PyMethodDef pymovehandler_functions[];
-extern PyMethodDef pyscaled_image_functions[];
-extern PyMethodDef pysession_client_functions[];
-extern PyMethodDef pysystemtray_functions[];
-extern PyMethodDef pytitled_dialog_functions[];
-extern PyMethodDef pytogglebutton_functions[];
-extern PyMethodDef pystartup_notification_functions[];
-
-void pyaboutdialog_register_classes(PyObject *d);
-void pyappmenuitem_register_classes(PyObject *d);
-void pyclock_register_classes(PyObject *d);
-void pycolorbutton_register_classes(PyObject *d);
-void pydecorbutton_register_classes(PyObject *d);
-void pydecortoggle_register_classes(PyObject *d);
-void pydialogs_register_classes(PyObject *d);
-void pyfilechooser_register_classes(PyObject *d);
-void pyframebox_register_classes(PyObject *d);
-void pygdk_extensions_register_classes(PyObject *d);
-void pygtk_extensions_register_classes(PyObject *d);
-void pygtk_style_register_classes(PyObject *d);
-void pygtktoxevent_register_classes(PyObject *d);
-void pyiconbutton_register_classes(PyObject *d);
-void pyicons_register_classes(PyObject *d);
-void pyicontheme_register_classes(PyObject *d);
-void pymenubutton_register_classes(PyObject *d);
-void pymovehandler_register_classes(PyObject *d);
-void pyscaled_image_register_classes(PyObject *d);
-void pysession_client_register_classes(PyObject *d);
-void pysystemtray_register_classes(PyObject *d);
-void pytitled_dialog_register_classes(PyObject *d);
-void pytogglebutton_register_classes(PyObject *d);
-void pystartup_notification_register_classes(PyObject* d);
-
-void pyclock_add_constants(PyObject *module, const gchar *strip_prefix);
-void pydecorbutton_add_constants(PyObject *module, const gchar *strip_prefix);
-void pyfilechooser_add_constants(PyObject *module, const gchar *strip_prefix);
-void pygtktoxevent_add_constants(PyObject *module, const gchar *strip_prefix);
-void pysession_client_add_constants(PyObject *module, const gchar *strip_prefix);
-
-
-static PyMethodDef all_functions[1000];
-
-static PyMethodDef* each_functions[] = {
- pyaboutdialog_functions,
- pyappmenuitem_functions,
- pyclock_functions,
- pycolorbutton_functions,
- pydecorbutton_functions,
- pydecortoggle_functions,
- pydialogs_functions,
- pyfilechooser_functions,
- pyframebox_functions,
- pygdk_extensions_functions,
- pygtk_extensions_functions,
- pygtk_style_functions,
- pygtktoxevent_functions,
- pyiconbutton_functions,
- pyicons_functions,
- pyicontheme_functions,
- pymenubutton_functions,
- pymovehandler_functions,
- pyscaled_image_functions,
- pysession_client_functions,
- pysystemtray_functions,
- pytitled_dialog_functions,
- pytogglebutton_functions,
- pystartup_notification_functions,
-};
-
-static void
-my_register1()
-{
- PyObject *m, *d;
- int i;
- int j;
- int cnt;
-
- cnt = 0;
-
- for(i = 0; i < sizeof(each_functions) / sizeof(each_functions[0]); i++) {
- for(j = 0; each_functions[i][j].ml_name != NULL; j++) {
- if (cnt >= sizeof(all_functions) / sizeof(all_functions[0])) {
- fprintf (stderr, "pyxfce: Internal Error: too many functions");
- exit (1);
- }
-
- all_functions[cnt++] = each_functions[i][j];
- }
- }
-
- m = Py_InitModule("_gui", all_functions);
-
- pyclock_add_constants(m, "XFCE_");
- pydecorbutton_add_constants(m, "XFCE_");
- pyfilechooser_add_constants(m, "XFCE_");
- pygtktoxevent_add_constants(m, "XFCE_");
- pysession_client_add_constants(m, "XFCE_");
-
- PyModule_AddStringConstant(m, "STARTUP_NOTIFICATION_ID_KEY", XFCE_STARTUP_NOTIFICATION_ENVIRONMENT_DESKTOP_STARTUP_ID);
-
- d = PyModule_GetDict(m);
- pyaboutdialog_register_classes (d);
- pyappmenuitem_register_classes (d);
- pyclock_register_classes (d);
- pycolorbutton_register_classes (d);
- pydecorbutton_register_classes (d);
- pydecortoggle_register_classes (d);
- pydialogs_register_classes (d);
- pyfilechooser_register_classes (d);
- pyframebox_register_classes (d);
- pygdk_extensions_register_classes (d);
- pygtk_extensions_register_classes (d);
- pygtk_style_register_classes (d);
- pygtktoxevent_register_classes (d);
- pyiconbutton_register_classes (d);
- pyicons_register_classes (d);
- pyicontheme_register_classes (d);
- pymenubutton_register_classes (d);
- pymovehandler_register_classes (d);
- pyscaled_image_register_classes (d);
- pysession_client_register_classes (d);
- pysystemtray_register_classes (d);
- pytitled_dialog_register_classes (d);
- pytogglebutton_register_classes (d);
- pystartup_notification_register_classes (d);
-}
-
-DL_EXPORT(void)
-init_gui(void)
-{
- /* set the default python encoding to utf-8 */
- PyUnicode_SetDefaultEncoding("utf-8");
-
- init_pygobject ();
-
- my_register1 ();
-}
-
-
-#if 0
-DL_EXPORT(void)
-init_gui(void)
-{
- /* set the default python encoding to utf-8 */
- PyUnicode_SetDefaultEncoding("utf-8");
-
- init_pygobject ();
- Py_InitModule("gui", NULL);
- /*Py_InitModule3*/
-
- my_register ("aboutdialog", pyaboutdialog_functions, pyaboutdialog_register_classes);
- my_register ("appmenuitem", pyappmenuitem_functions, pyappmenuitem_register_classes);
- my_register ("clock", pyclock_functions, pyclock_register_classes);
- my_register ("colorbutton", pycolorbutton_functions, pycolorbutton_register_classes);
- my_register ("decorbutton", pydecorbutton_functions, pydecorbutton_register_classes);
- my_register ("decortoggle", pydecortoggle_functions, pydecortoggle_register_classes);
- my_register ("dialogs", pydialogs_functions, pydialogs_register_classes);
- my_register ("filechooser", pyfilechooser_functions, pyfilechooser_register_classes);
- my_register ("framebox", pyframebox_functions, pyframebox_register_classes);
- my_register ("gdkextensions", pygdk_extensions_functions, pygdk_extensions_register_classes);
- my_register ("gtkextensions", pygtk_extensions_functions, pygtk_extensions_register_classes);
- my_register ("gtkstyle", pygtk_style_functions, pygtk_style_register_classes);
- my_register ("gtktoxevent", pygtktoxevent_functions, pygtktoxevent_register_classes);
- my_register ("iconbutton", pyiconbutton_functions, pyiconbutton_register_classes);
- my_register ("icons", pyicons_functions, pyicons_register_classes);
- my_register ("icontheme", pyicontheme_functions, pyicontheme_register_classes);
- my_register ("menubutton", pymenubutton_functions, pymenubutton_register_classes);
- my_register ("movehandler", pymovehandler_functions, pymovehandler_register_classes);
- my_register ("scaledimage", pyscaled_image_functions, pyscaled_image_register_classes);
- my_register ("sessionclient", pysession_client_functions, pysession_client_register_classes);
- my_register ("systemtray", pysystemtray_functions, pysystemtray_register_classes);
- my_register ("togglebutton", pytogglebutton_functions, pytogglebutton_register_classes);
-}
-#endif
diff --git a/gui/iconbutton.c b/gui/iconbutton.c
deleted file mode 100644
index 98dfbb0..0000000
--- a/gui/iconbutton.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "iconbutton.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#ifndef XFCE_TYPE_ICONBUTTON
-#define XFCE_TYPE_ICONBUTTON (xfce_iconbutton_get_type ())
-#endif
-
-#line 17 "iconbutton.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGdkPixbuf_Type;
-#define PyGdkPixbuf_Type (*_PyGdkPixbuf_Type)
-static PyTypeObject *_PyGtkButton_Type;
-#define PyGtkButton_Type (*_PyGtkButton_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceIconbutton_Type;
-
-#line 32 "iconbutton.c"
-
-
-
-/* ----------- XfceIconbutton ----------- */
-
-static int
-_wrap_xfce_iconbutton_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char* kwlist[] = { NULL };
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, ":iconbutton.Iconbutton.__init__", kwlist))
- return -1;
-
- pygobject_constructv(self, 0, NULL);
-
- if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create %(typename)s object");
- return -1;
- }
-
- return 0;
-}
-
-
-static PyObject *
-_wrap_xfce_iconbutton_set_pixbuf(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "pixbuf", NULL };
- PyGObject *pixbuf;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:XfceIconbutton.set_pixbuf", kwlist, &PyGdkPixbuf_Type, &pixbuf))
- return NULL;
- xfce_iconbutton_set_pixbuf(XFCE_ICONBUTTON(self->obj), GDK_PIXBUF(pixbuf->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyMethodDef _PyXfceIconbutton_methods[] = {
- { "set_pixbuf", (PyCFunction)_wrap_xfce_iconbutton_set_pixbuf, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-PyTypeObject PyXfceIconbutton_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "iconbutton.Iconbutton", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceIconbutton_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_iconbutton_new, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_xfce_iconbutton_new_from_pixbuf(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "pb", NULL };
- PyGObject *pb;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:iconbutton_new_from_pixbuf", kwlist, &PyGdkPixbuf_Type, &pb))
- return NULL;
- ret = xfce_iconbutton_new_from_pixbuf(GDK_PIXBUF(pb->obj));
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-PyMethodDef pyiconbutton_functions[] = {
- { "iconbutton_new_from_pixbuf", (PyCFunction)_wrap_xfce_iconbutton_new_from_pixbuf, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pyiconbutton_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkButton_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Button");
- if (_PyGtkButton_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Button from gtk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return;
- }
- if ((module = PyImport_ImportModule("gtk.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkPixbuf_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Pixbuf");
- if (_PyGdkPixbuf_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Pixbuf from gtk.gdk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk.gdk");
- return;
- }
-
-
-#line 193 "iconbutton.c"
- pygobject_register_class(d, "XfceIconbutton", XFCE_TYPE_ICONBUTTON, &PyXfceIconbutton_Type, Py_BuildValue("(O)", &PyGtkButton_Type));
- pyg_set_object_has_new_constructor(XFCE_TYPE_ICONBUTTON);
-}
diff --git a/gui/iconbutton.defs b/gui/iconbutton.defs
deleted file mode 100644
index 53e72cb..0000000
--- a/gui/iconbutton.defs
+++ /dev/null
@@ -1,43 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object Iconbutton
- (in-module "Xfce")
- (parent "GtkButton")
- (c-name "XfceIconbutton")
- (gtype-id "XFCE_TYPE_ICONBUTTON")
-)
-
-;; Enumerations and flags ...
-
-
-;; From xfce_iconbutton.h
-
-(define-function iconbutton_get_type
- (c-name "xfce_iconbutton_get_type")
- (return-type "GtkType")
-)
-
-(define-function iconbutton_new
- (c-name "xfce_iconbutton_new")
- (is-constructor-of "XfceIconbutton")
- (return-type "GtkWidget*")
-)
-
-(define-function iconbutton_new_from_pixbuf
- (c-name "xfce_iconbutton_new_from_pixbuf")
- (return-type "GtkWidget*")
- (parameters
- '("GdkPixbuf*" "pb")
- )
-)
-
-(define-method set_pixbuf
- (of-object "XfceIconbutton")
- (c-name "xfce_iconbutton_set_pixbuf")
- (return-type "none")
- (parameters
- '("GdkPixbuf*" "pixbuf")
- )
-)
-
-
diff --git a/gui/iconbutton.override b/gui/iconbutton.override
deleted file mode 100644
index 6eb795d..0000000
--- a/gui/iconbutton.override
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#ifndef XFCE_TYPE_ICONBUTTON
-#define XFCE_TYPE_ICONBUTTON (xfce_iconbutton_get_type ())
-#endif
-
-%%
-include
-%%
-modulename iconbutton
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.gdk.Pixbuf as PyGdkPixbuf_Type
-import gtk.Button as PyGtkButton_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/gui/icons.c b/gui/icons.c
deleted file mode 100644
index 3260e70..0000000
--- a/gui/icons.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "icons.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-#include <libxfcegui4/gui-enum-types.h>
-
-#define XFCE_TYPE_ICON_THEME_CATEGORY GUI_TYPE_ICON_THEME_CATEGORY
-#line 15 "icons.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGdkPixbuf_Type;
-#define PyGdkPixbuf_Type (*_PyGdkPixbuf_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 27 "icons.c"
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_xfce_themed_icon_lookup(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "name", "size", NULL };
- char *name;
- int size;
- gchar *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "si:themed_icon_lookup", kwlist, &name, &size))
- return NULL;
- ret = xfce_themed_icon_lookup(name, size);
- if (ret) {
- PyObject *py_ret = PyString_FromString(ret);
- g_free(ret);
- return py_ret;
- }
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_themed_icon_load(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "name", "size", NULL };
- char *name;
- int size;
- GdkPixbuf *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "si:themed_icon_load", kwlist, &name, &size))
- return NULL;
- ret = xfce_themed_icon_load(name, size);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_xfce_themed_icon_lookup_category(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "category", "size", NULL };
- PyObject *py_category = NULL;
- int size;
- gchar *ret;
- XfceIconThemeCategory category;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Oi:themed_icon_lookup_category", kwlist, &py_category, &size))
- return NULL;
- if (pyg_enum_get_value(XFCE_TYPE_ICON_THEME_CATEGORY, py_category, (gint *)&category))
- return NULL;
- ret = xfce_themed_icon_lookup_category(category, size);
- if (ret) {
- PyObject *py_ret = PyString_FromString(ret);
- g_free(ret);
- return py_ret;
- }
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_themed_icon_load_category(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "category", "size", NULL };
- PyObject *py_category = NULL;
- int size;
- GdkPixbuf *ret;
- XfceIconThemeCategory category;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Oi:themed_icon_load_category", kwlist, &py_category, &size))
- return NULL;
- if (pyg_enum_get_value(XFCE_TYPE_ICON_THEME_CATEGORY, py_category, (gint *)&category))
- return NULL;
- ret = xfce_themed_icon_load_category(category, size);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_xfce_themed_icon_add_search_path(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "path", NULL };
- char *path;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:themed_icon_add_search_path", kwlist, &path))
- return NULL;
- xfce_themed_icon_add_search_path(path);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_set_icon_theme(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "theme_name", NULL };
- char *theme_name;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:themed_icon_set_icon_theme", kwlist, &theme_name))
- return NULL;
- xfce_set_icon_theme(theme_name);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_load_themed_icon(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "name", "size", NULL };
- char *name;
- int size;
- GdkPixbuf *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "si:load_themed_icon", kwlist, &name, &size))
- return NULL;
- ret = xfce_load_themed_icon(name, size);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_xfce_pixbuf_new_from_file_at_size(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "filename", "width", "height", NULL };
- char *filename;
- int width, height;
- GdkPixbuf *ret;
- GError *error = NULL;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sii:pixbuf_new_from_file_at_size", kwlist, &filename, &width, &height))
- return NULL;
- ret = xfce_pixbuf_new_from_file_at_size(filename, width, height, &error);
- if (pyg_error_check(&error))
- return NULL;
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-PyMethodDef pyicons_functions[] = {
- { "themed_icon_lookup", (PyCFunction)_wrap_xfce_themed_icon_lookup, METH_VARARGS|METH_KEYWORDS },
- { "themed_icon_load", (PyCFunction)_wrap_xfce_themed_icon_load, METH_VARARGS|METH_KEYWORDS },
- { "themed_icon_lookup_category", (PyCFunction)_wrap_xfce_themed_icon_lookup_category, METH_VARARGS|METH_KEYWORDS },
- { "themed_icon_load_category", (PyCFunction)_wrap_xfce_themed_icon_load_category, METH_VARARGS|METH_KEYWORDS },
- { "themed_icon_add_search_path", (PyCFunction)_wrap_xfce_themed_icon_add_search_path, METH_VARARGS|METH_KEYWORDS },
- { "themed_icon_set_icon_theme", (PyCFunction)_wrap_xfce_set_icon_theme, METH_VARARGS|METH_KEYWORDS },
- { "load_themed_icon", (PyCFunction)_wrap_xfce_load_themed_icon, METH_VARARGS|METH_KEYWORDS },
- { "pixbuf_new_from_file_at_size", (PyCFunction)_wrap_xfce_pixbuf_new_from_file_at_size, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-
-/* ----------- enums and flags ----------- */
-
-void
-pyicons_add_constants(PyObject *module, const gchar *strip_prefix)
-{
- pyg_enum_add(module, "IconThemeCategory", strip_prefix, XFCE_TYPE_ICON_THEME_CATEGORY);
-
- if (PyErr_Occurred())
- PyErr_Print();
-}
-
-/* initialise stuff extension classes */
-void
-pyicons_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkPixbuf_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Pixbuf");
- if (_PyGdkPixbuf_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Pixbuf from gtk.gdk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk.gdk");
- return;
- }
-
-
-#line 228 "icons.c"
-}
diff --git a/gui/icons.defs b/gui/icons.defs
deleted file mode 100644
index ead4b76..0000000
--- a/gui/icons.defs
+++ /dev/null
@@ -1,144 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-(define-enum IconThemeCategory
- (in-module "Xfce")
- (c-name "XfceIconThemeCategory")
- (gtype-id "XFCE_TYPE_ICON_THEME_CATEGORY")
- (values
- '("icon-category-unknown" "XFCE_ICON_CATEGORY_UNKNOWN")
- '("icon-category-editor" "XFCE_ICON_CATEGORY_EDITOR")
- '("icon-category-fileman" "XFCE_ICON_CATEGORY_FILEMAN")
- '("icon-category-utility" "XFCE_ICON_CATEGORY_UTILITY")
- '("icon-category-game" "XFCE_ICON_CATEGORY_GAME")
- '("icon-category-help" "XFCE_ICON_CATEGORY_HELP")
- '("icon-category-multimedia" "XFCE_ICON_CATEGORY_MULTIMEDIA")
- '("icon-category-network" "XFCE_ICON_CATEGORY_NETWORK")
- '("icon-category-graphics" "XFCE_ICON_CATEGORY_GRAPHICS")
- '("icon-category-printer" "XFCE_ICON_CATEGORY_PRINTER")
- '("icon-category-productivity" "XFCE_ICON_CATEGORY_PRODUCTIVITY")
- '("icon-category-sound" "XFCE_ICON_CATEGORY_SOUND")
- '("icon-category-terminal" "XFCE_ICON_CATEGORY_TERMINAL")
- '("icon-category-development" "XFCE_ICON_CATEGORY_DEVELOPMENT")
- '("icon-category-settings" "XFCE_ICON_CATEGORY_SETTINGS")
- '("icon-category-system" "XFCE_ICON_CATEGORY_SYSTEM")
- '("icon-category-wine" "XFCE_ICON_CATEGORY_WINE")
- '("n-builtin-icon-categories" "XFCE_N_BUILTIN_ICON_CATEGORIES")
- )
-)
-
-
-;; From /usr/local/include/xfce4/libxfcegui4/icons.h
-
-(define-function inline_icon_at_size
- (c-name "xfce_inline_icon_at_size")
- (return-type "GdkPixbuf*")
- (parameters
- '("const-guint8*" "data")
- '("int" "width")
- '("int" "height")
- )
-)
-
-(define-function themed_icon_lookup
- (c-name "xfce_themed_icon_lookup")
- (return-type "gchar*")
- (parameters
- '("const-gchar*" "name")
- '("gint" "size")
- )
-)
-
-(define-function themed_icon_load
- (c-name "xfce_themed_icon_load")
- (return-type "GdkPixbuf*")
- (parameters
- '("const-gchar*" "name")
- '("gint" "size")
- )
-)
-
-(define-function themed_icon_lookup_list
- (c-name "xfce_themed_icon_lookup_list")
- (return-type "gchar*")
- (parameters
- '("GList*" "names")
- '("gint" "size")
- )
-)
-
-(define-function themed_icon_load_list
- (c-name "xfce_themed_icon_load_list")
- (return-type "GdkPixbuf*")
- (parameters
- '("GList*" "names")
- '("gint" "size")
- )
-)
-
-(define-function themed_icon_lookup_category
- (c-name "xfce_themed_icon_lookup_category")
- (return-type "gchar*")
- (parameters
- '("XfceIconThemeCategory" "category")
- '("gint" "size")
- )
-)
-
-(define-function themed_icon_load_category
- (c-name "xfce_themed_icon_load_category")
- (return-type "GdkPixbuf*")
- (parameters
- '("XfceIconThemeCategory" "category")
- '("gint" "size")
- )
-)
-
-(define-function themed_icon_add_search_path
- (c-name "xfce_themed_icon_add_search_path")
- (return-type "none")
- (parameters
- '("const-gchar*" "path")
- )
-)
-
-(define-function themed_icon_set_icon_theme
- (c-name "xfce_set_icon_theme")
- (return-type "none")
- (parameters
- '("const-gchar*" "theme_name")
- )
-)
-
-(define-function inline_icon_at_size
- (c-name "inline_icon_at_size")
- (return-type "GdkPixbuf*")
- (parameters
- '("const-guint8*" "data")
- '("int" "width")
- '("int" "height")
- )
-)
-
-(define-function load_themed_icon
- (c-name "xfce_load_themed_icon")
- (return-type "GdkPixbuf*")
- (parameters
- '("const-gchar*" "name")
- '("gint" "size")
- )
-)
-
-(define-function pixbuf_new_from_file_at_size
- (c-name "xfce_pixbuf_new_from_file_at_size")
- (return-type "GdkPixbuf*")
- (parameters
- '("const-gchar*" "filename")
- '("gint" "width")
- '("gint" "height")
- '("GError**" "error")
- )
-)
-
-
diff --git a/gui/icons.override b/gui/icons.override
deleted file mode 100644
index 3c23658..0000000
--- a/gui/icons.override
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-#include <libxfcegui4/gui-enum-types.h>
-
-#define XFCE_TYPE_ICON_THEME_CATEGORY GUI_TYPE_ICON_THEME_CATEGORY
-%%
-include
-%%
-modulename icons
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.gdk.Pixbuf as PyGdkPixbuf_Type
-%%
-ignore
-%%
-ignore-glob
- xfce_inline_icon_at_size
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/gui/icontheme.defs b/gui/icontheme.defs
deleted file mode 100644
index ac290d1..0000000
--- a/gui/icontheme.defs
+++ /dev/null
@@ -1,171 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object IconTheme
- (in-module "Xfce")
- (parent "GObject")
- (c-name "XfceIconTheme")
- (gtype-id "XFCE_TYPE_ICON_THEME")
-)
-
-;; Enumerations and flags ...
-
-
-;; From xfce-icontheme.h
-
-(define-function icon_theme_get_type
- (c-name "xfce_icon_theme_get_type")
- (return-type "GType")
- (parameters
- )
-)
-
-(define-function icon_theme_get_for_screen
- (c-name "xfce_icon_theme_get_for_screen")
- (return-type "XfceIconTheme*")
- (parameters
- '("GdkScreen*" "screen")
- )
-)
-
-(define-method lookup
- (of-object "XfceIconTheme")
- (c-name "xfce_icon_theme_lookup")
- (return-type "gchar*")
- (parameters
- '("const-gchar*" "icon_name")
- '("gint" "icon_size")
- )
-)
-
-(define-method lookup_list
- (of-object "XfceIconTheme")
- (c-name "xfce_icon_theme_lookup_list")
- (return-type "gchar*")
- (parameters
- '("GList*" "icon_names")
- '("gint" "icon_size")
- )
-)
-
-(define-method lookup_category
- (of-object "XfceIconTheme")
- (c-name "xfce_icon_theme_lookup_category")
- (return-type "gchar*")
- (parameters
- '("XfceIconThemeCategory" "category")
- '("gint" "icon_size")
- )
-)
-
-(define-method load
- (of-object "XfceIconTheme")
- (c-name "xfce_icon_theme_load")
- (return-type "GdkPixbuf*")
- (parameters
- '("const-gchar*" "icon_name")
- '("gint" "icon_size")
- )
-)
-
-(define-method load_list
- (of-object "XfceIconTheme")
- (c-name "xfce_icon_theme_load_list")
- (return-type "GdkPixbuf*")
- (parameters
- '("GList*" "icon_names")
- '("gint" "icon_size")
- )
-)
-
-(define-method load_category
- (of-object "XfceIconTheme")
- (c-name "xfce_icon_theme_load_category")
- (return-type "GdkPixbuf*")
- (parameters
- '("XfceIconThemeCategory" "category")
- '("gint" "icon_size")
- )
-)
-
-(define-method get_search_path
- (of-object "XfceIconTheme")
- (c-name "xfce_icon_theme_get_search_path")
- (return-type "GList*")
-)
-
-(define-method set_search_path
- (of-object "XfceIconTheme")
- (c-name "xfce_icon_theme_set_search_path")
- (return-type "none")
- (parameters
- '("GList*" "search_paths")
- )
-)
-
-(define-method prepend_search_path
- (of-object "XfceIconTheme")
- (c-name "xfce_icon_theme_prepend_search_path")
- (return-type "none")
- (parameters
- '("const-gchar*" "search_path")
- )
-)
-
-(define-method append_search_path
- (of-object "XfceIconTheme")
- (c-name "xfce_icon_theme_append_search_path")
- (return-type "none")
- (parameters
- '("const-gchar*" "search_path")
- )
-)
-
-(define-method register_category
- (of-object "XfceIconTheme")
- (c-name "xfce_icon_theme_register_category")
- (return-type "XfceIconThemeCategory")
- (parameters
- '("GList*" "icon_names")
- )
-)
-
-(define-method unregister_category
- (of-object "XfceIconTheme")
- (c-name "xfce_icon_theme_unregister_category")
- (return-type "none")
- (parameters
- '("XfceIconThemeCategory" "category")
- )
-)
-
-(define-method set_use_svg
- (of-object "XfceIconTheme")
- (c-name "xfce_icon_theme_set_use_svg")
- (return-type "none")
- (parameters
- '("gboolean" "use_svg")
- )
-)
-
-(define-method get_use_svg
- (of-object "XfceIconTheme")
- (c-name "xfce_icon_theme_get_use_svg")
- (return-type "gboolean")
-)
-
-
-
-(define-function icon_theme_new
- (c-name "xfce_icon_theme_new")
- (is-constructor-of "XfceIconTheme")
- (return-type "XfceIconTheme*")
- (parameters
- '("GdkScreen*" "screen")
- )
-)
-
-(object IconTheme
- (in-module (Xfce))
- (parent Object)
- (c-name XfceIconTheme)
-)
diff --git a/gui/icontheme.override b/gui/icontheme.override
deleted file mode 100644
index b3f645e..0000000
--- a/gui/icontheme.override
+++ /dev/null
@@ -1,128 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-#include <libxfcegui4/gui-enum-types.h>
-
-#define XFCE_TYPE_FILE_CHOOSER_ACTION GUI_TYPE_FILE_CHOOSER_ACTION
-#define XFCE_TYPE_ICON_THEME_CATEGORY GUI_TYPE_ICON_THEME_CATEGORY
-
-%%
-include
-%%
-modulename icontheme
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.gdk.Screen as PyGdkScreen_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
-override xfce_icon_theme_get_search_path noargs
-static PyObject *
-_wrap_xfce_icon_theme_get_search_path(PyGObject *self)
-{
- gint n_items;
- PyObject *py_tuple;
- int i;
- GList *list;
- GList *item;
-
- list = xfce_icon_theme_get_search_path(XFCE_ICON_THEME(self->obj));
- if (list)
- n_items = g_list_length (list);
- else
- n_items = 0;
-
- py_tuple = PyTuple_New(n_items);
- item = list;
- for (i = 0; item != NULL; i++)
- PyTuple_SetItem(py_tuple, i, PyString_FromString((char *)item->data));
-
- if (list) {
- g_list_foreach (list, (GFunc) g_free, NULL);
- g_list_free (list);
- }
-
- return py_tuple;
-}
-%%
-override xfce_icon_theme_set_search_path kwargs
-static PyObject *
-_wrap_xfce_icon_theme_set_search_path(PyGObject *self, PyObject *args,
- PyObject *kwargs)
-{
- static char *kwlist[] = { "path", NULL };
- int i, len;
- PyObject *py_seq;
- GList *list;
-
- if (!PyArg_ParseTupleAndKeywords(args,kwargs,
- "O:XfceIconTheme.set_search_path",
- kwlist, &py_seq))
- return NULL;
-
- if (!PySequence_Check(py_seq) || (len = PySequence_Size(py_seq)) < 0) {
- PyErr_SetString(PyExc_ValueError,
- "path should be a sequence of strings");
- return NULL;
- }
-
- list = NULL;
-
- for (i = 0; i < len; i++) {
- PyObject *py_path = PySequence_GetItem(py_seq, i);
- if (!PyString_Check(py_path)) {
- PyErr_SetString(PyExc_ValueError, "path items must be strings");
- Py_DECREF(py_path);
- if (list)
- g_list_free (list);
- return NULL;
- }
- list = g_list_append (list, PyString_AsString(py_path));
- Py_DECREF(py_path);
- }
-
- xfce_icon_theme_set_search_path(XFCE_ICON_THEME(self->obj), list);
-
- if (list)
- g_list_free (list); /* items are not to be freed by me */
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-%%
-override xfce_icon_theme_new kwargs
-static int
-_wrap_xfce_icon_theme_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "screen", NULL };
- PyGObject *gscreen;
-
- if (!PyArg_ParseTupleAndKeywords(args,kwargs,
- "O!:XfceIconTheme.__init__",
- kwlist, &PyGdkScreen_Type, &gscreen))
- return -1;
-
- if (!gscreen) {
- PyErr_SetString(PyExc_RuntimeError, "could not create XfceIconTheme object");
- return -1;
- }
-
- self->obj = (GObject *)xfce_icon_theme_get_for_screen (gscreen->obj);
-
- if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create XfceIconTheme object");
- return -1;
- }
- pygobject_register_wrapper((PyObject *)self);
- return 0;
-}
diff --git a/gui/libxfcegui4-config.defs b/gui/libxfcegui4-config.defs
deleted file mode 100644
index 4bdbf5d..0000000
--- a/gui/libxfcegui4-config.defs
+++ /dev/null
@@ -1,8 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-
-;; From /usr/include/xfce4/libxfcegui4/libxfcegui4-config.h
-
-
diff --git a/gui/libxfcegui4.defs b/gui/libxfcegui4.defs
deleted file mode 100644
index 240bd32..0000000
--- a/gui/libxfcegui4.defs
+++ /dev/null
@@ -1,8 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-
-;; From libxfcegui4.h
-
-
diff --git a/gui/libxfcegui4_config.defs b/gui/libxfcegui4_config.defs
deleted file mode 100644
index 08828e8..0000000
--- a/gui/libxfcegui4_config.defs
+++ /dev/null
@@ -1,8 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-
-;; From libxfcegui4-config.h
-
-
diff --git a/gui/menubutton.c b/gui/menubutton.c
deleted file mode 100644
index 6ff9c08..0000000
--- a/gui/menubutton.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "menubutton.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#ifndef XFCE_TYPE_MENUBUTTON
-#define XFCE_TYPE_MENUBUTTON (xfce_menubutton_get_type ())
-#endif
-
-#line 17 "menubutton.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGtkButton_Type;
-#define PyGtkButton_Type (*_PyGtkButton_Type)
-static PyTypeObject *_PyGdkPixbuf_Type;
-#define PyGdkPixbuf_Type (*_PyGdkPixbuf_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceMenubutton_Type;
-
-#line 32 "menubutton.c"
-
-
-
-/* ----------- XfceMenubutton ----------- */
-
-static int
-_wrap_xfce_menubutton_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "text", NULL };
- char *text;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceMenubutton.__init__", kwlist, &text))
- return -1;
- self->obj = (GObject *)xfce_menubutton_new(text);
-
- if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create XfceMenubutton object");
- return -1;
- }
- pygobject_register_wrapper((PyObject *)self);
- return 0;
-}
-
-static PyObject *
-_wrap_xfce_menubutton_set_text(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "text", NULL };
- char *text;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceMenubutton.set_text", kwlist, &text))
- return NULL;
- xfce_menubutton_set_text(XFCE_MENUBUTTON(self->obj), text);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_menubutton_set_pixbuf(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "pixbuf", NULL };
- PyGObject *pixbuf;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:XfceMenubutton.set_pixbuf", kwlist, &PyGdkPixbuf_Type, &pixbuf))
- return NULL;
- xfce_menubutton_set_pixbuf(XFCE_MENUBUTTON(self->obj), GDK_PIXBUF(pixbuf->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_menubutton_set_stock_icon(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "stock", NULL };
- char *stock;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceMenubutton.set_stock_icon", kwlist, &stock))
- return NULL;
- xfce_menubutton_set_stock_icon(XFCE_MENUBUTTON(self->obj), stock);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyMethodDef _PyXfceMenubutton_methods[] = {
- { "set_text", (PyCFunction)_wrap_xfce_menubutton_set_text, METH_VARARGS|METH_KEYWORDS },
- { "set_pixbuf", (PyCFunction)_wrap_xfce_menubutton_set_pixbuf, METH_VARARGS|METH_KEYWORDS },
- { "set_stock_icon", (PyCFunction)_wrap_xfce_menubutton_set_stock_icon, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-PyTypeObject PyXfceMenubutton_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "menubutton.Menubutton", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceMenubutton_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_menubutton_new, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_xfce_menubutton_new_with_pixbuf(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "text", "pb", NULL };
- char *text;
- PyGObject *pb;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sO!:menubutton_new_with_pixbuf", kwlist, &text, &PyGdkPixbuf_Type, &pb))
- return NULL;
- ret = xfce_menubutton_new_with_pixbuf(text, GDK_PIXBUF(pb->obj));
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_xfce_menubutton_new_with_stock_icon(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "text", "stock", NULL };
- char *text, *stock;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ss:menubutton_new_with_stock_icon", kwlist, &text, &stock))
- return NULL;
- ret = xfce_menubutton_new_with_stock_icon(text, stock);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-PyMethodDef pymenubutton_functions[] = {
- { "menubutton_new_with_pixbuf", (PyCFunction)_wrap_xfce_menubutton_new_with_pixbuf, METH_VARARGS|METH_KEYWORDS },
- { "menubutton_new_with_stock_icon", (PyCFunction)_wrap_xfce_menubutton_new_with_stock_icon, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pymenubutton_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkButton_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Button");
- if (_PyGtkButton_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Button from gtk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return;
- }
- if ((module = PyImport_ImportModule("gtk.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkPixbuf_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Pixbuf");
- if (_PyGdkPixbuf_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Pixbuf from gtk.gdk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk.gdk");
- return;
- }
-
-
-#line 236 "menubutton.c"
- pygobject_register_class(d, "XfceMenubutton", XFCE_TYPE_MENUBUTTON, &PyXfceMenubutton_Type, Py_BuildValue("(O)", &PyGtkButton_Type));
-}
diff --git a/gui/menubutton.defs b/gui/menubutton.defs
deleted file mode 100644
index d053dc4..0000000
--- a/gui/menubutton.defs
+++ /dev/null
@@ -1,74 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object Menubutton
- (in-module "Xfce")
- (parent "GtkButton")
- (c-name "XfceMenubutton")
- (gtype-id "XFCE_TYPE_MENUBUTTON")
-)
-
-;; Enumerations and flags ...
-
-
-;; From xfce_menubutton.h
-
-(define-function menubutton_get_type
- (c-name "xfce_menubutton_get_type")
- (return-type "GtkType")
-)
-
-(define-function menubutton_new
- (c-name "xfce_menubutton_new")
- (is-constructor-of "XfceMenubutton")
- (return-type "GtkWidget*")
- (parameters
- '("const-char*" "text")
- )
-)
-
-(define-function menubutton_new_with_pixbuf
- (c-name "xfce_menubutton_new_with_pixbuf")
- (return-type "GtkWidget*")
- (parameters
- '("const-char*" "text")
- '("GdkPixbuf*" "pb")
- )
-)
-
-(define-function menubutton_new_with_stock_icon
- (c-name "xfce_menubutton_new_with_stock_icon")
- (return-type "GtkWidget*")
- (parameters
- '("const-char*" "text")
- '("const-char*" "stock")
- )
-)
-
-(define-method set_text
- (of-object "XfceMenubutton")
- (c-name "xfce_menubutton_set_text")
- (return-type "none")
- (parameters
- '("const-char*" "text")
- )
-)
-
-(define-method set_pixbuf
- (of-object "XfceMenubutton")
- (c-name "xfce_menubutton_set_pixbuf")
- (return-type "none")
- (parameters
- '("GdkPixbuf*" "pixbuf")
- )
-)
-
-(define-method set_stock_icon
- (of-object "XfceMenubutton")
- (c-name "xfce_menubutton_set_stock_icon")
- (return-type "none")
- (parameters
- '("const-char*" "stock")
- )
-)
-
-
diff --git a/gui/menubutton.override b/gui/menubutton.override
deleted file mode 100644
index a8495d1..0000000
--- a/gui/menubutton.override
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#ifndef XFCE_TYPE_MENUBUTTON
-#define XFCE_TYPE_MENUBUTTON (xfce_menubutton_get_type ())
-#endif
-
-%%
-include
-%%
-modulename menubutton
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.Button as PyGtkButton_Type
-import gtk.gdk.Pixbuf as PyGdkPixbuf_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/gui/movehandler.c b/gui/movehandler.c
deleted file mode 100644
index e19b1d2..0000000
--- a/gui/movehandler.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "movehandler.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#ifndef XFCE_TYPE_MOVEHANDLER
-#define XFCE_TYPE_MOVEHANDLER (xfce_movehandler_get_type ())
-#endif
-
-#line 17 "movehandler.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGtkWidget_Type;
-#define PyGtkWidget_Type (*_PyGtkWidget_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceMovehandler_Type;
-
-#line 30 "movehandler.c"
-
-
-
-/* ----------- XfceMovehandler ----------- */
-
-static int
-_wrap_xfce_movehandler_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "window", NULL };
- PyGObject *window;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:XfceMovehandler.__init__", kwlist, &PyGtkWidget_Type, &window))
- return -1;
- self->obj = (GObject *)xfce_movehandler_new(GTK_WIDGET(window->obj));
-
- if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create XfceMovehandler object");
- return -1;
- }
- pygobject_register_wrapper((PyObject *)self);
- return 0;
-}
-
-PyTypeObject PyXfceMovehandler_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "movehandler.Movehandler", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- NULL, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_movehandler_new, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-PyMethodDef pymovehandler_functions[] = {
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pymovehandler_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkWidget_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Widget");
- if (_PyGtkWidget_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Widget from gtk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return;
- }
-
-
-#line 143 "movehandler.c"
- pygobject_register_class(d, "XfceMovehandler", XFCE_TYPE_MOVEHANDLER, &PyXfceMovehandler_Type, Py_BuildValue("(O)", &PyGtkWidget_Type));
-}
diff --git a/gui/movehandler.defs b/gui/movehandler.defs
deleted file mode 100644
index 543bda9..0000000
--- a/gui/movehandler.defs
+++ /dev/null
@@ -1,47 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object Movehandler
- (in-module "Xfce")
- (parent "GtkWidget")
- (c-name "XfceMovehandler")
- (gtype-id "XFCE_TYPE_MOVEHANDLER")
-)
-
-;; Enumerations and flags ...
-
-
-;; From xfce_movehandler.h
-
-(define-function void
- (c-name "void")
- (return-type "typedef")
- (parameters
- '("*" "XfceMoveFunc")
- )
-)
-
-(define-function movehandler_get_type
- (c-name "xfce_movehandler_get_type")
- (return-type "GtkType")
-)
-
-(define-function movehandler_new
- (c-name "xfce_movehandler_new")
- (is-constructor-of "XfceMovehandler")
- (return-type "GtkWidget*")
- (parameters
- '("GtkWidget*" "window")
- )
-)
-
-(define-method set_move_func
- (of-object "XfceMovehandler")
- (c-name "xfce_movehandler_set_move_func")
- (return-type "none")
- (parameters
- '("XfceMoveFunc" "move")
- '("gpointer" "data")
- )
-)
-
-
diff --git a/gui/movehandler.override b/gui/movehandler.override
deleted file mode 100644
index b07bcdc..0000000
--- a/gui/movehandler.override
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#ifndef XFCE_TYPE_MOVEHANDLER
-#define XFCE_TYPE_MOVEHANDLER (xfce_movehandler_get_type ())
-#endif
-
-%%
-include
-%%
-modulename movehandler
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.Widget as PyGtkWidget_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/gui/scaled_image.c b/gui/scaled_image.c
deleted file mode 100644
index 5328b04..0000000
--- a/gui/scaled_image.c
+++ /dev/null
@@ -1,196 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "scaled_image.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-#include <libxfcegui4/xfce_scaled_image.h>
-
-#ifndef XFCE_TYPE_SCALED_IMAGE
-#define XFCE_TYPE_SCALED_IMAGE (xfce_scaled_image_get_type ())
-#endif
-
-#line 18 "scaled_image.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGtkImage_Type;
-#define PyGtkImage_Type (*_PyGtkImage_Type)
-static PyTypeObject *_PyGdkPixbuf_Type;
-#define PyGdkPixbuf_Type (*_PyGdkPixbuf_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceScaledImage_Type;
-
-#line 33 "scaled_image.c"
-
-
-
-/* ----------- XfceScaledImage ----------- */
-
-static int
-_wrap_xfce_scaled_image_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char* kwlist[] = { NULL };
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, ":scaledimage.ScaledImage.__init__", kwlist))
- return -1;
-
- pygobject_constructv(self, 0, NULL);
-
- if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create %(typename)s object");
- return -1;
- }
-
- return 0;
-}
-
-
-static PyObject *
-_wrap_xfce_scaled_image_set_from_pixbuf(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "pixbuf", NULL };
- PyGObject *pixbuf;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:XfceScaledImage.set_from_pixbuf", kwlist, &PyGdkPixbuf_Type, &pixbuf))
- return NULL;
- xfce_scaled_image_set_from_pixbuf(XFCE_SCALED_IMAGE(self->obj), GDK_PIXBUF(pixbuf->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyMethodDef _PyXfceScaledImage_methods[] = {
- { "set_from_pixbuf", (PyCFunction)_wrap_xfce_scaled_image_set_from_pixbuf, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-PyTypeObject PyXfceScaledImage_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "scaledimage.ScaledImage", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceScaledImage_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_scaled_image_new, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_xfce_scaled_image_new_from_pixbuf(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "pb", NULL };
- PyGObject *pb;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:scaled_image_new_from_pixbuf", kwlist, &PyGdkPixbuf_Type, &pb))
- return NULL;
- ret = xfce_scaled_image_new_from_pixbuf(GDK_PIXBUF(pb->obj));
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-PyMethodDef pyscaled_image_functions[] = {
- { "scaled_image_new_from_pixbuf", (PyCFunction)_wrap_xfce_scaled_image_new_from_pixbuf, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pyscaled_image_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkImage_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Image");
- if (_PyGtkImage_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Image from gtk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return;
- }
- if ((module = PyImport_ImportModule("gtk.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkPixbuf_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Pixbuf");
- if (_PyGdkPixbuf_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Pixbuf from gtk.gdk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk.gdk");
- return;
- }
-
-
-#line 194 "scaled_image.c"
- pygobject_register_class(d, "XfceScaledImage", XFCE_TYPE_SCALED_IMAGE, &PyXfceScaledImage_Type, Py_BuildValue("(O)", &PyGtkImage_Type));
- pyg_set_object_has_new_constructor(XFCE_TYPE_SCALED_IMAGE);
-}
diff --git a/gui/scaled_image.defs b/gui/scaled_image.defs
deleted file mode 100644
index 0375f6e..0000000
--- a/gui/scaled_image.defs
+++ /dev/null
@@ -1,43 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object ScaledImage
- (in-module "Xfce")
- (parent "GtkImage")
- (c-name "XfceScaledImage")
- (gtype-id "XFCE_TYPE_SCALED_IMAGE")
-)
-
-;; Enumerations and flags ...
-
-
-;; From xfce_scaled_image.h
-
-(define-function scaled_image_get_type
- (c-name "xfce_scaled_image_get_type")
- (return-type "GtkType")
-)
-
-(define-function scaled_image_new
- (c-name "xfce_scaled_image_new")
- (is-constructor-of "XfceScaledImage")
- (return-type "GtkWidget*")
-)
-
-(define-function scaled_image_new_from_pixbuf
- (c-name "xfce_scaled_image_new_from_pixbuf")
- (return-type "GtkWidget*")
- (parameters
- '("GdkPixbuf*" "pb")
- )
-)
-
-(define-method set_from_pixbuf
- (of-object "XfceScaledImage")
- (c-name "xfce_scaled_image_set_from_pixbuf")
- (return-type "none")
- (parameters
- '("GdkPixbuf*" "pixbuf")
- )
-)
-
-
diff --git a/gui/scaled_image.override b/gui/scaled_image.override
deleted file mode 100644
index a620054..0000000
--- a/gui/scaled_image.override
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-#include <libxfcegui4/xfce_scaled_image.h>
-
-#ifndef XFCE_TYPE_SCALED_IMAGE
-#define XFCE_TYPE_SCALED_IMAGE (xfce_scaled_image_get_type ())
-#endif
-
-%%
-include
-%%
-modulename scaledimage
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.Image as PyGtkImage_Type
-import gtk.gdk.Pixbuf as PyGdkPixbuf_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/gui/session_client.c b/gui/session_client.c
deleted file mode 100644
index 466d587..0000000
--- a/gui/session_client.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "session_client.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-#include <libxfcegui4/gui-enum-types.h>
-
-#define SESSION_TYPE_INTERACT_STYLE GUI_TYPE_INTERACT_STYLE
-#define SESSION_TYPE_RESTART_STYLE GUI_TYPE_RESTART_STYLE
-#define SESSION_TYPE_CLIENT_STATE GUI_TYPE_CLIENT_STATE
-
-#line 18 "session_client.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 28 "session_client.c"
-
-
-
-/* ----------- functions ----------- */
-
-PyMethodDef pysession_client_functions[] = {
- { NULL, NULL, 0 }
-};
-
-
-/* ----------- enums and flags ----------- */
-
-void
-pysession_client_add_constants(PyObject *module, const gchar *strip_prefix)
-{
- pyg_enum_add(module, "InteractStyle", strip_prefix, SESSION_TYPE_INTERACT_STYLE);
- pyg_enum_add(module, "RestartStyle", strip_prefix, SESSION_TYPE_RESTART_STYLE);
- pyg_enum_add(module, "ClientState", strip_prefix, SESSION_TYPE_CLIENT_STATE);
-
- if (PyErr_Occurred())
- PyErr_Print();
-}
-
-/* initialise stuff extension classes */
-void
-pysession_client_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
-
-
-#line 74 "session_client.c"
-}
diff --git a/gui/session_client.defs b/gui/session_client.defs
deleted file mode 100644
index f3adc59..0000000
--- a/gui/session_client.defs
+++ /dev/null
@@ -1,103 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-(define-enum InteractStyle
- (in-module "Session")
- (c-name "SessionInteractStyle")
- (gtype-id "SESSION_TYPE_INTERACT_STYLE")
- (values
- '("none" "SESSION_INTERACT_NONE")
- '("errors" "SESSION_INTERACT_ERRORS")
- '("any" "SESSION_INTERACT_ANY")
- )
-)
-
-(define-enum RestartStyle
- (in-module "Session")
- (c-name "SessionRestartStyle")
- (gtype-id "SESSION_TYPE_RESTART_STYLE")
- (values
- '("if-running" "SESSION_RESTART_IF_RUNNING")
- '("anyway" "SESSION_RESTART_ANYWAY")
- '("immediately" "SESSION_RESTART_IMMEDIATELY")
- '("never" "SESSION_RESTART_NEVER")
- )
-)
-
-(define-enum ClientState
- (in-module "Session")
- (c-name "SessionClientState")
- (gtype-id "SESSION_TYPE_CLIENT_STATE")
- (values
- '("idle" "SESSION_CLIENT_IDLE")
- '("saving-phase-1" "SESSION_CLIENT_SAVING_PHASE_1")
- '("waiting-for-phase-2" "SESSION_CLIENT_WAITING_FOR_PHASE_2")
- '("saving-phase-2" "SESSION_CLIENT_SAVING_PHASE_2")
- '("waiting-for-interact" "SESSION_CLIENT_WAITING_FOR_INTERACT")
- '("done-with-interact" "SESSION_CLIENT_DONE_WITH_INTERACT")
- '("frozen" "SESSION_CLIENT_FROZEN")
- '("disconnected" "SESSION_CLIENT_DISCONNECTED")
- '("registering" "SESSION_CLIENT_REGISTERING")
- )
-)
-
-
-;; From /usr/local/include/xfce4/libxfcegui4/session-client.h
-
-(define-function client_session_new_full
- (c-name "client_session_new_full")
- (return-type "SessionClient*")
- (parameters
- '("gpointer" "data")
- '("SessionRestartStyle" "restart_style")
- '("gchar" "priority")
- '("gchar*" "client_id")
- '("gchar*" "program")
- '("gchar*" "current_directory")
- '("gchar**" "restart_command")
- '("gchar**" "clone_command")
- '("gchar**" "discard_command")
- '("gchar**" "resign_command")
- '("gchar**" "shutdown_command")
- )
-)
-
-(define-function client_session_new
- (c-name "client_session_new")
- (is-constructor-of "ClientSession")
- (return-type "SessionClient*")
- (parameters
- '("gint" "argc")
- '("gchar*[]" "argv")
- '("gpointer" "data")
- '("SessionRestartStyle" "restart_style")
- '("gchar" "priority")
- )
-)
-
-(define-function session_init
- (c-name "session_init")
- (return-type "gboolean")
- (parameters
- '("SessionClient*" "session_client")
- )
-)
-
-(define-function session_shutdown
- (c-name "session_shutdown")
- (return-type "none")
- (parameters
- '("SessionClient*" "session_client")
- )
-)
-
-(define-function logout_session
- (c-name "logout_session")
- (return-type "none")
- (parameters
- '("SessionClient*" "session_client")
- )
-)
-
-
diff --git a/gui/session_client.override b/gui/session_client.override
deleted file mode 100644
index 3d8f0bf..0000000
--- a/gui/session_client.override
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-#include <libxfcegui4/gui-enum-types.h>
-
-#define SESSION_TYPE_INTERACT_STYLE GUI_TYPE_INTERACT_STYLE
-#define SESSION_TYPE_RESTART_STYLE GUI_TYPE_RESTART_STYLE
-#define SESSION_TYPE_CLIENT_STATE GUI_TYPE_CLIENT_STATE
-
-%%
-include
-%%
-modulename sessionclient
-%%
-import gobject.GObject as PyGObject_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/gui/sessionclient.c b/gui/sessionclient.c
deleted file mode 100644
index 9a8f84e..0000000
--- a/gui/sessionclient.c
+++ /dev/null
@@ -1,218 +0,0 @@
-#include <libxfcegui4/session-client.h>
-
-/*
-typedef enum
-{
- SESSION_CLIENT_IDLE,
- SESSION_CLIENT_SAVING_PHASE_1,
- SESSION_CLIENT_WAITING_FOR_PHASE_2,
- SESSION_CLIENT_SAVING_PHASE_2,
- SESSION_CLIENT_WAITING_FOR_INTERACT,
- SESSION_CLIENT_DONE_WITH_INTERACT,
- SESSION_CLIENT_FROZEN,
- SESSION_CLIENT_DISCONNECTED,
- SESSION_CLIENT_REGISTERING
-}
-SessionClientState;
-*/
-
-/*
-struct SessionClient
-...
- gpointer data;
- gpointer session_connection;
-
- SessionClientState current_state;
- SessionRestartStyle restart_style;
- SessionInteractStyle interact_style;
-
- gchar priority;
-
- gchar *client_id;
- gchar *given_client_id;
-
- gchar *current_directory;
- gchar *program;
- gchar **clone_command;
- gchar **resign_command;
- gchar **restart_command;
- gchar **discard_command;
- gchar **shutdown_command;
-
-*/
-
-static void save_phase_2_cb (gpointer client_data)
-{
-}
-
-static void interact_cb (gpointer client_data,
- SessionInteractStyle interact_style);
-{
-}
-
-static void shutdown_cancelled_cb (gpointer client_data)
-{
-}
-
-static void save_complete_cb (gpointer client_data)
-{
-}
-
-static void die_cb (gpointer client_data)
-{
-}
-
-static void save_yourself_cb (gpointer client_data, int save_style,
- gboolean shutdown, int interact_style,
- gboolean fast)
-{
-}
-
-extern void Py_GetArgcArgv(int *argc, char ***argv);
-
-static int
-_wrap_session_client_new((PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "priority", NULL };
-
- SessionClient* client;
- gpointer client_data;
- gchar prio;
- int prioi;
- char** argv;
- int argc;
-
- client_data = NULL;
-
- prio = 30;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,
- "i:SessionClient.__init__", kwlist, &prioi))
- return -1;
-
- if (prioi < 0 || prioi > 127) { /* fixme */
- prioi = 30;
- }
-
- prio = prioi;
-
- Py_GetArgcArgv(&argc, &argv);
-
- client = client_session_new (argc, argv, client_data,
- SESSION_RESTART_IF_RUNNING, prio);
-
- client->save_phase_2 = save_phase_2_cb;
- client->interact = interact_cb;
- client->shutdown_cancelled = shutdown_cancelled_cb;
- client->save_complete = save_complete_cb;
- client->die = die_cb;
- client->save_yourself = save_yourself_cb;
-
- /* gboolean session_init(client); */
- /* void session_shutdown(client); */
- /* logout_session(client); */
-
- /* register client */
-
- /* pygobject_register_wrapper((PyObject *)self); */
-
- return 0;
-}
-
-PyTypeObject PyXfceScaledImage_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "sessionclient.SessionClient", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceScaledImage_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_scaled_image_new, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-/* initialise stuff extension classes */
-void
-pysession_client_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkImage_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Image");
- if (_PyGtkImage_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Image from gtk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return;
- }
- if ((module = PyImport_ImportModule("gtk.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkPixbuf_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Pixbuf");
- if (_PyGdkPixbuf_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Pixbuf from gtk.gdk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk.gdk");
- return;
- }
-
-
- pygobject_register_class(d, "XfceSessionClient", XFCE_TYPE_SESSION_CLIENT, &PyXfceSessionClient_Type, /* Py_BuildValue("(O)", &PyGtkImage_Type */));
-}
diff --git a/gui/startup-notification.defs b/gui/startup-notification.defs
deleted file mode 100644
index d32ff9a..0000000
--- a/gui/startup-notification.defs
+++ /dev/null
@@ -1,42 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-
-;; From /usr/local/include/xfce4/libxfcegui4/xfce-startup-notification.h
-
-(define-function startup_notification_start
- (c-name "xfce_startup_notification_start")
- (return-type "char*")
- (parameters
- '("GdkScreen*" "screen")
- '("char-const*" "path")
- )
-)
-
-(define-function startup_notification_cancel
- (c-name "xfce_startup_notification_cancel")
- (return-type "none")
- (parameters
- '("const-char*" "id")
- )
-)
-
-(define-function startup_notification_modify_environment
- (c-name "xfce_startup_notification_modify_environment")
- (return-type "char**")
- (parameters
- '("const-char**" "envp")
- '("const-char*" "id")
- )
-)
-
-(define-function startup_notification_cleanup_environment
- (c-name "xfce_startup_notification_cleanup_environment")
- (return-type "char**")
- (parameters
- '("const-char**" "envp")
- )
-)
-
-
diff --git a/gui/startup-notification.override b/gui/startup-notification.override
deleted file mode 100644
index d12ee07..0000000
--- a/gui/startup-notification.override
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-%%
-include
-%%
-modulename startupnotification
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.gdk.Screen as PyGdkScreen_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
-override xfce_startup_notification_start kwargs
-static PyObject *
-_wrap_xfce_startup_notification_start(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "screen", "path", NULL };
- PyGObject *screen;
- char *path;
- gchar *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!s:startup_notification_start", kwlist, &PyGdkScreen_Type, &screen, &path))
- return NULL;
- ret = xfce_startup_notification_start(GDK_SCREEN(screen->obj), path);
- if (ret) {
- PyObject *py_ret = PyString_FromString(ret);
- g_free(ret);
- return py_ret;
- }
- Py_INCREF(Py_None);
- return Py_None;
-}
diff --git a/gui/systemtray.c b/gui/systemtray.c
deleted file mode 100644
index 383ca72..0000000
--- a/gui/systemtray.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "systemtray.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#ifndef XFCE_TYPE_SYSTEM_TRAY
-#define XFCE_TYPE_SYSTEM_TRAY (xfce_system_tray_get_type ())
-#endif
-
-#line 17 "systemtray.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGdkScreen_Type;
-#define PyGdkScreen_Type (*_PyGdkScreen_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceSystemTray_Type;
-
-#line 30 "systemtray.c"
-
-
-
-/* ----------- XfceSystemTray ----------- */
-
-static int
-_wrap_xfce_system_tray_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char* kwlist[] = { NULL };
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, ":systemtray.SystemTray.__init__", kwlist))
- return -1;
-
- pygobject_constructv(self, 0, NULL);
-
- if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create %(typename)s object");
- return -1;
- }
-
- return 0;
-}
-
-
-#line 30 "systemtray.override"
-static PyObject *
-_wrap_xfce_system_tray_register(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "screen", NULL };
- PyGObject *pscreen;
- GdkScreen* gscreen;
- Screen* xscreen;
- GError* error = NULL;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,
- "O!:XfceSystemTray.register",
- kwlist, &PyGdkScreen_Type, &pscreen)
- ) {
- return NULL;
- }
-
- if (!pscreen || !pscreen->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not register XfceSystemTray object");
- return NULL;
- }
-
- gscreen = pscreen->obj;
-
- xscreen = GDK_SCREEN_XSCREEN(gscreen);
- if (!xscreen) {
- /* TODO unref gscreen ? */
- PyErr_SetString(PyExc_RuntimeError, "could not check if any (Xfce or other) system tray is running");
- return NULL;
- }
-
- if (xfce_system_tray_register((XfceSystemTray*) self->obj, xscreen, &error)) {
- return PyBool_FromLong(1);
- } else {
- if (pyg_error_check(&error))
- return NULL;
-
- return PyBool_FromLong(0);
- }
-}
-#line 95 "systemtray.c"
-
-
-static PyObject *
-_wrap_xfce_system_tray_unregister(PyGObject *self)
-{
- xfce_system_tray_unregister(XFCE_SYSTEM_TRAY(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyMethodDef _PyXfceSystemTray_methods[] = {
- { "register", (PyCFunction)_wrap_xfce_system_tray_register, METH_VARARGS|METH_KEYWORDS },
- { "unregister", (PyCFunction)_wrap_xfce_system_tray_unregister, METH_NOARGS },
- { NULL, NULL, 0 }
-};
-
-PyTypeObject PyXfceSystemTray_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "systemtray.SystemTray", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceSystemTray_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_system_tray_new, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-#line 71 "systemtray.override"
-static PyObject *
-_wrap_xfce_system_tray_check_running(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "screen", NULL };
- PyGObject *pscreen;
- GdkScreen* gscreen;
- Screen* xscreen;
- GError* error = NULL;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,
- "O!:XfceSystemTray.check_running",
- kwlist, &PyGdkScreen_Type, &pscreen)
- ) {
- return NULL;
- }
-
- if (!pscreen || !pscreen->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not check if any (Xfce or other) system tray is running");
- return NULL;
- }
-
- gscreen = pscreen->obj;
-
- xscreen = GDK_SCREEN_XSCREEN(gscreen);
- if (!xscreen) {
- /* TODO unref gscreen ? */
- PyErr_SetString(PyExc_RuntimeError, "could not check if any (Xfce or other) system tray is running");
- return NULL;
- }
-
- if (xfce_system_tray_check_running(xscreen)) {
- return PyBool_FromLong(1);
- } else {
- return PyBool_FromLong(0);
- }
-}
-#line 198 "systemtray.c"
-
-
-PyMethodDef pysystemtray_functions[] = {
- { "system_tray_check_running", (PyCFunction)_wrap_xfce_system_tray_check_running, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pysystemtray_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkScreen_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Screen");
- if (_PyGdkScreen_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Screen from gtk.gdk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk.gdk");
- return;
- }
-
-
-#line 242 "systemtray.c"
- pygobject_register_class(d, "XfceSystemTray", XFCE_TYPE_SYSTEM_TRAY, &PyXfceSystemTray_Type, Py_BuildValue("(O)", &PyGObject_Type));
- pyg_set_object_has_new_constructor(XFCE_TYPE_SYSTEM_TRAY);
-}
diff --git a/gui/systemtray.defs b/gui/systemtray.defs
deleted file mode 100644
index d533827..0000000
--- a/gui/systemtray.defs
+++ /dev/null
@@ -1,55 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object SystemTray
- (in-module "Xfce")
- (parent "GObject")
- (c-name "XfceSystemTray")
- (gtype-id "XFCE_TYPE_SYSTEM_TRAY")
-)
-
-;; Enumerations and flags ...
-
-
-;; From xfce_systemtray.h
-
-(define-function system_tray_error_quark
- (c-name "xfce_system_tray_error_quark")
- (return-type "GQuark")
-)
-
-(define-function system_tray_get_type
- (c-name "xfce_system_tray_get_type")
- (return-type "GType")
-)
-
-(define-function system_tray_new
- (c-name "xfce_system_tray_new")
- (is-constructor-of "XfceSystemTray")
- (return-type "XfceSystemTray*")
-)
-
-(define-method register
- (of-object "XfceSystemTray")
- (c-name "xfce_system_tray_register")
- (return-type "gboolean")
- (parameters
- '("Screen*" "screen")
- '("GError**" "error")
- )
-)
-
-(define-method unregister
- (of-object "XfceSystemTray")
- (c-name "xfce_system_tray_unregister")
- (return-type "none")
-)
-
-(define-function system_tray_check_running
- (c-name "xfce_system_tray_check_running")
- (return-type "gboolean")
- (parameters
- '("Screen*" "screen")
- )
-)
-
-
diff --git a/gui/systemtray.override b/gui/systemtray.override
deleted file mode 100644
index c1e84ab..0000000
--- a/gui/systemtray.override
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#ifndef XFCE_TYPE_SYSTEM_TRAY
-#define XFCE_TYPE_SYSTEM_TRAY (xfce_system_tray_get_type ())
-#endif
-
-%%
-include
-%%
-modulename systemtray
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.gdk.Screen as PyGdkScreen_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
-override xfce_system_tray_register kwargs
-static PyObject *
-_wrap_xfce_system_tray_register(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "screen", NULL };
- PyGObject *pscreen;
- GdkScreen* gscreen;
- Screen* xscreen;
- GError* error = NULL;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,
- "O!:XfceSystemTray.register",
- kwlist, &PyGdkScreen_Type, &pscreen)
- ) {
- return NULL;
- }
-
- if (!pscreen || !pscreen->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not register XfceSystemTray object");
- return NULL;
- }
-
- gscreen = pscreen->obj;
-
- xscreen = GDK_SCREEN_XSCREEN(gscreen);
- if (!xscreen) {
- /* TODO unref gscreen ? */
- PyErr_SetString(PyExc_RuntimeError, "could not check if any (Xfce or other) system tray is running");
- return NULL;
- }
-
- if (xfce_system_tray_register((XfceSystemTray*) self->obj, xscreen, &error)) {
- return PyBool_FromLong(1);
- } else {
- if (pyg_error_check(&error))
- return NULL;
-
- return PyBool_FromLong(0);
- }
-}
-%%
-override xfce_system_tray_check_running kwargs
-static PyObject *
-_wrap_xfce_system_tray_check_running(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "screen", NULL };
- PyGObject *pscreen;
- GdkScreen* gscreen;
- Screen* xscreen;
- GError* error = NULL;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,
- "O!:XfceSystemTray.check_running",
- kwlist, &PyGdkScreen_Type, &pscreen)
- ) {
- return NULL;
- }
-
- if (!pscreen || !pscreen->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not check if any (Xfce or other) system tray is running");
- return NULL;
- }
-
- gscreen = pscreen->obj;
-
- xscreen = GDK_SCREEN_XSCREEN(gscreen);
- if (!xscreen) {
- /* TODO unref gscreen ? */
- PyErr_SetString(PyExc_RuntimeError, "could not check if any (Xfce or other) system tray is running");
- return NULL;
- }
-
- if (xfce_system_tray_check_running(xscreen)) {
- return PyBool_FromLong(1);
- } else {
- return PyBool_FromLong(0);
- }
-}
diff --git a/gui/tests/testaboutdialog.py b/gui/tests/testaboutdialog.py
deleted file mode 100644
index f176848..0000000
--- a/gui/tests/testaboutdialog.py
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env python
-
-import pygtk
-pygtk.require("2.0")
-import gtk
-import xfce4
-
-widget = xfce4.gui.AboutDialog()
-widget.set_program("testaboutdialog")
-widget.set_version("0.1")
-widget.set_description("Tests the About Dialog")
-widget.set_copyright("Danny Milosavljevic")
-widget.set_license("er... yeah... later")
-widget.set_homepage("http://what.browser.will.it.choose.today.at/")
-widget.add_credit("Danny Milosavljevic", "dannym at xfce.org", "Developer")
-widget.add_credit("Fred Mustermann", "fred at bogus.example.com", "Potential Being")
-
-def about_cb(button):
- global widget
- global w
- widget.set_transient_for(w)
- widget.run()
- widget.hide()
-
-button = gtk.Button("About")
-button.connect("clicked", about_cb)
-button.show()
-
-w = gtk.Window()
-w.connect("destroy", lambda x: gtk.main_quit())
-
-w.set_border_width(7)
-w.add(button)
-
-w.show()
-
-gtk.main()
diff --git a/gui/tests/testappmenuitem.py b/gui/tests/testappmenuitem.py
deleted file mode 100644
index 25f221a..0000000
--- a/gui/tests/testappmenuitem.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-
-import pygtk
-pygtk.require("2.0")
-import gtk
-import xfce4
-
-widget = xfce4.gui.app_menu_item_new_with_label("Boo!")
-#AppMenuItem()
-widget.set_name("Boo!")
-widget.set_command("xterm")
-widget.set_needs_term(False)
-widget.set_startup_notification(False)
-
-pitem = gtk.MenuItem("Progs...")
-pitem.show()
-menubar = gtk.MenuBar()
-menubar.append(pitem)
-menubar.show()
-
-menu1 = gtk.Menu()
-menu1.append(widget)
-widget.show()
-pitem.set_submenu(menu1)
-
-vbox = gtk.VBox()
-vbox.pack_start(menubar, False)
-vbox.show()
-
-w = gtk.Window()
-w.connect("destroy", lambda x: gtk.main_quit())
-
-w.set_border_width(7)
-w.add(vbox)
-
-w.show()
-
-gtk.main()
diff --git a/gui/tests/testdecorbutton.py b/gui/tests/testdecorbutton.py
deleted file mode 100644
index d68a875..0000000
--- a/gui/tests/testdecorbutton.py
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env python
-
-# what is that for
-
-import pygtk
-pygtk.require("2.0")
-import gtk
-import xfce4
-
-widget = xfce4.gui.Decorbutton("hide") # "close"
-widget.show()
-
-w = gtk.Window()
-w.connect("destroy", lambda x: gtk.main_quit())
-
-w.set_border_width(7)
-w.add(widget)
-
-w.show()
-
-gtk.main()
diff --git a/gui/tests/testdecortoggle.py b/gui/tests/testdecortoggle.py
deleted file mode 100644
index 06f1d7b..0000000
--- a/gui/tests/testdecortoggle.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-
-# what is that for
-
-import pygtk
-pygtk.require("2.0")
-import gtk
-import xfce4
-
-widget = xfce4.gui.Decortoggle("right") # "close"
-widget.set_active(True)
-widget.toggled()
-widget.show()
-
-w = gtk.Window()
-w.connect("destroy", lambda x: gtk.main_quit())
-
-w.set_border_width(7)
-w.add(widget)
-
-w.show()
-
-gtk.main()
diff --git a/gui/tests/testfilechooser.py b/gui/tests/testfilechooser.py
deleted file mode 100644
index bb65147..0000000
--- a/gui/tests/testfilechooser.py
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-# not working
-import pygtk
-pygtk.require("2.0")
-import gtk
-import xfce4
-
-widget = xfce4.gui.FileChooser()
-widget.run()
diff --git a/gui/tests/testframebox.py b/gui/tests/testframebox.py
deleted file mode 100644
index a0695ff..0000000
--- a/gui/tests/testframebox.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-# not working
-import pygtk
-pygtk.require("2.0")
-import gtk
-import xfce4
-
-widget = xfce4.gui.Framebox("Hi", 0)
-
-button = gtk.Button("About")
-button.show()
-
-widget.add(button)
-widget.show()
-
-w = gtk.Window()
-w.connect("destroy", lambda x: gtk.main_quit())
-
-w.set_border_width(7)
-w.add(widget)
-
-w.show()
-
-gtk.main()
diff --git a/gui/tests/testiconbutton.py b/gui/tests/testiconbutton.py
deleted file mode 100644
index b0533a5..0000000
--- a/gui/tests/testiconbutton.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-
-import pygtk
-pygtk.require("2.0")
-import gtk
-import xfce4
-
-iv = gtk.Invisible()
-pb = iv.render_icon(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_DIALOG)
-widget = xfce4.gui.Iconbutton()
-widget.set_pixbuf(pb)
-widget.show()
-
-w = gtk.Window()
-w.connect("destroy", lambda x: gtk.main_quit())
-
-w.set_border_width(7)
-w.add(widget)
-
-w.show()
-
-gtk.main()
diff --git a/gui/tests/testicontheme.py b/gui/tests/testicontheme.py
deleted file mode 100644
index 36f545e..0000000
--- a/gui/tests/testicontheme.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python
-
-import pygtk
-pygtk.require("2.0")
-import gtk
-import xfce4
-
-widget = xfce4.gui.IconTheme(gtk.gdk.screen_get_default())
-ic = widget.load("xfce-mail", 24)
-print ic
-icname = widget.lookup("xfce-mail", 24)
-print icname
-
-image = gtk.Image()
-image.set_from_pixbuf(ic)
-image.show()
-w = gtk.Window()
-w.connect("destroy", lambda x: gtk.main_quit())
-w.add(image)
-w.show()
-
-gtk.main()
diff --git a/gui/tests/testmenubutton.py b/gui/tests/testmenubutton.py
deleted file mode 100644
index 2c0df4e..0000000
--- a/gui/tests/testmenubutton.py
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env python
-# beware!!! endless effect!!
-import pygtk
-pygtk.require("2.0")
-import gtk
-import xfce4
-
-menu = gtk.Menu()
-item = gtk.MenuItem("Test")
-item.show()
-menu.append(item)
-
-widget = xfce4.gui.Menubutton("Hello")
-widget.set_text("Buh")
-widget.set_stock_icon(gtk.STOCK_DIALOG_INFO)
-#widget.set_pixbuf(pb)
-widget.show()
-
-w = gtk.Window()
-w.connect("destroy", lambda x: gtk.main_quit())
-
-w.set_border_width(7)
-w.add(widget)
-
-w.show()
-
-gtk.main()
diff --git a/gui/tests/testmovehandler.py b/gui/tests/testmovehandler.py
deleted file mode 100644
index f1a20f1..0000000
--- a/gui/tests/testmovehandler.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-# beware!!! endless effect!!
-import pygtk
-pygtk.require("2.0")
-import gtk
-import xfce4
-
-w = gtk.Window()
-
-widget = xfce4.gui.Movehandler(w)
-widget.show()
-
-w.connect("destroy", lambda x: gtk.main_quit())
-
-w.set_border_width(7)
-w.add(widget)
-
-w.show()
-
-gtk.main()
diff --git a/gui/tests/testscaledimage.py b/gui/tests/testscaledimage.py
deleted file mode 100644
index ac43115..0000000
--- a/gui/tests/testscaledimage.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-# doesnt work correctly
-import pygtk
-pygtk.require("2.0")
-import gtk
-import xfce4
-
-iv = gtk.Invisible()
-pb = iv.render_icon(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_DIALOG)
-
-widget = xfce4.gui.ScaledImage()
-widget.set_from_pixbuf(pb)
-widget.show()
-
-w = gtk.Window()
-w.connect("destroy", lambda x: gtk.main_quit())
-
-w.set_border_width(7)
-w.add(widget)
-
-w.show()
-
-gtk.main()
diff --git a/gui/tests/testsessionclient.py b/gui/tests/testsessionclient.py
deleted file mode 100644
index 1126399..0000000
--- a/gui/tests/testsessionclient.py
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env python
-
-import pygtk
-pygtk.require("2.0")
-import gtk
-import xfce4
-
-sc = xfce4.gui.SessionClient()
-#sc.init()
-#sc.shutdown()
-#sc.logout()
diff --git a/gui/tests/testsystemtray.py b/gui/tests/testsystemtray.py
deleted file mode 100644
index 63f4afd..0000000
--- a/gui/tests/testsystemtray.py
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env python
-# not tested
-import pygtk
-pygtk.require("2.0")
-import gtk
-import xfce4
-
-box = gtk.HBox()
-box.show()
-
-def icon_docked_cb(tray, widget):
- global box
- box.pack_start(widget)
-
-def icon_undocked_cb(tray, widget):
- global box
- box.remove(widget)
-
-def selection_cleared_cb(tray):
- #tray.register(...)
- pass
-
-def message_new_cb(tray, widget, id, timeout, text):
- pass
-
-def message_clear_cb(tray, widget, id):
- pass
-
-tray = xfce4.gui.SystemTray()
-tray.connect("icon-docked", icon_docked_cb)
-tray.connect("icon-undocked", icon_undocked_cb)
-tray.connect("selection-cleared", selection_cleared_cb)
-tray.connect("message-new", message_new_cb)
-tray.connect("message-clear", message_clear_cb)
-
-#tray.register(gtk.gdk.screen_get_default())
-#tray.unregister()
-#tray.check_running(gtk.gdk.screen_get_default())
-#tray.error_quark()
-
-w = gtk.Window()
-w.connect("destroy", lambda x: gtk.main_quit())
-
-w.set_border_width(7)
-w.add(box)
-
-w.show()
-
-gtk.main()
diff --git a/gui/tests/testtogglebutton.py b/gui/tests/testtogglebutton.py
deleted file mode 100644
index 809cca2..0000000
--- a/gui/tests/testtogglebutton.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-
-# what is that for
-
-import pygtk
-pygtk.require("2.0")
-import gtk
-import xfce4
-
-widget = xfce4.gui.Togglebutton("right")
-widget.set_active(True)
-widget.toggled()
-widget.show()
-
-w = gtk.Window()
-w.connect("destroy", lambda x: gtk.main_quit())
-
-w.set_border_width(7)
-w.add(widget)
-
-w.show()
-
-gtk.main()
diff --git a/gui/titled_dialog.defs b/gui/titled_dialog.defs
deleted file mode 100644
index 277edb1..0000000
--- a/gui/titled_dialog.defs
+++ /dev/null
@@ -1,53 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object TitledDialog
- (in-module "Xfce")
- (parent "GtkDialog")
- (c-name "XfceTitledDialog")
- (gtype-id "XFCE_TYPE_TITLED_DIALOG")
-)
-
-;; Enumerations and flags ...
-
-
-;; From xfce-titled-dialog.h
-
-(define-function titled_dialog_get_type
- (c-name "xfce_titled_dialog_get_type")
- (return-type "GType")
-)
-
-(define-function titled_dialog_new
- (c-name "xfce_titled_dialog_new")
- (is-constructor-of "XfceTitledDialog")
- (return-type "GtkWidget*")
-)
-
-(define-function titled_dialog_new_with_buttons
- (c-name "xfce_titled_dialog_new_with_buttons")
- (return-type "GtkWidget*")
- (parameters
- '("const-gchar*" "title")
- '("GtkWindow*" "parent")
- '("GtkDialogFlags" "flags")
- '("const-gchar*" "first_button_text")
- )
- (varargs #t)
-)
-
-(define-method get_subtitle
- (of-object "XfceTitledDialog")
- (c-name "xfce_titled_dialog_get_subtitle")
- (return-type "const-gchar*")
-)
-
-(define-method set_subtitle
- (of-object "XfceTitledDialog")
- (c-name "xfce_titled_dialog_set_subtitle")
- (return-type "none")
- (parameters
- '("const-gchar*" "subtitle")
- )
-)
-
-
diff --git a/gui/togglebutton.c b/gui/togglebutton.c
deleted file mode 100644
index 80c6659..0000000
--- a/gui/togglebutton.c
+++ /dev/null
@@ -1,178 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "togglebutton.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#ifndef XFCE_TYPE_TOGGLEBUTTON
-#define XFCE_TYPE_TOGGLEBUTTON (xfce_togglebutton_get_type ())
-#endif
-
-#line 17 "togglebutton.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGtkToggleButton_Type;
-#define PyGtkToggleButton_Type (*_PyGtkToggleButton_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceTogglebutton_Type;
-
-#line 30 "togglebutton.c"
-
-
-
-/* ----------- XfceTogglebutton ----------- */
-
-static int
-_wrap_xfce_togglebutton_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "arrow_type", NULL };
- PyObject *py_arrow_type = NULL;
- GtkArrowType arrow_type;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:XfceTogglebutton.__init__", kwlist, &py_arrow_type))
- return -1;
- if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_arrow_type, (gint *)&arrow_type))
- return -1;
- self->obj = (GObject *)xfce_togglebutton_new(arrow_type);
-
- if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create XfceTogglebutton object");
- return -1;
- }
- pygobject_register_wrapper((PyObject *)self);
- return 0;
-}
-
-static PyObject *
-_wrap_xfce_togglebutton_set_arrow_type(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "arrow_type", NULL };
- PyObject *py_arrow_type = NULL;
- GtkArrowType arrow_type;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:XfceTogglebutton.set_arrow_type", kwlist, &py_arrow_type))
- return NULL;
- if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_arrow_type, (gint *)&arrow_type))
- return NULL;
- xfce_togglebutton_set_arrow_type(XFCE_TOGGLEBUTTON(self->obj), arrow_type);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_togglebutton_get_arrow_type(PyGObject *self)
-{
- gint ret;
-
- ret = xfce_togglebutton_get_arrow_type(XFCE_TOGGLEBUTTON(self->obj));
- return pyg_enum_from_gtype(GTK_TYPE_ARROW_TYPE, ret);
-}
-
-static PyMethodDef _PyXfceTogglebutton_methods[] = {
- { "set_arrow_type", (PyCFunction)_wrap_xfce_togglebutton_set_arrow_type, METH_VARARGS|METH_KEYWORDS },
- { "get_arrow_type", (PyCFunction)_wrap_xfce_togglebutton_get_arrow_type, METH_NOARGS },
- { NULL, NULL, 0 }
-};
-
-PyTypeObject PyXfceTogglebutton_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "togglebutton.Togglebutton", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyXfceTogglebutton_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_togglebutton_new, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-PyMethodDef pytogglebutton_functions[] = {
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pytogglebutton_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkToggleButton_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "ToggleButton");
- if (_PyGtkToggleButton_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name ToggleButton from gtk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return;
- }
-
-
-#line 177 "togglebutton.c"
- pygobject_register_class(d, "XfceTogglebutton", XFCE_TYPE_TOGGLEBUTTON, &PyXfceTogglebutton_Type, Py_BuildValue("(O)", &PyGtkToggleButton_Type));
-}
diff --git a/gui/togglebutton.defs b/gui/togglebutton.defs
deleted file mode 100644
index 691cd75..0000000
--- a/gui/togglebutton.defs
+++ /dev/null
@@ -1,44 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object Togglebutton
- (in-module "Xfce")
- (parent "GtkToggleButton")
- (c-name "XfceTogglebutton")
- (gtype-id "XFCE_TYPE_TOGGLEBUTTON")
-)
-
-;; Enumerations and flags ...
-
-
-;; From xfce_togglebutton.h
-
-(define-function togglebutton_get_type
- (c-name "xfce_togglebutton_get_type")
- (return-type "GtkType")
-)
-
-(define-function togglebutton_new
- (c-name "xfce_togglebutton_new")
- (is-constructor-of "XfceTogglebutton")
- (return-type "GtkWidget*")
- (parameters
- '("GtkArrowType" "arrow_type")
- )
-)
-
-(define-method set_arrow_type
- (of-object "XfceTogglebutton")
- (c-name "xfce_togglebutton_set_arrow_type")
- (return-type "none")
- (parameters
- '("GtkArrowType" "arrow_type")
- )
-)
-
-(define-method get_arrow_type
- (of-object "XfceTogglebutton")
- (c-name "xfce_togglebutton_get_arrow_type")
- (return-type "GtkArrowType")
-)
-
-
diff --git a/gui/togglebutton.override b/gui/togglebutton.override
deleted file mode 100644
index 7984fde..0000000
--- a/gui/togglebutton.override
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#ifndef XFCE_TYPE_TOGGLEBUTTON
-#define XFCE_TYPE_TOGGLEBUTTON (xfce_togglebutton_get_type ())
-#endif
-
-%%
-include
-%%
-modulename togglebutton
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.ToggleButton as PyGtkToggleButton_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/netk/GET_FUNCTIONS b/netk/GET_FUNCTIONS
deleted file mode 100644
index 00d23aa..0000000
--- a/netk/GET_FUNCTIONS
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-cat *.c |grep _functions |grep "{" |sed 's; = {;;' |sed 's@^\(.*\)$@extern \1;@'
-cat *.c |grep _classes |grep -v ";" |sed 's@^\(.*\)$@void \1;@' |grep -v "/\*"
-
-
-
diff --git a/netk/Makefile.am b/netk/Makefile.am
deleted file mode 100644
index 9219f20..0000000
--- a/netk/Makefile.am
+++ /dev/null
@@ -1,77 +0,0 @@
- at SET_MAKE@
-
-PLATFORM_VERSION = 4.2
-
-common_ldflags = -module -avoid-version -export-symbols-regex init_netk
-if PLATFORM_WIN32
-common_ldflags += -no-undefined
-endif
-
-INCLUDES = $(PYTHON_INCLUDES)
-
-CODEGEN_PATH = @CODEGEN_PATH@
-
-pyxfceexecdir = $(pyexecdir)/xfce4
-pyxfceexec_LTLIBRARIES = _netk.la
-pyxfceexec_PYTHON = netk.py
-_netk_la_CFLAGS = $(XFCE4_GUI_CFLAGS) $(PYTHON_CFLAGS) $(PYGTK_CFLAGS)
-_netk_la_LDFLAGS = $(common_ldflags)
-_netk_la_LIBADD = $(XFCE4_GUI_LIBS) $(PYTHON_LIBS)
-_netk_la_SOURCES = \
- application.c \
- class_group.c \
- enum_types.c \
- pager.c \
- screen.c \
- tasklist.c \
- trayicon.c \
- util.c \
- window_action_menu.c \
- window.c \
- window_menu.c \
- workspace.c \
- netkmodule.c
-
-defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs
-defs_DATA = \
- application.defs \
- class_group.defs \
- enum_types.defs \
- pager.defs \
- screen.defs \
- tasklist.defs \
- trayicon.defs \
- util.defs \
- window_action_menu.defs \
- window.defs \
- window_menu.defs \
- workspace.defs
-
-netk_overrides = application.override tasklist.override window_menu.override \
-class_group.override template.override window.override \
-enum_types.override trayicon.override workspace.override \
-pager.override util.override \
-screen.override window_action_menu.override
-
-EXTRA_DIST = $(defs_DATA) $(netk_overrides) gen
-nodist__netk_la_SOURCES =
-
-PYGTK_DEFS="`pkg-config --variable=defsdir pygtk-2.0`"
-
-.defs.c:
- (cd $(srcdir) \
- && $(PYTHON) $(CODEGEN_PATH)/codegen.py \
- $(PYGTK_CODEGEN_DEFINES) \
- --override $*.override \
- --register $(PYGTK_DEFS)/gtk-types.defs \
- --register $(PYGTK_DEFS)/gdk-types.defs \
- --register workspace.defs \
- --register window.defs \
- --register trayicon.defs \
- --register screen.defs \
- --register application.defs \
- --register class_group.defs \
- --prefix py$* $*.defs) > gen-$*.c \
- && cp gen-$*.c $*.c \
- && rm -f gen-$*.c
-
diff --git a/netk/application.c b/netk/application.c
deleted file mode 100644
index 083d18d..0000000
--- a/netk/application.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "application.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#line 13 "application.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject PyNetkApplication_Type;
-
-#line 24 "application.c"
-
-
-
-/* ----------- NetkApplication ----------- */
-
-static PyObject *
-_wrap_netk_application_get_xid(PyGObject *self)
-{
- gulong ret;
-
- ret = netk_application_get_xid(NETK_APPLICATION(self->obj));
- return PyLong_FromUnsignedLong(ret);
-
-}
-
-#line 25 "application.override"
-static PyObject *
-_wrap_netk_application_get_windows(PyGObject *self)
-{
- GList *icon_list = NULL;
- PyObject *pywindow;
- PyObject *py_list;
- GList *tmp;
-
- if ((icon_list = netk_application_get_windows(NETK_APPLICATION(self->obj)))) {
-
- if ((py_list = PyList_New(0)) == NULL) {
- /*g_list_free(icon_list); no */
- return NULL;
- }
- for (tmp = icon_list; tmp != NULL; tmp = tmp->next) {
- pywindow = pygobject_new(G_OBJECT(tmp->data)); /* reffed+sunk automagically */
-
- if (pywindow == NULL) {
- /*g_list_free(icon_list); no */
- Py_DECREF(py_list);
- return NULL;
- }
- PyList_Append(py_list, pywindow);
- Py_DECREF(pywindow);
- }
- /*g_list_free(icon_list); no */
- return py_list;
- }
- if ((py_list = PyList_New(0)) == NULL) {
- /* g_list_free(icon_list); no */
- return NULL;
- }
- return py_list;
-}
-#line 75 "application.c"
-
-
-static PyObject *
-_wrap_netk_application_get_n_windows(PyGObject *self)
-{
- int ret;
-
- ret = netk_application_get_n_windows(NETK_APPLICATION(self->obj));
- return PyInt_FromLong(ret);
-}
-
-static PyObject *
-_wrap_netk_application_get_name(PyGObject *self)
-{
- const gchar *ret;
-
- ret = netk_application_get_name(NETK_APPLICATION(self->obj));
- if (ret)
- return PyString_FromString(ret);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_application_get_icon_name(PyGObject *self)
-{
- const gchar *ret;
-
- ret = netk_application_get_icon_name(NETK_APPLICATION(self->obj));
- if (ret)
- return PyString_FromString(ret);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_application_get_pid(PyGObject *self)
-{
- int ret;
-
- ret = netk_application_get_pid(NETK_APPLICATION(self->obj));
- return PyInt_FromLong(ret);
-}
-
-static PyObject *
-_wrap_netk_application_get_icon(PyGObject *self)
-{
- GdkPixbuf *ret;
-
- ret = netk_application_get_icon(NETK_APPLICATION(self->obj));
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_netk_application_get_mini_icon(PyGObject *self)
-{
- GdkPixbuf *ret;
-
- ret = netk_application_get_mini_icon(NETK_APPLICATION(self->obj));
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_netk_application_get_icon_is_fallback(PyGObject *self)
-{
- int ret;
-
- ret = netk_application_get_icon_is_fallback(NETK_APPLICATION(self->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyMethodDef _PyNetkApplication_methods[] = {
- { "get_xid", (PyCFunction)_wrap_netk_application_get_xid, METH_NOARGS },
- { "get_windows", (PyCFunction)_wrap_netk_application_get_windows, METH_NOARGS },
- { "get_n_windows", (PyCFunction)_wrap_netk_application_get_n_windows, METH_NOARGS },
- { "get_name", (PyCFunction)_wrap_netk_application_get_name, METH_NOARGS },
- { "get_icon_name", (PyCFunction)_wrap_netk_application_get_icon_name, METH_NOARGS },
- { "get_pid", (PyCFunction)_wrap_netk_application_get_pid, METH_NOARGS },
- { "get_icon", (PyCFunction)_wrap_netk_application_get_icon, METH_NOARGS },
- { "get_mini_icon", (PyCFunction)_wrap_netk_application_get_mini_icon, METH_NOARGS },
- { "get_icon_is_fallback", (PyCFunction)_wrap_netk_application_get_icon_is_fallback, METH_NOARGS },
- { NULL, NULL, 0 }
-};
-
-PyTypeObject PyNetkApplication_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "application.Application", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyNetkApplication_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)0, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_netk_application_get(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "xwindow", NULL };
- unsigned long xwindow;
- NetkApplication *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "k:application_get", kwlist, &xwindow))
- return NULL;
- ret = netk_application_get(xwindow);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-PyMethodDef pyapplication_functions[] = {
- { "application_get", (PyCFunction)_wrap_netk_application_get, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pyapplication_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
-
-
-#line 253 "application.c"
- pygobject_register_class(d, "NetkApplication", NETK_TYPE_APPLICATION, &PyNetkApplication_Type, Py_BuildValue("(O)", &PyGObject_Type));
- pyg_set_object_has_new_constructor(NETK_TYPE_APPLICATION);
-}
diff --git a/netk/application.defs b/netk/application.defs
deleted file mode 100644
index ae65685..0000000
--- a/netk/application.defs
+++ /dev/null
@@ -1,82 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object Application
- (in-module "Netk")
- (parent "GObject")
- (c-name "NetkApplication")
- (gtype-id "NETK_TYPE_APPLICATION")
-)
-
-;; Enumerations and flags ...
-
-
-;; From netk-application.h
-
-(define-function application_get_type
- (c-name "netk_application_get_type")
- (return-type "GType")
-)
-
-(define-function application_get
- (c-name "netk_application_get")
- (return-type "NetkApplication*")
- (parameters
- '("gulong" "xwindow")
- )
-)
-
-(define-method get_xid
- (of-object "NetkApplication")
- (c-name "netk_application_get_xid")
- (return-type "gulong")
-)
-
-(define-method get_windows
- (of-object "NetkApplication")
- (c-name "netk_application_get_windows")
- (return-type "GList*")
-)
-
-(define-method get_n_windows
- (of-object "NetkApplication")
- (c-name "netk_application_get_n_windows")
- (return-type "int")
-)
-
-(define-method get_name
- (of-object "NetkApplication")
- (c-name "netk_application_get_name")
- (return-type "const-char*")
-)
-
-(define-method get_icon_name
- (of-object "NetkApplication")
- (c-name "netk_application_get_icon_name")
- (return-type "const-char*")
-)
-
-(define-method get_pid
- (of-object "NetkApplication")
- (c-name "netk_application_get_pid")
- (return-type "int")
-)
-
-(define-method get_icon
- (of-object "NetkApplication")
- (c-name "netk_application_get_icon")
- (return-type "GdkPixbuf*")
-)
-
-(define-method get_mini_icon
- (of-object "NetkApplication")
- (c-name "netk_application_get_mini_icon")
- (return-type "GdkPixbuf*")
-)
-
-(define-method get_icon_is_fallback
- (of-object "NetkApplication")
- (c-name "netk_application_get_icon_is_fallback")
- (return-type "gboolean")
-)
-
-
diff --git a/netk/application.override b/netk/application.override
deleted file mode 100644
index 6e7b7e2..0000000
--- a/netk/application.override
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-%%
-include
-%%
-modulename application
-%%
-import gobject.GObject as PyGObject_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
-override netk_application_get_windows noargs
-static PyObject *
-_wrap_netk_application_get_windows(PyGObject *self)
-{
- GList *icon_list = NULL;
- PyObject *pywindow;
- PyObject *py_list;
- GList *tmp;
-
- if ((icon_list = netk_application_get_windows(NETK_APPLICATION(self->obj)))) {
-
- if ((py_list = PyList_New(0)) == NULL) {
- /*g_list_free(icon_list); no */
- return NULL;
- }
- for (tmp = icon_list; tmp != NULL; tmp = tmp->next) {
- pywindow = pygobject_new(G_OBJECT(tmp->data)); /* reffed+sunk automagically */
-
- if (pywindow == NULL) {
- /*g_list_free(icon_list); no */
- Py_DECREF(py_list);
- return NULL;
- }
- PyList_Append(py_list, pywindow);
- Py_DECREF(pywindow);
- }
- /*g_list_free(icon_list); no */
- return py_list;
- }
- if ((py_list = PyList_New(0)) == NULL) {
- /* g_list_free(icon_list); no */
- return NULL;
- }
- return py_list;
-}
diff --git a/netk/class_group.c b/netk/class_group.c
deleted file mode 100644
index c009133..0000000
--- a/netk/class_group.c
+++ /dev/null
@@ -1,273 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "class_group.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/netk-class-group.h>
-#include <libxfcegui4/netk-window.h>
-
-extern PyTypeObject PyNetkWindow_Type;
-
-#line 16 "class_group.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject PyNetkClassGroup_Type;
-
-#line 27 "class_group.c"
-
-
-
-/* ----------- NetkClassGroup ----------- */
-
-#line 30 "class_group.override"
-static PyObject *
-_wrap_netk_class_group_get_windows(PyGObject *self)
-{
- GList *icon_list = NULL;
- PyObject *pywindow;
- PyObject *py_list;
- GList *tmp;
-
- if ((icon_list = netk_class_group_get_windows(NETK_CLASS_GROUP(self->obj)))) {
-
- if ((py_list = PyList_New(0)) == NULL) {
- /*g_list_free(icon_list); no */
- return NULL;
- }
- for (tmp = icon_list; tmp != NULL; tmp = tmp->next) {
- pywindow = pygobject_new(G_OBJECT(tmp->data)); /* will g_object_ref and sink if applicable */
-
- if (pywindow == NULL) {
- /*g_list_free(icon_list); no */
- Py_DECREF(py_list);
- return NULL;
- }
- PyList_Append(py_list, pywindow);
- Py_DECREF(pywindow);
- }
- /*g_list_free(icon_list); no */
- return py_list;
- }
- if ((py_list = PyList_New(0)) == NULL) {
- /* g_list_free(icon_list); no */
- return NULL;
- }
- return py_list;
-}
-#line 68 "class_group.c"
-
-
-static PyObject *
-_wrap_netk_class_group_get_res_class(PyGObject *self)
-{
- const gchar *ret;
-
- ret = netk_class_group_get_res_class(NETK_CLASS_GROUP(self->obj));
- if (ret)
- return PyString_FromString(ret);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_class_group_get_name(PyGObject *self)
-{
- const gchar *ret;
-
- ret = netk_class_group_get_name(NETK_CLASS_GROUP(self->obj));
- if (ret)
- return PyString_FromString(ret);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_class_group_get_icon(PyGObject *self)
-{
- GdkPixbuf *ret;
-
- ret = netk_class_group_get_icon(NETK_CLASS_GROUP(self->obj));
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_netk_class_group_get_mini_icon(PyGObject *self)
-{
- GdkPixbuf *ret;
-
- ret = netk_class_group_get_mini_icon(NETK_CLASS_GROUP(self->obj));
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyMethodDef _PyNetkClassGroup_methods[] = {
- { "get_windows", (PyCFunction)_wrap_netk_class_group_get_windows, METH_NOARGS },
- { "get_res_class", (PyCFunction)_wrap_netk_class_group_get_res_class, METH_NOARGS },
- { "get_name", (PyCFunction)_wrap_netk_class_group_get_name, METH_NOARGS },
- { "get_icon", (PyCFunction)_wrap_netk_class_group_get_icon, METH_NOARGS },
- { "get_mini_icon", (PyCFunction)_wrap_netk_class_group_get_mini_icon, METH_NOARGS },
- { NULL, NULL, 0 }
-};
-
-PyTypeObject PyNetkClassGroup_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "classgroup.ClassGroup", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyNetkClassGroup_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)0, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_netk_class_group_get(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "res_class", NULL };
- char *res_class;
- NetkClassGroup *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:class_group_get", kwlist, &res_class))
- return NULL;
- ret = netk_class_group_get(res_class);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_p_netk_class_group_create(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "res_class", NULL };
- char *res_class;
- NetkClassGroup *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:p_netk_class_group_create", kwlist, &res_class))
- return NULL;
- ret = p_netk_class_group_create(res_class);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_p_netk_class_group_destroy(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "class_group", NULL };
- PyGObject *class_group;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:p_netk_class_group_destroy", kwlist, &PyNetkClassGroup_Type, &class_group))
- return NULL;
- p_netk_class_group_destroy(NETK_CLASS_GROUP(class_group->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_p_netk_class_group_add_window(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "class_group", "window", NULL };
- PyGObject *class_group, *window;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!O!:p_netk_class_group_add_window", kwlist, &PyNetkClassGroup_Type, &class_group, &PyNetkWindow_Type, &window))
- return NULL;
- p_netk_class_group_add_window(NETK_CLASS_GROUP(class_group->obj), NETK_WINDOW(window->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_p_netk_class_group_remove_window(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "class_group", "window", NULL };
- PyGObject *class_group, *window;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!O!:p_netk_class_group_remove_window", kwlist, &PyNetkClassGroup_Type, &class_group, &PyNetkWindow_Type, &window))
- return NULL;
- p_netk_class_group_remove_window(NETK_CLASS_GROUP(class_group->obj), NETK_WINDOW(window->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-PyMethodDef pyclass_group_functions[] = {
- { "class_group_get", (PyCFunction)_wrap_netk_class_group_get, METH_VARARGS|METH_KEYWORDS },
- { "p_netk_class_group_create", (PyCFunction)_wrap_p_netk_class_group_create, METH_VARARGS|METH_KEYWORDS },
- { "p_netk_class_group_destroy", (PyCFunction)_wrap_p_netk_class_group_destroy, METH_VARARGS|METH_KEYWORDS },
- { "p_netk_class_group_add_window", (PyCFunction)_wrap_p_netk_class_group_add_window, METH_VARARGS|METH_KEYWORDS },
- { "p_netk_class_group_remove_window", (PyCFunction)_wrap_p_netk_class_group_remove_window, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pyclass_group_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
-
-
-#line 271 "class_group.c"
- pygobject_register_class(d, "NetkClassGroup", NETK_TYPE_CLASS_GROUP, &PyNetkClassGroup_Type, Py_BuildValue("(O)", &PyGObject_Type));
- pyg_set_object_has_new_constructor(NETK_TYPE_CLASS_GROUP);
-}
diff --git a/netk/class_group.defs b/netk/class_group.defs
deleted file mode 100644
index d52d3af..0000000
--- a/netk/class_group.defs
+++ /dev/null
@@ -1,92 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object ClassGroup
- (in-module "Netk")
- (parent "GObject")
- (c-name "NetkClassGroup")
- (gtype-id "NETK_TYPE_CLASS_GROUP")
-)
-
-;; Enumerations and flags ...
-
-
-;; From netk-class-group.h
-
-(define-function class_group_get_type
- (c-name "netk_class_group_get_type")
- (return-type "GType")
-)
-
-(define-function class_group_get
- (c-name "netk_class_group_get")
- (return-type "NetkClassGroup*")
- (parameters
- '("const-char*" "res_class")
- )
-)
-
-(define-method get_windows
- (of-object "NetkClassGroup")
- (c-name "netk_class_group_get_windows")
- (return-type "GList*")
-)
-
-(define-method get_res_class
- (of-object "NetkClassGroup")
- (c-name "netk_class_group_get_res_class")
- (return-type "const-char*")
-)
-
-(define-method get_name
- (of-object "NetkClassGroup")
- (c-name "netk_class_group_get_name")
- (return-type "const-char*")
-)
-
-(define-method get_icon
- (of-object "NetkClassGroup")
- (c-name "netk_class_group_get_icon")
- (return-type "GdkPixbuf*")
-)
-
-(define-method get_mini_icon
- (of-object "NetkClassGroup")
- (c-name "netk_class_group_get_mini_icon")
- (return-type "GdkPixbuf*")
-)
-
-(define-function p_netk_class_group_create
- (c-name "p_netk_class_group_create")
- (return-type "NetkClassGroup*")
- (parameters
- '("const-char*" "res_class")
- )
-)
-
-(define-function p_netk_class_group_destroy
- (c-name "p_netk_class_group_destroy")
- (return-type "none")
- (parameters
- '("NetkClassGroup*" "class_group")
- )
-)
-
-(define-function p_netk_class_group_add_window
- (c-name "p_netk_class_group_add_window")
- (return-type "none")
- (parameters
- '("NetkClassGroup*" "class_group")
- '("NetkWindow*" "window")
- )
-)
-
-(define-function p_netk_class_group_remove_window
- (c-name "p_netk_class_group_remove_window")
- (return-type "none")
- (parameters
- '("NetkClassGroup*" "class_group")
- '("NetkWindow*" "window")
- )
-)
-
-
diff --git a/netk/class_group.override b/netk/class_group.override
deleted file mode 100644
index 5429895..0000000
--- a/netk/class_group.override
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/netk-class-group.h>
-#include <libxfcegui4/netk-window.h>
-
-extern PyTypeObject PyNetkWindow_Type;
-
-%%
-include
-%%
-modulename classgroup
-%%
-import gobject.GObject as PyGObject_Type
-import window as PyNetkWindow_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
- netk_class_group_get_type
-%%
-ignore-win32
-%%
-override netk_class_group_get_windows noargs
-static PyObject *
-_wrap_netk_class_group_get_windows(PyGObject *self)
-{
- GList *icon_list = NULL;
- PyObject *pywindow;
- PyObject *py_list;
- GList *tmp;
-
- if ((icon_list = netk_class_group_get_windows(NETK_CLASS_GROUP(self->obj)))) {
-
- if ((py_list = PyList_New(0)) == NULL) {
- /*g_list_free(icon_list); no */
- return NULL;
- }
- for (tmp = icon_list; tmp != NULL; tmp = tmp->next) {
- pywindow = pygobject_new(G_OBJECT(tmp->data)); /* will g_object_ref and sink if applicable */
-
- if (pywindow == NULL) {
- /*g_list_free(icon_list); no */
- Py_DECREF(py_list);
- return NULL;
- }
- PyList_Append(py_list, pywindow);
- Py_DECREF(pywindow);
- }
- /*g_list_free(icon_list); no */
- return py_list;
- }
- if ((py_list = PyList_New(0)) == NULL) {
- /* g_list_free(icon_list); no */
- return NULL;
- }
- return py_list;
-}
diff --git a/netk/enum_types.c b/netk/enum_types.c
deleted file mode 100644
index 245b185..0000000
--- a/netk/enum_types.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "enum_types.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#line 13 "enum_types.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 23 "enum_types.c"
-
-
-
-/* ----------- functions ----------- */
-
-PyMethodDef pyenum_types_functions[] = {
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pyenum_types_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
-
-
-#line 55 "enum_types.c"
-}
diff --git a/netk/enum_types.defs b/netk/enum_types.defs
deleted file mode 100644
index f967c66..0000000
--- a/netk/enum_types.defs
+++ /dev/null
@@ -1,33 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-
-;; From netk-enum-types.h
-
-(define-function window_state_get_type
- (c-name "netk_window_state_get_type")
- (return-type "GType")
-)
-
-(define-function window_actions_get_type
- (c-name "netk_window_actions_get_type")
- (return-type "GType")
-)
-
-(define-function window_type_get_type
- (c-name "netk_window_type_get_type")
- (return-type "GType")
-)
-
-(define-function pager_display_mode_get_type
- (c-name "netk_pager_display_mode_get_type")
- (return-type "GType")
-)
-
-(define-function tasklist_grouping_type_get_type
- (c-name "netk_tasklist_grouping_type_get_type")
- (return-type "GType")
-)
-
-
diff --git a/netk/enum_types.override b/netk/enum_types.override
deleted file mode 100644
index c4fc36d..0000000
--- a/netk/enum_types.override
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-%%
-include
-%%
-modulename enumtypes
-%%
-import gobject.GObject as PyGObject_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
- netk_window_state_get_type
- netk_window_type_get_type
-%%
-ignore-win32
-%%
diff --git a/netk/gen b/netk/gen
deleted file mode 100755
index f1af90b..0000000
--- a/netk/gen
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-inc="`pkg-config --variable=includedir libxfcegui4-1.0`"/xfce4
-
-for s in "${inc}"/libxfcegui4/*.h
-do
- #echo "XX $s"
- t="${s##*/}"
-
- t="${t%.h}"
-
- if [ "${t#netk-}" != "$t" ]
- then
- defs="${t/-/_}.defs"
- defs="${defs/-/_}"
- defs="${defs/-/_}"
-
- #echo "${defs}"
-
- python /usr/lib/python2.6/site-packages/gtk-2.0/codegen/h2def.py "$s" >"${defs}"
- fi
-done
-rm -f util.defs
-
-for s in netk_*.defs
-do
- t="${s#netk_}"
- mv "$s" "$t"
-done
-
-#mmv -o 'xfce-*.defs' '#1.defs'
-#rm -f libxfce4util.defs
-#rm -f libxfce4util-config.defs
-#rm -f generics.defs
-#rm -f debug.defs
-
-for s in *.defs
-do
- sed -e 's;(define-function netk_;(define-function ;' "$s" >"${s}.new" && mv "${s}.new" "$s"
-done
-
-#cat >>trayicon.defs << EOF
-#
-#(define-function tray_icon_get_type
-# (c-name "tray_icon_get_type")
-# (return-type "GType")
-#)
-#
-#(define-function tray_icon_new
-# (c-name "netk_tray_icon_new")
-# (is-constructor-of "NetkTrayIcon")
-# (return-type "NetkTrayIcon*")
-#)
-#
-#(define-method tray_icon_set_screen
-# (of-object "NetkTrayIcon")
-# (c-name "netk_tray_icon_set_screen")
-# (return-type "none")
-# (parameters
-# '("GdkScreen*" "screen")
-# )
-#)
-#EOF
-# message_new
-# message_cancel
-
-cat trayicon.defs \
-| awk ' /^\(define-/ { n = 0; } /^\(define-function tray_icon_new/ { n = 1; } /^\)/ { n = 0; } /\(parameters/ { if (n) skip1 = 1; } /\("Screen\*" "screen"\)/ { if (n) skip1 = 1; } / \)/ { if (n) skip1 = 1; } // { if (skip1 == 1) skip1 = 0; else print $_; } ' >trayicon.defs.new \
-&& mv trayicon.defs.new trayicon.defs
-
-cat >> screen.defs << EOF
-(define-method get_workspaces
- (of-object "NetkScreen")
- (c-name "netk_screen_get_workspaces")
- (return-type "GList*")
- (parameters
- )
-)
-EOF
diff --git a/netk/gen-window-menu.c b/netk/gen-window-menu.c
deleted file mode 100644
index e69de29..0000000
diff --git a/netk/marshal.defs b/netk/marshal.defs
deleted file mode 100644
index dd31a66..0000000
--- a/netk/marshal.defs
+++ /dev/null
@@ -1,8 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-
-;; From /usr/local/include/xfce4/libxfcegui4/netk-marshal.h
-
-
diff --git a/netk/netkmodule.c b/netk/netkmodule.c
deleted file mode 100644
index d119fe5..0000000
--- a/netk/netkmodule.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <locale.h>
-
-/* include this first, before NO_IMPORT_PYGOBJECT is defined */
-#include <pygobject.h>
-#include <pyerrors.h>
-
-extern PyMethodDef pyapplication_functions[];
-extern PyMethodDef pyclass_group_functions[];
-extern PyMethodDef pyenum_types_functions[];
-extern PyMethodDef pypager_functions[];
-extern PyMethodDef pyscreen_functions[];
-extern PyMethodDef pytasklist_functions[];
-extern PyMethodDef pytrayicon_functions[];
-extern PyMethodDef pyutil_functions[];
-extern PyMethodDef pywindow_action_menu_functions[];
-extern PyMethodDef pywindow_functions[];
-extern PyMethodDef pywindow_menu_functions[];
-extern PyMethodDef pyworkspace_functions[];
-void pyapplication_register_classes(PyObject *d);
-void pyclass_group_register_classes(PyObject *d);
-void pyenum_types_register_classes(PyObject *d);
-void pypager_register_classes(PyObject *d);
-void pyscreen_register_classes(PyObject *d);
-void pytasklist_register_classes(PyObject *d);
-void pytrayicon_register_classes(PyObject *d);
-void pyutil_register_classes(PyObject *d);
-void pywindow_action_menu_register_classes(PyObject *d);
-void pywindow_register_classes(PyObject *d);
-void pywindow_menu_register_classes(PyObject *d);
-void pyworkspace_register_classes(PyObject *d);
-
-void pywindow_add_constants(PyObject *module, const gchar *strip_prefix);
-void pypager_add_constants(PyObject *module, const gchar *strip_prefix);
-void pytasklist_add_constants(PyObject *module, const gchar *strip_prefix);
-
-static PyMethodDef all_functions[1000];
-
-static PyMethodDef* each_functions[] = {
- pyapplication_functions,
- pyclass_group_functions,
- pyenum_types_functions,
- pypager_functions,
- pyscreen_functions,
- pytasklist_functions,
- pytrayicon_functions,
- pyutil_functions,
- pywindow_action_menu_functions,
- pywindow_functions,
- pywindow_menu_functions,
- pyworkspace_functions,
-};
-
-static void
-my_register1()
-{
- PyObject *m, *d;
- int i;
- int j;
- int cnt;
-
- cnt = 0;
-
- for(i = 0; i < sizeof(each_functions) / sizeof(each_functions[0]); i++) {
- for(j = 0; each_functions[i][j].ml_name != NULL; j++) {
- if (cnt >= sizeof(all_functions) / sizeof(all_functions[0])) {
- fprintf (stderr, "pyxfce: Internal Error: too many functions");
- exit (1);
- }
-
- all_functions[cnt++] = each_functions[i][j];
- }
- }
-
- m = Py_InitModule("_netk", all_functions);
- pywindow_add_constants(m, "NETK_");
- pypager_add_constants(m, "NETK_");
- pytasklist_add_constants(m, "NETK_");
- d = PyModule_GetDict(m);
-
- pyapplication_register_classes (d);
- pyclass_group_register_classes (d);
- pyenum_types_register_classes (d);
- pypager_register_classes (d);
- pyscreen_register_classes (d);
- pytasklist_register_classes (d);
- pytrayicon_register_classes (d);
- pyutil_register_classes (d);
- pywindow_action_menu_register_classes (d);
- pywindow_register_classes (d);
- pywindow_menu_register_classes (d);
- pyworkspace_register_classes (d);
-}
-
-DL_EXPORT(void)
-init_netk(void)
-{
- /* set the default python encoding to utf-8 */
- PyUnicode_SetDefaultEncoding("utf-8");
-
- init_pygobject ();
-
- my_register1 ();
-}
-
-#if 0
-static void
-my_register(char const *name, PyMethodDef afunctions[], void (aregister)(PyObject *d))
-{
- PyObject *m, *d;
- char tmp[2049];
- snprintf (tmp, 2049, "netk.%s", name);
- m = Py_InitModule(tmp, afunctions);
- d = PyModule_GetDict(m);
- (*aregister)(d);
- /*_add_constants(m, "GDK_")*/
-}
-
-DL_EXPORT(void)
-init_netk(void)
-{
- /* set the default python encoding to utf-8 */
- PyUnicode_SetDefaultEncoding("utf-8");
-
- init_pygobject ();
-
- my_register ("application", pyapplication_functions, pyapplication_register_classes);
- my_register ("classgroup", pyclass_group_functions, pyclass_group_register_classes);
- my_register ("enumtypes", pyenum_types_functions, pyenum_types_register_classes);
- my_register ("pager", pypager_functions, pypager_register_classes);
- my_register ("screen", pyscreen_functions, pyscreen_register_classes);
- my_register ("tasklist", pytasklist_functions, pytasklist_register_classes);
- my_register ("trayicon", pytrayicon_functions, pytrayicon_register_classes);
- my_register ("util", pyutil_functions, pyutil_register_classes);
- my_register ("windowactionmenu", pywindow_action_menu_functions, pywindow_action_menu_register_classes);
- my_register ("window", pywindow_functions, pywindow_register_classes);
- my_register ("windowmenu", pywindow_menu_functions, pywindow_menu_register_classes);
- my_register ("workspace", pyworkspace_functions, pyworkspace_register_classes);
-}
-#endif
diff --git a/netk/pager.c b/netk/pager.c
deleted file mode 100644
index 313c164..0000000
--- a/netk/pager.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "pager.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-extern PyTypeObject PyNetkScreen_Type; /* ugh */
-
-#line 15 "pager.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGtkContainer_Type;
-#define PyGtkContainer_Type (*_PyGtkContainer_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject PyNetkPager_Type;
-
-#line 28 "pager.c"
-
-
-
-/* ----------- NetkPager ----------- */
-
-static int
-_wrap_netk_pager_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "screen", NULL };
- PyGObject *screen;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:NetkPager.__init__", kwlist, &PyNetkScreen_Type, &screen))
- return -1;
- self->obj = (GObject *)netk_pager_new(NETK_SCREEN(screen->obj));
-
- if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create NetkPager object");
- return -1;
- }
- pygobject_register_wrapper((PyObject *)self);
- return 0;
-}
-
-static PyObject *
-_wrap_netk_pager_set_screen(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "screen", NULL };
- PyGObject *screen;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:NetkPager.set_screen", kwlist, &PyNetkScreen_Type, &screen))
- return NULL;
- netk_pager_set_screen(NETK_PAGER(self->obj), NETK_SCREEN(screen->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_pager_set_orientation(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "orientation", NULL };
- GtkOrientation orientation;
- PyObject *py_orientation = NULL;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:NetkPager.set_orientation", kwlist, &py_orientation))
- return NULL;
- if (pyg_enum_get_value(GTK_TYPE_ORIENTATION, py_orientation, (gint *)&orientation))
- return NULL;
- netk_pager_set_orientation(NETK_PAGER(self->obj), orientation);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_pager_set_n_rows(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "n_rows", NULL };
- int n_rows;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:NetkPager.set_n_rows", kwlist, &n_rows))
- return NULL;
- netk_pager_set_n_rows(NETK_PAGER(self->obj), n_rows);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_pager_set_display_mode(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "mode", NULL };
- NetkPagerDisplayMode mode;
- PyObject *py_mode = NULL;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:NetkPager.set_display_mode", kwlist, &py_mode))
- return NULL;
- if (pyg_enum_get_value(NETK_TYPE_PAGER_DISPLAY_MODE, py_mode, (gint *)&mode))
- return NULL;
- netk_pager_set_display_mode(NETK_PAGER(self->obj), mode);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_pager_set_show_all(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "show_all_workspaces", NULL };
- int show_all_workspaces;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:NetkPager.set_show_all", kwlist, &show_all_workspaces))
- return NULL;
- netk_pager_set_show_all(NETK_PAGER(self->obj), show_all_workspaces);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_pager_set_shadow_type(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "shadow_type", NULL };
- PyObject *py_shadow_type = NULL;
- GtkShadowType shadow_type;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:NetkPager.set_shadow_type", kwlist, &py_shadow_type))
- return NULL;
- if (pyg_enum_get_value(GTK_TYPE_SHADOW_TYPE, py_shadow_type, (gint *)&shadow_type))
- return NULL;
- netk_pager_set_shadow_type(NETK_PAGER(self->obj), shadow_type);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyMethodDef _PyNetkPager_methods[] = {
- { "set_screen", (PyCFunction)_wrap_netk_pager_set_screen, METH_VARARGS|METH_KEYWORDS },
- { "set_orientation", (PyCFunction)_wrap_netk_pager_set_orientation, METH_VARARGS|METH_KEYWORDS },
- { "set_n_rows", (PyCFunction)_wrap_netk_pager_set_n_rows, METH_VARARGS|METH_KEYWORDS },
- { "set_display_mode", (PyCFunction)_wrap_netk_pager_set_display_mode, METH_VARARGS|METH_KEYWORDS },
- { "set_show_all", (PyCFunction)_wrap_netk_pager_set_show_all, METH_VARARGS|METH_KEYWORDS },
- { "set_shadow_type", (PyCFunction)_wrap_netk_pager_set_shadow_type, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-PyTypeObject PyNetkPager_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "pager.Pager", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyNetkPager_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_netk_pager_new, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-PyMethodDef pypager_functions[] = {
- { NULL, NULL, 0 }
-};
-
-
-/* ----------- enums and flags ----------- */
-
-void
-pypager_add_constants(PyObject *module, const gchar *strip_prefix)
-{
- pyg_enum_add(module, "PagerDisplayMode", strip_prefix, NETK_TYPE_PAGER_DISPLAY_MODE);
-
- if (PyErr_Occurred())
- PyErr_Print();
-}
-
-/* initialise stuff extension classes */
-void
-pypager_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkContainer_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Container");
- if (_PyGtkContainer_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Container from gtk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return;
- }
-
-
-#line 250 "pager.c"
- pygobject_register_class(d, "NetkPager", NETK_TYPE_PAGER, &PyNetkPager_Type, Py_BuildValue("(O)", &PyGtkContainer_Type));
-}
diff --git a/netk/pager.defs b/netk/pager.defs
deleted file mode 100644
index 899004c..0000000
--- a/netk/pager.defs
+++ /dev/null
@@ -1,93 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object Pager
- (in-module "Netk")
- (parent "GtkContainer")
- (c-name "NetkPager")
- (gtype-id "NETK_TYPE_PAGER")
-)
-
-;; Enumerations and flags ...
-
-(define-enum PagerDisplayMode
- (in-module "Netk")
- (c-name "NetkPagerDisplayMode")
- (gtype-id "NETK_TYPE_PAGER_DISPLAY_MODE")
- (values
- '("name" "NETK_PAGER_DISPLAY_NAME")
- '("content" "NETK_PAGER_DISPLAY_CONTENT")
- )
-)
-
-
-;; From /usr/local/include/xfce4/libxfcegui4/netk-pager.h
-
-(define-function pager_get_type
- (c-name "netk_pager_get_type")
- (return-type "GType")
-)
-
-(define-function pager_new
- (c-name "netk_pager_new")
- (is-constructor-of "NetkPager")
- (return-type "GtkWidget*")
- (parameters
- '("NetkScreen*" "screen")
- )
-)
-
-(define-method set_screen
- (of-object "NetkPager")
- (c-name "netk_pager_set_screen")
- (return-type "none")
- (parameters
- '("NetkScreen*" "screen")
- )
-)
-
-(define-method set_orientation
- (of-object "NetkPager")
- (c-name "netk_pager_set_orientation")
- (return-type "none")
- (parameters
- '("GtkOrientation" "orientation")
- )
-)
-
-(define-method set_n_rows
- (of-object "NetkPager")
- (c-name "netk_pager_set_n_rows")
- (return-type "none")
- (parameters
- '("int" "n_rows")
- )
-)
-
-(define-method set_display_mode
- (of-object "NetkPager")
- (c-name "netk_pager_set_display_mode")
- (return-type "none")
- (parameters
- '("NetkPagerDisplayMode" "mode")
- )
-)
-
-(define-method set_show_all
- (of-object "NetkPager")
- (c-name "netk_pager_set_show_all")
- (return-type "none")
- (parameters
- '("gboolean" "show_all_workspaces")
- )
-)
-
-(define-method set_shadow_type
- (of-object "NetkPager")
- (c-name "netk_pager_set_shadow_type")
- (return-type "none")
- (parameters
- '("GtkShadowType" "shadow_type")
- )
-)
-
-
diff --git a/netk/pager.override b/netk/pager.override
deleted file mode 100644
index 99b1983..0000000
--- a/netk/pager.override
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-extern PyTypeObject PyNetkScreen_Type; /* ugh */
-
-%%
-include
-%%
-modulename pager
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.Container as PyGtkContainer_Type
-import screen as PyNetkScreen_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/netk/screen.c b/netk/screen.c
deleted file mode 100644
index 3c6e559..0000000
--- a/netk/screen.c
+++ /dev/null
@@ -1,465 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "screen.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#line 13 "screen.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject PyNetkScreen_Type;
-
-#line 24 "screen.c"
-
-
-
-/* ----------- NetkScreen ----------- */
-
-static PyObject *
-_wrap_netk_screen_get_number(PyGObject *self)
-{
- int ret;
-
- ret = netk_screen_get_number(NETK_SCREEN(self->obj));
- return PyInt_FromLong(ret);
-}
-
-static PyObject *
-_wrap_netk_screen_get_workspace(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "workspace", NULL };
- int workspace;
- NetkWorkspace *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:NetkScreen.get_workspace", kwlist, &workspace))
- return NULL;
- ret = netk_screen_get_workspace(NETK_SCREEN(self->obj), workspace);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_netk_screen_get_active_workspace(PyGObject *self)
-{
- NetkWorkspace *ret;
-
- ret = netk_screen_get_active_workspace(NETK_SCREEN(self->obj));
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_netk_screen_get_active_window(PyGObject *self)
-{
- NetkWindow *ret;
-
- ret = netk_screen_get_active_window(NETK_SCREEN(self->obj));
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-#line 27 "screen.override"
-static PyObject *
-_wrap_netk_screen_get_windows(PyGObject *self)
-{
- GList *icon_list = NULL;
- PyObject *pywindow;
- PyObject *py_list;
- GList *tmp;
-
- if ((icon_list = netk_screen_get_windows(NETK_SCREEN(self->obj)))) {
-
- if ((py_list = PyList_New(0)) == NULL) {
- /*g_list_free(icon_list); no */
- return NULL;
- }
- for (tmp = icon_list; tmp != NULL; tmp = tmp->next) {
- pywindow = pygobject_new(G_OBJECT(tmp->data)); /* will g_object_ref and sink if applicable */
-
- if (pywindow == NULL) {
- /*g_list_free(icon_list); no */
- Py_DECREF(py_list);
- return NULL;
- }
- PyList_Append(py_list, pywindow);
- Py_DECREF(pywindow);
- }
- /*g_list_free(icon_list); no */
- return py_list;
- }
- if ((py_list = PyList_New(0)) == NULL) {
- /* g_list_free(icon_list); no */
- return NULL;
- }
- return py_list;
-}
-#line 108 "screen.c"
-
-
-#line 63 "screen.override"
-static PyObject *
-_wrap_netk_screen_get_windows_stacked(PyGObject *self)
-{
- GList *icon_list = NULL;
- PyObject *pywindow;
- PyObject *py_list;
- GList *tmp;
-
- if ((icon_list = netk_screen_get_windows_stacked(NETK_SCREEN(self->obj)))) {
- if ((py_list = PyList_New(0)) == NULL) {
- /* g_list_free(icon_list); no */
- return NULL;
- }
- for (tmp = icon_list; tmp != NULL; tmp = tmp->next) {
- pywindow = pygobject_new(G_OBJECT(tmp->data)); /* will g_object_ref and sink if applicable */
-
- if (pywindow == NULL) {
- /*g_list_free(icon_list); no */
- Py_DECREF(py_list);
- return NULL;
- }
- PyList_Append(py_list, pywindow);
- Py_DECREF(pywindow);
- }
- /*g_list_free(icon_list); no */
- return py_list;
- }
- if ((py_list = PyList_New(0)) == NULL) {
- /* g_list_free(icon_list); no */
- return NULL;
- }
- return py_list;
-}
-#line 145 "screen.c"
-
-
-static PyObject *
-_wrap_netk_screen_force_update(PyGObject *self)
-{
- netk_screen_force_update(NETK_SCREEN(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_screen_get_workspace_count(PyGObject *self)
-{
- int ret;
-
- ret = netk_screen_get_workspace_count(NETK_SCREEN(self->obj));
- return PyInt_FromLong(ret);
-}
-
-static PyObject *
-_wrap_netk_screen_change_workspace_count(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "count", NULL };
- int count;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:NetkScreen.change_workspace_count", kwlist, &count))
- return NULL;
- netk_screen_change_workspace_count(NETK_SCREEN(self->obj), count);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_screen_net_wm_supports(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "atom", NULL };
- char *atom;
- int ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:NetkScreen.net_wm_supports", kwlist, &atom))
- return NULL;
- ret = netk_screen_net_wm_supports(NETK_SCREEN(self->obj), atom);
- return PyBool_FromLong(ret);
-
-}
-
-#line 98 "screen.override"
-static PyObject *
-_wrap_netk_screen_get_background_pixmap(PyGObject *self)
-{
- gulong ret;
- GdkDrawable *drawable;
- PyObject *obj;
-
- ret = netk_screen_get_background_pixmap(NETK_SCREEN(self->obj));
- if (ret) {
- drawable = gdk_xid_table_lookup (ret);
- if (drawable)
- g_object_ref (G_OBJECT (drawable));
- else
- drawable = gdk_pixmap_foreign_new (ret);
-
- obj = pygobject_new (G_OBJECT (drawable));
- if (drawable)
- g_object_unref (G_OBJECT (drawable));
- return obj;
- } else {
- Py_INCREF(Py_None);
- return Py_None;
- }
-}
-#line 217 "screen.c"
-
-
-static PyObject *
-_wrap_netk_screen_get_width(PyGObject *self)
-{
- int ret;
-
- ret = netk_screen_get_width(NETK_SCREEN(self->obj));
- return PyInt_FromLong(ret);
-}
-
-static PyObject *
-_wrap_netk_screen_get_height(PyGObject *self)
-{
- int ret;
-
- ret = netk_screen_get_height(NETK_SCREEN(self->obj));
- return PyInt_FromLong(ret);
-}
-
-static PyObject *
-_wrap_netk_screen_get_showing_desktop(PyGObject *self)
-{
- int ret;
-
- ret = netk_screen_get_showing_desktop(NETK_SCREEN(self->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_netk_screen_toggle_showing_desktop(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "show", NULL };
- int show;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:NetkScreen.toggle_showing_desktop", kwlist, &show))
- return NULL;
- netk_screen_toggle_showing_desktop(NETK_SCREEN(self->obj), show);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_screen_move_viewport(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "x", "y", NULL };
- int x, y;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ii:NetkScreen.move_viewport", kwlist, &x, &y))
- return NULL;
- netk_screen_move_viewport(NETK_SCREEN(self->obj), x, y);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_screen_try_set_workspace_layout(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "current_token", "rows", "columns", NULL };
- int current_token, rows, columns, ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iii:NetkScreen.try_set_workspace_layout", kwlist, ¤t_token, &rows, &columns))
- return NULL;
- ret = netk_screen_try_set_workspace_layout(NETK_SCREEN(self->obj), current_token, rows, columns);
- return PyInt_FromLong(ret);
-}
-
-static PyObject *
-_wrap_netk_screen_release_workspace_layout(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "current_token", NULL };
- int current_token;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:NetkScreen.release_workspace_layout", kwlist, ¤t_token))
- return NULL;
- netk_screen_release_workspace_layout(NETK_SCREEN(self->obj), current_token);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-#line 124 "screen.override"
-static PyObject *
-_wrap_netk_screen_get_workspaces(PyGObject *self)
-{
- PyObject *pyworkspace;
- PyObject *py_list;
- int cnt, i;
-
- cnt = netk_screen_get_workspace_count(NETK_SCREEN(self->obj));
-
- if ((py_list = PyList_New(0)) == NULL) {
- return NULL;
- }
-
- for(i = 0; i < cnt; i++) {
- pyworkspace = pygobject_new(G_OBJECT(netk_screen_get_workspace(NETK_SCREEN(self->obj), i))); /* will g_object_ref and sink if applicable */
-
- PyList_Append(py_list, pyworkspace);
- Py_DECREF(pyworkspace);
- }
- return py_list;
-}
-#line 321 "screen.c"
-
-
-static PyMethodDef _PyNetkScreen_methods[] = {
- { "get_number", (PyCFunction)_wrap_netk_screen_get_number, METH_NOARGS },
- { "get_workspace", (PyCFunction)_wrap_netk_screen_get_workspace, METH_VARARGS|METH_KEYWORDS },
- { "get_active_workspace", (PyCFunction)_wrap_netk_screen_get_active_workspace, METH_NOARGS },
- { "get_active_window", (PyCFunction)_wrap_netk_screen_get_active_window, METH_NOARGS },
- { "get_windows", (PyCFunction)_wrap_netk_screen_get_windows, METH_NOARGS },
- { "get_windows_stacked", (PyCFunction)_wrap_netk_screen_get_windows_stacked, METH_NOARGS },
- { "force_update", (PyCFunction)_wrap_netk_screen_force_update, METH_NOARGS },
- { "get_workspace_count", (PyCFunction)_wrap_netk_screen_get_workspace_count, METH_NOARGS },
- { "change_workspace_count", (PyCFunction)_wrap_netk_screen_change_workspace_count, METH_VARARGS|METH_KEYWORDS },
- { "net_wm_supports", (PyCFunction)_wrap_netk_screen_net_wm_supports, METH_VARARGS|METH_KEYWORDS },
- { "get_background_pixmap", (PyCFunction)_wrap_netk_screen_get_background_pixmap, METH_NOARGS },
- { "get_width", (PyCFunction)_wrap_netk_screen_get_width, METH_NOARGS },
- { "get_height", (PyCFunction)_wrap_netk_screen_get_height, METH_NOARGS },
- { "get_showing_desktop", (PyCFunction)_wrap_netk_screen_get_showing_desktop, METH_NOARGS },
- { "toggle_showing_desktop", (PyCFunction)_wrap_netk_screen_toggle_showing_desktop, METH_VARARGS|METH_KEYWORDS },
- { "move_viewport", (PyCFunction)_wrap_netk_screen_move_viewport, METH_VARARGS|METH_KEYWORDS },
- { "try_set_workspace_layout", (PyCFunction)_wrap_netk_screen_try_set_workspace_layout, METH_VARARGS|METH_KEYWORDS },
- { "release_workspace_layout", (PyCFunction)_wrap_netk_screen_release_workspace_layout, METH_VARARGS|METH_KEYWORDS },
- { "get_workspaces", (PyCFunction)_wrap_netk_screen_get_workspaces, METH_NOARGS },
- { NULL, NULL, 0 }
-};
-
-PyTypeObject PyNetkScreen_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "netk.Screen", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyNetkScreen_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)0, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_netk_screen_get_default(PyObject *self)
-{
- NetkScreen *ret;
-
- ret = netk_screen_get_default();
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_netk_screen_get(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "index", NULL };
- int index;
- NetkScreen *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:screen_get", kwlist, &index))
- return NULL;
- ret = netk_screen_get(index);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_netk_screen_get_for_root(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "root_window_id", NULL };
- unsigned long root_window_id;
- NetkScreen *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "k:screen_get_for_root", kwlist, &root_window_id))
- return NULL;
- ret = netk_screen_get_for_root(root_window_id);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-PyMethodDef pyscreen_functions[] = {
- { "screen_get_default", (PyCFunction)_wrap_netk_screen_get_default, METH_NOARGS },
- { "screen_get", (PyCFunction)_wrap_netk_screen_get, METH_VARARGS|METH_KEYWORDS },
- { "screen_get_for_root", (PyCFunction)_wrap_netk_screen_get_for_root, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pyscreen_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
-
-
-#line 463 "screen.c"
- pygobject_register_class(d, "NetkScreen", NETK_TYPE_SCREEN, &PyNetkScreen_Type, Py_BuildValue("(O)", &PyGObject_Type));
- pyg_set_object_has_new_constructor(NETK_TYPE_SCREEN);
-}
diff --git a/netk/screen.defs b/netk/screen.defs
deleted file mode 100644
index 78e85af..0000000
--- a/netk/screen.defs
+++ /dev/null
@@ -1,180 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object Screen
- (in-module "Netk")
- (parent "GObject")
- (c-name "NetkScreen")
- (gtype-id "NETK_TYPE_SCREEN")
-)
-
-;; Enumerations and flags ...
-
-
-;; From /usr/local/include/xfce4/libxfcegui4/netk-screen.h
-
-(define-function screen_get_type
- (c-name "netk_screen_get_type")
- (return-type "GType")
-)
-
-(define-function screen_get_default
- (c-name "netk_screen_get_default")
- (return-type "NetkScreen*")
-)
-
-(define-function screen_get
- (c-name "netk_screen_get")
- (return-type "NetkScreen*")
- (parameters
- '("int" "index")
- )
-)
-
-(define-function screen_get_for_root
- (c-name "netk_screen_get_for_root")
- (return-type "NetkScreen*")
- (parameters
- '("gulong" "root_window_id")
- )
-)
-
-(define-method get_number
- (of-object "NetkScreen")
- (c-name "netk_screen_get_number")
- (return-type "int")
-)
-
-(define-method get_workspace
- (of-object "NetkScreen")
- (c-name "netk_screen_get_workspace")
- (return-type "NetkWorkspace*")
- (parameters
- '("int" "workspace")
- )
-)
-
-(define-method get_active_workspace
- (of-object "NetkScreen")
- (c-name "netk_screen_get_active_workspace")
- (return-type "NetkWorkspace*")
-)
-
-(define-method get_active_window
- (of-object "NetkScreen")
- (c-name "netk_screen_get_active_window")
- (return-type "NetkWindow*")
-)
-
-(define-method get_windows
- (of-object "NetkScreen")
- (c-name "netk_screen_get_windows")
- (return-type "GList*")
-)
-
-(define-method get_windows_stacked
- (of-object "NetkScreen")
- (c-name "netk_screen_get_windows_stacked")
- (return-type "GList*")
-)
-
-(define-method force_update
- (of-object "NetkScreen")
- (c-name "netk_screen_force_update")
- (return-type "none")
-)
-
-(define-method get_workspace_count
- (of-object "NetkScreen")
- (c-name "netk_screen_get_workspace_count")
- (return-type "int")
-)
-
-(define-method change_workspace_count
- (of-object "NetkScreen")
- (c-name "netk_screen_change_workspace_count")
- (return-type "none")
- (parameters
- '("int" "count")
- )
-)
-
-(define-method net_wm_supports
- (of-object "NetkScreen")
- (c-name "netk_screen_net_wm_supports")
- (return-type "gboolean")
- (parameters
- '("const-char*" "atom")
- )
-)
-
-(define-method get_background_pixmap
- (of-object "NetkScreen")
- (c-name "netk_screen_get_background_pixmap")
- (return-type "gulong")
-)
-
-(define-method get_width
- (of-object "NetkScreen")
- (c-name "netk_screen_get_width")
- (return-type "int")
-)
-
-(define-method get_height
- (of-object "NetkScreen")
- (c-name "netk_screen_get_height")
- (return-type "int")
-)
-
-(define-method get_showing_desktop
- (of-object "NetkScreen")
- (c-name "netk_screen_get_showing_desktop")
- (return-type "gboolean")
-)
-
-(define-method toggle_showing_desktop
- (of-object "NetkScreen")
- (c-name "netk_screen_toggle_showing_desktop")
- (return-type "none")
- (parameters
- '("gboolean" "show")
- )
-)
-
-(define-method move_viewport
- (of-object "NetkScreen")
- (c-name "netk_screen_move_viewport")
- (return-type "none")
- (parameters
- '("int" "x")
- '("int" "y")
- )
-)
-
-(define-method try_set_workspace_layout
- (of-object "NetkScreen")
- (c-name "netk_screen_try_set_workspace_layout")
- (return-type "int")
- (parameters
- '("int" "current_token")
- '("int" "rows")
- '("int" "columns")
- )
-)
-
-(define-method release_workspace_layout
- (of-object "NetkScreen")
- (c-name "netk_screen_release_workspace_layout")
- (return-type "none")
- (parameters
- '("int" "current_token")
- )
-)
-
-
-(define-method get_workspaces
- (of-object "NetkScreen")
- (c-name "netk_screen_get_workspaces")
- (return-type "GList*")
- (parameters
- )
-)
diff --git a/netk/screen.override b/netk/screen.override
deleted file mode 100644
index 728668d..0000000
--- a/netk/screen.override
+++ /dev/null
@@ -1,144 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-%%
-include
-%%
-modulename netk
-%%
-import gobject.GObject as PyGObject_Type
-import workspace as PyNetkWorkspace_Type
-import window as PyNetkWindow_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
-override netk_screen_get_windows noargs
-static PyObject *
-_wrap_netk_screen_get_windows(PyGObject *self)
-{
- GList *icon_list = NULL;
- PyObject *pywindow;
- PyObject *py_list;
- GList *tmp;
-
- if ((icon_list = netk_screen_get_windows(NETK_SCREEN(self->obj)))) {
-
- if ((py_list = PyList_New(0)) == NULL) {
- /*g_list_free(icon_list); no */
- return NULL;
- }
- for (tmp = icon_list; tmp != NULL; tmp = tmp->next) {
- pywindow = pygobject_new(G_OBJECT(tmp->data)); /* will g_object_ref and sink if applicable */
-
- if (pywindow == NULL) {
- /*g_list_free(icon_list); no */
- Py_DECREF(py_list);
- return NULL;
- }
- PyList_Append(py_list, pywindow);
- Py_DECREF(pywindow);
- }
- /*g_list_free(icon_list); no */
- return py_list;
- }
- if ((py_list = PyList_New(0)) == NULL) {
- /* g_list_free(icon_list); no */
- return NULL;
- }
- return py_list;
-}
-%%
-override netk_screen_get_windows_stacked noargs
-static PyObject *
-_wrap_netk_screen_get_windows_stacked(PyGObject *self)
-{
- GList *icon_list = NULL;
- PyObject *pywindow;
- PyObject *py_list;
- GList *tmp;
-
- if ((icon_list = netk_screen_get_windows_stacked(NETK_SCREEN(self->obj)))) {
- if ((py_list = PyList_New(0)) == NULL) {
- /* g_list_free(icon_list); no */
- return NULL;
- }
- for (tmp = icon_list; tmp != NULL; tmp = tmp->next) {
- pywindow = pygobject_new(G_OBJECT(tmp->data)); /* will g_object_ref and sink if applicable */
-
- if (pywindow == NULL) {
- /*g_list_free(icon_list); no */
- Py_DECREF(py_list);
- return NULL;
- }
- PyList_Append(py_list, pywindow);
- Py_DECREF(pywindow);
- }
- /*g_list_free(icon_list); no */
- return py_list;
- }
- if ((py_list = PyList_New(0)) == NULL) {
- /* g_list_free(icon_list); no */
- return NULL;
- }
- return py_list;
-}
-%%
-override netk_screen_get_background_pixmap noargs
-static PyObject *
-_wrap_netk_screen_get_background_pixmap(PyGObject *self)
-{
- gulong ret;
- GdkDrawable *drawable;
- PyObject *obj;
-
- ret = netk_screen_get_background_pixmap(NETK_SCREEN(self->obj));
- if (ret) {
- drawable = gdk_xid_table_lookup (ret);
- if (drawable)
- g_object_ref (G_OBJECT (drawable));
- else
- drawable = gdk_pixmap_foreign_new (ret);
-
- obj = pygobject_new (G_OBJECT (drawable));
- if (drawable)
- g_object_unref (G_OBJECT (drawable));
- return obj;
- } else {
- Py_INCREF(Py_None);
- return Py_None;
- }
-}
-%%
-override netk_screen_get_workspaces noargs
-static PyObject *
-_wrap_netk_screen_get_workspaces(PyGObject *self)
-{
- PyObject *pyworkspace;
- PyObject *py_list;
- int cnt, i;
-
- cnt = netk_screen_get_workspace_count(NETK_SCREEN(self->obj));
-
- if ((py_list = PyList_New(0)) == NULL) {
- return NULL;
- }
-
- for(i = 0; i < cnt; i++) {
- pyworkspace = pygobject_new(G_OBJECT(netk_screen_get_workspace(NETK_SCREEN(self->obj), i))); /* will g_object_ref and sink if applicable */
-
- PyList_Append(py_list, pyworkspace);
- Py_DECREF(pyworkspace);
- }
- return py_list;
-}
diff --git a/netk/tasklist.c b/netk/tasklist.c
deleted file mode 100644
index 8e42459..0000000
--- a/netk/tasklist.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "tasklist.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-extern PyTypeObject PyNetkScreen_Type;
-
-#line 15 "tasklist.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGtkContainer_Type;
-#define PyGtkContainer_Type (*_PyGtkContainer_Type)
-static PyTypeObject *_PyNetkScreen_Type;
-#define PyNetkScreen_Type (*_PyNetkScreen_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject PyNetkTasklist_Type;
-
-#line 30 "tasklist.c"
-
-
-
-/* ----------- NetkTasklist ----------- */
-
-static int
-_wrap_netk_tasklist_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "screen", NULL };
- PyGObject *screen;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:NetkTasklist.__init__", kwlist, &PyNetkScreen_Type, &screen))
- return -1;
- self->obj = (GObject *)netk_tasklist_new(NETK_SCREEN(screen->obj));
-
- if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create NetkTasklist object");
- return -1;
- }
- pygobject_register_wrapper((PyObject *)self);
- return 0;
-}
-
-static PyObject *
-_wrap_netk_tasklist_set_screen(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "screen", NULL };
- PyGObject *screen;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:NetkTasklist.set_screen", kwlist, &PyNetkScreen_Type, &screen))
- return NULL;
- netk_tasklist_set_screen(NETK_TASKLIST(self->obj), NETK_SCREEN(screen->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-#line 29 "tasklist.override"
-static PyObject *
-_wrap_netk_tasklist_get_size_hint_list(PyGObject *self)
-{
- int n_items;
- PyObject *py_tuple;
- int i;
-
- const int *arr;
-
- arr = netk_tasklist_get_size_hint_list (NETK_TASKLIST(self->obj), &n_items);
-
- py_tuple = PyTuple_New(n_items);
-
- for (i = 0; i < n_items; i++)
- PyTuple_SetItem(py_tuple, i, PyInt_FromLong( (long)arr[i]));
-
- return py_tuple;
-}
-#line 86 "tasklist.c"
-
-
-static PyObject *
-_wrap_netk_tasklist_set_grouping(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "grouping", NULL };
- NetkTasklistGroupingType grouping;
- PyObject *py_grouping = NULL;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:NetkTasklist.set_grouping", kwlist, &py_grouping))
- return NULL;
- if (pyg_enum_get_value(NETK_TYPE_TASKLIST_GROUPING_TYPE, py_grouping, (gint *)&grouping))
- return NULL;
- netk_tasklist_set_grouping(NETK_TASKLIST(self->obj), grouping);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_tasklist_set_switch_workspace_on_unminimize(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "switch_workspace_on_unminimize", NULL };
- int switch_workspace_on_unminimize;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:NetkTasklist.set_switch_workspace_on_unminimize", kwlist, &switch_workspace_on_unminimize))
- return NULL;
- netk_tasklist_set_switch_workspace_on_unminimize(NETK_TASKLIST(self->obj), switch_workspace_on_unminimize);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_tasklist_set_grouping_limit(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "limit", NULL };
- int limit;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:NetkTasklist.set_grouping_limit", kwlist, &limit))
- return NULL;
- netk_tasklist_set_grouping_limit(NETK_TASKLIST(self->obj), limit);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_tasklist_set_include_all_workspaces(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "include_all_workspaces", NULL };
- int include_all_workspaces;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:NetkTasklist.set_include_all_workspaces", kwlist, &include_all_workspaces))
- return NULL;
- netk_tasklist_set_include_all_workspaces(NETK_TASKLIST(self->obj), include_all_workspaces);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_tasklist_set_show_label(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "show_label", NULL };
- int show_label;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:NetkTasklist.set_show_label", kwlist, &show_label))
- return NULL;
- netk_tasklist_set_show_label(NETK_TASKLIST(self->obj), show_label);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_tasklist_set_minimum_width(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "size", NULL };
- int size;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:NetkTasklist.set_minimum_width", kwlist, &size))
- return NULL;
- netk_tasklist_set_minimum_width(NETK_TASKLIST(self->obj), size);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_tasklist_get_minimum_width(PyGObject *self)
-{
- int ret;
-
- ret = netk_tasklist_get_minimum_width(NETK_TASKLIST(self->obj));
- return PyInt_FromLong(ret);
-}
-
-static PyObject *
-_wrap_netk_tasklist_set_minimum_height(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "size", NULL };
- int size;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:NetkTasklist.set_minimum_height", kwlist, &size))
- return NULL;
- netk_tasklist_set_minimum_height(NETK_TASKLIST(self->obj), size);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_tasklist_get_minimum_height(PyGObject *self)
-{
- int ret;
-
- ret = netk_tasklist_get_minimum_height(NETK_TASKLIST(self->obj));
- return PyInt_FromLong(ret);
-}
-
-static PyMethodDef _PyNetkTasklist_methods[] = {
- { "set_screen", (PyCFunction)_wrap_netk_tasklist_set_screen, METH_VARARGS|METH_KEYWORDS },
- { "get_size_hint_list", (PyCFunction)_wrap_netk_tasklist_get_size_hint_list, METH_NOARGS },
- { "set_grouping", (PyCFunction)_wrap_netk_tasklist_set_grouping, METH_VARARGS|METH_KEYWORDS },
- { "set_switch_workspace_on_unminimize", (PyCFunction)_wrap_netk_tasklist_set_switch_workspace_on_unminimize, METH_VARARGS|METH_KEYWORDS },
- { "set_grouping_limit", (PyCFunction)_wrap_netk_tasklist_set_grouping_limit, METH_VARARGS|METH_KEYWORDS },
- { "set_include_all_workspaces", (PyCFunction)_wrap_netk_tasklist_set_include_all_workspaces, METH_VARARGS|METH_KEYWORDS },
- { "set_show_label", (PyCFunction)_wrap_netk_tasklist_set_show_label, METH_VARARGS|METH_KEYWORDS },
- { "set_minimum_width", (PyCFunction)_wrap_netk_tasklist_set_minimum_width, METH_VARARGS|METH_KEYWORDS },
- { "get_minimum_width", (PyCFunction)_wrap_netk_tasklist_get_minimum_width, METH_NOARGS },
- { "set_minimum_height", (PyCFunction)_wrap_netk_tasklist_set_minimum_height, METH_VARARGS|METH_KEYWORDS },
- { "get_minimum_height", (PyCFunction)_wrap_netk_tasklist_get_minimum_height, METH_NOARGS },
- { NULL, NULL, 0 }
-};
-
-PyTypeObject PyNetkTasklist_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "tasklist.Tasklist", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyNetkTasklist_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_netk_tasklist_new, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-PyMethodDef pytasklist_functions[] = {
- { NULL, NULL, 0 }
-};
-
-
-/* ----------- enums and flags ----------- */
-
-void
-pytasklist_add_constants(PyObject *module, const gchar *strip_prefix)
-{
- pyg_enum_add(module, "TasklistGroupingType", strip_prefix, NETK_TYPE_TASKLIST_GROUPING_TYPE);
-
- if (PyErr_Occurred())
- PyErr_Print();
-}
-
-/* initialise stuff extension classes */
-void
-pytasklist_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("screen")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyNetkScreen_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Screen");
- if (_PyNetkScreen_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Screen from screen");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import screen");
- return;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkContainer_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Container");
- if (_PyGtkContainer_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Container from gtk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return;
- }
-
-
-#line 331 "tasklist.c"
- pygobject_register_class(d, "NetkTasklist", NETK_TYPE_TASKLIST, &PyNetkTasklist_Type, Py_BuildValue("(O)", &PyGtkContainer_Type));
-}
diff --git a/netk/tasklist.defs b/netk/tasklist.defs
deleted file mode 100644
index 8394f2e..0000000
--- a/netk/tasklist.defs
+++ /dev/null
@@ -1,144 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object Tasklist
- (in-module "Netk")
- (parent "GtkContainer")
- (c-name "NetkTasklist")
- (gtype-id "NETK_TYPE_TASKLIST")
-)
-
-;; Enumerations and flags ...
-
-(define-enum TasklistGroupingType
- (in-module "Netk")
- (c-name "NetkTasklistGroupingType")
- (gtype-id "NETK_TYPE_TASKLIST_GROUPING_TYPE")
- (values
- '("never-group" "NETK_TASKLIST_NEVER_GROUP")
- '("auto-group" "NETK_TASKLIST_AUTO_GROUP")
- '("always-group" "NETK_TASKLIST_ALWAYS_GROUP")
- )
-)
-
-
-;; From /usr/local/include/xfce4/libxfcegui4/netk-tasklist.h
-
-(define-function tasklist_get_type
- (c-name "netk_tasklist_get_type")
- (return-type "GType")
-)
-
-(define-function tasklist_new
- (c-name "netk_tasklist_new")
- (is-constructor-of "NetkTasklist")
- (return-type "GtkWidget*")
- (parameters
- '("NetkScreen*" "screen")
- )
-)
-
-(define-method set_screen
- (of-object "NetkTasklist")
- (c-name "netk_tasklist_set_screen")
- (return-type "none")
- (parameters
- '("NetkScreen*" "screen")
- )
-)
-
-(define-method get_size_hint_list
- (of-object "NetkTasklist")
- (c-name "netk_tasklist_get_size_hint_list")
- (return-type "const-int*")
- (parameters
- '("int*" "n_elements")
- )
-)
-
-(define-method set_grouping
- (of-object "NetkTasklist")
- (c-name "netk_tasklist_set_grouping")
- (return-type "none")
- (parameters
- '("NetkTasklistGroupingType" "grouping")
- )
-)
-
-(define-method set_switch_workspace_on_unminimize
- (of-object "NetkTasklist")
- (c-name "netk_tasklist_set_switch_workspace_on_unminimize")
- (return-type "none")
- (parameters
- '("gboolean" "switch_workspace_on_unminimize")
- )
-)
-
-(define-method set_grouping_limit
- (of-object "NetkTasklist")
- (c-name "netk_tasklist_set_grouping_limit")
- (return-type "none")
- (parameters
- '("gint" "limit")
- )
-)
-
-(define-method set_include_all_workspaces
- (of-object "NetkTasklist")
- (c-name "netk_tasklist_set_include_all_workspaces")
- (return-type "none")
- (parameters
- '("gboolean" "include_all_workspaces")
- )
-)
-
-(define-method set_show_label
- (of-object "NetkTasklist")
- (c-name "netk_tasklist_set_show_label")
- (return-type "none")
- (parameters
- '("gboolean" "show_label")
- )
-)
-
-(define-method set_minimum_width
- (of-object "NetkTasklist")
- (c-name "netk_tasklist_set_minimum_width")
- (return-type "none")
- (parameters
- '("gint" "size")
- )
-)
-
-(define-method get_minimum_width
- (of-object "NetkTasklist")
- (c-name "netk_tasklist_get_minimum_width")
- (return-type "gint")
-)
-
-(define-method set_minimum_height
- (of-object "NetkTasklist")
- (c-name "netk_tasklist_set_minimum_height")
- (return-type "none")
- (parameters
- '("gint" "size")
- )
-)
-
-(define-method get_minimum_height
- (of-object "NetkTasklist")
- (c-name "netk_tasklist_get_minimum_height")
- (return-type "gint")
-)
-
-(define-method set_icon_loader
- (of-object "NetkTasklist")
- (c-name "netk_tasklist_set_icon_loader")
- (return-type "none")
- (parameters
- '("NetkLoadIconFunction" "load_icon_func")
- '("void*" "data")
- '("GDestroyNotify" "free_data_func")
- )
-)
-
-
diff --git a/netk/tasklist.override b/netk/tasklist.override
deleted file mode 100644
index a5952cd..0000000
--- a/netk/tasklist.override
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-extern PyTypeObject PyNetkScreen_Type;
-
-%%
-include
-%%
-modulename tasklist
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.Container as PyGtkContainer_Type
-import screen.Screen as PyNetkScreen_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
-override netk_tasklist_get_size_hint_list noargs
-static PyObject *
-_wrap_netk_tasklist_get_size_hint_list(PyGObject *self)
-{
- int n_items;
- PyObject *py_tuple;
- int i;
-
- const int *arr;
-
- arr = netk_tasklist_get_size_hint_list (NETK_TASKLIST(self->obj), &n_items);
-
- py_tuple = PyTuple_New(n_items);
-
- for (i = 0; i < n_items; i++)
- PyTuple_SetItem(py_tuple, i, PyInt_FromLong( (long)arr[i]));
-
- return py_tuple;
-}
diff --git a/netk/template.override b/netk/template.override
deleted file mode 100644
index 0a4011a..0000000
--- a/netk/template.override
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-%%
-include
-%%
-modulename *
-%%
-import gobject.GObject as PyGObject_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/netk/tests/getbackground.py b/netk/tests/getbackground.py
deleted file mode 100644
index b755f7d..0000000
--- a/netk/tests/getbackground.py
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env python
-# released under the GNU Library General Public License (c) 2005 Danny Milosavljevic
-# adapted from netk, Copyright (C) 2001 Havoc Pennington
-
-import gtk
-
-def get_cmap(drawable):
- cmap = drawable.get_colormap()
- if cmap == None:
- if drawable.get_depth() == 1:
- cmap = None # try null cmap
- else: # try system
- cmap = gtk.gdk.colormap_get_system()
-
- if cmap != None:
- # dont crash with visual mismatch
- if cmap.get_visual().depth != drawable.get_depth():
- cmap = None
-
- return cmap
-
-def pixbuf_from_pixmap(pixmap):
- width, height = pixmap.get_size()
- pb = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, True, 8, width, height)
- cmap = get_cmap(pixmap)
- buf = pb.get_from_drawable(pixmap, cmap, 0, 0, 0, 0, width, height)
- return buf
-
-
-if __name__ == "__main__":
- import xfce4
- screen = xfce4.netk.screen_get_default()
- map = screen.get_background_pixmap()
- buf = pixbuf_from_pixmap(map)
- pb = buf.scale_simple(buf.get_width() / 4, buf.get_height() / 4, gtk.gdk.INTERP_BILINEAR)
- w = gtk.Window()
- w.connect("destroy", lambda x: gtk.main_quit())
- image = gtk.Image()
- image.set_from_pixbuf(pb)
- image.show()
- w.add(image)
- w.show()
-
- gtk.main()
diff --git a/netk/tests/iwindowlist.py b/netk/tests/iwindowlist.py
deleted file mode 100644
index ae5989e..0000000
--- a/netk/tests/iwindowlist.py
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env python
-
-import pygtk
-pygtk.require("2.0")
-import gtk
-import xfce4.netk
-
-screen = xfce4.netk.screen_get_default()
-
-class Tasklist(gtk.VBox):
- def __init__(self):
- global screen
- gtk.VBox.__init__(self)
- self._wmap = {}
- self._windows = screen.get_windows()
- screen.connect("window-opened", self.opened_cb)
- screen.connect("window-closed", self.closed_cb)
-
- for window in self._windows:
- self.opened_cb(screen, window)
-
- def opened_cb(self, screen, window):
- pid = window.get_pid()
- if pid == None:
- pid = 0
-
- name = window.get_name()
- #skiptaskbar = window.get_skip_taskbar_hint()
- w = gtk.Button("%d: %s" % (pid, name))
- w.show()
- self._wmap[window] = w
- self.pack_start(w, True, True)
-
- window.connect("name-changed", self.window_name_changed_cb)
- #False, False)
-
- def window_name_changed_cb(self, window):
- name = window.get_name()
- if window in self._wmap:
- w = self._wmap[window]
- w.get_children()[0].set_text(name)
-
- def closed_cb(self, screen, window):
- if window in self._wmap:
- w = self._wmap[window]
- w.destroy()
-
-tl = Tasklist()
-tl.show()
-
-w = gtk.Window()
-w.add(tl)
-w.connect("destroy", lambda x: gtk.main_quit())
-w.show()
-
-gtk.main()
-
diff --git a/netk/tests/netkwindowgettwice.py b/netk/tests/netkwindowgettwice.py
deleted file mode 100644
index 83ef5aa..0000000
--- a/netk/tests/netkwindowgettwice.py
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-
-import xfce4
-
-screen = xfce4.netk.screen_get_default()
-screen.get_windows()
-screen.get_windows()
-
-# no segfault
diff --git a/netk/tests/testtrayicon.py b/netk/tests/testtrayicon.py
deleted file mode 100644
index 220b0d6..0000000
--- a/netk/tests/testtrayicon.py
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env python
-
-import pygtk
-pygtk.require("2.0")
-import gtk
-import xfce4
-
-label = gtk.Label("Boo!")
-label.show()
-
-ti = xfce4.netk.TrayIcon() # dependent on screen!
-ti.add(label)
-
-ti.set_screen(gtk.gdk.screen_get_default())
-ti.set_screen(xfce4.netk.screen_get_default())
-ti.show()
-
-gtk.main()
diff --git a/netk/trayicon.c b/netk/trayicon.c
deleted file mode 100644
index 09257f5..0000000
--- a/netk/trayicon.c
+++ /dev/null
@@ -1,239 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "trayicon.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-#include <libxfcegui4/netk-trayicon.h>
-#include <libxfcegui4/netk-screen.h>
-
-#ifndef NETK_TYPE_TRAY_ICON
-#define NETK_TYPE_TRAY_ICON (netk_tray_icon_get_type ())
-#endif
-
-extern PyTypeObject PyNetkScreen_Type;
-
-#line 21 "trayicon.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGtkPlug_Type;
-#define PyGtkPlug_Type (*_PyGtkPlug_Type)
-static PyTypeObject *_PyGdkScreen_Type;
-#define PyGdkScreen_Type (*_PyGdkScreen_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject PyNetkTrayIcon_Type;
-
-#line 36 "trayicon.c"
-
-
-
-/* ----------- NetkTrayIcon ----------- */
-
-#line 36 "trayicon.override"
-static int
-_wrap_netk_tray_icon_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- Screen *xscreen;
-
- xscreen = GDK_SCREEN_XSCREEN (gdk_screen_get_default ());
- if (!xscreen) {
- PyErr_SetString(PyExc_RuntimeError, "could not create NetkTrayIcon object");
- return -1;
- }
-
- self->obj = (GObject *)netk_tray_icon_new (xscreen);
-
- if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create NetkTrayIcon object");
- return -1;
- }
- pygobject_register_wrapper((PyObject *)self);
- return 0;
-}
-#line 63 "trayicon.c"
-
-
-#line 58 "trayicon.override"
-static PyObject* _wrap_netk_tray_icon_set_screen(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "screen", NULL };
- Screen *xscreen;
- PyGObject *gscreen;
- PyGObject *nscreen;
- gint i;
- gint cnt;
-
- if (PyArg_ParseTupleAndKeywords(args, kwargs, "O!:NetkTrayIcon.__init__", kwlist, &PyNetkScreen_Type, &nscreen)) {
- cnt = ScreenCount (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
- for(i = 0; i < cnt; i++) {
- if (netk_screen_get (i) == (NetkScreen*) nscreen->obj) {
- break;
- }
- }
- if (i >= cnt) {
- return NULL;
- }
- xscreen = GDK_SCREEN_XSCREEN (gdk_display_get_screen (gdk_display_get_default (), i));
- } else if (PyArg_ParseTupleAndKeywords(args, kwargs, "O!:NetkTrayIcon.__init__", kwlist, &PyGdkScreen_Type, &gscreen)) {
- xscreen = GDK_SCREEN_XSCREEN (GDK_SCREEN (gscreen->obj));
- } else {
- return NULL;
- }
-
-
- netk_tray_icon_set_screen(NETK_TRAY_ICON(self->obj), xscreen);
- Py_INCREF(Py_None);
- return Py_None;
-}
-#line 98 "trayicon.c"
-
-
-static PyObject *
-_wrap_netk_tray_icon_message_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "id", "text", NULL };
- char *text;
- glong id, ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ls:NetkTrayIcon.message_new", kwlist, &id, &text))
- return NULL;
- ret = netk_tray_icon_message_new(NETK_TRAY_ICON(self->obj), id, text);
- return PyInt_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_netk_tray_icon_message_cancel(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "id", NULL };
- glong id;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "l:NetkTrayIcon.message_cancel", kwlist, &id))
- return NULL;
- netk_tray_icon_message_cancel(NETK_TRAY_ICON(self->obj), id);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyMethodDef _PyNetkTrayIcon_methods[] = {
- { "set_screen", (PyCFunction)_wrap_netk_tray_icon_set_screen, METH_VARARGS|METH_KEYWORDS },
- { "message_new", (PyCFunction)_wrap_netk_tray_icon_message_new, METH_VARARGS|METH_KEYWORDS },
- { "message_cancel", (PyCFunction)_wrap_netk_tray_icon_message_cancel, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-PyTypeObject PyNetkTrayIcon_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "trayicon.TrayIcon", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyNetkTrayIcon_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_netk_tray_icon_new, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-PyMethodDef pytrayicon_functions[] = {
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pytrayicon_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkPlug_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Plug");
- if (_PyGtkPlug_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Plug from gtk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return;
- }
- if ((module = PyImport_ImportModule("gtk.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkScreen_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Screen");
- if (_PyGdkScreen_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Screen from gtk.gdk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk.gdk");
- return;
- }
-
-
-#line 238 "trayicon.c"
- pygobject_register_class(d, "NetkTrayIcon", NETK_TYPE_TRAY_ICON, &PyNetkTrayIcon_Type, Py_BuildValue("(O)", &PyGtkPlug_Type));
-}
diff --git a/netk/trayicon.defs b/netk/trayicon.defs
deleted file mode 100644
index 5d42733..0000000
--- a/netk/trayicon.defs
+++ /dev/null
@@ -1,54 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object TrayIcon
- (in-module "Netk")
- (parent "GtkPlug")
- (c-name "NetkTrayIcon")
- (gtype-id "NETK_TYPE_TRAY_ICON")
-)
-
-;; Enumerations and flags ...
-
-
-;; From /usr/local/include/xfce4/libxfcegui4/netk-trayicon.h
-
-(define-function tray_icon_get_type
- (c-name "netk_tray_icon_get_type")
- (return-type "GType")
-)
-
-(define-function tray_icon_new
- (c-name "netk_tray_icon_new")
- (is-constructor-of "NetkTrayIcon")
- (return-type "GtkWidget*")
-)
-
-(define-method set_screen
- (of-object "NetkTrayIcon")
- (c-name "netk_tray_icon_set_screen")
- (return-type "none")
- (parameters
- '("Screen*" "screen")
- )
-)
-
-(define-method message_new
- (of-object "NetkTrayIcon")
- (c-name "netk_tray_icon_message_new")
- (return-type "glong")
- (parameters
- '("glong" "id")
- '("const-gchar*" "text")
- )
-)
-
-(define-method message_cancel
- (of-object "NetkTrayIcon")
- (c-name "netk_tray_icon_message_cancel")
- (return-type "none")
- (parameters
- '("glong" "id")
- )
-)
-
-
diff --git a/netk/trayicon.override b/netk/trayicon.override
deleted file mode 100644
index fa9fd77..0000000
--- a/netk/trayicon.override
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-#include <libxfcegui4/netk-trayicon.h>
-#include <libxfcegui4/netk-screen.h>
-
-#ifndef NETK_TYPE_TRAY_ICON
-#define NETK_TYPE_TRAY_ICON (netk_tray_icon_get_type ())
-#endif
-
-extern PyTypeObject PyNetkScreen_Type;
-
-%%
-include
-%%
-modulename trayicon
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.Plug as PyGtkPlug_Type
-import screen as PyNetkScreen_Type
-import gtk.gdk.Screen as PyGdkScreen_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
-override netk_tray_icon_new kwargs
-static int
-_wrap_netk_tray_icon_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- Screen *xscreen;
-
- xscreen = GDK_SCREEN_XSCREEN (gdk_screen_get_default ());
- if (!xscreen) {
- PyErr_SetString(PyExc_RuntimeError, "could not create NetkTrayIcon object");
- return -1;
- }
-
- self->obj = (GObject *)netk_tray_icon_new (xscreen);
-
- if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create NetkTrayIcon object");
- return -1;
- }
- pygobject_register_wrapper((PyObject *)self);
- return 0;
-}
-%%
-override netk_tray_icon_set_screen kwargs
-static PyObject* _wrap_netk_tray_icon_set_screen(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "screen", NULL };
- Screen *xscreen;
- PyGObject *gscreen;
- PyGObject *nscreen;
- gint i;
- gint cnt;
-
- if (PyArg_ParseTupleAndKeywords(args, kwargs, "O!:NetkTrayIcon.__init__", kwlist, &PyNetkScreen_Type, &nscreen)) {
- cnt = ScreenCount (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
- for(i = 0; i < cnt; i++) {
- if (netk_screen_get (i) == (NetkScreen*) nscreen->obj) {
- break;
- }
- }
- if (i >= cnt) {
- return NULL;
- }
- xscreen = GDK_SCREEN_XSCREEN (gdk_display_get_screen (gdk_display_get_default (), i));
- } else if (PyArg_ParseTupleAndKeywords(args, kwargs, "O!:NetkTrayIcon.__init__", kwlist, &PyGdkScreen_Type, &gscreen)) {
- xscreen = GDK_SCREEN_XSCREEN (GDK_SCREEN (gscreen->obj));
- } else {
- return NULL;
- }
-
-
- netk_tray_icon_set_screen(NETK_TRAY_ICON(self->obj), xscreen);
- Py_INCREF(Py_None);
- return Py_None;
-}
-%%
diff --git a/netk/util.c b/netk/util.c
deleted file mode 100644
index 30dbad1..0000000
--- a/netk/util.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "util.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#line 13 "util.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGtkWindow_Type;
-#define PyGtkWindow_Type (*_PyGtkWindow_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 25 "util.c"
-
-
-
-/* ----------- functions ----------- */
-
-PyMethodDef pyutil_functions[] = {
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pyutil_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGtkWindow_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Window");
- if (_PyGtkWindow_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Window from gtk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return;
- }
-
-
-#line 71 "util.c"
-}
diff --git a/netk/util.defs b/netk/util.defs
deleted file mode 100644
index 23f869b..0000000
--- a/netk/util.defs
+++ /dev/null
@@ -1,250 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-
-;; From netk-util.h
-
-(define-function gtk_window_set_type
- (c-name "netk_gtk_window_set_type")
- (return-type "none")
- (parameters
- '("GtkWindow*" "window")
- '("NetkWindowType" "type")
- )
-)
-
-(define-function gtk_window_avoid_input
- (c-name "netk_gtk_window_avoid_input")
- (return-type "none")
- (parameters
- '("GtkWindow*" "window")
- )
-)
-
-(define-function get_cardinal
- (c-name "netk_get_cardinal")
- (return-type "gboolean")
- (parameters
- '("Window" "xwindow")
- '("Atom" "atom")
- '("int*" "val")
- )
-)
-
-(define-function get_wm_state
- (c-name "netk_get_wm_state")
- (return-type "int")
- (parameters
- '("Window" "xwindow")
- )
-)
-
-(define-function get_window
- (c-name "netk_get_window")
- (return-type "gboolean")
- (parameters
- '("Window" "xwindow")
- '("Atom" "atom")
- '("Window*" "val")
- )
-)
-
-(define-function get_pixmap
- (c-name "netk_get_pixmap")
- (return-type "gboolean")
- (parameters
- '("Window" "xwindow")
- '("Atom" "atom")
- '("Pixmap*" "val")
- )
-)
-
-(define-function get_atom
- (c-name "netk_get_atom")
- (return-type "gboolean")
- (parameters
- '("Window" "xwindow")
- '("Atom" "atom")
- '("Atom*" "val")
- )
-)
-
-(define-function get_text_property
- (c-name "netk_get_text_property")
- (return-type "char*")
- (parameters
- '("Window" "xwindow")
- '("Atom" "atom")
- )
-)
-
-(define-function get_utf8_property
- (c-name "netk_get_utf8_property")
- (return-type "char*")
- (parameters
- '("Window" "xwindow")
- '("Atom" "atom")
- )
-)
-
-(define-function get_window_list
- (c-name "netk_get_window_list")
- (return-type "gboolean")
- (parameters
- '("Window" "xwindow")
- '("Atom" "atom")
- '("Window**" "windows")
- '("int*" "len")
- )
-)
-
-(define-function get_atom_list
- (c-name "netk_get_atom_list")
- (return-type "gboolean")
- (parameters
- '("Window" "xwindow")
- '("Atom" "atom")
- '("Atom**" "atoms")
- '("int*" "len")
- )
-)
-
-(define-function get_cardinal_list
- (c-name "netk_get_cardinal_list")
- (return-type "gboolean")
- (parameters
- '("Window" "xwindow")
- '("Atom" "atom")
- '("gulong**" "cardinals")
- '("int*" "len")
- )
-)
-
-(define-function get_utf8_list
- (c-name "netk_get_utf8_list")
- (return-type "char**")
- (parameters
- '("Window" "xwindow")
- '("Atom" "atom")
- )
-)
-
-(define-function close
- (c-name "netk_close")
- (return-type "none")
- (parameters
- '("Screen*" "screen")
- '("Window" "xwindow")
- )
-)
-
-(define-function change_state
- (c-name "netk_change_state")
- (return-type "none")
- (parameters
- '("Screen*" "screen")
- '("Window" "xwindow")
- '("gboolean" "add")
- '("Atom" "state1")
- '("Atom" "state2")
- )
-)
-
-(define-function change_workspace
- (c-name "netk_change_workspace")
- (return-type "none")
- (parameters
- '("Screen*" "screen")
- '("Window" "xwindow")
- '("int" "new_space")
- )
-)
-
-(define-function activate
- (c-name "netk_activate")
- (return-type "none")
- (parameters
- '("Screen*" "screen")
- '("Window" "xwindow")
- )
-)
-
-(define-function activate_workspace
- (c-name "netk_activate_workspace")
- (return-type "none")
- (parameters
- '("Screen*" "screen")
- '("int" "new_active_space")
- )
-)
-
-(define-function get_group_leader
- (c-name "netk_get_group_leader")
- (return-type "Window")
- (parameters
- '("Window" "xwindow")
- )
-)
-
-(define-function get_session_id
- (c-name "netk_get_session_id")
- (return-type "char*")
- (parameters
- '("Window" "xwindow")
- )
-)
-
-(define-function get_pid
- (c-name "netk_get_pid")
- (return-type "int")
- (parameters
- '("Window" "xwindow")
- )
-)
-
-(define-function get_name
- (c-name "netk_get_name")
- (return-type "char*")
- (parameters
- '("Window" "xwindow")
- )
-)
-
-(define-function get_res_class_utf8
- (c-name "netk_get_res_class_utf8")
- (return-type "char*")
- (parameters
- '("Window" "xwindow")
- )
-)
-
-(define-function set_desktop_layout
- (c-name "netk_set_desktop_layout")
- (return-type "none")
- (parameters
- '("Screen*" "xscreen")
- '("int" "rows")
- '("int" "columns")
- )
-)
-
-(define-function get_desktop_margins
- (c-name "netk_get_desktop_margins")
- (return-type "gboolean")
- (parameters
- '("Screen*" "xscreen")
- '("DesktopMargins*" "margins")
- )
-)
-
-(define-function set_desktop_margins
- (c-name "netk_set_desktop_margins")
- (return-type "none")
- (parameters
- '("Window" "xwindow")
- '("DesktopMargins*" "margins")
- )
-)
-
-
diff --git a/netk/util.override b/netk/util.override
deleted file mode 100644
index 1e7a082..0000000
--- a/netk/util.override
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-%%
-include
-%%
-modulename util
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.Window as PyGtkWindow_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
- netk_gtk_window_avoid_input
- netk_gtk_window_set_type
-%%
-ignore-win32
-%%
diff --git a/netk/window.c b/netk/window.c
deleted file mode 100644
index be6d3fb..0000000
--- a/netk/window.c
+++ /dev/null
@@ -1,792 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "window.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-#include <libxfcegui4/netk-window.h> /* sigh */
-
-extern PyTypeObject PyNetkWorkspace_Type;
-
-#line 16 "window.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGdkPixbuf_Type;
-#define PyGdkPixbuf_Type (*_PyGdkPixbuf_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject PyNetkWindow_Type;
-
-#line 29 "window.c"
-
-
-
-/* ----------- NetkWindow ----------- */
-
-static PyObject *
-_wrap_netk_window_get_screen(PyGObject *self)
-{
- NetkScreen *ret;
-
- ret = netk_window_get_screen(NETK_WINDOW(self->obj));
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_netk_window_get_name(PyGObject *self)
-{
- const gchar *ret;
-
- ret = netk_window_get_name(NETK_WINDOW(self->obj));
- if (ret)
- return PyString_FromString(ret);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_get_icon_name(PyGObject *self)
-{
- const gchar *ret;
-
- ret = netk_window_get_icon_name(NETK_WINDOW(self->obj));
- if (ret)
- return PyString_FromString(ret);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_get_application(PyGObject *self)
-{
- NetkApplication *ret;
-
- ret = netk_window_get_application(NETK_WINDOW(self->obj));
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_netk_window_get_group_leader(PyGObject *self)
-{
- gulong ret;
-
- ret = netk_window_get_group_leader(NETK_WINDOW(self->obj));
- return PyLong_FromUnsignedLong(ret);
-
-}
-
-static PyObject *
-_wrap_netk_window_get_xid(PyGObject *self)
-{
- gulong ret;
-
- ret = netk_window_get_xid(NETK_WINDOW(self->obj));
- return PyLong_FromUnsignedLong(ret);
-
-}
-
-static PyObject *
-_wrap_netk_window_get_class_group(PyGObject *self)
-{
- NetkClassGroup *ret;
-
- ret = netk_window_get_class_group(NETK_WINDOW(self->obj));
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_netk_window_get_session_id(PyGObject *self)
-{
- const gchar *ret;
-
- ret = netk_window_get_session_id(NETK_WINDOW(self->obj));
- if (ret)
- return PyString_FromString(ret);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_get_session_id_utf8(PyGObject *self)
-{
- const gchar *ret;
-
- ret = netk_window_get_session_id_utf8(NETK_WINDOW(self->obj));
- if (ret)
- return PyString_FromString(ret);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-#line 43 "window.override"
-static PyObject *
-_wrap_netk_window_get_pid(PyGObject *self)
-{
- int ret;
-
- ret = netk_window_get_pid(NETK_WINDOW(self->obj));
- if (ret == 0) {
- Py_INCREF(Py_None);
- return Py_None;
- }
-
- return PyInt_FromLong(ret);
-}
-#line 147 "window.c"
-
-
-static PyObject *
-_wrap_netk_window_get_client_machine(PyGObject *self)
-{
- const gchar *ret;
-
- ret = netk_window_get_client_machine(NETK_WINDOW(self->obj));
- if (ret)
- return PyString_FromString(ret);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_get_window_type(PyGObject *self)
-{
- gint ret;
-
- ret = netk_window_get_window_type(NETK_WINDOW(self->obj));
- return pyg_enum_from_gtype(NETK_TYPE_WINDOW_TYPE, ret);
-}
-
-static PyObject *
-_wrap_netk_window_get_resource_class(PyGObject *self)
-{
- const gchar *ret;
-
- ret = netk_window_get_resource_class(NETK_WINDOW(self->obj));
- if (ret)
- return PyString_FromString(ret);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_get_resource_name(PyGObject *self)
-{
- const gchar *ret;
-
- ret = netk_window_get_resource_name(NETK_WINDOW(self->obj));
- if (ret)
- return PyString_FromString(ret);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_is_minimized(PyGObject *self)
-{
- int ret;
-
- ret = netk_window_is_minimized(NETK_WINDOW(self->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_netk_window_is_maximized_horizontally(PyGObject *self)
-{
- int ret;
-
- ret = netk_window_is_maximized_horizontally(NETK_WINDOW(self->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_netk_window_is_maximized_vertically(PyGObject *self)
-{
- int ret;
-
- ret = netk_window_is_maximized_vertically(NETK_WINDOW(self->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_netk_window_is_maximized(PyGObject *self)
-{
- int ret;
-
- ret = netk_window_is_maximized(NETK_WINDOW(self->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_netk_window_is_shaded(PyGObject *self)
-{
- int ret;
-
- ret = netk_window_is_shaded(NETK_WINDOW(self->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_netk_window_is_skip_pager(PyGObject *self)
-{
- int ret;
-
- ret = netk_window_is_skip_pager(NETK_WINDOW(self->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_netk_window_is_skip_tasklist(PyGObject *self)
-{
- int ret;
-
- ret = netk_window_is_skip_tasklist(NETK_WINDOW(self->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_netk_window_is_sticky(PyGObject *self)
-{
- int ret;
-
- ret = netk_window_is_sticky(NETK_WINDOW(self->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_netk_window_set_skip_pager(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "skip", NULL };
- int skip;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:NetkWindow.set_skip_pager", kwlist, &skip))
- return NULL;
- netk_window_set_skip_pager(NETK_WINDOW(self->obj), skip);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_set_skip_tasklist(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "skip", NULL };
- int skip;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i:NetkWindow.set_skip_tasklist", kwlist, &skip))
- return NULL;
- netk_window_set_skip_tasklist(NETK_WINDOW(self->obj), skip);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_close(PyGObject *self)
-{
- netk_window_close(NETK_WINDOW(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_minimize(PyGObject *self)
-{
- netk_window_minimize(NETK_WINDOW(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_unminimize(PyGObject *self)
-{
- netk_window_unminimize(NETK_WINDOW(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_maximize(PyGObject *self)
-{
- netk_window_maximize(NETK_WINDOW(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_unmaximize(PyGObject *self)
-{
- netk_window_unmaximize(NETK_WINDOW(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_maximize_horizontally(PyGObject *self)
-{
- netk_window_maximize_horizontally(NETK_WINDOW(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_unmaximize_horizontally(PyGObject *self)
-{
- netk_window_unmaximize_horizontally(NETK_WINDOW(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_maximize_vertically(PyGObject *self)
-{
- netk_window_maximize_vertically(NETK_WINDOW(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_unmaximize_vertically(PyGObject *self)
-{
- netk_window_unmaximize_vertically(NETK_WINDOW(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_shade(PyGObject *self)
-{
- netk_window_shade(NETK_WINDOW(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_unshade(PyGObject *self)
-{
- netk_window_unshade(NETK_WINDOW(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_stick(PyGObject *self)
-{
- netk_window_stick(NETK_WINDOW(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_unstick(PyGObject *self)
-{
- netk_window_unstick(NETK_WINDOW(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_keyboard_move(PyGObject *self)
-{
- netk_window_keyboard_move(NETK_WINDOW(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_keyboard_size(PyGObject *self)
-{
- netk_window_keyboard_size(NETK_WINDOW(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_get_workspace(PyGObject *self)
-{
- NetkWorkspace *ret;
-
- ret = netk_window_get_workspace(NETK_WINDOW(self->obj));
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_netk_window_move_to_workspace(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "space", NULL };
- PyGObject *space;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:NetkWindow.move_to_workspace", kwlist, &PyNetkWorkspace_Type, &space))
- return NULL;
- netk_window_move_to_workspace(NETK_WINDOW(self->obj), NETK_WORKSPACE(space->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_is_pinned(PyGObject *self)
-{
- int ret;
-
- ret = netk_window_is_pinned(NETK_WINDOW(self->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_netk_window_pin(PyGObject *self)
-{
- netk_window_pin(NETK_WINDOW(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_unpin(PyGObject *self)
-{
- netk_window_unpin(NETK_WINDOW(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_activate(PyGObject *self)
-{
- netk_window_activate(NETK_WINDOW(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_is_active(PyGObject *self)
-{
- int ret;
-
- ret = netk_window_is_active(NETK_WINDOW(self->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_netk_window_activate_transient(PyGObject *self)
-{
- netk_window_activate_transient(NETK_WINDOW(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_get_icon(PyGObject *self)
-{
- GdkPixbuf *ret;
-
- ret = netk_window_get_icon(NETK_WINDOW(self->obj));
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_netk_window_get_mini_icon(PyGObject *self)
-{
- GdkPixbuf *ret;
-
- ret = netk_window_get_mini_icon(NETK_WINDOW(self->obj));
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_netk_window_get_icon_is_fallback(PyGObject *self)
-{
- int ret;
-
- ret = netk_window_get_icon_is_fallback(NETK_WINDOW(self->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_netk_window_set_icon_geometry(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "x", "y", "width", "height", NULL };
- int x, y, width, height;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iiii:NetkWindow.set_icon_geometry", kwlist, &x, &y, &width, &height))
- return NULL;
- netk_window_set_icon_geometry(NETK_WINDOW(self->obj), x, y, width, height);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_window_get_actions(PyGObject *self)
-{
- guint ret;
-
- ret = netk_window_get_actions(NETK_WINDOW(self->obj));
- return pyg_flags_from_gtype(NETK_TYPE_WINDOW_ACTIONS, ret);
-}
-
-static PyObject *
-_wrap_netk_window_get_state(PyGObject *self)
-{
- guint ret;
-
- ret = netk_window_get_state(NETK_WINDOW(self->obj));
- return pyg_flags_from_gtype(NETK_TYPE_WINDOW_STATE, ret);
-}
-
-#line 33 "window.override"
-static PyObject *
-_wrap_netk_window_get_geometry(PyGObject *self)
-{
- gint x, y, width, height;
-
- netk_window_get_geometry(NETK_WINDOW(self->obj), &x, &y, &width, &height);
- return Py_BuildValue("(iiii)", x, y, width, height);
-}
-#line 566 "window.c"
-
-
-static PyObject *
-_wrap_netk_window_is_visible_on_workspace(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "workspace", NULL };
- PyGObject *workspace;
- int ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:NetkWindow.is_visible_on_workspace", kwlist, &PyNetkWorkspace_Type, &workspace))
- return NULL;
- ret = netk_window_is_visible_on_workspace(NETK_WINDOW(self->obj), NETK_WORKSPACE(workspace->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_netk_window_is_on_workspace(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "workspace", NULL };
- PyGObject *workspace;
- int ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:NetkWindow.is_on_workspace", kwlist, &PyNetkWorkspace_Type, &workspace))
- return NULL;
- ret = netk_window_is_on_workspace(NETK_WINDOW(self->obj), NETK_WORKSPACE(workspace->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_netk_window_is_in_viewport(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "workspace", NULL };
- PyGObject *workspace;
- int ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:NetkWindow.is_in_viewport", kwlist, &PyNetkWorkspace_Type, &workspace))
- return NULL;
- ret = netk_window_is_in_viewport(NETK_WINDOW(self->obj), NETK_WORKSPACE(workspace->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyMethodDef _PyNetkWindow_methods[] = {
- { "get_screen", (PyCFunction)_wrap_netk_window_get_screen, METH_NOARGS },
- { "get_name", (PyCFunction)_wrap_netk_window_get_name, METH_NOARGS },
- { "get_icon_name", (PyCFunction)_wrap_netk_window_get_icon_name, METH_NOARGS },
- { "get_application", (PyCFunction)_wrap_netk_window_get_application, METH_NOARGS },
- { "get_group_leader", (PyCFunction)_wrap_netk_window_get_group_leader, METH_NOARGS },
- { "get_xid", (PyCFunction)_wrap_netk_window_get_xid, METH_NOARGS },
- { "get_class_group", (PyCFunction)_wrap_netk_window_get_class_group, METH_NOARGS },
- { "get_session_id", (PyCFunction)_wrap_netk_window_get_session_id, METH_NOARGS },
- { "get_session_id_utf8", (PyCFunction)_wrap_netk_window_get_session_id_utf8, METH_NOARGS },
- { "get_pid", (PyCFunction)_wrap_netk_window_get_pid, METH_NOARGS },
- { "get_client_machine", (PyCFunction)_wrap_netk_window_get_client_machine, METH_NOARGS },
- { "get_window_type", (PyCFunction)_wrap_netk_window_get_window_type, METH_NOARGS },
- { "get_resource_class", (PyCFunction)_wrap_netk_window_get_resource_class, METH_NOARGS },
- { "get_resource_name", (PyCFunction)_wrap_netk_window_get_resource_name, METH_NOARGS },
- { "is_minimized", (PyCFunction)_wrap_netk_window_is_minimized, METH_NOARGS },
- { "is_maximized_horizontally", (PyCFunction)_wrap_netk_window_is_maximized_horizontally, METH_NOARGS },
- { "is_maximized_vertically", (PyCFunction)_wrap_netk_window_is_maximized_vertically, METH_NOARGS },
- { "is_maximized", (PyCFunction)_wrap_netk_window_is_maximized, METH_NOARGS },
- { "is_shaded", (PyCFunction)_wrap_netk_window_is_shaded, METH_NOARGS },
- { "is_skip_pager", (PyCFunction)_wrap_netk_window_is_skip_pager, METH_NOARGS },
- { "is_skip_tasklist", (PyCFunction)_wrap_netk_window_is_skip_tasklist, METH_NOARGS },
- { "is_sticky", (PyCFunction)_wrap_netk_window_is_sticky, METH_NOARGS },
- { "set_skip_pager", (PyCFunction)_wrap_netk_window_set_skip_pager, METH_VARARGS|METH_KEYWORDS },
- { "set_skip_tasklist", (PyCFunction)_wrap_netk_window_set_skip_tasklist, METH_VARARGS|METH_KEYWORDS },
- { "close", (PyCFunction)_wrap_netk_window_close, METH_NOARGS },
- { "minimize", (PyCFunction)_wrap_netk_window_minimize, METH_NOARGS },
- { "unminimize", (PyCFunction)_wrap_netk_window_unminimize, METH_NOARGS },
- { "maximize", (PyCFunction)_wrap_netk_window_maximize, METH_NOARGS },
- { "unmaximize", (PyCFunction)_wrap_netk_window_unmaximize, METH_NOARGS },
- { "maximize_horizontally", (PyCFunction)_wrap_netk_window_maximize_horizontally, METH_NOARGS },
- { "unmaximize_horizontally", (PyCFunction)_wrap_netk_window_unmaximize_horizontally, METH_NOARGS },
- { "maximize_vertically", (PyCFunction)_wrap_netk_window_maximize_vertically, METH_NOARGS },
- { "unmaximize_vertically", (PyCFunction)_wrap_netk_window_unmaximize_vertically, METH_NOARGS },
- { "shade", (PyCFunction)_wrap_netk_window_shade, METH_NOARGS },
- { "unshade", (PyCFunction)_wrap_netk_window_unshade, METH_NOARGS },
- { "stick", (PyCFunction)_wrap_netk_window_stick, METH_NOARGS },
- { "unstick", (PyCFunction)_wrap_netk_window_unstick, METH_NOARGS },
- { "keyboard_move", (PyCFunction)_wrap_netk_window_keyboard_move, METH_NOARGS },
- { "keyboard_size", (PyCFunction)_wrap_netk_window_keyboard_size, METH_NOARGS },
- { "get_workspace", (PyCFunction)_wrap_netk_window_get_workspace, METH_NOARGS },
- { "move_to_workspace", (PyCFunction)_wrap_netk_window_move_to_workspace, METH_VARARGS|METH_KEYWORDS },
- { "is_pinned", (PyCFunction)_wrap_netk_window_is_pinned, METH_NOARGS },
- { "pin", (PyCFunction)_wrap_netk_window_pin, METH_NOARGS },
- { "unpin", (PyCFunction)_wrap_netk_window_unpin, METH_NOARGS },
- { "activate", (PyCFunction)_wrap_netk_window_activate, METH_NOARGS },
- { "is_active", (PyCFunction)_wrap_netk_window_is_active, METH_NOARGS },
- { "activate_transient", (PyCFunction)_wrap_netk_window_activate_transient, METH_NOARGS },
- { "get_icon", (PyCFunction)_wrap_netk_window_get_icon, METH_NOARGS },
- { "get_mini_icon", (PyCFunction)_wrap_netk_window_get_mini_icon, METH_NOARGS },
- { "get_icon_is_fallback", (PyCFunction)_wrap_netk_window_get_icon_is_fallback, METH_NOARGS },
- { "set_icon_geometry", (PyCFunction)_wrap_netk_window_set_icon_geometry, METH_VARARGS|METH_KEYWORDS },
- { "get_actions", (PyCFunction)_wrap_netk_window_get_actions, METH_NOARGS },
- { "get_state", (PyCFunction)_wrap_netk_window_get_state, METH_NOARGS },
- { "get_geometry", (PyCFunction)_wrap_netk_window_get_geometry, METH_NOARGS },
- { "is_visible_on_workspace", (PyCFunction)_wrap_netk_window_is_visible_on_workspace, METH_VARARGS|METH_KEYWORDS },
- { "is_on_workspace", (PyCFunction)_wrap_netk_window_is_on_workspace, METH_VARARGS|METH_KEYWORDS },
- { "is_in_viewport", (PyCFunction)_wrap_netk_window_is_in_viewport, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-PyTypeObject PyNetkWindow_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "window.Window", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyNetkWindow_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)0, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_netk_window_get(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "xwindow", NULL };
- unsigned long xwindow;
- NetkWindow *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "k:window_get", kwlist, &xwindow))
- return NULL;
- ret = netk_window_get(xwindow);
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-PyMethodDef pywindow_functions[] = {
- { "window_get", (PyCFunction)_wrap_netk_window_get, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-
-/* ----------- enums and flags ----------- */
-
-void
-pywindow_add_constants(PyObject *module, const gchar *strip_prefix)
-{
- pyg_flags_add(module, "WindowState", strip_prefix, NETK_TYPE_WINDOW_STATE);
- pyg_flags_add(module, "WindowActions", strip_prefix, NETK_TYPE_WINDOW_ACTIONS);
- pyg_enum_add(module, "WindowType", strip_prefix, NETK_TYPE_WINDOW_TYPE);
-
- if (PyErr_Occurred())
- PyErr_Print();
-}
-
-/* initialise stuff extension classes */
-void
-pywindow_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
- if ((module = PyImport_ImportModule("gtk.gdk")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGdkPixbuf_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "Pixbuf");
- if (_PyGdkPixbuf_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Pixbuf from gtk.gdk");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk.gdk");
- return;
- }
-
-
-#line 790 "window.c"
- pygobject_register_class(d, "NetkWindow", NETK_TYPE_WINDOW, &PyNetkWindow_Type, Py_BuildValue("(O)", &PyGObject_Type));
- pyg_set_object_has_new_constructor(NETK_TYPE_WINDOW);
-}
diff --git a/netk/window.defs b/netk/window.defs
deleted file mode 100644
index 65794c2..0000000
--- a/netk/window.defs
+++ /dev/null
@@ -1,459 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object Window
- (in-module "Netk")
- (parent "GObject")
- (c-name "NetkWindow")
- (gtype-id "NETK_TYPE_WINDOW")
-)
-
-;; Enumerations and flags ...
-
-(define-flags WindowState
- (in-module "Netk")
- (c-name "NetkWindowState")
- (gtype-id "NETK_TYPE_WINDOW_STATE")
- (values
- '("minimized" "NETK_WINDOW_STATE_MINIMIZED")
- '("maximized-horizontally" "NETK_WINDOW_STATE_MAXIMIZED_HORIZONTALLY")
- '("maximized-vertically" "NETK_WINDOW_STATE_MAXIMIZED_VERTICALLY")
- '("shaded" "NETK_WINDOW_STATE_SHADED")
- '("skip-pager" "NETK_WINDOW_STATE_SKIP_PAGER")
- '("skip-tasklist" "NETK_WINDOW_STATE_SKIP_TASKLIST")
- '("sticky" "NETK_WINDOW_STATE_STICKY")
- '("hidden" "NETK_WINDOW_STATE_HIDDEN")
- '("fullscreen" "NETK_WINDOW_STATE_FULLSCREEN")
- '("urgent" "NETK_WINDOW_STATE_URGENT")
- )
-)
-
-(define-flags WindowActions
- (in-module "Netk")
- (c-name "NetkWindowActions")
- (gtype-id "NETK_TYPE_WINDOW_ACTIONS")
- (values
- '("move" "NETK_WINDOW_ACTION_MOVE")
- '("resize" "NETK_WINDOW_ACTION_RESIZE")
- '("shade" "NETK_WINDOW_ACTION_SHADE")
- '("stick" "NETK_WINDOW_ACTION_STICK")
- '("maximize-horizontally" "NETK_WINDOW_ACTION_MAXIMIZE_HORIZONTALLY")
- '("maximize-vertically" "NETK_WINDOW_ACTION_MAXIMIZE_VERTICALLY")
- '("change-workspace" "NETK_WINDOW_ACTION_CHANGE_WORKSPACE")
- '("close" "NETK_WINDOW_ACTION_CLOSE")
- '("unmaximize-horizontally" "NETK_WINDOW_ACTION_UNMAXIMIZE_HORIZONTALLY")
- '("unmaximize-vertically" "NETK_WINDOW_ACTION_UNMAXIMIZE_VERTICALLY")
- '("unshade" "NETK_WINDOW_ACTION_UNSHADE")
- '("unstick" "NETK_WINDOW_ACTION_UNSTICK")
- '("minimize" "NETK_WINDOW_ACTION_MINIMIZE")
- '("unminimize" "NETK_WINDOW_ACTION_UNMINIMIZE")
- '("maximize" "NETK_WINDOW_ACTION_MAXIMIZE")
- '("unmaximize" "NETK_WINDOW_ACTION_UNMAXIMIZE")
- )
-)
-
-(define-enum WindowType
- (in-module "Netk")
- (c-name "NetkWindowType")
- (gtype-id "NETK_TYPE_WINDOW_TYPE")
- (values
- '("normal" "NETK_WINDOW_NORMAL")
- '("desktop" "NETK_WINDOW_DESKTOP")
- '("dock" "NETK_WINDOW_DOCK")
- '("dialog" "NETK_WINDOW_DIALOG")
- '("modal-dialog" "NETK_WINDOW_MODAL_DIALOG")
- '("toolbar" "NETK_WINDOW_TOOLBAR")
- '("menu" "NETK_WINDOW_MENU")
- '("utility" "NETK_WINDOW_UTILITY")
- '("splashscreen" "NETK_WINDOW_SPLASHSCREEN")
- )
-)
-
-
-;; From /usr/local/include/xfce4/libxfcegui4/netk-window.h
-
-(define-function window_get_type
- (c-name "netk_window_get_type")
- (return-type "GType")
-)
-
-(define-function window_get
- (c-name "netk_window_get")
- (return-type "NetkWindow*")
- (parameters
- '("gulong" "xwindow")
- )
-)
-
-(define-method get_screen
- (of-object "NetkWindow")
- (c-name "netk_window_get_screen")
- (return-type "NetkScreen*")
-)
-
-(define-method get_name
- (of-object "NetkWindow")
- (c-name "netk_window_get_name")
- (return-type "const-char*")
-)
-
-(define-method get_icon_name
- (of-object "NetkWindow")
- (c-name "netk_window_get_icon_name")
- (return-type "const-char*")
-)
-
-(define-method get_application
- (of-object "NetkWindow")
- (c-name "netk_window_get_application")
- (return-type "NetkApplication*")
-)
-
-(define-method get_group_leader
- (of-object "NetkWindow")
- (c-name "netk_window_get_group_leader")
- (return-type "gulong")
-)
-
-(define-method get_xid
- (of-object "NetkWindow")
- (c-name "netk_window_get_xid")
- (return-type "gulong")
-)
-
-(define-method get_class_group
- (of-object "NetkWindow")
- (c-name "netk_window_get_class_group")
- (return-type "NetkClassGroup*")
-)
-
-(define-method get_session_id
- (of-object "NetkWindow")
- (c-name "netk_window_get_session_id")
- (return-type "const-char*")
-)
-
-(define-method get_session_id_utf8
- (of-object "NetkWindow")
- (c-name "netk_window_get_session_id_utf8")
- (return-type "const-char*")
-)
-
-(define-method get_pid
- (of-object "NetkWindow")
- (c-name "netk_window_get_pid")
- (return-type "int")
-)
-
-(define-method get_client_machine
- (of-object "NetkWindow")
- (c-name "netk_window_get_client_machine")
- (return-type "const-char*")
-)
-
-(define-method get_window_type
- (of-object "NetkWindow")
- (c-name "netk_window_get_window_type")
- (return-type "NetkWindowType")
-)
-
-(define-method get_resource_class
- (of-object "NetkWindow")
- (c-name "netk_window_get_resource_class")
- (return-type "const-char*")
-)
-
-(define-method get_resource_name
- (of-object "NetkWindow")
- (c-name "netk_window_get_resource_name")
- (return-type "const-char*")
-)
-
-(define-method is_minimized
- (of-object "NetkWindow")
- (c-name "netk_window_is_minimized")
- (return-type "gboolean")
-)
-
-(define-method is_maximized_horizontally
- (of-object "NetkWindow")
- (c-name "netk_window_is_maximized_horizontally")
- (return-type "gboolean")
-)
-
-(define-method is_maximized_vertically
- (of-object "NetkWindow")
- (c-name "netk_window_is_maximized_vertically")
- (return-type "gboolean")
-)
-
-(define-method is_maximized
- (of-object "NetkWindow")
- (c-name "netk_window_is_maximized")
- (return-type "gboolean")
-)
-
-(define-method is_shaded
- (of-object "NetkWindow")
- (c-name "netk_window_is_shaded")
- (return-type "gboolean")
-)
-
-(define-method is_skip_pager
- (of-object "NetkWindow")
- (c-name "netk_window_is_skip_pager")
- (return-type "gboolean")
-)
-
-(define-method is_skip_tasklist
- (of-object "NetkWindow")
- (c-name "netk_window_is_skip_tasklist")
- (return-type "gboolean")
-)
-
-(define-method is_sticky
- (of-object "NetkWindow")
- (c-name "netk_window_is_sticky")
- (return-type "gboolean")
-)
-
-(define-method set_skip_pager
- (of-object "NetkWindow")
- (c-name "netk_window_set_skip_pager")
- (return-type "none")
- (parameters
- '("gboolean" "skip")
- )
-)
-
-(define-method set_skip_tasklist
- (of-object "NetkWindow")
- (c-name "netk_window_set_skip_tasklist")
- (return-type "none")
- (parameters
- '("gboolean" "skip")
- )
-)
-
-(define-method close
- (of-object "NetkWindow")
- (c-name "netk_window_close")
- (return-type "none")
-)
-
-(define-method minimize
- (of-object "NetkWindow")
- (c-name "netk_window_minimize")
- (return-type "none")
-)
-
-(define-method unminimize
- (of-object "NetkWindow")
- (c-name "netk_window_unminimize")
- (return-type "none")
-)
-
-(define-method maximize
- (of-object "NetkWindow")
- (c-name "netk_window_maximize")
- (return-type "none")
-)
-
-(define-method unmaximize
- (of-object "NetkWindow")
- (c-name "netk_window_unmaximize")
- (return-type "none")
-)
-
-(define-method maximize_horizontally
- (of-object "NetkWindow")
- (c-name "netk_window_maximize_horizontally")
- (return-type "none")
-)
-
-(define-method unmaximize_horizontally
- (of-object "NetkWindow")
- (c-name "netk_window_unmaximize_horizontally")
- (return-type "none")
-)
-
-(define-method maximize_vertically
- (of-object "NetkWindow")
- (c-name "netk_window_maximize_vertically")
- (return-type "none")
-)
-
-(define-method unmaximize_vertically
- (of-object "NetkWindow")
- (c-name "netk_window_unmaximize_vertically")
- (return-type "none")
-)
-
-(define-method shade
- (of-object "NetkWindow")
- (c-name "netk_window_shade")
- (return-type "none")
-)
-
-(define-method unshade
- (of-object "NetkWindow")
- (c-name "netk_window_unshade")
- (return-type "none")
-)
-
-(define-method stick
- (of-object "NetkWindow")
- (c-name "netk_window_stick")
- (return-type "none")
-)
-
-(define-method unstick
- (of-object "NetkWindow")
- (c-name "netk_window_unstick")
- (return-type "none")
-)
-
-(define-method keyboard_move
- (of-object "NetkWindow")
- (c-name "netk_window_keyboard_move")
- (return-type "none")
-)
-
-(define-method keyboard_size
- (of-object "NetkWindow")
- (c-name "netk_window_keyboard_size")
- (return-type "none")
-)
-
-(define-method get_workspace
- (of-object "NetkWindow")
- (c-name "netk_window_get_workspace")
- (return-type "NetkWorkspace*")
-)
-
-(define-method move_to_workspace
- (of-object "NetkWindow")
- (c-name "netk_window_move_to_workspace")
- (return-type "none")
- (parameters
- '("NetkWorkspace*" "space")
- )
-)
-
-(define-method is_pinned
- (of-object "NetkWindow")
- (c-name "netk_window_is_pinned")
- (return-type "gboolean")
-)
-
-(define-method pin
- (of-object "NetkWindow")
- (c-name "netk_window_pin")
- (return-type "none")
-)
-
-(define-method unpin
- (of-object "NetkWindow")
- (c-name "netk_window_unpin")
- (return-type "none")
-)
-
-(define-method activate
- (of-object "NetkWindow")
- (c-name "netk_window_activate")
- (return-type "none")
-)
-
-(define-method is_active
- (of-object "NetkWindow")
- (c-name "netk_window_is_active")
- (return-type "gboolean")
-)
-
-(define-method activate_transient
- (of-object "NetkWindow")
- (c-name "netk_window_activate_transient")
- (return-type "none")
-)
-
-(define-method get_icon
- (of-object "NetkWindow")
- (c-name "netk_window_get_icon")
- (return-type "GdkPixbuf*")
-)
-
-(define-method get_mini_icon
- (of-object "NetkWindow")
- (c-name "netk_window_get_mini_icon")
- (return-type "GdkPixbuf*")
-)
-
-(define-method get_icon_is_fallback
- (of-object "NetkWindow")
- (c-name "netk_window_get_icon_is_fallback")
- (return-type "gboolean")
-)
-
-(define-method set_icon_geometry
- (of-object "NetkWindow")
- (c-name "netk_window_set_icon_geometry")
- (return-type "none")
- (parameters
- '("int" "x")
- '("int" "y")
- '("int" "width")
- '("int" "height")
- )
-)
-
-(define-method get_actions
- (of-object "NetkWindow")
- (c-name "netk_window_get_actions")
- (return-type "NetkWindowActions")
-)
-
-(define-method get_state
- (of-object "NetkWindow")
- (c-name "netk_window_get_state")
- (return-type "NetkWindowState")
-)
-
-(define-method get_geometry
- (of-object "NetkWindow")
- (c-name "netk_window_get_geometry")
- (return-type "none")
- (parameters
- '("int*" "xp")
- '("int*" "yp")
- '("int*" "widthp")
- '("int*" "heightp")
- )
-)
-
-(define-method is_visible_on_workspace
- (of-object "NetkWindow")
- (c-name "netk_window_is_visible_on_workspace")
- (return-type "gboolean")
- (parameters
- '("NetkWorkspace*" "workspace")
- )
-)
-
-(define-method is_on_workspace
- (of-object "NetkWindow")
- (c-name "netk_window_is_on_workspace")
- (return-type "gboolean")
- (parameters
- '("NetkWorkspace*" "workspace")
- )
-)
-
-(define-method is_in_viewport
- (of-object "NetkWindow")
- (c-name "netk_window_is_in_viewport")
- (return-type "gboolean")
- (parameters
- '("NetkWorkspace*" "workspace")
- )
-)
-
-
diff --git a/netk/window.override b/netk/window.override
deleted file mode 100644
index dd6cc10..0000000
--- a/netk/window.override
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-#include <libxfcegui4/netk-window.h> /* sigh */
-
-extern PyTypeObject PyNetkWorkspace_Type;
-
-%%
-include
-%%
-modulename window
-%%
-import gobject.GObject as PyGObject_Type
-import application as PyNetkApplication_Type
-import classgroup as PyNetkClassGroup_Type
-import workspace as PyNetkWorkspace_Type
-import screen as PyNetkScreen_Type
-import gtk.gdk.Pixbuf as PyGdkPixbuf_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
-override netk_window_get_geometry noargs
-static PyObject *
-_wrap_netk_window_get_geometry(PyGObject *self)
-{
- gint x, y, width, height;
-
- netk_window_get_geometry(NETK_WINDOW(self->obj), &x, &y, &width, &height);
- return Py_BuildValue("(iiii)", x, y, width, height);
-}
-%%
-override netk_window_get_pid noargs
-static PyObject *
-_wrap_netk_window_get_pid(PyGObject *self)
-{
- int ret;
-
- ret = netk_window_get_pid(NETK_WINDOW(self->obj));
- if (ret == 0) {
- Py_INCREF(Py_None);
- return Py_None;
- }
-
- return PyInt_FromLong(ret);
-}
diff --git a/netk/window_action_menu.c b/netk/window_action_menu.c
deleted file mode 100644
index 66faacc..0000000
--- a/netk/window_action_menu.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "window_action_menu.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-#include <libxfcegui4/netk-window.h>
-#include <libxfcegui4/netk-window-action-menu.h>
-
-extern PyTypeObject PyNetkWindow_Type;
-
-#line 17 "window_action_menu.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 27 "window_action_menu.c"
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_netk_create_window_action_menu(PyObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "window", NULL };
- PyGObject *window;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!:create_window_action_menu", kwlist, &PyNetkWindow_Type, &window))
- return NULL;
- ret = netk_create_window_action_menu(NETK_WINDOW(window->obj));
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-PyMethodDef pywindow_action_menu_functions[] = {
- { "create_window_action_menu", (PyCFunction)_wrap_netk_create_window_action_menu, METH_VARARGS|METH_KEYWORDS },
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pywindow_action_menu_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
-
-
-#line 74 "window_action_menu.c"
-}
diff --git a/netk/window_action_menu.defs b/netk/window_action_menu.defs
deleted file mode 100644
index 2f1235b..0000000
--- a/netk/window_action_menu.defs
+++ /dev/null
@@ -1,16 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-
-;; From netk-window-action-menu.h
-
-(define-function create_window_action_menu
- (c-name "netk_create_window_action_menu")
- (return-type "GtkWidget*")
- (parameters
- '("NetkWindow*" "window")
- )
-)
-
-
diff --git a/netk/window_action_menu.override b/netk/window_action_menu.override
deleted file mode 100644
index 7dba136..0000000
--- a/netk/window_action_menu.override
+++ /dev/null
@@ -1,28 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-#include <libxfcegui4/netk-window.h>
-#include <libxfcegui4/netk-window-action-menu.h>
-
-extern PyTypeObject PyNetkWindow_Type;
-
-%%
-include
-%%
-modulename windowactionmenu
-%%
-import gobject.GObject as PyGObject_Type
-import window as PyNetkWindow_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/netk/window_menu.c b/netk/window_menu.c
deleted file mode 100644
index e9fc4f0..0000000
--- a/netk/window_menu.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "window_menu.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#line 13 "window_menu.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 23 "window_menu.c"
-
-
-
-/* ----------- functions ----------- */
-
-PyMethodDef pywindow_menu_functions[] = {
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pywindow_menu_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
-
-
-#line 55 "window_menu.c"
-}
diff --git a/netk/window_menu.defs b/netk/window_menu.defs
deleted file mode 100644
index bbb1d45..0000000
--- a/netk/window_menu.defs
+++ /dev/null
@@ -1,16 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-
-;; From netk-window-menu.h
-
-(define-function create_window_menu
- (c-name "netk_create_window_menu")
- (return-type "GtkWidget*")
- (parameters
- '("GList*" "windows")
- )
-)
-
-
diff --git a/netk/window_menu.override b/netk/window_menu.override
deleted file mode 100644
index 1a22d16..0000000
--- a/netk/window_menu.override
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-%%
-include
-%%
-modulename windowmenu
-%%
-import gobject.GObject as PyGObject_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/netk/workspace.c b/netk/workspace.c
deleted file mode 100644
index 85678b7..0000000
--- a/netk/workspace.c
+++ /dev/null
@@ -1,208 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "workspace.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-#line 13 "workspace.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject PyNetkWorkspace_Type;
-
-#line 24 "workspace.c"
-
-
-
-/* ----------- NetkWorkspace ----------- */
-
-static PyObject *
-_wrap_netk_workspace_get_number(PyGObject *self)
-{
- int ret;
-
- ret = netk_workspace_get_number(NETK_WORKSPACE(self->obj));
- return PyInt_FromLong(ret);
-}
-
-static PyObject *
-_wrap_netk_workspace_get_name(PyGObject *self)
-{
- const gchar *ret;
-
- ret = netk_workspace_get_name(NETK_WORKSPACE(self->obj));
- if (ret)
- return PyString_FromString(ret);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_workspace_change_name(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "name", NULL };
- char *name;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:NetkWorkspace.change_name", kwlist, &name))
- return NULL;
- netk_workspace_change_name(NETK_WORKSPACE(self->obj), name);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_workspace_activate(PyGObject *self)
-{
- netk_workspace_activate(NETK_WORKSPACE(self->obj));
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_netk_workspace_get_width(PyGObject *self)
-{
- int ret;
-
- ret = netk_workspace_get_width(NETK_WORKSPACE(self->obj));
- return PyInt_FromLong(ret);
-}
-
-static PyObject *
-_wrap_netk_workspace_get_height(PyGObject *self)
-{
- int ret;
-
- ret = netk_workspace_get_height(NETK_WORKSPACE(self->obj));
- return PyInt_FromLong(ret);
-}
-
-static PyObject *
-_wrap_netk_workspace_get_viewport_x(PyGObject *self)
-{
- int ret;
-
- ret = netk_workspace_get_viewport_x(NETK_WORKSPACE(self->obj));
- return PyInt_FromLong(ret);
-}
-
-static PyObject *
-_wrap_netk_workspace_get_viewport_y(PyGObject *self)
-{
- int ret;
-
- ret = netk_workspace_get_viewport_y(NETK_WORKSPACE(self->obj));
- return PyInt_FromLong(ret);
-}
-
-static PyObject *
-_wrap_netk_workspace_is_virtual(PyGObject *self)
-{
- int ret;
-
- ret = netk_workspace_is_virtual(NETK_WORKSPACE(self->obj));
- return PyBool_FromLong(ret);
-
-}
-
-static PyMethodDef _PyNetkWorkspace_methods[] = {
- { "get_number", (PyCFunction)_wrap_netk_workspace_get_number, METH_NOARGS },
- { "get_name", (PyCFunction)_wrap_netk_workspace_get_name, METH_NOARGS },
- { "change_name", (PyCFunction)_wrap_netk_workspace_change_name, METH_VARARGS|METH_KEYWORDS },
- { "activate", (PyCFunction)_wrap_netk_workspace_activate, METH_NOARGS },
- { "get_width", (PyCFunction)_wrap_netk_workspace_get_width, METH_NOARGS },
- { "get_height", (PyCFunction)_wrap_netk_workspace_get_height, METH_NOARGS },
- { "get_viewport_x", (PyCFunction)_wrap_netk_workspace_get_viewport_x, METH_NOARGS },
- { "get_viewport_y", (PyCFunction)_wrap_netk_workspace_get_viewport_y, METH_NOARGS },
- { "is_virtual", (PyCFunction)_wrap_netk_workspace_is_virtual, METH_NOARGS },
- { NULL, NULL, 0 }
-};
-
-PyTypeObject PyNetkWorkspace_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "workspace.Workspace", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- _PyNetkWorkspace_methods, /* tp_methods */
- 0, /* tp_members */
- 0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)0, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-PyMethodDef pyworkspace_functions[] = {
- { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pyworkspace_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- PyObject *moddict = PyModule_GetDict(module);
-
- _PyGObject_Type = (PyTypeObject *)PyDict_GetItemString(moddict, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return;
- }
-
-
-#line 206 "workspace.c"
- pygobject_register_class(d, "NetkWorkspace", NETK_TYPE_WORKSPACE, &PyNetkWorkspace_Type, Py_BuildValue("(O)", &PyGObject_Type));
- pyg_set_object_has_new_constructor(NETK_TYPE_WORKSPACE);
-}
diff --git a/netk/workspace.defs b/netk/workspace.defs
deleted file mode 100644
index 2906d22..0000000
--- a/netk/workspace.defs
+++ /dev/null
@@ -1,77 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object Workspace
- (in-module "Netk")
- (parent "GObject")
- (c-name "NetkWorkspace")
- (gtype-id "NETK_TYPE_WORKSPACE")
-)
-
-;; Enumerations and flags ...
-
-
-;; From netk-workspace.h
-
-(define-function workspace_get_type
- (c-name "netk_workspace_get_type")
- (return-type "GType")
-)
-
-(define-method get_number
- (of-object "NetkWorkspace")
- (c-name "netk_workspace_get_number")
- (return-type "int")
-)
-
-(define-method get_name
- (of-object "NetkWorkspace")
- (c-name "netk_workspace_get_name")
- (return-type "const-char*")
-)
-
-(define-method change_name
- (of-object "NetkWorkspace")
- (c-name "netk_workspace_change_name")
- (return-type "none")
- (parameters
- '("const-char*" "name")
- )
-)
-
-(define-method activate
- (of-object "NetkWorkspace")
- (c-name "netk_workspace_activate")
- (return-type "none")
-)
-
-(define-method get_width
- (of-object "NetkWorkspace")
- (c-name "netk_workspace_get_width")
- (return-type "int")
-)
-
-(define-method get_height
- (of-object "NetkWorkspace")
- (c-name "netk_workspace_get_height")
- (return-type "int")
-)
-
-(define-method get_viewport_x
- (of-object "NetkWorkspace")
- (c-name "netk_workspace_get_viewport_x")
- (return-type "int")
-)
-
-(define-method get_viewport_y
- (of-object "NetkWorkspace")
- (c-name "netk_workspace_get_viewport_y")
- (return-type "int")
-)
-
-(define-method is_virtual
- (of-object "NetkWorkspace")
- (c-name "netk_workspace_is_virtual")
- (return-type "gboolean")
-)
-
-
diff --git a/netk/workspace.override b/netk/workspace.override
deleted file mode 100644
index 445662f..0000000
--- a/netk/workspace.override
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
-%%
-include
-%%
-modulename workspace
-%%
-import gobject.GObject as PyGObject_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
diff --git a/panel/Makefile.am b/panel/Makefile.am
index c2ec5c9..c6d0b20 100644
--- a/panel/Makefile.am
+++ b/panel/Makefile.am
@@ -21,22 +21,26 @@ _panel_la_SOURCES = \
arrow_button.c \
enums.c \
external_plugin.c \
- itembar.c \
- plugin_iface.c \
- window.c \
- panelmodule.c
+ panelmodule.c \
+ convenience.c \
+ plugin.c \
+ hvbox.c \
+ xfce-panel-macros-47.h
defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs
defs_DATA = \
arrow_button.defs \
enums.defs \
- external_plugin.defs \
- itembar.defs \
- plugin_iface.defs \
- window.defs
-
-panel_overrides = arrow_button.override enums.override external_plugin.override \
- itembar.override plugin_iface.override window.override
+ convenience.defs \
+ plugin.defs \
+ hvbox.defs
+
+panel_overrides = \
+ arrow_button.override \
+ enums.override \
+ convenience.override \
+ plugin.override \
+ hvbox.override
EXTRA_DIST = $(defs_DATA) $(panel_overrides) gen
nodist__panel_la_SOURCES =
diff --git a/panel/arrow_button.c b/panel/arrow_button.c
index e6ee685..13fe4fa 100644
--- a/panel/arrow_button.c
+++ b/panel/arrow_button.c
@@ -35,15 +35,15 @@ PyTypeObject G_GNUC_INTERNAL PyXfceArrowButton_Type;
static int
_wrap_xfce_arrow_button_new(PyGObject *self, PyObject *args, PyObject *kwargs)
{
- static char *kwlist[] = { "type", NULL };
- PyObject *py_type = NULL;
- GtkArrowType type;
+ static char *kwlist[] = { "arrow_type", NULL };
+ PyObject *py_arrow_type = NULL;
+ GtkArrowType arrow_type;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:XfceArrowButton.__init__", kwlist, &py_type))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:XfceArrowButton.__init__", kwlist, &py_arrow_type))
return -1;
- if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_type, (gpointer)&type))
+ if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_arrow_type, (gpointer)&arrow_type))
return -1;
- self->obj = (GObject *)xfce_arrow_button_new(type);
+ self->obj = (GObject *)xfce_arrow_button_new(arrow_type);
if (!self->obj) {
PyErr_SetString(PyExc_RuntimeError, "could not create XfceArrowButton object");
@@ -54,38 +54,69 @@ _wrap_xfce_arrow_button_new(PyGObject *self, PyObject *args, PyObject *kwargs)
}
static PyObject *
+_wrap_xfce_arrow_button_get_arrow_type(PyGObject *self)
+{
+ gint ret;
+
+
+ ret = xfce_arrow_button_get_arrow_type(XFCE_ARROW_BUTTON(self->obj));
+
+ return pyg_enum_from_gtype(GTK_TYPE_ARROW_TYPE, ret);
+}
+
+static PyObject *
_wrap_xfce_arrow_button_set_arrow_type(PyGObject *self, PyObject *args, PyObject *kwargs)
{
- static char *kwlist[] = { "type", NULL };
- PyObject *py_type = NULL;
- GtkArrowType type;
+ static char *kwlist[] = { "arrow_type", NULL };
+ PyObject *py_arrow_type = NULL;
+ GtkArrowType arrow_type;
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:XfceArrowButton.set_arrow_type", kwlist, &py_type))
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:XfceArrowButton.set_arrow_type", kwlist, &py_arrow_type))
return NULL;
- if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_type, (gpointer)&type))
+ if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_arrow_type, (gpointer)&arrow_type))
return NULL;
- xfce_arrow_button_set_arrow_type(XFCE_ARROW_BUTTON(self->obj), type);
+ xfce_arrow_button_set_arrow_type(XFCE_ARROW_BUTTON(self->obj), arrow_type);
Py_INCREF(Py_None);
return Py_None;
}
static PyObject *
-_wrap_xfce_arrow_button_get_arrow_type(PyGObject *self)
+_wrap_xfce_arrow_button_get_blinking(PyGObject *self)
{
- gint ret;
+ int ret;
- ret = xfce_arrow_button_get_arrow_type(XFCE_ARROW_BUTTON(self->obj));
+ ret = xfce_arrow_button_get_blinking(XFCE_ARROW_BUTTON(self->obj));
- return pyg_enum_from_gtype(GTK_TYPE_ARROW_TYPE, ret);
+ return PyBool_FromLong(ret);
+
+}
+
+static PyObject *
+_wrap_xfce_arrow_button_set_blinking(PyGObject *self, PyObject *args, PyObject *kwargs)
+{
+ static char *kwlist[] = { "blinking", NULL };
+ int blinking;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:XfceArrowButton.set_blinking", kwlist, &blinking))
+ return NULL;
+
+ xfce_arrow_button_set_blinking(XFCE_ARROW_BUTTON(self->obj), blinking);
+
+ Py_INCREF(Py_None);
+ return Py_None;
}
static const PyMethodDef _PyXfceArrowButton_methods[] = {
+ { "get_arrow_type", (PyCFunction)_wrap_xfce_arrow_button_get_arrow_type, METH_NOARGS,
+ NULL },
{ "set_arrow_type", (PyCFunction)_wrap_xfce_arrow_button_set_arrow_type, METH_VARARGS|METH_KEYWORDS,
NULL },
- { "get_arrow_type", (PyCFunction)_wrap_xfce_arrow_button_get_arrow_type, METH_NOARGS,
+ { "get_blinking", (PyCFunction)_wrap_xfce_arrow_button_get_blinking, METH_NOARGS,
+ NULL },
+ { "set_blinking", (PyCFunction)_wrap_xfce_arrow_button_set_blinking, METH_VARARGS|METH_KEYWORDS,
NULL },
{ NULL, NULL, 0, NULL }
};
@@ -181,6 +212,6 @@ pyarrow_button_register_classes(PyObject *d)
}
-#line 185 "arrow_button.c"
+#line 216 "arrow_button.c"
pygobject_register_class(d, "XfceArrowButton", XFCE_TYPE_ARROW_BUTTON, &PyXfceArrowButton_Type, Py_BuildValue("(O)", &PyGtkToggleButton_Type));
}
diff --git a/panel/arrow_button.defs b/panel/arrow_button.defs
index a0782de..e39e744 100644
--- a/panel/arrow_button.defs
+++ b/panel/arrow_button.defs
@@ -22,23 +22,38 @@
(is-constructor-of "XfceArrowButton")
(return-type "GtkWidget*")
(parameters
- '("GtkArrowType" "type")
+ '("GtkArrowType" "arrow_type")
)
)
+(define-method get_arrow_type
+ (of-object "XfceArrowButton")
+ (c-name "xfce_arrow_button_get_arrow_type")
+ (return-type "GtkArrowType")
+)
+
(define-method set_arrow_type
(of-object "XfceArrowButton")
(c-name "xfce_arrow_button_set_arrow_type")
(return-type "none")
(parameters
- '("GtkArrowType" "type")
+ '("GtkArrowType" "arrow_type")
)
)
-(define-method get_arrow_type
+(define-method get_blinking
(of-object "XfceArrowButton")
- (c-name "xfce_arrow_button_get_arrow_type")
- (return-type "GtkArrowType")
+ (c-name "xfce_arrow_button_get_blinking")
+ (return-type "gboolean")
+)
+
+(define-method set_blinking
+ (of-object "XfceArrowButton")
+ (c-name "xfce_arrow_button_set_blinking")
+ (return-type "none")
+ (parameters
+ '("gboolean" "blinking")
+ )
)
diff --git a/panel/window.override b/panel/convenience.override
similarity index 65%
rename from panel/window.override
rename to panel/convenience.override
index 8b378cc..c9b0bf4 100644
--- a/panel/window.override
+++ b/panel/convenience.override
@@ -5,19 +5,18 @@
headers
#include "pygobject.h"
#include <gtk/gtk.h>
-#include <libxfce4panel/xfce-panel-window.h>
-#include <libxfce4panel/libxfce4panel-enum-types.h>
+#include <libxfce4panel/libxfce4panel.h>
extern PyTypeObject PyGtkWidget_Type;
%%
include
%%
-modulename support
+modulename convenience
%%
import gobject.GObject as PyGObject_Type
import gtk.Widget as PyGtkWidget_Type
-import gtk.Window as PyGtkWindow_Type
+import gtk.ToggleButton as PyGtkToggleButton_Type
%%
ignore
%%
diff --git a/panel/external_plugin.c b/panel/external_plugin.c
index a6f7f84..f94bb6d 100644
--- a/panel/external_plugin.c
+++ b/panel/external_plugin.c
@@ -1,207 +1,50 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "external_plugin.override"
+#include <stdio.h>
+#include "Python.h"
#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfce4panel/xfce-panel-external-plugin.h>
+#include <libxfce4panel/libxfce4panel.h>
+#include "xfce-panel-macros-47.h"
-extern PyTypeObject PyGtkWidget_Type;
extern PyTypeObject PyXfcePanelPlugin_Type;
-static int
-command_line_args_helper(char*** argv)
-{
- int argc;
- int i;
- PyObject* av;
-
- argc = 0;
-
- av = PySys_GetObject("argv");
- if (!PyList_Check(av)) {
- PyErr_Warn(PyExc_Warning, "ignoring sys.argv: it must be a list of strings");
- av = NULL;
- }
-
- if (av != NULL) {
- argc = PyList_Size(av);
- for (i = 0; i < argc; i++) {
- if (!PyString_Check(PyList_GetItem(av, i))) {
- PyErr_Warn(PyExc_Warning, "ignoring sys.argv: it must be a list of strings");
- av = NULL;
- break;
- }
- }
- }
-
- if (av) {
- *argv = g_new(char *, argc + 1);
- for (i = 0; i < argc; i++) {
- (*argv)[i] = g_strdup(PyString_AsString(PyList_GetItem(av, i)));
- }
-
- (*argv)[i] = 0;
- }
-
- return argc;
-}
-
static void
-command_line_args_free(int count, char** argv)
-{
- int i;
- for(i = 0; i < count; i++) {
- g_free(argv[i]);
- }
-}
-
-static void
-panel_plugin_construct(XfcePanelPlugin* plugin)
-{
+construct(XfcePanelPlugin *xpp) {
+ printf("constructing...\n");
}
-#line 68 "external_plugin.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGtkWidget_Type;
-#define PyGtkWidget_Type (*_PyGtkWidget_Type)
-static PyTypeObject *_PyGtkPlug_Type;
-#define PyGtkPlug_Type (*_PyGtkPlug_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject G_GNUC_INTERNAL PyXfceExternalPanelPlugin_Type;
-
-#line 83 "external_plugin.c"
-
+PYXFCE_PANEL_PLUGIN_REGISTER_EXTERNAL_FULL_BODY(construct);
-
-/* ----------- XfceExternalPanelPlugin ----------- */
-
-#line 82 "external_plugin.override"
-static int
-_wrap_xfce_external_panel_plugin_new(PyGObject *self, PyObject *args, PyObject *kwargs)
+static PyObject *
+register_external_full_constructor(PyGObject *self, PyObject *args, PyObject *kwargs)
{
- char** argv;
- int argc;
- int i;
-
- argv = NULL;
- argc = command_line_args_helper(&argv);
- self->obj = (GObject *)xfce_external_panel_plugin_new (argc, argv, panel_plugin_construct);
-
- command_line_args_free(argc, argv);
-
- if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create xfce4.panel.ExternalPanelPlugin object");
- return -1;
+ static char *kwlist[] = { "socket_ID", "plugin", NULL };
+ GtkOrientation orientation;
+ int socket_ID;
+ PyGObject *py_plugin = NULL;
+ XfcePanelPlugin* plugin = NULL;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iO:XfcePanelPlugin.__init__", kwlist, &socket_ID, &py_plugin))
+ return NULL;
+ if ((PyObject *)py_plugin == Py_None) {
+ PyErr_SetString(PyExc_TypeError, "plugin should be a XfcePanelPlugin");
+ return NULL;
+ } else if (py_plugin && pygobject_check(py_plugin, &PyXfcePanelPlugin_Type)) {
+ plugin = XFCE_PANEL_PLUGIN(py_plugin->obj);
+ {
+ PYXFCE_PANEL_PLUGIN_REGISTER_EXTERNAL_FULL_CONSTRUCTOR(socket_ID, plugin)
+ }
+ Py_INCREF(Py_None);
+ return Py_None;
+ } else {
+ PyErr_SetString(PyExc_TypeError, "plugin should be a XfcePanelPlugin");
+ return NULL;
}
- pygobject_register_wrapper((PyObject *)self);
-
- return 0;
}
-#line 112 "external_plugin.c"
-
-PyTypeObject G_GNUC_INTERNAL PyXfceExternalPanelPlugin_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "external.ExternalPanelPlugin", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- (struct PyMethodDef*)NULL, /* tp_methods */
- (struct PyMemberDef*)0, /* tp_members */
- (struct PyGetSetDef*)0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_external_panel_plugin_new, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
+PyMethodDef pyexternal_plugin_functions[] = {
+ { "register_external_full_constructor", (PyCFunction) register_external_full_constructor, METH_VARARGS|METH_KEYWORDS, NULL },
+ { NULL, NULL, 0, NULL },
};
-
-
-/* ----------- functions ----------- */
-
-const PyMethodDef pyexternal_plugin_functions[] = {
- { NULL, NULL, 0, NULL }
-};
-
-/* initialise stuff extension classes */
-void
-pyexternal_plugin_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- _PyGObject_Type = (PyTypeObject *)PyObject_GetAttrString(module, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return ;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return ;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- _PyGtkWidget_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Widget");
- if (_PyGtkWidget_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Widget from gtk");
- return ;
- }
- _PyGtkPlug_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Plug");
- if (_PyGtkPlug_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Plug from gtk");
- return ;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return ;
- }
-
-
-#line 206 "external_plugin.c"
- pygobject_register_class(d, "XfceExternalPanelPlugin", XFCE_TYPE_EXTERNAL_PANEL_PLUGIN, &PyXfceExternalPanelPlugin_Type, Py_BuildValue("(OO)", &PyGtkPlug_Type, &PyXfcePanelPlugin_Type));
+void pyexternal_plugin_register_classes(PyObject *d) {
}
diff --git a/panel/external_plugin.defs b/panel/external_plugin.defs
deleted file mode 100644
index 16a75f9..0000000
--- a/panel/external_plugin.defs
+++ /dev/null
@@ -1,33 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object ExternalPanelPlugin
- (in-module "Xfce")
- (parent "GtkPlug")
- (c-name "XfceExternalPanelPlugin")
- (gtype-id "XFCE_TYPE_EXTERNAL_PANEL_PLUGIN")
- (implements "XfcePanelPlugin")
-
-)
-
-;; Enumerations and flags ...
-
-
-;; From xfce-panel-external-plugin.h
-
-(define-function xfce_external_panel_plugin_get_type
- (c-name "xfce_external_panel_plugin_get_type")
- (return-type "GType")
-)
-
-(define-function xfce_external_panel_plugin_new
- (c-name "xfce_external_panel_plugin_new")
- (is-constructor-of "XfceExternalPanelPlugin")
- (return-type "GtkWidget*")
- (parameters
- '("gint" "argc")
- '("gchar**" "argv")
- '("XfcePanelPluginFunc" "construct")
- )
-)
-
-
diff --git a/panel/external_plugin.override b/panel/external_plugin.override
deleted file mode 100644
index e8fedfc..0000000
--- a/panel/external_plugin.override
+++ /dev/null
@@ -1,103 +0,0 @@
-/* -*- Mode: C; c-basic-offset: 4 -*-
- *
- */
-%%
-headers
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfce4panel/xfce-panel-external-plugin.h>
-
-extern PyTypeObject PyGtkWidget_Type;
-extern PyTypeObject PyXfcePanelPlugin_Type;
-
-static int
-command_line_args_helper(char*** argv)
-{
- int argc;
- int i;
- PyObject* av;
-
- argc = 0;
-
- av = PySys_GetObject("argv");
- if (!PyList_Check(av)) {
- PyErr_Warn(PyExc_Warning, "ignoring sys.argv: it must be a list of strings");
- av = NULL;
- }
-
- if (av != NULL) {
- argc = PyList_Size(av);
- for (i = 0; i < argc; i++) {
- if (!PyString_Check(PyList_GetItem(av, i))) {
- PyErr_Warn(PyExc_Warning, "ignoring sys.argv: it must be a list of strings");
- av = NULL;
- break;
- }
- }
- }
-
- if (av) {
- *argv = g_new(char *, argc + 1);
- for (i = 0; i < argc; i++) {
- (*argv)[i] = g_strdup(PyString_AsString(PyList_GetItem(av, i)));
- }
-
- (*argv)[i] = 0;
- }
-
- return argc;
-}
-
-static void
-command_line_args_free(int count, char** argv)
-{
- int i;
- for(i = 0; i < count; i++) {
- g_free(argv[i]);
- }
-}
-
-static void
-panel_plugin_construct(XfcePanelPlugin* plugin)
-{
-}
-
-%%
-include
-%%
-modulename external
-%%
-import gobject.GObject as PyGObject_Type
-import gtk.Widget as PyGtkWidget_Type
-import gtk.Plug as PyGtkPlug_Type
-%%
-ignore
-%%
-ignore-glob
- *_get_type
-%%
-ignore-win32
-%%
-override xfce_external_panel_plugin_new kwargs
-static int
-_wrap_xfce_external_panel_plugin_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- char** argv;
- int argc;
- int i;
-
- argv = NULL;
- argc = command_line_args_helper(&argv);
- self->obj = (GObject *)xfce_external_panel_plugin_new (argc, argv, panel_plugin_construct);
-
- command_line_args_free(argc, argv);
-
- if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create xfce4.panel.ExternalPanelPlugin object");
- return -1;
- }
-
- pygobject_register_wrapper((PyObject *)self);
-
- return 0;
-}
diff --git a/panel/gen b/panel/gen
index fffe123..0430040 100755
--- a/panel/gen
+++ b/panel/gen
@@ -1,13 +1,12 @@
#!/bin/sh
-inc="`pkg-config --variable=includedir libxfce4panel-1.0`"/xfce4/libxfce4panel
+inc="`pkg-config --variable=includedir libxfce4panel-1.0`"/xfce4/libxfce4panel-1.0/libxfce4panel
for s in "${inc}"/*.h
do
t="${s##*/}"
t="${t%.h}"
-
if [ "${t#xfce_panel_}" = "$t" ]
then
defs="${t/-/_}.defs"
@@ -17,47 +16,13 @@ do
defs="${defs/xfce_panel_/}"
defs="${defs/xfce_/}"
[ "${defs}" = "internal_plugin.defs" ] && continue
- [ "${defs}" = "plugin.defs" ] && continue
+ #[ "${defs}" = "plugin.defs" ] && continue
python2 /usr/lib/python2.6/site-packages/gtk-2.0/codegen/h2def.py "$s" >"${defs}"
fi
done
-cp plugin_iface.defs plugin_iface.defs.o
-
-cat >plugin_iface.defs << EOF
-(define-interface PanelPlugin
- (in-module "Xfce")
- (c-name "XfcePanelPlugin")
- (gtype-id "XFCE_TYPE_PANEL_PLUGIN")
-)
-
-EOF
-cat plugin_iface.defs.o >> plugin_iface.defs
-rm -f plugin_iface.defs.o
-
sed -e 's;\(XFCE_TYPE_EXTERNAL_PANEL_PLUGIN.*\)$;\1\
- (implements "XfcePanelPlugin")\
+ (implements "XfcePanelPluginProvider")\
;' \
- external_plugin.defs >external_plugin.defs.n && mv external_plugin.defs.n external_plugin.defs
-
-##rm -f util.defs
-#
-##mv xfce_support.defs support.defs
-#
-##mmv -o 'xfce-*.defs' '#1.defs'
-##rm -f libxfce4util.defs
-##rm -f libxfce4util-config.defs
-##rm -f generics.defs
-##rm -f debug.defs
-#rm -f add_control_dialog.defs # not yet done
-#rm -f controls.defs # not yet done
-#rm -f global.defs # not yet done
-#cp -f icons.defs.manual icons.defs
-#rm -f item.defs # not yet done
-#rm -f item_dialog.defs # not yet done
-##rm -f main.defs
-#rm -f panel_command.defs # not yet done. easy though.
-#rm -f panel.defs # not yet done.
-#rm -f plugins.defs # not yet done. easy though.
-#rm -f xfce.defs # dummy
+ plugin.defs >plugin.defs.n && mv plugin.defs.n plugin.defs.nn
diff --git a/panel/arrow_button.override b/panel/hvbox.override
similarity index 67%
copy from panel/arrow_button.override
copy to panel/hvbox.override
index 6b817b5..896c56e 100644
--- a/panel/arrow_button.override
+++ b/panel/hvbox.override
@@ -5,18 +5,21 @@
headers
#include "pygobject.h"
#include <gtk/gtk.h>
-#include <libxfce4panel/xfce-arrow-button.h>
+#include <libxfce4panel/libxfce4panel.h>
+#define XFCE_TYPE_HV_BOX XFCE_TYPE_HVBOX
+#define XFCE_HV_BOX XFCE_HVBOX
extern PyTypeObject PyGtkWidget_Type;
%%
include
%%
-modulename arrowbutton
+modulename hvbox
%%
import gobject.GObject as PyGObject_Type
import gtk.Widget as PyGtkWidget_Type
import gtk.ToggleButton as PyGtkToggleButton_Type
+import gtk.Box as PyGtkBox_Type
%%
ignore
%%
diff --git a/panel/itembar.c b/panel/itembar.c
deleted file mode 100644
index 82d2e7a..0000000
--- a/panel/itembar.c
+++ /dev/null
@@ -1,446 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "itembar.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfce4panel/xfce-itembar.h>
-
-extern PyTypeObject PyGtkWidget_Type;
-
-#line 15 "itembar.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGtkWidget_Type;
-#define PyGtkWidget_Type (*_PyGtkWidget_Type)
-static PyTypeObject *_PyGtkContainer_Type;
-#define PyGtkContainer_Type (*_PyGtkContainer_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject G_GNUC_INTERNAL PyXfceItembar_Type;
-
-#line 30 "itembar.c"
-
-
-
-/* ----------- XfceItembar ----------- */
-
-static int
-_wrap_xfce_itembar_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "orientation", NULL };
- GtkOrientation orientation;
- PyObject *py_orientation = NULL;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:XfceItembar.__init__", kwlist, &py_orientation))
- return -1;
- if (pyg_enum_get_value(GTK_TYPE_ORIENTATION, py_orientation, (gpointer)&orientation))
- return -1;
- self->obj = (GObject *)xfce_itembar_new(orientation);
-
- if (!self->obj) {
- PyErr_SetString(PyExc_RuntimeError, "could not create XfceItembar object");
- return -1;
- }
- pygobject_register_wrapper((PyObject *)self);
- return 0;
-}
-
-static PyObject *
-_wrap_xfce_itembar_set_maximum_size(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "size", NULL };
- int size;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:XfceItembar.set_maximum_size", kwlist, &size))
- return NULL;
-
- xfce_itembar_set_maximum_size(XFCE_ITEMBAR(self->obj), size);
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_itembar_set_allow_expand(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "allow", NULL };
- int allow;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:XfceItembar.set_allow_expand", kwlist, &allow))
- return NULL;
-
- xfce_itembar_set_allow_expand(XFCE_ITEMBAR(self->obj), allow);
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_itembar_set_orientation(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "orientation", NULL };
- GtkOrientation orientation;
- PyObject *py_orientation = NULL;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:XfceItembar.set_orientation", kwlist, &py_orientation))
- return NULL;
- if (pyg_enum_get_value(GTK_TYPE_ORIENTATION, py_orientation, (gpointer)&orientation))
- return NULL;
-
- xfce_itembar_set_orientation(XFCE_ITEMBAR(self->obj), orientation);
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_itembar_get_orientation(PyGObject *self)
-{
- gint ret;
-
-
- ret = xfce_itembar_get_orientation(XFCE_ITEMBAR(self->obj));
-
- return pyg_enum_from_gtype(GTK_TYPE_ORIENTATION, ret);
-}
-
-static PyObject *
-_wrap_xfce_itembar_insert(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "item", "position", NULL };
- PyGObject *item;
- int position;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!i:XfceItembar.insert", kwlist, &PyGtkWidget_Type, &item, &position))
- return NULL;
-
- xfce_itembar_insert(XFCE_ITEMBAR(self->obj), GTK_WIDGET(item->obj), position);
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_itembar_append(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "item", NULL };
- PyGObject *item;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:XfceItembar.append", kwlist, &PyGtkWidget_Type, &item))
- return NULL;
-
- xfce_itembar_append(XFCE_ITEMBAR(self->obj), GTK_WIDGET(item->obj));
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_itembar_prepend(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "item", NULL };
- PyGObject *item;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:XfceItembar.prepend", kwlist, &PyGtkWidget_Type, &item))
- return NULL;
-
- xfce_itembar_prepend(XFCE_ITEMBAR(self->obj), GTK_WIDGET(item->obj));
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_itembar_reorder_child(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "item", "position", NULL };
- PyGObject *item;
- int position;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!i:XfceItembar.reorder_child", kwlist, &PyGtkWidget_Type, &item, &position))
- return NULL;
-
- xfce_itembar_reorder_child(XFCE_ITEMBAR(self->obj), GTK_WIDGET(item->obj), position);
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_itembar_set_child_expand(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "item", "expand", NULL };
- PyGObject *item;
- int expand;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!i:XfceItembar.set_child_expand", kwlist, &PyGtkWidget_Type, &item, &expand))
- return NULL;
-
- xfce_itembar_set_child_expand(XFCE_ITEMBAR(self->obj), GTK_WIDGET(item->obj), expand);
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_itembar_get_child_expand(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "item", NULL };
- PyGObject *item;
- int ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:XfceItembar.get_child_expand", kwlist, &PyGtkWidget_Type, &item))
- return NULL;
-
- ret = xfce_itembar_get_child_expand(XFCE_ITEMBAR(self->obj), GTK_WIDGET(item->obj));
-
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_xfce_itembar_get_n_items(PyGObject *self)
-{
- int ret;
-
-
- ret = xfce_itembar_get_n_items(XFCE_ITEMBAR(self->obj));
-
- return PyInt_FromLong(ret);
-}
-
-static PyObject *
-_wrap_xfce_itembar_get_item_index(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "item", NULL };
- PyGObject *item;
- int ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:XfceItembar.get_item_index", kwlist, &PyGtkWidget_Type, &item))
- return NULL;
-
- ret = xfce_itembar_get_item_index(XFCE_ITEMBAR(self->obj), GTK_WIDGET(item->obj));
-
- return PyInt_FromLong(ret);
-}
-
-static PyObject *
-_wrap_xfce_itembar_get_nth_item(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "n", NULL };
- int n;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:XfceItembar.get_nth_item", kwlist, &n))
- return NULL;
-
- ret = xfce_itembar_get_nth_item(XFCE_ITEMBAR(self->obj), n);
-
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_xfce_itembar_raise_event_window(PyGObject *self)
-{
-
- xfce_itembar_raise_event_window(XFCE_ITEMBAR(self->obj));
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_itembar_lower_event_window(PyGObject *self)
-{
-
- xfce_itembar_lower_event_window(XFCE_ITEMBAR(self->obj));
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_itembar_event_window_is_raised(PyGObject *self)
-{
- int ret;
-
-
- ret = xfce_itembar_event_window_is_raised(XFCE_ITEMBAR(self->obj));
-
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_xfce_itembar_get_item_at_point(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "x", "y", NULL };
- int x, y;
- GtkWidget *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"ii:XfceItembar.get_item_at_point", kwlist, &x, &y))
- return NULL;
-
- ret = xfce_itembar_get_item_at_point(XFCE_ITEMBAR(self->obj), x, y);
-
- /* pygobject_new handles NULL checking */
- return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_xfce_itembar_get_drop_index(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "x", "y", NULL };
- int x, y, ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"ii:XfceItembar.get_drop_index", kwlist, &x, &y))
- return NULL;
-
- ret = xfce_itembar_get_drop_index(XFCE_ITEMBAR(self->obj), x, y);
-
- return PyInt_FromLong(ret);
-}
-
-static const PyMethodDef _PyXfceItembar_methods[] = {
- { "set_maximum_size", (PyCFunction)_wrap_xfce_itembar_set_maximum_size, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "set_allow_expand", (PyCFunction)_wrap_xfce_itembar_set_allow_expand, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "set_orientation", (PyCFunction)_wrap_xfce_itembar_set_orientation, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "get_orientation", (PyCFunction)_wrap_xfce_itembar_get_orientation, METH_NOARGS,
- NULL },
- { "insert", (PyCFunction)_wrap_xfce_itembar_insert, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "append", (PyCFunction)_wrap_xfce_itembar_append, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "prepend", (PyCFunction)_wrap_xfce_itembar_prepend, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "reorder_child", (PyCFunction)_wrap_xfce_itembar_reorder_child, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "set_child_expand", (PyCFunction)_wrap_xfce_itembar_set_child_expand, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "get_child_expand", (PyCFunction)_wrap_xfce_itembar_get_child_expand, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "get_n_items", (PyCFunction)_wrap_xfce_itembar_get_n_items, METH_NOARGS,
- NULL },
- { "get_item_index", (PyCFunction)_wrap_xfce_itembar_get_item_index, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "get_nth_item", (PyCFunction)_wrap_xfce_itembar_get_nth_item, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "raise_event_window", (PyCFunction)_wrap_xfce_itembar_raise_event_window, METH_NOARGS,
- NULL },
- { "lower_event_window", (PyCFunction)_wrap_xfce_itembar_lower_event_window, METH_NOARGS,
- NULL },
- { "event_window_is_raised", (PyCFunction)_wrap_xfce_itembar_event_window_is_raised, METH_NOARGS,
- NULL },
- { "get_item_at_point", (PyCFunction)_wrap_xfce_itembar_get_item_at_point, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "get_drop_index", (PyCFunction)_wrap_xfce_itembar_get_drop_index, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { NULL, NULL, 0, NULL }
-};
-
-PyTypeObject G_GNUC_INTERNAL PyXfceItembar_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "itembar.Itembar", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- (struct PyMethodDef*)_PyXfceItembar_methods, /* tp_methods */
- (struct PyMemberDef*)0, /* tp_members */
- (struct PyGetSetDef*)0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_itembar_new, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-const PyMethodDef pyitembar_functions[] = {
- { NULL, NULL, 0, NULL }
-};
-
-/* initialise stuff extension classes */
-void
-pyitembar_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- _PyGObject_Type = (PyTypeObject *)PyObject_GetAttrString(module, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return ;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return ;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- _PyGtkWidget_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Widget");
- if (_PyGtkWidget_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Widget from gtk");
- return ;
- }
- _PyGtkContainer_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Container");
- if (_PyGtkContainer_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Container from gtk");
- return ;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return ;
- }
-
-
-#line 445 "itembar.c"
- pygobject_register_class(d, "XfceItembar", XFCE_TYPE_ITEMBAR, &PyXfceItembar_Type, Py_BuildValue("(O)", &PyGtkContainer_Type));
-}
diff --git a/panel/itembar.defs b/panel/itembar.defs
deleted file mode 100644
index 9376478..0000000
--- a/panel/itembar.defs
+++ /dev/null
@@ -1,181 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object Itembar
- (in-module "Xfce")
- (parent "GtkContainer")
- (c-name "XfceItembar")
- (gtype-id "XFCE_TYPE_ITEMBAR")
-)
-
-;; Enumerations and flags ...
-
-
-;; From xfce-itembar.h
-
-(define-function xfce_itembar_get_type
- (c-name "xfce_itembar_get_type")
- (return-type "GType")
-)
-
-(define-function xfce_itembar_new
- (c-name "xfce_itembar_new")
- (is-constructor-of "XfceItembar")
- (return-type "GtkWidget*")
- (parameters
- '("GtkOrientation" "orientation")
- )
-)
-
-(define-method set_maximum_size
- (of-object "XfceItembar")
- (c-name "xfce_itembar_set_maximum_size")
- (return-type "none")
- (parameters
- '("gint" "size")
- )
-)
-
-(define-method set_allow_expand
- (of-object "XfceItembar")
- (c-name "xfce_itembar_set_allow_expand")
- (return-type "none")
- (parameters
- '("gboolean" "allow")
- )
-)
-
-(define-method set_orientation
- (of-object "XfceItembar")
- (c-name "xfce_itembar_set_orientation")
- (return-type "none")
- (parameters
- '("GtkOrientation" "orientation")
- )
-)
-
-(define-method get_orientation
- (of-object "XfceItembar")
- (c-name "xfce_itembar_get_orientation")
- (return-type "GtkOrientation")
-)
-
-(define-method insert
- (of-object "XfceItembar")
- (c-name "xfce_itembar_insert")
- (return-type "none")
- (parameters
- '("GtkWidget*" "item")
- '("gint" "position")
- )
-)
-
-(define-method append
- (of-object "XfceItembar")
- (c-name "xfce_itembar_append")
- (return-type "none")
- (parameters
- '("GtkWidget*" "item")
- )
-)
-
-(define-method prepend
- (of-object "XfceItembar")
- (c-name "xfce_itembar_prepend")
- (return-type "none")
- (parameters
- '("GtkWidget*" "item")
- )
-)
-
-(define-method reorder_child
- (of-object "XfceItembar")
- (c-name "xfce_itembar_reorder_child")
- (return-type "none")
- (parameters
- '("GtkWidget*" "item")
- '("gint" "position")
- )
-)
-
-(define-method set_child_expand
- (of-object "XfceItembar")
- (c-name "xfce_itembar_set_child_expand")
- (return-type "none")
- (parameters
- '("GtkWidget*" "item")
- '("gboolean" "expand")
- )
-)
-
-(define-method get_child_expand
- (of-object "XfceItembar")
- (c-name "xfce_itembar_get_child_expand")
- (return-type "gboolean")
- (parameters
- '("GtkWidget*" "item")
- )
-)
-
-(define-method get_n_items
- (of-object "XfceItembar")
- (c-name "xfce_itembar_get_n_items")
- (return-type "gint")
-)
-
-(define-method get_item_index
- (of-object "XfceItembar")
- (c-name "xfce_itembar_get_item_index")
- (return-type "gint")
- (parameters
- '("GtkWidget*" "item")
- )
-)
-
-(define-method get_nth_item
- (of-object "XfceItembar")
- (c-name "xfce_itembar_get_nth_item")
- (return-type "GtkWidget*")
- (parameters
- '("gint" "n")
- )
-)
-
-(define-method raise_event_window
- (of-object "XfceItembar")
- (c-name "xfce_itembar_raise_event_window")
- (return-type "none")
-)
-
-(define-method lower_event_window
- (of-object "XfceItembar")
- (c-name "xfce_itembar_lower_event_window")
- (return-type "none")
-)
-
-(define-method event_window_is_raised
- (of-object "XfceItembar")
- (c-name "xfce_itembar_event_window_is_raised")
- (return-type "gboolean")
-)
-
-(define-method get_item_at_point
- (of-object "XfceItembar")
- (c-name "xfce_itembar_get_item_at_point")
- (return-type "GtkWidget*")
- (parameters
- '("gint" "x")
- '("gint" "y")
- )
-)
-
-(define-method get_drop_index
- (of-object "XfceItembar")
- (c-name "xfce_itembar_get_drop_index")
- (return-type "gint")
- (parameters
- '("gint" "x")
- '("gint" "y")
- )
-)
-
-
diff --git a/panel/panel.py b/panel/panel.py
index 3ff2251..ecf7c83 100644
--- a/panel/panel.py
+++ b/panel/panel.py
@@ -2,7 +2,43 @@
from _panel import *
-class Plugin(ExternalPanelPlugin):
+import pygtk
+pygtk.require("2.0")
+import gtk
+import sys
+
+PLUGIN_ARGV_0, \
+PLUGIN_ARGV_FILENAME, \
+PLUGIN_ARGV_UNIQUE_ID, \
+PLUGIN_ARGV_SOCKET_ID, \
+PLUGIN_ARGV_NAME, \
+PLUGIN_ARGV_DISPLAY_NAME, \
+PLUGIN_ARGV_COMMENT, \
+PLUGIN_ARGV_BACKGROUND_IMAGE, \
+PLUGIN_ARGV_ARGUMENTS = range(9)
+
+# and the other arguments are appended (at and including position PLUGIN_ARGV_ARGUMENTS).
+
+PLUGIN_EXIT_SUCCESS, \
+PLUGIN_EXIT_FAILURE, \
+PLUGIN_EXIT_ARGUMENTS_FAILED, \
+PLUGIN_EXIT_PREINIT_FAILED, \
+PLUGIN_EXIT_CHECK_FAILED, \
+PLUGIN_EXIT_NO_PROVIDER, \
+PLUGIN_EXIT_SUCCESS_AND_RESTART = range(7)
+
+class Plugin(PanelPlugin):
+ def __init__(self):
+ PanelPlugin.__init__(self)
+ self.props.name = sys.argv[PLUGIN_ARGV_NAME]
+ self.props.unique_id = sys.argv[PLUGIN_ARGV_UNIQUE_ID]
+ self.props.display_name = sys.argv[PLUGIN_ARGV_DISPLAY_NAME]
+ self.props.comment = sys.argv[PLUGIN_ARGV_COMMENT]
+ self.props.arguments = sys.argv[PLUGIN_ARGV_ARGUMENTS : ]
+ socket_id = int(sys.argv[PLUGIN_ARGV_SOCKET_ID])
+ register_external_full_constructor(socket_id, self)
+ # #define XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL_FULL_CONSTRUCTOR(socket_id, xpp)
+
def _get_horizontal(self):
position = self.get_property("screen-position")
return position in (
diff --git a/panel/panelmodule.c b/panel/panelmodule.c
index d46e2d7..ca01f9c 100644
--- a/panel/panelmodule.c
+++ b/panel/panelmodule.c
@@ -11,20 +11,16 @@
#include <pygobject.h>
#include <pyerrors.h>
-extern PyMethodDef pyarrow_button_functions[];
-extern PyMethodDef pyenums_functions[];
-extern PyMethodDef pyenum_types_functions[];
-extern PyMethodDef pyexternal_plugin_functions[];
-extern PyMethodDef pyitembar_functions[];
-extern PyMethodDef pyplugin_iface_functions[];
-extern PyMethodDef pywindow_functions[];
+extern const PyMethodDef pyarrow_button_functions[];
+extern const PyMethodDef pyenums_functions[];
+extern const PyMethodDef pyexternal_plugin_functions[];
+extern const PyMethodDef pyconvenience_functions[];
+extern const PyMethodDef pyplugin_functions[];
void pyarrow_button_register_classes(PyObject *d);
void pyenums_register_classes(PyObject *d);
-void pyenum_types_register_classes(PyObject *d);
void pyexternal_plugin_register_classes(PyObject *d);
-void pyitembar_register_classes(PyObject *d);
-void pyplugin_iface_register_classes(PyObject *d);
-void pywindow_register_classes(PyObject *d);
+void pyplugin_register_classes(PyObject *d);
+void pyconvenience_register_classes(PyObject *d);
void pyenums_add_constants(PyObject *module, const gchar *strip_prefix);
static PyMethodDef all_functions[1000];
@@ -32,11 +28,9 @@ static PyMethodDef all_functions[1000];
static PyMethodDef* each_functions[] = {
pyarrow_button_functions,
pyenums_functions,
- pyenum_types_functions,
pyexternal_plugin_functions,
- pyitembar_functions,
- pyplugin_iface_functions,
- pywindow_functions,
+ pyplugin_functions,
+ pyconvenience_functions,
};
static void
@@ -65,11 +59,9 @@ my_register1()
pyarrow_button_register_classes(d);
pyenums_register_classes(d);
- pyenum_types_register_classes(d);
- pyplugin_iface_register_classes(d);
pyexternal_plugin_register_classes(d);
- pyitembar_register_classes(d);
- pywindow_register_classes(d);
+ pyplugin_register_classes(d);
+ pyconvenience_register_classes(d);
pyenums_add_constants(m, "XFCE_");
}
diff --git a/panel/plugin_iface.override b/panel/plugin.override
similarity index 66%
rename from panel/plugin_iface.override
rename to panel/plugin.override
index 35895b0..6f83586 100644
--- a/panel/plugin_iface.override
+++ b/panel/plugin.override
@@ -5,20 +5,22 @@
headers
#include "pygobject.h"
#include <gtk/gtk.h>
-#include <libxfce4panel/xfce-panel-plugin-iface.h>
-#include <libxfce4panel/libxfce4panel-enum-types.h>
+#include <libxfce4panel/libxfce4panel.h>
extern PyTypeObject PyGtkWidget_Type;
%%
include
%%
-modulename pluginiface
+modulename plugin
%%
import gobject.GObject as PyGObject_Type
import gtk.Widget as PyGtkWidget_Type
+import gtk.Window as PyGtkWindow_Type
+import gtk.ToggleButton as PyGtkToggleButton_Type
import gtk.MenuItem as PyGtkMenuItem_Type
import gtk.Menu as PyGtkMenu_Type
+import gtk.EventBox as PyGtkEventBox_Type
%%
ignore
%%
diff --git a/panel/plugin_iface.c b/panel/plugin_iface.c
deleted file mode 100644
index 9198560..0000000
--- a/panel/plugin_iface.c
+++ /dev/null
@@ -1,456 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "plugin_iface.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfce4panel/xfce-panel-plugin-iface.h>
-#include <libxfce4panel/libxfce4panel-enum-types.h>
-
-extern PyTypeObject PyGtkWidget_Type;
-
-#line 16 "plugin_iface.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGtkWidget_Type;
-#define PyGtkWidget_Type (*_PyGtkWidget_Type)
-static PyTypeObject *_PyGtkMenuItem_Type;
-#define PyGtkMenuItem_Type (*_PyGtkMenuItem_Type)
-static PyTypeObject *_PyGtkMenu_Type;
-#define PyGtkMenu_Type (*_PyGtkMenu_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject G_GNUC_INTERNAL PyXfcePanelPlugin_Type;
-
-#line 33 "plugin_iface.c"
-
-
-
-/* ----------- XfcePanelPlugin ----------- */
-
-static PyObject *
-_wrap_xfce_panel_plugin_get_name(PyGObject *self)
-{
- gchar *ret;
-
-
- ret = xfce_panel_plugin_get_name(XFCE_PANEL_PLUGIN(self->obj));
-
- if (ret) {
- PyObject *py_ret = PyString_FromString(ret);
- g_free(ret);
- return py_ret;
- }
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_get_id(PyGObject *self)
-{
- gchar *ret;
-
-
- ret = xfce_panel_plugin_get_id(XFCE_PANEL_PLUGIN(self->obj));
-
- if (ret) {
- PyObject *py_ret = PyString_FromString(ret);
- g_free(ret);
- return py_ret;
- }
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_get_display_name(PyGObject *self)
-{
- gchar *ret;
-
-
- ret = xfce_panel_plugin_get_display_name(XFCE_PANEL_PLUGIN(self->obj));
-
- if (ret) {
- PyObject *py_ret = PyString_FromString(ret);
- g_free(ret);
- return py_ret;
- }
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_get_size(PyGObject *self)
-{
- int ret;
-
-
- ret = xfce_panel_plugin_get_size(XFCE_PANEL_PLUGIN(self->obj));
-
- return PyInt_FromLong(ret);
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_get_screen_position(PyGObject *self)
-{
- gint ret;
-
-
- ret = xfce_panel_plugin_get_screen_position(XFCE_PANEL_PLUGIN(self->obj));
-
- return pyg_enum_from_gtype(XFCE_TYPE_SCREEN_POSITION, ret);
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_set_expand(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "expand", NULL };
- int expand;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:XfcePanelPlugin.set_expand", kwlist, &expand))
- return NULL;
-
- xfce_panel_plugin_set_expand(XFCE_PANEL_PLUGIN(self->obj), expand);
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_get_expand(PyGObject *self)
-{
- int ret;
-
-
- ret = xfce_panel_plugin_get_expand(XFCE_PANEL_PLUGIN(self->obj));
-
- return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_get_orientation(PyGObject *self)
-{
- gint ret;
-
-
- ret = xfce_panel_plugin_get_orientation(XFCE_PANEL_PLUGIN(self->obj));
-
- return pyg_enum_from_gtype(GTK_TYPE_ORIENTATION, ret);
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_add_action_widget(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "widget", NULL };
- PyGObject *widget;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:XfcePanelPlugin.add_action_widget", kwlist, &PyGtkWidget_Type, &widget))
- return NULL;
-
- xfce_panel_plugin_add_action_widget(XFCE_PANEL_PLUGIN(self->obj), GTK_WIDGET(widget->obj));
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_menu_insert_item(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "item", NULL };
- PyGObject *item;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:XfcePanelPlugin.menu_insert_item", kwlist, &PyGtkMenuItem_Type, &item))
- return NULL;
-
- xfce_panel_plugin_menu_insert_item(XFCE_PANEL_PLUGIN(self->obj), GTK_MENU_ITEM(item->obj));
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_menu_show_about(PyGObject *self)
-{
-
- xfce_panel_plugin_menu_show_about(XFCE_PANEL_PLUGIN(self->obj));
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_menu_show_configure(PyGObject *self)
-{
-
- xfce_panel_plugin_menu_show_configure(XFCE_PANEL_PLUGIN(self->obj));
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_block_menu(PyGObject *self)
-{
-
- xfce_panel_plugin_block_menu(XFCE_PANEL_PLUGIN(self->obj));
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_unblock_menu(PyGObject *self)
-{
-
- xfce_panel_plugin_unblock_menu(XFCE_PANEL_PLUGIN(self->obj));
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_register_menu(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "menu", NULL };
- PyGObject *menu;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:XfcePanelPlugin.register_menu", kwlist, &PyGtkMenu_Type, &menu))
- return NULL;
-
- xfce_panel_plugin_register_menu(XFCE_PANEL_PLUGIN(self->obj), GTK_MENU(menu->obj));
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_arrow_type(PyGObject *self)
-{
- gint ret;
-
-
- ret = xfce_panel_plugin_arrow_type(XFCE_PANEL_PLUGIN(self->obj));
-
- return pyg_enum_from_gtype(GTK_TYPE_ARROW_TYPE, ret);
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_lookup_rc_file(PyGObject *self)
-{
- gchar *ret;
-
-
- ret = xfce_panel_plugin_lookup_rc_file(XFCE_PANEL_PLUGIN(self->obj));
-
- if (ret) {
- PyObject *py_ret = PyString_FromString(ret);
- g_free(ret);
- return py_ret;
- }
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_save_location(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "create", NULL };
- int create;
- gchar *ret;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:XfcePanelPlugin.save_location", kwlist, &create))
- return NULL;
-
- ret = xfce_panel_plugin_save_location(XFCE_PANEL_PLUGIN(self->obj), create);
-
- if (ret) {
- PyObject *py_ret = PyString_FromString(ret);
- g_free(ret);
- return py_ret;
- }
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_focus_widget(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "widget", NULL };
- PyGObject *widget;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:XfcePanelPlugin.focus_widget", kwlist, &PyGtkWidget_Type, &widget))
- return NULL;
-
- xfce_panel_plugin_focus_widget(XFCE_PANEL_PLUGIN(self->obj), GTK_WIDGET(widget->obj));
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_set_panel_hidden(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "hidden", NULL };
- int hidden;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:XfcePanelPlugin.set_panel_hidden", kwlist, &hidden))
- return NULL;
-
- xfce_panel_plugin_set_panel_hidden(XFCE_PANEL_PLUGIN(self->obj), hidden);
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static const PyMethodDef _PyXfcePanelPlugin_methods[] = {
- { "get_name", (PyCFunction)_wrap_xfce_panel_plugin_get_name, METH_NOARGS,
- NULL },
- { "get_id", (PyCFunction)_wrap_xfce_panel_plugin_get_id, METH_NOARGS,
- NULL },
- { "get_display_name", (PyCFunction)_wrap_xfce_panel_plugin_get_display_name, METH_NOARGS,
- NULL },
- { "get_size", (PyCFunction)_wrap_xfce_panel_plugin_get_size, METH_NOARGS,
- NULL },
- { "get_screen_position", (PyCFunction)_wrap_xfce_panel_plugin_get_screen_position, METH_NOARGS,
- NULL },
- { "set_expand", (PyCFunction)_wrap_xfce_panel_plugin_set_expand, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "get_expand", (PyCFunction)_wrap_xfce_panel_plugin_get_expand, METH_NOARGS,
- NULL },
- { "get_orientation", (PyCFunction)_wrap_xfce_panel_plugin_get_orientation, METH_NOARGS,
- NULL },
- { "add_action_widget", (PyCFunction)_wrap_xfce_panel_plugin_add_action_widget, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "menu_insert_item", (PyCFunction)_wrap_xfce_panel_plugin_menu_insert_item, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "menu_show_about", (PyCFunction)_wrap_xfce_panel_plugin_menu_show_about, METH_NOARGS,
- NULL },
- { "menu_show_configure", (PyCFunction)_wrap_xfce_panel_plugin_menu_show_configure, METH_NOARGS,
- NULL },
- { "block_menu", (PyCFunction)_wrap_xfce_panel_plugin_block_menu, METH_NOARGS,
- NULL },
- { "unblock_menu", (PyCFunction)_wrap_xfce_panel_plugin_unblock_menu, METH_NOARGS,
- NULL },
- { "register_menu", (PyCFunction)_wrap_xfce_panel_plugin_register_menu, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "arrow_type", (PyCFunction)_wrap_xfce_panel_plugin_arrow_type, METH_NOARGS,
- NULL },
- { "lookup_rc_file", (PyCFunction)_wrap_xfce_panel_plugin_lookup_rc_file, METH_NOARGS,
- NULL },
- { "save_location", (PyCFunction)_wrap_xfce_panel_plugin_save_location, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "focus_widget", (PyCFunction)_wrap_xfce_panel_plugin_focus_widget, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "set_panel_hidden", (PyCFunction)_wrap_xfce_panel_plugin_set_panel_hidden, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { NULL, NULL, 0, NULL }
-};
-
-PyTypeObject G_GNUC_INTERNAL PyXfcePanelPlugin_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "pluginiface.PanelPlugin", /* tp_name */
- sizeof(PyObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- 0, /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- (struct PyMethodDef*)_PyXfcePanelPlugin_methods, /* tp_methods */
- (struct PyMemberDef*)0, /* tp_members */
- (struct PyGetSetDef*)0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- 0, /* tp_dictoffset */
- (initproc)0, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-const PyMethodDef pyplugin_iface_functions[] = {
- { NULL, NULL, 0, NULL }
-};
-
-/* initialise stuff extension classes */
-void
-pyplugin_iface_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- _PyGObject_Type = (PyTypeObject *)PyObject_GetAttrString(module, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return ;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return ;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- _PyGtkWidget_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Widget");
- if (_PyGtkWidget_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Widget from gtk");
- return ;
- }
- _PyGtkMenuItem_Type = (PyTypeObject *)PyObject_GetAttrString(module, "MenuItem");
- if (_PyGtkMenuItem_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name MenuItem from gtk");
- return ;
- }
- _PyGtkMenu_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Menu");
- if (_PyGtkMenu_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Menu from gtk");
- return ;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return ;
- }
-
-
-#line 455 "plugin_iface.c"
- pyg_register_interface(d, "PanelPlugin", XFCE_TYPE_PANEL_PLUGIN, &PyXfcePanelPlugin_Type);
-}
diff --git a/panel/plugin_iface.defs b/panel/plugin_iface.defs
deleted file mode 100644
index f812f97..0000000
--- a/panel/plugin_iface.defs
+++ /dev/null
@@ -1,184 +0,0 @@
-(define-interface PanelPlugin
- (in-module "Xfce")
- (c-name "XfcePanelPlugin")
- (gtype-id "XFCE_TYPE_PANEL_PLUGIN")
-)
-
-;; -*- scheme -*-
-; object definitions ...
-;; Enumerations and flags ...
-
-
-;; From xfce-panel-plugin-iface.h
-
-(define-function xfce_panel_plugin_get_type
- (c-name "xfce_panel_plugin_get_type")
- (return-type "GType")
-)
-
-(define-method get_name
- (of-object "XfcePanelPlugin")
- (c-name "xfce_panel_plugin_get_name")
- (return-type "gchar*")
-)
-
-(define-method get_id
- (of-object "XfcePanelPlugin")
- (c-name "xfce_panel_plugin_get_id")
- (return-type "gchar*")
-)
-
-(define-method get_display_name
- (of-object "XfcePanelPlugin")
- (c-name "xfce_panel_plugin_get_display_name")
- (return-type "gchar*")
-)
-
-(define-method get_size
- (of-object "XfcePanelPlugin")
- (c-name "xfce_panel_plugin_get_size")
- (return-type "gint")
-)
-
-(define-method get_screen_position
- (of-object "XfcePanelPlugin")
- (c-name "xfce_panel_plugin_get_screen_position")
- (return-type "XfceScreenPosition")
-)
-
-(define-method set_expand
- (of-object "XfcePanelPlugin")
- (c-name "xfce_panel_plugin_set_expand")
- (return-type "none")
- (parameters
- '("gboolean" "expand")
- )
-)
-
-(define-method get_expand
- (of-object "XfcePanelPlugin")
- (c-name "xfce_panel_plugin_get_expand")
- (return-type "gboolean")
-)
-
-(define-method get_orientation
- (of-object "XfcePanelPlugin")
- (c-name "xfce_panel_plugin_get_orientation")
- (return-type "GtkOrientation")
-)
-
-(define-method add_action_widget
- (of-object "XfcePanelPlugin")
- (c-name "xfce_panel_plugin_add_action_widget")
- (return-type "none")
- (parameters
- '("GtkWidget*" "widget")
- )
-)
-
-(define-method menu_insert_item
- (of-object "XfcePanelPlugin")
- (c-name "xfce_panel_plugin_menu_insert_item")
- (return-type "none")
- (parameters
- '("GtkMenuItem*" "item")
- )
-)
-
-(define-method menu_show_about
- (of-object "XfcePanelPlugin")
- (c-name "xfce_panel_plugin_menu_show_about")
- (return-type "none")
-)
-
-(define-method menu_show_configure
- (of-object "XfcePanelPlugin")
- (c-name "xfce_panel_plugin_menu_show_configure")
- (return-type "none")
-)
-
-(define-method block_menu
- (of-object "XfcePanelPlugin")
- (c-name "xfce_panel_plugin_block_menu")
- (return-type "none")
-)
-
-(define-method unblock_menu
- (of-object "XfcePanelPlugin")
- (c-name "xfce_panel_plugin_unblock_menu")
- (return-type "none")
-)
-
-(define-method register_menu
- (of-object "XfcePanelPlugin")
- (c-name "xfce_panel_plugin_register_menu")
- (return-type "none")
- (parameters
- '("GtkMenu*" "menu")
- )
-)
-
-(define-method arrow_type
- (of-object "XfcePanelPlugin")
- (c-name "xfce_panel_plugin_arrow_type")
- (return-type "GtkArrowType")
-)
-
-(define-method position_widget
- (of-object "XfcePanelPlugin")
- (c-name "xfce_panel_plugin_position_widget")
- (return-type "none")
- (parameters
- '("GtkWidget*" "menu_widget")
- '("GtkWidget*" "attach_widget")
- '("gint*" "x")
- '("gint*" "y")
- )
-)
-
-(define-function xfce_panel_plugin_position_menu
- (c-name "xfce_panel_plugin_position_menu")
- (return-type "none")
- (parameters
- '("GtkMenu*" "menu")
- '("gint*" "x")
- '("gint*" "y")
- '("gboolean*" "push_in")
- '("gpointer" "panel_plugin")
- )
-)
-
-(define-method lookup_rc_file
- (of-object "XfcePanelPlugin")
- (c-name "xfce_panel_plugin_lookup_rc_file")
- (return-type "gchar*")
-)
-
-(define-method save_location
- (of-object "XfcePanelPlugin")
- (c-name "xfce_panel_plugin_save_location")
- (return-type "gchar*")
- (parameters
- '("gboolean" "create")
- )
-)
-
-(define-method focus_widget
- (of-object "XfcePanelPlugin")
- (c-name "xfce_panel_plugin_focus_widget")
- (return-type "none")
- (parameters
- '("GtkWidget*" "widget")
- )
-)
-
-(define-method set_panel_hidden
- (of-object "XfcePanelPlugin")
- (c-name "xfce_panel_plugin_set_panel_hidden")
- (return-type "none")
- (parameters
- '("gboolean" "hidden")
- )
-)
-
-
diff --git a/panel/itembar.override b/panel/plugin_provider.override
similarity index 72%
rename from panel/itembar.override
rename to panel/plugin_provider.override
index 6e34680..9a1a9fc 100644
--- a/panel/itembar.override
+++ b/panel/plugin_provider.override
@@ -5,18 +5,18 @@
headers
#include "pygobject.h"
#include <gtk/gtk.h>
-#include <libxfce4panel/xfce-itembar.h>
+#include <libxfce4panel/libxfce4panel.h>
extern PyTypeObject PyGtkWidget_Type;
%%
include
%%
-modulename itembar
+modulename plugin
%%
import gobject.GObject as PyGObject_Type
import gtk.Widget as PyGtkWidget_Type
-import gtk.Container as PyGtkContainer_Type
+import gtk.ToggleButton as PyGtkToggleButton_Type
%%
ignore
%%
diff --git a/panel/window.c b/panel/window.c
deleted file mode 100644
index 351d9c2..0000000
--- a/panel/window.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "window.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfce4panel/xfce-panel-window.h>
-#include <libxfce4panel/libxfce4panel-enum-types.h>
-
-extern PyTypeObject PyGtkWidget_Type;
-
-#line 16 "window.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-static PyTypeObject *_PyGtkWidget_Type;
-#define PyGtkWidget_Type (*_PyGtkWidget_Type)
-static PyTypeObject *_PyGtkWindow_Type;
-#define PyGtkWindow_Type (*_PyGtkWindow_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject G_GNUC_INTERNAL PyXfcePanelWindow_Type;
-
-#line 31 "window.c"
-
-
-
-/* ----------- XfcePanelWindow ----------- */
-
-static int
-_wrap_xfce_panel_window_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char* kwlist[] = { NULL };
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,
- ":support.PanelWindow.__init__",
- kwlist))
- return -1;
-
- pygobject_constructv(self, 0, NULL);
- if (!self->obj) {
- PyErr_SetString(
- PyExc_RuntimeError,
- "could not create support.PanelWindow object");
- return -1;
- }
- return 0;
-}
-
-static PyObject *
-_wrap_xfce_panel_window_set_orientation(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "orientation", NULL };
- GtkOrientation orientation;
- PyObject *py_orientation = NULL;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:XfcePanelWindow.set_orientation", kwlist, &py_orientation))
- return NULL;
- if (pyg_enum_get_value(GTK_TYPE_ORIENTATION, py_orientation, (gpointer)&orientation))
- return NULL;
-
- xfce_panel_window_set_orientation(XFCE_PANEL_WINDOW(self->obj), orientation);
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_panel_window_get_orientation(PyGObject *self)
-{
- gint ret;
-
-
- ret = xfce_panel_window_get_orientation(XFCE_PANEL_WINDOW(self->obj));
-
- return pyg_enum_from_gtype(GTK_TYPE_ORIENTATION, ret);
-}
-
-static PyObject *
-_wrap_xfce_panel_window_set_handle_style(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "handle_style", NULL };
- PyObject *py_handle_style = NULL;
- XfceHandleStyle handle_style;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O:XfcePanelWindow.set_handle_style", kwlist, &py_handle_style))
- return NULL;
- if (pyg_enum_get_value(XFCE_TYPE_HANDLE_STYLE, py_handle_style, (gpointer)&handle_style))
- return NULL;
-
- xfce_panel_window_set_handle_style(XFCE_PANEL_WINDOW(self->obj), handle_style);
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_panel_window_get_handle_style(PyGObject *self)
-{
- gint ret;
-
-
- ret = xfce_panel_window_get_handle_style(XFCE_PANEL_WINDOW(self->obj));
-
- return pyg_enum_from_gtype(XFCE_TYPE_HANDLE_STYLE, ret);
-}
-
-static PyObject *
-_wrap_xfce_panel_window_set_show_border(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "top_border", "bottom_border", "left_border", "right_border", NULL };
- int top_border, bottom_border, left_border, right_border;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"iiii:XfcePanelWindow.set_show_border", kwlist, &top_border, &bottom_border, &left_border, &right_border))
- return NULL;
-
- xfce_panel_window_set_show_border(XFCE_PANEL_WINDOW(self->obj), top_border, bottom_border, left_border, right_border);
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_panel_window_set_movable(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
- static char *kwlist[] = { "movable", NULL };
- int movable;
-
- if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:XfcePanelWindow.set_movable", kwlist, &movable))
- return NULL;
-
- xfce_panel_window_set_movable(XFCE_PANEL_WINDOW(self->obj), movable);
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_panel_window_get_movable(PyGObject *self)
-{
- int ret;
-
-
- ret = xfce_panel_window_get_movable(XFCE_PANEL_WINDOW(self->obj));
-
- return PyBool_FromLong(ret);
-
-}
-
-static const PyMethodDef _PyXfcePanelWindow_methods[] = {
- { "set_orientation", (PyCFunction)_wrap_xfce_panel_window_set_orientation, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "get_orientation", (PyCFunction)_wrap_xfce_panel_window_get_orientation, METH_NOARGS,
- NULL },
- { "set_handle_style", (PyCFunction)_wrap_xfce_panel_window_set_handle_style, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "get_handle_style", (PyCFunction)_wrap_xfce_panel_window_get_handle_style, METH_NOARGS,
- NULL },
- { "set_show_border", (PyCFunction)_wrap_xfce_panel_window_set_show_border, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "set_movable", (PyCFunction)_wrap_xfce_panel_window_set_movable, METH_VARARGS|METH_KEYWORDS,
- NULL },
- { "get_movable", (PyCFunction)_wrap_xfce_panel_window_get_movable, METH_NOARGS,
- NULL },
- { NULL, NULL, 0, NULL }
-};
-
-PyTypeObject G_GNUC_INTERNAL PyXfcePanelWindow_Type = {
- PyObject_HEAD_INIT(NULL)
- 0, /* ob_size */
- "support.PanelWindow", /* tp_name */
- sizeof(PyGObject), /* tp_basicsize */
- 0, /* tp_itemsize */
- /* methods */
- (destructor)0, /* tp_dealloc */
- (printfunc)0, /* tp_print */
- (getattrfunc)0, /* tp_getattr */
- (setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
- (reprfunc)0, /* tp_repr */
- (PyNumberMethods*)0, /* tp_as_number */
- (PySequenceMethods*)0, /* tp_as_sequence */
- (PyMappingMethods*)0, /* tp_as_mapping */
- (hashfunc)0, /* tp_hash */
- (ternaryfunc)0, /* tp_call */
- (reprfunc)0, /* tp_str */
- (getattrofunc)0, /* tp_getattro */
- (setattrofunc)0, /* tp_setattro */
- (PyBufferProcs*)0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- NULL, /* Documentation string */
- (traverseproc)0, /* tp_traverse */
- (inquiry)0, /* tp_clear */
- (richcmpfunc)0, /* tp_richcompare */
- offsetof(PyGObject, weakreflist), /* tp_weaklistoffset */
- (getiterfunc)0, /* tp_iter */
- (iternextfunc)0, /* tp_iternext */
- (struct PyMethodDef*)_PyXfcePanelWindow_methods, /* tp_methods */
- (struct PyMemberDef*)0, /* tp_members */
- (struct PyGetSetDef*)0, /* tp_getset */
- NULL, /* tp_base */
- NULL, /* tp_dict */
- (descrgetfunc)0, /* tp_descr_get */
- (descrsetfunc)0, /* tp_descr_set */
- offsetof(PyGObject, inst_dict), /* tp_dictoffset */
- (initproc)_wrap_xfce_panel_window_new, /* tp_init */
- (allocfunc)0, /* tp_alloc */
- (newfunc)0, /* tp_new */
- (freefunc)0, /* tp_free */
- (inquiry)0 /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-const PyMethodDef pywindow_functions[] = {
- { NULL, NULL, 0, NULL }
-};
-
-
-/* ----------- enums and flags ----------- */
-
-void
-pywindow_add_constants(PyObject *module, const gchar *strip_prefix)
-{
-#ifdef VERSION
- PyModule_AddStringConstant(module, "__version__", VERSION);
-#endif
- pyg_enum_add(module, "HandleStyle", strip_prefix, XFCE_TYPE_HANDLE_STYLE);
-
- if (PyErr_Occurred())
- PyErr_Print();
-}
-
-/* initialise stuff extension classes */
-void
-pywindow_register_classes(PyObject *d)
-{
- PyObject *module;
-
- if ((module = PyImport_ImportModule("gobject")) != NULL) {
- _PyGObject_Type = (PyTypeObject *)PyObject_GetAttrString(module, "GObject");
- if (_PyGObject_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name GObject from gobject");
- return ;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gobject");
- return ;
- }
- if ((module = PyImport_ImportModule("gtk")) != NULL) {
- _PyGtkWidget_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Widget");
- if (_PyGtkWidget_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Widget from gtk");
- return ;
- }
- _PyGtkWindow_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Window");
- if (_PyGtkWindow_Type == NULL) {
- PyErr_SetString(PyExc_ImportError,
- "cannot import name Window from gtk");
- return ;
- }
- } else {
- PyErr_SetString(PyExc_ImportError,
- "could not import gtk");
- return ;
- }
-
-
-#line 281 "window.c"
- pygobject_register_class(d, "XfcePanelWindow", XFCE_TYPE_PANEL_WINDOW, &PyXfcePanelWindow_Type, Py_BuildValue("(O)", &PyGtkWindow_Type));
- pyg_set_object_has_new_constructor(XFCE_TYPE_PANEL_WINDOW);
-}
diff --git a/panel/window.defs b/panel/window.defs
deleted file mode 100644
index 5ebdf1c..0000000
--- a/panel/window.defs
+++ /dev/null
@@ -1,127 +0,0 @@
-;; -*- scheme -*-
-; object definitions ...
-(define-object PanelWindow
- (in-module "Xfce")
- (parent "GtkWindow")
- (c-name "XfcePanelWindow")
- (gtype-id "XFCE_TYPE_PANEL_WINDOW")
-)
-
-;; Enumerations and flags ...
-
-(define-enum HandleStyle
- (in-module "Xfce")
- (c-name "XfceHandleStyle")
- (gtype-id "XFCE_TYPE_HANDLE_STYLE")
- (values
- '("none" "XFCE_HANDLE_STYLE_NONE")
- '("both" "XFCE_HANDLE_STYLE_BOTH")
- '("start" "XFCE_HANDLE_STYLE_START")
- '("end" "XFCE_HANDLE_STYLE_END")
- )
-)
-
-
-;; From xfce-panel-window.h
-
-(define-function xfce_panel_window_get_type
- (c-name "xfce_panel_window_get_type")
- (return-type "GType")
-)
-
-(define-function xfce_panel_window_new
- (c-name "xfce_panel_window_new")
- (is-constructor-of "XfcePanelWindow")
- (return-type "GtkWidget*")
-)
-
-(define-method set_orientation
- (of-object "XfcePanelWindow")
- (c-name "xfce_panel_window_set_orientation")
- (return-type "none")
- (parameters
- '("GtkOrientation" "orientation")
- )
-)
-
-(define-method get_orientation
- (of-object "XfcePanelWindow")
- (c-name "xfce_panel_window_get_orientation")
- (return-type "GtkOrientation")
-)
-
-(define-method set_handle_style
- (of-object "XfcePanelWindow")
- (c-name "xfce_panel_window_set_handle_style")
- (return-type "none")
- (parameters
- '("XfceHandleStyle" "handle_style")
- )
-)
-
-(define-method get_handle_style
- (of-object "XfcePanelWindow")
- (c-name "xfce_panel_window_get_handle_style")
- (return-type "XfceHandleStyle")
-)
-
-(define-method set_show_border
- (of-object "XfcePanelWindow")
- (c-name "xfce_panel_window_set_show_border")
- (return-type "none")
- (parameters
- '("gboolean" "top_border")
- '("gboolean" "bottom_border")
- '("gboolean" "left_border")
- '("gboolean" "right_border")
- )
-)
-
-(define-method get_show_border
- (of-object "XfcePanelWindow")
- (c-name "xfce_panel_window_get_show_border")
- (return-type "none")
- (parameters
- '("gboolean*" "top_border")
- '("gboolean*" "bottom_border")
- '("gboolean*" "left_border")
- '("gboolean*" "right_border")
- )
-)
-
-(define-method set_resize_function
- (of-object "XfcePanelWindow")
- (c-name "xfce_panel_window_set_resize_function")
- (return-type "none")
- (parameters
- '("XfcePanelWindowResizeFunc" "function")
- '("gpointer" "data")
- )
-)
-
-(define-method set_move_function
- (of-object "XfcePanelWindow")
- (c-name "xfce_panel_window_set_move_function")
- (return-type "none")
- (parameters
- '("XfcePanelWindowMoveFunc" "function")
- '("gpointer" "data")
- )
-)
-
-(define-method set_movable
- (of-object "XfcePanelWindow")
- (c-name "xfce_panel_window_set_movable")
- (return-type "none")
- (parameters
- '("gboolean" "movable")
- )
-)
-
-(define-method get_movable
- (of-object "XfcePanelWindow")
- (c-name "xfce_panel_window_get_movable")
- (return-type "gboolean")
-)
-
-
diff --git a/panel/xfce-panel-macros-47.h b/panel/xfce-panel-macros-47.h
new file mode 100644
index 0000000..4dbe190
--- /dev/null
+++ b/panel/xfce-panel-macros-47.h
@@ -0,0 +1,449 @@
+/*
+ * Copyright (C) 2009-2010 Nick Schermer <nick at xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#ifndef __LIBXFCE4PANEL_47_H__
+#define __LIBXFCE4PANEL_47_H__
+#include <libxfce4panel/xfce-panel-plugin-provider.h>
+#include <gdk/gdkx.h>
+#include <stdlib.h>
+
+#undef XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL_FULL
+
+G_BEGIN_DECLS
+
+/**
+ * PYXFCE_PANEL_PLUGIN_REGISTER_EXTERNAL_FULL:
+ * @construct_func : name of a function that can be cast to an
+ * #XfcePanelPluginFunc
+ * @preinit_func : name of a function that can be case to #XfcePanelPluginPreInit
+ * or %NULL
+ * @check_func : name of a function that can be cast to an
+ * #XfcePanelPluginCheck or %NULL
+ *
+ * Same as XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL_WITH_CHECK(), but with a
+ * preinit function that is called before gtk_init(). This allows plugins
+ * to initialize libraries or threads.
+ *
+ * Since: 4.8
+ **/
+#define PYXFCE_PANEL_PLUGIN_REGISTER_EXTERNAL_FULL_BODY(construct_func) \
+ static GdkAtom _xpp_atom = GDK_NONE; \
+ static gdouble _xpp_alpha = 1.00; \
+ static guint _xpp_bg_style = 0; \
+ static GdkColor _xpp_bg_color = { 0, }; \
+ static const gchar *_xpp_bg_image = NULL; \
+ static cairo_pattern_t *_xpp_bg_image_cache = NULL; \
+ static gboolean _xpp_debug = FALSE; \
+ static gint _xpp_retval = PLUGIN_EXIT_FAILURE; \
+ \
+ static void \
+ _xpp_quit_main_loop (void) \
+ { \
+ static gboolean quiting = FALSE; \
+ \
+ if (!quiting) \
+ { \
+ quiting = TRUE; \
+ gtk_main_quit (); \
+ } \
+ } \
+ \
+ static gboolean \
+ _xpp_client_event (GtkWidget *plug, \
+ GdkEventClient *event, \
+ XfcePanelPlugin *xpp) \
+ { \
+ XfcePanelPluginProvider *provider = XFCE_PANEL_PLUGIN_PROVIDER (xpp); \
+ gint value; \
+ XfcePanelPluginProviderPropType type; \
+ \
+ g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN (xpp), TRUE); \
+ g_return_val_if_fail (GTK_IS_PLUG (plug), TRUE); \
+ g_return_val_if_fail (_xpp_atom != GDK_NONE, TRUE); \
+ g_return_val_if_fail (XFCE_IS_PANEL_PLUGIN_PROVIDER (xpp), TRUE); \
+ \
+ if (event->message_type == _xpp_atom) \
+ { \
+ type = event->data.s[0]; \
+ value = event->data.s[1]; \
+ \
+ switch (type) \
+ { \
+ case PROVIDER_PROP_TYPE_ACTION_REMOVED: \
+ xfce_panel_plugin_provider_removed (provider); \
+ break; \
+ \
+ case PROVIDER_PROP_TYPE_ACTION_SAVE: \
+ xfce_panel_plugin_provider_save (provider); \
+ break; \
+ \
+ case PROVIDER_PROP_TYPE_SET_BACKGROUND_ALPHA: \
+ _xpp_alpha = value / 100.00; \
+ if (gtk_widget_is_composited (plug)) \
+ gtk_widget_queue_draw (plug); \
+ break; \
+ \
+ case PROVIDER_PROP_TYPE_SET_LOCKED: \
+ xfce_panel_plugin_provider_set_locked (provider, !!value); \
+ break; \
+ \
+ case PROVIDER_PROP_TYPE_SET_ORIENTATION: \
+ xfce_panel_plugin_provider_set_orientation (provider, value); \
+ break; \
+ \
+ case PROVIDER_PROP_TYPE_SET_SCREEN_POSITION: \
+ xfce_panel_plugin_provider_set_screen_position (provider, value); \
+ break; \
+ \
+ case PROVIDER_PROP_TYPE_SET_SENSITIVE: \
+ gtk_widget_set_sensitive (plug, !!value); \
+ break; \
+ \
+ case PROVIDER_PROP_TYPE_SET_SIZE: \
+ xfce_panel_plugin_provider_set_size (provider, value); \
+ break; \
+ \
+ case PROVIDER_PROP_TYPE_ACTION_SHOW_ABOUT: \
+ xfce_panel_plugin_provider_show_about (provider); \
+ break; \
+ \
+ case PROVIDER_PROP_TYPE_ACTION_SHOW_CONFIGURE: \
+ xfce_panel_plugin_provider_show_configure (provider); \
+ break; \
+ \
+ case PROVIDER_PROP_TYPE_ACTION_QUIT_FOR_RESTART: \
+ _xpp_retval = PLUGIN_EXIT_SUCCESS_AND_RESTART; \
+ case PROVIDER_PROP_TYPE_ACTION_QUIT: \
+ _xpp_quit_main_loop (); \
+ break; \
+ \
+ case PROVIDER_PROP_TYPE_SET_BACKGROUND_COLOR: \
+ _xpp_bg_color.red = event->data.s[1]; \
+ _xpp_bg_color.green = event->data.s[2]; \
+ _xpp_bg_color.blue = event->data.s[3]; \
+ _xpp_bg_style = 1; \
+ gtk_widget_queue_draw (plug); \
+ break; \
+ \
+ case PROVIDER_PROP_TYPE_ACTION_BACKGROUND_UNSET: \
+ _xpp_bg_style = 0; \
+ gtk_widget_queue_draw (plug); \
+ break; \
+ \
+ default: \
+ g_warning ("Received unknow client event %u", type); \
+ break; \
+ } \
+ \
+ return FALSE; \
+ } \
+ \
+ return TRUE; \
+ } \
+ \
+ static void \
+ _xpp_provider_signal (GtkWidget *xpp, \
+ guint message, \
+ GtkWidget *plug) \
+ { \
+ GdkEventClient event; \
+ GdkWindow *window; \
+ gint result; \
+ \
+ g_return_if_fail (GTK_IS_PLUG (plug)); \
+ g_return_if_fail (XFCE_IS_PANEL_PLUGIN (xpp)); \
+ g_return_if_fail (GTK_WIDGET_REALIZED (plug)); \
+ g_return_if_fail (_xpp_atom != GDK_NONE); \
+ g_return_if_fail (GTK_WIDGET_REALIZED (xpp)); \
+ \
+ if (_xpp_debug) \
+ g_printerr ("xfce4-panel(%s): send provider signal %d\n", \
+ xfce_panel_plugin_get_name (XFCE_PANEL_PLUGIN (xpp)), message); \
+ \
+ event.type = GDK_CLIENT_EVENT; \
+ event.window = gtk_widget_get_window (plug); \
+ event.send_event = TRUE; \
+ event.message_type = _xpp_atom; \
+ event.data_format = 16; \
+ event.data.s[0] = message; \
+ event.data.s[1] = 0; \
+ \
+ window = gtk_plug_get_socket_window (GTK_PLUG (plug)); \
+ g_return_if_fail (GDK_IS_WINDOW (window)); \
+ \
+ gdk_error_trap_push (); \
+ gdk_event_send_client_message ((GdkEvent *) &event, GDK_WINDOW_XID (window)); \
+ gdk_flush (); \
+ result = gdk_error_trap_pop (); \
+ if (G_UNLIKELY (result != 0)) \
+ g_warning ("Failed to send provider-signal %d: X error code %d", message, result); \
+ } \
+ \
+ static void \
+ _xpp_realize (XfcePanelPlugin *xpp, \
+ GtkPlug *plug) \
+ { \
+ g_return_if_fail (XFCE_IS_PANEL_PLUGIN (xpp)); \
+ g_return_if_fail (GTK_IS_PLUG (plug)); \
+ g_return_if_fail (GTK_WIDGET_REALIZED (plug)); \
+ \
+ if (_xpp_debug) \
+ g_printerr ("xfce4-panel(%s): calling plugin construct function\n", \
+ xfce_panel_plugin_get_name (xpp)); \
+ \
+ g_signal_handlers_disconnect_by_func (G_OBJECT (xpp), \
+ G_CALLBACK (_xpp_realize), NULL); \
+ \
+ g_signal_connect (G_OBJECT (xpp), "provider-signal", \
+ G_CALLBACK (_xpp_provider_signal), plug); \
+ \
+ ((XfcePanelPluginFunc) construct_func) (xpp); \
+ } \
+ \
+ static gboolean \
+ _xpp_expose_event (GtkWidget *plug, \
+ GdkEventExpose *event) \
+ { \
+ cairo_t *cr; \
+ const GdkColor *color; \
+ gdouble real_alpha; \
+ GdkPixbuf *pixbuf; \
+ GError *error = NULL; \
+ \
+ if (!GTK_WIDGET_DRAWABLE (plug)) \
+ return FALSE; \
+ \
+ if (G_UNLIKELY (_xpp_bg_style == 2)) \
+ { \
+ cr = gdk_cairo_create (gtk_widget_get_window (plug)); \
+ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); \
+ gdk_cairo_rectangle (cr, &event->area); \
+ cairo_clip (cr); \
+ \
+ if (G_LIKELY (_xpp_bg_image_cache != NULL)) \
+ { \
+ cairo_set_source (cr, _xpp_bg_image_cache); \
+ cairo_paint (cr); \
+ } \
+ else \
+ { \
+ /* load the image in a pixbuf */ \
+ pixbuf = gdk_pixbuf_new_from_file (_xpp_bg_image, &error); \
+ if (G_LIKELY (pixbuf != NULL)) \
+ { \
+ gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0); \
+ g_object_unref (G_OBJECT (pixbuf)); \
+ \
+ _xpp_bg_image_cache = cairo_get_source (cr); \
+ cairo_pattern_reference (_xpp_bg_image_cache); \
+ cairo_pattern_set_extend (_xpp_bg_image_cache, CAIRO_EXTEND_REPEAT); \
+ cairo_paint (cr); \
+ } \
+ else \
+ { \
+ /* print error message */ \
+ g_warning ("Background image disabled, \"%s\" could not be loaded: %s", \
+ _xpp_bg_image, error != NULL ? error->message : "No error"); \
+ g_error_free (error); \
+ \
+ /* disable background image */ \
+ _xpp_bg_style = 0; \
+ } \
+ } \
+ \
+ cairo_destroy (cr); \
+ } \
+ else \
+ { \
+ real_alpha = gtk_widget_is_composited (plug) ? _xpp_alpha : 1.00; \
+ \
+ if (_xpp_bg_style == 1 || real_alpha < 1.00) \
+ { \
+ if (G_LIKELY (_xpp_bg_style == 0)) \
+ color = &(gtk_widget_get_style (plug)->bg[GTK_STATE_NORMAL]); \
+ else \
+ color = &_xpp_bg_color; \
+ \
+ cr = gdk_cairo_create (gtk_widget_get_window (plug)); \
+ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); \
+ cairo_set_source_rgba (cr, \
+ color->red / 65535.00, \
+ color->green / 65535.00, \
+ color->blue / 65535.00, \
+ real_alpha); \
+ gdk_cairo_rectangle (cr, &event->area); \
+ cairo_fill (cr); \
+ cairo_destroy (cr); \
+ } \
+ } \
+ \
+ return FALSE; \
+ } \
+ \
+ static void \
+ _xpp_plug_embedded (GtkPlug *plug) \
+ { \
+ g_return_if_fail (GTK_IS_PLUG (plug)); \
+ \
+ if (!gtk_plug_get_embedded (plug)) \
+ _xpp_quit_main_loop (); \
+ }
+
+#define PYXFCE_FOO(preinit_func, check_func) \
+ gint \
+ main (gint argc, gchar **argv) \
+ { \
+ GtkWidget *plug; \
+ GdkScreen *screen; \
+ GtkWidget *xpp; \
+ gint unique_id; \
+ GdkNativeWindow socket_id; \
+ GdkColormap *colormap = NULL; \
+ const gchar *value; \
+ gchar *base_name; \
+ \
+ value = g_getenv ("PANEL_DEBUG"); \
+ if (G_UNLIKELY (value != NULL)) \
+ { \
+ _xpp_debug = TRUE; \
+ \
+ base_name = g_filename_display_basename (argv[0]);\
+ g_printerr ("xfce4-panel(%s): compiled against libxfce4panel %s\n", \
+ base_name, LIBXFCE4PANEL_VERSION); \
+ g_free (base_name); \
+ } \
+ \
+ if (G_UNLIKELY (argc < PLUGIN_ARGV_ARGUMENTS)) \
+ { \
+ g_critical ("Not enough arguments are passed to the plugin"); \
+ return PLUGIN_EXIT_ARGUMENTS_FAILED; \
+ } \
+ \
+ if (G_UNLIKELY (preinit_func != NULL)) \
+ { \
+ if (!((XfcePanelPluginPreInit) preinit_func) (argc, argv)) \
+ return PLUGIN_EXIT_PREINIT_FAILED; \
+ } \
+ \
+ gtk_init (&argc, &argv); \
+ \
+ if (check_func != NULL) \
+ { \
+ screen = gdk_screen_get_default (); \
+ if (!((XfcePanelPluginCheck) check_func) (screen)) \
+ return PLUGIN_EXIT_CHECK_FAILED; \
+ } \
+ \
+ _xpp_atom = gdk_atom_intern_static_string (_PANEL_CLIENT_EVENT_ATOM); \
+ \
+ socket_id = strtol (argv[PLUGIN_ARGV_SOCKET_ID], NULL, 0); \
+ plug = gtk_plug_new (socket_id); \
+ gtk_widget_set_name (GTK_WIDGET (plug), "XfcePanelWindowExternal"); \
+ g_signal_connect (G_OBJECT (plug), "embedded", \
+ G_CALLBACK (_xpp_plug_embedded), NULL); \
+ g_signal_connect (G_OBJECT (plug), "expose-event", \
+ G_CALLBACK (_xpp_expose_event), NULL); \
+ \
+ gtk_widget_set_app_paintable (plug, TRUE); \
+ \
+ screen = gtk_widget_get_screen (plug); \
+ \
+ colormap = gdk_screen_get_rgba_colormap (screen); \
+ if (colormap == NULL) \
+ colormap = gdk_screen_get_rgb_colormap (screen); \
+ if (colormap != NULL) \
+ gtk_widget_set_colormap (plug, colormap); \
+ \
+ unique_id = strtol (argv[PLUGIN_ARGV_UNIQUE_ID], NULL, 0); \
+ xpp = g_object_new (XFCE_TYPE_PANEL_PLUGIN, \
+ "name", argv[PLUGIN_ARGV_NAME], \
+ "unique-id", unique_id, \
+ "display-name", argv[PLUGIN_ARGV_DISPLAY_NAME], \
+ "comment", argv[PLUGIN_ARGV_COMMENT], \
+ "arguments", argv + PLUGIN_ARGV_ARGUMENTS, NULL); \
+ gtk_container_add (GTK_CONTAINER (plug), xpp); \
+ g_signal_connect_after (G_OBJECT (xpp), "realize", \
+ G_CALLBACK (_xpp_realize), plug); \
+ g_signal_connect_after (G_OBJECT (xpp), "destroy", \
+ G_CALLBACK (_xpp_quit_main_loop), NULL); \
+ gtk_widget_show (xpp); \
+ \
+ if (*argv[PLUGIN_ARGV_BACKGROUND_IMAGE] != '\0') \
+ { \
+ _xpp_bg_image = argv[PLUGIN_ARGV_BACKGROUND_IMAGE]; \
+ _xpp_bg_style = 2; \
+ } \
+ \
+ g_signal_connect (G_OBJECT (plug), "client-event", \
+ G_CALLBACK (_xpp_client_event), xpp); \
+ gtk_widget_show (plug); \
+ \
+ gtk_main (); \
+ \
+ if (_xpp_retval != PLUGIN_EXIT_SUCCESS_AND_RESTART) \
+ _xpp_retval = PLUGIN_EXIT_SUCCESS; \
+ \
+ if (_xpp_bg_image_cache != NULL) \
+ cairo_pattern_destroy (_xpp_bg_image_cache); \
+ \
+ if (GTK_IS_WIDGET (plug)) \
+ gtk_widget_destroy (plug); \
+ \
+ return _xpp_retval; \
+ }
+
+#define PYXFCE_PANEL_PLUGIN_REGISTER_EXTERNAL_FULL_CONSTRUCTOR(socket_id, xpp) \
+ GtkWidget *plug; \
+ GdkScreen *screen; \
+ GdkColormap *colormap = NULL; \
+ _xpp_atom = gdk_atom_intern_static_string (_PANEL_CLIENT_EVENT_ATOM); \
+ plug = gtk_plug_new (socket_id); \
+ gtk_widget_set_name (GTK_WIDGET (plug), "XfcePanelWindowExternal"); \
+ g_signal_connect (G_OBJECT (plug), "embedded", \
+ G_CALLBACK (_xpp_plug_embedded), NULL); \
+ g_signal_connect (G_OBJECT (plug), "expose-event", \
+ G_CALLBACK (_xpp_expose_event), NULL); \
+ \
+ gtk_widget_set_app_paintable (plug, TRUE); \
+ \
+ screen = gtk_widget_get_screen (plug); \
+ \
+ colormap = gdk_screen_get_rgba_colormap (screen); \
+ if (colormap == NULL) \
+ colormap = gdk_screen_get_rgb_colormap (screen); \
+ if (colormap != NULL) \
+ gtk_widget_set_colormap (plug, colormap); \
+ gtk_container_add (GTK_CONTAINER (plug), xpp); \
+ g_signal_connect_after (G_OBJECT (xpp), "realize", \
+ G_CALLBACK (_xpp_realize), plug); \
+ g_signal_connect_after (G_OBJECT (xpp), "destroy", \
+ G_CALLBACK (_xpp_quit_main_loop), NULL); \
+ gtk_widget_show (xpp); \
+ \
+ if (0) \
+ { \
+ /*_xpp_bg_image = argv[PLUGIN_ARGV_BACKGROUND_IMAGE];FIXME*/ \
+ /*_xpp_bg_style = 2; FIXME */ \
+ } \
+ \
+ g_signal_connect (G_OBJECT (plug), "client-event", \
+ G_CALLBACK (_xpp_client_event), xpp); \
+ gtk_widget_show (plug);
+
+G_END_DECLS
+
+#endif /* !__LIBXFCE4PANEL_47_H__ */
diff --git a/ui/Makefile.am b/ui/Makefile.am
new file mode 100644
index 0000000..6e64b3d
--- /dev/null
+++ b/ui/Makefile.am
@@ -0,0 +1,74 @@
+ at SET_MAKE@
+
+PLATFORM_VERSION = 4.2
+
+CODEGEN_PATH = @CODEGEN_PATH@
+
+common_ldflags = -module -avoid-version -export-symbols-regex init_ui
+if PLATFORM_WIN32
+common_ldflags += -no-undefined
+endif
+
+INCLUDES = $(PYTHON_INCLUDES)
+
+pyxfceexecdir = $(pyexecdir)/xfce4
+pyxfceexec_LTLIBRARIES = _ui.la
+pyxfceexec_PYTHON = ui.py
+
+_ui_la_CFLAGS = $(XFCE4_UI_CFLAGS) $(PYTHON_CFLAGS) $(PYGTK_CFLAGS)
+_ui_la_LDFLAGS = $(common_ldflags)
+_ui_la_LIBADD = $(XFCE4_UI_LIBS)
+#-export-symbols-regex
+_ui_la_SOURCES = \
+ dialogs.c \
+ gdk_extensions.c \
+ gtk_extensions.c \
+ sm_client.c \
+ titled_dialog.c \
+ uimodule.c
+
+defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs
+defs_DATA = \
+ dialogs.defs \
+ gdk_extensions.defs \
+ gtk_extensions.defs \
+ sm_client.defs \
+ titled_dialog.defs
+
+ui_overrides = \
+ dialogs.override \
+ gdk_extensions.override \
+ gtk_extensions.override \
+ sm_client.override \
+ titled_dialog.override
+
+EXTRA_DIST = $(defs_DATA) $(ui_overrides) gen
+
+nodist__ui_la_SOURCES =
+
+PYGTK_DEFS="`pkg-config --variable=defsdir pygtk-2.0`"
+
+.defs.c:
+ (cd $(srcdir) \
+ && $(PYTHON) $(CODEGEN_PATH)/codegen.py \
+ $(PYGTK_CODEGEN_DEFINES) \
+ --override $*.override \
+ --register $(PYGTK_DEFS)/gtk-types.defs \
+ --register $(PYGTK_DEFS)/gdk-types.defs \
+ --register ../util/desktopentry.defs \
+ --prefix py$* $*.defs) > gen-$*.c \
+ && cp gen-$*.c $*.c \
+ && rm -f gen-$*.c
+
+startup-notification.c: startup-notification.defs
+ (cd $(srcdir) \
+ && $(PYTHON) $(CODEGEN_PATH)/codegen.py \
+ $(PYGTK_CODEGEN_DEFINES) \
+ --override $*.override \
+ --register $(PYGTK_DEFS)/gtk-types.defs \
+ --register $(PYGTK_DEFS)/gdk-types.defs \
+ --register ../util/desktopentry.defs \
+ --prefix pystartup_notification $*.defs) > gen-$*.c \
+ && cp gen-$*.c $*.c \
+ && rm -f gen-$*.c
+
diff --git a/gui/dialogs.override b/ui/dialogs.override
similarity index 97%
rename from gui/dialogs.override
rename to ui/dialogs.override
index 7fc5a96..379eeef 100644
--- a/gui/dialogs.override
+++ b/ui/dialogs.override
@@ -5,7 +5,7 @@
headers
#include "pygobject.h"
#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
%%
include
%%
diff --git a/gui/gdk_extensions.override b/ui/gdk_extensions.override
similarity index 91%
rename from gui/gdk_extensions.override
rename to ui/gdk_extensions.override
index e030ff3..8cdc70b 100644
--- a/gui/gdk_extensions.override
+++ b/ui/gdk_extensions.override
@@ -5,7 +5,7 @@
headers
#include "pygobject.h"
#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
#undef GDK_DISPLAY
#define GDK_DISPLAY(object) (GDK_DISPLAY_OBJECT(object))
diff --git a/ui/gen b/ui/gen
new file mode 100755
index 0000000..ecf0c7e
--- /dev/null
+++ b/ui/gen
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+inc="`pkg-config --variable=includedir libxfce4ui-1`"/xfce4
+if [ "${inc}" = "/xfce4" ]
+then
+ echo "error: could not find include dir.">&2
+ exit 1
+fi
+
+for s in "${inc}"/libxfce4ui-1/libxfce4ui/*.h
+do
+ t="${s##*/}"
+
+ t="${t%.h}"
+
+ if [ "${t#netk-}" = "$t" ]
+ then
+ defs="${t/-/_}.defs"
+ defs="${defs/-/_}"
+ python2 /usr/lib/python2.6/site-packages/gtk-2.0/codegen/h2def.py "$s" >"${defs}"
+ fi
+done
+rm -f util.defs
+
+for s in xfce_*.defs
+do
+ t="${s#xfce_}"
+ mv "$s" "$t"
+done
+
+sed \
+ -e 's;(define-function xfce_confirm;(define-function confirm;' \
+ dialogs.defs > dialogs.defs.new && mv dialogs.defs.new dialogs.defs
+
+#remove
+#(define-enum SMClientPriority
+#...
+#)
+
+in_prio=
+IFS="
+"
+while read line
+do
+ if [ "${line}" = "(define-enum SMClientPriority" ]
+ then
+ in_prio=1
+ elif [ -z "${in_prio}" ]
+ then
+ echo "${line}"
+ elif [ "${line}" = ")" ]
+ then
+ in_prio=
+ fi
+done < sm_client.defs > sm_client.defs.new && mv sm_client.defs.new sm_client.defs
+
+for s in *.defs
+do
+ sed -e 's;(define-function xfce_;(define-function ;' "$s" >"${s}.new" && mv "${s}.new" "$s"
+done
+
diff --git a/gui/gtk_extensions.override b/ui/gtk_extensions.override
similarity index 81%
rename from gui/gtk_extensions.override
rename to ui/gtk_extensions.override
index 58b88ad..0b33e80 100644
--- a/gui/gtk_extensions.override
+++ b/ui/gtk_extensions.override
@@ -5,7 +5,7 @@
headers
#include "pygobject.h"
#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
+#include <libxfce4ui/libxfce4ui.h>
%%
include
@@ -14,6 +14,7 @@ modulename gtkextensions
%%
import gobject.GObject as PyGObject_Type
import gtk.Window as PyGtkWindow_Type
+import gtk.Widget as PyGtkWidget_Type
import gtk.gdk.Screen as PyGdkScreen_Type
%%
ignore
diff --git a/gui/template.override b/ui/sm_client.override
similarity index 67%
rename from gui/template.override
rename to ui/sm_client.override
index 0a4011a..77d85db 100644
--- a/gui/template.override
+++ b/ui/sm_client.override
@@ -5,19 +5,19 @@
headers
#include "pygobject.h"
#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-
+#include <libxfce4ui/libxfce4ui.h>
%%
include
%%
-modulename *
+modulename sm_client
%%
import gobject.GObject as PyGObject_Type
%%
ignore
+ XfceSMClientPriority
+ SMClientPriority
%%
ignore-glob
- *_get_type
%%
ignore-win32
%%
diff --git a/gui/titled_dialog.override b/ui/titled_dialog.override
similarity index 97%
rename from gui/titled_dialog.override
rename to ui/titled_dialog.override
index 3b006af..5fcf5b0 100644
--- a/gui/titled_dialog.override
+++ b/ui/titled_dialog.override
@@ -5,8 +5,7 @@
headers
#include "pygobject.h"
#include <gtk/gtk.h>
-#include <libxfcegui4/libxfcegui4.h>
-#include <libxfcegui4/gui-enum-types.h>
+#include <libxfce4ui/libxfce4ui.h>
%%
include
diff --git a/netk/netk.py b/ui/ui.py
similarity index 53%
rename from netk/netk.py
rename to ui/ui.py
index bfefdba..c2facbe 100644
--- a/netk/netk.py
+++ b/ui/ui.py
@@ -1,3 +1,4 @@
#!/usr/bin/env python
-from _netk import *
+from _ui import *
+
diff --git a/ui/uimodule.c b/ui/uimodule.c
new file mode 100644
index 0000000..dd031a4
--- /dev/null
+++ b/ui/uimodule.c
@@ -0,0 +1,87 @@
+/* -*- Mode: C; c-basic-offset: 4 -*-
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <locale.h>
+
+/* include this first, before NO_IMPORT_PYGOBJECT is defined */
+#include <pygobject.h>
+#include <pyerrors.h>
+
+#include <libxfce4ui/libxfce4ui.h>
+
+extern PyMethodDef pydialogs_functions[];
+extern PyMethodDef pygdk_extensions_functions[];
+extern PyMethodDef pygtk_extensions_functions[];
+extern PyMethodDef pysm_client_functions[];
+extern PyMethodDef pytitled_dialog_functions[];
+
+void pydialogs_register_classes(PyObject *d);
+void pygdk_extensions_register_classes(PyObject *d);
+void pygtk_extensions_register_classes(PyObject *d);
+void pysm_client_register_classes(PyObject *d);
+void pytitled_dialog_register_classes(PyObject *d);
+
+void pysm_client_add_constants(PyObject *module, const gchar *strip_prefix);
+
+
+static PyMethodDef all_functions[1000];
+
+static PyMethodDef* each_functions[] = {
+ pydialogs_functions,
+ pygdk_extensions_functions,
+ pygtk_extensions_functions,
+ pysm_client_functions,
+ pytitled_dialog_functions,
+};
+
+static void
+my_register1()
+{
+ PyObject *m, *d;
+ int i;
+ int j;
+ int cnt;
+
+ cnt = 0;
+
+ for(i = 0; i < sizeof(each_functions) / sizeof(each_functions[0]); i++) {
+ for(j = 0; each_functions[i][j].ml_name != NULL; j++) {
+ if (cnt >= sizeof(all_functions) / sizeof(all_functions[0])) {
+ fprintf (stderr, "pyxfce: Internal Error: too many functions");
+ exit (1);
+ }
+
+ all_functions[cnt++] = each_functions[i][j];
+ }
+ }
+
+ m = Py_InitModule("_ui", all_functions);
+
+ pysm_client_add_constants(m, "XFCE_");
+
+ /*PyModule_AddStringConstant(m, "STARTUP_NOTIFICATION_ID_KEY", XFCE_STARTUP_NOTIFICATION_ENVIRONMENT_DESKTOP_STARTUP_ID);*/
+
+ d = PyModule_GetDict(m);
+ pydialogs_register_classes (d);
+ pygdk_extensions_register_classes (d);
+ pygtk_extensions_register_classes (d);
+ pysm_client_register_classes (d);
+ pytitled_dialog_register_classes (d);
+}
+
+DL_EXPORT(void)
+init_ui(void)
+{
+ /* set the default python encoding to utf-8 */
+ PyUnicode_SetDefaultEncoding("utf-8");
+
+ init_pygobject ();
+
+ my_register1 ();
+}
+
+
diff --git a/xfconf/binding.c b/xfconf/binding.c
new file mode 100644
index 0000000..144c89c
--- /dev/null
+++ b/xfconf/binding.c
@@ -0,0 +1,70 @@
+/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
+
+#include <Python.h>
+
+
+
+#line 6 "binding.override"
+#include "pygobject.h"
+#include <glib.h>
+#include <xfconf/xfconf.h>
+
+#line 13 "binding.c"
+
+
+/* ---------- types from other modules ---------- */
+static PyTypeObject *_PyGObject_Type;
+#define PyGObject_Type (*_PyGObject_Type)
+
+
+/* ---------- forward type declarations ---------- */
+
+#line 23 "binding.c"
+
+
+
+/* ----------- functions ----------- */
+
+static PyObject *
+_wrap_xfconf_g_property_unbind(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+ static char *kwlist[] = { "id", NULL };
+ unsigned long id;
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwargs,"k:g_property_unbind", kwlist, &id))
+ return NULL;
+
+ xfconf_g_property_unbind(id);
+
+ Py_INCREF(Py_None);
+ return Py_None;
+}
+
+const PyMethodDef pybinding_functions[] = {
+ { "g_property_unbind", (PyCFunction)_wrap_xfconf_g_property_unbind, METH_VARARGS|METH_KEYWORDS,
+ NULL },
+ { NULL, NULL, 0, NULL }
+};
+
+/* initialise stuff extension classes */
+void
+pybinding_register_classes(PyObject *d)
+{
+ PyObject *module;
+
+ if ((module = PyImport_ImportModule("gobject")) != NULL) {
+ _PyGObject_Type = (PyTypeObject *)PyObject_GetAttrString(module, "GObject");
+ if (_PyGObject_Type == NULL) {
+ PyErr_SetString(PyExc_ImportError,
+ "cannot import name GObject from gobject");
+ return ;
+ }
+ } else {
+ PyErr_SetString(PyExc_ImportError,
+ "could not import gobject");
+ return ;
+ }
+
+
+#line 70 "binding.c"
+}
diff --git a/xfconf/binding.defs b/xfconf/binding.defs
new file mode 100644
index 0000000..fa0880f
--- /dev/null
+++ b/xfconf/binding.defs
@@ -0,0 +1,58 @@
+;; -*- scheme -*-
+; object definitions ...
+;; Enumerations and flags ...
+
+
+;; From xfconf-binding.h
+
+(define-function g_property_bind
+ (c-name "xfconf_g_property_bind")
+ (return-type "gulong")
+ (parameters
+ '("XfconfChannel*" "channel")
+ '("const-gchar*" "xfconf_property")
+ '("GType" "xfconf_property_type")
+ '("gpointer" "object")
+ '("const-gchar*" "object_property")
+ )
+)
+
+(define-function g_property_bind_gdkcolor
+ (c-name "xfconf_g_property_bind_gdkcolor")
+ (return-type "gulong")
+ (parameters
+ '("XfconfChannel*" "channel")
+ '("const-gchar*" "xfconf_property")
+ '("gpointer" "object")
+ '("const-gchar*" "object_property")
+ )
+)
+
+(define-function g_property_unbind
+ (c-name "xfconf_g_property_unbind")
+ (return-type "none")
+ (parameters
+ '("gulong" "id")
+ )
+)
+
+(define-function g_property_unbind_by_property
+ (c-name "xfconf_g_property_unbind_by_property")
+ (return-type "none")
+ (parameters
+ '("XfconfChannel*" "channel")
+ '("const-gchar*" "xfconf_property")
+ '("gpointer" "object")
+ '("const-gchar*" "object_property")
+ )
+)
+
+(define-function g_property_unbind_all
+ (c-name "xfconf_g_property_unbind_all")
+ (return-type "none")
+ (parameters
+ '("gpointer" "channel_or_object")
+ )
+)
+
+
More information about the Xfce4-commits
mailing list