Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv4784/src
Modified Files:
prefs.c prefs.h prefs_window.c
Log Message:
Moved startup_messages to new prefs.
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -d -r1.227 -r1.228
--- prefs.c 12 Jun 2006 02:44:00 -0000 1.227
+++ prefs.c 12 Jun 2006 03:02:29 -0000 1.228
@@ -225,6 +225,7 @@
prefs_set_int("mserv_use", FALSE);
prefs_set_string("mserv_username", "");
prefs_set_int("automount", FALSE);
+ prefs_set_int("startup_messages", TRUE);
}
/* Initialize default variable-length list entries */
@@ -1794,7 +1795,6 @@
mycfg->statusbar_timeout = STATUSBAR_TIMEOUT;
mycfg->tmp_disable_sort = TRUE;
- mycfg->startup_messages = TRUE;
mycfg->info_window = FALSE;
mycfg->multi_edit = FALSE;
mycfg->multi_edit_title = TRUE;
@@ -2105,12 +2105,6 @@
{
prefs_set_tmp_disable_sort ((gboolean)atoi(arg));
}
- else if(g_ascii_strcasecmp (line, "startup_messages") == 0)
- {
- /* only set if no upgrade/downgrade was performed */
- if (cfg->version == g_ascii_strtod (VERSION, NULL))
- prefs_set_startup_messages ((gboolean)atoi(arg));
- }
else if(g_ascii_strcasecmp (line, "special_export_charset") == 0)
{
prefs_set_int (EXPORT_FILES_SPECIAL_CHARSET,
@@ -2288,7 +2282,6 @@
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);
- fprintf (fp, "startup_messages=%d\n", cfg->startup_messages);
}
@@ -2753,16 +2746,6 @@
cfg->tmp_disable_sort = val;
}
-gboolean prefs_get_startup_messages(void)
-{
- return(cfg->startup_messages);
-}
-
-void prefs_set_startup_messages(gboolean val)
-{
- cfg->startup_messages = val;
-}
-
/* sorting gets disabled temporarily if either of the options
'tmp_disable_sort' or 'block_display' is checked */
gboolean prefs_get_disable_sorting(void)
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- prefs.h 12 Jun 2006 02:44:01 -0000 1.153
+++ prefs.h 12 Jun 2006 03:02:29 -0000 1.154
@@ -94,7 +94,6 @@
gboolean md5tracks; /* don't allow track duplication on your ipod */
gboolean block_display; /* block display during change of selection? */
gboolean tmp_disable_sort;/* tmp. disable sorting during change of slctn? */
- gboolean startup_messages;/* show startup messages/warnings? */
struct sortcfg
{ /* sort type: SORT_ASCENDING, SORT_DESCENDING, SORT_NONE */
@@ -327,8 +326,6 @@
gboolean prefs_get_multi_edit_title (void);
void prefs_set_tmp_disable_sort(gboolean val);
gboolean prefs_get_tmp_disable_sort(void);
-void prefs_set_startup_messages(gboolean val);
-gboolean prefs_get_startup_messages(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.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- prefs_window.c 12 Jun 2006 02:44:01 -0000 1.148
+++ prefs_window.c 12 Jun 2006 03:02:29 -0000 1.149
@@ -641,7 +641,7 @@
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_startup_messages");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
- tmpcfg->startup_messages);
+ prefs_get_int("startup_messages"));
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_mserv_use");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
@@ -708,7 +708,6 @@
prefs_set_write_charset(tmpcfg->write_charset);
prefs_set_add_recursively(tmpcfg->add_recursively);
prefs_set_tmp_disable_sort(tmpcfg->tmp_disable_sort);
- prefs_set_startup_messages(tmpcfg->startup_messages);
tm_show_preferred_columns();
}
}
@@ -1370,8 +1369,8 @@
on_cfg_startup_messages (GtkToggleButton *togglebutton,
gpointer user_data)
{
- tmpcfg->startup_messages =
- gtk_toggle_button_get_active (togglebutton);
+ temp_prefs_set_int(temp_prefs, "startup_messages",
+ gtk_toggle_button_get_active (togglebutton));
}
void
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
