Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv28617/src
Modified Files:
display_sorttabs.c prefs.c prefs_window.c
Log Message:
Moved group compilations to new prefs.
Index: display_sorttabs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_sorttabs.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- display_sorttabs.c 13 Jun 2006 05:48:55 -0000 1.80
+++ display_sorttabs.c 19 Jun 2006 21:51:37 -0000 1.81
@@ -1587,7 +1587,7 @@
}
master_entry->members = g_list_append (master_entry->members, track);
/* Check if this track should go in the compilation artist group */
- group_track = ( prefs_get_group_compilations() &&
+ group_track = ( prefs_get_int("group_compilations") &&
(track->compilation == TRUE) &&
(st->current_category == ST_CAT_ARTIST) );
/* Check whether entry of same name already exists */
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -d -r1.247 -r1.248
--- prefs.c 15 Jun 2006 14:43:51 -0000 1.247
+++ prefs.c 19 Jun 2006 21:51:37 -0000 1.248
@@ -1995,10 +1995,6 @@
{
prefs_set_offline((gboolean)atoi(arg));
}
- else if(g_ascii_strcasecmp (line, "group_compilations") == 0)
- {
- prefs_set_group_compilations((gboolean)atoi(arg), FALSE);
- }
else if(g_ascii_strcasecmp (line, "toolbar_style") == 0)
{
prefs_set_toolbar_style(atoi(arg));
@@ -2206,7 +2202,6 @@
}
fprintf(fp, "md5=%d\n",prefs_get_md5tracks ());
fprintf(fp, "block_display=%d\n",prefs_get_block_display());
- fprintf(fp, "group_compilations=%d\n",prefs_get_group_compilations());
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());
@@ -2402,17 +2397,6 @@
display_show_hide_toolbar ();
}
-gboolean prefs_get_group_compilations (void)
-{
- return cfg->group_compilations;
-}
-
-void prefs_set_group_compilations (gboolean val, gboolean update_display)
-{
- cfg->group_compilations = val;
- if (update_display) st_show_visible ();
-}
-
GtkToolbarStyle prefs_get_toolbar_style (void)
{
return cfg->toolbar_style;
Index: prefs_window.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- prefs_window.c 16 Jun 2006 00:55:26 -0000 1.169
+++ prefs_window.c 19 Jun 2006 21:51:37 -0000 1.170
@@ -633,7 +633,7 @@
if ((w = gtkpod_xml_get_widget (prefs_window_xml,
"cfg_group_compilations")))
{
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
- prefs_get_group_compilations());
+ prefs_get_int("group_compilations"));
}
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_tmp_disable_sort");
@@ -696,12 +696,13 @@
/* this call well automatically destroy/setup the md5 hash table */
prefs_set_md5tracks(tmpcfg->md5tracks);
prefs_set_block_display(tmpcfg->block_display);
- prefs_set_group_compilations(tmpcfg->group_compilations, TRUE);
prefs_set_toolbar_style(tmpcfg->toolbar_style);
prefs_set_display_toolbar(tmpcfg->display_toolbar);
prefs_set_display_tooltips_main (tmpcfg->display_tooltips_main);
prefs_set_display_tooltips_prefs (tmpcfg->display_tooltips_prefs);
tm_show_preferred_columns();
+ st_show_visible();
+
}
}
@@ -1308,7 +1309,8 @@
on_cfg_group_compilations_toggled (GtkToggleButton *togglebutton,
gpointer user_data)
{
- tmpcfg->group_compilations = gtk_toggle_button_get_active (togglebutton);
+ temp_prefs_set_int(temp_prefs, "group_compilations",
+ gtk_toggle_button_get_active (togglebutton));
}
void
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
