rev 3121 - in kde-extras/rsibreak/trunk/debian: . patches

[Tom Albers]

Author: tomalbers-guest
Date: 2006-02-12 21:17:58 +0000 (Sun, 12 Feb 2006)
New Revision: 3121

Added:
   kde-extras/rsibreak/trunk/debian/patches/12_fix_348900_do_not_follow_symlinks.diff
Modified:
   kde-extras/rsibreak/trunk/debian/changelog
Log:
Added 12_fix_348900_do_not_follow_symlinks.diff


Modified: kde-extras/rsibreak/trunk/debian/changelog
===================================================================
--- kde-extras/rsibreak/trunk/debian/changelog	2006-02-12 19:13:49 UTC (rev 3120)
+++ kde-extras/rsibreak/trunk/debian/changelog	2006-02-12 21:17:58 UTC (rev 3121)
@@ -2,6 +2,11 @@
 
   * NOT RELEASED YET
 
+  [ Tom Albers ]
+  * Updated copyright file
+  * patches/12_fix_348900_do_not_follow_symlinks.diff: do not follow
+    symlinks while searching for images (Closes: #348900)
+
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Tue, 10 Jan 2006 01:43:11 +0100
 
 rsibreak (0.4.0-1) unstable; urgency=low

Added: kde-extras/rsibreak/trunk/debian/patches/12_fix_348900_do_not_follow_symlinks.diff
===================================================================
--- kde-extras/rsibreak/trunk/debian/patches/12_fix_348900_do_not_follow_symlinks.diff	2006-02-12 19:13:49 UTC (rev 3120)
+++ kde-extras/rsibreak/trunk/debian/patches/12_fix_348900_do_not_follow_symlinks.diff	2006-02-12 21:17:58 UTC (rev 3121)
@@ -0,0 +1,29 @@
+Index: src/rsiwidget.cpp
+===================================================================
+--- rsibreak-0.4.0/rsibreak/src/rsiwidget.cpp	(revision 508830)
++++  rsibreak-0.4.0/rsibreak/src/rsiwidget.cpp	(working copy)
+@@ -225,11 +225,6 @@
+ 
+     QDir dir( folder);
+ 
+-    // TODO: make an automated filter, maybe with QImageIO.
+-    QString ext("*.png *.jpg *.jpeg *.tif *.tiff *.gif *.bmp *.xpm *.ppm *.pnm *.xcf *.pcx");
+-    dir.setNameFilter(ext + " " + ext.upper());
+-    dir.setMatchAllDirs ( true );
+-
+     if ( !dir.exists() or !dir.isReadable() )
+     {
+         kdWarning() << "Folder does not exist or is not readable: "
+@@ -237,6 +232,12 @@
+         return;
+     }
+ 
++    // TODO: make an automated filter, maybe with QImageIO.
++    QString ext("*.png *.jpg *.jpeg *.tif *.tiff *.gif *.bmp *.xpm *.ppm *.pnm *.xcf *.pcx");
++    dir.setNameFilter(ext + " " + ext.upper());
++    dir.setFilter(QDir::Dirs | QDir::Files | QDir::NoSymLinks );
++    dir.setMatchAllDirs ( true );
++
+     const QFileInfoList *list = dir.entryInfoList();
+     if (!list)
+         return;