Merge lp:~malept/awn/0.4-libdesktop-agnostic into lp:~awn-core/awn/trunk-rewrite

[Mark Lee]

[Mark Lee (malept)]

84 files changed, 2253 insertions(+), 7731 deletions(-)

[moonbeam (rcryderman)]

ok... Huge merge. I haven't reviewed it as such. I say let's just go for it and hope for the best. Anything that breaks will get fixed.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2009-07-15 17:12:11 +0000
+++ .bzrignore	2009-07-27 18:28:46 +0000
@@ -45,7 +45,6 @@
 libawn/*awn-enum-types.*
 libawn/*libawnmarshal.*
 libawn/libawn-marshal.*
-libawn/egg/*egg-enum-types.*
 bindings/python/awn.c
 awn-manager/awnDefs.py
 awn-manager/awnManager.py
@@ -77,11 +76,11 @@
 doc/reference/tmpl/*.sgml
 doc/reference/tmpl/*.sgml.bak
 doc/reference/*-scan.c
-data/awn.schemas*
+data/avant-window-navigator.schemas*
 config.h.in
 test/vala-test
 awn-manager/awn-launcher-editor
-data/awn.schema-ini
+data/avant-window-navigator.schema-ini
 src/awn
 src/awn-app-glue.h
 src/awn-panel-glue.h
@@ -93,8 +92,7 @@
 tests/test-themed-icon
 tests/test-awn-icon-box
 ./tests/test-taskmanager
-applets/taskmanager/taskmanager.schemas
-applets/taskmanager/taskmanager.schemas.in
+applets/taskmanager/awn-applet-taskmanager.schemas*
 tests/test-awn-effects
 awn-manager/awnManagerMini.py
 m4/gtk-doc.m4

=== modified file 'ChangeLog'
--- ChangeLog	2009-08-06 06:57:04 +0000
+++ ChangeLog	2009-08-06 20:35:34 +0000
@@ -1,3 +1,27 @@
[phone]  Mark Lee  <[e-mail]>
+
+	* bindings/python/Makefile.am:
+	* bindings/python/awn.defs:
+	* bindings/python/awn.override:
+	* configure.in:
+	Add/fix Python bindings with regards to functions which depend on the
+	libdesktop-agnostic Python bindings.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* applets/taskmanager/task-launcher.c:
+	* applets/taskmanager/task-manager.c:
+	* applets/taskmanager/util.c:
+	* applets/taskmanager/util.h:
+	* awn-applet-activation/main.c:
+	Update due to naming changes in the libdesktop-agnostic desktop
+	entry API.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* applets/taskmanager/task-settings.c (cfg_load_int):
+	Update due to a change in the libdesktop-agnostic config API.
+
 2009-08-06  Michal Hruby  <[e-mail]>
 
 	* libawn/awn-cairo-utils.c:
@@ -25,6 +49,23 @@
 	On TaskIcon click... Better to check if active (and then do a minimize)
 	first instead of checking if minimized (and then do a restore).
 
[phone]  Mark Lee  <[e-mail]>
+
+	* Makefile.schemas:
+	* configure.in:
+	* data/Makefile.am:
+	* data/awn-schema-to-gconf (removed):
+	* debian/awn-settings-trunk.install:
+	* debian/control:
+	Replace awn-schema-to-gconf with the equivalent program packaged
+	with libdesktop-agnostic.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* applets/taskmanager/task-manager.c:
+	Convert the launcher_paths member to a GValueArray, to avoid
+	converting to and from GSList.
+
 2009-08-04  Rodney Cryderman  <[e-mail]>
 
 	* applets/taskmanager/task-icon.c:
@@ -374,6 +415,13 @@
 	Close dialog on icon click if it is open.
 	Add some comments to the clicked signal handler.
 
[phone]  Mark Lee  <[e-mail]>
+
+	* doc/reference/libawn-docs.sgml:
+	Add the awn-config page to the documentation.
+	* libawn/awn-config.c:
+	Fix the gtk-doc documentation.
+
 2009-07-27  Rodney Cryderman  <[e-mail]>
 
 	* applets/taskmanager/task-icon.c:
@@ -525,6 +573,11 @@
 	Looks for a desktop file to associate with windows that are not 
 	already associated with a TaskLauncher.
 
[phone]  Mark Lee  <[e-mail]>
+
+	* libawn/awn-dialog.c (awn_dialog_constructed):
+	Fix typo.
+
 2009-07-24  Michal Hruby  <[e-mail]>
 
 	* awn-settings/awn-settings.xml:
@@ -641,6 +694,11 @@
 	* applets/taskmanager/task-launcher.c:
 	Small style cleanup.
 
[phone]  Mark Lee  <[e-mail]>
+
+	* libawn/awn-utils.h (awn_utils_gslist_to_gvaluearray):
+	Fix gtk-doc.
+
 2009-07-21  Michal Hruby <[e-mail]>
 
 	* data/awn.schema-ini.in:
@@ -657,6 +715,29 @@
 
 2009-07-20  Mark Lee  <[e-mail]>
 
+	* libawn/awn-overlay-text.c (awn_overlay_text_constructed,
+	  awn_overlay_text_class_init):
+	* libawn/awn-tooltip.c (awn_tooltip_get_property,
+	  awn_tooltip_set_property, awn_tooltip_finalize,
+	  awn_tooltip_class_init, ensure_tooltip, awn_tooltip_set_font_color,
+	  awn_tooltip_set_background_color):
+	* libawn/awn-tooltip.h:
+	Fix/convert color-related code.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* src/awn-applet-manager.c (awn_applet_manager_constructed,
+	  set_list_property, awn_applet_manager_set_property):
+	Fix typo.
+	Fix setting list properties.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* applets/taskmanager/awn-applet-taskmanager.schema-ini:
+	Fix schema type names.
+
[phone]  Mark Lee  <[e-mail]>
+
 	* applets/taskmanager/taskmanager.schema-ini:
 	Fix the match_strength default so that it's a valid value.
 
@@ -687,6 +768,29 @@
 	* src/awn-monitor.c:
 	Auto-config when using multiple monitors now really works.
 
[phone]  Mark Lee  <[e-mail]>
+
+	* src/awn-applet-manager.c (awn_applet_manager_get_property,
+	  awn_applet_manager_set_property, awn_applet_manager_class_init):
+	* src/awn-background.c (awn_background_set_property,
+	  awn_background_class_init):
+	* src/awn-monitor.c (awn_monitor_get_property,
+	  awn_monitor_set_property, awn_monitor_class_init):
+	* src/awn-panel.c (awn_panel_get_property, awn_panel_set_property,
+	  awn_panel_class_init):
+	Fix property types.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* libawn/awn-utils.h:
+	Fix gtk-doc.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* applets/taskmanager/task-launcher.c:
+	* awn-applet-activation/main.c:
+	Update due to the VFS API change in libdesktop-agnostic.
+
 2009-07-17  Mark Lee  <[e-mail]>
 
 	* Makefile.marshal:
@@ -704,6 +808,20 @@
 	* doc/reference/libawn.types:
 	Update the doc templates.
 
[phone]  Mark Lee  <[e-mail]>
+
+	* doc/reference/libawn-sections.txt:
+	* libawn/awn-utils.c (awn_utils_ensure_transparent_bg,
+	  awn_utils_gslist_to_gvaluearray):
+	* libawn/awn-utils.h:
+	Add awn_utils_gslist_to_gvaluearray(), to make converting between the two
+	structures easier.
+	* src/awn-applet-manager.c (awn_applet_manager_get_property,
+	  awn_ua_add_applet):
+	Convert to use the new function.
+	* src/awn-ua-alignment.c (awn_ua_alignment_plug_removed):
+	Convert to use the libdesktop-agnostic API.
+
 2009-07-17  Rodney Cryderman  <[e-mail]>
 
 	* src/awn-ua-alignment.c:
@@ -771,6 +889,26 @@
 	Improved the task matching.  Please test with a match strength
 	of 99.  Especially interested in false positives.
 
[phone]  Mark Lee  <[e-mail]>
+
+	* applets/taskmanager/task-icon.c (task_icon_dest_drag_data_received):
+	* awn-applet-activation/main.c (main):
+	* libawn/awn-utils.c (awn_vfs_init):
+	* src/awn-main.c (main):
+	Update to use the new libdesktop-agnostic VFS convenience API.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* applets/taskmanager/task-icon.c (task_icon_dispose,
+	  task_icon_finalize, do_bind_property,
+	  task_icon_constructed):
+	Convert to use the libdesktop-agnostic config API.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* data/avant-window-navigator.schema-ini.in:
+	Fix keys that should be labeled as colors.
+
 2009-07-15  Rodney Cryderman  <[e-mail]>
 
 	* applets/taskmanager/task-icon.c:
@@ -799,6 +937,19 @@
 	* applets/taskmanager/task-icon.c:
 	awn_icon_set_indicator_count() deals with values >3 intelligently.
 
[phone]  Mark Lee  <[e-mail]>
+
+	* libawn/awn-label.c (do_bind_property, awn_label_constructed,
+	  awn_label_get_property, awn_label_set_property,
+	  awn_label_class_init):
+	Convert to use the libdesktop-agnostic config API.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* bindings/python/awnmodule.c:
+	* src/awn-main.c (main):
+	Remove obsolete usage of preprocessor variable.
+
 2009-07-14  Rodney Cryderman  <[e-mail]>
 
 	* applets/taskmanager/task-icon.c:
@@ -887,6 +1038,39 @@
 	* bindings/python/Makefile.am:
 	Shave-ify the Python bindings generator command.
 
[phone]  Mark Lee  <[e-mail]>
+
+	* applets/taskmanager/task-manager.c (task_manager_class_init,
+		task_manager_size_changed, task_manager_dispose):
+	* libawn/awn-dialog.c (awn_dialog_set_property, awn_dialog_finalize):
+	* libawn/awn-icon.c (awn_icon_set_property, awn_icon_dispose):
+	* libawn/awn-overlay-text.c (awn_overlay_text_set_property,
+	  awn_overlay_text_dispose):
+	* libawn/awn-tooltip.c (awn_tooltip_set_property, awn_tooltip_dispose):
+	* src/awn-applet-manager.c (awn_applet_manager_dispose):
+	* src/awn-background.c (awn_background_finalize):
+	* src/awn-monitor.c (awn_monitor_dispose, awn_monitor_class_init):
+	* src/awn-panel.c (awn_panel_dispose):
+	Clean up the config key <-> property bindings when the object is garbage
+	collected.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* applets/taskmanager/task-icon.c:
+	* applets/taskmanager/task-launcher.c:
+	* awn-applet-activation/main.c:
+	* libawn/awn-config.h:
+	* libawn/awn-utils.c:
+	* src/awn-main.c:
+	* src/awn-monitor.h:
+	* src/awn-panel.h:
+	Update #includes due to libdesktop-agnostic changes.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* libawn/awn-defines.h (AWN_PANEL_ID_DEFAULT):
+	Fix gtk-doc.
+
 2009-07-12  Rodney Cryderman  <[e-mail]>
 
 	* libawn/awn-themed-icon.c:
@@ -1003,6 +1187,11 @@
 	awn-applet-activation -> awn-applet.
 	Attempt to rename the process was removed.
 
[phone]  Mark Lee  <[e-mail]>
+
+	* libawn/awn-config.c:
+	Handle single-instance applets when the mode is denoted in the UID.
+
 2009-07-08  Michal Hruby  <[e-mail]>
 
 	* libawn/awn-applet.c:
@@ -1017,6 +1206,26 @@
 	A couple of changes to get proper shape mask support.
 	Started the workaround for D&D deadzone.
 
[phone]  Mark Lee  <[e-mail]>
+
+	* data/avant-window-navigator.schema-ini.in:
+	Fix shared config option types.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* awn.pc.in:
+	Remove obsolete variable from pkgconfig file.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* applets/taskmanager/task-settings.c (cfg_notify_int):
+	Update due to API change in libdesktop-agnostic.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* applets/taskmanager/task-manager.c:
+	Launchers work again.
+
 2009-07-06  Mark Lee  <[e-mail]>
 
 	* doc/reference/libawn-sections.txt:
@@ -1033,6 +1242,24 @@
 
 2009-07-06  Mark Lee  <[e-mail]>
 
+	* data/awn-schema-to-gconf (main):
+	The third argument is now mandatory.
+	Applets are no longer nested in the avant-window-navigator directory.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* Makefile.marshal:
+	* Makefile.schemas:
+	* Makefile.shave:
+	* applets/taskmanager/Makefile.am:
+	* data/Makefile.am:
+	* src/Makefile.am:
+	Modularize the shave-related variables into its own Makefile.
+	Modularize the schema-related variables/rules into its own Makefile.
+	Use shave when generating the GConf schemas.
+
[phone]  Mark Lee  <[e-mail]>
+
 	* .bzrignore:
 	* data/Makefile.am:
 	* data/awn.schema-ini.in:
@@ -1041,6 +1268,24 @@
 
 2009-07-06  Mark Lee  <[e-mail]>
 
+	* data/awn-schema-to-gconf:
+	Make sure types are converted properly.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* data/avant-window-navigator.schema-ini.in:
+	Fix types.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* applets/taskmanager/Makefile.am:
+	* configure.in:
+	* data/Makefile.am:
+	Only install the schema files if requested.
+	Make the schema config conversion rule more generic.
+
[phone]  Mark Lee  <[e-mail]>
+
 	* applets/expander/Makefile.am:
 	Remove unnecessary linking.
 
@@ -1102,6 +1347,29 @@
 	* tests/test-effects.py:
 	Various fixes.
 
[phone]  Mark Lee  <[e-mail]>
+
+	* .bzrignore:
+	* applets/taskmanager/Makefile.am:
+	* applets/taskmanager/awn-applet-taskmanager.schema-ini:
+	Rename schema file.
+	* applets/taskmanager/task-manager.c (task_manager_get_property,
+	  task_manager_set_property, task_manager_constructed):
+	Continue converting taskmanager to use the libdesktop-agnostic config
+	API.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* libawn/awn-config.c (awn_config_get_default,
+	  awn_config_get_default_for_applet,
+	  awn_config_get_default_for_applet_by_info):
+	Implement the convenience methods for creating applet config objects.
+	Fix potential crasher.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* libawn/awn-dialog.c:
+	Convert color properties to be of type DesktopAgnosticColor*.
 2009-07-04  Mark Lee  <[e-mail]>
 
 	* applets/taskmanager/task-item.c (task_item_init):
@@ -1113,6 +1381,88 @@
 	Fix typo.
 	Make sure taskmanager defines the canonical-name property.
 
[phone]  Mark Lee  <[e-mail]>
+
+	* libawn/awn-config.c:
+	* libawn/awn-config.h:
+	Added.
+
+	* libawn/awn-config-bridge.c:
+	* libawn/awn-config-bridge.h:
+	* libawn/awn-config-client-gconf.c:
+	* libawn/awn-config-client-gkeyfile.c:
+	* libawn/awn-config-client-shared.c:
+	* libawn/awn-config-client.h:
+	* tests/test-config-client.c:
+	* tests/test-config-client.py:
+	Removed.
+
+	* bindings/python/awn.defs:
+	* bindings/python/awn.override:
+	Remove bindings.
+
+	* data/Makefile.am:
+	* data/avant-window-navigator.schema-ini.in:
+	Rename schema files.
+
+	* doc/reference/libawn-docs.sgml:
+	* doc/reference/libawn-sections.txt:
+	* doc/reference/libawn.types:
+	Update documentation templates.
+
+	* libawn/awn-defines.h (AWN_PANEL_ID_DEFAULT):
+	Add default panel ID constant.
+
+	* .bzrignore:
+	* applets/taskmanager/Makefile.am:
+	* applets/taskmanager/task-manager.c (task_manager_constructed,
+	  _drag_source_end):
+	* applets/taskmanager/task-settings.c (cfg_notify_int, cfg_load_int,
+	  task_settings_get_default):
+	* configure.in:
+	* libawn/Makefile.am:
+	* libawn/awn-dialog.c (awn_dialog_constructed, awn_dialog_get_property,
+	  awn_dialog_set_property, awn_dialog_finalize):
+	* libawn/awn-effects.c:
+	* libawn/awn-effects.h:
+	* libawn/awn-icon.c (awn_icon_constructed, awn_icon_set_property,
+	  awn_icon_dispose):
+	* libawn/awn-overlay-text.c (awn_overlay_text_set_property,
+	  awn_overlay_text_dispose, awn_overlay_text_init):
+	* libawn/awn-tooltip.c (awn_tooltip_constructed, awn_tooltip_set_property,
+				awn_tooltip_init):
+	* libawn/libawn.h:
+	* src/awn-app.c (awn_app_finalize, awn_app_init):
+	* src/awn-applet-manager.c (awn_applet_manager_constructed,
+	  awn_applet_manager_get_property, awn_applet_manager_set_property,
+	  awn_applet_manager_class_init, awn_applet_manager_new_from_config,
+	  free_list):
+	* src/awn-applet-manager.h:
+	* src/awn-applet-proxy.h:
+	* src/awn-background-3d.c (awn_background_3d_new):
+	* src/awn-background-3d.h:
+	* src/awn-background-curves.c (awn_background_curves_new):
+	* src/awn-background-curves.h:
+	* src/awn-background-edgy.c (awn_background_edgy_new):
+	* src/awn-background-edgy.h:
+	* src/awn-background-flat.c (awn_background_flat_new):
+	* src/awn-background-flat.h:
+	* src/awn-background.c (awn_background_constructed,
+	  awn_background_get_property, awn_background_set_property,
+	  awn_background_class_init, set_cfg_from_theme,
+	  load_colours_from_widget):
+	* src/awn-background.h:
+	* src/awn-monitor.c (awn_monitor_constructed, awn_monitor_class_init,
+	  awn_monitor_new_from_config):
+	* src/awn-monitor.h (geometry_changed):
+	* src/awn-panel.c (awn_panel_constructed, awn_panel_class_init,
+	  awn_panel_new_from_config):
+	* src/awn-panel.h:
+	* tests/Makefile.am:
+	The first part of converting Awn to use the libdesktop-agnostic
+	configuration API. The applet convenience methods still need to be
+	implemented.
+
 2009-07-04  Michal Hruby  <[e-mail]>
 
 	* libawn/awn-dialog.c:
@@ -1341,6 +1691,14 @@
 	* doc/reference/libawn-sections.txt:
 	Update the gtk-doc generated sections file.
 
[phone]  Mark Lee  <[e-mail]>
+
+	* doc/reference/libawn-sections.txt:
+	* libawn/awn-cairo-utils.c:
+	* libawn/awn-cairo-utils.h:
+	Update the cairo color convenience functions to use the libdesktop-agnostic
+	cairo color convenience API.
+
 2009-06-27  Julien Lavergne <[e-mail]>
 
 	* awn-settings/awn-settings.xml:
@@ -1826,6 +2184,18 @@
 
 2009-06-19  Mark Lee  <[e-mail]>
 
+	* .bzrignore:
+	* configure.in:
+	* doc/reference/Makefile.am:
+	Remove remnants of the old libawn/egg directory.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* applets/taskmanager/task-launcher.c:
+	Remove unused variable.
+
[phone]  Mark Lee  <[e-mail]>
+
 	* bindings/python/awn.override:
 	* libawn/libawn.h:
 	Clean up headers.
@@ -2524,6 +2894,11 @@
 
 2009-06-07  Mark Lee  <[e-mail]>
 
+	* awn-applet-activation/main.c:
+	Fix typo.
+
[phone]  Mark Lee  <[e-mail]>
+
 	* doc/reference/libawn-docs.sgml:
 	Update/reorganize the table of contents.
 
@@ -2554,6 +2929,12 @@
 
 2009-06-07  Mark Lee  <[e-mail]>
 
+	* doc/reference/libawn-sections.txt:
+	* doc/reference/libawn.types:
+	Update, given the libdesktop-agnostic-related changes.
+
[phone]  Mark Lee  <[e-mail]>
+
 	* doc/reference/tmpl/awn-applet-dialog.sgml:
 	* doc/reference/tmpl/awn-applet-simple.sgml:
 	* doc/reference/tmpl/awn-applet.sgml:
@@ -2867,6 +3248,13 @@
 	* libawn/awn-dialog.c:
 	Fix issue with titlebar spacing.
 
[phone]  Mark Lee  <[e-mail]>
+
+	* applets/taskmanager/task-launcher.c:
+	* awn-applet-activation/main.c:
+	* libawn/awn-config-client-gkeyfile.c:
+	Use the updated libdesktop-agnostic API.
+
 2009-05-30  Michal Hruby <[e-mail]>
 
 	* libawn/awn-cairo-utils.c:
@@ -2914,6 +3302,29 @@
 
 2009-05-22  Mark Lee  <[e-mail]>
 
+	* bindings/python/awn.defs:
+	* libawn/awn-utils.c:
+	* libawn/awn-utils.h:
+	Re-add awn_vfs_init () until one can access libdesktop-agnostic
+	from Python.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* applets/taskmanager/task-launcher.c:
+	* awn-applet-activation/main.c:
+	* bindings/python/awn.defs:
+	* bindings/python/awn.override:
+	* configure.in:
+	* libawn/Makefile.am:
+	* libawn/awn-desktop-item.h:
+	* libawn/awn-desktop-item-egg.c:
+	* libawn/egg/:
+	* libawn/libawn.h:
+	Replace AwnDesktopItem/EggDesktopFile with the equivalent API in
+	libdesktop-agnostic.
+
[phone]  Mark Lee  <[e-mail]>
+
 	* INSTALL:
 	Update.
 
@@ -2940,6 +3351,18 @@
 
 2009-05-12  Mark Lee  <[e-mail]>
 
+	* libawn/awn-vfs.c:
+	* libawn/awn-vfs.h:
+	Removed (obsoleted by libdesktop-agnostic).
+
+	* bindings/python/awn.override:
+	* configure.in:
+	* libawn/Makefile.am:
+	* libawn/libawn.h:
+	Remove references of the removed files and their dependencies.
+
[phone]  Mark Lee  <[e-mail]>
+
 	* src/awn-background.c:
 	Fix the default values of the color properties to use the
 	libdesktop-agnostic syntax.
@@ -3003,6 +3426,25 @@
 2009-04-25  Mark Lee  <[e-mail]>
 
 	* applets/taskmanager/task-icon.c:
+	* awn-applet-activation/main.c:
+	* libawn/awn-cairo-utils.h:
+	* libawn/awn-config-client-gkeyfile.c:
+	* libawn/awn-dialog.c:
+	* libawn/awn-tooltip.c:
+	* src/awn-background.c:
+	* src/awn-background.h:
+	* src/awn-main.c:
+	The libdesktop-agnostic headers have been consolidated into a single
+	header; use that instead.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* debian/control:
+	Add libdesktop-agnostic dependencies.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* applets/taskmanager/task-icon.c:
 	* libawn/Makefile.am:
 	* libawn/awn-applet.c:
 	* libawn/awn-dialog.c:
@@ -3020,6 +3462,28 @@
 	* libawn/awn-cairo-utils.c:
 	Fix variable shadowing errors.
 
[phone]  Mark Lee  <[e-mail]>
+
+	* libawn/awn-config-client-gkeyfile.c:
+	Convert to use the libdesktop-agnostic VFS implementation. Only tested
+	to see if it compiled correctly.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* src/awn-main.c:
+	Convert to use the libdesktop-agnostic VFS implementation (currently
+	used only if the gkeyfile config backend is used).
+
[phone]  Mark Lee  <[e-mail]>
+
+	* applets/taskmanager/task-icon.c:
+	Convert to use the libdesktop-agnostic VFS implementation.
+
[phone]  Mark Lee  <[e-mail]>
+
+	* awn-applet-activation/main.c:
+	Convert to use the libdesktop-agnostic VFS implementation.
+
 2009-04-20  Mark Lee  <[e-mail]>
 
 	reviewed by: R. Cryderman <[e-mail]>
@@ -5021,7 +5485,6 @@
 	* libawn/awn-icons.h:
 	Added awn_icons_get_icon_at_height() to awn-icons.
 
->>>>>>> MERGE-SOURCE
 2008-07-13  Rodney Cryderman <[e-mail]>
 
 	* libawn/awn-icons.c:

=== added file 'Makefile.schemas'
--- Makefile.schemas	1970-01-01 00:00:00 +0000
+++ Makefile.schemas	2009-08-05 07:18:27 +0000
@@ -0,0 +1,25 @@
+# requires Makefile.shave
+
+# Usage
+# -----
+# 1. Set the schema_DATA variable to the schema-ini file(s) to install.
+# 2. Add install-gconf-schemas to the install-data-local rule dependencies.
+
+if GCONF_SCHEMAS_INSTALL
+schemasdir       = @GCONF_SCHEMA_FILE_DIR@
+schemas_in_files = $(schema_DATA:.schema-ini=.schemas.in)
+schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+
+%.schemas.in: %.schema-ini
+	$(QUIET_GEN)$(LDA_BINDIR)/lda-schema-to-gconf $< $@
+
+@INTLTOOL_SCHEMAS_RULE@
+
+install-gconf-schemas: $(schemas_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA)
+else
+install-gconf-schemas:
+endif
+
+schemadir = $(pkgdatadir)/schemas
+# vim: set ft=automake noet ts=8 sts=8 sw=8 :

=== added file 'Makefile.shave'
--- Makefile.shave	1970-01-01 00:00:00 +0000
+++ Makefile.shave	2009-07-06 23:38:20 +0000
@@ -0,0 +1,4 @@
+# shave-related
+V         = @
+Q         = $(V:1=)
+QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)

=== removed file 'Makefile.shave'
--- Makefile.shave	2009-07-18 07:00:32 +0000
+++ Makefile.shave	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-# shave-related
-V         = @
-Q         = $(V:1=)
-QUIET_GEN = $(Q:@=@echo '  GEN   '$@;)

=== modified file 'applets/taskmanager/Makefile.am'
--- applets/taskmanager/Makefile.am	2009-07-28 01:24:31 +0000
+++ applets/taskmanager/Makefile.am	2009-07-31 18:34:39 +0000
@@ -1,6 +1,7 @@
 include $(top_srcdir)/Makefile.shave
 MARSHAL_PREFIX = taskmanager
 include $(top_srcdir)/Makefile.marshal
+include $(top_srcdir)/Makefile.schemas
 
 AM_CPPFLAGS = \
 	$(STANDARD_CPPFLAGS) \
@@ -58,27 +59,7 @@
 desktop_DATA = taskmanager.desktop
 @INTLTOOL_DESKTOP_RULE@
 
-if USE_GCONF
-schemasdir       = @GCONF_SCHEMA_FILE_DIR@
-schemas_in_files = taskmanager.schemas.in
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-
-taskmanager.schemas.in: taskmanager.schema-ini
-	$(top_srcdir)/data/awn-schema-to-gconf $< $@ "taskmanager"
-
-@INTLTOOL_SCHEMAS_RULE@
-
-if GCONF_SCHEMAS_INSTALL
-install-gconf-schemas: $(schemas_DATA)
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA)
-else
-install-gconf-schemas:
-endif
-else
-install-gconf-schemas:
-endif
-schemadir = $(pkgdatadir)/schemas
-schema_DATA = taskmanager.schema-ini
+schema_DATA = awn-applet-taskmanager.schema-ini
 
 install-data-local: install-gconf-schemas
 
@@ -89,4 +70,4 @@
 	$(NULL)
 
 EXTRA_DIST = $(desktop_DATA).in.in $(schema_DATA)
-CLEANFILES = $(desktop_DATA) $(shemas_in_files) $(schemas_DATA) $(BUILT_SOURCES)
+CLEANFILES = $(desktop_DATA) $(schemas_in_files) $(schemas_DATA) $(BUILT_SOURCES)

=== renamed file 'applets/taskmanager/taskmanager.schema-ini' => 'applets/taskmanager/awn-applet-taskmanager.schema-ini'
--- applets/taskmanager/taskmanager.schema-ini	2009-08-03 04:06:27 +0000
+++ applets/taskmanager/awn-applet-taskmanager.schema-ini	2009-08-05 04:06:09 +0000
@@ -1,10 +1,18 @@
+# Task Manager configuration schema
+# ---------------------------------
+
+# schema metadata
+[DEFAULT]
+single_instance = false
+
+# configuration options
 [DEFAULT/only_show_launchers]
-type = bool
+type = boolean
 default = false
 description = Only show and manager launcher windows
 
 [DEFAULT/show_all_windows]
-type = bool
+type = boolean
 default = true
 description = Show windows from all workspaces
 
@@ -14,31 +22,33 @@
 description = a list of paths to .desktop files from which the taskmanager should create it's launchers
 
 [DEFAULT/drag_and_drop]
-type = bool
+type = boolean
 default = true
 description = Enable reordering of windows by drag and drop 
 
 [DEFAULT/grouping]
-type = bool
+type = boolean
 default = true
 description = Enabling group of tasks.
 
 [DEFAULT/match_strength]
-type = int
+type = integer
 default = 99
 description = How radical matching is applied for grouping items. The value should be between 0 and 99. 0 is as good as no grouping. 99 will match almost everything.
 
 [DEFAULT/max_indicators]
-type = int
+type = integer
 default = 3
 description = Maximum number of task indicators to show under icons. Valid range is 0..3.
 
 [DEFAULT/txt_indicator_threshold]
-type = int
+type = integer
 default = 4
 description = The threshold at which text count begins to be displayed. valid range 1..
 
 [DEFAULT/enable_long_press]
-type = bool
+type = boolean
 default = true
 description = Enable long press to open Dialog.
+
+# vim: set ft=dosini :

=== modified file 'applets/taskmanager/task-icon.c'
--- applets/taskmanager/task-icon.c	2009-08-06 04:16:03 +0000
+++ applets/taskmanager/task-icon.c	2009-08-06 19:16:07 +0000
@@ -28,6 +28,7 @@
 
 #include <libwnck/libwnck.h>
 
+#include <libdesktop-agnostic/vfs.h>
 #include "libawn/gseal-transition.h"
 
 #include "taskmanager-marshal.h"
@@ -68,8 +69,8 @@
   //An overlay for showing number of items
   AwnOverlayText *overlay_text;
 
-  //A Config client
-  AwnConfigClient * client;
+  // Config client
+  DesktopAgnosticConfigClient *client;
   
   GdkPixbuf *icon;
   AwnApplet *applet;
@@ -288,6 +289,9 @@
 task_icon_dispose (GObject *object)
 {
   TaskIconPrivate *priv = TASK_ICON_GET_PRIVATE (object);
+
+  desktop_agnostic_config_client_unbind_all_for_object (priv->client, object,
+                                                        NULL);
   
   /*this needs to be done in dispose, not finalize, due to idiosyncracies of 
    AwnDialog*/
@@ -296,11 +300,6 @@
     gtk_widget_destroy (priv->dialog);
     priv->dialog = NULL;
   }
-  if (priv->client)
-  {
-    awn_config_client_free(priv->client);
-    priv->client = NULL;
-  }
   if (priv->overlay_text)
   {
     g_object_unref (priv->overlay_text);
@@ -331,12 +330,34 @@
   G_OBJECT_CLASS (task_icon_parent_class)->finalize (object);
 }
 
+static gboolean
+do_bind_property (DesktopAgnosticConfigClient *client, const gchar *key,
+                  GObject *object, const gchar *property)
+{
+  GError *error = NULL;
+  
+  desktop_agnostic_config_client_bind (client,
+                                       DESKTOP_AGNOSTIC_CONFIG_GROUP_DEFAULT,
+                                       key, object, property, TRUE,
+                                       DESKTOP_AGNOSTIC_CONFIG_BIND_METHOD_FALLBACK,
+                                       &error);
+  if (error)
+  {
+    g_warning ("Could not bind property '%s' to key '%s': %s", property, key,
+               error->message);
+    g_error_free (error);
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
 static void
 task_icon_constructed (GObject *object)
 {
-  AwnConfigBridge    *bridge;
   TaskIconPrivate *priv = TASK_ICON (object)->priv;
   GtkWidget *widget = GTK_WIDGET(object);  
+  GError *error = NULL;
 
   if ( G_OBJECT_CLASS (task_icon_parent_class)->constructed)
   {
@@ -355,20 +376,33 @@
   //update geometry of icon every second.
   priv->update_geometry_id = g_timeout_add_seconds (1, (GSourceFunc)_update_geometry, widget);
 
-  priv->client = awn_config_client_new_for_applet ("taskmanager", NULL);
-  bridge = awn_config_bridge_get_default ();
+  priv->client = awn_config_get_default_for_applet (priv->applet, &error);
+
+  if (error)
+  {
+    g_warning ("Could not get the applet's configuration object: %s",
+               error->message);
+    g_error_free (error);
+    return;
+  }
   
-  awn_config_bridge_bind (bridge, priv->client,
-                          AWN_CONFIG_CLIENT_DEFAULT_GROUP, "max_indicators",
-                          object, "max_indicators");  
-
-  awn_config_bridge_bind (bridge, priv->client,
-                          AWN_CONFIG_CLIENT_DEFAULT_GROUP, "txt_indicator_threshold",
-                          object, "txt_indicator_threshold");
-
-  awn_config_bridge_bind (bridge, priv->client,
-                          AWN_CONFIG_CLIENT_DEFAULT_GROUP, "enable_long_press",
-                          object, "enable_long_press");
+  if (!do_bind_property (priv->client, "max_indicators", object,
+                         "max_indicators"))
+  {
+    return;
+  }
+
+  if (!do_bind_property (priv->client, "txt_indicator_threshold", object,
+                         "txt_indicator_threshold"))
+  {
+    return;
+  }
+
+  if (!do_bind_property (priv->client, "enable_long_press", object,
+                         "enable_long_press"))
+  {
+    return;
+  }
 }
 
 /**
@@ -2137,7 +2171,8 @@
   //}
   
   error = NULL;
-  list = awn_vfs_get_pathlist_from_string (sdata_data, &error);
+
+  list = desktop_agnostic_vfs_files_from_uri_list (sdata_data, &error);
   if (error)
   {
     g_warning ("Unable to handle drop: %s", error->message);

=== modified file 'applets/taskmanager/task-launcher.c'
--- applets/taskmanager/task-launcher.c	2009-08-03 18:30:37 +0000
+++ applets/taskmanager/task-launcher.c	2009-08-06 19:54:39 +0000
@@ -27,6 +27,7 @@
 #include <libwnck/libwnck.h>
 #include <glib/gi18n.h>
 
+#include <libdesktop-agnostic/fdo.h>
 #undef G_DISABLE_SINGLE_INCLUDES
 #include <glibtop/procargs.h>
 #include <glibtop/procuid.h>
@@ -48,13 +49,13 @@
 
 struct _TaskLauncherPrivate
 {
-  gchar          *path;
-  AwnDesktopItem *item;
+  gchar *path;
+  DesktopAgnosticFDODesktopEntry *entry;
 
-  gchar *name;
-  gchar *exec;
-  gchar *icon_name;
-  gint   pid;
+  const gchar *name;
+  const gchar *exec;
+  const gchar *icon_name;
+  GPid   pid;
   glong timestamp;
   
   GtkWidget     *menu;
@@ -184,7 +185,7 @@
   priv = launcher->priv = TASK_LAUNCHER_GET_PRIVATE (launcher);
   
   priv->path = NULL;
-  priv->item = NULL;
+  priv->entry = NULL;
 }
 
 TaskItem * 
@@ -214,43 +215,53 @@
 task_launcher_set_desktop_file (TaskLauncher *launcher, const gchar *path)
 {
   TaskLauncherPrivate *priv;
-  TaskSettings * s = task_settings_get_default ();
+  DesktopAgnosticVFSFile *file;
+  GError *error = NULL;
   GdkPixbuf *pixbuf;
-  gchar * exec_key = NULL;
-  gchar * needle = NULL;
  
   g_return_if_fail (TASK_IS_LAUNCHER (launcher));
   priv = launcher->priv;
 
   priv->path = g_strdup (path);
 
-  priv->item = awn_desktop_item_new (path);
-
-  if (priv->item == NULL)
-    return;
-
-  priv->special_id = get_special_id_from_desktop(priv->item);
-  priv->name = awn_desktop_item_get_name (priv->item);
-
-  exec_key = g_strstrip (awn_desktop_item_get_exec (priv->item) );
+  file = desktop_agnostic_vfs_file_new_for_path (path, &error);
+
+  if (error)
+  {
+    g_critical ("Error when trying to load the launcher: %s", error->message);
+    g_error_free (error);
+    return;
+  }
+
+  if (file == NULL || !desktop_agnostic_vfs_file_exists (file))
+  {
+    g_critical ("File not found: '%s'", path);
+    return;
+  }
+
+  priv->entry = desktop_agnostic_fdo_desktop_entry_new_for_file (file, &error);
+
+  if (error)
+  {
+    g_critical ("Error when trying to load the launcher: %s", error->message);
+    g_error_free (error);
+    return;
+  }
+
+  if (priv->entry == NULL)
+  {
+    return;
+  }
+
+  priv->special_id = get_special_id_from_desktop(priv->entry);
+  priv->name = desktop_agnostic_fdo_desktop_entry_get_name (priv->entry);
+
+  priv->exec = g_strstrip (desktop_agnostic_fdo_desktop_entry_get_string (priv->entry, "Exec"));
   
-  /*do we have have any % chars? if so... then find the first one , 
-   and truncate
-   
-   There is an open question if we should remove any of other command line 
-   args... for now leaving things alone as long as their is no %
-   */
-  needle = strchr (exec_key,'%');
-  if (needle)
-  {
-	  *needle = '\0';
-	  g_strstrip (exec_key);
-  }
-  priv->exec = exec_key;
-  priv->icon_name = awn_desktop_item_get_icon_name (priv->item);
+  priv->icon_name = desktop_agnostic_fdo_desktop_entry_get_icon (priv->entry);
 
   task_item_emit_name_changed (TASK_ITEM (launcher), priv->name);
-  pixbuf = awn_desktop_item_get_icon (priv->item, s->panel_size);
+  pixbuf = _get_icon (TASK_ITEM (launcher));
   task_item_emit_icon_changed (TASK_ITEM (launcher), pixbuf);
   g_object_unref (pixbuf);
   task_item_emit_visible_changed (TASK_ITEM (launcher), TRUE);
@@ -271,9 +282,32 @@
 static GdkPixbuf * 
 _get_icon (TaskItem *item)
 {
+  TaskLauncherPrivate *priv = TASK_LAUNCHER (item)->priv;
   TaskSettings *s = task_settings_get_default ();
-
-  return awn_desktop_item_get_icon (TASK_LAUNCHER (item)->priv->item, s->panel_size);
+  GError *error = NULL;
+  GdkPixbuf *pixbuf = NULL;
+
+  if (g_path_is_absolute (priv->icon_name))
+  {
+    pixbuf = gdk_pixbuf_new_from_file_at_scale (priv->icon_name,
+                                                s->panel_size, s->panel_size,
+                                                TRUE, &error);
+  }
+  else
+  {
+    GtkIconTheme *icon_theme = gtk_icon_theme_get_default ();
+
+    pixbuf = gtk_icon_theme_load_icon (icon_theme, priv->icon_name,
+                                       s->panel_size, 0, &error);
+  }
+  if (error)
+  {
+    g_warning ("The launcher '%s' could not load the icon '%s': %s",
+               priv->path, priv->icon_name, error->message);
+    g_error_free (error);
+    return NULL;
+  }
+  return pixbuf;
 }
 
 static gboolean
@@ -467,7 +501,7 @@
       /* is the launcher pid set?*/
       if (priv->pid)
       {
-        gchar * name = awn_desktop_item_get_name (priv->item);
+        gchar *name = desktop_agnostic_fdo_desktop_entry_get_name (priv->entry);
         GStrv tokens = g_strsplit (name, " ",-1);
         if (tokens && tokens[0] && (strlen (tokens[0])>5) )
         {
@@ -513,10 +547,12 @@
   launcher = TASK_LAUNCHER (item);
   priv = launcher->priv;
 
-  priv->pid = awn_desktop_item_launch (priv->item, NULL, &error);
+  priv->pid = 
+    desktop_agnostic_fdo_desktop_entry_launch (priv->entry,
+                                               0, NULL, &error);
   g_get_current_time (&timeval);
   priv->timestamp = timeval.tv_sec;
-  
+
 #ifdef DEBUG  
   g_debug ("%s: current time = %ld",__func__,timeval.tv_sec);  
   g_debug ("%s: launch pid = %d",__func__,priv->pid);
@@ -579,7 +615,8 @@
   launcher = TASK_LAUNCHER (item);
   priv = launcher->priv;
 
-  priv->pid = awn_desktop_item_launch (priv->item, NULL, &error);
+  priv->pid = desktop_agnostic_fdo_desktop_entry_launch (priv->entry, 0,
+                                                         NULL, &error);
 
   if (error)
   {
@@ -601,8 +638,9 @@
   
   g_return_if_fail (TASK_IS_LAUNCHER (launcher));
 
-  launcher->priv->pid = awn_desktop_item_launch (launcher->priv->item,
-                                                 list, &error);
+  launcher->priv->pid =
+    desktop_agnostic_fdo_desktop_entry_launch (launcher->priv->entry,
+                                               0, list, &error);
 
   if (error)
   {

=== modified file 'applets/taskmanager/task-manager.c'
--- applets/taskmanager/task-manager.c	2009-08-05 17:08:03 +0000
+++ applets/taskmanager/task-manager.c	2009-08-06 19:54:39 +0000
@@ -56,7 +56,7 @@
 
 struct _TaskManagerPrivate
 {
-  AwnConfigClient *client;
+  DesktopAgnosticConfigClient *client;
   TaskSettings    *settings;
   WnckScreen      *screen;
 
@@ -72,12 +72,12 @@
   GHashTable *win_table;
 
   /* Properties */
-  GSList   *launcher_paths;
-  gboolean  show_all_windows;
-  gboolean  only_show_launchers;
-  gboolean  drag_and_drop;
-  gboolean  grouping;
-  gint      match_strength;
+  GValueArray *launcher_paths;
+  gboolean     show_all_windows;
+  gboolean     only_show_launchers;
+  gboolean     drag_and_drop;
+  gboolean     grouping;
+  gint         match_strength;
 };
 
 enum
@@ -111,7 +111,7 @@
 static void task_manager_set_show_only_launchers (TaskManager *manager, 
                                                   gboolean     show_only);
 static void task_manager_refresh_launcher_paths  (TaskManager *manager,
-                                                  GSList      *list);
+                                                  GValueArray *list);
 static void task_manager_set_drag_and_drop (TaskManager *manager, 
                                             gboolean     drag_and_drop);
 
@@ -126,6 +126,8 @@
 static void task_manager_size_changed   (AwnApplet *applet,
                                          gint       size);
 
+static void task_manager_dispose (GObject *object);
+
 typedef enum 
 {
   TASK_MANAGER_ERROR_UNSUPPORTED_WINDOW_TYPE,
@@ -175,9 +177,8 @@
       break;
 
     case PROP_LAUNCHER_PATHS:
-      g_value_set_pointer (value, manager->priv->launcher_paths);
+      g_value_set_boxed (value, manager->priv->launcher_paths);
       break;
-
     case PROP_DRAG_AND_DROP:
       g_value_set_boolean (value, manager->priv->drag_and_drop);
       break;
@@ -215,10 +216,15 @@
       break;
 
     case PROP_LAUNCHER_PATHS:
-      task_manager_refresh_launcher_paths (manager, 
-                                           g_value_get_pointer (value));
+      if (manager->priv->launcher_paths)
+      {
+        g_value_array_free (manager->priv->launcher_paths);
+        manager->priv->launcher_paths = NULL;
+      }
+      manager->priv->launcher_paths = (GValueArray*)g_value_dup_boxed (value);
+      task_manager_refresh_launcher_paths (manager,
+                                           manager->priv->launcher_paths);
       break;
-
     case PROP_DRAG_AND_DROP:
       task_manager_set_drag_and_drop (manager, 
                                       g_value_get_boolean (value));
@@ -243,9 +249,7 @@
 task_manager_constructed (GObject *object)
 {
   TaskManagerPrivate *priv;
-  AwnConfigBridge    *bridge;
   GtkWidget          *widget;
-  gchar              *uid = NULL;
 
   G_OBJECT_CLASS (task_manager_parent_class)->constructed (object);
   
@@ -253,35 +257,46 @@
   widget = GTK_WIDGET (object);
 
   priv->settings = task_settings_get_default ();
-  /* Load the uid */
-  /* FIXME: AwnConfigClient needs to associate the default schema when uid is
-   * used
-   */
-  g_object_get (object, "uid", &uid, NULL);
-  priv->client = awn_config_client_new_for_applet ("taskmanager", NULL);
-  g_free (uid);
+
+  priv->client = awn_config_get_default_for_applet (AWN_APPLET (object), NULL);
 
   /* Connect up the important bits */
-  bridge = awn_config_bridge_get_default ();
-  awn_config_bridge_bind (bridge, priv->client, 
-                          AWN_CONFIG_CLIENT_DEFAULT_GROUP, "show_all_windows", 
-                          object, "show_all_windows");
-  awn_config_bridge_bind (bridge, priv->client, 
-                        AWN_CONFIG_CLIENT_DEFAULT_GROUP, "only_show_launchers", 
-                          object, "only_show_launchers");
-  awn_config_bridge_bind_list (bridge, priv->client, 
-                             AWN_CONFIG_CLIENT_DEFAULT_GROUP, "launcher_paths",
-                             AWN_CONFIG_CLIENT_LIST_TYPE_STRING,
-                             object, "launcher_paths");
-  awn_config_bridge_bind (bridge, priv->client, 
-                          AWN_CONFIG_CLIENT_DEFAULT_GROUP, "drag_and_drop",
-                          object, "drag_and_drop");
-  awn_config_bridge_bind (bridge, priv->client, 
-                          AWN_CONFIG_CLIENT_DEFAULT_GROUP, "grouping",
-                          object, "grouping");  
-  awn_config_bridge_bind (bridge, priv->client, 
-                          AWN_CONFIG_CLIENT_DEFAULT_GROUP, "match_strength",
-                          object, "match_strength");
+  desktop_agnostic_config_client_bind (priv->client,
+                                       DESKTOP_AGNOSTIC_CONFIG_GROUP_DEFAULT,
+                                       "show_all_windows",
+                                       object, "show_all_windows", TRUE,
+                                       DESKTOP_AGNOSTIC_CONFIG_BIND_METHOD_FALLBACK,
+                                       NULL);
+  desktop_agnostic_config_client_bind (priv->client,
+                                       DESKTOP_AGNOSTIC_CONFIG_GROUP_DEFAULT,
+                                       "only_show_launchers",
+                                       object, "only_show_launchers", TRUE,
+                                       DESKTOP_AGNOSTIC_CONFIG_BIND_METHOD_FALLBACK,
+                                       NULL);
+  desktop_agnostic_config_client_bind (priv->client,
+                                       DESKTOP_AGNOSTIC_CONFIG_GROUP_DEFAULT,
+                                       "launcher_paths",
+                                       object, "launcher_paths", FALSE,
+                                       DESKTOP_AGNOSTIC_CONFIG_BIND_METHOD_FALLBACK,
+                                       NULL);
+  desktop_agnostic_config_client_bind (priv->client,
+                                       DESKTOP_AGNOSTIC_CONFIG_GROUP_DEFAULT,
+                                       "drag_and_drop",
+                                       object, "drag_and_drop", TRUE,
+                                       DESKTOP_AGNOSTIC_CONFIG_BIND_METHOD_FALLBACK,
+                                       NULL);
+  desktop_agnostic_config_client_bind (priv->client,
+                                       DESKTOP_AGNOSTIC_CONFIG_GROUP_DEFAULT,
+                                       "grouping",
+                                       object, "grouping", TRUE,
+                                       DESKTOP_AGNOSTIC_CONFIG_BIND_METHOD_FALLBACK,
+                                       NULL);
+  desktop_agnostic_config_client_bind (priv->client,
+                                       DESKTOP_AGNOSTIC_CONFIG_GROUP_DEFAULT,
+                                       "match_strength",
+                                       object, "match_strength", TRUE,
+                                       DESKTOP_AGNOSTIC_CONFIG_BIND_METHOD_FALLBACK,
+                                       NULL);
 }
 
 static void
@@ -294,6 +309,7 @@
   obj_class->constructed = task_manager_constructed;
   obj_class->set_property = task_manager_set_property;
   obj_class->get_property = task_manager_get_property;
+  obj_class->dispose = task_manager_dispose;
 
   app_class->orient_changed = task_manager_orient_changed;
   app_class->size_changed   = task_manager_size_changed;
@@ -313,10 +329,11 @@
                                 G_PARAM_CONSTRUCT | G_PARAM_READWRITE);
   g_object_class_install_property (obj_class, PROP_ONLY_SHOW_LAUNCHERS, pspec);
 
-  pspec = g_param_spec_pointer ("launcher_paths",
-                                "launcher-paths",
-                                "List of paths to launcher desktop files",
-                                G_PARAM_READWRITE);
+  pspec = g_param_spec_boxed ("launcher-paths",
+                              "launcher paths",
+                              "List of paths to launcher desktop files",
+                              G_TYPE_VALUE_ARRAY,
+                              G_PARAM_READWRITE);
   g_object_class_install_property (obj_class, PROP_LAUNCHER_PATHS, pspec);
 
   pspec = g_param_spec_boolean ("drag_and_drop",
@@ -446,6 +463,20 @@
   task_drag_indicator_refresh (priv->drag_indicator);
 }
 
+static void
+task_manager_dispose (GObject *object)
+{
+  TaskManagerPrivate *priv;
+
+  priv = TASK_MANAGER_GET_PRIVATE (object);
+
+  desktop_agnostic_config_client_unbind_all_for_object (priv->client,
+                                                        object,
+                                                        NULL);
+
+  G_OBJECT_CLASS (task_manager_parent_class)->dispose (object);
+}
+
 /*
  * WNCK_SCREEN CALLBACKS
  */
@@ -803,11 +834,13 @@
 #ifdef DEBUG
           g_debug ("%s:  regex matched full path =   %s",__func__,full_path);
 #endif       
-          AwnDesktopItem * desktop = awn_desktop_item_new (full_path);
+          // TODO handle GErrors
+          DesktopAgnosticVFSFile *file = desktop_agnostic_vfs_file_new_for_path (full_path, NULL);
+          DesktopAgnosticFDODesktopEntry * desktop = desktop_agnostic_fdo_desktop_entry_new_for_file (file, NULL);
           if (desktop)
           {
-            gchar * exec = awn_desktop_item_get_exec (desktop);
-            awn_desktop_item_free (desktop);
+            gchar * exec = desktop_agnostic_fdo_desktop_entry_get_string (desktop, "Exec");
+            g_object_unref (desktop);
 #ifdef DEBUG
             g_debug ("%s:  exec =   %s",__func__,exec);
             g_debug ("%s:  cmd =   %s",__func__,cmd);            
@@ -832,7 +865,8 @@
               }
               g_free (exec);              
             }            
-          }          
+          }
+          g_object_unref (file);
           g_free (full_path);
         }
       }
@@ -1181,27 +1215,20 @@
 task_manager_append_launcher(TaskManager  *manager, const gchar * launcher_path)
 {
   TaskManagerPrivate *priv;
-  GSList  * launcher_paths;
+  GValueArray *launcher_paths;
+  GValue val = {0,};
   
   g_return_if_fail (TASK_IS_MANAGER (manager));
   priv = manager->priv;
 
-  /*
-   directly editing priv->launcher_paths does not work... so retrieve,
-   modify, and set
-   TODO once lda is merged have another look.
-   */
-  launcher_paths = awn_config_client_get_list (priv->client,
-                                               AWN_CONFIG_CLIENT_DEFAULT_GROUP,
-                                               "launcher_paths",
-                                               AWN_CONFIG_CLIENT_LIST_TYPE_STRING,
-                                               NULL);
-  launcher_paths = g_slist_append (launcher_paths,g_strdup(launcher_path));
-  awn_config_client_set_list (priv->client,AWN_CONFIG_CLIENT_DEFAULT_GROUP,
-                              "launcher_paths",AWN_CONFIG_CLIENT_LIST_TYPE_STRING,
-                              launcher_paths,NULL);
-  task_manager_refresh_launcher_paths (manager,launcher_paths);
-  
+  g_object_get (G_OBJECT (manager), "launcher_paths", &launcher_paths, NULL);
+  g_value_init (&val, G_TYPE_STRING);
+  g_value_set_string (&val, launcher_path);
+  launcher_paths = g_value_array_append (launcher_paths, &val);
+  g_object_set (G_OBJECT (manager), "launcher_paths", launcher_paths, NULL);
+  g_value_unset (&val);
+  task_manager_refresh_launcher_paths (manager, launcher_paths);
+  g_value_array_free (launcher_paths);
 }
 
 /**
@@ -1210,93 +1237,111 @@
  * that aren't already on the bar.
  * State: partial - TODO: refresh of a list
  */
-static void 
+static void
 task_manager_refresh_launcher_paths (TaskManager *manager,
-                                     GSList      *list)
+                                     GValueArray *list)
 {
   TaskManagerPrivate *priv;
-  GSList *d;
-  GSList *i;
 
   g_return_if_fail (TASK_IS_MANAGER (manager));
   priv = manager->priv;
-  
+
   /* FIXME: I guess we should add something to check whether the user has
-   * removed a launcher. Make sure we don't remove a launcher which has a 
+   * removed a launcher. Make sure we don't remove a launcher which has a
    * window set, wait till the window is closed
    *
    * FIXME:  This approach just is not going to work..
-   *         IMO we should do something similar to 
+   *         IMO we should do something similar to
    *         awn_applet_manager_refresh_applets() in awn-applet-manager.c
    */
-  
-  for (d = list; d; d = d->next)
-  {  
+
+  for (guint idx = 0; idx < list->n_values; idx++)
+  {
+    gchar *path;
     gboolean found;
+
+    path = g_value_dup_string (g_value_array_get_nth (list, idx));
     found = FALSE;
-    for (i = priv->icons; i ;i = i->next)
+
+    for (GSList *icon_iter = priv->icons;
+         icon_iter != NULL;
+         icon_iter = icon_iter->next)
     {
-      TaskIcon * icon = i->data;
-      GSList   * items = task_icon_get_items (icon);
-      GSList   * item_iter;
-      for (item_iter = items; item_iter; item_iter = item_iter->next)
+      GSList *items = task_icon_get_items (TASK_ICON (icon_iter->data));
+
+      for (GSList *item_iter = items;
+           item_iter != NULL;
+           item_iter = item_iter->next)
       {
-        TaskItem * item = item_iter->data;
-        
-        if ( TASK_IS_LAUNCHER (item) )
+        TaskItem *item = item_iter->data;
+
+        if (TASK_IS_LAUNCHER (item) &&
+            g_strcmp0 (task_launcher_get_desktop_path (TASK_LAUNCHER (item)),
+                       path) == 0)
         {
-          if (g_strcmp0 (task_launcher_get_desktop_path(TASK_LAUNCHER(item)),d->data)==0)
-          {
-            found = TRUE;
-          }
+          found = TRUE;
+          break;
         }
       }
+      if (found)
+      {
+        break;
+      }
     }
     if (!found)
     {
-      TaskItem     *launcher = NULL;
-      GtkWidget     *icon;
-      
-      launcher = task_launcher_new_for_desktop_file (d->data);
+      TaskItem  *launcher = NULL;
+      GtkWidget *icon;
+
+      launcher = task_launcher_new_for_desktop_file (path);
       if (launcher)
       {
         icon = task_icon_new (AWN_APPLET (manager));
         task_icon_append_item (TASK_ICON (icon), launcher);
         gtk_container_add (GTK_CONTAINER (priv->box), icon);
-        gtk_box_reorder_child (GTK_BOX (priv->box), icon, g_slist_position (list,d));
-        priv->icons = g_slist_insert (priv->icons, icon, g_slist_position (list,d));
+        gtk_box_reorder_child (GTK_BOX (priv->box), icon, idx);
+        priv->icons = g_slist_insert (priv->icons, icon, idx);
 
         g_object_weak_ref (G_OBJECT (icon), (GWeakNotify)icon_closed, manager);
-        g_signal_connect_swapped (icon, 
+        g_signal_connect_swapped (icon,
                                   "visible-changed",
-                                  G_CALLBACK (on_icon_visible_changed), 
+                                  G_CALLBACK (on_icon_visible_changed),
                                   manager);
-        g_signal_connect_swapped (awn_overlayable_get_effects (AWN_OVERLAYABLE (icon)), 
-                                  "animation-end", 
-                                  G_CALLBACK (on_icon_effects_ends), 
+        g_signal_connect_swapped (awn_overlayable_get_effects (AWN_OVERLAYABLE (icon)),
+                                  "animation-end",
+                                  G_CALLBACK (on_icon_effects_ends),
                                   icon);
-        
+
         update_icon_visible (manager, TASK_ICON (icon));
 
         /* reordening through D&D */
-        if(priv->drag_and_drop)
-          _drag_add_signals(manager, icon);        
+        if (priv->drag_and_drop)
+        {
+          _drag_add_signals(manager, icon);
+        }
       }
       else
       {
-        g_debug ("%s: Bad desktop file '%s'",__func__,(gchar *)d->data);
+        g_debug ("%s: Bad desktop file '%s'", __func__, path);
       }
     }
+    g_free (path);
   }
 #if 0
-  for (d = list; d; d = d->next)
+  for (guint idx = 0; idx < list->n_values; idx++)
   {
-    GtkWidget     *icon;
-    TaskItem     *launcher = NULL;
-
-    launcher = task_launcher_new_for_desktop_file (d->data);
-
-    if (!launcher) continue;
+    gchar *path;
+    TaskItem  *launcher = NULL;
+    GtkWidget *icon;
+
+    path = g_value_dup_string (g_value_array_get_nth (list, idx));
+
+    launcher = task_launcher_new_for_desktop_file (path);
+
+    if (!launcher)
+    {
+      continue;
+    }
     /*Nasty... but can't just disable yet*/
     icon = task_icon_new (AWN_APPLET (manager));
     task_icon_append_item (TASK_ICON (icon), launcher);
@@ -1317,13 +1362,12 @@
     update_icon_visible (manager, TASK_ICON (icon));
 
     /* reordening through D&D */
-    if(priv->drag_and_drop)
+    if (priv->drag_and_drop)
+    {
       _drag_add_signals(manager, icon);
+    }
   }
-#endif       
-  for (d = list; d; d = d->next)
-    g_free (d->data);
-  g_slist_free (list);
+#endif
 }
 
 static void
@@ -1822,12 +1866,18 @@
     }
     launchers = g_slist_reverse(launchers);
 
-    awn_config_client_set_list (priv->client, 
-                                AWN_CONFIG_CLIENT_DEFAULT_GROUP, 
-                                "launcher_paths", 
-                                AWN_CONFIG_CLIENT_LIST_TYPE_STRING, 
-                                launchers, 
-                                &err);
+    GValue *val;
+
+    val = g_value_init (val, G_TYPE_BOXED);
+    g_value_set_boxed (val, launchers);
+
+    desktop_agnostic_config_client_set_value (priv->client,
+                                              DESKTOP_AGNOSTIC_CONFIG_GROUP_DEFAULT,
+                                              "launcher_paths",
+                                              val, &err);
+
+    g_value_unset (val);
+
     for (d = launchers; d; d = d->next)
       g_free (d->data);
     g_slist_free (launchers);

=== modified file 'applets/taskmanager/task-settings.c'
--- applets/taskmanager/task-settings.c	2009-04-18 08:54:34 +0000
+++ applets/taskmanager/task-settings.c	2009-08-06 19:36:12 +0000
@@ -17,153 +17,61 @@
  *
  */
 
-#include <assert.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "task-settings.h"
 
-#include "config.h"
-
-/* globals */
-static TaskSettings *settings  = NULL;
-static AwnConfigClient    *client   = NULL;
-
 /* prototypes */
 
-/*
-static void awn_load_bool  (AwnConfigClient *lclient, 
-                            const gchar     *group,
-                            const gchar     *key, 
-                            gboolean        *data, 
-                            gboolean         def);
-static void awn_load_float (AwnConfigClient *lclient, 
-                            const gchar     *group,
-                            const gchar     *key, 
-                            gfloat          *data, 
-                            gfloat           def);
-                            */
-static void awn_load_int  (AwnConfigClient  *lclient, 
-                           const gchar      *group,
-                           const gchar      *key, 
-                           gint             *data, 
-                           gint              def);
-
-/*
-static void awn_notify_bool  (AwnConfigClientNotifyEntry *entry, 
-                              gboolean                   *data);
-static void awn_notify_float (AwnConfigClientNotifyEntry *entry, 
-                              gfloat                     *data);
-                              */
-static void awn_notify_int   (AwnConfigClientNotifyEntry *entry, 
-                              gint                       *data);
-
+static void
+cfg_notify_int (const gchar *group, const gchar *key, const GValue *value,
+                gpointer user_data)
+{
+  gint* int_value = (gint*)user_data;
+  *int_value = g_value_get_int (value);
+}
+
+static void
+cfg_load_int (DesktopAgnosticConfigClient *cfg,
+              const gchar                 *group,
+              const gchar                 *key,
+              gint                        *data)
+{
+  /* FIXME handle errors */
+  *data = desktop_agnostic_config_client_get_int (cfg, group, key, NULL);
+  desktop_agnostic_config_client_notify_add (cfg, group, key,
+                                             cfg_notify_int, data, NULL);
+}
+
+/**
+ * task_settings_get_default:
+ *
+ * Returns: A singleton
+ *
+ * Retrieves a structure that holds various values from the panel useful
+ * for the applet.
+ */
 TaskSettings *
 task_settings_get_default (void)
 {
-  TaskSettings *s;
-
-  if (settings)
-    return settings;
-  
-  s = g_new (TaskSettings, 1);
-
-  settings = s;
-
-  client = awn_config_client_new();
-
-  /* Bar settings */
-  awn_config_client_ensure_group(client, "panel");
-
-  awn_load_int(client, "panel", "size", &s->panel_size, 48);
-  awn_load_int(client, "panel", "orient", &s->orient, 0);
-  awn_load_int(client, "panel", "offset", &s->offset, 0);
- 
-  return s;
-}
-
-/*
-static void
-awn_notify_bool (AwnConfigClientNotifyEntry *entry, gboolean* data)
-{
-  *data = entry->value.bool_val;
-}
-
-static void
-awn_notify_float (AwnConfigClientNotifyEntry *entry, gfloat* data)
-{
-  *data = entry->value.float_val;
-}
-*/
-static void
-awn_notify_int (AwnConfigClientNotifyEntry *entry, gint* data)
-{
-  *data = entry->value.int_val;
-}
-
-/*
-static void
-awn_load_bool (AwnConfigClient *lclient, 
-               const gchar     *group, 
-               const gchar     *key, 
-               gboolean        *data, 
-               gboolean         def)
-{
-  if (awn_config_client_entry_exists(lclient, group, key))
-  {
-    *data = awn_config_client_get_bool(lclient, group, key, NULL);
-  }
-  else
-  {
-    g_print("%s unset, setting now\n", key);
-    awn_config_client_set_bool(lclient, group, key, def, NULL);
-    *data = def;
-  }
-
-  awn_config_client_notify_add(lclient, group, key, 
-                               (AwnConfigClientNotifyFunc)awn_notify_bool, 
-                               data);
-}
-
-static void
-awn_load_float (AwnConfigClient *lclient, 
-                const gchar     *group, 
-                const gchar     *key, 
-                gfloat          *data, 
-                gfloat           def)
-{
-  if (awn_config_client_entry_exists(lclient, group, key))
-  {
-    *data = awn_config_client_get_float(lclient, group, key, NULL);
-  }
-  else
-  {
-    g_print("%s unset, setting now\n", key);
-    awn_config_client_set_float(lclient, group, key, def, NULL);
-    *data = def;
-  }
-
-  awn_config_client_notify_add (lclient, group, key, 
-                                (AwnConfigClientNotifyFunc)awn_notify_float, 
-                                data);
-}
-*/
-static void
-awn_load_int (AwnConfigClient *lclient, 
-              const gchar     *group, 
-              const gchar     *key, 
-              gint            *data, 
-              gint             def)
-{
-  if (awn_config_client_entry_exists(lclient, group, key))
-  {
-    *data = awn_config_client_get_int(lclient, group, key, NULL);
-  }
-  else
-  {
-    g_print("%s unset, setting now\n", key);
-    awn_config_client_set_int(lclient, group, key, def, NULL);
-    *data = def;
-  }
-
-  awn_config_client_notify_add (lclient, group, key, 
-                                (AwnConfigClientNotifyFunc)awn_notify_int, 
-                                data);
+  static TaskSettings *settings  = NULL;
+  static DesktopAgnosticConfigClient *client = NULL;
+
+  if (!settings)
+  {
+    settings = g_new (TaskSettings, 1);
+
+    /* FIXME handle error */
+    client = awn_config_get_default (AWN_PANEL_ID_DEFAULT, NULL);
+
+    /* Bar settings */
+
+    cfg_load_int(client, "panel", "size", &(settings->panel_size));
+    cfg_load_int(client, "panel", "orient", &(settings->orient));
+    cfg_load_int(client, "panel", "offset", &(settings->offset));
+  }
+
+  return settings;
 }

=== modified file 'applets/taskmanager/util.c'
--- applets/taskmanager/util.c	2009-08-06 04:36:35 +0000
+++ applets/taskmanager/util.c	2009-08-06 19:54:39 +0000
@@ -112,7 +112,7 @@
  Other matching algororithms are NOT used if something is special cased.
 */
 gchar *
-get_special_id_from_desktop (AwnDesktopItem * item)
+get_special_id_from_desktop (DesktopAgnosticFDODesktopEntry * entry)
 {
   /*
    Exec,Name,filename, special_id.  If all in the first 3 match then the 
@@ -128,7 +128,7 @@
     gboolean  match = TRUE;
     if (iter->exec)
     {
-      gchar * exec = awn_desktop_item_get_exec (item);
+      gchar * exec = desktop_agnostic_fdo_desktop_entry_get_string (entry, "Exec");
       match = g_regex_match_simple(iter->exec, exec,0,0);
       g_free (exec);
       if (!match)
@@ -136,7 +136,7 @@
     }
     if (iter->name)
     {
-      gchar * name = awn_desktop_item_get_name (item);
+      gchar * name = desktop_agnostic_fdo_desktop_entry_get_name (entry);
       match = g_regex_match_simple(iter->name, name,0,0);
       g_free (name);
       if (!match)
@@ -144,8 +144,10 @@
     }
     if (iter->filename)
     {
-      const gchar * filename = awn_desktop_item_get_filename (item);
+      DesktopAgnosticVFSFile *file = desktop_agnostic_fdo_desktop_entry_get_file (entry);
+      gchar *filename = desktop_agnostic_vfs_file_get_path (file);
       match = g_regex_match_simple(iter->filename, filename,0,0);
+      g_free (filename);
       if (!match)
         continue;
     }
@@ -277,4 +279,4 @@
   }
   g_strfreev (cmd_argv);   
   return full_cmd;
-}
\ No newline at end of file
+}

=== modified file 'applets/taskmanager/util.h'
--- applets/taskmanager/util.h	2009-07-29 01:38:12 +0000
+++ applets/taskmanager/util.h	2009-08-06 19:54:39 +0000
@@ -18,8 +18,9 @@
 #define __TASK_MANAGER_UTIL_H__
 
 #include <libawn/libawn.h>
+#include <libdesktop-agnostic/fdo.h>
 
-gchar * get_special_id_from_desktop (AwnDesktopItem * item);
+gchar * get_special_id_from_desktop (DesktopAgnosticFDODesktopEntry *entry);
 
 gchar * get_special_id_from_window_data (gchar * cmd, gchar *res_name, 
                                       gchar * class_name,const gchar *title);

=== modified file 'awn-applet-activation/main.c'
--- awn-applet-activation/main.c	2009-07-08 21:17:59 +0000
+++ awn-applet-activation/main.c	2009-08-06 19:54:39 +0000
@@ -26,9 +26,8 @@
 #include <errno.h>
 
 #include <libawn/awn-defines.h>
-#include <libawn/awn-desktop-item.h>
 #include <libawn/awn-applet.h>
-#include <libawn/awn-vfs.h>
+#include <libdesktop-agnostic/fdo.h>
 
 /* Forwards */
 GtkWidget *
@@ -99,7 +98,8 @@
 {
   GError *error = NULL;
   GOptionContext *context;
-  AwnDesktopItem *item = NULL;
+  DesktopAgnosticVFSFile *desktop_file = NULL;
+  DesktopAgnosticFDODesktopEntry *entry = NULL;
   GtkWidget *applet = NULL;
   const gchar *exec;
   const gchar *name;
@@ -121,7 +121,13 @@
 
   if (!g_thread_supported()) g_thread_init(NULL);
 
-  awn_vfs_init();
+  desktop_agnostic_vfs_init (&error);
+  if (error)
+  {
+    g_critical ("Error initializing VFS subsystem: %s", error->message);
+    g_error_free (error);
+    return EXIT_FAILURE;
+  }
 
   gtk_init(&argc, &argv);
 
@@ -132,48 +138,62 @@
   }
 
   /* Try and load the desktop file */
-  item = awn_desktop_item_new(path);
-
-  if (item == NULL)
-  {
-    g_warning("This desktop file does not exist %s\n", path);
+  desktop_file = desktop_agnostic_vfs_file_new_for_path (path, &error);
+
+  if (error)
+  {
+    g_critical ("Error: %s", error->message);
+    g_error_free (error);
+    return 1;
+  }
+
+  if (desktop_file == NULL || !desktop_agnostic_vfs_file_exists (desktop_file))
+  {
+    g_warning ("This desktop file '%s' does not exist.", path);
+    return 1;
+  }
+
+  entry = desktop_agnostic_fdo_desktop_entry_new_for_file (desktop_file, &error);
+
+  if (error)
+  {
+    g_critical ("Error: %s", error->message);
+    g_error_free (error);
+    return 1;
+  }
+
+  if (entry == NULL)
+  {
+    g_warning ("This desktop file '%s' does not exist.", path);
     return 1;
   }
 
   /* Now we have the file, lets see if we can
           a) load the dynamic library it points to
           b) Find the correct function within that library */
-  exec = awn_desktop_item_get_exec(item);
+  exec = desktop_agnostic_fdo_desktop_entry_get_string (entry, "Exec");
 
   if (exec == NULL)
   {
-    g_warning("No exec path found in desktop file %s\n", path);
+    g_warning ("No Exec key found in desktop file '%s', exiting.", path);
     return 1;
   }
 
-  name = awn_desktop_item_get_name(item);
+  name = desktop_agnostic_fdo_desktop_entry_get_name (entry);
 
   /* Check if this is a Python applet */
-  type = awn_desktop_item_get_string(item, "X-AWN-AppletType");
+  type = desktop_agnostic_fdo_desktop_entry_get_string (entry, "X-AWN-AppletType");
 
   if (!type)
   {
-    /* FIXME we'll maintain this for a bit until the .desktop files are fixed */
-    type = awn_desktop_item_get_item_type(item);
-
-    if (type)
-    {
-      g_warning("Please inform the developer(s) of the applet '%s' that the .desktop file associated with their applet need to be updated per the Applet Development Guidelines on the AWN Wiki.", name);
-    }
+    g_warning ("No X-AWN-AppletType key found in desktop file '%s', exiting.", path);
+    return 1;
   }
 
-  if (type)
+  if (strcmp(type, "Python") == 0)
   {
-    if (strcmp(type, "Python") == 0)
-    {
-      launch_python(path, exec, uid, window, panel_id);
-      return 0;
-    }
+    launch_python(path, exec, uid, window, panel_id);
+    return 0;
   }
 
   /* Extract canonical-name from exec */
@@ -195,7 +215,6 @@
     g_warning ("Could not create applet\n");
     return 1;
   }
-  name = awn_desktop_item_get_name (item);
 
   if (name != NULL)
   {
@@ -214,6 +233,14 @@
 
   gtk_main();
 
+  desktop_agnostic_vfs_shutdown (&error);
+  if (error)
+  {
+    g_critical ("Error shutting down VFS subsystem: %s", error->message);
+    g_error_free (error);
+    return EXIT_FAILURE;
+  }
+
   return 0;
 }
 

=== modified file 'awn.pc.in'
--- awn.pc.in	2008-08-11 20:29:13 +0000
+++ awn.pc.in	2009-07-08 01:07:01 +0000
@@ -2,7 +2,6 @@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
-config_backend=@CFG_BACKEND_NAME@
 vapidir=@datarootdir@/vala/vapi
 
 Name: libawn

=== modified file 'bindings/python/Makefile.am'
--- bindings/python/Makefile.am	2009-07-13 19:27:22 +0000
+++ bindings/python/Makefile.am	2009-08-06 20:35:34 +0000
@@ -38,6 +38,7 @@
 	$(PYTHON_EXTRA_LDFLAGS) \
 	$(PYGTK_LIBS) \
 	$(PYCAIRO_LIBS) \
+	$(AWN_LIBS) \
 	$(top_builddir)/libawn/libawn.la \
 	$(NULL)
 
@@ -54,6 +55,8 @@
 	    --py_ssize_t-clean \
 	    --register $(PYGTK_DEFSDIR)/gdk-types.defs \
 	    --register $(PYGTK_DEFSDIR)/gtk-types.defs \
+	    --register $(LDA_DEFSDIR)/desktopagnostic.defs \
+	    --register $(LDA_DEFSDIR)/desktopagnostic_config.defs \
 	--override $(srcdir)/$*.override \
 	    --prefix py$* $<) > gen-$*.c \
 	&& cp -f gen-$*.c $*.c \

=== modified file 'bindings/python/awn.defs'
--- bindings/python/awn.defs	2009-07-14 20:40:48 +0000
+++ bindings/python/awn.defs	2009-08-06 20:35:34 +0000
@@ -129,21 +129,6 @@
   (gtype-id "AWN_TYPE_TOOLTIP")
 )
 
-;; Boxed types ...
-(define-boxed Config
-  (in-module "Awn")
-  (c-name "AwnConfigClient")
-  (gtype-id "AWN_TYPE_CONFIG_CLIENT")
-)
-
-(define-boxed DesktopItem
-  (in-module "Awn")
-  (c-name "AwnDesktopItem")
-  (gtype-id "AWN_TYPE_DESKTOP_ITEM")
-  (copy-func "awn_desktop_item_copy")
-  (release-func "awn_desktop_item_free")
-)
-
 ;; Enumerations and flags ...
 
 (define-flags CairoRoundCorners
@@ -215,35 +200,6 @@
   )
 )
 
-(define-enum ConfigListType
-  (in-module "Awn")
-  (c-name "AwnConfigListType")
-  (gtype-id "AWN_TYPE_CONFIG_LIST_TYPE")
-  (values
-    '("boolean" "AWN_CONFIG_LIST_TYPE_BOOL")
-    '("float" "AWN_CONFIG_LIST_TYPE_FLOAT")
-    '("integer" "AWN_CONFIG_LIST_TYPE_INT")
-    '("string" "AWN_CONFIG_LIST_TYPE_STRING")
-  )
-)
-
-(define-enum ConfigValueType
-  (in-module "Awn")
-  (c-name "AwnConfigValueType")
-  (gtype-id "AWN_TYPE_CONFIG_VALUE_TYPE")
-  (values
-    '("null" "AWN_CONFIG_VALUE_TYPE_NULL")
-    '("boolean" "AWN_CONFIG_VALUE_TYPE_BOOL")
-    '("float" "AWN_CONFIG_VALUE_TYPE_FLOAT")
-    '("integer" "AWN_CONFIG_VALUE_TYPE_INT")
-    '("string" "AWN_CONFIG_VALUE_TYPE_STRING")
-    '("list_boolean" "AWN_CONFIG_VALUE_TYPE_LIST_BOOL")
-    '("list_float" "AWN_CONFIG_VALUE_TYPE_LIST_FLOAT")
-    '("list_integer" "AWN_CONFIG_VALUE_TYPE_LIST_INT")
-    '("list_string" "AWN_CONFIG_VALUE_TYPE_LIST_STRING")
-  )
-)
-
 ;; From awn-dialog.h
 
 (define-function dialog_new
@@ -256,209 +212,6 @@
   )
 )
 
-;; From awn-config-client.h
-
-(define-function config_client_new
-  (c-name "awn_config_client_new")
-  (is-constructor-of "AwnConfigClient")
-  (return-type "AwnConfigClient*")
-)
-
-(define-method clear
-  (of-object "AwnConfigClient")
-  (c-name "awn_config_client_clear")
-  (return-type "none")
-  (parameters
-    '("GError**" "opt_error")
-  )
-)
-
-(define-method ensure_group
-  (of-object "AwnConfigClient")
-  (c-name "awn_config_client_ensure_group")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "group")
-  )
-)
-
-(define-method notify_add
-  (of-object "AwnConfigClient")
-  (c-name "awn_config_client_notify_add")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "group")
-    '("const-gchar*" "key")
-    '("AwnConfigClientNotifyFunc" "callback")
-    '("gpointer" "data")
-  )
-)
-
-(define-method exists
-  (of-object "AwnConfigClient")
-  (c-name "awn_config_client_entry_exists")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "group")
-    '("const-gchar*" "key")
-  )
-)
-
-(define-method get_value_type
-  (of-object "AwnConfigClient")
-  (c-name "awn_config_client_get_value_type")
-  (return-type "AwnConfigValueType")
-  (parameters
-    '("const-gchar*" "group")
-    '("const-gchar*" "key")
-    '("GError**" "opt_error")
-  )
-)
-
-(define-method set_bool
-  (of-object "AwnConfigClient")
-  (c-name "awn_config_client_set_bool")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "group")
-    '("const-gchar*" "key")
-    '("gboolean" "the_bool")
-    '("GError**" "opt_error")
-  )
-)
-
-(define-method set_int
-  (of-object "AwnConfigClient")
-  (c-name "awn_config_client_set_int")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "group")
-    '("const-gchar*" "key")
-    '("gint" "the_int")
-    '("GError**" "opt_error")
-  )
-)
-
-(define-method set_string
-  (of-object "AwnConfigClient")
-  (c-name "awn_config_client_set_string")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "group")
-    '("const-gchar*" "key")
-    '("const-gchar*" "the_string")
-    '("GError**" "opt_error")
-  )
-)
-
-(define-method set_float
-  (of-object "AwnConfigClient")
-  (c-name "awn_config_client_set_float")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "group")
-    '("const-gchar*" "key")
-    '("gdouble" "the_float")
-    '("GError**" "opt_error")
-  )
-)
-
-(define-method set_list
-  (of-object "AwnConfigClient")
-  (c-name "awn_config_client_set_list")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "group")
-    '("const-gchar*" "key")
-    '("GConfValueType" "list_type")
-    '("GSList*" "list")
-    '("GError**" "opt_error")
-  )
-)
-
-(define-method get_bool
-  (of-object "AwnConfigClient")
-  (c-name "awn_config_client_get_bool")
-  (return-type "gboolean")
-  (parameters
-    '("const-gchar*" "group")
-    '("const-gchar*" "key")
-    '("GError**" "opt_error")
-  )
-)
-
-(define-method get_int
-  (of-object "AwnConfigClient")
-  (c-name "awn_config_client_get_int")
-  (return-type "gint")
-  (parameters
-    '("const-gchar*" "group")
-    '("const-gchar*" "key")
-    '("GError**" "opt_error")
-  )
-)
-
-(define-method get_string
-  (of-object "AwnConfigClient")
-  (c-name "awn_config_client_get_string")
-  (return-type "gchar*")
-  (parameters
-    '("const-gchar*" "group")
-    '("const-gchar*" "key")
-    '("GError**" "opt_error")
-  )
-)
-
-(define-method get_float
-  (of-object "AwnConfigClient")
-  (c-name "awn_config_client_get_float")
-  (return-type "gfloat")
-  (parameters
-    '("const-gchar*" "group")
-    '("const-gchar*" "key")
-    '("GError**" "opt_error")
-  )
-)
-
-(define-method get_list
-  (of-object "AwnConfigClient")
-  (c-name "awn_config_client_get_list")
-  (return-type "GSList*")
-  (parameters
-    '("const-gchar*" "group")
-    '("const-gchar*" "key")
-    '("AwnConfigListType" "list_type")
-    '("GError**" "opt_error")
-  )
-)
-
-(define-function config_key_lock_open
-  (c-name "awn_config_client_key_lock_open")
-  (return-type "int")
-  (parameters
-    '("const-gchar*" "group")
-    '("const-gchar*" "key")
-  )
-)
-
-(define-function config_key_lock
-  (c-name "awn_config_client_key_lock")
-  (return-type "none")
-  (parameters
-    '("int" "fd")
-    '("int" "operation")
-  )
-)
-
-(define-function config_key_lock_close
-  (c-name "awn_config_client_key_lock_close")
-  (return-type "none")
-  (parameters
-    '("int" "fd")
-  )
-)
-
-
 ;; From awn-alignment.h
 
 (define-function awn_alignment_new_for_applet
@@ -776,162 +529,73 @@
   )
 )
 
+(define-function awn_cairo_set_source_color
+  (c-name "awn_cairo_set_source_color")
+  (return-type "none")
+  (parameters
+    '("cairo_t*" "cr")
+    '("DesktopAgnosticColor*" "color")
+  )
+)
+
+(define-function awn_cairo_set_source_color_with_alpha_multiplier
+  (c-name "awn_cairo_set_source_color_with_alpha_multiplier")
+  (return-type "none")
+  (parameters
+    '("cairo_t*" "cr")
+    '("DesktopAgnosticColor*" "color")
+    '("gdouble" "multiplier")
+  )
+)
+
+(define-function awn_cairo_set_source_color_with_multipliers
+  (c-name "awn_cairo_set_source_color_with_multipliers")
+  (return-type "none")
+  (parameters
+    '("cairo_t*" "cr")
+    '("DesktopAgnosticColor*" "color")
+    '("gdouble" "color_multiplier")
+    '("gdouble" "alpha_multiplier")
+  )
+)
+
+
+;; From awn-config.h
+
+(define-function awn_config_get_default
+  (c-name "awn_config_get_default")
+  (return-type "DesktopAgnosticConfigClient*")
+  (parameters
+    '("gint" "panel_id")
+    '("GError**" "error")
+  )
+)
+
+(define-function awn_config_get_default_for_applet
+  (c-name "awn_config_get_default_for_applet")
+  (return-type "DesktopAgnosticConfigClient*")
+  (parameters
+    '("AwnApplet*" "applet")
+    '("GError**" "error")
+  )
+)
+
+(define-function awn_config_get_default_for_applet_by_info
+  (c-name "awn_config_get_default_for_applet_by_info")
+  (return-type "DesktopAgnosticConfigClient*")
+  (parameters
+    '("const-gchar*" "name")
+    '("const-gchar*" "uid")
+    '("GError**" "error")
+  )
+)
+
 
 
 ;; From awn-defines.h
 
 
 
-;; From awn-desktop-item.h
-
-(define-function awn_desktop_item_get_type
-  (c-name "awn_desktop_item_get_type")
-  (return-type "GType")
-)
-
-(define-function awn_desktop_item_new
-  (c-name "awn_desktop_item_new")
-  (is-constructor-of "AwnDesktopItem")
-  (return-type "AwnDesktopItem*")
-  (parameters
-    '("gchar*" "filename")
-  )
-)
-
-(define-method get_filename
-  (c-name "awn_desktop_item_get_filename")
-  (of-object "AwnDesktopItem")
-  (return-type "const-gchar*")
-)
-
-(define-method get_item_type
-  (c-name "awn_desktop_item_get_item_type")
-  (of-object "AwnDesktopItem")
-  (return-type "gchar*")
-)
-
-(define-method set_item_type
-  (c-name "awn_desktop_item_set_item_type")
-  (of-object "AwnDesktopItem")
-  (return-type "none")
-  (parameters
-    '("gchar*" "item_type")
-  )
-)
-
-(define-method get_icon
-  (c-name "awn_desktop_item_get_icon")
-  (of-object "AwnDesktopItem")
-  (return-type "GdkPixbuf*")
-  (parameters
-    '("guint" "size")
-  )
-)
-
-(define-method set_icon
-  (c-name "awn_desktop_item_set_icon_name")
-  (of-object "AwnDesktopItem")
-  (return-type "none")
-  (parameters
-    '("gchar*" "icon")
-  )
-)
-
-(define-method get_name
-  (c-name "awn_desktop_item_get_name")
-  (of-object "AwnDesktopItem")
-  (return-type "gchar*")
-)
-
-(define-method set_name
-  (c-name "awn_desktop_item_set_name")
-  (of-object "AwnDesktopItem")
-  (return-type "none")
-  (parameters
-    '("gchar*" "name")
-  )
-)
-
-(define-method get_exec
-  (c-name "awn_desktop_item_get_exec")
-  (of-object "AwnDesktopItem")
-  (return-type "gchar*")
-)
-
-(define-method set_exec
-  (c-name "awn_desktop_item_set_exec")
-  (of-object "AwnDesktopItem")
-  (return-type "none")
-  (parameters
-    '("gchar*" "exec")
-  )
-)
-
-(define-method get_string
-  (c-name "awn_desktop_item_get_string")
-  (of-object "AwnDesktopItem")
-  (return-type "gchar*")
-  (parameters
-    '("gchar*" "key")
-  )
-)
-
-(define-method set_string
-  (c-name "awn_desktop_item_set_string")
-  (of-object "AwnDesktopItem")
-  (return-type "none")
-  (parameters
-    '("gchar*" "key")
-    '("gchar*" "value")
-  )
-)
-
-(define-method get_localestring
-  (c-name "awn_desktop_item_get_localestring")
-  (of-object "AwnDesktopItem")
-  (return-type "gchar*")
-  (parameters
-    '("gchar*" "key")
-  )
-)
-
-(define-method set_localestring
-  (c-name "awn_desktop_item_set_localestring")
-  (of-object "AwnDesktopItem")
-  (return-type "none")
-  (parameters
-    '("gchar*" "key")
-    '("gchar*" "locale")
-    '("gchar*" "value")
-  )
-)
-
-(define-method exists
-  (c-name "awn_desktop_item_exists")
-  (of-object "AwnDesktopItem")
-  (return-type "gboolean")
-)
-
-(define-method launch
-  (c-name "awn_desktop_item_launch")
-  (of-object "AwnDesktopItem")
-  (return-type "gint")
-  (parameters
-    '("GSList*" "documents")
-    '("GError**" "err")
-  )
-)
-
-(define-method save
-  (c-name "awn_desktop_item_save")
-  (of-object "AwnDesktopItem")
-  (return-type "none")
-  (parameters
-    '("gchar*" "new_filename")
-    '("GError**" "err")
-  )
-)
-
 ;; From awn-effects.h
 
 (define-function awn_effects_get_type
@@ -1401,7 +1065,7 @@
   (c-name "awn_tooltip_set_font_color")
   (return-type "none")
   (parameters
-    '("const-gchar*" "font_color")
+    '("DesktopAgnosticColor*" "font_color")
   )
 )
 
@@ -1410,7 +1074,7 @@
   (c-name "awn_tooltip_set_background_color")
   (return-type "none")
   (parameters
-    '("const-gchar*" "bg_color")
+    '("DesktopAgnosticColor*" "bg_color")
   )
 )
 
@@ -1572,8 +1236,6 @@
   )
 )
 
-;; From awn-vfs.h
-
 (define-function vfs_init
   (c-name "awn_vfs_init")
   (return-type "none")

=== modified file 'bindings/python/awn.override'
--- bindings/python/awn.override	2009-07-14 20:40:48 +0000
+++ bindings/python/awn.override	2009-08-06 20:35:34 +0000
@@ -6,82 +6,27 @@
 #include <pygobject.h>
 #include <pycairo.h>
 #include <pygtk/pygtk.h>
-#ifdef USE_GCONF
-#include <gconf/gconf-value.h>
-#endif
 #include <libawn/awn-enum-types.h>
 #include <libawn/libawn.h>
 
 extern Pycairo_CAPI_t *Pycairo_CAPI;
 
-static GSList *
-_pysequence_to_gslist (PyObject *seq, AwnConfigListType list_type)
+/* Some hacking to get GdkRegion to work. */
+#ifndef PYGDK_TYPE_REGION
+GType pygdk_region_get_type (void) G_GNUC_CONST;
+#define PYGDK_TYPE_REGION (pygdk_region_get_type ())
+GType
+pygdk_region_get_type (void)
 {
-  GSList *list = NULL;
-
-  int i;
-  int len = PySequence_Length (seq);
-  for (i = 0; i < len; i++) {
-    PyObject *item = PySequence_GetItem (seq, i);
-    Py_DECREF(item);
-    switch (list_type) {
-      case AWN_CONFIG_CLIENT_LIST_TYPE_BOOL: {
-        gboolean *data = g_malloc (sizeof (gboolean));
-        *data = (gboolean)PyInt_AsLong (item);
-        list = g_slist_append (list, data);
-        break;
-      } case AWN_CONFIG_CLIENT_LIST_TYPE_FLOAT: {
-        gdouble *data = g_malloc (sizeof (gdouble));
-        *data = (gdouble)PyFloat_AsDouble (item);
-        list = g_slist_append (list, data);
-        break;
-      } case AWN_CONFIG_CLIENT_LIST_TYPE_INT: {
-        gint *data = g_malloc (sizeof (gint));
-        *data = (gint)PyInt_AsLong (item);
-        list = g_slist_append (list, data);
-        break;
-      } case AWN_CONFIG_CLIENT_LIST_TYPE_STRING: {
-        gchar *data = g_strdup (PyString_AsString (item));
-        list = g_slist_append (list, data);
-        break;
-      }
-    }
-  }
-  return list;
-}
-static PyObject *
-_gslist_to_pylist (GSList *list, AwnConfigListType list_type) {
-  PyObject *py_list;
-  guint i;
-  gsize slist_len = g_slist_length (list);
-  py_list = PyList_New ((Py_ssize_t)slist_len);
-
-  for (i = 0; i < slist_len; i++) {
-    PyObject *py_data = NULL;
-    gpointer data = g_slist_nth_data (list, i);
-    if (data) {
-      switch (list_type) {
-        case AWN_CONFIG_CLIENT_LIST_TYPE_BOOL:
-          py_data = PyBool_FromLong (*((gboolean*)data));
-          break;
-        case AWN_CONFIG_CLIENT_LIST_TYPE_FLOAT:
-          py_data = PyFloat_FromDouble (*((gdouble*)data));
-          break;
-        case AWN_CONFIG_CLIENT_LIST_TYPE_INT:
-          py_data = PyInt_FromLong (*((gint*)data));
-          break;
-        case AWN_CONFIG_CLIENT_LIST_TYPE_STRING:
-          py_data = PyString_FromString ((gchar*)data);
-          break;
-      }
-      if (PyList_SetItem (py_list, i, py_data) == -1) {
-        PyErr_SetString (PyExc_ValueError, "Could not populate the list with the configuration value.");
-        return NULL;
-      }
-    }
-  }
-  return py_list;
-}
+  static GType our_type = 0;
+  
+  if (our_type == 0)
+    /* GdkRegion is already taken by pygtk in its boxing of GdkRegion. */
+    our_type = g_type_from_name("GdkRegion");
+  return our_type;
+}
+#endif /* GDK_TYPE_REGION */
+
 static gchar**
 _pysequence_to_gchar_array (PyObject *py_seq)
 {
@@ -118,6 +63,7 @@
 modulename awn
 %%
 import gobject.GObject as PyGObject_Type
+import desktopagnostic.Color as PyDesktopAgnosticColor_Type
 import gtk.Alignment as PyGtkAlignment_Type
 import gtk.Dialog as PyGtkDialog_Type
 import gtk.EventBox as PyGtkEventBox_Type
@@ -137,101 +83,6 @@
 ignore-glob
   *_get_type
 %%
-override awn_config_client_new kwargs
-static int
-_wrap_awn_config_client_new (PyGBoxed *self, PyObject *args, PyObject *kwargs)
-{
-  static char *kwlist[] = { "name", "uid", NULL };
-  gchar *name = NULL;
-  PyObject *py_uid = NULL;
-  gchar *uid = NULL;
-
-  if (!PyArg_ParseTupleAndKeywords (args, kwargs,"|sO:AwnConfigClient.__init__", kwlist, &name, &py_uid)) {
-    return -1;
-  }
-  self->gtype = AWN_TYPE_CONFIG_CLIENT;
-  self->free_on_dealloc = FALSE;
-  if (name) {
-    if (!py_uid) {
-      PyErr_SetString (PyExc_ValueError, "The uid argument needs to be defined if the name argument is defined");
-      return -1;
-    }
-    if (PyString_Check (py_uid)) {
-      uid = PyString_AsString (py_uid);
-    } else if (py_uid != Py_None) {
-      PyErr_SetString (PyExc_TypeError, "The uid argument must be either a string or None");
-      return -1;
-    }
-    self->boxed = awn_config_client_new_for_applet (name, uid);
-  } else {
-    self->boxed = awn_config_client_new ();
-  }
-
-  if (!self->boxed) {
-    PyErr_SetString (PyExc_RuntimeError, "could not create AwnConfigClient object");
-    return -1;
-  }
-  self->free_on_dealloc = TRUE;
-  return 0;
-}
-%%
-override awn_config_client_get_list kwargs
-static PyObject *
-_wrap_awn_config_client_get_list (PyGBoxed *self, PyObject *args, PyObject *kwargs)
-{
-  static char *kwlist[] = { "group", "key", "list_type", NULL };
-  char *group, *key;
-  AwnConfigListType list_type;
-  GSList *ret = NULL;
-  GError *opt_error = NULL;
-
-  if (!PyArg_ParseTupleAndKeywords (args, kwargs, "ssi:AwnConfigClient.get_list", kwlist, &group, &key, &list_type)) {
-    return NULL;
-  }
-
-  ret = awn_config_client_get_list (pyg_boxed_get (self, AwnConfigClient), group, key, list_type, &opt_error);
-
-  if (pyg_error_check (&opt_error)) {
-    return NULL;
-  }
-
-  return _gslist_to_pylist (ret, list_type);
-}
-%%
-override awn_config_client_set_list kwargs
-static PyObject *
-_wrap_awn_config_client_set_list (PyGBoxed *self, PyObject *args, PyObject *kwargs)
-{
-  static char *kwlist[] = { "group", "key", "list_type", "value", NULL };
-  char *group, *key;
-  AwnConfigListType list_type;
-  PyObject *py_list;
-  GSList *the_list = NULL;
-  GError *opt_error = NULL;
-
-  if (!PyArg_ParseTupleAndKeywords (args, kwargs, "ssiO:AwnConfigClient.set_list", kwlist, &group, &key, &list_type, &py_list)) {
-    return NULL;
-  }
-
-  if (!PyList_Check (py_list) && !PyTuple_Check (py_list)) {
-    PyErr_SetString (PyExc_TypeError, "Fourth argument not a tuple or list");
-    return NULL;
-  }
-  the_list = _pysequence_to_gslist (py_list, list_type);
-
-  awn_config_client_set_list (pyg_boxed_get (self, AwnConfigClient), group, key, list_type, the_list, &opt_error);
-
-  g_slist_foreach (the_list, (GFunc)g_free, NULL);
-  g_slist_free (the_list);
-
-  if (pyg_error_check (&opt_error)) {
-    return NULL;
-  }
-
-  Py_INCREF (Py_None);
-  return Py_None;
-}
-%%
 override awn_applet_simple_set_temp_icon kwargs
 static PyObject *
 _wrap_awn_applet_simple_set_temp_icon (PyGObject *self, PyObject *args, PyObject *kwargs)
@@ -239,207 +90,6 @@
     return _wrap_awn_applet_simple_set_icon (self, args, kwargs);
 }
 %%
-override awn_config_client_notify_add kwargs
-/* Borrowed from gnome-python/trunk/gconf/gconf.override, r585 */
-void
-pyawn_config_client_notify_add (AwnConfigClientNotifyEntry *entry, PyObject *tuple)
-{
-    PyObject *func;
-    PyObject *userdata = NULL;
-    PyObject *notify_entry;
-    PyObject *value;
-    PyObject *ret;
-    PyGILState_STATE state;
-
-    state = pyg_gil_state_ensure ();
-
-    g_assert (PyTuple_Check (tuple));
-    func = PyTuple_GetItem (tuple, 0);
-    userdata = PyTuple_GetItem (tuple, 1);
-
-    /* build the AwnConfigClientNotifyEntry python equivalent manually, as a dictionary */
-    notify_entry = PyDict_New ();
-    PyDict_SetItemString (notify_entry, "client", pyg_boxed_new (AWN_TYPE_CONFIG_CLIENT, entry->client, TRUE, TRUE));
-    PyDict_SetItemString (notify_entry, "group", PyString_FromString (entry->group));
-    PyDict_SetItemString (notify_entry, "key", PyString_FromString (entry->key));
-    switch (awn_config_client_get_value_type (entry->client, entry->group, entry->key, NULL)) {
-        case AWN_CONFIG_VALUE_TYPE_BOOL:
-            value = PyBool_FromLong (entry->value.bool_val);
-            break;
-        case AWN_CONFIG_VALUE_TYPE_FLOAT:
-            value = PyFloat_FromDouble (entry->value.float_val);
-            break;
-        case AWN_CONFIG_VALUE_TYPE_INT:
-            value = PyInt_FromLong (entry->value.int_val);
-            break;
-        case AWN_CONFIG_VALUE_TYPE_STRING:
-            value = PyString_FromString (entry->value.str_val);
-            break;
-        case AWN_CONFIG_VALUE_TYPE_LIST_BOOL:
-            value = _gslist_to_pylist (entry->value.list_val, AWN_CONFIG_CLIENT_LIST_TYPE_BOOL);
-            break;
-        case AWN_CONFIG_VALUE_TYPE_LIST_FLOAT:
-            value = _gslist_to_pylist (entry->value.list_val, AWN_CONFIG_CLIENT_LIST_TYPE_FLOAT);
-            break;
-        case AWN_CONFIG_VALUE_TYPE_LIST_INT:
-            value = _gslist_to_pylist (entry->value.list_val, AWN_CONFIG_CLIENT_LIST_TYPE_INT);
-            break;
-        case AWN_CONFIG_VALUE_TYPE_LIST_STRING:
-            value = _gslist_to_pylist (entry->value.list_val, AWN_CONFIG_CLIENT_LIST_TYPE_STRING);
-            break;
-        default:
-            PyErr_Format (PyExc_ValueError, "Could not determine the value type of the configuration key '[%s]%s'.", entry->group, entry->key);
-            return;
-            break;
-    }
-    PyDict_SetItemString (notify_entry, "value", value);
-
-    if (!userdata) {
-        ret = PyObject_CallFunction (func, "N",  notify_entry);
-    } else {
-        ret = PyObject_CallFunction (func, "NO", notify_entry, userdata);
-    }
-
-    if (ret == NULL) {
-            PyErr_Print ();
-    } else {
-            Py_DECREF (ret);
-    }
-
-    pyg_gil_state_release (state);
-}
-
-static PyObject *
-_wrap_awn_config_client_notify_add (PyGBoxed *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "group", "key", "func",  "user_data", NULL };
-    gchar *group;
-    gchar *key;
-    PyObject *callback;
-    PyObject *extra = NULL;
-    PyObject *data;
-
-    if (!PyArg_ParseTupleAndKeywords (args, kwargs,
-                                      "ssO|O:AwnConfigClient.notify_add",
-                                      kwlist, &group, &key,
-                                      &callback, &extra)) {
-        return NULL;
-    }
-
-    if (!PyCallable_Check (callback)) {
-        PyErr_SetString (PyExc_TypeError, "Third argument not callable");
-        return NULL;
-    }
-
-    if (extra) {
-        Py_INCREF (extra);
-    } else {
-        extra = PyTuple_New (0);
-    }
-
-    data = Py_BuildValue ("(ON)", callback, extra);
-
-    awn_config_client_notify_add (pyg_boxed_get(self, AwnConfigClient),
-                                  group, key,
-                                  (AwnConfigClientNotifyFunc)pyawn_config_client_notify_add,
-                                  data);
-
-    Py_INCREF (Py_None);
-    return Py_None;
-}
-%%
-override awn_desktop_item_launch kwargs
-static PyObject *
-_wrap_awn_desktop_item_launch (PyGBoxed *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "documents", NULL };
-    PyObject *py_documents = NULL;
-    GSList *documents = NULL;
-    GError *opt_error = NULL;
-    gint pid;
-
-    if (!PyArg_ParseTupleAndKeywords (args, kwargs, "|O:AwnDesktopItem.launch", kwlist, &py_documents)) {
-        return NULL;
-    }
-
-    if (py_documents) {
-        if (PyList_Check (py_documents) || PyTuple_Check (py_documents)) {
-            /* abuse the utility function */
-            documents = _pysequence_to_gslist (py_documents, AWN_CONFIG_CLIENT_LIST_TYPE_STRING);
-        } else if (PyString_Check (py_documents)) {
-            /* only one argument */
-            documents = g_slist_append (documents, PyString_AsString (py_documents));
-        } else {
-            PyErr_SetString (PyExc_TypeError, "Argument is not a sequence");
-            return NULL;
-        }
-    }
-
-    pid = awn_desktop_item_launch (pyg_boxed_get (self, AwnDesktopItem), documents, &opt_error);
-
-    if (pyg_error_check (&opt_error)) {
-        return NULL;
-    }
-
-    return PyInt_FromLong (pid);
-}
-%%
-override awn_config_client_key_lock_open kwargs
-static PyObject *
-_wrap_awn_config_client_key_lock_open(PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "group", "key", NULL };
-    char *group, *key;
-    int ret;
-
-    if (!PyArg_ParseTupleAndKeywords (args, kwargs,"ss:AwnConfigClient.lock_open", kwlist, &group, &key))
-        return NULL;
-    
-    ret = awn_config_client_key_lock_open (group, key);
-    
-    return PyInt_FromLong (ret);
-}
-%%
-override awn_config_client_key_lock kwargs
-static PyObject *
-_wrap_awn_config_client_key_lock (PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "fd", "operation", NULL };
-    int fd, operation, ret;
-
-    if (!PyArg_ParseTupleAndKeywords (args, kwargs,"ii:AwnConfigClient.lock", kwlist, &fd, &operation))
-        return NULL;
-    
-    ret = awn_config_client_key_lock (fd, operation);
-
-    if (ret != 0) {
-        return PyErr_SetFromErrno(PyExc_IOError);
-    }
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-%%
-override awn_config_client_key_lock_close kwargs
-static PyObject *
-_wrap_awn_config_client_key_lock_close (PyObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "fd", NULL };
-    int fd, ret;
-
-    if (!PyArg_ParseTupleAndKeywords (args, kwargs,"i:AwnConfigClient.lock_close", kwlist, &fd))
-        return NULL;
-    
-    ret = awn_config_client_key_lock_close (fd);
-
-    if (ret != 0) {
-        return PyErr_SetFromErrno(PyExc_IOError);
-    }
-    
-    Py_INCREF(Py_None);
-    return Py_None;
-}
-%%
 override awn_applet_simple_set_awn_icons kwargs
 static PyObject *
 _wrap_awn_applet_simple_set_awn_icons (PyObject *self, PyObject *args, PyObject *kwargs)

=== modified file 'bindings/python/awnmodule.c'
--- bindings/python/awnmodule.c	2009-06-23 15:09:15 +0000
+++ bindings/python/awnmodule.c	2009-07-15 01:05:32 +0000
@@ -24,11 +24,6 @@
 #include <pygobject.h>
 #include <cairo/cairo.h>
 #include <pycairo.h>
-#ifdef USE_GCONF
-#include <gconf/gconf.h>
-#include <gconf/gconf-client.h>
-#include <gconf/gconf-value.h>
-#endif
 #include <gtk/gtk.h>
 #include <libawn/awn-applet.h>
 #include <libawn/awn-applet-simple.h>

=== modified file 'configure.in'
--- configure.in	2009-07-16 15:04:17 +0000
+++ configure.in	2009-08-06 20:35:34 +0000
@@ -16,7 +16,7 @@
 m4_define(pycairo_required_version,      1.0.2) dnl or 1.1.7
 m4_define(pygtk_required_version,        2.12.0)
 
-AM_INIT_AUTOMAKE([1.8])
+AM_INIT_AUTOMAKE([1.8 -Wno-portability])
 AM_MAINTAINER_MODE
 
 AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"])
@@ -57,6 +57,11 @@
 AC_SUBST(PYGTK_DEFSDIR)
 AC_MSG_RESULT($PYGTK_DEFSDIR)
 
+AC_MSG_CHECKING(for libdesktop-agnostic Python definitions directory)
+LDA_DEFSDIR=`$PKG_CONFIG --variable=defsdir desktop-agnostic`
+AC_SUBST(LDA_DEFSDIR)
+AC_MSG_RESULT($LDA_DEFSDIR)
+
 PKG_CHECK_MODULES(PYCAIRO, pycairo >= pycairo_required_version)
 AC_SUBST(PYCAIRO_CFLAGS)
 AC_SUBST(PYCAIRO_LIBS)
@@ -131,35 +136,7 @@
 
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, glib-genmarshal)
 
-dnl ==============================================
-dnl Configuration backend
-dnl ==============================================
-AC_MSG_CHECKING([for config backend support])
-AC_ARG_WITH(gconf,
-            AS_HELP_STRING([--with-gconf],
-                           [Use GConf to store configuration information]),
-            [if test "$with_gconf" == "no"; then
-                # use Glib's GKeyFile - it's already pulled in.
-                CFG_MODULE=""
-                CFG_BACKEND_NAME="GKeyFile"
-                GCONF_SCHEMA_INSTALL_SOURCE="/dev/null"
-                GCONF_SCHEMA_FILE_DIR="/dev/null"
-                AC_MSG_RESULT([GKeyFile (part of Glib)])
-            fi])
-if test "$with_gconf" != "no"; then
-    CFG_MODULE="gconf-2.0"
-    CFG_BACKEND_NAME="GConf"
-    AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
-    if test x"$GCONFTOOL" = xno; then
-        AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
-    fi
-    AC_DEFINE([USE_GCONF], 1, [Use GConf to store configuration information])
-    AC_MSG_RESULT([GConf])
-fi
-AC_SUBST(CFG_BACKEND_NAME)
-AM_CONDITIONAL(USE_GCONF, test "$with_gconf" != "no")
-
-LIBRARY_MODULES="glib-2.0 >= $MIN_GLIB_VERSION gthread-2.0 gobject-2.0 gtk+-2.0 >= $MIN_GTK_VERSION gdk-2.0 >= $MIN_GTK_VERSION dbus-glib-1 gio-2.0 $CFG_MODULE desktop-agnostic"
+LIBRARY_MODULES="glib-2.0 >= $MIN_GLIB_VERSION gthread-2.0 gobject-2.0 gtk+-2.0 >= $MIN_GTK_VERSION gdk-2.0 >= $MIN_GTK_VERSION dbus-glib-1 desktop-agnostic"
 DOCK_MODULES="x11 xproto xcomposite xrender"
 TASKMANAGER_MODULES="libwnck-1.0 >= $MIN_WNCK_VERSION x11 libgtop-2.0"
 AC_SUBST(LIBRARY_MODULES)
@@ -168,14 +145,8 @@
 PKG_CHECK_MODULES(DOCK, [$DOCK_MODULES])
 PKG_CHECK_MODULES(TASKMANAGER, [$LIBRARY_MODULES $TASKMANAGER_MODULES])
 
-dnl =============================================
-dnl Startup notification check (eggdesktopfile)
-dnl =============================================
-
-old_LIBS="$LIBS"
-LIBS="$LIBS $AWN_LIBS"
-AC_CHECK_FUNCS(gdk_x11_display_broadcast_startup_message)
-LIBS="$old_LIBS"
+LDA_BINDIR="`$PKG_CONFIG --variable=exec_prefix desktop-agnostic`/bin"
+AC_SUBST(LDA_BINDIR)
 
 dnl ==============================================
 dnl DBus
@@ -188,6 +159,12 @@
 dnl GConf
 dnl ==============================================
 AM_GCONF_SOURCE_2
+if test "$enable_schemas_install" != "no"; then
+    AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+    if test x"$GCONFTOOL" = xno; then
+        AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+    fi
+fi
 
 dnl ==============================================
 dnl Miscellaneous
@@ -233,12 +210,11 @@
 data/Makefile
 data/active/Makefile
 data/avant-window-navigator.desktop.in
-data/awn.schema-ini
+data/avant-window-navigator.schema-ini
 doc/Makefile
 doc/reference/Makefile
 libawn/Makefile
 libawn/anims/Makefile
-libawn/egg/Makefile
 po/Makefile.in
 shave/shave
 shave/shave-libtool
@@ -255,8 +231,6 @@
 echo ""
 echo "                   prefix:   ${prefix}"
 echo ""
-echo "    Configuration Backend:   $CFG_BACKEND_NAME"
-echo ""
 echo "             Vala Support:   ${with_vala}"
 echo ""
 echo "            Documentation:   ${enable_gtk_doc}"

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2009-07-06 22:12:25 +0000
+++ data/Makefile.am	2009-08-05 07:18:27 +0000
@@ -2,6 +2,8 @@
 
 APP_ICON_NAME = avant-window-navigator
 include $(top_srcdir)/Makefile.app-icons
+include $(top_srcdir)/Makefile.shave
+include $(top_srcdir)/Makefile.schemas
 
 # desktop file
 
@@ -39,29 +41,9 @@
 
 # config-related
 
-if USE_GCONF
-schemasdir       = @GCONF_SCHEMA_FILE_DIR@
-schemas_in_files = awn.schemas.in
-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
-
-awn.schemas.in: awn.schema-ini
-	$(top_srcdir)/data/awn-schema-to-gconf $< $@
-
-@INTLTOOL_SCHEMAS_RULE@
-
-if GCONF_SCHEMAS_INSTALL
-install-gconf-schemas: $(schemas_DATA)
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA)
-else
-install-gconf-schemas:
-endif
-else
-install-gconf-schemas:
-endif
-schemadir = $(pkgdatadir)/schemas
-schema_DATA = awn.schema-ini
-
-dist_bin_SCRIPTS = awn-schema-to-gconf awn-applets-migration
+schema_DATA = avant-window-navigator.schema-ini
+
+dist_bin_SCRIPTS = awn-applets-migration
 
 # global
 
@@ -71,6 +53,6 @@
 	rm -f $(DESTDIR)$(datadir)/icons/hicolor/24x24/apps/avant-window-navigator.png
 	rm -f $(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/avant-window-navigator.png
 
-EXTRA_DIST += $(icons) $(text_DATA) $(desktop_DATA).in.in awn.schema-ini awn-themed-icon-ui.glade
+EXTRA_DIST += $(icons) $(text_DATA) $(desktop_DATA).in.in avant-window-navigator.schema-ini awn-themed-icon-ui.glade
 
-CLEANFILES = $(desktop_DATA) $(desktop_DATA).in awn.schemas awn.schemas.in
+CLEANFILES = $(desktop_DATA) $(desktop_DATA).in avant-window-navigator.schemas avant-window-navigator.schemas.in

=== renamed file 'data/awn.schema-ini.in' => 'data/avant-window-navigator.schema-ini.in'
--- data/awn.schema-ini.in	2009-07-27 19:35:05 +0000
+++ data/avant-window-navigator.schema-ini.in	2009-07-31 18:34:39 +0000
@@ -1,30 +1,37 @@
+# Avant Window Navigator configuration schema
+# -------------------------------------------
+# schema metadata
+[DEFAULT]
+single_instance = false
+
+# configuration options
 [panel/panel_mode]
-type = bool
-default = False
-description = If True, maximised windows will not cover the panel.
+type = boolean
+default = false
+description = If true, maximised windows will not cover the panel.
 
 [panel/expand]
-type = bool
-default = False
-description = If True, the panel will expand to full monitor width/height.
+type = boolean
+default = false
+description = If true, the panel will expand to full monitor width/height.
 
 [panel/orient]
-type = int
+type = integer
 default = 2
 description = Orientation of Awn. (top=0, right=1, bottom=2 and left=3)
 
 [panel/offset]
-type = int
+type = integer
 default = 10
 description = Offset of the icons from window border.
 
 [panel/dialog_offset]
-type = int
+type = integer
 default = 15
 description = Offset between the icons and their dialog.
 
 [panel/size]
-type = int
+type = integer
 default = 48
 description = The user-visible size of Awn.
 
@@ -44,22 +51,22 @@
 description = The active list UA Screenlets for this panel.
 
 [panel/monitor_force]
-type = bool
-default = False
+type = boolean
+default = false
 description = Force monitor geometry.
 
 [panel/monitor_width]
-type = int
+type = integer
 default = 1024
-description = The forced monitor width. Only used if monitor_force is True.
+description = The forced monitor width. Only used if monitor_force is true.
 
 [panel/monitor_height]
-type = int
+type = integer
 default = 768
-description = The forced monitor height. Only used if monitor_force is True.
+description = The forced monitor height. Only used if monitor_force is true.
 
 [panel/monitor_offset]
-type = int
+type = integer
 default = 0
 description = An optional offset when you have more than 1 monitors.
 
@@ -69,17 +76,17 @@
 description = Alignment of a non-expanded panel on the monitor edge.
 
 [panel/autohide]
-type = int
+type = integer
 default = 0
 description = Auto hides the dock when the cursor is not on the dock (shouldn't be used together with panel_mode). (none=0, keep below=1, fade out=2, see through=3)
 
 [panel/style]
-type = int
+type = integer
 default = 1
 description = The style of the bar. (none=0, flat bar=1, 3d bar=2, curved bar=3, edgy=4)
 
 [panel/clickthrough]
-type = int
+type = integer
 default = 1
 description = Provides possibility to click on windows behind the panel. (0 - never click through, 1 - click through when holding CTRL, 2 - always click through and interact with panel only when holding CTRL)
 
@@ -89,47 +96,47 @@
 description = The list of panels.
 
 [theme/gstep1]
-type = string
+type = color
 default = #454545C8
 description = First gradient step color.
 
 [theme/gstep2]
-type = string
+type = color
 default = #010101BE
 description = Second gradient step color.
 
 [theme/ghistep1]
-type = string
+type = color
 default = #FFFFFF0B
 description = First highlight gradient step color.
 
 [theme/ghistep2]
-type = string
+type = color
 default = #FFFFFF0A
 description = Second highlight gradient step color.
 
 [theme/dialog_bg]
-type = string
+type = color
 default = #AAAAAAEE
 description = Background color for AwnDialog.
 
 [theme/dialog_title_bg]
-type = string
+type = color
 default = #FFFFFFFF
 description = Background color for AwnDialog's title.
 
 [theme/icon_text_color]
-type = string
+type = color
 default =
 description = Icon text color.  Leave empty to use gtk theme color.
 
 [theme/icon_text_outline_color]
-type = string
+type = color
 default =
 description = Icon text outline color.  Leave empty to use gtk theme color.
 
 [theme/icon_font_mode]
-type = int
+type = integer
 default = 0
 description = 0 - solid, 1 - outline, 2 - outline, reversed.
 
@@ -139,28 +146,28 @@
 description = width of icon text outline if outline mode is enabled.  Suggested values 1.0 - 5.0.
 
 [theme/border]
-type = string
+type = color
 default = #000000CC
 description = Main border color.
 
 [theme/hilight]
-type = string
+type = color
 default = #FFFFFF11
 description = Internal border color.
 
 [theme/show_sep]
-type = bool
-default = True
+type = boolean
+default = true
 description = Draw separators.
 
 [theme/sep_color]
-type = string
+type = color
 default = #FFFFFF00
 description = Separator color.
 
 [theme/draw_pattern]
-type = bool
-default = False
+type = boolean
+default = false
 description = Enable drawing of a pattern.
 
 [theme/pattern_alpha]
@@ -174,8 +181,8 @@
 description = The location of the pattern to draw.
 
 [theme/gtk_theme_mode]
-type = bool
-default = TRUE
+type = boolean
+default = true
 description = Whether to use colors from the current Gtk theme.
 
 [theme/corner_radius]
@@ -204,12 +211,12 @@
 description = Font name of the tooltip
 
 [theme/tooltip_font_color]
-type = string
+type = color
 default = #FFFFFFFF
 description = Font color of the tooltip
 
 [theme/tooltip_bg_color]
-type = string
+type = color
 default = #000000B3
 description = Background color of the tooltip
 
@@ -219,12 +226,12 @@
 description = Path to the current desktop file theme.
 
 [effects/reflection_offset]
-type = int
+type = integer
 default = 0
 description = The offset between the icon and it's reflection
 
 [effects/icon_effect]
-type = int
+type = integer
 default = 0
 description = A bitmask which stores the type of effect for each event
 
@@ -239,8 +246,8 @@
 description = Reflection alpha as a multiple of the current alpha of the icon.
 
 [effects/show_shadows]
-type = bool
-default = FALSE
+type = boolean
+default = false
 description = Show shadows for icons.
 
 [effects/arrow_icon]
@@ -249,17 +256,17 @@
 description = Path to the png containing the arrow icon.
 
 [shared/dialog_focus_loss_behavior]
-type = bool
+type = boolean
 default = true
 description = Whether to close dialogs on loss of focus.
 
 [shared/allow_generic_config_edit]
-type = bool
-default = False
+type = boolean
+default = false
 description = Determines if generic configuration editor is allowed for applets that do not have a customized preferences dialog.
 
 [shared/long_press_timeout]
-type = int
+type = integer
 default = 750
 description = Time in ms after which AwnIcon will emit long-press signal.
 

=== removed file 'data/awn-schema-to-gconf'
--- data/awn-schema-to-gconf	2008-04-13 00:03:43 +0000
+++ data/awn-schema-to-gconf	1970-01-01 00:00:00 +0000
@@ -1,92 +0,0 @@
-#!/usr/bin/env python
-#
-#  Copyright (C) 2007 Mark Lee <[e-mail]>
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
-#
-#  Author : Mark Lee <[e-mail]>
-
-import sys
-from ConfigParser import SafeConfigParser as ConfigParser
-try:
-    # >=dev-lang/python-2.5 cElementTree
-    from xml.etree import cElementTree as ET
-except ImportError:
-    try:
-        # >=dev-lang/python-2.5 ElementTree
-        from xml.etree import ElementTree as ET
-    except ImportError:
-        try:
-            # dev-python/lxml
-            import lxml.etree as ET
-        except ImportError:
-            try:
-                # dev-python/celementtree
-                import cElementTree as ET
-            except:
-                # dev-python/elementtree
-                from elementtree import ElementTree as ET
-
-def main(argv):
-    if len(argv) < 2:
-        sys.stderr.write('Usage: %s [input file] [output file] ([key prefix])\n')
-        sys.exit(1)
-    else:
-        in_schema = ConfigParser()
-        in_fp = file(argv[0], 'r')
-        in_schema.readfp(in_fp, argv[0])
-        in_fp.close()
-        out_schema = ET.ElementTree(ET.Element('gconfschemafile'))
-        schemalist = ET.SubElement(out_schema.getroot(), 'schemalist')
-        for key in in_schema.sections():
-            if key.startswith('DEFAULT/'):
-                real_key = key[8:]
-            else:
-                real_key = key
-            if len(argv) == 3:
-                full_key = '/apps/avant-window-navigator/applets/%s/%s' % (argv[2], real_key)
-            else:
-                full_key = '/apps/avant-window-navigator/%s' % real_key
-            schema_key = '/schemas' + full_key
-            schema_element = ET.SubElement(schemalist, 'schema')
-            ET.SubElement(schema_element, 'key').text = schema_key
-            ET.SubElement(schema_element, 'applyto').text = full_key
-            ET.SubElement(schema_element, 'owner').text = 'avant-window-navigator'
-            key_type = in_schema.get(key, 'type')
-            element_type = ET.SubElement(schema_element, 'type')
-            value = in_schema.get(key, 'default')
-            if key_type.startswith('list-'):
-                element_type.text = 'list'
-                ET.SubElement(schema_element, 'list_type').text = key_type[5:]
-                value = '[%s]' % value.replace(';', ',')
-            else:
-                element_type.text = key_type
-            ET.SubElement(schema_element, 'default').text = value
-            locale = ET.SubElement(schema_element, 'locale')
-            locale.set('name', 'C')
-            ET.SubElement(locale, 'short')
-            ET.SubElement(locale, 'long').text = in_schema.get(key, 'description')
-            for lang in [x[12:-1] for x in in_schema.options(key) if x.startswith('description[')]:
-                locale = ET.SubElement(schema_element, 'locale')
-                locale.set('name', lang)
-                ET.SubElement(locale, 'short')
-                ET.SubElement(locale, 'long').text = in_schema.get(key, 'description[%s]' % lang)
-
-        out_schema.write(argv[1], encoding='utf-8')
-
-if __name__ == '__main__':
-    main(sys.argv[1:])
-
-# vim: set ft=python et sw=4 ts=4 sts=4

=== modified file 'debian/awn-settings-trunk.install'
--- debian/awn-settings-trunk.install	2009-07-25 14:48:33 +0000
+++ debian/awn-settings-trunk.install	2009-08-05 07:18:27 +0000
@@ -2,6 +2,5 @@
 usr/share/icons/hicolor/*/apps/awn-settings.*
 usr/share/icons/hicolor/*/apps/awn-plugins.*
 usr/bin/awn-launcher-editor
-usr/bin/awn-schema-to-gconf
 usr/bin/awn-settings
 usr/share/applications/awn-settings.desktop

=== modified file 'debian/control'
--- debian/control	2009-06-21 22:56:41 +0000
+++ debian/control	2009-08-05 07:18:27 +0000
@@ -20,8 +20,8 @@
 		gtk-doc-tools, 
 		doc-base,
 		valac (>= 0.5.4),
-		python2.5 | python-lxml | python-celementtree | python-elementtree,
-		automake
+		automake,
+		libdesktop-agnostic-dev,
 Standards-Version: 3.7.3
 Homepage: https://launchpad.net/avant-window-navigator/
 XS-Python-Version: >= 2.4
@@ -33,6 +33,7 @@
 		${misc:Depends},
 		avant-window-navigator-data-trunk (>= ${source:Version}),
 		python-awn-trunk (>= ${source:Version}),
+		libdesktop-agnostic-vfs,
 		dbus-x11 | dbus
 Recommends:	awn-settings-trunk (>= 0.2),
 Suggests: 	metacity (>= 2.21.5) | xcompmgr | compiz | xfwm4 (>= 4.2)
@@ -58,7 +59,8 @@
 Section: libs
 Architecture: any
 Depends: 	${shlibs:Depends},
-		${misc:Depends}
+		${misc:Depends},
+		libdesktop-agnostic0,
 Suggests: 	metacity (>= 2.21.5) | xcompmgr | compiz | xfwm4 (>= 4.2)
 Conflicts: libawn0-bzr, libawn-bzr, libawn, libawn0, libawn0-testing
 Replaces: libawn0-bzr, libawn-bzr, libawn, libawn0, libawn0-testing
@@ -83,7 +85,8 @@
 		${shlibs:Depends},
 		${misc:Depends},
 		libgnome2-dev,
-		libgtk2.0-dev
+		libgtk2.0-dev,
+		libdesktop-agnostic-dev,
 Conflicts: libawn-dev-bzr, libawn-dev, libawn-testing-dev
 Replaces: libawn-dev-bzr, libawn-dev, libawn-testing-dev
 Description: library for avant-window-navigator - development files

=== modified file 'doc/reference/Makefile.am'
--- doc/reference/Makefile.am	2009-07-18 07:00:32 +0000
+++ doc/reference/Makefile.am	2009-07-18 07:24:08 +0000
@@ -54,7 +54,6 @@
 IGNORE_HFILES = \
 	$(DOC_SOURCE_DIR)/gseal-transition.h \
 	$(DOC_SOURCE_DIR)/stamp-awn-enum-types.h \
-	$(DOC_SOURCE_DIR)/egg/stamp-egg-enum-types.h \
 	$(DOC_SOURCE_DIR)/libawn.h \
 	$(NULL)
 

=== modified file 'doc/reference/libawn-docs.sgml'
--- doc/reference/libawn-docs.sgml	2009-06-23 09:05:41 +0000
+++ doc/reference/libawn-docs.sgml	2009-07-27 18:33:46 +0000
@@ -15,8 +15,7 @@
     </chapter>
     <chapter>
       <title>Base Components</title>
-      <xi:include href="xml/awn-config-bridge.xml"/>
-      <xi:include href="xml/awn-config-client.xml"/>
+      <xi:include href="xml/awn-config.xml"/>
       <xi:include href="xml/awn-dialog.xml"/>
       <xi:include href="xml/awn-effects.xml"/>
       <xi:include href="xml/awn-tooltip.xml"/>

=== modified file 'doc/reference/libawn-sections.txt'
--- doc/reference/libawn-sections.txt	2009-07-18 06:39:39 +0000
+++ doc/reference/libawn-sections.txt	2009-07-27 07:19:38 +0000
@@ -321,24 +321,6 @@
 </SECTION>
 
 <SECTION>
-<FILE>awn-config-bridge</FILE>
-AwnConfigBridgePrivate
-<TITLE>AwnConfigBridge</TITLE>
-AwnConfigBridge
-awn_config_bridge_get_default
-awn_config_bridge_bind
-awn_config_bridge_bind_list
-<SUBSECTION Standard>
-AWN_CONFIG_BRIDGE
-AWN_IS_CONFIG_BRIDGE
-AWN_TYPE_CONFIG_BRIDGE
-awn_config_bridge_get_type
-AWN_CONFIG_BRIDGE_CLASS
-AWN_IS_CONFIG_BRIDGE_CLASS
-AWN_CONFIG_BRIDGE_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>awn-overlay-progress-circle</FILE>
 <TITLE>AwnOverlayProgressCircle</TITLE>
 AwnOverlayProgressCircle
@@ -443,10 +425,6 @@
 </SECTION>
 
 <SECTION>
-<FILE>stamp-egg-enum-types</FILE>
-</SECTION>
-
-<SECTION>
 <FILE>libawn</FILE>
 </SECTION>
 
@@ -459,55 +437,6 @@
 </SECTION>
 
 <SECTION>
-<FILE>awn-vfs</FILE>
-AwnVfsMonitor
-AwnVfsMonitorEvent
-AwnVfsMonitorType
-AwnVfsMonitorFunc
-awn_vfs_monitor_add
-awn_vfs_monitor_emit
-awn_vfs_monitor_remove
-awn_vfs_init
-awn_vfs_get_pathlist_from_string
-</SECTION>
-
-<SECTION>
-<FILE>awn-config-client</FILE>
-AwnConfigClient
-AWN_TYPE_CONFIG_CLIENT
-AWN_CONFIG_CLIENT
-AwnConfigClientNotifyFunc
-AWN_CONFIG_CLIENT_DEFAULT_GROUP
-AwnConfigValueType
-AwnConfigListType
-AwnConfigBackend
-awn_config_client_get_type
-awn_config_client_new
-awn_config_client_new_for_applet
-awn_config_client_query_backend
-awn_config_client_clear
-awn_config_client_ensure_group
-awn_config_client_notify_add
-awn_config_client_entry_exists
-awn_config_client_load_defaults_from_schema
-awn_config_client_key_lock_open
-awn_config_client_key_lock
-awn_config_client_key_lock_close
-awn_config_client_get_value_type
-awn_config_client_get_bool
-awn_config_client_set_bool
-awn_config_client_get_float
-awn_config_client_set_float
-awn_config_client_get_int
-awn_config_client_set_int
-awn_config_client_get_string
-awn_config_client_set_string
-awn_config_client_get_list
-awn_config_client_set_list
-awn_config_client_free
-</SECTION>
-
-<SECTION>
 <FILE>awn-enum-types</FILE>
 awn_orientation_get_type
 AWN_TYPE_ORIENTATION
@@ -519,20 +448,10 @@
 AWN_TYPE_PATH_TYPE
 awn_cairo_round_corners_get_type
 AWN_TYPE_CAIRO_ROUND_CORNERS
-awn_config_value_type_get_type
-AWN_TYPE_CONFIG_VALUE_TYPE
-awn_config_list_type_get_type
-AWN_TYPE_CONFIG_LIST_TYPE
-awn_config_backend_get_type
-AWN_TYPE_CONFIG_BACKEND
 awn_effect_get_type
 AWN_TYPE_EFFECT
 awn_overlay_align_get_type
 AWN_TYPE_OVERLAY_ALIGN
-awn_vfs_monitor_event_get_type
-AWN_TYPE_VFS_MONITOR_EVENT
-awn_vfs_monitor_type_get_type
-AWN_TYPE_VFS_MONITOR_TYPE
 </SECTION>
 
 <SECTION>
@@ -563,14 +482,13 @@
 
 <SECTION>
 <FILE>awn-defines</FILE>
-AWN_GCONF_PATH
-AWN_APPLET_GCONF_PATH
 AWN_MAX_HEIGHT
 AWN_MIN_HEIGHT
 AwnOrientation
 AwnAppletFlags
 AwnAppletLicense
 AwnPathType
+AWN_PANEL_ID_DEFAULT
 AWN_FONT_SIZE_EXTRA_SMALL
 AWN_FONT_SIZE_SMALL
 AWN_FONT_SIZE_MEDIUM
@@ -579,31 +497,11 @@
 </SECTION>
 
 <SECTION>
-<FILE>awn-desktop-item</FILE>
-AwnDesktopItem
-AWN_TYPE_DESKTOP_ITEM
-AWN_DESKTOP_ITEM
-awn_desktop_item_get_type
-awn_desktop_item_new
-awn_desktop_item_copy
-awn_desktop_item_get_filename
-awn_desktop_item_get_item_type
-awn_desktop_item_set_item_type
-awn_desktop_item_get_icon_name
-awn_desktop_item_set_icon_name
-awn_desktop_item_get_icon
-awn_desktop_item_get_name
-awn_desktop_item_set_name
-awn_desktop_item_get_exec
-awn_desktop_item_set_exec
-awn_desktop_item_get_string
-awn_desktop_item_set_string
-awn_desktop_item_get_localestring
-awn_desktop_item_set_localestring
-awn_desktop_item_exists
-awn_desktop_item_launch
-awn_desktop_item_save
-awn_desktop_item_free
+<FILE>awn-config</FILE>
+awn_config_get_default
+awn_config_get_default_for_applet
+awn_config_get_default_for_applet_by_info
+awn_config_free
 </SECTION>
 
 <SECTION>
@@ -616,6 +514,8 @@
 awn_utils_ensure_transparent_bg
 awn_utils_make_transparent_bg
 awn_utils_get_offset_modifier_by_path_type
+awn_utils_gslist_to_gvaluearray
+awn_vfs_init
 </SECTION>
 
 <SECTION>
@@ -638,7 +538,6 @@
 AwnCairoRoundCorners
 awn_cairo_rounded_rect
 awn_cairo_rounded_rect_shadow
-AWN_RGBA_SCALE_FACTOR
 awn_cairo_set_source_color
 awn_cairo_set_source_color_with_alpha_multiplier
 awn_cairo_set_source_color_with_multipliers
@@ -647,71 +546,6 @@
 </SECTION>
 
 <SECTION>
-<FILE>eggdesktopfile</FILE>
-EggDesktopFileType
-EggDesktopFile
-egg_desktop_file_get_type
-EGG_TYPE_DESKTOP_FILE
-EGG_DESKTOP_FILE
-egg_desktop_file_new
-egg_desktop_file_new_from_data_dirs
-egg_desktop_file_new_from_key_file
-egg_desktop_file_copy
-egg_desktop_file_free
-egg_desktop_file_get_key_file
-egg_desktop_file_get_source
-egg_desktop_file_get_desktop_file_type
-egg_desktop_file_get_name
-egg_desktop_file_get_icon
-egg_desktop_file_can_launch
-egg_desktop_file_accepts_documents
-egg_desktop_file_accepts_multiple
-egg_desktop_file_accepts_uris
-egg_desktop_file_parse_exec
-egg_desktop_file_launch
-EggDesktopFileLaunchOption
-EGG_DESKTOP_FILE_GROUP
-EGG_DESKTOP_FILE_KEY_TYPE
-EGG_DESKTOP_FILE_KEY_VERSION
-EGG_DESKTOP_FILE_KEY_NAME
-EGG_DESKTOP_FILE_KEY_GENERIC_NAME
-EGG_DESKTOP_FILE_KEY_NO_DISPLAY
-EGG_DESKTOP_FILE_KEY_COMMENT
-EGG_DESKTOP_FILE_KEY_ICON
-EGG_DESKTOP_FILE_KEY_HIDDEN
-EGG_DESKTOP_FILE_KEY_ONLY_SHOW_IN
-EGG_DESKTOP_FILE_KEY_NOT_SHOW_IN
-EGG_DESKTOP_FILE_KEY_TRY_EXEC
-EGG_DESKTOP_FILE_KEY_EXEC
-EGG_DESKTOP_FILE_KEY_PATH
-EGG_DESKTOP_FILE_KEY_TERMINAL
-EGG_DESKTOP_FILE_KEY_MIME_TYPE
-EGG_DESKTOP_FILE_KEY_CATEGORIES
-EGG_DESKTOP_FILE_KEY_STARTUP_NOTIFY
-EGG_DESKTOP_FILE_KEY_STARTUP_WM_CLASS
-EGG_DESKTOP_FILE_KEY_URL
-EGG_DESKTOP_FILE_ERROR
-egg_desktop_file_error_quark
-EggDesktopFileError
-egg_set_desktop_file
-egg_get_desktop_file
-</SECTION>
-
-<SECTION>
-<FILE>egg-enum-types</FILE>
-egg_desktop_file_type_get_type
-EGG_TYPE_DESKTOP_FILE_TYPE
-egg_desktop_file_launch_option_get_type
-EGG_TYPE_DESKTOP_FILE_LAUNCH_OPTION
-egg_desktop_file_error_get_type
-EGG_TYPE_DESKTOP_FILE_ERROR
-</SECTION>
-
-<SECTION>
-<FILE>stamp-egg-enum-types</FILE>
-</SECTION>
-
-<SECTION>
 <FILE>awn-effect-turn</FILE>
 turn_hover_effect
 turn_effect

=== modified file 'doc/reference/libawn.types'
--- doc/reference/libawn.types	2009-07-18 06:39:39 +0000
+++ doc/reference/libawn.types	2009-07-27 07:19:38 +0000
@@ -6,34 +6,22 @@
 awn_icon_get_type
 awn_applet_simple_get_type
 awn_overlay_pixbuf_get_type
-awn_config_client_get_type
 awn_orientation_get_type
 awn_applet_flags_get_type
 awn_applet_license_get_type
 awn_path_type_get_type
 awn_cairo_round_corners_get_type
-awn_config_value_type_get_type
-awn_config_list_type_get_type
-awn_config_backend_get_type
 awn_effect_get_type
 awn_overlay_align_get_type
-awn_vfs_monitor_event_get_type
-awn_vfs_monitor_type_get_type
 awn_overlay_progress_get_type
-awn_desktop_item_get_type
 awn_themed_icon_get_type
 awn_overlay_throbber_get_type
 awn_applet_get_type
 awn_effects_get_type
 awn_alignment_get_type
-awn_config_bridge_get_type
 awn_overlay_progress_circle_get_type
 awn_icon_box_get_type
 awn_overlay_pixbuf_file_get_type
 awn_overlayable_get_type
 awn_image_get_type
 awn_overlay_get_type
-egg_desktop_file_get_type
-egg_desktop_file_type_get_type
-egg_desktop_file_launch_option_get_type
-egg_desktop_file_error_get_type

=== modified file 'libawn/Makefile.am'
--- libawn/Makefile.am	2009-07-18 07:00:32 +0000
+++ libawn/Makefile.am	2009-07-27 18:28:46 +0000
@@ -1,4 +1,4 @@
-SUBDIRS = egg anims
+SUBDIRS = anims
 
 include $(top_srcdir)/Makefile.shave
 MARSHAL_PREFIX = libawn
@@ -33,9 +33,7 @@
 	awn-applet.h \
 	awn-applet-simple.h \
 	awn-cairo-utils.h \
-	awn-config-bridge.h \
-	awn-config-client.h \
-	awn-desktop-item.h \
+	awn-config.h \
 	awn-dialog.h \
 	awn-effects.h \
 	awn-icon.h \
@@ -54,7 +52,6 @@
 	awn-themed-icon.h \
 	awn-tooltip.h \
 	awn-utils.h \
-	awn-vfs.h \
 	libawn.h
 	$(NULL)
 
@@ -71,7 +68,7 @@
 	awn-applet.c \
 	awn-applet-simple.c \
 	awn-cairo-utils.c \
-	awn-config-bridge.c \
+	awn-config.c \
 	awn-dialog.c \
 	awn-effects.c \
 	awn-effects-ops-new.c \
@@ -92,17 +89,8 @@
 	awn-themed-icon.c \
 	awn-tooltip.c \
 	awn-utils.c \
-	awn-vfs.c \
 	$(NULL)
 
-source_c += awn-desktop-item-egg.c
-
-if USE_GCONF
-source_c += awn-config-client-gconf.c
-else
-source_c += awn-config-client-gkeyfile.c
-endif
-
 libawninc_HEADERS = \
 	$(public_headers) \
 	$(NULL)
@@ -116,7 +104,6 @@
 libawn_la_LDFLAGS = -version-info 0:1:0
 
 libawn_la_LIBADD += \
-	$(top_builddir)/libawn/egg/libeggdesktopfile.la \
 	$(top_builddir)/libawn/anims/libawn-effects-anims.la \
 	$(NULL)
 
@@ -141,6 +128,4 @@
 
 CLEANFILES = $(STAMPFILES) $(BUILT_SOURCES)
 
-EXTRA_DIST=awn-config-client-shared.c
-
 # vim: set ts=8 sts=8 sw=8 :

=== modified file 'libawn/awn-cairo-utils.c'
--- libawn/awn-cairo-utils.c	2009-08-06 06:57:04 +0000
+++ libawn/awn-cairo-utils.c	2009-08-06 19:16:07 +0000
@@ -237,11 +237,11 @@
 {
   g_return_if_fail (color);
 
-  cairo_set_source_rgba (cr,
-                         desktop_agnostic_color_get_red (color) / AWN_RGBA_SCALE_FACTOR,
-                         desktop_agnostic_color_get_green (color) / AWN_RGBA_SCALE_FACTOR,
-                         desktop_agnostic_color_get_blue (color) / AWN_RGBA_SCALE_FACTOR,
-                         desktop_agnostic_color_get_alpha (color) / AWN_RGBA_SCALE_FACTOR);
+  double red, green, blue, alpha;
+
+  desktop_agnostic_color_get_cairo_color (color, &red, &green, &blue, &alpha);
+
+  cairo_set_source_rgba (cr, red, green, blue, alpha);
 }
 
 void
@@ -252,11 +252,11 @@
   g_return_if_fail (color);
   g_return_if_fail (multiplier >= 0 && multiplier <= 1.0);
 
-  cairo_set_source_rgba (cr,
-                         desktop_agnostic_color_get_red (color) / AWN_RGBA_SCALE_FACTOR,
-                         desktop_agnostic_color_get_green (color) / AWN_RGBA_SCALE_FACTOR,
-                         desktop_agnostic_color_get_blue (color) / AWN_RGBA_SCALE_FACTOR,
-                         desktop_agnostic_color_get_alpha (color) / AWN_RGBA_SCALE_FACTOR * multiplier);
+  double red, green, blue, alpha;
+
+  desktop_agnostic_color_get_cairo_color (color, &red, &green, &blue, &alpha);
+
+  cairo_set_source_rgba (cr, red, green, blue, alpha * multiplier);
 }
 
 void
@@ -267,11 +267,12 @@
 {
   g_return_if_fail (color);
 
-  cairo_set_source_rgba (cr,
-                         desktop_agnostic_color_get_red (color) / AWN_RGBA_SCALE_FACTOR * color_multiplier,
-                         desktop_agnostic_color_get_green (color) / AWN_RGBA_SCALE_FACTOR * color_multiplier,
-                         desktop_agnostic_color_get_blue (color) / AWN_RGBA_SCALE_FACTOR * color_multiplier,
-                         desktop_agnostic_color_get_alpha (color) / AWN_RGBA_SCALE_FACTOR * alpha_multiplier);
+  double red, green, blue, alpha;
+
+  desktop_agnostic_color_get_cairo_color (color, &red, &green, &blue, &alpha);
+
+  cairo_set_source_rgba (cr, red * color_multiplier, green * color_multiplier,
+                         blue * color_multiplier, alpha * alpha_multiplier);
 }
 
 void
@@ -281,11 +282,11 @@
 {
   g_return_if_fail (color);
 
-  cairo_pattern_add_color_stop_rgba (pattern, offset,
-                                     desktop_agnostic_color_get_red (color) / AWN_RGBA_SCALE_FACTOR,
-                                     desktop_agnostic_color_get_green (color) / AWN_RGBA_SCALE_FACTOR,
-                                     desktop_agnostic_color_get_blue (color) / AWN_RGBA_SCALE_FACTOR,
-                                     desktop_agnostic_color_get_alpha (color) / AWN_RGBA_SCALE_FACTOR);
+  double red, green, blue, alpha;
+
+  desktop_agnostic_color_get_cairo_color (color, &red, &green, &blue, &alpha);
+
+  cairo_pattern_add_color_stop_rgba (pattern, offset, red, green, blue, alpha);
 }
 
 void
@@ -297,11 +298,12 @@
   g_return_if_fail (color);
   g_return_if_fail (multiplier >= 0 && multiplier <= 1.0);
 
-  cairo_pattern_add_color_stop_rgba (pattern, offset,
-                                     desktop_agnostic_color_get_red (color) / AWN_RGBA_SCALE_FACTOR,
-                                     desktop_agnostic_color_get_green (color) / AWN_RGBA_SCALE_FACTOR,
-                                     desktop_agnostic_color_get_blue (color) / AWN_RGBA_SCALE_FACTOR,
-                                     desktop_agnostic_color_get_alpha (color) / AWN_RGBA_SCALE_FACTOR * multiplier);
+  double red, green, blue, alpha;
+
+  desktop_agnostic_color_get_cairo_color (color, &red, &green, &blue, &alpha);
+
+  cairo_pattern_add_color_stop_rgba (pattern, offset, red, green, blue,
+                                     alpha * multiplier);
 }
 
 /* vim: set et ts=2 sts=2 sw=2 ai cindent : */

=== modified file 'libawn/awn-cairo-utils.h'
--- libawn/awn-cairo-utils.h	2009-08-01 03:51:13 +0000
+++ libawn/awn-cairo-utils.h	2009-08-05 04:06:09 +0000
@@ -58,8 +58,6 @@
                               double radius, AwnCairoRoundCorners state,
                               double shadow_radius, double shadow_alpha);
 
-#define AWN_RGBA_SCALE_FACTOR (double)(G_MAXUSHORT)
-
 void
 awn_cairo_set_source_color (cairo_t              *cr,
                             DesktopAgnosticColor *color);

=== removed file 'libawn/awn-config-bridge.c'
--- libawn/awn-config-bridge.c	2008-12-24 23:54:53 +0000
+++ libawn/awn-config-bridge.c	1970-01-01 00:00:00 +0000
@@ -1,317 +0,0 @@
-/*
- *  Copyright (C) 2008 Neil Jagdish Patel <[e-mail]>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
- *
- *  Author : Neil Jagdish Patel <[e-mail]>
- *
- */
-
-#include "config.h"
-
-#include "awn-config-bridge.h"
-
-G_DEFINE_TYPE (AwnConfigBridge, awn_config_bridge, G_TYPE_OBJECT)
-
-#define AWN_CONFIG_BRIDGE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE (obj, \
-  AWN_TYPE_CONFIG_BRIDGE, AwnConfigBridgePrivate))
-
-struct _AwnConfigBridgePrivate
-{
-  GList *binds;
-};
-
-typedef struct
-{
-  GObject           *object;
-  gchar             *property_name;
-  AwnConfigListType  type;
-
-} AwnConfigBind;
-
-/*
- * FORWARDS
- */
-static void on_boolean_key_changed (AwnConfigClientNotifyEntry *entry,
-                                    gpointer                    data);
-static void on_float_key_changed   (AwnConfigClientNotifyEntry *entry,
-                                    gpointer                    data);
-static void on_int_key_changed     (AwnConfigClientNotifyEntry *entry,
-                                    gpointer                    data);
-static void on_string_key_changed  (AwnConfigClientNotifyEntry *entry,
-                                    gpointer                    data);
-static void on_list_key_changed    (AwnConfigClientNotifyEntry *entry,
-                                    gpointer                    data);
-
-static void
-awn_config_bridge_dispose (GObject *object)
-{
-  AwnConfigBridgePrivate *priv = AWN_CONFIG_BRIDGE_GET_PRIVATE (object);
-  GList                   *b;
-
-  for (b = priv->binds; b; b = b->next)
-  {
-    AwnConfigBind *bind = b->data;
-
-    g_free (bind->property_name);
-    g_slice_free (AwnConfigBind, bind);
-  }
-  g_list_free (priv->binds);
-
-  G_OBJECT_CLASS (awn_config_bridge_parent_class)->dispose (object);
-}
-
-static void
-awn_config_bridge_class_init (AwnConfigBridgeClass *klass)
-{
-  GObjectClass *obj_class = G_OBJECT_CLASS (klass);
-
-  obj_class->dispose = awn_config_bridge_dispose;
-
-  g_type_class_add_private (obj_class, sizeof (AwnConfigBridgePrivate));
-}
-
-
-static void
-awn_config_bridge_init (AwnConfigBridge *bridge)
-{
-  AwnConfigBridgePrivate *priv;
-
-  priv = bridge->priv = AWN_CONFIG_BRIDGE_GET_PRIVATE (bridge);
-
-  priv->binds = NULL;
-}
-
-AwnConfigBridge * 
-awn_config_bridge_get_default (void)
-{
-  AwnConfigBridge *bridge = NULL;
-
-  if (!bridge)
-    bridge = g_object_new (AWN_TYPE_CONFIG_BRIDGE, NULL);
-
-  return bridge;
-}
-
-/*
- * Binding function for most types 
- */
-void  
-awn_config_bridge_bind (AwnConfigBridge *bridge,
-                        AwnConfigClient *client,
-                        const gchar     *group,
-                        const gchar     *key,
-                        GObject         *object,
-                        const gchar     *property_name)
-{
-  AwnConfigBridgePrivate *priv;
-  AwnConfigBind          *bind;
-  GParamSpec             *spec;
-  gchar                  *string;
-  GError                 *error;
-  gboolean               key_exists;
-
-  g_return_if_fail (AWN_IS_CONFIG_BRIDGE (bridge));
-  g_return_if_fail (client);
-  g_return_if_fail (group);
-  g_return_if_fail (key);
-  g_return_if_fail (G_IS_OBJECT (object));
-  g_return_if_fail (property_name);
-  priv = bridge->priv;
-
-  error = NULL;
-
-  bind = g_slice_new0 (AwnConfigBind);
-  bind->object = object;
-  bind->property_name = g_strdup (property_name);
-
-  spec = g_object_class_find_property (G_OBJECT_GET_CLASS (object),
-                                       property_name);
-  
-  key_exists = awn_config_client_entry_exists(client, group, key);
-
-  switch (G_PARAM_SPEC_VALUE_TYPE (spec))
-  {
-    case G_TYPE_BOOLEAN:
-      if (key_exists) {
-        g_object_set (object, property_name, 
-                      awn_config_client_get_bool (client, group, key, &error), 
-                      NULL);
-      }
-      awn_config_client_notify_add (client, group, key,
-                                    on_boolean_key_changed, bind);
-      break;
-    
-    case G_TYPE_FLOAT:
-    case G_TYPE_DOUBLE:
-      if (key_exists) {
-        g_object_set (object, property_name, 
-                      awn_config_client_get_float (client, group, key, &error),
-                      NULL);
-      }
-      awn_config_client_notify_add (client, group, key,
-                                    on_float_key_changed, bind);
-      break;
-    
-    case G_TYPE_INT:
-    case G_TYPE_UINT:
-      if (key_exists) {
-        g_object_set (object, property_name, 
-                      awn_config_client_get_int (client, group, key, &error),
-                      NULL);
-      }
-      awn_config_client_notify_add (client, group, key,
-                                    on_int_key_changed, bind);
-      break;
-
-    case G_TYPE_STRING:
-      string = awn_config_client_get_string (client, group, key, &error);
-      if (key_exists) {
-        g_object_set (object, property_name,
-                      string,
-                      NULL);
-      }
-      awn_config_client_notify_add (client, group, key,
-                                    on_string_key_changed, bind);
-      if (string) g_free (string);
-      break;
-
-    default:
-      g_print ("Unable to handle type for %s\n", property_name);
-      g_free (bind->property_name);
-      g_slice_free (AwnConfigBind, bind);
-      return;
-  }
-  
-  if (error)
-  {
-    g_warning ("Error binding ConfigClient: %s\n", error->message);
-    g_error_free (error);
-  }
-
-  priv->binds = g_list_append (priv->binds, bind);
-}
-
-void
-awn_config_bridge_bind_list   (AwnConfigBridge   *bridge,
-                               AwnConfigClient   *client,
-                               const gchar       *group,
-                               const gchar       *key,
-                               AwnConfigListType  list_type,
-                               GObject           *object,
-                               const gchar       *property_name)
-{
-  AwnConfigBridgePrivate *priv;
-  AwnConfigBind          *bind;
-  GParamSpec             *spec;
-  GSList                 *list;
-
-
-  g_return_if_fail (AWN_IS_CONFIG_BRIDGE (bridge));
-  g_return_if_fail (client);
-  g_return_if_fail (group);
-  g_return_if_fail (key);
-  g_return_if_fail (G_IS_OBJECT (object));
-  g_return_if_fail (property_name);
-  priv = bridge->priv;
-
-  bind = g_slice_new0 (AwnConfigBind);
-  bind->object = object;
-  bind->property_name = g_strdup (property_name);
-  bind->type = list_type;
-
-  spec = g_object_class_find_property (G_OBJECT_GET_CLASS (object),
-                                       property_name);
-
-  if (G_PARAM_SPEC_VALUE_TYPE (spec) != G_TYPE_POINTER)
-  {
-    g_warning ("Unable to bridge between lists and anything != G_TYPE_POINTER");
-    g_free (bind->property_name);
-    g_slice_free (AwnConfigBind, bind);
-    return;
-  }
-
-  list = awn_config_client_get_list (client, group, key, list_type, NULL);
-  g_object_set (object, property_name, list, NULL);
-
-  awn_config_client_notify_add (client, group, key, on_list_key_changed, bind);
-
-  priv->binds = g_list_append (priv->binds, bind);
-}
-
-static void
-on_boolean_key_changed (AwnConfigClientNotifyEntry *entry,
-                        gpointer                    data)
-{
-  AwnConfigBind *bind = (AwnConfigBind*)data;
-  
-  g_return_if_fail (bind);
-
-  g_object_set (bind->object, 
-                bind->property_name, entry->value.bool_val, 
-                NULL);
-}
-
-static void
-on_float_key_changed (AwnConfigClientNotifyEntry *entry,
-                      gpointer                    data)
-{
-  AwnConfigBind *bind = (AwnConfigBind*)data;
-  
-  g_return_if_fail (bind);
-
-  g_object_set (bind->object, 
-                bind->property_name, entry->value.float_val, 
-                NULL);
-}
-
-static void
-on_int_key_changed (AwnConfigClientNotifyEntry *entry,
-                    gpointer                    data)
-{
-  AwnConfigBind *bind = (AwnConfigBind*)data;
-  
-  g_return_if_fail (bind);
-
-  g_object_set (bind->object, 
-                bind->property_name, entry->value.int_val, 
-                NULL);
-}
-
-static void
-on_string_key_changed (AwnConfigClientNotifyEntry *entry,
-                       gpointer                    data)
-{
-  AwnConfigBind *bind = (AwnConfigBind*)data;
-  
-  g_return_if_fail (bind);
-
-  g_object_set (bind->object, 
-                bind->property_name, entry->value.str_val, 
-                NULL);
-}
-
-static void
-on_list_key_changed (AwnConfigClientNotifyEntry *entry,
-                     gpointer                    data)
-{
-  AwnConfigBind *bind = (AwnConfigBind*)data;
-  
-  g_return_if_fail (bind);
-
-  g_object_set (bind->object, 
-                bind->property_name, entry->value.list_val, 
-                NULL);
-}

=== removed file 'libawn/awn-config-bridge.h'
--- libawn/awn-config-bridge.h	2008-09-27 18:44:29 +0000
+++ libawn/awn-config-bridge.h	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-/*
- *  Copyright (C) 2008 Neil Jagdish Patel <[e-mail]>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA.
- *
- *  Author : Neil Jagdish Patel <[e-mail]>
-*/
-
-#ifndef	_AWN_CONFIG_BRIDGE_H
-#define	_AWN_CONFIG_BRIDGE_H
-
-#include <glib.h>
-#include <glib-object.h>
-
-#include <libawn/awn-config-client.h>
-
-G_BEGIN_DECLS
-
-#define AWN_TYPE_CONFIG_BRIDGE (awn_config_bridge_get_type())
-
-#define AWN_CONFIG_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AWN_TYPE_CONFIG_BRIDGE, \
-  AwnConfigBridge))
-
-#define AWN_CONFIG_BRIDGE_CLASS(obj)	(G_TYPE_CHECK_CLASS_CAST ((obj), AWN_TYPE_CONFIG_BRIDGE, \
-  AwnConfigBridgeClass))
-
-#define AWN_IS_CONFIG_BRIDGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AWN_TYPE_CONFIG_BRIDGE))
-
-#define AWN_IS_CONFIG_BRIDGE_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((obj), \
-  AWN_TYPE_CONFIG_BRIDGE))
-
-#define AWN_CONFIG_BRIDGE_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), \
-  AWN_TYPE_CONFIG_BRIDGE, AwnConfigBridgeClass))
-
-typedef struct _AwnConfigBridge AwnConfigBridge;
-typedef struct _AwnConfigBridgeClass AwnConfigBridgeClass;
-typedef struct _AwnConfigBridgePrivate AwnConfigBridgePrivate;
-
-struct _AwnConfigBridge 
-{
-  GObject  parent;
-
-  AwnConfigBridgePrivate *priv;
-};
-
-struct _AwnConfigBridgeClass 
-{
-  GObjectClass parent_class;
-};
-
-GType             awn_config_bridge_get_type (void) G_GNUC_CONST;
-
-AwnConfigBridge * awn_config_bridge_get_default (void);
-
-void              awn_config_bridge_bind        (AwnConfigBridge *bridge,
-                                                 AwnConfigClient *client,
-                                                 const gchar     *group,
-                                                 const gchar     *key,
-                                                 GObject         *object,
-                                                 const gchar     *prop_name);
-
-void              awn_config_bridge_bind_list   (AwnConfigBridge   *bridge,
-                                                 AwnConfigClient   *client,
-                                                 const gchar       *group,
-                                                 const gchar       *key,
-                                                 AwnConfigListType  list_type,
-                                                 GObject           *object,
-                                                 const gchar       *prop_name);
-
-
-G_END_DECLS
-
-#endif /* _AWN_CONFIG_BRIDGE_H */
-

=== removed file 'libawn/awn-config-client-gconf.c'
--- libawn/awn-config-client-gconf.c	2009-05-25 02:12:33 +0000
+++ libawn/awn-config-client-gconf.c	1970-01-01 00:00:00 +0000
@@ -1,509 +0,0 @@
-/*
- *  Copyright (C) 2007, 2008 Mark Lee <[e-mail]>
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the
- *  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- *  Boston, MA 02111-1307, USA.
- *
- *  Author : Mark Lee <[e-mail]>
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <gconf/gconf-client.h>
-
-#include "libawn/awn-config-client.h"
-#include "libawn/awn-defines.h"
-#include "awn-config-client-shared.c"
-
-struct _AwnConfigClient
-{
-	GConfClient *client;
-	gchar *path; /* key prefix */
-};
-
-typedef struct 
-{
-	AwnConfigClient *client;
-	AwnConfigClientNotifyFunc callback;
-	gpointer data;
-} AwnConfigClientNotifyData;
-
-/* returns a newly allocated string */
-static gchar *
-awn_config_client_generate_key (AwnConfigClient *client, 
-                                const gchar     *group, 
-                                const gchar     *key)
-{
-	if (key == NULL) 
-  {
-		if (strcmp (group, AWN_CONFIG_CLIENT_DEFAULT_GROUP) == 0) {
-			return g_strdup (client->path);
-		} 
-    else 
-    {
-			return g_strconcat (client->path, "/", group, NULL);
-		}
-	} 
-  else 
-  {
-		if (strcmp (group, AWN_CONFIG_CLIENT_DEFAULT_GROUP) == 0) 
-    {
-			return g_strconcat (client->path, "/", key, NULL);
-		} 
-    else 
-    {
-			return g_strconcat (client->path, "/", group, "/", key, NULL);
-		}
-	}
-}
-
-static void 
-awn_config_client_notify_proxy (GConfClient               *client, 
-                                guint                      cid, 
-                                GConfEntry                *entry, 
-                                AwnConfigClientNotifyData *notify)
-{
-	AwnConfigClientNotifyEntry *awn_entry = g_new (AwnConfigClientNotifyEntry, 1);
-	GConfValue *value = NULL;
-	value = gconf_entry_get_value (entry);
-
-	if (value) 
-  {
-		gchar **exploded = g_strsplit (gconf_entry_get_key (entry), "/", 0);
-		guint exploded_len = g_strv_length (exploded);
-		gchar **base_exploded = g_strsplit (notify->client->path, "/", 0);
-		guint base_exploded_len = g_strv_length (base_exploded);
-		g_strfreev (base_exploded);
-		g_return_if_fail (exploded_len >= 2);
-		awn_entry->client = notify->client;
-
-		if (exploded_len - base_exploded_len == 1) 
-    { 
-      /* special case: top-level dock/applet keys */
-			awn_entry->group = g_strdup (AWN_CONFIG_CLIENT_DEFAULT_GROUP);
-		} 
-    else 
-    {
-			awn_entry->group = g_strdup (exploded[exploded_len - 2]);
-		}
-		awn_entry->key = g_strdup (exploded[exploded_len - 1]);
-		g_strfreev (exploded);
-		
-    switch (value->type) 
-    {
-			case GCONF_VALUE_BOOL:
-				awn_entry->value.bool_val = gconf_value_get_bool (value);
-				break;
-			case GCONF_VALUE_FLOAT:
-				awn_entry->value.float_val = (gfloat)gconf_value_get_float (value);
-				break;
-			case GCONF_VALUE_INT:
-				awn_entry->value.int_val = gconf_value_get_int (value);
-				break;
-			case GCONF_VALUE_LIST:
-				awn_entry->value.list_val = gconf_client_get_list (client, entry->key, gconf_value_get_list_type (value), NULL);
-				break;
-			case GCONF_VALUE_STRING:
-				awn_entry->value.str_val = (gchar*)gconf_value_get_string (value);
-				break;
-			default:
-				/* FIXME do an error? */
-				g_warning ("Invalid GConf value type!");
-				break;
-		}
-		(notify->callback) (awn_entry, notify->data);
-		g_free (awn_entry->group);
-		g_free (awn_entry->key);
-	}
-	g_free (awn_entry);
-}
-
-static AwnConfigClient *
-awn_config_client_new_with_path (const gchar *path, const gchar *name)
-{
-	AwnConfigClient *client = g_new (AwnConfigClient, 1);
-	client->path = g_strdup (path);
-	client->client = gconf_client_get_default ();
-	
-  if (!gconf_client_dir_exists (client->client, client->path, NULL)) 
-  {
-		GError *err = NULL;
-		awn_config_client_load_defaults_from_schema (client, &err);
-		if (err) 
-    {
-			g_error ("Error loading the schema: '%s'", err->message);
-			g_error_free (err);
-		}
-	}
-	gconf_client_add_dir (client->client, AWN_GCONF_PATH, GCONF_CLIENT_PRELOAD_NONE, NULL);
-	return client;
-}
-
-AwnConfigClient *
-awn_config_client_new ()
-{
-	static AwnConfigClient *awn_dock_config = NULL;
-	if (!awn_dock_config) 
-  {
-		awn_dock_config = awn_config_client_new_with_path (AWN_GCONF_PATH, NULL);
-	}
-	return awn_dock_config;
-}
-
-static void
-_associate_schemas_in_dir (GConfClient *client,
-                           const gchar *prefs_key,
-                           const gchar *schema_dir,
-                           GError **error)
-{
-  GSList *list, *l;
-
-  list = gconf_client_all_entries (client, schema_dir, error);
-
-  if (error)
-  {
-    g_return_if_fail (*error == NULL);
-  }
-  
-  for (l = list; l; l = l->next) 
-  {
-    GConfEntry *entry = l->data;
-    gchar *key;
-    gchar *tmp;
-
-    tmp = g_path_get_basename (gconf_entry_get_key (entry));
-	
-    if (strchr (tmp, '-'))
-      g_warning ("Applet key '%s' contains a hyphen. Please "
-     	           "use underscores in gconf keys\n", tmp);
-	
-    key = g_strdup_printf ("%s/%s", prefs_key, tmp);
-	
-    g_free (tmp);
-
-    gconf_engine_associate_schema (
-      client->engine, key, gconf_entry_get_key (entry), error);
-    
-    g_free (key);
-	
-    gconf_entry_free (entry);
-	
-    if (error && *error)
-    {
-    g_slist_free (list);
-      return;
-    }
-  }
-
-  g_slist_free (list);
-
-  list = gconf_client_all_dirs (client, schema_dir, error);
- 	
-  for (l = list; l; l = l->next) 
-  {
-    gchar *subdir = l->data;
-    gchar *prefs_subdir;
-    gchar *schema_subdir;
-    gchar *tmp;
-	
-    tmp = g_path_get_basename (subdir);
-	
-    prefs_subdir = g_strdup_printf ("%s/%s", prefs_key, tmp);
-    schema_subdir = g_strdup_printf ("%s/%s", schema_dir, tmp);
-	
-    _associate_schemas_in_dir (
-    client, prefs_subdir, schema_subdir, error);
-	
-    g_free (prefs_subdir);
-    g_free (schema_subdir);
-    g_free (subdir);
-    g_free (tmp);
-	
-    if (error && *error)
-    {
-      g_slist_free (list);
-      return;
-    }
-  }
-
-  g_slist_free (list);
-} 
-
-AwnConfigClient *
-awn_config_client_new_for_applet (const gchar *name, const gchar *uid)
-{
-	AwnConfigClient *client;
-  gchar *gconf_key = NULL;
-
-  g_return_val_if_fail (name, NULL);
-
-	if (uid) 
-  {
-    GConfClient *c;
-
-		gconf_key = g_strconcat (AWN_GCONF_PATH, "/applets/", uid, NULL);
-
-    /* Check if the dir exists, and if not, apply the applet schema to it */
-    c = gconf_client_get_default ();
-    if (!gconf_client_dir_exists (c, gconf_key, NULL))
-    {
-      gchar *schema_key =  g_strconcat (AWN_GCONF_PATH, "/applets/", name,NULL);
-      _associate_schemas_in_dir (c, gconf_key, schema_key, NULL);
-      g_free (schema_key);
-    }
-    g_object_unref (c);
-	} 
-  else 
-  {
-		gconf_key = g_strconcat (AWN_GCONF_PATH, "/applets/", name, NULL);
-	}
-  
-  client = awn_config_client_new_with_path (gconf_key, name);
-	g_free (gconf_key);
-	
-  return client;
-}
-
-/**
- * awn_config_client_query_backend :
- *
- * Returns: An enum value indicating the backend in use.
- */
-AwnConfigBackend  awn_config_client_query_backend (void)
-{
-  return AWN_CONFIG_CLIENT_GKEYFILE;  
-}
-
-
-void awn_config_client_clear (AwnConfigClient *client, GError **err)
-{
-	/* only do it for applets on gconf */
-	if (strcmp (AWN_GCONF_PATH, client->path) != 0) {
-		gconf_client_remove_dir (client->client, client->path, err);
-	}
-}
-
-void awn_config_client_ensure_group (AwnConfigClient *client, const gchar *group)
-{
-	gchar *gconf_key = awn_config_client_generate_key (client, group, NULL);
-	if (!gconf_client_dir_exists (client->client, gconf_key, NULL)) {
-		gconf_client_add_dir (client->client, gconf_key, GCONF_CLIENT_PRELOAD_NONE, NULL);
-	}
-	g_free (gconf_key);
-}
-
-void awn_config_client_notify_add (AwnConfigClient *client, const gchar *group, 
-				   const gchar *key, AwnConfigClientNotifyFunc callback,
-				   gpointer user_data)
-{
-	AwnConfigClientNotifyData *notify = g_new0 (AwnConfigClientNotifyData, 1);
-	notify->callback = callback;
-	notify->data = user_data;
-	gchar *full_key = awn_config_client_generate_key (client, group, key);
-	notify->client = client;
-	GError *err = NULL;
-	guint notify_id = gconf_client_notify_add (client->client, full_key, (GConfClientNotifyFunc)awn_config_client_notify_proxy, notify, NULL, &err);
-	if (notify_id == 0 || err) {
-		g_warning ("Something went wrong when we tried to add a notification callback: %s", err->message);
-		g_error_free (err);
-	}
-	g_free (full_key);
-}
-
-gboolean awn_config_client_entry_exists (AwnConfigClient *client, const gchar *group, const gchar *key)
-{
-	GConfValue *value = NULL;
-	gchar *gconf_key = awn_config_client_generate_key (client, group, key);
-	value = gconf_client_get (client->client, gconf_key, NULL);
-	g_free (gconf_key);
-	return value != NULL;
-}
-
-void awn_config_client_load_defaults_from_schema (AwnConfigClient *client, GError **err)
-{
-	(void)g_spawn_command_line_async ("killall -HUP gconfd-2", err);
-}
-
-AwnConfigValueType awn_config_client_get_value_type (AwnConfigClient *client, const gchar *group, const gchar *key, GError **err)
-{
-	AwnConfigValueType value_type;
-	gchar *gconf_key = awn_config_client_generate_key (client, group, key);
-	GConfValue *value = gconf_client_get (client->client, gconf_key, err);
-	if (value) {
-		switch (value->type) {
-			case GCONF_VALUE_BOOL:
-				value_type = AWN_CONFIG_VALUE_TYPE_BOOL;
-				break;
-			case GCONF_VALUE_FLOAT:
-				value_type = AWN_CONFIG_VALUE_TYPE_FLOAT;
-				break;
-			case GCONF_VALUE_INT:
-				value_type = AWN_CONFIG_VALUE_TYPE_INT;
-				break;
-			case GCONF_VALUE_STRING:
-				value_type = AWN_CONFIG_VALUE_TYPE_STRING;
-				break;
-			case GCONF_VALUE_LIST: {
-				switch (gconf_value_get_list_type (value)) {
-					case GCONF_VALUE_BOOL:
-						value_type = AWN_CONFIG_VALUE_TYPE_LIST_BOOL;
-						break;
-					case GCONF_VALUE_FLOAT:
-						value_type = AWN_CONFIG_VALUE_TYPE_LIST_FLOAT;
-						break;
-					case GCONF_VALUE_INT:
-						value_type = AWN_CONFIG_CLIENT_LIST_TYPE_INT;
-						break;
-					case GCONF_VALUE_STRING:
-						value_type = AWN_CONFIG_VALUE_TYPE_LIST_STRING;
-						break;
-					default:
-						value_type = AWN_CONFIG_VALUE_TYPE_NULL;
-						break;
-				}
-				break;
-			} default:
-				value_type = AWN_CONFIG_VALUE_TYPE_NULL;
-				break;
-		}
-	} else {
-		value_type = AWN_CONFIG_VALUE_TYPE_NULL;
-	}
-	g_free (gconf_key);
-	return value_type;
-}
-
-gboolean awn_config_client_get_bool (AwnConfigClient *client, const gchar *group, const gchar *key, GError **err)
-{
-    gchar *gconf_key = awn_config_client_generate_key (client, group, key);
-    gboolean value = gconf_client_get_bool (client->client, gconf_key, err);
-    g_free (gconf_key);
-    return value;
-}
-
-void awn_config_client_set_bool (AwnConfigClient *client, const gchar *group, const gchar *key, gboolean value, GError **err)
-{
-	gchar *full_key = awn_config_client_generate_key (client, group, key);
-	gconf_client_set_bool (client->client, full_key, value, err);
-	g_free (full_key);
-}
-
-gfloat awn_config_client_get_float (AwnConfigClient *client, const gchar *group, const gchar *key, GError **err)
-{
-	gchar *gconf_key = awn_config_client_generate_key (client, group, key);
-	gfloat value = gconf_client_get_float (client->client, gconf_key, err);
-	g_free (gconf_key);
-	return value;