[Xfce4-commits] <pyxfce:master> remove generated files.

Danny Milosavljevic noreply at xfce.org
Sun Jan 2 21:36:01 CET 2011


Updating branch refs/heads/master
         to 744591da2d5aa1d4f44304f744436aea3e2f521a (commit)
       from 8e609a1ac637654e4ec4377f8efb824a5fe0c095 (commit)

commit 744591da2d5aa1d4f44304f744436aea3e2f521a
Author: Danny Milosavljevic <dannym at xfce.org>
Date:   Sun Jan 2 21:31:55 2011 +0100

    remove generated files.

 ui/libxfce4ui.defs => menu/libxfce4menu.defs       |    2 +-
 .../libxfce4menu_config.defs                       |    6 +-
 menu/libxfce4menu_enum_types.defs                  |   23 +
 menu/menu.defs                                     |  191 +++++++
 menu/menu_and_rules.defs                           |   19 +
 menu/menu_directory.defs                           |  100 ++++
 menu/menu_element.defs                             |   31 ++
 menu/menu_environment.defs                         |   21 +
 menu/menu_item.defs                                |  268 ++++++++++
 menu/menu_item_cache.defs                          |   44 ++
 menu/menu_item_pool.defs                           |   62 +++
 menu/menu_layout.defs                              |  124 +++++
 menu/menu_monitor.defs                             |  104 ++++
 menu/menu_move.defs                                |   49 ++
 menu/menu_not_rules.defs                           |   19 +
 menu/menu_or_rules.defs                            |   19 +
 menu/menu_rules.defs                               |   61 +++
 menu/menu_separator.defs                           |   18 +
 menu/menu_standard_rules.defs                      |   35 ++
 panel/arrow_button.c                               |  217 --------
 panel/convenience.c                                |  121 -----
 panel/enums.c                                      |   84 ---
 panel/hvbox.c                                      |  175 -------
 panel/plugin.c                                     |  542 --------------------
 panel/plugin_provider.c                            |   93 ----
 util/desktopentry.c                                |  281 ----------
 util/fileutils.c                                   |   74 ---
 util/i18n.c                                        |  182 -------
 util/kiosk.c                                       |   55 --
 util/miscutils.c                                   |   94 ----
 util/rc.c                                          |   55 --
 util/resource.c                                    |  152 ------
 util/utf8.c                                        |   97 ----
 xfconf/binding.c                                   |   70 ---
 xfconf/channel.c                                   |  501 ------------------
 xfconf/errors.c                                    |   68 ---
 xfconf/types.c                                     |   53 --
 37 files changed, 1192 insertions(+), 2918 deletions(-)

diff --git a/ui/libxfce4ui.defs b/menu/libxfce4menu.defs
similarity index 77%
copy from ui/libxfce4ui.defs
copy to menu/libxfce4menu.defs
index c6e20d4..346b83d 100644
--- a/ui/libxfce4ui.defs
+++ b/menu/libxfce4menu.defs
@@ -3,6 +3,6 @@
 ;; Enumerations and flags ...
 
 
-;; From libxfce4ui.h
+;; From libxfce4menu.h
 
 
diff --git a/ui/libxfce4ui_config.defs b/menu/libxfce4menu_config.defs
similarity index 66%
copy from ui/libxfce4ui_config.defs
copy to menu/libxfce4menu_config.defs
index 05920f5..38a2343 100644
--- a/ui/libxfce4ui_config.defs
+++ b/menu/libxfce4menu_config.defs
@@ -3,10 +3,10 @@
 ;; Enumerations and flags ...
 
 
-;; From libxfce4ui-config.h
+;; From libxfce4menu-config.h
 
-(define-function libxfce4ui_check_version
-  (c-name "libxfce4ui_check_version")
+(define-function libxfce4menu_check_version
+  (c-name "libxfce4menu_check_version")
   (return-type "const-gchar*")
   (parameters
     '("guint" "required_major")
diff --git a/menu/libxfce4menu_enum_types.defs b/menu/libxfce4menu_enum_types.defs
new file mode 100644
index 0000000..5532349
--- /dev/null
+++ b/menu/libxfce4menu_enum_types.defs
@@ -0,0 +1,23 @@
+;; -*- scheme -*-
+; object definitions ...
+;; Enumerations and flags ...
+
+
+;; From libxfce4menu-enum-types.h
+
+(define-function xfce_menu_layout_merge_type_get_type
+  (c-name "xfce_menu_layout_merge_type_get_type")
+  (return-type "GType")
+)
+
+(define-function xfce_menu_layout_node_type_get_type
+  (c-name "xfce_menu_layout_node_type_get_type")
+  (return-type "GType")
+)
+
+(define-function xfce_menu_monitor_flags_get_type
+  (c-name "xfce_menu_monitor_flags_get_type")
+  (return-type "GType")
+)
+
+
diff --git a/menu/menu.defs b/menu/menu.defs
new file mode 100644
index 0000000..0677862
--- /dev/null
+++ b/menu/menu.defs
@@ -0,0 +1,191 @@
+;; -*- scheme -*-
+; object definitions ...
+;; Enumerations and flags ...
+
+
+;; From xfce-menu.h
+
+(define-function xfce_menu_init
+  (c-name "xfce_menu_init")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "env")
+  )
+)
+
+(define-function xfce_menu_shutdown
+  (c-name "xfce_menu_shutdown")
+  (return-type "none")
+)
+
+(define-function xfce_menu_get_type
+  (c-name "xfce_menu_get_type")
+  (return-type "GType")
+)
+
+(define-function xfce_menu_get_root
+  (c-name "xfce_menu_get_root")
+  (return-type "XfceMenu*")
+  (parameters
+    '("GError**" "error")
+  )
+)
+
+(define-function xfce_menu_new
+  (c-name "xfce_menu_new")
+  (is-constructor-of "XfceMenu")
+  (return-type "XfceMenu*")
+  (parameters
+    '("const-gchar*" "filename")
+    '("GError**" "error")
+  )
+)
+
+(define-method get_filename
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_get_filename")
+  (return-type "const-gchar*")
+)
+
+(define-method set_filename
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_set_filename")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "filename")
+  )
+)
+
+(define-method get_name
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_get_name")
+  (return-type "const-gchar*")
+)
+
+(define-method set_name
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_set_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+  )
+)
+
+(define-method get_directory
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_get_directory")
+  (return-type "XfceMenuDirectory*")
+)
+
+(define-method set_directory
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_set_directory")
+  (return-type "none")
+  (parameters
+    '("XfceMenuDirectory*" "directory")
+  )
+)
+
+(define-method get_directory_dirs
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_get_directory_dirs")
+  (return-type "GSList*")
+)
+
+(define-method get_legacy_dirs
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_get_legacy_dirs")
+  (return-type "GSList*")
+)
+
+(define-method get_app_dirs
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_get_app_dirs")
+  (return-type "GSList*")
+)
+
+(define-method get_only_unallocated
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_get_only_unallocated")
+  (return-type "gboolean")
+)
+
+(define-method set_only_unallocated
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_set_only_unallocated")
+  (return-type "none")
+  (parameters
+    '("gboolean" "only_unallocated")
+  )
+)
+
+(define-method get_deleted
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_get_deleted")
+  (return-type "gboolean")
+)
+
+(define-method set_deleted
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_set_deleted")
+  (return-type "none")
+  (parameters
+    '("gboolean" "deleted")
+  )
+)
+
+(define-method get_menus
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_get_menus")
+  (return-type "GSList*")
+)
+
+(define-method add_menu
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_add_menu")
+  (return-type "none")
+  (parameters
+    '("XfceMenu*" "submenu")
+  )
+)
+
+(define-method get_menu_with_name
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_get_menu_with_name")
+  (return-type "XfceMenu*")
+  (parameters
+    '("const-gchar*" "name")
+  )
+)
+
+(define-method get_parent
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_get_parent")
+  (return-type "XfceMenu*")
+)
+
+(define-method get_item_pool
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_get_item_pool")
+  (return-type "XfceMenuItemPool*")
+)
+
+(define-method get_items
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_get_items")
+  (return-type "GSList*")
+)
+
+(define-method has_layout
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_has_layout")
+  (return-type "gboolean")
+)
+
+(define-method get_layout_elements
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_get_layout_elements")
+  (return-type "GSList*")
+)
+
+
diff --git a/menu/menu_and_rules.defs b/menu/menu_and_rules.defs
new file mode 100644
index 0000000..cf67280
--- /dev/null
+++ b/menu/menu_and_rules.defs
@@ -0,0 +1,19 @@
+;; -*- scheme -*-
+; object definitions ...
+;; Enumerations and flags ...
+
+
+;; From xfce-menu-and-rules.h
+
+(define-function xfce_menu_and_rules_get_type
+  (c-name "xfce_menu_and_rules_get_type")
+  (return-type "GType")
+)
+
+(define-function xfce_menu_and_rules_new
+  (c-name "xfce_menu_and_rules_new")
+  (is-constructor-of "XfceMenuAndRules")
+  (return-type "XfceMenuAndRules*")
+)
+
+
diff --git a/menu/menu_directory.defs b/menu/menu_directory.defs
new file mode 100644
index 0000000..e7982c3
--- /dev/null
+++ b/menu/menu_directory.defs
@@ -0,0 +1,100 @@
+;; -*- scheme -*-
+; object definitions ...
+;; Enumerations and flags ...
+
+
+;; From xfce-menu-directory.h
+
+(define-function xfce_menu_directory_get_type
+  (c-name "xfce_menu_directory_get_type")
+  (return-type "GType")
+)
+
+(define-method get_filename
+  (of-object "XfceMenuDirectory")
+  (c-name "xfce_menu_directory_get_filename")
+  (return-type "const-gchar*")
+)
+
+(define-method set_filename
+  (of-object "XfceMenuDirectory")
+  (c-name "xfce_menu_directory_set_filename")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+  )
+)
+
+(define-method get_name
+  (of-object "XfceMenuDirectory")
+  (c-name "xfce_menu_directory_get_name")
+  (return-type "const-gchar*")
+)
+
+(define-method set_name
+  (of-object "XfceMenuDirectory")
+  (c-name "xfce_menu_directory_set_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+  )
+)
+
+(define-method get_comment
+  (of-object "XfceMenuDirectory")
+  (c-name "xfce_menu_directory_get_comment")
+  (return-type "const-gchar*")
+)
+
+(define-method set_comment
+  (of-object "XfceMenuDirectory")
+  (c-name "xfce_menu_directory_set_comment")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "comment")
+  )
+)
+
+(define-method get_icon
+  (of-object "XfceMenuDirectory")
+  (c-name "xfce_menu_directory_get_icon")
+  (return-type "const-gchar*")
+)
+
+(define-method set_icon
+  (of-object "XfceMenuDirectory")
+  (c-name "xfce_menu_directory_set_icon")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "icon")
+  )
+)
+
+(define-method get_no_display
+  (of-object "XfceMenuDirectory")
+  (c-name "xfce_menu_directory_get_no_display")
+  (return-type "gboolean")
+)
+
+(define-method set_no_display
+  (of-object "XfceMenuDirectory")
+  (c-name "xfce_menu_directory_set_no_display")
+  (return-type "none")
+  (parameters
+    '("gboolean" "no_display")
+  )
+)
+
+(define-method get_hidden
+  (of-object "XfceMenuDirectory")
+  (c-name "xfce_menu_directory_get_hidden")
+  (return-type "gboolean")
+)
+
+(define-method show_in_environment
+  (of-object "XfceMenuDirectory")
+  (c-name "xfce_menu_directory_show_in_environment")
+  (return-type "gboolean")
+)
+
+
diff --git a/menu/menu_element.defs b/menu/menu_element.defs
new file mode 100644
index 0000000..cda6c47
--- /dev/null
+++ b/menu/menu_element.defs
@@ -0,0 +1,31 @@
+;; -*- scheme -*-
+; object definitions ...
+(define-object MenuElement
+  (in-module "Xfce")
+  (c-name "XfceMenuElement")
+  (gtype-id "XFCE_TYPE_MENU_ELEMENT")
+)
+
+;; Enumerations and flags ...
+
+
+;; From xfce-menu-element.h
+
+(define-function xfce_menu_element_get_type
+  (c-name "xfce_menu_element_get_type")
+  (return-type "GType")
+)
+
+(define-method get_name
+  (of-object "XfceMenuElement")
+  (c-name "xfce_menu_element_get_name")
+  (return-type "const-gchar*")
+)
+
+(define-method get_icon_name
+  (of-object "XfceMenuElement")
+  (c-name "xfce_menu_element_get_icon_name")
+  (return-type "const-gchar*")
+)
+
+
diff --git a/menu/menu_environment.defs b/menu/menu_environment.defs
new file mode 100644
index 0000000..12ec27e
--- /dev/null
+++ b/menu/menu_environment.defs
@@ -0,0 +1,21 @@
+;; -*- scheme -*-
+; object definitions ...
+;; Enumerations and flags ...
+
+
+;; From xfce-menu-environment.h
+
+(define-function xfce_menu_set_environment
+  (c-name "xfce_menu_set_environment")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "env")
+  )
+)
+
+(define-function xfce_menu_get_environment
+  (c-name "xfce_menu_get_environment")
+  (return-type "const-gchar*")
+)
+
+
diff --git a/menu/menu_item.defs b/menu/menu_item.defs
new file mode 100644
index 0000000..f386d16
--- /dev/null
+++ b/menu/menu_item.defs
@@ -0,0 +1,268 @@
+;; -*- scheme -*-
+; object definitions ...
+;; Enumerations and flags ...
+
+
+;; From xfce-menu-item.h
+
+(define-function xfce_menu_item_get_type
+  (c-name "xfce_menu_item_get_type")
+  (return-type "GType")
+)
+
+(define-function xfce_menu_item_new
+  (c-name "xfce_menu_item_new")
+  (is-constructor-of "XfceMenuItem")
+  (return-type "XfceMenuItem*")
+  (parameters
+    '("const-gchar*" "filename")
+  )
+)
+
+(define-method get_desktop_id
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_get_desktop_id")
+  (return-type "const-gchar*")
+)
+
+(define-method set_desktop_id
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_set_desktop_id")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "desktop_id")
+  )
+)
+
+(define-method get_filename
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_get_filename")
+  (return-type "const-gchar*")
+)
+
+(define-method set_filename
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_set_filename")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "filename")
+  )
+)
+
+(define-method get_command
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_get_command")
+  (return-type "const-gchar*")
+)
+
+(define-method set_command
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_set_command")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "command")
+  )
+)
+
+(define-method get_try_exec
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_get_try_exec")
+  (return-type "const-gchar*")
+)
+
+(define-method set_try_exec
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_set_try_exec")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "try_exec")
+  )
+)
+
+(define-method get_name
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_get_name")
+  (return-type "const-gchar*")
+)
+
+(define-method set_name
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_set_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "name")
+  )
+)
+
+(define-method get_generic_name
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_get_generic_name")
+  (return-type "const-gchar*")
+)
+
+(define-method set_generic_name
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_set_generic_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "generic_name")
+  )
+)
+
+(define-method get_comment
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_get_comment")
+  (return-type "const-gchar*")
+)
+
+(define-method set_comment
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_set_comment")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "comment")
+  )
+)
+
+(define-method get_icon_name
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_get_icon_name")
+  (return-type "const-gchar*")
+)
+
+(define-method set_icon_name
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_set_icon_name")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "icon_name")
+  )
+)
+
+(define-method get_path
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_get_path")
+  (return-type "const-gchar*")
+)
+
+(define-method set_path
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_set_path")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "path")
+  )
+)
+
+(define-method requires_terminal
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_requires_terminal")
+  (return-type "gboolean")
+)
+
+(define-method set_requires_terminal
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_set_requires_terminal")
+  (return-type "none")
+  (parameters
+    '("gboolean" "requires_terminal")
+  )
+)
+
+(define-method get_no_display
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_get_no_display")
+  (return-type "gboolean")
+)
+
+(define-method set_no_display
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_set_no_display")
+  (return-type "none")
+  (parameters
+    '("gboolean" "no_display")
+  )
+)
+
+(define-method supports_startup_notification
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_supports_startup_notification")
+  (return-type "gboolean")
+)
+
+(define-method set_supports_startup_notification
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_set_supports_startup_notification")
+  (return-type "none")
+  (parameters
+    '("gboolean" "supports_startup_notification")
+  )
+)
+
+(define-method get_categories
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_get_categories")
+  (return-type "GList*")
+)
+
+(define-method set_categories
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_set_categories")
+  (return-type "none")
+  (parameters
+    '("GList*" "categories")
+  )
+)
+
+(define-method has_category
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_has_category")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "category")
+  )
+)
+
+(define-method show_in_environment
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_show_in_environment")
+  (return-type "gboolean")
+)
+
+(define-method only_show_in_environment
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_only_show_in_environment")
+  (return-type "gboolean")
+)
+
+(define-method ref
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_ref")
+  (return-type "none")
+)
+
+(define-method unref
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_unref")
+  (return-type "none")
+)
+
+(define-method get_allocated
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_get_allocated")
+  (return-type "gint")
+)
+
+(define-method increment_allocated
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_increment_allocated")
+  (return-type "none")
+)
+
+(define-method decrement_allocated
+  (of-object "XfceMenuItem")
+  (c-name "xfce_menu_item_decrement_allocated")
+  (return-type "none")
+)
+
+
diff --git a/menu/menu_item_cache.defs b/menu/menu_item_cache.defs
new file mode 100644
index 0000000..b82954f
--- /dev/null
+++ b/menu/menu_item_cache.defs
@@ -0,0 +1,44 @@
+;; -*- scheme -*-
+; object definitions ...
+;; Enumerations and flags ...
+
+
+;; From xfce-menu-item-cache.h
+
+(define-function xfce_menu_item_cache_get_type
+  (c-name "xfce_menu_item_cache_get_type")
+  (return-type "GType")
+)
+
+(define-function xfce_menu_item_cache_get_default
+  (c-name "xfce_menu_item_cache_get_default")
+  (return-type "XfceMenuItemCache*")
+)
+
+(define-method lookup
+  (of-object "XfceMenuItemCache")
+  (c-name "xfce_menu_item_cache_lookup")
+  (return-type "XfceMenuItem*")
+  (parameters
+    '("const-gchar*" "filename")
+    '("const-gchar*" "desktop_id")
+  )
+)
+
+(define-method foreach
+  (of-object "XfceMenuItemCache")
+  (c-name "xfce_menu_item_cache_foreach")
+  (return-type "none")
+  (parameters
+    '("GHFunc" "func")
+    '("gpointer" "user_data")
+  )
+)
+
+(define-method invalidate
+  (of-object "XfceMenuItemCache")
+  (c-name "xfce_menu_item_cache_invalidate")
+  (return-type "none")
+)
+
+
diff --git a/menu/menu_item_pool.defs b/menu/menu_item_pool.defs
new file mode 100644
index 0000000..d1a3264
--- /dev/null
+++ b/menu/menu_item_pool.defs
@@ -0,0 +1,62 @@
+;; -*- scheme -*-
+; object definitions ...
+;; Enumerations and flags ...
+
+
+;; From xfce-menu-item-pool.h
+
+(define-function xfce_menu_item_pool_get_type
+  (c-name "xfce_menu_item_pool_get_type")
+  (return-type "GType")
+)
+
+(define-function xfce_menu_item_pool_new
+  (c-name "xfce_menu_item_pool_new")
+  (is-constructor-of "XfceMenuItemPool")
+  (return-type "XfceMenuItemPool*")
+)
+
+(define-method insert
+  (of-object "XfceMenuItemPool")
+  (c-name "xfce_menu_item_pool_insert")
+  (return-type "none")
+  (parameters
+    '("XfceMenuItem*" "item")
+  )
+)
+
+(define-method lookup
+  (of-object "XfceMenuItemPool")
+  (c-name "xfce_menu_item_pool_lookup")
+  (return-type "XfceMenuItem*")
+  (parameters
+    '("const-gchar*" "desktop_id")
+  )
+)
+
+(define-method foreach
+  (of-object "XfceMenuItemPool")
+  (c-name "xfce_menu_item_pool_foreach")
+  (return-type "none")
+  (parameters
+    '("GHFunc" "func")
+    '("gpointer" "user_data")
+  )
+)
+
+(define-method apply_exclude_rule
+  (of-object "XfceMenuItemPool")
+  (c-name "xfce_menu_item_pool_apply_exclude_rule")
+  (return-type "none")
+  (parameters
+    '("XfceMenuStandardRules*" "rule")
+  )
+)
+
+(define-method get_empty
+  (of-object "XfceMenuItemPool")
+  (c-name "xfce_menu_item_pool_get_empty")
+  (return-type "gboolean")
+)
+
+
diff --git a/menu/menu_layout.defs b/menu/menu_layout.defs
new file mode 100644
index 0000000..1b6e29c
--- /dev/null
+++ b/menu/menu_layout.defs
@@ -0,0 +1,124 @@
+;; -*- scheme -*-
+; object definitions ...
+;; Enumerations and flags ...
+
+(define-enum MenuLayoutMergeType
+  (in-module "Xfce")
+  (c-name "XfceMenuLayoutMergeType")
+  (gtype-id "XFCE_TYPE_MENU_LAYOUT_MERGE_TYPE")
+  (values
+    '("menus" "XFCE_MENU_LAYOUT_MERGE_MENUS")
+    '("files" "XFCE_MENU_LAYOUT_MERGE_FILES")
+    '("all" "XFCE_MENU_LAYOUT_MERGE_ALL")
+  )
+)
+
+(define-enum MenuLayoutNodeType
+  (in-module "Xfce")
+  (c-name "XfceMenuLayoutNodeType")
+  (gtype-id "XFCE_TYPE_MENU_LAYOUT_NODE_TYPE")
+  (values
+    '("invalid" "XFCE_MENU_LAYOUT_NODE_INVALID")
+    '("filename" "XFCE_MENU_LAYOUT_NODE_FILENAME")
+    '("menuname" "XFCE_MENU_LAYOUT_NODE_MENUNAME")
+    '("separator" "XFCE_MENU_LAYOUT_NODE_SEPARATOR")
+    '("merge" "XFCE_MENU_LAYOUT_NODE_MERGE")
+  )
+)
+
+
+;; From xfce-menu-layout.h
+
+(define-function xfce_menu_layout_get_type
+  (c-name "xfce_menu_layout_get_type")
+  (return-type "GType")
+)
+
+(define-function xfce_menu_layout_new
+  (c-name "xfce_menu_layout_new")
+  (is-constructor-of "XfceMenuLayout")
+  (return-type "XfceMenuLayout*")
+)
+
+(define-method add_filename
+  (of-object "XfceMenuLayout")
+  (c-name "xfce_menu_layout_add_filename")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "filename")
+  )
+)
+
+(define-method add_menuname
+  (of-object "XfceMenuLayout")
+  (c-name "xfce_menu_layout_add_menuname")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "menuname")
+  )
+)
+
+(define-method add_separator
+  (of-object "XfceMenuLayout")
+  (c-name "xfce_menu_layout_add_separator")
+  (return-type "none")
+)
+
+(define-method add_merge
+  (of-object "XfceMenuLayout")
+  (c-name "xfce_menu_layout_add_merge")
+  (return-type "none")
+  (parameters
+    '("XfceMenuLayoutMergeType" "type")
+  )
+)
+
+(define-method get_nodes
+  (of-object "XfceMenuLayout")
+  (c-name "xfce_menu_layout_get_nodes")
+  (return-type "GSList*")
+)
+
+(define-method get_filename_used
+  (of-object "XfceMenuLayout")
+  (c-name "xfce_menu_layout_get_filename_used")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "filename")
+  )
+)
+
+(define-method get_menuname_used
+  (of-object "XfceMenuLayout")
+  (c-name "xfce_menu_layout_get_menuname_used")
+  (return-type "gboolean")
+  (parameters
+    '("const-gchar*" "menuname")
+  )
+)
+
+(define-method get_type
+  (of-object "XfceMenuLayoutNode")
+  (c-name "xfce_menu_layout_node_get_type")
+  (return-type "XfceMenuLayoutNodeType")
+)
+
+(define-method get_filename
+  (of-object "XfceMenuLayoutNode")
+  (c-name "xfce_menu_layout_node_get_filename")
+  (return-type "const-gchar*")
+)
+
+(define-method get_menuname
+  (of-object "XfceMenuLayoutNode")
+  (c-name "xfce_menu_layout_node_get_menuname")
+  (return-type "const-gchar*")
+)
+
+(define-method get_merge_type
+  (of-object "XfceMenuLayoutNode")
+  (c-name "xfce_menu_layout_node_get_merge_type")
+  (return-type "XfceMenuLayoutMergeType")
+)
+
+
diff --git a/menu/menu_monitor.defs b/menu/menu_monitor.defs
new file mode 100644
index 0000000..1f1dcc4
--- /dev/null
+++ b/menu/menu_monitor.defs
@@ -0,0 +1,104 @@
+;; -*- scheme -*-
+; object definitions ...
+;; Enumerations and flags ...
+
+(define-flags MenuMonitorFlags
+  (in-module "Xfce")
+  (c-name "XfceMenuMonitorFlags")
+  (gtype-id "XFCE_TYPE_MENU_MONITOR_FLAGS")
+  (values
+    '("directories" "XFCE_MENU_MONITOR_DIRECTORIES")
+    '("menu-files" "XFCE_MENU_MONITOR_MENU_FILES")
+    '("directory-files" "XFCE_MENU_MONITOR_DIRECTORY_FILES")
+    '("desktop-files" "XFCE_MENU_MONITOR_DESKTOP_FILES")
+  )
+)
+
+
+;; From xfce-menu-monitor.h
+
+(define-function xfce_menu_monitor_set_vtable
+  (c-name "xfce_menu_monitor_set_vtable")
+  (return-type "none")
+  (parameters
+    '("XfceMenuMonitorVTable*" "vtable")
+    '("gpointer" "user_data")
+  )
+)
+
+(define-method monitor_add_item
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_monitor_add_item")
+  (return-type "gpointer")
+  (parameters
+    '("XfceMenuItem*" "item")
+  )
+)
+
+(define-method monitor_remove_item
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_monitor_remove_item")
+  (return-type "none")
+  (parameters
+    '("XfceMenuItem*" "item")
+  )
+)
+
+(define-method monitor_add_directory
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_monitor_add_directory")
+  (return-type "gpointer")
+  (parameters
+    '("const-gchar*" "directory")
+  )
+)
+
+(define-method monitor_remove_directory
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_monitor_remove_directory")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "directory")
+  )
+)
+
+(define-method monitor_add_file
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_monitor_add_file")
+  (return-type "gpointer")
+  (parameters
+    '("const-gchar*" "filename")
+  )
+)
+
+(define-method monitor_remove_file
+  (of-object "XfceMenu")
+  (c-name "xfce_menu_monitor_remove_file")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "filename")
+  )
+)
+
+(define-function xfce_menu_monitor_set_flags
+  (c-name "xfce_menu_monitor_set_flags")
+  (return-type "none")
+  (parameters
+    '("XfceMenuMonitorFlags" "flags")
+  )
+)
+
+(define-function xfce_menu_monitor_get_flags
+  (c-name "xfce_menu_monitor_get_flags")
+  (return-type "XfceMenuMonitorFlags")
+)
+
+(define-function xfce_menu_monitor_has_flags
+  (c-name "xfce_menu_monitor_has_flags")
+  (return-type "gboolean")
+  (parameters
+    '("XfceMenuMonitorFlags" "flags")
+  )
+)
+
+
diff --git a/menu/menu_move.defs b/menu/menu_move.defs
new file mode 100644
index 0000000..0154646
--- /dev/null
+++ b/menu/menu_move.defs
@@ -0,0 +1,49 @@
+;; -*- scheme -*-
+; object definitions ...
+;; Enumerations and flags ...
+
+
+;; From xfce-menu-move.h
+
+(define-function xfce_menu_move_get_type
+  (c-name "xfce_menu_move_get_type")
+  (return-type "GType")
+)
+
+(define-function xfce_menu_move_new
+  (c-name "xfce_menu_move_new")
+  (is-constructor-of "XfceMenuMove")
+  (return-type "XfceMenuMove*")
+)
+
+(define-method get_old
+  (of-object "XfceMenuMove")
+  (c-name "xfce_menu_move_get_old")
+  (return-type "const-gchar*")
+)
+
+(define-method set_old
+  (of-object "XfceMenuMove")
+  (c-name "xfce_menu_move_set_old")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "old")
+  )
+)
+
+(define-method get_new
+  (of-object "XfceMenuMove")
+  (c-name "xfce_menu_move_get_new")
+  (return-type "const-gchar*")
+)
+
+(define-method set_new
+  (of-object "XfceMenuMove")
+  (c-name "xfce_menu_move_set_new")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "new")
+  )
+)
+
+
diff --git a/menu/menu_not_rules.defs b/menu/menu_not_rules.defs
new file mode 100644
index 0000000..1675489
--- /dev/null
+++ b/menu/menu_not_rules.defs
@@ -0,0 +1,19 @@
+;; -*- scheme -*-
+; object definitions ...
+;; Enumerations and flags ...
+
+
+;; From xfce-menu-not-rules.h
+
+(define-function xfce_menu_not_rules_get_type
+  (c-name "xfce_menu_not_rules_get_type")
+  (return-type "GType")
+)
+
+(define-function xfce_menu_not_rules_new
+  (c-name "xfce_menu_not_rules_new")
+  (is-constructor-of "XfceMenuNotRules")
+  (return-type "XfceMenuNotRules*")
+)
+
+
diff --git a/menu/menu_or_rules.defs b/menu/menu_or_rules.defs
new file mode 100644
index 0000000..1a0cfa3
--- /dev/null
+++ b/menu/menu_or_rules.defs
@@ -0,0 +1,19 @@
+;; -*- scheme -*-
+; object definitions ...
+;; Enumerations and flags ...
+
+
+;; From xfce-menu-or-rules.h
+
+(define-function xfce_menu_or_rules_get_type
+  (c-name "xfce_menu_or_rules_get_type")
+  (return-type "GType")
+)
+
+(define-function xfce_menu_or_rules_new
+  (c-name "xfce_menu_or_rules_new")
+  (is-constructor-of "XfceMenuOrRules")
+  (return-type "XfceMenuOrRules*")
+)
+
+
diff --git a/menu/menu_rules.defs b/menu/menu_rules.defs
new file mode 100644
index 0000000..97b7b52
--- /dev/null
+++ b/menu/menu_rules.defs
@@ -0,0 +1,61 @@
+;; -*- scheme -*-
+; object definitions ...
+(define-object MenuRules
+  (in-module "Xfce")
+  (c-name "XfceMenuRules")
+  (gtype-id "XFCE_TYPE_MENU_RULES")
+)
+
+;; Enumerations and flags ...
+
+
+;; From xfce-menu-rules.h
+
+(define-function xfce_menu_rules_get_type
+  (c-name "xfce_menu_rules_get_type")
+  (return-type "GType")
+)
+
+(define-method match
+  (of-object "XfceMenuRules")
+  (c-name "xfce_menu_rules_match")
+  (return-type "gboolean")
+  (parameters
+    '("XfceMenuItem*" "item")
+  )
+)
+
+(define-method add_all
+  (of-object "XfceMenuRules")
+  (c-name "xfce_menu_rules_add_all")
+  (return-type "none")
+)
+
+(define-method add_rules
+  (of-object "XfceMenuRules")
+  (c-name "xfce_menu_rules_add_rules")
+  (return-type "none")
+  (parameters
+    '("XfceMenuRules*" "additional_rules")
+  )
+)
+
+(define-method add_filename
+  (of-object "XfceMenuRules")
+  (c-name "xfce_menu_rules_add_filename")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "filename")
+  )
+)
+
+(define-method add_category
+  (of-object "XfceMenuRules")
+  (c-name "xfce_menu_rules_add_category")
+  (return-type "none")
+  (parameters
+    '("const-gchar*" "category")
+  )
+)
+
+
diff --git a/menu/menu_separator.defs b/menu/menu_separator.defs
new file mode 100644
index 0000000..541f193
--- /dev/null
+++ b/menu/menu_separator.defs
@@ -0,0 +1,18 @@
+;; -*- scheme -*-
+; object definitions ...
+;; Enumerations and flags ...
+
+
+;; From xfce-menu-separator.h
+
+(define-function xfce_menu_separator_get_type
+  (c-name "xfce_menu_separator_get_type")
+  (return-type "GType")
+)
+
+(define-function xfce_menu_separator_get_default
+  (c-name "xfce_menu_separator_get_default")
+  (return-type "XfceMenuSeparator*")
+)
+
+
diff --git a/menu/menu_standard_rules.defs b/menu/menu_standard_rules.defs
new file mode 100644
index 0000000..65f9b01
--- /dev/null
+++ b/menu/menu_standard_rules.defs
@@ -0,0 +1,35 @@
+;; -*- scheme -*-
+; object definitions ...
+(define-object MenuStandardRules
+  (in-module "Xfce")
+  (parent "GObject")
+  (c-name "XfceMenuStandardRules")
+  (gtype-id "XFCE_TYPE_MENU_STANDARD_RULES")
+)
+
+;; Enumerations and flags ...
+
+
+;; From xfce-menu-standard-rules.h
+
+(define-function xfce_menu_standard_rules_get_type
+  (c-name "xfce_menu_standard_rules_get_type")
+  (return-type "GType")
+)
+
+(define-method get_include
+  (of-object "XfceMenuStandardRules")
+  (c-name "xfce_menu_standard_rules_get_include")
+  (return-type "gboolean")
+)
+
+(define-method set_include
+  (of-object "XfceMenuStandardRules")
+  (c-name "xfce_menu_standard_rules_set_include")
+  (return-type "none")
+  (parameters
+    '("gboolean" "include")
+  )
+)
+
+
diff --git a/panel/arrow_button.c b/panel/arrow_button.c
deleted file mode 100644
index 13fe4fa..0000000
--- a/panel/arrow_button.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "arrow_button.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfce4panel/xfce-arrow-button.h>
-
-extern PyTypeObject PyGtkWidget_Type;
-
-#line 15 "arrow_button.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 *_PyGtkToggleButton_Type;
-#define PyGtkToggleButton_Type (*_PyGtkToggleButton_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject G_GNUC_INTERNAL PyXfceArrowButton_Type;
-
-#line 30 "arrow_button.c"
-
-
-
-/* ----------- XfceArrowButton ----------- */
-
-static int
-_wrap_xfce_arrow_button_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:XfceArrowButton.__init__", kwlist, &py_arrow_type))
-        return -1;
-    if (pyg_enum_get_value(GTK_TYPE_ARROW_TYPE, py_arrow_type, (gpointer)&arrow_type))
-        return -1;
-    self->obj = (GObject *)xfce_arrow_button_new(arrow_type);
-
-    if (!self->obj) {
-        PyErr_SetString(PyExc_RuntimeError, "could not create XfceArrowButton object");
-        return -1;
-    }
-    pygobject_register_wrapper((PyObject *)self);
-    return 0;
-}
-
-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[] = { "arrow_type", NULL };
-    PyObject *py_arrow_type = NULL;
-    GtkArrowType arrow_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_arrow_type, (gpointer)&arrow_type))
-        return NULL;
-    
-    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_blinking(PyGObject *self)
-{
-    int ret;
-
-    
-    ret = xfce_arrow_button_get_blinking(XFCE_ARROW_BUTTON(self->obj));
-    
-    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_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 }
-};
-
-PyTypeObject G_GNUC_INTERNAL PyXfceArrowButton_Type = {
-    PyObject_HEAD_INIT(NULL)
-    0,                                 /* ob_size */
-    "arrowbutton.ArrowButton",                   /* 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*)_PyXfceArrowButton_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_arrow_button_new,             /* tp_init */
-    (allocfunc)0,           /* tp_alloc */
-    (newfunc)0,               /* tp_new */
-    (freefunc)0,             /* tp_free */
-    (inquiry)0              /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-const PyMethodDef pyarrow_button_functions[] = {
-    { NULL, NULL, 0, NULL }
-};
-
-/* initialise stuff extension classes */
-void
-pyarrow_button_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 ;
-        }
-        _PyGtkToggleButton_Type = (PyTypeObject *)PyObject_GetAttrString(module, "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 216 "arrow_button.c"
-    pygobject_register_class(d, "XfceArrowButton", XFCE_TYPE_ARROW_BUTTON, &PyXfceArrowButton_Type, Py_BuildValue("(O)", &PyGtkToggleButton_Type));
-}
diff --git a/panel/convenience.c b/panel/convenience.c
deleted file mode 100644
index ac41f0a..0000000
--- a/panel/convenience.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "convenience.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfce4panel/libxfce4panel.h>
-
-extern PyTypeObject PyGtkWidget_Type;
-
-#line 15 "convenience.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 *_PyGtkToggleButton_Type;
-#define PyGtkToggleButton_Type (*_PyGtkToggleButton_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 29 "convenience.c"
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_xfce_panel_create_button(PyObject *self)
-{
-    GtkWidget *ret;
-
-    
-    ret = xfce_panel_create_button();
-    
-    /* pygobject_new handles NULL checking */
-    return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_xfce_panel_create_toggle_button(PyObject *self)
-{
-    GtkWidget *ret;
-
-    
-    ret = xfce_panel_create_toggle_button();
-    
-    /* pygobject_new handles NULL checking */
-    return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_xfce_panel_get_channel_name(PyObject *self)
-{
-    const gchar *ret;
-
-    
-    ret = xfce_panel_get_channel_name();
-    
-    if (ret)
-        return PyString_FromString(ret);
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-const PyMethodDef pyconvenience_functions[] = {
-    { "xfce_panel_create_button", (PyCFunction)_wrap_xfce_panel_create_button, METH_NOARGS,
-      NULL },
-    { "xfce_panel_create_toggle_button", (PyCFunction)_wrap_xfce_panel_create_toggle_button, METH_NOARGS,
-      NULL },
-    { "xfce_panel_get_channel_name", (PyCFunction)_wrap_xfce_panel_get_channel_name, METH_NOARGS,
-      NULL },
-    { NULL, NULL, 0, NULL }
-};
-
-/* initialise stuff extension classes */
-void
-pyconvenience_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 ;
-        }
-        _PyGtkToggleButton_Type = (PyTypeObject *)PyObject_GetAttrString(module, "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 121 "convenience.c"
-}
diff --git a/panel/enums.c b/panel/enums.c
deleted file mode 100644
index 5665b76..0000000
--- a/panel/enums.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "enums.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfce4panel/libxfce4panel-enum-types.h>
-
-extern PyTypeObject PyGtkWidget_Type;
-
-#line 15 "enums.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 27 "enums.c"
-
-
-
-/* ----------- functions ----------- */
-
-const PyMethodDef pyenums_functions[] = {
-    { NULL, NULL, 0, NULL }
-};
-
-
-/* ----------- enums and flags ----------- */
-
-void
-pyenums_add_constants(PyObject *module, const gchar *strip_prefix)
-{
-#ifdef VERSION
-    PyModule_AddStringConstant(module, "__version__", VERSION);
-#endif
-  pyg_enum_add(module, "ScreenPosition", strip_prefix, XFCE_TYPE_SCREEN_POSITION);
-
-  if (PyErr_Occurred())
-    PyErr_Print();
-}
-
-/* initialise stuff extension classes */
-void
-pyenums_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 ;
-        }
-    } else {
-        PyErr_SetString(PyExc_ImportError,
-            "could not import gtk");
-        return ;
-    }
-
-
-#line 84 "enums.c"
-}
diff --git a/panel/hvbox.c b/panel/hvbox.c
deleted file mode 100644
index b8a3851..0000000
--- a/panel/hvbox.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "hvbox.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfce4panel/libxfce4panel.h>
-#define XFCE_TYPE_HV_BOX XFCE_TYPE_HVBOX
-#define XFCE_HV_BOX XFCE_HVBOX
-
-extern PyTypeObject PyGtkWidget_Type;
-
-#line 17 "hvbox.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 *_PyGtkToggleButton_Type;
-#define PyGtkToggleButton_Type (*_PyGtkToggleButton_Type)
-static PyTypeObject *_PyGtkBox_Type;
-#define PyGtkBox_Type (*_PyGtkBox_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject G_GNUC_INTERNAL PyXfceHVBox_Type;
-
-#line 34 "hvbox.c"
-
-
-
-/* ----------- XfceHVBox ----------- */
-
-static PyObject *
-_wrap_xfce_hvbox_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:XfceHVBox.set_orientation", kwlist, &py_orientation))
-        return NULL;
-    if (pyg_enum_get_value(GTK_TYPE_ORIENTATION, py_orientation, (gpointer)&orientation))
-        return NULL;
-    
-    xfce_hvbox_set_orientation(XFCE_HV_BOX(self->obj), orientation);
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_hvbox_get_orientation(PyGObject *self)
-{
-    gint ret;
-
-    
-    ret = xfce_hvbox_get_orientation(XFCE_HV_BOX(self->obj));
-    
-    return pyg_enum_from_gtype(GTK_TYPE_ORIENTATION, ret);
-}
-
-static const PyMethodDef _PyXfceHVBox_methods[] = {
-    { "set_orientation", (PyCFunction)_wrap_xfce_hvbox_set_orientation, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { "get_orientation", (PyCFunction)_wrap_xfce_hvbox_get_orientation, METH_NOARGS,
-      NULL },
-    { NULL, NULL, 0, NULL }
-};
-
-PyTypeObject G_GNUC_INTERNAL PyXfceHVBox_Type = {
-    PyObject_HEAD_INIT(NULL)
-    0,                                 /* ob_size */
-    "hvbox.HVBox",                   /* 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*)_PyXfceHVBox_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)0,             /* tp_init */
-    (allocfunc)0,           /* tp_alloc */
-    (newfunc)0,               /* tp_new */
-    (freefunc)0,             /* tp_free */
-    (inquiry)0              /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-const PyMethodDef pyhvbox_functions[] = {
-    { NULL, NULL, 0, NULL }
-};
-
-/* initialise stuff extension classes */
-void
-pyhvbox_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 ;
-        }
-        _PyGtkToggleButton_Type = (PyTypeObject *)PyObject_GetAttrString(module, "ToggleButton");
-        if (_PyGtkToggleButton_Type == NULL) {
-            PyErr_SetString(PyExc_ImportError,
-                "cannot import name ToggleButton from gtk");
-            return ;
-        }
-        _PyGtkBox_Type = (PyTypeObject *)PyObject_GetAttrString(module, "Box");
-        if (_PyGtkBox_Type == NULL) {
-            PyErr_SetString(PyExc_ImportError,
-                "cannot import name Box from gtk");
-            return ;
-        }
-    } else {
-        PyErr_SetString(PyExc_ImportError,
-            "could not import gtk");
-        return ;
-    }
-
-
-#line 174 "hvbox.c"
-    pygobject_register_class(d, "XfceHVBox", XFCE_TYPE_HV_BOX, &PyXfceHVBox_Type, Py_BuildValue("(O)", &PyGtkBox_Type));
-}
diff --git a/panel/plugin.c b/panel/plugin.c
deleted file mode 100644
index f1cbb8e..0000000
--- a/panel/plugin.c
+++ /dev/null
@@ -1,542 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "plugin.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfce4panel/libxfce4panel.h>
-
-extern PyTypeObject PyGtkWidget_Type;
-
-#line 15 "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 *_PyGtkWindow_Type;
-#define PyGtkWindow_Type (*_PyGtkWindow_Type)
-static PyTypeObject *_PyGtkToggleButton_Type;
-#define PyGtkToggleButton_Type (*_PyGtkToggleButton_Type)
-static PyTypeObject *_PyGtkMenuItem_Type;
-#define PyGtkMenuItem_Type (*_PyGtkMenuItem_Type)
-static PyTypeObject *_PyGtkMenu_Type;
-#define PyGtkMenu_Type (*_PyGtkMenu_Type)
-static PyTypeObject *_PyGtkEventBox_Type;
-#define PyGtkEventBox_Type (*_PyGtkEventBox_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject G_GNUC_INTERNAL PyXfcePanelPlugin_Type;
-
-#line 38 "plugin.c"
-
-
-
-/* ----------- XfcePanelPlugin ----------- */
-
-static PyObject *
-_wrap_xfce_panel_plugin_get_name(PyGObject *self)
-{
-    const gchar *ret;
-
-    
-    ret = xfce_panel_plugin_get_name(XFCE_PANEL_PLUGIN(self->obj));
-    
-    if (ret)
-        return PyString_FromString(ret);
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_get_display_name(PyGObject *self)
-{
-    const gchar *ret;
-
-    
-    ret = xfce_panel_plugin_get_display_name(XFCE_PANEL_PLUGIN(self->obj));
-    
-    if (ret)
-        return PyString_FromString(ret);
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_get_comment(PyGObject *self)
-{
-    const gchar *ret;
-
-    
-    ret = xfce_panel_plugin_get_comment(XFCE_PANEL_PLUGIN(self->obj));
-    
-    if (ret)
-        return PyString_FromString(ret);
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_get_unique_id(PyGObject *self)
-{
-    int ret;
-
-    
-    ret = xfce_panel_plugin_get_unique_id(XFCE_PANEL_PLUGIN(self->obj));
-    
-    return PyInt_FromLong(ret);
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_get_property_base(PyGObject *self)
-{
-    const gchar *ret;
-
-    
-    ret = xfce_panel_plugin_get_property_base(XFCE_PANEL_PLUGIN(self->obj));
-    
-    if (ret)
-        return PyString_FromString(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_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_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_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_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_take_window(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "window", NULL };
-    PyGObject *window;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"O!:XfcePanelPlugin.take_window", kwlist, &PyGtkWindow_Type, &window))
-        return NULL;
-    
-    xfce_panel_plugin_take_window(XFCE_PANEL_PLUGIN(self->obj), GTK_WINDOW(window->obj));
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-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_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_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_get_locked(PyGObject *self)
-{
-    int ret;
-
-    
-    ret = xfce_panel_plugin_get_locked(XFCE_PANEL_PLUGIN(self->obj));
-    
-    return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_xfce_panel_plugin_remove(PyGObject *self)
-{
-    
-    xfce_panel_plugin_remove(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_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_block_autohide(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "blocked", NULL };
-    int blocked;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"i:XfcePanelPlugin.block_autohide", kwlist, &blocked))
-        return NULL;
-    
-    xfce_panel_plugin_block_autohide(XFCE_PANEL_PLUGIN(self->obj), blocked);
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-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 const PyMethodDef _PyXfcePanelPlugin_methods[] = {
-    { "get_name", (PyCFunction)_wrap_xfce_panel_plugin_get_name, METH_NOARGS,
-      NULL },
-    { "get_display_name", (PyCFunction)_wrap_xfce_panel_plugin_get_display_name, METH_NOARGS,
-      NULL },
-    { "get_comment", (PyCFunction)_wrap_xfce_panel_plugin_get_comment, METH_NOARGS,
-      NULL },
-    { "get_unique_id", (PyCFunction)_wrap_xfce_panel_plugin_get_unique_id, METH_NOARGS,
-      NULL },
-    { "get_property_base", (PyCFunction)_wrap_xfce_panel_plugin_get_property_base, METH_NOARGS,
-      NULL },
-    { "get_size", (PyCFunction)_wrap_xfce_panel_plugin_get_size, METH_NOARGS,
-      NULL },
-    { "get_expand", (PyCFunction)_wrap_xfce_panel_plugin_get_expand, METH_NOARGS,
-      NULL },
-    { "set_expand", (PyCFunction)_wrap_xfce_panel_plugin_set_expand, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { "get_orientation", (PyCFunction)_wrap_xfce_panel_plugin_get_orientation, METH_NOARGS,
-      NULL },
-    { "get_screen_position", (PyCFunction)_wrap_xfce_panel_plugin_get_screen_position, METH_NOARGS,
-      NULL },
-    { "take_window", (PyCFunction)_wrap_xfce_panel_plugin_take_window, METH_VARARGS|METH_KEYWORDS,
-      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_configure", (PyCFunction)_wrap_xfce_panel_plugin_menu_show_configure, METH_NOARGS,
-      NULL },
-    { "menu_show_about", (PyCFunction)_wrap_xfce_panel_plugin_menu_show_about, METH_NOARGS,
-      NULL },
-    { "get_locked", (PyCFunction)_wrap_xfce_panel_plugin_get_locked, METH_NOARGS,
-      NULL },
-    { "remove", (PyCFunction)_wrap_xfce_panel_plugin_remove, 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 },
-    { "focus_widget", (PyCFunction)_wrap_xfce_panel_plugin_focus_widget, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { "block_autohide", (PyCFunction)_wrap_xfce_panel_plugin_block_autohide, METH_VARARGS|METH_KEYWORDS,
-      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 },
-    { NULL, NULL, 0, NULL }
-};
-
-PyTypeObject G_GNUC_INTERNAL PyXfcePanelPlugin_Type = {
-    PyObject_HEAD_INIT(NULL)
-    0,                                 /* ob_size */
-    "plugin.PanelPlugin",                   /* 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*)_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 */
-    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 ----------- */
-
-const PyMethodDef pyplugin_functions[] = {
-    { NULL, NULL, 0, NULL }
-};
-
-/* initialise stuff extension classes */
-void
-pyplugin_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 ;
-        }
-        _PyGtkToggleButton_Type = (PyTypeObject *)PyObject_GetAttrString(module, "ToggleButton");
-        if (_PyGtkToggleButton_Type == NULL) {
-            PyErr_SetString(PyExc_ImportError,
-                "cannot import name ToggleButton 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 ;
-        }
-        _PyGtkEventBox_Type = (PyTypeObject *)PyObject_GetAttrString(module, "EventBox");
-        if (_PyGtkEventBox_Type == NULL) {
-            PyErr_SetString(PyExc_ImportError,
-                "cannot import name EventBox from gtk");
-            return ;
-        }
-    } else {
-        PyErr_SetString(PyExc_ImportError,
-            "could not import gtk");
-        return ;
-    }
-
-
-#line 541 "plugin.c"
-    pygobject_register_class(d, "XfcePanelPlugin", XFCE_TYPE_PANEL_PLUGIN, &PyXfcePanelPlugin_Type, Py_BuildValue("(O)", &PyGtkEventBox_Type));
-}
diff --git a/panel/plugin_provider.c b/panel/plugin_provider.c
deleted file mode 100644
index 7e330ac..0000000
--- a/panel/plugin_provider.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "plugin_provider.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfce4panel/libxfce4panel.h>
-
-extern PyTypeObject PyGtkWidget_Type;
-
-#line 15 "plugin_provider.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 *_PyGtkToggleButton_Type;
-#define PyGtkToggleButton_Type (*_PyGtkToggleButton_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 29 "plugin_provider.c"
-
-
-
-/* ----------- functions ----------- */
-
-const PyMethodDef pyplugin_provider_functions[] = {
-    { NULL, NULL, 0, NULL }
-};
-
-
-/* ----------- enums and flags ----------- */
-
-void
-pyplugin_provider_add_constants(PyObject *module, const gchar *strip_prefix)
-{
-#ifdef VERSION
-    PyModule_AddStringConstant(module, "__version__", VERSION);
-#endif
-  pyg_enum_add(module, "PanelPluginProviderSignal", strip_prefix, XFCE_TYPE_PANEL_PLUGIN_PROVIDER_SIGNAL);
-  pyg_enum_add(module, "PanelPluginProviderPropType", strip_prefix, XFCE_TYPE_PANEL_PLUGIN_PROVIDER_PROP_TYPE);
-
-  if (PyErr_Occurred())
-    PyErr_Print();
-}
-
-/* initialise stuff extension classes */
-void
-pyplugin_provider_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 ;
-        }
-        _PyGtkToggleButton_Type = (PyTypeObject *)PyObject_GetAttrString(module, "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 93 "plugin_provider.c"
-}
diff --git a/util/desktopentry.c b/util/desktopentry.c
deleted file mode 100644
index 0f12760..0000000
--- a/util/desktopentry.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "desktopentry.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfce4util/libxfce4util.h>
-
-#line 13 "desktopentry.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject PyXfceDesktopEntry_Type;
-
-#line 24 "desktopentry.c"
-
-
-
-/* ----------- XfceDesktopEntry ----------- */
-
-static PyObject *
-_wrap_xfce_desktop_entry_get_file(PyGObject *self)
-{
-    const gchar *ret;
-
-    ret = xfce_desktop_entry_get_file(XFCE_DESKTOP_ENTRY(self->obj));
-    if (ret)
-        return PyString_FromString(ret);
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-#line 54 "desktopentry.override"
-static PyObject *
-_wrap_xfce_desktop_entry_get_int(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    int value;
-    gchar *key;
-    static char *kwlist[] = { "key", NULL };
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:xfce_desktop_entry_get_int", kwlist, &key))
-        return NULL;
-
-    if (xfce_desktop_entry_get_int (XFCE_DESKTOP_ENTRY(self->obj), key, &value)) {
-        return PyInt_FromLong((long) value);
-    }
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-#line 60 "desktopentry.c"
-
-
-#line 29 "desktopentry.override"
-static PyObject *
-_wrap_xfce_desktop_entry_get_string(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    gchar *value;
-    PyObject *ret;
-    gchar *key;
-    int translated;
-    static char *kwlist[] = { "key", "translated", NULL };
-
-    translated = TRUE;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|i:xfce_desktop_entry_get_string", kwlist, &key, &translated))
-        return NULL;
-
-    if (xfce_desktop_entry_get_string (XFCE_DESKTOP_ENTRY(self->obj), key, translated, &value)) {
-        ret = PyString_FromString (value);
-        g_free (value);
-        return ret;
-    }
-
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-#line 87 "desktopentry.c"
-
-
-static PyObject *
-_wrap_xfce_desktop_entry_has_translated_entry(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "key", NULL };
-    char *key;
-    int ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfceDesktopEntry.has_translated_entry", kwlist, &key))
-        return NULL;
-    ret = xfce_desktop_entry_has_translated_entry(XFCE_DESKTOP_ENTRY(self->obj), key);
-    return PyBool_FromLong(ret);
-
-}
-
-static PyMethodDef _PyXfceDesktopEntry_methods[] = {
-    { "get_file", (PyCFunction)_wrap_xfce_desktop_entry_get_file, METH_NOARGS },
-    { "get_int", (PyCFunction)_wrap_xfce_desktop_entry_get_int, METH_VARARGS|METH_KEYWORDS },
-    { "get_string", (PyCFunction)_wrap_xfce_desktop_entry_get_string, METH_VARARGS|METH_KEYWORDS },
-    { "has_translated_entry", (PyCFunction)_wrap_xfce_desktop_entry_has_translated_entry, METH_VARARGS|METH_KEYWORDS },
-    { NULL, NULL, 0 }
-};
-
-PyTypeObject PyXfceDesktopEntry_Type = {
-    PyObject_HEAD_INIT(NULL)
-    0,					/* ob_size */
-    "desktopentry.DesktopEntry",			/* 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 */
-    _PyXfceDesktopEntry_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 ----------- */
-
-#line 73 "desktopentry.override"
-static PyObject *
-_wrap_xfce_desktop_entry_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    const gchar** categories;
-    const gchar* file_path;
-    XfceDesktopEntry* desktop_entry;
-    PyObject* py_desktop_entry;
-    PyObject* py_categories;
-    PyObject* py_item;
-    int i, count;
-
-    static char *kwlist[] = { "file_path", "categories", NULL };
-
-    categories = NULL;
-    file_path = NULL;
-    py_categories = NULL;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, 
-      "s|O!:xfce_desktop_entry_new", kwlist, &file_path, &PyList_Type, &py_categories)) {
-        return NULL;
-    }
-
-    count = 0;
-
-    if (py_categories != NULL) {
-        count = PyList_Size (py_categories);
-        categories = (const gchar**) g_new0 (gchar*, count + 1);
-        for (i = 0; i < count; i++) {
-            py_item = PyList_GetItem (py_categories, i);
-
-            categories[i] = PyString_AsString (py_item);
-            if (categories[i] == NULL) {
-                g_free(categories);
-                PyErr_SetString(PyExc_TypeError, "Type Mismatch: categories should be a list of strings");
-                return NULL;
-            }
-        }
-    }
-
-    if (categories == NULL) {
-        count = 29;
-        categories = (const gchar**) g_new0(gchar*, count + 1);
-        categories[0] = "Name";
-        categories[1] = "GenericName",
-        categories[2] = "Type";
-        categories[3] = "Version";
-        categories[4] = "Encoding";
-        categories[5] = "NoDisplay";
-        categories[6] = "Comment";
-        categories[7] = "Icon";
-        categories[8] = "Hidden";
-        categories[9] = "FilePattern";
-        categories[10] = "TryExec";
-        categories[11] = "Exec";
-        categories[12] = "Path";
-        categories[13] = "Terminal";
-        categories[14] = "SwallowTitle";
-        categories[15] = "SwallowExec";
-        categories[16] = "Actions";
-        categories[17] = "MimeType";
-        categories[18] = "SortOrder";
-        categories[18] = "Dev";
-        categories[19] = "FSType";
-        categories[20] = "MountPoint";
-        categories[21] = "ReadOnly";
-        categories[22] = "UnmountIcon";
-        categories[23] = "URL";
-        categories[24] = "Categories";
-        categories[25] = "OnlyShowIn";
-        categories[26] = "NotShowIn";
-        categories[27] = "StartupNotify";
-        categories[28] = "StartupWMClass";
-    }
-
-    desktop_entry = xfce_desktop_entry_new(file_path, categories, count);
-
-    g_free(categories);
-
-    if (desktop_entry == NULL) {
-        PyErr_SetString(PyExc_OSError, "OSError");
-        return NULL;
-    }
-
-    py_desktop_entry = pygobject_new((GObject *) desktop_entry);
-    g_object_unref(desktop_entry);
-    return py_desktop_entry;
-}
-#line 249 "desktopentry.c"
-
-
-PyMethodDef pydesktopentry_functions[] = {
-    { "desktop_entry_new", (PyCFunction)_wrap_xfce_desktop_entry_new, METH_VARARGS|METH_KEYWORDS },
-    { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pydesktopentry_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 279 "desktopentry.c"
-    pygobject_register_class(d, "XfceDesktopEntry", XFCE_TYPE_DESKTOP_ENTRY, &PyXfceDesktopEntry_Type, Py_BuildValue("(O)", &PyGObject_Type));
-    pyg_set_object_has_new_constructor(XFCE_TYPE_DESKTOP_ENTRY);
-}
diff --git a/util/fileutils.c b/util/fileutils.c
deleted file mode 100644
index c62eb8c..0000000
--- a/util/fileutils.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 "fileutils.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfce4util/libxfce4util.h>
-
-#line 13 "fileutils.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 23 "fileutils.c"
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_xfce_mkdirhier(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "whole_path", "mode", NULL };
-    char *whole_path;
-    int ret;
-    unsigned long mode;
-    GError *error = NULL;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sk:mkdirhier", kwlist, &whole_path, &mode))
-        return NULL;
-    ret = xfce_mkdirhier(whole_path, mode, &error);
-    if (pyg_error_check(&error))
-        return NULL;
-    return PyBool_FromLong(ret);
-
-}
-
-PyMethodDef pyfileutils_functions[] = {
-    { "mkdirhier", (PyCFunction)_wrap_xfce_mkdirhier, METH_VARARGS|METH_KEYWORDS },
-    { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pyfileutils_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 "fileutils.c"
-}
diff --git a/util/i18n.c b/util/i18n.c
deleted file mode 100644
index 2975459..0000000
--- a/util/i18n.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "i18n.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfce4util/libxfce4util.h>
-
-#line 13 "i18n.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 23 "i18n.c"
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_xfce_textdomain(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "package", "localedir", "encoding", NULL };
-    char *package, *localedir, *encoding;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sss:textdomain", kwlist, &package, &localedir, &encoding))
-        return NULL;
-    xfce_textdomain(package, localedir, encoding);
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_strip_context(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "msgid", "msgval", NULL };
-    char *msgid, *msgval;
-    const gchar *ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ss:strip_context", kwlist, &msgid, &msgval))
-        return NULL;
-    ret = xfce_strip_context(msgid, msgval);
-    if (ret)
-        return PyString_FromString(ret);
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_get_file_localized(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "filename", NULL };
-    char *filename;
-    gchar *ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:get_file_localized", kwlist, &filename))
-        return NULL;
-    ret = xfce_get_file_localized(filename);
-    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_get_file_localized_r(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "buffer", "length", "filename", NULL };
-    char *buffer, *filename;
-    gsize length;
-    gchar *ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sks:get_file_localized_r", kwlist, &buffer, &length, &filename))
-        return NULL;
-    ret = xfce_get_file_localized_r(buffer, length, filename);
-    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_get_dir_localized(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "directory", NULL };
-    char *directory;
-    gchar *ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:get_dir_localized", kwlist, &directory))
-        return NULL;
-    ret = xfce_get_dir_localized(directory);
-    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_get_dir_localized_r(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "buffer", "length", "directory", NULL };
-    char *buffer, *directory;
-    gsize length;
-    gchar *ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sks:get_dir_localized_r", kwlist, &buffer, &length, &directory))
-        return NULL;
-    ret = xfce_get_dir_localized_r(buffer, length, directory);
-    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_locale_match(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "locale1", "locale2", NULL };
-    char *locale1, *locale2;
-    guint ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ss:locale_match", kwlist, &locale1, &locale2))
-        return NULL;
-    ret = xfce_locale_match(locale1, locale2);
-    return PyLong_FromUnsignedLong(ret);
-}
-
-PyMethodDef pyi18n_functions[] = {
-    { "textdomain", (PyCFunction)_wrap_xfce_textdomain, METH_VARARGS|METH_KEYWORDS },
-    { "strip_context", (PyCFunction)_wrap_xfce_strip_context, METH_VARARGS|METH_KEYWORDS },
-    { "get_file_localized", (PyCFunction)_wrap_xfce_get_file_localized, METH_VARARGS|METH_KEYWORDS },
-    { "get_file_localized_r", (PyCFunction)_wrap_xfce_get_file_localized_r, METH_VARARGS|METH_KEYWORDS },
-    { "get_dir_localized", (PyCFunction)_wrap_xfce_get_dir_localized, METH_VARARGS|METH_KEYWORDS },
-    { "get_dir_localized_r", (PyCFunction)_wrap_xfce_get_dir_localized_r, METH_VARARGS|METH_KEYWORDS },
-    { "locale_match", (PyCFunction)_wrap_xfce_locale_match, METH_VARARGS|METH_KEYWORDS },
-    { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pyi18n_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 182 "i18n.c"
-}
diff --git a/util/kiosk.c b/util/kiosk.c
deleted file mode 100644
index aa8ae92..0000000
--- a/util/kiosk.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 "kiosk.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfce4util/libxfce4util.h>
-
-#line 13 "kiosk.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 23 "kiosk.c"
-
-
-
-/* ----------- functions ----------- */
-
-PyMethodDef pykiosk_functions[] = {
-    { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pykiosk_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 "kiosk.c"
-}
diff --git a/util/miscutils.c b/util/miscutils.c
deleted file mode 100644
index 61d7702..0000000
--- a/util/miscutils.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "miscutils.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfce4util/libxfce4util.h>
-
-#line 13 "miscutils.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 23 "miscutils.c"
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_xfce_version_string(PyObject *self)
-{
-    const gchar *ret;
-
-    ret = xfce_version_string();
-    if (ret)
-        return PyString_FromString(ret);
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_get_homedir(PyObject *self)
-{
-    const gchar *ret;
-
-    ret = xfce_get_homedir();
-    if (ret)
-        return PyString_FromString(ret);
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_get_userdir(PyObject *self)
-{
-    const gchar *ret;
-
-    ret = xfce_get_userdir();
-    if (ret)
-        return PyString_FromString(ret);
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-PyMethodDef pymiscutils_functions[] = {
-    { "version_string", (PyCFunction)_wrap_xfce_version_string, METH_NOARGS },
-    { "get_homedir", (PyCFunction)_wrap_xfce_get_homedir, METH_NOARGS },
-    { "get_userdir", (PyCFunction)_wrap_xfce_get_userdir, METH_NOARGS },
-    { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pymiscutils_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 94 "miscutils.c"
-}
diff --git a/util/rc.c b/util/rc.c
deleted file mode 100644
index b400e14..0000000
--- a/util/rc.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 "rc.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfce4util/libxfce4util.h>
-
-#line 13 "rc.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 23 "rc.c"
-
-
-
-/* ----------- functions ----------- */
-
-PyMethodDef pyrc_functions[] = {
-    { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pyrc_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 "rc.c"
-}
diff --git a/util/resource.c b/util/resource.c
deleted file mode 100644
index a0d3892..0000000
--- a/util/resource.c
+++ /dev/null
@@ -1,152 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "resource.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfce4util/libxfce4util.h>
-#include <libxfce4util/libxfce4util-enum-types.h>
-
-#line 14 "resource.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 24 "resource.c"
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_xfce_resource_lookup(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "type", "filename", NULL };
-    PyObject *py_type = NULL;
-    char *filename;
-    gchar *ret;
-    XfceResourceType type;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Os:resource_lookup", kwlist, &py_type, &filename))
-        return NULL;
-    if (pyg_enum_get_value(XFCE_TYPE_RESOURCE_TYPE, py_type, (gint *)&type))
-        return NULL;
-    ret = xfce_resource_lookup(type, filename);
-    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_resource_push_path(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "type", "path", NULL };
-    PyObject *py_type = NULL;
-    char *path;
-    XfceResourceType type;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Os:resource_push_path", kwlist, &py_type, &path))
-        return NULL;
-    if (pyg_enum_get_value(XFCE_TYPE_RESOURCE_TYPE, py_type, (gint *)&type))
-        return NULL;
-    xfce_resource_push_path(type, path);
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_resource_pop_path(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "type", NULL };
-    PyObject *py_type = NULL;
-    XfceResourceType type;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O:resource_pop_path", kwlist, &py_type))
-        return NULL;
-    if (pyg_enum_get_value(XFCE_TYPE_RESOURCE_TYPE, py_type, (gint *)&type))
-        return NULL;
-    xfce_resource_pop_path(type);
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-_wrap_xfce_resource_save_location(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "type", "relpath", "create", NULL };
-    PyObject *py_type = NULL;
-    char *relpath;
-    int create;
-    gchar *ret;
-    XfceResourceType type;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "Osi:resource_save_location", kwlist, &py_type, &relpath, &create))
-        return NULL;
-    if (pyg_enum_get_value(XFCE_TYPE_RESOURCE_TYPE, py_type, (gint *)&type))
-        return NULL;
-    ret = xfce_resource_save_location(type, relpath, create);
-    if (ret) {
-        PyObject *py_ret = PyString_FromString(ret);
-        g_free(ret);
-        return py_ret;
-    }
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-PyMethodDef pyresource_functions[] = {
-    { "resource_lookup", (PyCFunction)_wrap_xfce_resource_lookup, METH_VARARGS|METH_KEYWORDS },
-    { "resource_push_path", (PyCFunction)_wrap_xfce_resource_push_path, METH_VARARGS|METH_KEYWORDS },
-    { "resource_pop_path", (PyCFunction)_wrap_xfce_resource_pop_path, METH_VARARGS|METH_KEYWORDS },
-    { "resource_save_location", (PyCFunction)_wrap_xfce_resource_save_location, METH_VARARGS|METH_KEYWORDS },
-    { NULL, NULL, 0 }
-};
-
-
-/* ----------- enums and flags ----------- */
-
-void
-pyresource_add_constants(PyObject *module, const gchar *strip_prefix)
-{
-  pyg_enum_add(module, "ResourceType", strip_prefix, XFCE_TYPE_RESOURCE_TYPE);
-
-  if (PyErr_Occurred())
-    PyErr_Print();
-}
-
-/* initialise stuff extension classes */
-void
-pyresource_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 152 "resource.c"
-}
diff --git a/util/utf8.c b/util/utf8.c
deleted file mode 100644
index 61be96b..0000000
--- a/util/utf8.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "utf8.override"
-#include "pygobject.h"
-#include <gtk/gtk.h>
-#include <libxfce4util/libxfce4util.h>
-
-#line 13 "utf8.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 23 "utf8.c"
-
-
-
-/* ----------- functions ----------- */
-
-static PyObject *
-_wrap_xfce_utf8_remove_controls(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "str", "max_len", "end", NULL };
-    char *str, *end;
-    gchar *ret;
-    gssize max_len;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sls:utf8_remove_controls", kwlist, &str, &max_len, &end))
-        return NULL;
-    ret = xfce_utf8_remove_controls(str, max_len, end);
-    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_utf8_strndup(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "src", "max_len", NULL };
-    char *src;
-    gchar *ret;
-    gssize max_len;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "sl:utf8_strndup", kwlist, &src, &max_len))
-        return NULL;
-    ret = xfce_utf8_strndup(src, max_len);
-    if (ret) {
-        PyObject *py_ret = PyString_FromString(ret);
-        g_free(ret);
-        return py_ret;
-    }
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-PyMethodDef pyutf8_functions[] = {
-    { "utf8_remove_controls", (PyCFunction)_wrap_xfce_utf8_remove_controls, METH_VARARGS|METH_KEYWORDS },
-    { "utf8_strndup", (PyCFunction)_wrap_xfce_utf8_strndup, METH_VARARGS|METH_KEYWORDS },
-    { NULL, NULL, 0 }
-};
-
-/* initialise stuff extension classes */
-void
-pyutf8_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 97 "utf8.c"
-}
diff --git a/xfconf/binding.c b/xfconf/binding.c
deleted file mode 100644
index 144c89c..0000000
--- a/xfconf/binding.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 "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/channel.c b/xfconf/channel.c
deleted file mode 100644
index 2e4004a..0000000
--- a/xfconf/channel.c
+++ /dev/null
@@ -1,501 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "channel.override"
-#include "pygobject.h"
-#include <glib.h>
-#include <xfconf/xfconf.h>
-
-#line 13 "channel.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* ---------- forward type declarations ---------- */
-PyTypeObject G_GNUC_INTERNAL PyXfconfChannel_Type;
-
-#line 24 "channel.c"
-
-
-
-/* ----------- XfconfChannel ----------- */
-
-static int
-_wrap_xfconf_channel_new(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "channel_name", NULL };
-    char *channel_name;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:XfconfChannel.__init__", kwlist, &channel_name))
-        return -1;
-    self->obj = (GObject *)xfconf_channel_new(channel_name);
-
-    if (!self->obj) {
-        PyErr_SetString(PyExc_RuntimeError, "could not create XfconfChannel object");
-        return -1;
-    }
-    pygobject_register_wrapper((PyObject *)self);
-    return 0;
-}
-
-static PyObject *
-_wrap_xfconf_channel_has_property(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "property", NULL };
-    char *property;
-    int ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:XfconfChannel.has_property", kwlist, &property))
-        return NULL;
-    
-    ret = xfconf_channel_has_property(XFCONF_CHANNEL(self->obj), property);
-    
-    return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_xfconf_channel_is_property_locked(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "property", NULL };
-    char *property;
-    int ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:XfconfChannel.is_property_locked", kwlist, &property))
-        return NULL;
-    
-    ret = xfconf_channel_is_property_locked(XFCONF_CHANNEL(self->obj), property);
-    
-    return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_xfconf_channel_reset_property(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "property_base", "recursive", NULL };
-    char *property_base;
-    int recursive;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"si:XfconfChannel.reset_property", kwlist, &property_base, &recursive))
-        return NULL;
-    
-    xfconf_channel_reset_property(XFCONF_CHANNEL(self->obj), property_base, recursive);
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-#line 49 "channel.override"
-static PyObject *
-_wrap_xfconf_channel_get_properties(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "property_base", NULL };
-    GHashTable *ret;
-    char* path;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s:XfconfChannel.get_properties", kwlist, &path))
-        return NULL;
-    ret = xfconf_channel_get_properties(XFCONF_CHANNEL(self->obj), path);
-    if (ret) {
-        GHashTableIter iter;
-        gpointer key, value;
-        PyObject* py_ret;
-        py_ret = PyDict_New();
-        g_hash_table_iter_init(&iter, ret);
-        while(g_hash_table_iter_next(&iter, &key, &value)) {
-            PyDict_SetItem(py_ret, PyString_FromString((const char*) key), pyg_value_as_pyobject((GValue*) value, TRUE));
-        }
-        g_hash_table_destroy(ret);
-        return py_ret;
-    }
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-#line 122 "channel.c"
-
-
-static PyObject *
-_wrap_xfconf_channel_get_string(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "property", "default_value", NULL };
-    char *property, *default_value;
-    gchar *ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"ss:XfconfChannel.get_string", kwlist, &property, &default_value))
-        return NULL;
-    
-    ret = xfconf_channel_get_string(XFCONF_CHANNEL(self->obj), property, default_value);
-    
-    if (ret) {
-        PyObject *py_ret = PyString_FromString(ret);
-        g_free(ret);
-        return py_ret;
-    }
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-
-static PyObject *
-_wrap_xfconf_channel_set_string(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "property", "value", NULL };
-    char *property, *value;
-    int ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"ss:XfconfChannel.set_string", kwlist, &property, &value))
-        return NULL;
-    
-    ret = xfconf_channel_set_string(XFCONF_CHANNEL(self->obj), property, value);
-    
-    return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_xfconf_channel_get_int(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "property", "default_value", NULL };
-    char *property;
-    int default_value, ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"si:XfconfChannel.get_int", kwlist, &property, &default_value))
-        return NULL;
-    
-    ret = xfconf_channel_get_int(XFCONF_CHANNEL(self->obj), property, default_value);
-    
-    return PyInt_FromLong(ret);
-}
-
-static PyObject *
-_wrap_xfconf_channel_set_int(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "property", "value", NULL };
-    char *property;
-    int value, ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"si:XfconfChannel.set_int", kwlist, &property, &value))
-        return NULL;
-    
-    ret = xfconf_channel_set_int(XFCONF_CHANNEL(self->obj), property, value);
-    
-    return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_xfconf_channel_get_uint(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "property", "default_value", NULL };
-    char *property;
-    guint32 ret;
-    unsigned long default_value;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"sk:XfconfChannel.get_uint", kwlist, &property, &default_value))
-        return NULL;
-    
-    ret = xfconf_channel_get_uint(XFCONF_CHANNEL(self->obj), property, default_value);
-    
-    return PyLong_FromUnsignedLong(ret);
-
-}
-
-static PyObject *
-_wrap_xfconf_channel_set_uint(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "property", "value", NULL };
-    char *property;
-    int ret;
-    unsigned long value;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"sk:XfconfChannel.set_uint", kwlist, &property, &value))
-        return NULL;
-    
-    ret = xfconf_channel_set_uint(XFCONF_CHANNEL(self->obj), property, value);
-    
-    return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_xfconf_channel_get_uint64(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "property", "default_value", NULL };
-    char *property;
-    PyObject *py_default_value = NULL;
-    guint64 default_value, ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"sO!:XfconfChannel.get_uint64", kwlist, &property, &PyLong_Type, &py_default_value))
-        return NULL;
-    default_value = PyLong_AsUnsignedLongLong(py_default_value);
-    
-    ret = xfconf_channel_get_uint64(XFCONF_CHANNEL(self->obj), property, default_value);
-    
-    return PyLong_FromUnsignedLongLong(ret);
-}
-
-static PyObject *
-_wrap_xfconf_channel_set_uint64(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "property", "value", NULL };
-    char *property;
-    PyObject *py_value = NULL;
-    int ret;
-    guint64 value;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"sO!:XfconfChannel.set_uint64", kwlist, &property, &PyLong_Type, &py_value))
-        return NULL;
-    value = PyLong_AsUnsignedLongLong(py_value);
-    
-    ret = xfconf_channel_set_uint64(XFCONF_CHANNEL(self->obj), property, value);
-    
-    return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_xfconf_channel_get_double(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "property", "default_value", NULL };
-    char *property;
-    double default_value, ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"sd:XfconfChannel.get_double", kwlist, &property, &default_value))
-        return NULL;
-    
-    ret = xfconf_channel_get_double(XFCONF_CHANNEL(self->obj), property, default_value);
-    
-    return PyFloat_FromDouble(ret);
-}
-
-static PyObject *
-_wrap_xfconf_channel_set_double(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "property", "value", NULL };
-    char *property;
-    double value;
-    int ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"sd:XfconfChannel.set_double", kwlist, &property, &value))
-        return NULL;
-    
-    ret = xfconf_channel_set_double(XFCONF_CHANNEL(self->obj), property, value);
-    
-    return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_xfconf_channel_get_bool(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "property", "default_value", NULL };
-    char *property;
-    int default_value, ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"si:XfconfChannel.get_bool", kwlist, &property, &default_value))
-        return NULL;
-    
-    ret = xfconf_channel_get_bool(XFCONF_CHANNEL(self->obj), property, default_value);
-    
-    return PyBool_FromLong(ret);
-
-}
-
-static PyObject *
-_wrap_xfconf_channel_set_bool(PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "property", "value", NULL };
-    char *property;
-    int value, ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"si:XfconfChannel.set_bool", kwlist, &property, &value))
-        return NULL;
-    
-    ret = xfconf_channel_set_bool(XFCONF_CHANNEL(self->obj), property, value);
-    
-    return PyBool_FromLong(ret);
-
-}
-
-static const PyMethodDef _PyXfconfChannel_methods[] = {
-    { "has_property", (PyCFunction)_wrap_xfconf_channel_has_property, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { "is_property_locked", (PyCFunction)_wrap_xfconf_channel_is_property_locked, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { "reset_property", (PyCFunction)_wrap_xfconf_channel_reset_property, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { "get_properties", (PyCFunction)_wrap_xfconf_channel_get_properties, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { "get_string", (PyCFunction)_wrap_xfconf_channel_get_string, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { "set_string", (PyCFunction)_wrap_xfconf_channel_set_string, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { "get_int", (PyCFunction)_wrap_xfconf_channel_get_int, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { "set_int", (PyCFunction)_wrap_xfconf_channel_set_int, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { "get_uint", (PyCFunction)_wrap_xfconf_channel_get_uint, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { "set_uint", (PyCFunction)_wrap_xfconf_channel_set_uint, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { "get_uint64", (PyCFunction)_wrap_xfconf_channel_get_uint64, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { "set_uint64", (PyCFunction)_wrap_xfconf_channel_set_uint64, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { "get_double", (PyCFunction)_wrap_xfconf_channel_get_double, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { "set_double", (PyCFunction)_wrap_xfconf_channel_set_double, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { "get_bool", (PyCFunction)_wrap_xfconf_channel_get_bool, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { "set_bool", (PyCFunction)_wrap_xfconf_channel_set_bool, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { NULL, NULL, 0, NULL }
-};
-
-PyTypeObject G_GNUC_INTERNAL PyXfconfChannel_Type = {
-    PyObject_HEAD_INIT(NULL)
-    0,                                 /* ob_size */
-    "classgroup.Channel",                   /* 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*)_PyXfconfChannel_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_xfconf_channel_new,             /* tp_init */
-    (allocfunc)0,           /* tp_alloc */
-    (newfunc)0,               /* tp_new */
-    (freefunc)0,             /* tp_free */
-    (inquiry)0              /* tp_is_gc */
-};
-
-
-
-/* ----------- functions ----------- */
-
-#line 25 "channel.override"
-static PyObject *
-_wrap_xfconf_list_channels(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { NULL };
-    gchar **ret;
-    int i;
-    int count;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, ":list_channels", kwlist))
-        return NULL;
-    ret = xfconf_list_channels();
-    if (ret) {
-        count = g_strv_length(ret);
-        PyObject *py_ret = PyList_New(count);
-        for(i = 0; i < count; ++i)
-            PyList_SetItem(py_ret, i, PyString_FromString(ret[i]));
-        g_strfreev(ret);
-        return py_ret;
-    }
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-#line 435 "channel.c"
-
-
-static PyObject *
-_wrap_xfconf_channel_get(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "channel_name", NULL };
-    char *channel_name;
-    XfconfChannel *ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"s:channel_get", kwlist, &channel_name))
-        return NULL;
-    
-    ret = xfconf_channel_get(channel_name);
-    
-    /* pygobject_new handles NULL checking */
-    return pygobject_new((GObject *)ret);
-}
-
-static PyObject *
-_wrap_xfconf_channel_new_with_property_base(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "channel_name", "property_base", NULL };
-    char *channel_name, *property_base;
-    XfconfChannel *ret;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,"ss:channel_new_with_property_base", kwlist, &channel_name, &property_base))
-        return NULL;
-    
-    ret = xfconf_channel_new_with_property_base(channel_name, property_base);
-    
-    /* pygobject_new handles NULL checking */
-    return pygobject_new((GObject *)ret);
-}
-
-const PyMethodDef pychannel_functions[] = {
-    { "list_channels", (PyCFunction)_wrap_xfconf_list_channels, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { "channel_get", (PyCFunction)_wrap_xfconf_channel_get, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { "channel_new_with_property_base", (PyCFunction)_wrap_xfconf_channel_new_with_property_base, METH_VARARGS|METH_KEYWORDS,
-      NULL },
-    { NULL, NULL, 0, NULL }
-};
-
-/* initialise stuff extension classes */
-void
-pychannel_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 500 "channel.c"
-    pygobject_register_class(d, "XfconfChannel", XFCONF_TYPE_CHANNEL, &PyXfconfChannel_Type, Py_BuildValue("(O)", &PyGObject_Type));
-}
diff --git a/xfconf/errors.c b/xfconf/errors.c
deleted file mode 100644
index 5ff8ac0..0000000
--- a/xfconf/errors.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "errors.override"
-#include "pygobject.h"
-#include <glib.h>
-#include <xfconf/xfconf.h>
-
-#line 13 "errors.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 23 "errors.c"
-
-
-
-/* ----------- functions ----------- */
-
-const PyMethodDef pyerrors_functions[] = {
-    { NULL, NULL, 0, NULL }
-};
-
-
-/* ----------- enums and flags ----------- */
-
-void
-pyerrors_add_constants(PyObject *module, const gchar *strip_prefix)
-{
-#ifdef VERSION
-    PyModule_AddStringConstant(module, "__version__", VERSION);
-#endif
-  pyg_enum_add(module, "Error", strip_prefix, XFCONF_TYPE_ERROR);
-
-  if (PyErr_Occurred())
-    PyErr_Print();
-}
-
-/* initialise stuff extension classes */
-void
-pyerrors_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 68 "errors.c"
-}
diff --git a/xfconf/types.c b/xfconf/types.c
deleted file mode 100644
index 45547d0..0000000
--- a/xfconf/types.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -- THIS FILE IS GENERATED - DO NOT EDIT *//* -*- Mode: C; c-basic-offset: 4 -*- */
-
-#include <Python.h>
-
-
-
-#line 6 "types.override"
-#include "pygobject.h"
-#include <glib.h>
-#include <xfconf/xfconf.h>
-
-#line 13 "types.c"
-
-
-/* ---------- types from other modules ---------- */
-static PyTypeObject *_PyGObject_Type;
-#define PyGObject_Type (*_PyGObject_Type)
-
-
-/* ---------- forward type declarations ---------- */
-
-#line 23 "types.c"
-
-
-
-/* ----------- functions ----------- */
-
-const PyMethodDef pytypes_functions[] = {
-    { NULL, NULL, 0, NULL }
-};
-
-/* initialise stuff extension classes */
-void
-pytypes_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 53 "types.c"
-}



More information about the Xfce4-commits mailing list