[gtpd-cvs] gtkpod/src prefs.c, 1.231, 1.232 prefs.h, 1.157, 1.158 prefs_window.c, 1.151, 1.152

[<fre...@us...>]

Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1344/src

Modified Files:
	prefs.c prefs.h prefs_window.c 
Log Message:

Moved tmp_disable_sort to new prefs.


Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -d -r1.231 -r1.232
--- prefs.c	12 Jun 2006 03:56:09 -0000	1.231
+++ prefs.c	12 Jun 2006 04:19:05 -0000	1.232
@@ -229,6 +229,7 @@
     prefs_set_int("add_recursively", TRUE);
     prefs_set_int("info_window", FALSE);
     prefs_set_int("last_prefs_page", 0);
+    prefs_set_int("tmp_disable_sort", TRUE);
 }
 
 /* Initialize default variable-length list entries */
@@ -1794,7 +1795,6 @@
     mycfg->update_charset = FALSE;
     mycfg->write_charset = FALSE;
 
-    mycfg->tmp_disable_sort = TRUE;
     mycfg->multi_edit = FALSE;
     mycfg->multi_edit_title = TRUE;
     mycfg->not_played_track = TRUE;
@@ -2088,10 +2088,6 @@
 	  {
 	      prefs_set_int ("itdb_0_concal_autosync", atoi(arg));
 	  }
-	  else if(g_ascii_strcasecmp (line, "tmp_disable_sort") == 0)
-	  {
-	      prefs_set_tmp_disable_sort ((gboolean)atoi(arg));
-	  }
 	  else if(g_ascii_strcasecmp (line, "special_export_charset") == 0)
 	  {
 	      prefs_set_int (EXPORT_FILES_SPECIAL_CHARSET,
@@ -2265,7 +2261,6 @@
     fprintf(fp, "update_charset=%d\n",prefs_get_update_charset());
     fprintf(fp, "write_charset=%d\n",prefs_get_write_charset());
     fprintf(fp, "case_sensitive=%d\n",prefs_get_case_sensitive());
-    fprintf (fp, "tmp_disable_sort=%d\n", cfg->tmp_disable_sort);
 }
 
 
@@ -2688,20 +2683,10 @@
     return cfg->multi_edit_title;
 }
 
-gboolean prefs_get_tmp_disable_sort(void)
-{
-    return(cfg->tmp_disable_sort);
-}
-
-void prefs_set_tmp_disable_sort(gboolean val)
-{
-    cfg->tmp_disable_sort = val;
-}
-
 /* sorting gets disabled temporarily if either of the options
    'tmp_disable_sort' or 'block_display' is checked */
 gboolean prefs_get_disable_sorting(void)
 {
-    return (prefs_get_block_display() || prefs_get_tmp_disable_sort());
+    return (prefs_get_block_display() || prefs_get_int("tmp_disable_sort"));
 }
 

Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -d -r1.157 -r1.158
--- prefs.h	12 Jun 2006 03:56:09 -0000	1.157
+++ prefs.h	12 Jun 2006 04:19:05 -0000	1.158
@@ -93,7 +93,6 @@
   gchar    *charset;        /* CHARSET to use with file operations */
   gboolean md5tracks;	    /* don't allow track duplication on your ipod */
   gboolean block_display;   /* block display during change of selection? */
-  gboolean tmp_disable_sort;/* tmp. disable sorting during change of slctn? */
   
   struct sortcfg
   {         /* sort type: SORT_ASCENDING, SORT_DESCENDING, SORT_NONE */
@@ -315,8 +314,6 @@
 gboolean prefs_get_not_played_track (void);
 void prefs_set_multi_edit_title (gboolean state);
 gboolean prefs_get_multi_edit_title (void);
-void prefs_set_tmp_disable_sort(gboolean val);
-gboolean prefs_get_tmp_disable_sort(void);
 gboolean prefs_get_disable_sorting(void);
 
 #endif

Index: prefs_window.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- prefs_window.c	12 Jun 2006 03:56:09 -0000	1.151
+++ prefs_window.c	12 Jun 2006 04:19:05 -0000	1.152
@@ -637,7 +637,7 @@
 
     w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_tmp_disable_sort");
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
-				 tmpcfg->tmp_disable_sort);
+				 prefs_get_int("tmp_disable_sort"));
 
     w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_startup_messages");
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
@@ -706,7 +706,6 @@
 	prefs_set_not_played_track (tmpcfg->not_played_track);
 	prefs_set_update_charset(tmpcfg->update_charset);
 	prefs_set_write_charset(tmpcfg->write_charset);
-	prefs_set_tmp_disable_sort(tmpcfg->tmp_disable_sort);
 	tm_show_preferred_columns();
     }
 }
@@ -1362,8 +1361,8 @@
 on_cfg_temporarily_disable_sorting     (GtkToggleButton *togglebutton,
                                         gpointer         user_data)
 {
-    tmpcfg->tmp_disable_sort =
-	gtk_toggle_button_get_active (togglebutton);
+    temp_prefs_set_int(temp_prefs, "tmp_disable_sort",
+		       gtk_toggle_button_get_active(togglebutton));
 }
 void
 on_cfg_startup_messages                (GtkToggleButton *togglebutton,