Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6723/src
Modified Files:
display_songs.c prefs.c prefs.h prefs_window.c
Log Message:
Moved multi_edit_title to new prefs.
Index: display_songs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_songs.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- display_songs.c 11 Jun 2006 16:04:47 -0000 1.104
+++ display_songs.c 12 Jun 2006 04:32:35 -0000 1.105
@@ -793,7 +793,7 @@
column = (TM_item) g_object_get_data(G_OBJECT(renderer), "column");
multi_edit = prefs_get_multi_edit ();
if (column == TM_COLUMN_TITLE)
- multi_edit &= prefs_get_multi_edit_title ();
+ multi_edit &= prefs_get_int("multi_edit_title");
selection = gtk_tree_view_get_selection(track_treeview);
row_list = gtk_tree_selection_get_selected_rows(selection, &model);
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -d -r1.232 -r1.233
--- prefs.c 12 Jun 2006 04:19:05 -0000 1.232
+++ prefs.c 12 Jun 2006 04:32:35 -0000 1.233
@@ -230,6 +230,7 @@
prefs_set_int("info_window", FALSE);
prefs_set_int("last_prefs_page", 0);
prefs_set_int("tmp_disable_sort", TRUE);
+ prefs_set_int("multi_edit_title", TRUE);
}
/* Initialize default variable-length list entries */
@@ -1796,7 +1797,6 @@
mycfg->write_charset = FALSE;
mycfg->multi_edit = FALSE;
- mycfg->multi_edit_title = TRUE;
mycfg->not_played_track = TRUE;
mycfg->misc_track_nr = 25;
mycfg->sortcfg.pm_sort = SORT_NONE;
@@ -2040,10 +2040,6 @@
{
prefs_set_multi_edit((gboolean)atoi(arg));
}
- else if(g_ascii_strcasecmp (line, "multi_edit_title") == 0)
- {
- prefs_set_multi_edit_title((gboolean)atoi(arg));
- }
else if((g_ascii_strcasecmp (line, "not_played_track") == 0) ||
(g_ascii_strcasecmp (line, "not_played_song") == 0))
{
@@ -2255,7 +2251,6 @@
fprintf(fp, "display_tooltips_prefs=%d\n",
prefs_get_display_tooltips_prefs());
fprintf(fp, "multi_edit=%d\n", prefs_get_multi_edit());
- fprintf(fp, "multi_edit_title=%d\n", prefs_get_multi_edit_title());
fprintf(fp, "misc_track_nr=%d\n", prefs_get_misc_track_nr());
fprintf(fp, "not_played_track=%d\n", prefs_get_not_played_track());
fprintf(fp, "update_charset=%d\n",prefs_get_update_charset());
@@ -2673,20 +2668,9 @@
return cfg->misc_track_nr;
}
-void prefs_set_multi_edit_title (gboolean state)
-{
- cfg->multi_edit_title = state;
-}
-
-gboolean prefs_get_multi_edit_title (void)
-{
- return cfg->multi_edit_title;
-}
-
/* 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_int("tmp_disable_sort"));
}
-
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -d -r1.158 -r1.159
--- prefs.h 12 Jun 2006 04:19:05 -0000 1.158
+++ prefs.h 12 Jun 2006 04:32:35 -0000 1.159
@@ -116,7 +116,6 @@
gboolean group_compilations; /* group compilations when browsing */
guint32 statusbar_timeout; /* timeout for statusbar messages */
gboolean multi_edit; /* multi edit enabled? */
- gboolean multi_edit_title; /* multi edit also enabled for title field? */
gboolean not_played_track; /* not played track in Highest rated
playlist?*/
gint misc_track_nr; /* track's nr in the Highest rated, most
played and most recently played pl*/
float version; /* version of gtkpod writing the cfg file */
@@ -312,8 +311,6 @@
gint prefs_get_misc_track_nr (void);
void prefs_set_not_played_track (gboolean state);
gboolean prefs_get_not_played_track (void);
-void prefs_set_multi_edit_title (gboolean state);
-gboolean prefs_get_multi_edit_title (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.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- prefs_window.c 12 Jun 2006 04:19:05 -0000 1.152
+++ prefs_window.c 12 Jun 2006 04:32:35 -0000 1.153
@@ -435,7 +435,7 @@
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_multi_edit_title");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
- tmpcfg->multi_edit_title);
+ prefs_get_int("multi_edit_title"));
gtk_widget_set_sensitive (w, tmpcfg->multi_edit);
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_update_charset");
@@ -701,7 +701,6 @@
prefs_set_display_tooltips_main (tmpcfg->display_tooltips_main);
prefs_set_display_tooltips_prefs (tmpcfg->display_tooltips_prefs);
prefs_set_multi_edit (tmpcfg->multi_edit);
- prefs_set_multi_edit_title (tmpcfg->multi_edit_title);
prefs_set_misc_track_nr (tmpcfg->misc_track_nr);
prefs_set_not_played_track (tmpcfg->not_played_track);
prefs_set_update_charset(tmpcfg->update_charset);
@@ -1245,8 +1244,8 @@
on_cfg_multi_edit_title_toggled (GtkToggleButton *togglebutton,
gpointer user_data)
{
- tmpcfg->multi_edit_title =
- gtk_toggle_button_get_active (togglebutton);
+ temp_prefs_set_int(temp_prefs, "multi_edit_title",
+ gtk_toggle_button_get_active(togglebutton));
}
void
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
