gcalctool r2309 - in branches/gnome-2-24: . gcalctool

[rancell svn gnome org]

Author: rancell
Date: Sun Nov 23 06:43:56 2008
New Revision: 2309
URL: http://svn.gnome.org/viewvc/gcalctool?rev=2309&view=rev

Log:
Remember setting to ignore change mode warning between instances (Bug #556407)

Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/gcalctool/get.h
   branches/gnome-2-24/gcalctool/gtk.c

Modified: branches/gnome-2-24/gcalctool/get.h
==============================================================================
--- branches/gnome-2-24/gcalctool/get.h	(original)
+++ branches/gnome-2-24/gcalctool/get.h	Sun Nov 23 06:43:56 2008
@@ -35,6 +35,7 @@
 #define R_BITCALC  "bitcalculating"
 #define R_XPOS     "xposition"
 #define R_YPOS     "yposition"
+#define R_CHMODE   "warn_change_mode"
 
 extern char *Rbstr[];          /* Base mode X resource strings. */
 extern char *Rdstr[];          /* Display mode X resource strings. */

Modified: branches/gnome-2-24/gcalctool/gtk.c
==============================================================================
--- branches/gnome-2-24/gcalctool/gtk.c	(original)
+++ branches/gnome-2-24/gcalctool/gtk.c	Sun Nov 23 06:43:56 2008
@@ -1577,9 +1577,8 @@
     gtk_widget_show_all(dialog);
     response = gtk_dialog_run(GTK_DIALOG(dialog));
     
-    // FIXME: Save this in GConf
-    X->warn_change_mode = !gtk_toggle_button_get_active(
-                             GTK_TOGGLE_BUTTON(request_check));
+    X->warn_change_mode = !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(request_check));
+    set_boolean_resource(R_CHMODE, X->warn_change_mode);
 
     gtk_widget_destroy(dialog);
 
@@ -2712,6 +2711,9 @@
 
     read_cfdefs();
     
+    if(!get_boolean_resource(R_CHMODE, &X->warn_change_mode))
+        X->warn_change_mode = TRUE;
+    
     /* Create main gcalctool window. */
     create_kframe();
     
@@ -2758,8 +2760,6 @@
 void
 ui_start(void)
 {
-    X->warn_change_mode = TRUE; // FIXME: Load from GConf
-    
     ui_set_base(v->base);
     ui_set_trigonometric_mode(v->ttype);
     ui_set_numeric_mode(v->dtype);