Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15742/src
Modified Files:
details.c display.c file_itunesdb.c
Log Message:
* file_itunesdb.c: fixed error when writing iTunesDB.ext
(filename/thumbnail)
Index: details.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/details.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- details.c 4 Dec 2005 10:24:38 -0000 1.5
+++ details.c 4 Dec 2005 16:00:39 -0000 1.6
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-12-04 19:12:35 jcs>
+/* Time-stamp: <2005-12-04 22:54:28 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -1128,6 +1128,39 @@
+/* Free memory taken by @detail */
+static void details_free (Detail *detail)
+{
+ g_return_if_fail (detail);
+
+ /* FIXME: how do we free the detail->xml? */
+
+ if (detail->window)
+ {
+ gtk_widget_destroy (detail->window);
+ }
+
+ if (detail->orig_tracks)
+ {
+ g_list_free (detail->orig_tracks);
+ }
+
+ if (detail->tracks)
+ {
+ GList *gl;
+ for (gl=detail->tracks; gl; gl=gl->next)
+ {
+ Track *tr = gl->data;
+ g_return_if_fail (tr);
+ itdb_track_free (tr);
+ }
+ g_list_free (detail->tracks);
+ }
+
+ g_free (detail);
+}
+
+
/* Open the details window and display the selected tracks, starting
* with the first track */
void details_edit (GList *selected_tracks)
@@ -1245,35 +1278,10 @@
}
-/* Free memory taken by @detail */
-static void details_free (Detail *detail)
+/* Use the dimension of the first open window */
+void details_update_default_sizes (void)
{
- g_return_if_fail (detail);
-
- /* FIXME: how do we free the detail->xml? */
-
- if (detail->window)
- {
- gtk_widget_destroy (detail->window);
- }
-
- if (detail->orig_tracks)
- {
- g_list_free (detail->orig_tracks);
- }
-
- if (detail->tracks)
- {
- GList *gl;
- for (gl=detail->tracks; gl; gl=gl->next)
- {
- Track *tr = gl->data;
- g_return_if_fail (tr);
- itdb_track_free (tr);
- }
- g_list_free (detail->tracks);
- }
-
- g_free (detail);
+ if (details)
+ details_store_window_state (details->data);
}
Index: display.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- display.c 26 Nov 2005 13:44:41 -0000 1.123
+++ display.c 4 Dec 2005 16:00:39 -0000 1.124
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-25 23:52:14 jcs>
+/* Time-stamp: <2005-12-04 22:53:33 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -341,6 +341,7 @@
st_update_default_sizes ();
prefs_window_update_default_sizes ();
info_update_default_sizes ();
+ details_update_default_sizes ();
}
Index: file_itunesdb.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file_itunesdb.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- file_itunesdb.c 3 Dec 2005 16:36:26 -0000 1.71
+++ file_itunesdb.c 4 Dec 2005 16:00:39 -0000 1.72
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-12-03 02:08:19 jcs>
+/* Time-stamp: <2005-12-04 23:45:22 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -920,11 +920,11 @@
if (etr->pc_path_locale && *etr->pc_path_locale)
fprintf (fp, "filename_locale=%s\n", etr->pc_path_locale);
if (etr->pc_path_utf8 && *etr->pc_path_utf8)
- fprintf (fp, "thumbnail_utf8=%s\n", etr->pc_path_utf8);
+ fprintf (fp, "filename_utf8=%s\n", etr->pc_path_utf8);
if (etr->thumb_path_locale && *etr->thumb_path_locale)
fprintf (fp, "thumbnail_locale=%s\n", etr->thumb_path_locale);
if (etr->thumb_path_utf8 && *etr->thumb_path_utf8)
- fprintf (fp, "filename_utf8=%s\n", etr->thumb_path_utf8);
+ fprintf (fp, "thumbnail_utf8=%s\n", etr->thumb_path_utf8);
/* this is just for convenience for people looking for a track
on the ipod away from gktpod/itunes etc. */
if (etr->md5_hash && *etr->md5_hash)
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
