Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27700/src
Modified Files:
display.c
Log Message:
* src/display.c (on_check_ipod_files_activate): require that
the iPod is loaded before checking files.
Index: display.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- display.c 24 Jun 2006 12:37:45 -0000 1.147
+++ display.c 24 Jun 2006 13:23:03 -0000 1.148
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-06-24 15:56:24 jcs>
+/* Time-stamp: <2006-06-24 21:48:17 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -1232,7 +1232,30 @@
iTunesDB *itdb = gp_get_ipod_itdb ();
if (itdb)
{
- check_db (itdb);
+ ExtraiTunesDBData *eitdb = itdb->userdata;
+
+ g_return_if_fail (eitdb);
+
+
+ if (!eitdb->itdb_imported)
+ {
+ gchar *mountpoint = get_itdb_prefs_string (itdb, KEY_MOUNTPOINT);
+ gchar *str = g_strdup_printf (_("iPod at '%s' is not
loaded.\nPlease load it first."), mountpoint);
+ GtkWidget *dialog = gtk_message_dialog_new (
+ GTK_WINDOW (gtkpod_window),
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_OK,
+ str);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
+ g_free (str);
+ g_free (mountpoint);
+ }
+ else
+ {
+ check_db (itdb);
+ }
}
else
{
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
