GNOME.org
 

[nautilus-actions: 33/45] Cleanup the code

commit 7ff7d6e6399272e7063f72d1c7fcff36ecf57aeb
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Jul 29 00:25:19 2009 +0200

    Cleanup the code

 TODO                             |   21 +-
 src/common/na-gconf.c            |  560 --------------------------------------
 src/nact/nact-assistant-export.c |    1 -
 src/nact/nact-assistant-import.c |    1 -
 src/nact/nact-iactions-list.c    |    2 -
 5 files changed, 13 insertions(+), 572 deletions(-)
---
diff --git a/TODO b/TODO
index 2bbab05..79786c4 100644
--- a/TODO
+++ b/TODO
@@ -1,18 +1,23 @@
 
-- Create a command line tool to install a schema (wrapper to
-"gconftool-2 --install-schema-file")
-
 - Implement the Help button in nact (or hide it meanwhile)
 
 - i18n doen't works in the command line tool and for some part of NACT 
 like the scheme list, it seems.
 
-- na-action and na-action-profile are included in nact-window.h
-  so are not needed in all other derived window files
-
-- try to import a schema for an action (without schema)
-
 - import and export assistants are seen as a distinct application in the
   task bar (there is a second NA icon) - gtk_window_set_transient_for()
   has no effect of this - open a bug ?
 
+- Note about the schemas in Nautilus Actions:
+  a) actions are identified by uuid
+  b) so, all GConf keys have a path with the uuid of the action
+  c) I'm not willing to write a schema for each and every uuid
+  d) so, as of 1.11.2, the provided schema is general and should apply
+     to all actions
+  e) but there is not yet an API to set a GConfMetaInfo for a key
+     note that gconftool-2 --dump is able to export for each entry a
+     <schema_key> which includes the path to the general schema key
+     but we cannot set it programatically (bad !)
+
+- allow users to upload/download actions directly from a web repository
+  (REST services ?)
diff --git a/src/common/na-gconf.c b/src/common/na-gconf.c
index 44948b3..39e524d 100644
--- a/src/common/na-gconf.c
+++ b/src/common/na-gconf.c
@@ -70,33 +70,6 @@ enum {
 #define PROP_NAGCONF_NOTIFIED_STR		"na-gconf-to-be-notified"
 #define PROP_NAGCONF_WATCH_ID_STR		"na-gconf-watch-id"
 
-/* correspondance table for association of GConf entry keys to action
- * and profile properties
- */
-/*typedef struct {
-	gchar *gconfkey;
-	gchar *property;
-}
-	KeyToPropertyStruct;
-
-static KeyToPropertyStruct st_key_property[] = {
-	{ ACTION_VERSION_ENTRY      , PROP_NAACTION_VERSION_STR          },
-	{ ACTION_LABEL_ENTRY        , PROP_NAACTION_LABEL_STR            },
-	{ ACTION_TOOLTIP_ENTRY      , PROP_NAACTION_TOOLTIP_STR          },
-	{ ACTION_ICON_ENTRY         , PROP_NAACTION_ICON_STR             },
-	{ ACTION_PROFILE_LABEL_ENTRY, PROP_NAPROFILE_LABEL_STR           },
-	{ ACTION_PATH_ENTRY         , PROP_NAPROFILE_PATH_STR            },
-	{ ACTION_PARAMETERS_ENTRY   , PROP_NAPROFILE_PARAMETERS_STR      },
-	{ ACTION_BASENAMES_ENTRY    , PROP_NAPROFILE_BASENAMES_STR       },
-	{ ACTION_MATCHCASE_ENTRY    , PROP_NAPROFILE_MATCHCASE_STR       },
-	{ ACTION_MIMETYPES_ENTRY    , PROP_NAPROFILE_MIMETYPES_STR       },
-	{ ACTION_ISFILE_ENTRY       , PROP_NAPROFILE_ISFILE_STR          },
-	{ ACTION_ISDIR_ENTRY        , PROP_NAPROFILE_ISDIR_STR           },
-	{ ACTION_MULTIPLE_ENTRY     , PROP_NAPROFILE_ACCEPT_MULTIPLE_STR },
-	{ ACTION_SCHEMES_ENTRY      , PROP_NAPROFILE_SCHEMES_STR         },
-	{                       NULL, NULL }
-};*/
-
 static GObjectClass *st_parent_class = NULL;
 
 static GType          register_type( void );
@@ -130,24 +103,6 @@ static gboolean       search_for_str( GSList *notifies, const gchar *profile, co
 static gboolean       search_for_bool( GSList *notifies, const gchar *profile, const gchar *key, gboolean *value );
 static gboolean       search_for_list( GSList *notifies, const gchar *profile, const gchar *key, GSList **value );
 
-/*static gboolean       load_action( NAGConf *gconf, NAAction *action, const gchar *path );
-static void           load_action_properties( NAGConf *gconf, NAAction *action );
-static GSList        *load_profiles( NAGConf *gconf, NAAction *action );
-static void           load_profile_properties( NAGConf *gconf, NAActionProfile *profile );
-static GSList        *load_keys_values( const NAGConf *gconf, const gchar *path );
-static void           free_keys_values( GSList *entries );
-static void           set_item_properties( NAObject *object, GSList *properties );
-static const gchar   *key_to_property( const gchar *key );
-static gboolean       set_action_properties( NAGConf *gconf, NAAction *action, GSList *properties );
-static void           load_v1_properties( NAAction *action, const gchar *version, GSList *properties );
-static gchar         *search_for_str( GSList *properties, const gchar *profile, const gchar *key );
-static gboolean       search_for_bool( GSList *properties, const gchar *profile, const gchar *key );
-static GSList        *search_for_list( GSList *properties, const gchar *profile, const gchar *key );
-static GSList        *keys_to_notify( GSList *entries );
-static void           free_list_notify( GSList *list );
-static gboolean       remove_v1_keys( NAGConf *gconf, const NAAction *action, gchar **message );
-static gboolean       remove_key( NAGConf *gconf, const gchar *uuid, const gchar *key, gchar **message );*/
-
 static gboolean       key_is_writable( NAGConf *gconf, const gchar *path );
 static gboolean       write_v2_keys( NAGConf *gconf, const NAAction *action, gchar **message );
 static gboolean       write_str( NAGConf *gconf, const gchar *uuid, const gchar *key, gchar *value, gchar **message );
@@ -530,31 +485,6 @@ iio_provider_delete_action( const NAIIOProvider *provider, const NAAction *actio
  * - version = '2.0' which introduces the 'profile' notion
  *   profile += name+label
  */
-/*static gboolean
-load_action( NAGConf *gconf, NAAction *action, const gchar *path )
-{
-	static const gchar *thisfn = "nacf_gconf_load_action";
-	g_debug( "%s: gconf=%p, action=%p, uuid=%s", thisfn, gconf, action, uuid );
-
-	g_assert( NA_IS_GCONF( gconf ));
-	g_assert( NA_IS_ACTION( action ));
-
-	gchar *path = g_strdup_printf( "%s/%s", NA_GCONF_CONFIG_PATH, uuid );
-
-	GSList *entries = load_keys_values( gconf, path );
-	GSList *properties = keys_to_notify( entries );
-	free_keys_values( entries );
-
-	gboolean ok = set_action_properties( gconf, action, properties );
-
-	if( !key_is_writable( gconf, path )){
-		g_object_set( G_OBJECT( action ), PROP_NAGCONF_ACTION_READONLY_STR, TRUE, NULL );
-	}
-
-	free_list_notify( properties );
-	g_free( path );
-	return( ok );
-}*/
 static void
 read_action( NAGConf *gconf, NAAction *action, const gchar *path )
 {
@@ -742,21 +672,6 @@ fill_profile_properties( NAGConf *gconf, NAActionProfile *profile, GSList *notif
  * load the keys which are the subdirs of the given path
  * returns a list of keys as full path
  */
-/*static GSList *
-load_subdirs( const NAGConf *gconf, const gchar *path )
-{
-	static const gchar *thisfn = "na_gconf_load_subdirs";
-
-	GError *error = NULL;
-	GSList *list = gconf_client_all_dirs( gconf->private->gconf, path, &error );
-	if( error ){
-		g_warning( "%s: path=%s, error=%s", thisfn, path, error->message );
-		g_error_free( error );
-		return(( GSList * ) NULL );
-	}
-
-	return( list );
-}*/
 static GSList *
 get_path_subdirs( const NAGConf *gconf, const gchar *path )
 {
@@ -967,481 +882,6 @@ search_for_list( GSList *properties, const gchar *profile, const gchar *key, GSL
 }
 
 /*
- * load and set the properties of the specified action
- */
-/*static void
-load_action_properties( NAGConf *gconf, NAAction *action )
-{
-	static const gchar *thisfn = "nacf_gconf_load_action_properties";
-	g_debug( "%s: gconf=%p, action=%p", thisfn, gconf, action );
-
-	g_assert( NA_IS_GCONF( gconf ));
-	g_assert( NA_IS_ACTION( action ));
-
-	gchar *uuid = na_action_get_uuid( action );
-	gchar *path = g_strdup_printf( "%s/%s", NA_GCONF_CONFIG_PATH, uuid );
-
-	GSList *properties = load_keys_values( gconf, path );
-
-	set_item_properties( NA_OBJECT( action ), properties );
-
-	free_keys_values( properties );
-	g_free( uuid );
-	g_free( path );
-}*/
-
-/*
- * load the list of profiles for an action and returns them as a GSList
- */
-/*static GSList *
-load_profiles( NAGConf *gconf, NAAction *action )
-{*/
-	/*static const gchar *thisfn = "nacf_gconf_load_profiles";
-	g_debug( "%s: gconf=%p, action=%p", thisfn, gconf, action );*/
-
-	/*g_assert( NA_IS_GCONF( gconf ));
-	g_assert( NA_IS_ACTION( action ));
-
-	gchar *uuid = na_action_get_uuid( action );
-	gchar *path = g_strdup_printf( "%s/%s", NA_GCONF_CONFIG_PATH, uuid );
-
-	GSList *ip;
-	GSList *items = NULL;
-	GSList *listpath = load_subdirs( gconf, path );
-
-	for( ip = listpath ; ip ; ip = ip->next ){
-
-		gchar *key = path_to_key(( const gchar * ) ip->data );
-		NAActionProfile *profile = na_action_profile_new( NA_OBJECT( action ), key );
-		load_profile_properties( gconf, profile );
-
-		items = g_slist_prepend( items, profile );
-	}
-
-	na_utils_free_string_list( listpath );
-	g_free( path );
-	g_free( uuid );
-
-	return( items );
-}*/
-
-/*
- * load and set the properties of the specified profile
- */
-/*static void
-load_profile_properties( NAGConf *gconf, NAActionProfile *profile )
-{
-	*//*static const gchar *thisfn = "nacf_gconf_load_profile_properties";
-	g_debug( "%s: gconf=%p, profile=%p", thisfn, gconf, profile );*/
-
-/*	g_assert( NA_IS_GCONF( gconf ));
-	g_assert( NA_IS_ACTION_PROFILE( profile ));
-
-	NAAction *action =
-		NA_ACTION( na_action_profile_get_action( NA_ACTION_PROFILE( profile )));
-	g_assert( NA_IS_ACTION( action ));
-
-	gchar *uuid = na_action_get_uuid( action );
-	gchar *path = g_strdup_printf(
-			"%s/%s/%s", NA_GCONF_CONFIG_PATH, uuid, na_action_profile_get_name( profile ));
-
-	GSList *properties = load_keys_values( gconf, path );
-
-	set_item_properties( NA_OBJECT( profile ), properties );
-
-	free_keys_values( properties );
-	g_free( path );
-	g_free( uuid );
-}*/
-
-/*
- * load all the key=value pairs of this key (specified as a full path),
- * returning them as a list of GConfEntry.
- * The list is not recursive, it contains only the immediate children of
- * path. To free the returned list, call free_key_values.
- */
-/*static GSList *
-load_keys_values( const NAGConf *gconf, const gchar *path )
-{
-	static const gchar *thisfn = "na_gconf_load_keys_values";
-
-	GError *error = NULL;
-	GSList *list_path = gconf_client_all_entries( gconf->private->gconf, path, &error );
-	if( error ){
-		g_warning( "%s: path=%s, error=%s", thisfn, path, error->message );
-		g_error_free( error );
-		return(( GSList * ) NULL );
-	}
-
-	return( list_path );
-}
-
-static void
-free_keys_values( GSList *list )
-{
-	GSList *item;
-	for( item = list ; item != NULL ; item = item->next ){
-		GConfEntry *entry = ( GConfEntry * ) item->data;
-		gconf_entry_unref( entry );
-	}
-	g_slist_free( list );
-}*/
-
-/*
- * set the item properties into the object
- * properties is a list of path to entry
- */
-/*static void
-set_item_properties( NAObject *object, GSList *properties )
-{
-	static const gchar *thisfn = "na_gconf_set_item_properties";
-	g_assert( NA_IS_OBJECT( object ));
-
-	GSList *item;
-	for( item = properties ; item != NULL ; item = item->next ){
-
-		GConfEntry *entry = ( GConfEntry * ) item->data;
-		NAPivotNotify *npn = entry_to_notify( entry );
-		if( npn->type ){
-			const gchar *property_str = key_to_property( npn->parm );
-
-			if( property_str ){
-				switch( npn->type ){
-					case NA_PIVOT_STR:
-					case NA_PIVOT_BOOL:
-					case NA_PIVOT_STRLIST:
-						g_object_set( G_OBJECT( object ), property_str, npn->data, NULL );
-						break;
-
-					default:
-						g_debug( "%s: uuid='%s', profile='%s', parm='%s', type=%d, data=%p",
-								thisfn, npn->uuid, npn->profile, npn->parm, npn->type, npn->data );
-						g_assert_not_reached();
-						break;
-				}
-			} else {
-				g_warning( "%s: no property found for %s GConf key", thisfn, npn->parm );
-			}
-		}
-
-		na_pivot_free_notify( npn );
-	}
-}*/
-
-/*static const gchar *
-key_to_property( const gchar *key )
-{
-	int i;
-	gchar *property = NULL;
-
-	for( i=0 ; st_key_property[i].gconfkey && !property ; ++i ){
-		if( !g_ascii_strcasecmp( st_key_property[i].gconfkey, key )){
-			property = st_key_property[i].property;
-			break;
-		}
-	}
-
-	return( property );
-}*/
-
-/*
- * set the item properties into the action, dealing with successive
- * versions
- */
-/*static gboolean
-set_action_properties( NAGConf *gconf, NAAction *action, GSList *properties )
-{
-	*//*static const gchar *thisfn = "na_gconf_set_action_properties";*//*
-
-	gchar *label = search_for_str( properties, NULL, ACTION_LABEL_ENTRY );
-	if( !label ){
-		return( FALSE );
-	}
-
-	gchar *version = search_for_str( properties, NULL, ACTION_VERSION_ENTRY );
-	gchar *tooltip = search_for_str( properties, NULL, ACTION_TOOLTIP_ENTRY );
-	gchar *icon = search_for_str( properties, NULL, ACTION_ICON_ENTRY );
-
-	g_object_set( G_OBJECT( action ),
-			PROP_NAACTION_VERSION_STR, version,
-			PROP_NAACTION_LABEL_STR, label,
-			PROP_NAACTION_TOOLTIP_STR, tooltip,
-			PROP_NAACTION_ICON_STR, icon,
-			PROP_NAACTION_PROVIDER_STR, gconf,
-			NULL );
-
-	g_free( icon );
-	g_free( tooltip );
-	g_free( label );
-
-	if( g_ascii_strcasecmp( version, "2.0" ) < 0 ){
-
-		load_v1_properties( action, version, properties );
-
-		gchar *uuid = na_action_get_uuid( action );
-		gchar *path = g_strdup_printf( "%s/%s", NA_GCONF_CONFIG_PATH, uuid );
-		if( gconf_client_key_is_writable( gconf->private->gconf, path, NULL )){
-			remove_v1_keys( gconf, action, NULL );
-		}
-		g_free( path );
-		g_free( uuid );
-
-	} else {
-
-		GSList *profiles = load_profiles( gconf, action );
-		na_action_set_profiles( action, profiles );
-		na_action_free_profiles( profiles );
-	}
-
-	g_free( version );
-	return( TRUE );
-}*/
-
-/*
- * only handle one profile, which is already loaded
- * action+= path+parameters+basenames+isdir+isfile+multiple+schemes
- */
-/*static void
-load_v1_properties( NAAction *action, const gchar *version, GSList *properties )
-{
-	GSList *profiles = NULL;
-	NAActionProfile *profile = na_action_profile_new( NA_OBJECT( action ), "default" );
-
-	gchar *path = search_for_str( properties, NULL, ACTION_PATH_ENTRY );
-	gchar *parameters = search_for_str( properties, NULL, ACTION_PARAMETERS_ENTRY );
-	GSList *basenames = search_for_list( properties, NULL, ACTION_BASENAMES_ENTRY );
-	gboolean isdir = search_for_bool( properties, NULL, ACTION_ISDIR_ENTRY );
-	gboolean isfile = search_for_bool( properties, NULL, ACTION_ISFILE_ENTRY );
-	gboolean multiple = search_for_bool( properties, NULL, ACTION_MULTIPLE_ENTRY );
-	GSList *schemes = search_for_list( properties, NULL, ACTION_SCHEMES_ENTRY );
-
-	g_object_set( G_OBJECT( profile ),
-			PROP_NAPROFILE_PATH_STR, path,
-			PROP_NAPROFILE_PARAMETERS_STR, parameters,
-			PROP_NAPROFILE_BASENAMES_STR, basenames,
-			PROP_NAPROFILE_ISDIR_STR, isdir,
-			PROP_NAPROFILE_ISFILE_STR, isfile,
-			PROP_NAPROFILE_ACCEPT_MULTIPLE_STR, multiple,
-			PROP_NAPROFILE_SCHEMES_STR, schemes,
-			NULL );
-
-	g_free( path );
-	g_free( parameters );
-	na_utils_free_string_list( basenames );
-	na_utils_free_string_list( schemes );
-
-	if( g_ascii_strcasecmp( version, "1.0" ) > 0 ){
-*/
-		/* handle matchcase+mimetypes
-		 * note that default values for 1.0 version have been set
-		 * in na_action_profile_instance_init
-		 */
-		/*gboolean matchcase = search_for_bool( properties, "", ACTION_MATCHCASE_ENTRY );
-		GSList *mimetypes = search_for_list( properties, "", ACTION_MIMETYPES_ENTRY );
-
-		g_object_set( G_OBJECT( profile ),
-				PROP_NAGCONF_PROFILE_MATCHCASE_STR, matchcase,
-				PROP_NAGCONF_PROFILE_MIMETYPES_STR, mimetypes,
-				NULL );
-
-		na_utils_free_string_list( mimetypes );
-	}
-
-	profiles = g_slist_prepend( profiles, profile );
-	na_action_set_profiles( action, profiles );
-	na_action_free_profiles( profiles );
-}*/
-
-/*static gchar *
-search_for_str( GSList *properties, const gchar *profile, const gchar *key )
-{
-	GSList *ip;
-	for( ip = properties ; ip ; ip = ip->next ){
-		NAPivotNotify *npn = ( NAPivotNotify * ) ip->data;
-		if( npn->type == NA_PIVOT_STR &&
-		  ( !profile || !g_ascii_strcasecmp( profile, npn->profile )) &&
-		    !g_ascii_strcasecmp( key, npn->parm )){
-				return( g_strdup(( gchar * ) npn->data ));
-		}
-	}
-	return(( gchar * ) NULL );
-}
-
-static gboolean
-search_for_bool( GSList *properties, const gchar *profile, const gchar *key )
-{
-	GSList *ip;
-	for( ip = properties ; ip ; ip = ip->next ){
-		NAPivotNotify *npn = ( NAPivotNotify * ) ip->data;
-		if( npn->type == NA_PIVOT_BOOL &&
-		  ( !profile || !g_ascii_strcasecmp( profile, npn->profile )) &&
-			!g_ascii_strcasecmp( key, npn->parm )){
-				return(( gboolean ) npn->data );
-		}
-	}
-	return( FALSE );
-}
-
-static GSList *
-search_for_list( GSList *properties, const gchar *profile, const gchar *key )
-{
-	GSList *ip;
-	for( ip = properties ; ip ; ip = ip->next ){
-		NAPivotNotify *npn = ( NAPivotNotify * ) ip->data;
-		if( npn->type == NA_PIVOT_STRLIST &&
-		  ( !profile || !g_ascii_strcasecmp( profile, npn->profile )) &&
-			!g_ascii_strcasecmp( key, npn->parm )){
-				return( na_utils_duplicate_string_list(( GSList * ) npn->data ));
-		}
-	}
-	return(( GSList * ) NULL );
-}*/
-
-/*
- * convet a list of GConfEntry to a list of NAPivotNotify.
- */
-/*static GSList *
-keys_to_notify( GSList *entries )
-{
-	GSList *item;
-	GSList *properties = NULL;
-
-	for( item = entries ; item ; item = item->next ){
-		GConfEntry *entry = ( GConfEntry * ) item->data;
-		NAPivotNotify *npn = entry_to_notify( entry );
-		properties = g_slist_prepend( properties, npn );
-	}
-
-	return( properties );
-}*/
-
-/*
- * convert a GConfEntry to a structure suitable to notify NAPivot
- *
- * when created or modified, the entry can be of the forms :
- *  key/parm
- *  key/profile/parm with a not null value
- *
- * but when removing an entry, it will be of the form :
- *  key
- *  key/parm
- *  key/profile
- *  key/profile/parm with a null value
- *
- * I don't know any way to choose between key/parm and key/profile
- * as the entry no more exists in GConf and thus cannot be tested
- * -> we will set this as key/parm, letting pivot try to interpret it
- */
-/*static NAPivotNotify *
-entry_to_notify( const GConfEntry *entry )
-{
-	*//*static const gchar *thisfn = "na_gconf_entry_to_notify";*//*
-	GSList *listvalues, *iv, *strings;
-
-	g_assert( entry );
-
-	const gchar *path = gconf_entry_get_key( entry );
-	g_assert( path );
-
-	NAPivotNotify *npn = g_new0( NAPivotNotify, 1 );
-
-	const gchar *subpath = path + strlen( NA_GCONF_CONFIG_PATH ) + 1;
-	gchar **split = g_strsplit( subpath, "/", -1 );
-	*//*g_debug( "%s: [0]=%s, [1]=%s", thisfn, split[0], split[1] );*//*
-	npn->uuid = g_strdup( split[0] );
-	if( g_strv_length( split ) == 2 ){
-		npn->parm = g_strdup( split[1] );
-	} else if( g_strv_length( split ) == 3 ){
-		npn->profile = g_strdup( split[1] );
-		npn->parm = g_strdup( split[2] );
-	}
-	g_strfreev( split );
-
-	const GConfValue *value = gconf_entry_get_value( entry );
-	if( value ){
-		switch( value->type ){
-
-			case GCONF_VALUE_STRING:
-				npn->type = NA_PIVOT_STR;
-				npn->data = ( gpointer ) g_strdup( gconf_value_get_string( value ));
-				break;
-
-			case GCONF_VALUE_BOOL:
-				npn->type = NA_PIVOT_BOOL;
-				npn->data = ( gpointer ) gconf_value_get_bool( value );
-				break;
-
-			case GCONF_VALUE_LIST:
-				listvalues = gconf_value_get_list( value );
-				strings = NULL;
-				for( iv = listvalues ; iv != NULL ; iv = iv->next ){
-					strings = g_slist_prepend( strings,
-							( gpointer ) gconf_value_get_string(( GConfValue * ) iv->data ));
-				}
-
-				npn->type = NA_PIVOT_STRLIST;
-				npn->data = ( gpointer ) na_utils_duplicate_string_list( strings );
-				*//*na_utils_free_string_list( strings );*//*
-				break;
-
-			default:
-				g_assert_not_reached();
-				break;
-		}
-	}
-	return( npn );
-}
-
-static void
-free_list_notify( GSList *list )
-{
-	GSList *il;
-	for( il = list ; il ; il = il->next ){
-		na_pivot_free_notify(( NAPivotNotify *) il->data );
-	}
-}*/
-
-/*static gboolean
-remove_v1_keys( NAGConf *gconf, const NAAction *action, gchar **message )
-{
-	gchar *uuid = na_action_get_uuid( action );
-
-	gboolean ret =
-		remove_key( gconf, uuid, ACTION_PATH_ENTRY, message ) &&
-		remove_key( gconf, uuid, ACTION_PARAMETERS_ENTRY, message ) &&
-		remove_key( gconf, uuid, ACTION_BASENAMES_ENTRY, message ) &&
-		remove_key( gconf, uuid, ACTION_MATCHCASE_ENTRY, message ) &&
-		remove_key( gconf, uuid, ACTION_MIMETYPES_ENTRY, message ) &&
-		remove_key( gconf, uuid, ACTION_ISFILE_ENTRY, message ) &&
-		remove_key( gconf, uuid, ACTION_ISDIR_ENTRY, message ) &&
-		remove_key( gconf, uuid, ACTION_MULTIPLE_ENTRY, message ) &&
-		remove_key( gconf, uuid, ACTION_SCHEMES_ENTRY, message );
-
-	g_free( uuid );
-	return( ret );
-}*/
-
-/*static gboolean
-remove_key( NAGConf *gconf, const gchar *uuid, const gchar *key, gchar **message )
-{
-	gboolean ret = TRUE;
-	GError *error = NULL;
-
-	gchar *path = g_strdup_printf( "%s/%s/%s", NA_GCONF_CONFIG_PATH, uuid, key );
-
-	if( !gconf_client_unset( gconf->private->gconf, path, &error )){
-		if( message ){
-			*message = g_strdup( error->message );
-		}
-		g_error_free( error );
-		ret = FALSE;
-	}
-
-	g_free( path );
-	return( ret );
-}*/
-
-/*
  * gconf_client_key_is_writable doesn't work as I expect: it returns
  * FALSE without error for our keys !
  * So I have to actually try a fake write to the key to get the real
diff --git a/src/nact/nact-assistant-export.c b/src/nact/nact-assistant-export.c
index 282e43f..baff280 100644
--- a/src/nact/nact-assistant-export.c
+++ b/src/nact/nact-assistant-export.c
@@ -36,7 +36,6 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
-#include <common/na-action.h>
 #include <common/na-utils.h>
 #include <common/na-xml-names.h>
 #include <common/na-xml-writer.h>
diff --git a/src/nact/nact-assistant-import.c b/src/nact/nact-assistant-import.c
index fc45053..427a90f 100644
--- a/src/nact/nact-assistant-import.c
+++ b/src/nact/nact-assistant-import.c
@@ -36,7 +36,6 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
-#include <common/na-action.h>
 #include <common/na-iio-provider.h>
 #include <common/na-utils.h>
 
diff --git a/src/nact/nact-iactions-list.c b/src/nact/nact-iactions-list.c
index ffde507..a639a9b 100644
--- a/src/nact/nact-iactions-list.c
+++ b/src/nact/nact-iactions-list.c
@@ -35,8 +35,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
 
-#include <common/na-action.h>
-
 #include "nact-application.h"
 #include "nact-iactions-list.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]