Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv10952/src
Modified Files:
file.c fileselection.c misc_track.c prefs.c prefs.h
prefs_window.c
Log Message:
Moved add_recursively to new prefs.
Index: file.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file.c,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -d -r1.173 -r1.174
--- file.c 12 Jun 2006 00:30:13 -0000 1.173
+++ file.c 12 Jun 2006 03:19:27 -0000 1.174
@@ -333,7 +333,7 @@
gtkpod_warning (_("Skipping '%s' to avoid adding playlist file
recursively\n"), filename);
}
else if (add_track_by_filename (itdb, filename, plitem,
- prefs_get_add_recursively (),
+ prefs_get_int("add_recursively"),
addtrackfunc, data))
{
++tracks;
Index: fileselection.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/fileselection.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- fileselection.c 9 Jun 2006 01:22:29 -0000 1.9
+++ fileselection.c 12 Jun 2006 03:19:27 -0000 1.10
@@ -108,7 +108,7 @@
result &= add_track_by_filename(fc_active_itdb,
(gchar*)current->data,
playlist,
- prefs_get_add_recursively(),
+ prefs_get_int("add_recursively"),
NULL, NULL);
current = current->next;
}
@@ -658,7 +658,7 @@
{
Playlist *plitem = pm_get_selected_playlist ();
add_directory_by_name (db_active_itdb, dir, plitem,
- prefs_get_add_recursively (),
+ prefs_get_int("add_recursively"),
NULL, NULL);
prefs_set_string ("last_dir_browsed", dir);
gtkpod_tracks_statusbar_update();
Index: misc_track.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_track.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- misc_track.c 11 Jun 2006 16:04:49 -0000 1.45
+++ misc_track.c 12 Jun 2006 03:19:27 -0000 1.46
@@ -1453,7 +1453,7 @@
if (!pl) break; /* while (*filesp) */
}
add_directory_by_name (itdb, decoded_file, pl,
- prefs_get_add_recursively (),
+ prefs_get_int("add_recursively"),
trackaddfunc, data);
added = TRUE;
}
@@ -1478,7 +1478,7 @@
if (!pl) break; /* while (*filesp) */
}
add_track_by_filename (itdb, decoded_file, pl,
- prefs_get_add_recursively (),
+ prefs_get_int("add_recursively"),
trackaddfunc, data);
added = TRUE;
break;
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -d -r1.228 -r1.229
--- prefs.c 12 Jun 2006 03:02:29 -0000 1.228
+++ prefs.c 12 Jun 2006 03:19:27 -0000 1.229
@@ -1790,7 +1790,6 @@
mycfg->display_tooltips_prefs = TRUE;
mycfg->update_charset = FALSE;
mycfg->write_charset = FALSE;
- mycfg->add_recursively = TRUE;
mycfg->last_prefs_page = 0;
mycfg->statusbar_timeout = STATUSBAR_TIMEOUT;
@@ -2067,10 +2066,6 @@
{
prefs_set_write_charset((gboolean)atoi(arg));
}
- else if(g_ascii_strcasecmp (line, "add_recursively") == 0)
- {
- prefs_set_add_recursively((gboolean)atoi(arg));
- }
else if(g_ascii_strcasecmp (line, "case_sensitive") == 0)
{
prefs_set_case_sensitive((gboolean)atoi(arg));
@@ -2278,7 +2273,6 @@
fprintf(fp, "not_played_track=%d\n", prefs_get_not_played_track());
fprintf(fp, "update_charset=%d\n",prefs_get_update_charset());
fprintf(fp, "write_charset=%d\n",prefs_get_write_charset());
- fprintf(fp, "add_recursively=%d\n",prefs_get_add_recursively());
fprintf(fp, "case_sensitive=%d\n",prefs_get_case_sensitive());
fprintf (fp, "info_window=%d\n", cfg->info_window);
fprintf (fp, "tmp_disable_sort=%d\n", cfg->tmp_disable_sort);
@@ -2513,16 +2507,6 @@
cfg->write_charset = val;
}
-gboolean prefs_get_add_recursively (void)
-{
- return cfg->add_recursively;
-}
-
-void prefs_set_add_recursively (gboolean val)
-{
- cfg->add_recursively = val;
-}
-
gboolean prefs_get_case_sensitive (void)
{
return cfg->sortcfg.case_sensitive;
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- prefs.h 12 Jun 2006 03:02:29 -0000 1.154
+++ prefs.h 12 Jun 2006 03:19:27 -0000 1.155
@@ -115,7 +115,6 @@
gboolean display_tooltips_prefs;/* should toolbar be displayed (prefs) */
gboolean update_charset; /* Update charset when updating track? */
gboolean write_charset; /* Use selected charset when writing track? */
- gboolean add_recursively; /* Add directories recursively? */
gboolean group_compilations; /* group compilations when browsing */
guint32 statusbar_timeout; /* timeout for statusbar messages */
gint last_prefs_page; /* last page selected in prefs window */
@@ -301,8 +300,6 @@
void prefs_set_update_charset (gboolean val);
gboolean prefs_get_write_charset (void);
void prefs_set_write_charset (gboolean val);
-gboolean prefs_get_add_recursively (void);
-void prefs_set_add_recursively (gboolean val);
gboolean prefs_get_case_sensitive (void);
void prefs_set_case_sensitive (gboolean val);
gboolean prefs_get_group_compilations (void);
Index: prefs_window.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- prefs_window.c 12 Jun 2006 03:02:29 -0000 1.149
+++ prefs_window.c 12 Jun 2006 03:19:27 -0000 1.150
@@ -462,7 +462,7 @@
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_add_recursively");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
- tmpcfg->add_recursively);
+ prefs_get_int("add_recursively"));
w = gtkpod_xml_get_widget (prefs_window_xml,
"cfg_delete_track_from_playlist");
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_add_recursively(tmpcfg->add_recursively);
prefs_set_tmp_disable_sort(tmpcfg->tmp_disable_sort);
tm_show_preferred_columns();
}
@@ -1269,7 +1268,8 @@
on_cfg_add_recursively_toggled (GtkToggleButton *togglebutton,
gpointer user_data)
{
- tmpcfg->add_recursively = gtk_toggle_button_get_active (togglebutton);
+ temp_prefs_set_int(temp_prefs, "add_recursively",
+ gtk_toggle_button_get_active (togglebutton));
}
void
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
