[gnumeric] Remove extrabooltest again.



commit 2177dbc49d7efb8d052e222687c5438ded91ece8
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Wed Nov 14 12:37:51 2012 -0700

    Remove extrabooltest again.
    
    2012-11-14  Andreas J Guelzow <aguelzow pyrshep ca>
    
    	* handle-conf-options: remove custom tests
    
    2012-11-14  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/gnumeric-conf.h: updated
    	* src/gnumeric-conf.c: updated

 ChangeLog                 |    5 +++++
 src/gnumeric-conf.c       |    2 +-
 tools/ChangeLog           |    6 +++++-
 tools/handle-conf-options |    8 +-------
 4 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2e253c8..d4353b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-14  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* src/gnumeric-conf.h: updated
+	* src/gnumeric-conf.c: updated
+
 2012-11-14  Jean Brefort  <jean brefort normalesup org>
 
 	* src/position.c: fixed introspection annotations. [#682514]
diff --git a/src/gnumeric-conf.c b/src/gnumeric-conf.c
index c74e92b..5132576 100644
--- a/src/gnumeric-conf.c
+++ b/src/gnumeric-conf.c
@@ -1267,7 +1267,7 @@ static struct cb_watch_bool watch_core_gui_editing_autocomplete = {
 gboolean
 gnm_conf_get_core_gui_editing_autocomplete (void)
 {
-	if (node_pool && !watch_core_gui_editing_autocomplete.handler)
+	if (!watch_core_gui_editing_autocomplete.handler)
 		watch_bool (&watch_core_gui_editing_autocomplete);
 	return watch_core_gui_editing_autocomplete.var;
 }
diff --git a/tools/ChangeLog b/tools/ChangeLog
index 013dab0..fe0d5c3 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,6 +1,10 @@
 2012-11-10  Andreas J Guelzow <aguelzow pyrshep ca>
 
-	* handle-conf-options: use enums for stf export setings and add 
+	* handle-conf-options: remove custom tests
+
+2012-11-10  Andreas J Guelzow <aguelzow pyrshep ca>
+
+	* handle-conf-options: use enums for stf export setings and add
 	custom tests
 
 2012-11-10  Andreas J Guelzow <aguelzow pyrshep ca>
diff --git a/tools/handle-conf-options b/tools/handle-conf-options
index 31164b1..7379661 100644
--- a/tools/handle-conf-options
+++ b/tools/handle-conf-options
@@ -370,10 +370,6 @@ my %extra_attributes =
 	'default' => 'GSF_OUTPUT_CSV_QUOTING_MODE_AUTO',  # Should match schema
      },
 
-     '/org/gnome/gnumeric/core/gui/editing/autocomplete' => {
-	 'extrabooltest' => 'node_pool && ',
-     },
-
     );
 
 foreach my $key (keys %extra_attributes) {
@@ -455,8 +451,6 @@ sub create_hcfile {
 	my $default = $schema->{'default'};
 	my $min = $schema->{'min'};
 	my $max = $schema->{'max'};
-	my $extrabooltest = $schema->{'extrabooltest'};
-	$extrabooltest = '' unless defined $extrabooltest;
 	my $gtype = ($schema->{'gtype'} || '0');
 
 	my $ctype = $type_to_ctype{$gtype || $type};
@@ -510,7 +504,7 @@ sub create_hcfile {
 
 	    $cfile .= "$get_head\n";
 	    $cfile .= "{\n";
-	    $cfile .= "\tif ($extrabooltest!$watch_name.handler)\n";
+	    $cfile .= "\tif (!$watch_name.handler)\n";
 	    $cfile .= "\t\twatch_bool (&$watch_name);\n";
 	    $cfile .= "\treturn $watch_name.var;\n";
 	    $cfile .= "}\n\n";



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