Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29873/src
Modified Files:
main.c misc_confirm.c prefs.c prefs.h prefs_window.c
Log Message:
Moved automount to new prefs.
Index: main.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/main.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- main.c 10 Jun 2006 23:29:24 -0000 1.55
+++ main.c 12 Jun 2006 02:44:00 -0000 1.56
@@ -133,7 +133,7 @@
/* stuff to be done before starting gtkpod */
call_script ("gtkpod.in", NULL);
-/* if(prefs_get_automount()) mount_ipod();*/
+/* if(prefs_get_int("automount")) mount_ipod();*/
if(prefs_get_int("autoimport") || prefs_get_int("autoimport_commandline"))
gp_load_ipods ();
Index: misc_confirm.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_confirm.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- misc_confirm.c 7 Jun 2006 05:03:43 -0000 1.37
+++ misc_confirm.c 12 Jun 2006 02:44:00 -0000 1.38
@@ -1081,10 +1081,11 @@
#endif
display_cleanup ();
- if(prefs_get_automount())
+ if(prefs_get_int("automount"))
{
/* unmount_ipod ();*/
}
+
call_script ("gtkpod.out", NULL);
gtk_main_quit ();
return FALSE;
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -d -r1.226 -r1.227
--- prefs.c 12 Jun 2006 00:30:13 -0000 1.226
+++ prefs.c 12 Jun 2006 02:44:00 -0000 1.227
@@ -224,6 +224,7 @@
prefs_set_string("coverart_template", "%A;folder.jpg");
prefs_set_int("mserv_use", FALSE);
prefs_set_string("mserv_username", "");
+ prefs_set_int("automount", FALSE);
}
/* Initialize default variable-length list entries */
@@ -1794,7 +1795,6 @@
mycfg->tmp_disable_sort = TRUE;
mycfg->startup_messages = TRUE;
- mycfg->automount = FALSE;
mycfg->info_window = FALSE;
mycfg->multi_edit = FALSE;
mycfg->multi_edit_title = TRUE;
@@ -2089,10 +2089,6 @@
/* ignore -- wie always fix the export path (replace
* non-compatible chars) */
}
- else if(g_ascii_strcasecmp (line, "automount") == 0)
- {
- prefs_set_automount (atoi (arg));
- }
else if(g_ascii_strcasecmp (line, "info_window") == 0)
{
prefs_set_info_window (atoi (arg));
@@ -2290,7 +2286,6 @@
fprintf(fp, "write_charset=%d\n",prefs_get_write_charset());
fprintf(fp, "add_recursively=%d\n",prefs_get_add_recursively());
fprintf(fp, "case_sensitive=%d\n",prefs_get_case_sensitive());
- fprintf (fp, "automount=%d\n", cfg->automount);
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);
@@ -2736,18 +2731,6 @@
cfg->last_prefs_page = i;
}
-gboolean
-prefs_get_automount (void)
-{
- return cfg->automount;
-}
-
-void
-prefs_set_automount(gboolean val)
-{
- cfg->automount = val;
-}
-
gboolean
prefs_get_info_window(void)
{
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- prefs.h 12 Jun 2006 00:30:13 -0000 1.152
+++ prefs.h 12 Jun 2006 02:44:01 -0000 1.153
@@ -120,7 +120,6 @@
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 automount; /* whether we should mount/unmount the ipod */
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?*/
@@ -283,7 +282,6 @@
void prefs_set_charset (gchar *charset);
void prefs_cfg_set_charset (struct cfg *cfg, gchar *charset);
void prefs_set_statusbar_timeout (guint32 val);
-void prefs_set_automount(gboolean val);
void prefs_set_info_window(gboolean val);
gboolean prefs_get_offline(void);
@@ -314,7 +312,6 @@
void prefs_set_toolbar_style (GtkToolbarStyle i);
gint prefs_get_last_prefs_page (void);
void prefs_set_last_prefs_page (gint i);
-gboolean prefs_get_automount (void);
gboolean prefs_get_info_window (void);
void prefs_set_display_tooltips_main (gboolean state);
gboolean prefs_get_display_tooltips_main (void);
Index: prefs_window.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- prefs_window.c 12 Jun 2006 00:30:13 -0000 1.147
+++ prefs_window.c 12 Jun 2006 02:44:01 -0000 1.148
@@ -619,7 +619,7 @@
if ((w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_automount_ipod")))
{
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
- prefs_get_automount());
+ prefs_get_int("automount"));
}
if ((w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_sort_tab_num_sb")))
{
@@ -707,7 +707,6 @@
prefs_set_update_charset(tmpcfg->update_charset);
prefs_set_write_charset(tmpcfg->write_charset);
prefs_set_add_recursively(tmpcfg->add_recursively);
- prefs_set_automount(tmpcfg->automount);
prefs_set_tmp_disable_sort(tmpcfg->tmp_disable_sort);
prefs_set_startup_messages(tmpcfg->startup_messages);
tm_show_preferred_columns();
@@ -1356,7 +1355,8 @@
on_cfg_automount_ipod_toggled (GtkToggleButton *togglebutton,
gpointer user_data)
{
- tmpcfg->automount = gtk_toggle_button_get_active (togglebutton);
+ temp_prefs_set_int(temp_prefs, "automount",
+ gtk_toggle_button_get_active (togglebutton));
}
void
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
