rev 3259 - in people/dato/packages/trunk/amarok/debian: . patches

[Adeodato Simó]

Author: adeodato
Date: 2006-03-06 04:16:41 +0000 (Mon, 06 Mar 2006)
New Revision: 3259

Modified:
   people/dato/packages/trunk/amarok/debian/changelog
   people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch
Log:
Fix the main.cpp patch that overwrites argv[0].


Modified: people/dato/packages/trunk/amarok/debian/changelog
===================================================================
--- people/dato/packages/trunk/amarok/debian/changelog	2006-03-06 03:49:53 UTC (rev 3258)
+++ people/dato/packages/trunk/amarok/debian/changelog	2006-03-06 04:16:41 UTC (rev 3259)
@@ -4,6 +4,10 @@
     - aRts engine (the amarok-arts package disappears).
     - GStreamer 0.8 support (amarok-gstreamer now pulls GStreamer 0.10).
 
+  * Use strncpy instead of qstrdup in the patch for main.cpp, so that argv[0]
+    is overwritten correctly. This closes: #352171 (amaroK not remembering the
+    desktop it was on upon login), and incidentally makes Erich Schubert happy.
+
   * Drop build-dependency on libgtk2.0-dev now that #353590 is fixed.
 
  -- Adeodato Simó <dato at net.com.org.es>  Mon,  6 Mar 2006 03:39:30 +0100

Modified: people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch	2006-03-06 03:49:53 UTC (rev 3258)
+++ people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch	2006-03-06 04:16:41 UTC (rev 3259)
@@ -54,7 +54,7 @@
      aboutData.addCredit( "Sven Krohlas", I18N_NOOP( "roKymoter (sven423)" ), "sven at asbest-online.de" );
      aboutData.addCredit( "Whitehawk Stormchaser", I18N_NOOP( "Tester, patches" ), "zerokode at gmx.net" );
  
-+    argv[0] = qstrdup( "amarok" );
++    strncpy(argv[0], "amarok", strlen(argv[0]));
 +
      KApplication::disableAutoDcopRegistration();