Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17072/src
Modified Files:
display.c info.c prefs.c prefs.h
Log Message:
Moved info_window to new prefs.
Index: display.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display.c,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- display.c 10 Jun 2006 13:39:48 -0000 1.140
+++ display.c 12 Jun 2006 03:35:16 -0000 1.141
@@ -101,7 +101,7 @@
/* CAREFUL: must be done after calling ..._space_statusbar_init() */
display_set_info_window_menu ();
/* check if info window should be opened */
- if (prefs_get_info_window ()) info_open_window ();
+ if (prefs_get_int("info_window")) info_open_window ();
}
/* redisplay the entire display (playlists, sort tabs, track view) and
@@ -351,7 +351,7 @@
{
GtkWidget *mi = gtkpod_xml_get_widget (main_window_xml,
"info_window_menu");
- if (prefs_get_info_window ())
+ if (prefs_get_int("info_window"))
{
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mi), TRUE);
}
Index: info.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/info.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- info.c 9 Jun 2006 02:19:46 -0000 1.42
+++ info.c 12 Jun 2006 03:35:16 -0000 1.43
@@ -171,7 +171,7 @@
defx = prefs_get_int("size_info.x");
defy = prefs_get_int("size_info.y");
gtk_window_set_default_size (GTK_WINDOW (info_window), defx, defy);
- prefs_set_info_window (TRUE); /* notify prefs */
+ prefs_set_int("info_window", TRUE); /* notify prefs */
info_update ();
gtk_widget_show (info_window);
/* set the menu item for the info window correctly */
@@ -190,7 +190,7 @@
win = info_window;
info_window = NULL;
gtk_widget_destroy (win);
- prefs_set_info_window (FALSE); /* notify prefs */
+ prefs_set_int("info_window", FALSE); /* notify prefs */
/* set the menu item for the info window correctly */
display_set_info_window_menu ();
}
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -d -r1.229 -r1.230
--- prefs.c 12 Jun 2006 03:19:27 -0000 1.229
+++ prefs.c 12 Jun 2006 03:35:16 -0000 1.230
@@ -226,6 +226,8 @@
prefs_set_string("mserv_username", "");
prefs_set_int("automount", FALSE);
prefs_set_int("startup_messages", TRUE);
+ prefs_set_int("add_recursively", TRUE);
+ prefs_set_int("info_window", FALSE);
}
/* Initialize default variable-length list entries */
@@ -1794,7 +1796,6 @@
mycfg->statusbar_timeout = STATUSBAR_TIMEOUT;
mycfg->tmp_disable_sort = TRUE;
- mycfg->info_window = FALSE;
mycfg->multi_edit = FALSE;
mycfg->multi_edit_title = TRUE;
mycfg->not_played_track = TRUE;
@@ -2084,10 +2085,6 @@
/* ignore -- wie always fix the export path (replace
* non-compatible chars) */
}
- else if(g_ascii_strcasecmp (line, "info_window") == 0)
- {
- prefs_set_info_window (atoi (arg));
- }
else if(g_ascii_strcasecmp (line, "write_gaintag") == 0)
{
/* ignore -- not used any more */
@@ -2274,7 +2271,6 @@
fprintf(fp, "update_charset=%d\n",prefs_get_update_charset());
fprintf(fp, "write_charset=%d\n",prefs_get_write_charset());
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);
}
@@ -2708,18 +2704,6 @@
cfg->last_prefs_page = i;
}
-gboolean
-prefs_get_info_window(void)
-{
- return cfg->info_window;
-}
-void
-
-prefs_set_info_window(gboolean val)
-{
- cfg->info_window = val;
-}
-
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.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- prefs.h 12 Jun 2006 03:19:27 -0000 1.155
+++ prefs.h 12 Jun 2006 03:35:16 -0000 1.156
@@ -106,7 +106,6 @@
GList *tmp_sort_ign_fields; /* used in prefs_window.c only */
gchar *tmp_sort_ign_strings;/* used in prefs_window.c only */
} sortcfg;
- gboolean info_window; /* is info window open (will then open on restart */
gboolean offline; /* are we working offline, i.e. without iPod? */
gboolean display_toolbar; /* should toolbar be displayed */
@@ -280,7 +279,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_info_window(gboolean val);
gboolean prefs_get_offline(void);
gint prefs_get_pm_sort (void);
@@ -308,7 +306,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_info_window (void);
void prefs_set_display_tooltips_main (gboolean state);
gboolean prefs_get_display_tooltips_main (void);
void prefs_set_display_tooltips_prefs (gboolean state);
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
