Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7082/src
Modified Files:
prefs.c prefs.h prefs_window.c
Log Message:
Moved display_tooltips_prefs to new prefs.
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -d -r1.249 -r1.250
--- prefs.c 20 Jun 2006 00:54:19 -0000 1.249
+++ prefs.c 20 Jun 2006 01:17:42 -0000 1.250
@@ -256,6 +256,7 @@
prefs_set_int("misc_track_nr", 25);
prefs_set_int("update_charset", FALSE);
prefs_set_int("display_tooltips_main", TRUE);
+ prefs_set_int("display_tooltips_prefs", TRUE);
/* Set sorting prefs */
prefs_set_int("case_sensitive", FALSE);
@@ -1868,7 +1869,6 @@
mycfg->offline = FALSE;
mycfg->display_toolbar = TRUE;
mycfg->toolbar_style = GTK_TOOLBAR_BOTH;
- mycfg->display_tooltips_prefs = TRUE;
g_free (cfgdir);
@@ -2019,10 +2019,6 @@
{
prefs_set_display_toolbar((gboolean)atoi(arg));
}
- else if(g_ascii_strcasecmp (line, "display_tooltips_prefs") == 0)
- {
- prefs_set_display_tooltips_prefs((gboolean)atoi(arg));
- }
else if(g_ascii_strcasecmp (line, "save_sorted_order") == 0)
{
/* ignore option -- has been deleted with 0.53 */
@@ -2201,8 +2197,6 @@
fprintf(fp, "offline=%d\n",prefs_get_offline());
fprintf(fp, "display_toolbar=%d\n",prefs_get_display_toolbar());
fprintf(fp, "toolbar_style=%d\n",prefs_get_toolbar_style());
- fprintf(fp, "display_tooltips_prefs=%d\n",
- prefs_get_display_tooltips_prefs());
}
@@ -2416,17 +2410,6 @@
display_show_hide_toolbar ();
}
-void prefs_set_display_tooltips_prefs (gboolean state)
-{
- cfg->display_tooltips_prefs = state;
- display_show_hide_tooltips ();
-}
-
-gboolean prefs_get_display_tooltips_prefs (void)
-{
- return cfg->display_tooltips_prefs;
-}
-
/* 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.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- prefs.h 20 Jun 2006 00:54:20 -0000 1.176
+++ prefs.h 20 Jun 2006 01:17:43 -0000 1.177
@@ -67,7 +67,6 @@
gboolean offline; /* are we working offline, i.e. without iPod? */
gboolean display_toolbar; /* should toolbar be displayed */
GtkToolbarStyle toolbar_style;/* style of toolbar */
- gboolean display_tooltips_prefs;/* should toolbar be displayed (prefs) */
guint32 statusbar_timeout; /* timeout for statusbar messages */
float version; /* version of gtkpod writing the cfg file */
};
@@ -223,8 +222,6 @@
void prefs_set_display_toolbar (gboolean val);
GtkToolbarStyle prefs_get_toolbar_style (void);
void prefs_set_toolbar_style (GtkToolbarStyle i);
-void prefs_set_display_tooltips_prefs (gboolean state);
-gboolean prefs_get_display_tooltips_prefs (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.171
retrieving revision 1.172
diff -u -d -r1.171 -r1.172
--- prefs_window.c 20 Jun 2006 00:54:20 -0000 1.171
+++ prefs_window.c 20 Jun 2006 01:17:43 -0000 1.172
@@ -260,7 +260,7 @@
g_return_if_fail (tooltipsdata);
tt = tooltipsdata->tooltips;
g_return_if_fail (tt);
- if (prefs_get_display_tooltips_prefs ()) gtk_tooltips_enable (tt);
+ if (prefs_get_int("display_tooltips_prefs")) gtk_tooltips_enable (tt);
else gtk_tooltips_disable (tt);
}
@@ -419,7 +419,7 @@
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_display_tooltips_prefs");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
- tmpcfg->display_tooltips_prefs);
+ prefs_get_int("display_tooltips_prefs"));
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_multi_edit");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
@@ -698,7 +698,6 @@
prefs_set_block_display(tmpcfg->block_display);
prefs_set_toolbar_style(tmpcfg->toolbar_style);
prefs_set_display_toolbar(tmpcfg->display_toolbar);
- prefs_set_display_tooltips_prefs (tmpcfg->display_tooltips_prefs);
tm_show_preferred_columns();
st_show_visible();
display_show_hide_tooltips();
@@ -1204,8 +1203,8 @@
on_cfg_display_tooltips_prefs_toggled (GtkToggleButton *togglebutton,
gpointer user_data)
{
- tmpcfg->display_tooltips_prefs =
- gtk_toggle_button_get_active (togglebutton);
+ temp_prefs_set_int(temp_prefs, "display_tooltips_prefs",
+ gtk_toggle_button_get_active (togglebutton));
}
@@ -1697,8 +1696,10 @@
tt = tooltips_data->tooltips;
if (tt)
{
- if (prefs_get_display_tooltips_prefs ()) gtk_tooltips_enable (tt);
- else gtk_tooltips_disable (tt);
+ if (prefs_get_int("display_tooltips_prefs"))
+ gtk_tooltips_enable (tt);
+ else
+ gtk_tooltips_disable (tt);
}
else
{
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
