Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15299/src
Modified Files:
display_playlists.c display_tracks.c file.c ipod_init.c
Log Message:
* src/display_playlists.c: display duplicates when adding
tracks through DND.
Index: display_playlists.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_playlists.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- display_playlists.c 27 Jun 2006 16:29:43 -0000 1.92
+++ display_playlists.c 26 Nov 2006 05:49:48 -0000 1.93
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-06-28 01:25:27 jcs>
+/* Time-stamp: <2006-11-26 14:34:06 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -883,8 +883,6 @@
gtk_drag_finish (dc, FALSE, FALSE, time);
g_return_if_reached ();
}
- pm_rows_reordered ();
- return;
}
else
{ /*handle DND between two itdbs */
@@ -945,6 +943,9 @@
gtk_drag_finish (dc, FALSE, FALSE, time);
break;
}
+
+ /* display if any duplicates were skipped */
+ gp_duplicate_remove (NULL, NULL);
}
Index: display_tracks.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_tracks.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- display_tracks.c 21 Oct 2006 10:21:53 -0000 1.113
+++ display_tracks.c 26 Nov 2006 05:49:48 -0000 1.114
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-10-21 19:15:12 jcs>
+/* Time-stamp: <2006-11-26 14:48:28 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
Index: file.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file.c,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -d -r1.191 -r1.192
--- file.c 22 Nov 2006 15:48:19 -0000 1.191
+++ file.c 26 Nov 2006 05:49:48 -0000 1.192
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-11-23 00:45:43 jcs>
+/* Time-stamp: <2006-11-26 14:42:36 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
Index: ipod_init.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/ipod_init.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ipod_init.c 24 Nov 2006 11:31:52 -0000 1.8
+++ ipod_init.c 26 Nov 2006 05:49:48 -0000 1.9
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-11-24 20:29:50 jcs>
+/* Time-stamp: <2006-11-25 00:50:21 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -246,6 +246,7 @@
GtkEntry *entry;
gchar buf[PATH_MAX];
GtkComboBox *cb;
+ const IpodInfo *info;
g_return_val_if_fail (itdb, FALSE);
@@ -276,20 +277,29 @@
/* If available set current model number, otherwise indicate that
none is available */
- model = get_itdb_prefs_string (itdb, KEY_IPOD_MODEL);
- if (model)
+ /* If available set current model number, otherwise indicate that
+ none is available */
+ info = itdb_device_get_ipod_info (itdb->device);
+ if (info && (info->ipod_generation != ITDB_IPOD_GENERATION_UNKNOWN))
{
- g_snprintf (buf, PATH_MAX, "%s", model);
- g_free (model);
+ g_snprintf (buf, PATH_MAX, "x%s", info->model_number);
}
else
{
- g_snprintf (buf, PATH_MAX, "%s", gettext (SELECT_OR_ENTER_YOUR_MODEL));
+ model = get_itdb_prefs_string (itdb, KEY_IPOD_MODEL);
+ if (model && (strlen (g_strstrip (model)) != 0))
+ {
+ g_snprintf (buf, PATH_MAX, "%s", model);
+ g_free (model);
+ }
+ else
+ {
+ g_snprintf (buf, PATH_MAX, "%s", gettext
(SELECT_OR_ENTER_YOUR_MODEL));
+ }
}
entry = GTK_ENTRY (gtk_bin_get_child(GTK_BIN (cb)));
gtk_entry_set_text (entry, buf);
-
response = gtk_dialog_run (GTK_DIALOG (ii->window));
switch (response)
@@ -426,12 +436,21 @@
}
else
{
- g_snprintf (buf, PATH_MAX, "%s", gettext (SELECT_OR_ENTER_YOUR_MODEL));
+ model = get_itdb_prefs_string (itdb, KEY_IPOD_MODEL);
+ if (model && (strlen (g_strstrip (model)) != 0))
+ {
+ g_snprintf (buf, PATH_MAX, "%s", model);
+ g_free (model);
+ }
+ else
+ {
+ g_snprintf (buf, PATH_MAX, "%s", gettext
(SELECT_OR_ENTER_YOUR_MODEL));
+ }
}
+
entry = GTK_ENTRY (gtk_bin_get_child(GTK_BIN (cb)));
gtk_entry_set_text (entry, buf);
-
response = gtk_dialog_run (GTK_DIALOG (window));
switch (response)
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
