From: Jakob Haufe <sur5r@sur5r.net>
Date: Fri, 28 Sep 2012 23:49:20 +0000 (+0200)
Subject: Refresh proper-tempfiles
X-Git-Tag: debian/2.0-1~7
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8fd32edb7d4196ea411865652e30652c3bc99a43;p=minitube

Refresh proper-tempfiles
---

diff --git a/debian/patches/proper-tempfiles b/debian/patches/proper-tempfiles
index 44835c2..bc4d125 100644
--- a/debian/patches/proper-tempfiles
+++ b/debian/patches/proper-tempfiles
@@ -6,7 +6,7 @@ Author: Jakob Haufe <sur5r@sur5r.net>
 Bug-Debian: http://bugs.debian.org/644935
 
 diff --git a/src/temporary.cpp b/src/temporary.cpp
-index a979cbd..bebcd1f 100644
+index 362cbd8..bebcd1f 100644
 --- a/src/temporary.cpp
 +++ b/src/temporary.cpp
 @@ -1,7 +1,7 @@
@@ -18,7 +18,7 @@ index a979cbd..bebcd1f 100644
  #ifdef Q_WS_X11
  static QString userName;
  #endif
-@@ -10,41 +10,21 @@ Temporary::Temporary() { }
+@@ -10,43 +10,21 @@ Temporary::Temporary() { }
  
  QString Temporary::filename() {
  
@@ -38,6 +38,8 @@ index a979cbd..bebcd1f 100644
 -        tempFile += "-" + userName;
 -#endif
 -
+-    // tempFile += ".mp4";
+-
 -    if (QFile::exists(tempFile) && !QFile::remove(tempFile)) {
 -        qDebug() << "Cannot remove temp file" << tempFile;
 +    if (tempfiles.size() > 1) {