Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2298/src
Modified Files:
main.c prefs.c prefs.h
Log Message:
Moved autoimport_commandline to new prefs.
Index: main.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/main.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- main.c 10 Jun 2006 23:04:06 -0000 1.54
+++ main.c 10 Jun 2006 23:29:24 -0000 1.55
@@ -134,7 +134,7 @@
call_script ("gtkpod.in", NULL);
/* if(prefs_get_automount()) mount_ipod();*/
- if(prefs_get_int("autoimport") || prefs_get_autoimport_commandline())
+ if(prefs_get_int("autoimport") || prefs_get_int("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.218
retrieving revision 1.219
diff -u -d -r1.218 -r1.219
--- prefs.c 10 Jun 2006 23:22:00 -0000 1.218
+++ prefs.c 10 Jun 2006 23:29:24 -0000 1.219
@@ -2268,7 +2268,7 @@
prefs_set_string ("initial_mountpoint", optarg);
break;
case GP_AUTO:
- prefs_set_autoimport_commandline (TRUE);
+ prefs_set_int("autoimport_commandline", TRUE);
break;
case GP_OFFLINE:
prefs_set_offline (TRUE);
@@ -2508,17 +2508,6 @@
return(result);
}
-gboolean prefs_get_autoimport_commandline(void)
-{
- return(cfg->autoimport_commandline);
-}
-
-void prefs_set_autoimport_commandline(gboolean val)
-{
- cfg->autoimport_commandline = val;
-}
-
-
/* Returns "$HOME/.gtkpod" and tries to create it if it does not
exist. */
gchar *prefs_get_cfgdir (void)
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- prefs.h 10 Jun 2006 23:22:00 -0000 1.143
+++ prefs.h 10 Jun 2006 23:29:24 -0000 1.144
@@ -95,8 +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_commandline;/* whether or not to automatically
- * import files as set by commandline */
struct sortcfg
{ /* sort type: SORT_ASCENDING, SORT_DESCENDING, SORT_NONE */
@@ -361,7 +359,6 @@
void prefs_set_mserv_use(gboolean val);
const gchar *prefs_get_mserv_username(void);
void prefs_set_mserv_username(const gchar *root);
-void prefs_set_autoimport_commandline(gboolean val);
/* Podcast preferences */
void prefs_set_pc_dir(const gchar *str);
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
