[nautilus-actions] Clean-up GConf reader code

[Pierre Wieser <pwieser src gnome org>]

commit 5d9f4f919c710d72dee42f8410f75f34c5b2c233
Author: Pierre Wieser <pwieser trychlos org>
Date:   Thu Feb 25 18:51:57 2010 +0100

    Clean-up GConf reader code

 src/io-gconf/nagp-reader.c |  328 +-------------------------------------------
 1 files changed, 1 insertions(+), 327 deletions(-)
---
diff --git a/src/io-gconf/nagp-reader.c b/src/io-gconf/nagp-reader.c
index 601ff32..ddcedc4 100644
--- a/src/io-gconf/nagp-reader.c
+++ b/src/io-gconf/nagp-reader.c
@@ -60,16 +60,7 @@ static void           read_done_item( const NAIFactoryProvider *provider, NAObje
 static void           read_done_action( const NAIFactoryProvider *provider, NAObjectAction *action, ReaderData *data, GSList **messages );
 static void           read_done_action_load_profile( const NAIFactoryProvider *provider, ReaderData *data, const gchar *path, GSList **messages );
 static void           read_done_profile( const NAIFactoryProvider *provider, NAObjectProfile *profile, ReaderData *data, GSList **messages );
-#if 0
-static void           read_item_action( NagpGConfProvider *provider, const gchar *path, NAObjectAction *action );
-static void           read_item_action_properties( NagpGConfProvider *provider, GSList *entries, NAObjectAction *action );
-static void           read_item_action_properties_v1( NagpGConfProvider *gconf, GSList *entries, NAObjectAction *action );
-static void           read_item_action_profile( NagpGConfProvider *provider, NAObjectAction *action, const gchar *path );
-static void           read_item_action_profile_properties( NagpGConfProvider *provider, GSList *entries, NAObjectProfile *profile );
-static void           read_item_menu( NagpGConfProvider *provider, const gchar *path, NAObjectMenu *menu );
-static void           read_item_menu_properties( NagpGConfProvider *provider, GSList *entries, NAObjectMenu *menu );
-static void           read_object_item_properties( NagpGConfProvider *provider, GSList *entries, NAObjectItem *item );
-#endif
+
 static NADataBoxed   *get_boxed_from_path( const NagpGConfProvider *provider, const gchar *path, ReaderData *reader_data, const NADataDef *def );
 static gboolean       is_key_writable( NagpGConfProvider *gconf, const gchar *key );
 
@@ -143,17 +134,11 @@ read_item( NagpGConfProvider *provider, const gchar *path, GSList **messages )
 	 */
 	if( have_type && !strcmp( type, NAGP_VALUE_TYPE_MENU )){
 		item = NA_OBJECT_ITEM( na_object_menu_new());
-#if 0
-		read_item_menu( provider, path, NA_OBJECT_MENU( item ));
-#endif
 
 	/* else this should be an action (no type, or type='Action')
 	 */
 	} else if( !have_type || !strcmp( type, NAGP_VALUE_TYPE_ACTION )){
 		item = NA_OBJECT_ITEM( na_object_action_new());
-#if 0
-		read_item_action( provider, path, NA_OBJECT_ACTION( item ));
-#endif
 
 	} else {
 		g_warning( "%s: unknown type '%s' at %s", thisfn, type, path );
@@ -340,317 +325,6 @@ read_done_profile( const NAIFactoryProvider *provider, NAObjectProfile *profile,
 	na_object_attach_profile( data->parent, profile );
 }
 
-#if 0
-/*
- * load and set the properties of the specified action
- * at least we must have a label, as all other entries can have
- * suitable default values
- *
- * we have to deal with successive versions of action schema :
- *
- * - version = '1.0'
- *   action+= uuid+label+tooltip+icon
- *   action+= path+parameters+basenames+isdir+isfile+multiple+schemes
- *
- * - version > '1.0'
- *   action+= matchcase+mimetypes
- *
- * - version = '2.0' which introduces the 'profile' notion
- *   profile += name+label
- *
- * Profiles are kept in the order specified in 'items' entry if it exists.
- */
-static void
-read_item_action( NagpGConfProvider *provider, const gchar *path, NAObjectAction *action )
-{
-	static const gchar *thisfn = "nagp_gconf_provider_read_item_action";
-	gchar *uuid;
-	GSList *entries, *list_profiles, *ip;
-	GSList *order;
-	gchar *profile_path;
-
-	g_debug( "%s: provider=%p, path=%s, action=%p",
-			thisfn, ( void * ) provider, path, ( void * ) action );
-	g_return_if_fail( NA_IS_OBJECT_ACTION( action ));
-
-	uuid = g_path_get_basename( path );
-	na_object_set_id( action, uuid );
-	g_free( uuid );
-
-	entries = na_gconf_utils_get_entries( provider->private->gconf, path );
-	read_item_action_properties( provider, entries, action  );
-
-	order = na_object_get_items_slist( action );
-	list_profiles = na_gconf_utils_get_subdirs( provider->private->gconf, path );
-
-	if( list_profiles ){
-
-		/* read profiles in the specified order
-		 */
-		for( ip = order ; ip ; ip = ip->next ){
-			profile_path = gconf_concat_dir_and_key( path, ( gchar * ) ip->data );
-			read_item_action_profile( provider, action, profile_path );
-			list_profiles = na_core_utils_slist_remove_ascii( list_profiles, profile_path );
-			g_free( profile_path );
-		}
-
-		/* append other profiles
-		 * but this may be an inconvenient for the runtime plugin ?
-		 */
-		for( ip = list_profiles ; ip ; ip = ip->next ){
-			profile_path = g_strdup(( gchar * ) ip->data );
-			read_item_action_profile( provider, action, profile_path );
-			g_free( profile_path );
-		}
-
-	/* if there is no subdir, this may be a valid v1 or an invalid v2
-	 * at least try to read some properties
-	 */
-	} else {
-		read_item_action_properties_v1( provider, entries, action );
-	}
-
-	na_core_utils_slist_free( order );
-	na_gconf_utils_free_subdirs( list_profiles );
-	na_gconf_utils_free_entries( entries );
-}
-
-/*
- * set the item properties into the action, dealing with successive
- * versions
- */
-static void
-read_item_action_properties( NagpGConfProvider *provider, GSList *entries, NAObjectAction *action )
-{
-	gchar *version;
-	gboolean target_selection, target_background, target_toolbar;
-	gboolean toolbar_same_label;
-	gchar *action_label;
-	gchar *toolbar_label;
-
-	read_object_item_properties( provider, entries, NA_OBJECT_ITEM( action ) );
-
-	if( na_gconf_utils_get_string_from_entries( entries, NAGP_ENTRY_VERSION, &version )){
-		na_object_set_version( action, version );
-		g_free( version );
-	}
-
-	if( na_gconf_utils_get_bool_from_entries( entries, NAGP_ENTRY_TARGET_SELECTION, &target_selection )){
-		na_object_set_target_selection( action, target_selection );
-	}
-
-	if( na_gconf_utils_get_bool_from_entries( entries, NAGP_ENTRY_TARGET_BACKGROUND, &target_background )){
-		na_object_set_target_background( action, target_background );
-	}
-
-	if( na_gconf_utils_get_bool_from_entries( entries, NAGP_ENTRY_TARGET_TOOLBAR, &target_toolbar )){
-		na_object_set_target_toolbar( action, target_toolbar );
-	}
-
-	/* toolbar label is the same that action if empty */
-	action_label = na_object_get_label( action );
-	toolbar_same_label = FALSE;
-	na_gconf_utils_get_string_from_entries( entries, NAGP_ENTRY_TOOLBAR_LABEL, &toolbar_label );
-	if( !toolbar_label || !g_utf8_strlen( toolbar_label, -1 ) || !g_utf8_collate( toolbar_label, action_label )){
-		toolbar_same_label = TRUE;
-	}
-	if( toolbar_same_label ){
-		g_free( toolbar_label );
-		toolbar_label = g_strdup( action_label );
-	}
-	na_object_set_toolbar_label( action, toolbar_label );
-	na_object_set_toolbar_same_label( action, toolbar_same_label );
-	g_free( action_label );
-	g_free( toolbar_label );
-}
-
-/*
- * version is marked as less than "2.0"
- * we handle so only one profile, which is already loaded
- * action+= path+parameters+basenames+isdir+isfile+multiple+schemes
- * if version greater than "1.0", we have also matchcase+mimetypes
- */
-static void
-read_item_action_properties_v1( NagpGConfProvider *provider, GSList *entries, NAObjectAction *action )
-{
-	NAObjectProfile *profile = na_object_profile_new();
-
-	na_object_attach_profile( action, profile );
-
-	read_item_action_profile_properties( provider, entries, profile );
-}
-
-static void
-read_item_action_profile( NagpGConfProvider *provider, NAObjectAction *action, const gchar *path )
-{
-	/*static const gchar *thisfn = "nagp_reader_read_item_action_profile";*/
-	NAObjectProfile *profile;
-	gchar *name;
-	GSList *entries;
-
-	g_return_if_fail( NA_IS_OBJECT_ACTION( action ));
-
-	profile = na_object_profile_new();
-
-	name = g_path_get_basename( path );
-	na_object_set_id( profile, name );
-	g_free( name );
-
-	entries = na_gconf_utils_get_entries( provider->private->gconf, path );
-	read_item_action_profile_properties( provider, entries, profile );
-	na_gconf_utils_free_entries( entries );
-
-	na_object_attach_profile( action, profile );
-}
-
-static void
-read_item_action_profile_properties( NagpGConfProvider *provider, GSList *entries, NAObjectProfile *profile )
-{
-	/*static const gchar *thisfn = "nagp_gconf_provider_read_item_action_profile_properties";*/
-	gchar *label, *path, *parameters;
-	GSList *basenames, *schemes, *mimetypes;
-	gboolean isfile, isdir, multiple, matchcase;
-	GSList *folders;
-
-	if( na_gconf_utils_get_string_from_entries( entries, NAGP_ENTRY_PROFILE_LABEL, &label )){
-		na_object_set_label( profile, label );
-		g_free( label );
-	}
-
-	if( na_gconf_utils_get_string_from_entries( entries, NAGP_ENTRY_PATH, &path )){
-		na_object_set_path( profile, path );
-		g_free( path );
-	}
-
-	if( na_gconf_utils_get_string_from_entries( entries, NAGP_ENTRY_PARAMETERS, &parameters )){
-		na_object_set_parameters( profile, parameters );
-		g_free( parameters );
-	}
-
-	if( na_gconf_utils_get_string_list_from_entries( entries, NAGP_ENTRY_BASENAMES, &basenames )){
-		na_object_set_basenames( profile, basenames );
-		na_core_utils_slist_free( basenames );
-	}
-
-	if( na_gconf_utils_get_bool_from_entries( entries, NAGP_ENTRY_ISFILE, &isfile )){
-		na_object_set_isfile( profile, isfile );
-	}
-
-	if( na_gconf_utils_get_bool_from_entries( entries, NAGP_ENTRY_ISDIR, &isdir )){
-		na_object_set_isdir( profile, isdir );
-	}
-
-	if( na_gconf_utils_get_bool_from_entries( entries, NAGP_ENTRY_MULTIPLE, &multiple )){
-		na_object_set_multiple( profile, multiple );
-	}
-
-	if( na_gconf_utils_get_string_list_from_entries( entries, NAGP_ENTRY_SCHEMES, &schemes )){
-		na_object_set_schemes( profile, schemes );
-		na_core_utils_slist_free( schemes );
-	}
-
-	/* handle matchcase+mimetypes
-	 * note that default values for 1.0 version have been set
-	 * in na_object_profile_instance_init
-	 */
-	if( na_gconf_utils_get_bool_from_entries( entries, NAGP_ENTRY_MATCHCASE, &matchcase )){
-		na_object_set_matchcase( profile, matchcase );
-	}
-
-	if( na_gconf_utils_get_string_list_from_entries( entries, NAGP_ENTRY_MIMETYPES, &mimetypes )){
-		na_object_set_mimetypes( profile, mimetypes );
-		na_core_utils_slist_free( mimetypes );
-	}
-
-	if( na_gconf_utils_get_string_list_from_entries( entries, NAGP_ENTRY_FOLDERS, &folders )){
-		na_object_set_folders( profile, folders );
-		na_core_utils_slist_free( folders );
-	}
-}
-
-static void
-read_item_menu( NagpGConfProvider *provider, const gchar *path, NAObjectMenu *menu )
-{
-	static const gchar *thisfn = "nagp_gconf_provider_read_item_menu";
-	gchar *uuid;
-	GSList *entries;
-
-	g_debug( "%s: provider=%p, path=%s, menu=%p",
-			thisfn, ( void * ) provider, path, ( void * ) menu );
-	g_return_if_fail( NA_IS_OBJECT_MENU( menu ));
-
-	uuid = g_path_get_basename( path );
-	na_object_set_id( menu, uuid );
-	g_free( uuid );
-
-	entries = na_gconf_utils_get_entries( provider->private->gconf, path );
-	read_item_menu_properties( provider, entries, menu  );
-	na_gconf_utils_free_entries( entries );
-}
-
-static void
-read_item_menu_properties( NagpGConfProvider *provider, GSList *entries, NAObjectMenu *menu )
-{
-	read_object_item_properties( provider, entries, NA_OBJECT_ITEM( menu ) );
-}
-
-/*
- * set the properties into the NAObjectItem
- *
- * The NAObjectItem is set to 'read-only' if at least one the entries is
- * not writable ; in other words, a writable NAObjectItem has all its
- * entries writable.
- */
-static void
-read_object_item_properties( NagpGConfProvider *provider, GSList *entries, NAObjectItem *item )
-{
-	static const gchar *thisfn = "nagp_gconf_provider_read_object_item_properties";
-	gchar *id, *label, *tooltip, *icon;
-	gboolean enabled;
-	GSList *subitems;
-	GSList *ie;
-	GConfEntry *gconf_entry;
-	const gchar *key;
-	gboolean writable;
-
-	if( !na_gconf_utils_get_string_from_entries( entries, NAGP_ENTRY_LABEL, &label )){
-		id = na_object_get_id( item );
-		g_warning( "%s: no label found for NAObjectItem %s", thisfn, id );
-		g_free( id );
-		label = g_strdup( "" );
-	}
-	na_object_set_label( item, label );
-	g_free( label );
-
-	if( na_gconf_utils_get_string_from_entries( entries, NAGP_ENTRY_TOOLTIP, &tooltip )){
-		na_object_set_tooltip( item, tooltip );
-		g_free( tooltip );
-	}
-
-	if( na_gconf_utils_get_string_from_entries( entries, NAGP_ENTRY_ICON, &icon )){
-		na_object_set_icon( item, icon );
-		g_free( icon );
-	}
-
-	if( na_gconf_utils_get_bool_from_entries( entries, NAGP_ENTRY_ENABLED, &enabled )){
-		na_object_set_enabled( item, enabled );
-	}
-
-	if( na_gconf_utils_get_string_list_from_entries( entries, NAGP_ENTRY_ITEMS_LIST, &subitems )){
-		na_object_set_items_slist( item, subitems );
-		na_core_utils_slist_free( subitems );
-	}
-
-	writable = TRUE;
-	for( ie = entries ; ie && writable ; ie = ie->next ){
-		gconf_entry = ( GConfEntry * ) ie->data;
-		key = gconf_entry_get_key( gconf_entry );
-		writable = is_key_writable( provider, key );
-	}
-	na_object_set_readonly( item, !writable );
-}
-#endif
-
 static NADataBoxed *
 get_boxed_from_path( const NagpGConfProvider *provider, const gchar *path, ReaderData *reader_data, const NADataDef *def )
 {