Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv30746/src
Modified Files:
file_export.c file_itunesdb.c info.c misc_playlist.c prefs.c
prefs.h tools.c
Log Message:
Moved statusbar_timeout to new prefs.
Index: file_export.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file_export.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- file_export.c 11 Jun 2006 16:04:47 -0000 1.61
+++ file_export.c 21 Jun 2006 00:12:05 -0000 1.62
@@ -473,10 +473,18 @@
}
++count;
- if (count == 1) /* we need longer timeout */
- prefs_set_statusbar_timeout (3*STATUSBAR_TIMEOUT);
+ if (count == 1) /* we need longer timeout */
+ {
+ prefs_set_int("statusbar_timeout", 3*STATUSBAR_TIMEOUT);
+ gtkpod_statusbar_reset_timeout();
+ }
+
if (count == n) /* we need to reset timeout */
- prefs_set_statusbar_timeout (0);
+ {
+ prefs_set_int("statusbar_timeout",
+ STATUSBAR_TIMEOUT);
+ gtkpod_statusbar_reset_timeout();
+ }
gtkpod_statusbar_message (ngettext ("Copied %d of %d track.",
"Copied %d of %d tracks.", n),
count, n);
Index: file_itunesdb.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file_itunesdb.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- file_itunesdb.c 11 Jun 2006 16:04:48 -0000 1.94
+++ file_itunesdb.c 21 Jun 2006 00:12:05 -0000 1.95
@@ -1460,9 +1460,17 @@
and more files to the iPod */
++count;
if (count == 1) /* we need longer timeout */
- prefs_set_statusbar_timeout (3*STATUSBAR_TIMEOUT);
+ {
+ prefs_set_int("statusbar_timeout",
+ 3*STATUSBAR_TIMEOUT);
+ gtkpod_statusbar_reset_timeout();
+ }
if (count == n) /* we need to reset timeout */
- prefs_set_statusbar_timeout (0);
+ {
+ prefs_set_int("statusbar_timeout",
+ STATUSBAR_TIMEOUT);
+ gtkpod_statusbar_reset_timeout();
+ }
gtkpod_statusbar_message (
ngettext ("Copied %d of %d new track.",
"Copied %d of %d new tracks.", n),
@@ -1491,7 +1499,8 @@
if (abort_flag) result = FALSE; /* negative result if user aborted */
if (result == FALSE)
gtkpod_statusbar_message (_("Some tracks were not written to iPod.
Export aborted!"));
- prefs_set_statusbar_timeout (0);
+ prefs_set_int("statusbar_timeout", 0);
+ gtkpod_statusbar_reset_timeout();
gtk_widget_destroy (dialog);
while (widgets_blocked && gtk_events_pending ()) gtk_main_iteration ();
return result;
Index: info.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/info.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- info.c 12 Jun 2006 03:35:16 -0000 1.43
+++ info.c 21 Jun 2006 00:12:05 -0000 1.44
@@ -418,7 +418,7 @@
{
if (statusbar_timeout_id != 0) /* remove last timeout, if still present */
gtk_timeout_remove (statusbar_timeout_id);
- statusbar_timeout_id = gtk_timeout_add(prefs_get_statusbar_timeout (),
+ statusbar_timeout_id = gtk_timeout_add(prefs_get_int("statusbar_timeout"),
(GtkFunction) gtkpod_statusbar_clear,
NULL);
}
Index: misc_playlist.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_playlist.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- misc_playlist.c 13 Jun 2006 04:19:36 -0000 1.34
+++ misc_playlist.c 21 Jun 2006 00:12:05 -0000 1.35
@@ -1008,7 +1008,8 @@
}
}
- prefs_set_statusbar_timeout (30*STATUSBAR_TIMEOUT);
+ prefs_set_int("statusbar_timeout", 30*STATUSBAR_TIMEOUT);
+ gtkpod_statusbar_reset_timeout();
block_widgets();
gtkpod_statusbar_message(_("Creating a tree of known files"));
@@ -1214,6 +1215,7 @@
g_tree_destroy (files_known);
gtkpod_statusbar_message (_("Found %d orphaned and %d dangling files.
Done."),
norphaned, ndangling);
- prefs_set_statusbar_timeout (0);
+ prefs_set_int("statusbar_timeout", STATUSBAR_TIMEOUT);
+ gtkpod_statusbar_reset_timeout();
release_widgets ();
}
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -d -r1.254 -r1.255
--- prefs.c 20 Jun 2006 23:25:31 -0000 1.254
+++ prefs.c 21 Jun 2006 00:12:05 -0000 1.255
@@ -2302,17 +2302,5 @@
return cfgdir;
}
-/* A value of "0" will set the default defined in misc.c */
-void prefs_set_statusbar_timeout (guint32 val)
-{
- if (val == 0) val = STATUSBAR_TIMEOUT;
- cfg->statusbar_timeout = val;
- gtkpod_statusbar_reset_timeout ();
-}
-
-guint32 prefs_get_statusbar_timeout (void)
-{
- return cfg->statusbar_timeout;
-}
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -d -r1.181 -r1.182
--- prefs.h 20 Jun 2006 23:25:31 -0000 1.181
+++ prefs.h 21 Jun 2006 00:12:05 -0000 1.182
@@ -62,7 +62,6 @@
gboolean md5tracks; /* don't allow track duplication on your ipod */
gboolean offline; /* are we working offline, i.e. without iPod? */
- guint32 statusbar_timeout; /* timeout for statusbar messages */
float version; /* version of gtkpod writing the cfg file */
};
@@ -202,10 +201,8 @@
void prefs_set_offline(gboolean active);
void prefs_set_md5tracks(gboolean active);
-void prefs_set_statusbar_timeout (guint32 val);
gboolean prefs_get_offline(void);
gboolean prefs_get_md5tracks(void);
-guint32 prefs_get_statusbar_timeout (void);
#endif
Index: tools.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/tools.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- tools.c 11 Jun 2006 16:04:51 -0000 1.47
+++ tools.c 21 Jun 2006 00:12:05 -0000 1.48
@@ -422,7 +422,8 @@
else
{
/* we need ***much*** longer timeout */
- prefs_set_statusbar_timeout (30*STATUSBAR_TIMEOUT);
+ prefs_set_int("statusbar_timeout", 30*STATUSBAR_TIMEOUT);
+ gtkpod_statusbar_reset_timeout();
}
while (!abort && (list!=NULL))
{
@@ -524,7 +525,8 @@
list=g_list_next(list);
} /*end while*/
- prefs_set_statusbar_timeout (0);
+ prefs_set_int("statusbar_timeout", STATUSBAR_TIMEOUT);
+ gtkpod_statusbar_reset_timeout();
gtkpod_statusbar_message (ngettext ("Normalized %d of %d tracks.",
"Normalized %d of %d tracks.", n),
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
