[nautilus-actions] nact_icommand_tab_parse_parameters(): uses internal data



commit 369c45e21751a475b587f6cf042c057fd5c4660a
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Jan 16 05:51:49 2012 +0100

    nact_icommand_tab_parse_parameters(): uses internal data

 ChangeLog                    |    2 ++
 src/nact/nact-icommand-tab.c |    7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 109e477..51799f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 	* docs/nact/C/nact-conditions.xml: Embeds literal values between
 	<literal>..</literal> tags.
 
+	* src/nact/nact-icommand-tab.c (parse_parameters): Uses internal data.
+
 	* src/core/na-desktop-environment.c
 	* src/core/na-desktop-environment.h
 	(na_desktop_environment_detect_running_desktop): Fix LXDE detection.
diff --git a/src/nact/nact-icommand-tab.c b/src/nact/nact-icommand-tab.c
index 52c82c1..addf669 100644
--- a/src/nact/nact-icommand-tab.c
+++ b/src/nact/nact-icommand-tab.c
@@ -70,8 +70,7 @@ typedef struct {
 
 #define ICOMMAND_TAB_PROP_DATA				"nact-icommand-tab-data"
 
-static guint     st_initializations = 0;	/* interface initialization count */
-static NATokens *st_tokens = NULL;
+static guint st_initializations = 0;	/* interface initialization count */
 
 static GType         register_type( void );
 static void          interface_base_init( NactICommandTabInterface *klass );
@@ -628,9 +627,11 @@ parse_parameters( NactICommandTab *instance )
 	const gchar *command = gtk_entry_get_text( GTK_ENTRY( get_path_entry( instance )));
 	const gchar *param_template = gtk_entry_get_text( GTK_ENTRY( get_parameters_entry( instance )));
 	gchar *exec, *returned;
+	ICommandData *data;
 
+	data = get_icommand_data( instance );
 	exec = g_strdup_printf( "%s %s", command, param_template );
-	returned = na_tokens_parse_for_display( st_tokens, exec, FALSE );
+	returned = na_tokens_parse_for_display( data->tokens, exec, FALSE );
 	g_free( exec );
 
 	return( returned );



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]