Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7995/src
Modified Files:
display_songs.c misc_playlist.c prefs.c prefs.h prefs_window.c
Log Message:
Moved tm_autostore to new prefs.
Index: display_songs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_songs.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- display_songs.c 12 Jun 2006 04:48:41 -0000 1.106
+++ display_songs.c 13 Jun 2006 04:19:35 -0000 1.107
@@ -1784,7 +1784,7 @@
tm_set_search_column (newcol);
- if(prefs_get_tm_autostore ()) tm_rows_reordered ();
+ if(prefs_get_int("tm_autostore")) tm_rows_reordered ();
sort_window_update ();
/* stable sorting: index original order */
Index: misc_playlist.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_playlist.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- misc_playlist.c 12 Jun 2006 22:04:26 -0000 1.33
+++ misc_playlist.c 13 Jun 2006 04:19:36 -0000 1.34
@@ -275,9 +275,9 @@
return;
}
- if (prefs_get_tm_autostore ())
+ if (prefs_get_int("tm_autostore"))
{
- prefs_set_tm_autostore (FALSE);
+ prefs_set_int("tm_autostore", FALSE);
gtkpod_warning (_("Auto Store of track view disabled.\n\n"));
/* sort_window_update (); */
}
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- prefs.c 13 Jun 2006 03:27:57 -0000 1.239
+++ prefs.c 13 Jun 2006 04:19:36 -0000 1.240
@@ -238,6 +238,7 @@
/* Set sorting prefs */
prefs_set_int("case_sensitive", FALSE);
+ prefs_set_int("tm_autostore", FALSE);
}
/* Initialize default variable-length list entries */
@@ -949,6 +950,13 @@
prefs_set_string("misc_song_nr", NULL);
}
+ /* sm_autostore renamed to tm_autostore */
+ if (prefs_get_int_value("sm_autostore", &int_buf))
+ {
+ prefs_set_int("tm_autostore", int_buf);
+ prefs_set_string("sm_autostore", NULL);
+ }
+
prefs_set_string ("version", VERSION);
}
@@ -1828,7 +1836,6 @@
mycfg->sortcfg.st_sort = SORT_NONE;
mycfg->sortcfg.tm_sort = SORT_NONE;
mycfg->sortcfg.tm_sortcol = TM_COLUMN_TITLE;
- mycfg->sortcfg.tm_autostore = FALSE;
g_free (cfgdir);
@@ -2010,11 +2017,6 @@
{
/* ignore */
}
- else if((g_ascii_strcasecmp (line, "tm_autostore") == 0) ||
- (g_ascii_strcasecmp (line, "sm_autostore") == 0))
- {
- prefs_set_tm_autostore((gboolean)atoi(arg));
- }
else if(g_ascii_strcasecmp (line, "pm_sort") == 0)
{
gint sort = correct_sort (atoi(arg));
@@ -2239,7 +2241,6 @@
fprintf(fp, "offline=%d\n",prefs_get_offline());
fprintf(fp, "display_toolbar=%d\n",prefs_get_display_toolbar());
fprintf(fp, "toolbar_style=%d\n",prefs_get_toolbar_style());
- fprintf(fp, "tm_autostore=%d\n",prefs_get_tm_autostore());
fprintf(fp, "pm_sort=%d\n",prefs_get_pm_sort());
fprintf(fp, "st_sort=%d\n",prefs_get_st_sort());
fprintf(fp, "tm_sort_=%d\n",prefs_get_tm_sort());
@@ -2495,16 +2496,6 @@
display_show_hide_toolbar ();
}
-gboolean prefs_get_tm_autostore (void)
-{
- return cfg->sortcfg.tm_autostore;
-}
-
-void prefs_set_tm_autostore (gboolean val)
-{
- cfg->sortcfg.tm_autostore = val;
-}
-
gint prefs_get_pm_sort (void)
{
return cfg->sortcfg.pm_sort;
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- prefs.h 13 Jun 2006 03:27:57 -0000 1.166
+++ prefs.h 13 Jun 2006 04:19:36 -0000 1.167
@@ -266,7 +266,6 @@
void prefs_set_tm_sort (gint type);
void prefs_set_st_sort (gint type);
void prefs_set_tm_sortcol (TM_item col);
-void prefs_set_tm_autostore (gboolean active);
void prefs_set_md5tracks(gboolean active);
void prefs_set_block_display(gboolean active);
void prefs_set_charset (gchar *charset);
@@ -278,7 +277,6 @@
gint prefs_get_st_sort (void);
gint prefs_get_tm_sort (void);
TM_item prefs_get_tm_sortcol (void);
-gboolean prefs_get_tm_autostore (void);
gboolean prefs_get_autoimport(void);
gchar * prefs_get_charset (void);
gboolean prefs_get_md5tracks(void);
Index: prefs_window.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- prefs_window.c 13 Jun 2006 03:27:57 -0000 1.160
+++ prefs_window.c 13 Jun 2006 04:19:36 -0000 1.161
@@ -1664,7 +1664,7 @@
w = gtkpod_xml_get_widget (sort_window_xml, "tm_autostore");
if (w)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
- tmpsortcfg->tm_autostore);
+ prefs_get_int("tm_autostore"));
if((w = gtkpod_xml_get_widget (sort_window_xml, "cfg_case_sensitive")))
{
@@ -1756,7 +1756,6 @@
prefs_set_pm_sort (scfg->pm_sort);
prefs_set_st_sort (scfg->st_sort);
prefs_set_tm_sort (scfg->tm_sort);
- prefs_set_tm_autostore (scfg->tm_autostore);
scfg->tm_sortcol = sort_window_get_sort_col ();
prefs_set_tm_sortcol (scfg->tm_sortcol);
@@ -1828,7 +1827,7 @@
tm_sort (prefs_get_tm_sortcol (), scfg->tm_sort);
}
/* if auto sort was changed to TRUE, store order */
- if (!tsc->tm_autostore && scfg->tm_autostore)
+ if (!temp_prefs_get_int(sort_temp_prefs, "tm_autostore"))
tm_rows_reordered ();
sortcfg_free (tsc);
@@ -2067,7 +2066,7 @@
void sort_window_set_tm_autostore (gboolean val)
{
- tmpsortcfg->tm_autostore = val;
+ temp_prefs_set_int(sort_temp_prefs, "tm_autostore", val);
}
void sort_window_set_pm_sort (gint val)
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
