Update of /cvsroot/gtkpod/gtkpod
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17457

Modified Files:
        ChangeLog_detailed gtkpod.glade 
Log Message:
        * merge threaded_conversion_branch back to HEAD.

        * src/file_convert.c: avoid GTK assertion with uninitialized
          statusbar.



Index: ChangeLog_detailed
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/ChangeLog_detailed,v
retrieving revision 1.419
retrieving revision 1.420
diff -u -d -r1.419 -r1.420
--- ChangeLog_detailed  22 Apr 2007 19:09:30 -0000      1.419
+++ ChangeLog_detailed  23 Apr 2007 15:33:29 -0000      1.420
@@ -1,3 +1,23 @@
+2007-04-23 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+       * merge threaded_conversion_branch back to HEAD.
+
+       * src/file_convert.c: avoid GTK assertion with uninitialized
+         statusbar.
+
+       * gtkpod.glade
+         src/file.h
+         src/file_itunesdb.c
+         src/display.c
+         src/file.h
+         src/file_convert.c
+         src/file_convert.h
+         src/file_itunesdb.c
+         src/prefs_window.c
+         src/info.c: handle closing of window if user
+         clicks on the 'close-window' buton, general cleanup,
+         created log window for file conversion output.
+
 2007-04-21 P.G. Richardson <phantom_sf at users.sourceforge.net>
 
        * Consideration of extra scenario for removal of a track with
@@ -38,8 +58,34 @@
 
        * po/POTFILES.in: renamed display_songs.c to display_tracks.c
 
+2007-04-20 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+       * gtkpod.glade
+         src/file_itunesdb.c
+         src/prefs.c: unified progress dialog across
+         delete/transfer/writing iTunesDB for better user experience.
+
+       * src/file_convert.c
+         src/file_convert.h
+         src/prefs_window.c: set up preferences dialog (number of
+         background threads, max. cache dir size)
+
+         src/file_itunesdb.c: avoid mutex deadlock when trying to
+         cancel delete/transfer of tracks.
+
+2007-04-20 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+       * gtkpod.glade
+         src/file_convert.c
+         src/file_itunesdb.c: Adapted export progress dialog and
+         moved layout to gtkpod.glade
+
 2007-04-19 Jorg Schuler <jcsjcs at users.sourceforge.net>
 
+       * Multi-threaded background file conversion, first round
+
+2007-04-15 Jorg Schuler <jcsjcs at users.sourceforge.net>
+
        * src/mp3file.c: fixed "comparison with string literal" issues
          by using strcmp instead. Thanks to Petr Gajdos.
 

Index: gtkpod.glade
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/gtkpod.glade,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -d -r1.231 -r1.232
--- gtkpod.glade        15 Apr 2007 13:27:40 -0000      1.231
+++ gtkpod.glade        23 Apr 2007 15:33:29 -0000      1.232
@@ -51,7 +51,7 @@
                      <signal name="activate" handler="on_load_ipods_mi" 
last_modification_time="Sat, 20 May 2006 14:21:46 GMT"/>
 
                      <child internal-child="image">
-                       <widget class="GtkImage" id="image3858">
+                       <widget class="GtkImage" id="image3926">
                          <property name="visible">True</property>
                          <property name="pixbuf">gtkpod-read.png</property>
                          <property name="xalign">0.5</property>
@@ -71,7 +71,7 @@
                      <signal name="activate" handler="on_save_changes_mi" 
last_modification_time="Sat, 20 May 2006 14:22:12 GMT"/>
 
[...1537 lines suppressed...]
+       <placeholder/>
+      </child>
+
+      <child>
+       <widget class="GtkStatusbar" id="conversion_statusbar">
+         <property name="visible">True</property>
+         <property name="has_resize_grip">True</property>
+       </widget>
+       <packing>
+         <property name="padding">0</property>
+         <property name="expand">False</property>
+         <property name="fill">False</property>
+         <property name="pack_type">GTK_PACK_END</property>
+       </packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
 </glade-interface>


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2

Reply via email to