Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv25052/src
Modified Files:
prefs.c prefs.h prefs_window.c
Log Message:
Moved last_prefs_page to new prefs.
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -d -r1.230 -r1.231
--- prefs.c 12 Jun 2006 03:35:16 -0000 1.230
+++ prefs.c 12 Jun 2006 03:56:09 -0000 1.231
@@ -228,6 +228,7 @@
prefs_set_int("startup_messages", TRUE);
prefs_set_int("add_recursively", TRUE);
prefs_set_int("info_window", FALSE);
+ prefs_set_int("last_prefs_page", 0);
}
/* Initialize default variable-length list entries */
@@ -1792,8 +1793,6 @@
mycfg->display_tooltips_prefs = TRUE;
mycfg->update_charset = FALSE;
mycfg->write_charset = FALSE;
- mycfg->last_prefs_page = 0;
- mycfg->statusbar_timeout = STATUSBAR_TIMEOUT;
mycfg->tmp_disable_sort = TRUE;
mycfg->multi_edit = FALSE;
@@ -2013,10 +2012,6 @@
{
prefs_set_tm_sortcol(atoi(arg));
}
- else if(g_ascii_strcasecmp (line, "last_prefs_page") == 0)
- {
- prefs_set_last_prefs_page(atoi(arg));
- }
else if(g_ascii_strcasecmp (line, "backups") == 0)
{
/* removed with version after 0.82-CVS */
@@ -2251,7 +2246,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, "last_prefs_page=%d\n",prefs_get_last_prefs_page());
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());
@@ -2694,16 +2688,6 @@
return cfg->multi_edit_title;
}
-gint prefs_get_last_prefs_page (void)
-{
- return cfg->last_prefs_page;
-}
-
-void prefs_set_last_prefs_page (gint i)
-{
- cfg->last_prefs_page = i;
-}
-
gboolean prefs_get_tmp_disable_sort(void)
{
return(cfg->tmp_disable_sort);
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- prefs.h 12 Jun 2006 03:35:16 -0000 1.156
+++ prefs.h 12 Jun 2006 03:56:09 -0000 1.157
@@ -116,7 +116,6 @@
gboolean write_charset; /* Use selected charset when writing track? */
gboolean group_compilations; /* group compilations when browsing */
guint32 statusbar_timeout; /* timeout for statusbar messages */
- gint last_prefs_page; /* last page selected in prefs window */
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?*/
@@ -304,8 +303,6 @@
void prefs_set_group_compilations (gboolean val, gboolean update_display);
GtkToolbarStyle prefs_get_toolbar_style (void);
void prefs_set_toolbar_style (GtkToolbarStyle i);
-gint prefs_get_last_prefs_page (void);
-void prefs_set_last_prefs_page (gint i);
void prefs_set_display_tooltips_main (gboolean state);
gboolean prefs_get_display_tooltips_main (void);
void prefs_set_display_tooltips_prefs (gboolean state);
Index: prefs_window.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- prefs_window.c 12 Jun 2006 03:19:27 -0000 1.150
+++ prefs_window.c 12 Jun 2006 03:56:09 -0000 1.151
@@ -659,7 +659,7 @@
if (page == -1)
{
gtk_notebook_set_current_page (GTK_NOTEBOOK (w),
- prefs_get_last_prefs_page ());
+ prefs_get_int("last_prefs_page"));
}
else
{
@@ -776,8 +776,8 @@
/* save current notebook page */
nb = gtkpod_xml_get_widget (prefs_window_xml, "notebook");
- prefs_set_last_prefs_page (gtk_notebook_get_current_page (
- GTK_NOTEBOOK (nb)));
+ prefs_set_int("last_prefs_page", gtk_notebook_get_current_page (
+ GTK_NOTEBOOK (nb)));
/* save current window size */
gtk_window_get_size (GTK_WINDOW (prefs_window), &defx, &defy);
@@ -813,8 +813,8 @@
/* save current notebook page */
nb = gtkpod_xml_get_widget (prefs_window_xml, "notebook");
- prefs_set_last_prefs_page (gtk_notebook_get_current_page (
- GTK_NOTEBOOK (nb)));
+ prefs_set_int("last_prefs_page",gtk_notebook_get_current_page (
+ GTK_NOTEBOOK (nb)));
/* save current window size */
gtk_window_get_size (GTK_WINDOW (prefs_window), &defx, &defy);
@@ -844,8 +844,8 @@
/* save current notebook page */
nb = gtkpod_xml_get_widget (prefs_window_xml, "notebook");
- prefs_set_last_prefs_page (gtk_notebook_get_current_page (
- GTK_NOTEBOOK (nb)));
+ prefs_set_int("last_prefs_page", gtk_notebook_get_current_page (
+ GTK_NOTEBOOK (nb)));
/* save current window size */
gtk_window_get_size (GTK_WINDOW (prefs_window), &defx, &defy);
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
