Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv24204/src
Modified Files:
main.c prefs.c prefs.h prefs_window.c
Log Message:
Moved autoimport to new prefs.
Index: main.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/main.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- main.c 28 May 2006 02:03:04 -0000 1.53
+++ main.c 10 Jun 2006 23:04:06 -0000 1.54
@@ -134,7 +134,7 @@
call_script ("gtkpod.in", NULL);
/* if(prefs_get_automount()) mount_ipod();*/
- if(prefs_get_autoimport() || prefs_get_autoimport_commandline())
+ if(prefs_get_int("autoimport") || prefs_get_autoimport_commandline())
gp_load_ipods ();
server_setup (); /* start server to accept playcount updates */
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -d -r1.216 -r1.217
--- prefs.c 10 Jun 2006 13:39:48 -0000 1.216
+++ prefs.c 10 Jun 2006 23:04:06 -0000 1.217
@@ -213,6 +213,8 @@
prefs_set_int("size_prefs.y", 480);
prefs_set_int("size_info.x", 510);
prefs_set_int("size_info.y", 300);
+
+ prefs_set_int("autoimport", FALSE);
}
/* Initialize default variable-length list entries */
@@ -893,7 +895,14 @@
prefs_set_string("size_info.x", NULL);
prefs_set_string("size_info.y", NULL);
}
-
+
+ /* auto_import reanmed to autoimport */
+ if (prefs_get_int_value("auto_import", &int_buf))
+ {
+ prefs_set_int("autoimport", int_buf);
+ prefs_set_string("auto_import", NULL);
+ }
+
prefs_set_string ("version", VERSION);
}
@@ -1763,7 +1772,6 @@
mycfg->charset = NULL;
mycfg->md5tracks = TRUE;
mycfg->block_display = FALSE;
- mycfg->autoimport = FALSE;
mycfg->offline = FALSE;
mycfg->write_extended_info = TRUE;
mycfg->readtags = TRUE;
@@ -1963,11 +1971,6 @@
{
prefs_set_block_display((gboolean)atoi(arg));
}
- else if((g_ascii_strcasecmp (line, "auto_import") == 0) ||
- (g_ascii_strcasecmp (line, "autoimport") == 0))
- {
- prefs_set_autoimport((gboolean)atoi(arg));
- }
else if(g_ascii_strcasecmp (line, "readtags") == 0)
{
prefs_set_readtags((gboolean)atoi(arg));
@@ -2302,8 +2305,6 @@
}
fprintf(fp, "md5=%d\n",prefs_get_md5tracks ());
fprintf(fp, "block_display=%d\n",prefs_get_block_display());
- fprintf(fp, "autoimport=%d\n",prefs_get_autoimport());
-
fprintf(fp, "readtags=%d\n", prefs_get_readtags());
fprintf(fp, "parsetags=%d\n", prefs_get_parsetags());
fprintf(fp, "parsetags_overwrite=%d\n", prefs_get_parsetags_overwrite());
@@ -2512,16 +2513,6 @@
return(result);
}
-gboolean prefs_get_autoimport(void)
-{
- return(cfg->autoimport);
-}
-
-void prefs_set_autoimport(gboolean val)
-{
- cfg->autoimport = val;
-}
-
gboolean prefs_get_autoimport_commandline(void)
{
return(cfg->autoimport_commandline);
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- prefs.h 10 Jun 2006 13:39:48 -0000 1.141
+++ prefs.h 10 Jun 2006 23:04:06 -0000 1.142
@@ -95,7 +95,6 @@
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? */
- gboolean autoimport; /* whether or not to automatically import files */
gboolean autoimport_commandline;/* whether or not to automatically
* import files as set by commandline */
@@ -294,7 +293,6 @@
void prefs_set_tm_sortcol (TM_item col);
void prefs_set_tm_autostore (gboolean active);
void prefs_set_write_extended_info(gboolean active);
-void prefs_set_autoimport(gboolean val);
void prefs_set_md5tracks(gboolean active);
void prefs_set_block_display(gboolean active);
void prefs_set_readtags (gboolean active);
@@ -366,7 +364,6 @@
void prefs_set_mserv_use(gboolean val);
const gchar *prefs_get_mserv_username(void);
void prefs_set_mserv_username(const gchar *root);
-gboolean prefs_get_autoimport_commandline(void);
void prefs_set_autoimport_commandline(gboolean val);
/* Podcast preferences */
Index: prefs_window.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- prefs_window.c 10 Jun 2006 13:39:48 -0000 1.138
+++ prefs_window.c 10 Jun 2006 23:04:06 -0000 1.139
@@ -477,7 +477,7 @@
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_autoimport");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
- tmpcfg->autoimport);
+ prefs_get_int("autoimport"));
w = gtkpod_xml_get_widget (prefs_window_xml, "autoselect_hbox");
for (i=0; i<SORT_TAB_MAX; ++i)
@@ -704,7 +704,6 @@
* catch the reorder signal) */
tm_store_col_order ();
prefs_set_charset(tmpcfg->charset);
- prefs_set_autoimport(tmpcfg->autoimport);
prefs_set_readtags(tmpcfg->readtags);
prefs_set_parsetags(tmpcfg->parsetags);
@@ -1100,8 +1099,8 @@
on_cfg_autoimport_toggled (GtkToggleButton *togglebutton,
gpointer user_data)
{
- tmpcfg->autoimport =
- gtk_toggle_button_get_active(togglebutton);
+ temp_prefs_set_int(temp_prefs, "autoimport",
+ gtk_toggle_button_get_active(togglebutton));
}
void
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
