rev 8532 - in kde-extras/amarok/trunk/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2007-12-25 23:15:52 +0000 (Tue, 25 Dec 2007)
New Revision: 8532

Added:
   kde-extras/amarok/trunk/debian/patches/11_bug403340_cancel_rename_when_deleting_items.diff
Modified:
   kde-extras/amarok/trunk/debian/changelog
   kde-extras/amarok/trunk/debian/patches/series
Log:
Developed a patch for Debian #403340 / KDE #147587

Modified: kde-extras/amarok/trunk/debian/changelog
===================================================================
--- kde-extras/amarok/trunk/debian/changelog	2007-12-25 23:06:23 UTC (rev 8531)
+++ kde-extras/amarok/trunk/debian/changelog	2007-12-25 23:15:52 UTC (rev 8532)
@@ -1,4 +1,4 @@
-amarok (1.4.8-2~pre1) unstable; urgency=low
+amarok (1.4.8-2~pre2) unstable; urgency=low
 
   * Remove amarok-gstreamer.install because there is no gstreamer engine
     anymore.
@@ -26,8 +26,8 @@
       never allowed (Closes: #432219).
     - Downgrade amarok-engines to amarok Suggests.
     - Convert amarok-engines package to arch:all as it's a metapackage. Edit
-      amarok-engines description because it's longer going to be installed by
-      default.
+      amarok-engines description because it's no longer going to be installed
+       by default.
   * Add "Homepage" field in debian/control, remove homepage reference from
     amarok description.
   * Disable /usr/share/doc/amarok-* symlinks in debian/rules. They just
@@ -37,8 +37,12 @@
     dependency and gets installed anyway.
   * Prepend sequence number to the filenames of debian/patches. Edit
     debian/patches/series accordingly.
+  * New patches:
+    - 11_bug403340_cancel_rename_when_deleting_items.diff - cancel a pending
+      'rename' request for the playlist item that has just been deleted
+      (Closes: #403340).
 
- -- Modestas Vainius <modestas at vainius.eu>  Wed, 26 Dec 2007 00:09:17 +0200
+ -- Modestas Vainius <modestas at vainius.eu>  Wed, 26 Dec 2007 00:26:44 +0200
 
 amarok (1.4.8-1) unstable; urgency=low
 

Added: kde-extras/amarok/trunk/debian/patches/11_bug403340_cancel_rename_when_deleting_items.diff
===================================================================
--- kde-extras/amarok/trunk/debian/patches/11_bug403340_cancel_rename_when_deleting_items.diff	                        (rev 0)
+++ kde-extras/amarok/trunk/debian/patches/11_bug403340_cancel_rename_when_deleting_items.diff	2007-12-25 23:15:52 UTC (rev 8532)
@@ -0,0 +1,15 @@
+--- amarok/src/playlist.cpp	2007-12-25 23:53:35.000000000 +0200
++++ amarok/src/playlist.cpp	2007-12-26 00:00:38.000000000 +0200
+@@ -4382,6 +4382,12 @@
+             setStopAfterMode( DoNotStop );
+     }
+ 
++    //cancel rename if it is pending (Bug: #147587)
++    if ( m_itemToRename == item ) {
++        m_clicktimer->stop();
++        m_itemToRename = 0;
++    }
++
+     //keep m_nextTracks queue synchronized
+     if( m_nextTracks.removeRef( item ) && !multi )
+        emit queueChanged( PLItemList(), PLItemList( item ) );

Modified: kde-extras/amarok/trunk/debian/patches/series
===================================================================
--- kde-extras/amarok/trunk/debian/patches/series	2007-12-25 23:06:23 UTC (rev 8531)
+++ kde-extras/amarok/trunk/debian/patches/series	2007-12-25 23:15:52 UTC (rev 8532)
@@ -4,3 +4,4 @@
 04_gmo_files_at_build_time.patch -p0
 05_disable-final.diff -p0
 10_queuemedia.patch -p0
+11_bug403340_cancel_rename_when_deleting_items.diff -p0