diff options
| author | Tim Williams <tmw@autotrain.org> | 2011-10-17 18:47:27 +0100 |
|---|---|---|
| committer | Tim Williams <tmw@autotrain.org> | 2011-10-17 18:47:27 +0100 |
| commit | 76ef832ce5348d12a871223d4c034c7daeaddb82 (patch) | |
| tree | 7024a1f39a6114daa8c5ed24bb31a8687c832b9a /mandriva/2010.2/kdegraphics/kdegraphics-3.5.12-ksnapshot-use-xdg-dir.patch | |
| parent | ec2515f058c60d2478a549f58376db628ba556b9 (diff) | |
| download | tde-packaging-76ef832ce5348d12a871223d4c034c7daeaddb82.tar.gz tde-packaging-76ef832ce5348d12a871223d4c034c7daeaddb82.zip | |
Adding the remaining Mandriva patches and spec files
Diffstat (limited to 'mandriva/2010.2/kdegraphics/kdegraphics-3.5.12-ksnapshot-use-xdg-dir.patch')
| -rw-r--r-- | mandriva/2010.2/kdegraphics/kdegraphics-3.5.12-ksnapshot-use-xdg-dir.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/mandriva/2010.2/kdegraphics/kdegraphics-3.5.12-ksnapshot-use-xdg-dir.patch b/mandriva/2010.2/kdegraphics/kdegraphics-3.5.12-ksnapshot-use-xdg-dir.patch new file mode 100644 index 000000000..8565ff3d4 --- /dev/null +++ b/mandriva/2010.2/kdegraphics/kdegraphics-3.5.12-ksnapshot-use-xdg-dir.patch @@ -0,0 +1,52 @@ +--- ksnapshot/ksnapshot.cpp.orig 2007-11-28 22:13:20.000000000 +0800 ++++ ksnapshot/ksnapshot.cpp 2007-11-28 22:21:29.000000000 +0800 +@@ -41,6 +41,8 @@ + #include <tqpainter.h> + #include <tqpaintdevicemetrics.h> + #include <tqwhatsthis.h> ++#include <tqtextcodec.h> ++#include <tqtextstream.h> + + #include <stdlib.h> + +@@ -58,6 +60,31 @@ + + #define kApp KApplication::kApplication() + ++// helper function for reading xdg user dirs: it is required in order to take ++// care of locale stuff ++TQString readXdgUserDirs() ++{ ++ TQFile f( TQDir::homeDirPath() + "/.config/user-dirs.dirs" ); ++ ++ TQString picturesDir = TQDir::currentDirPath(); ++ if (!f.open(IO_ReadOnly)) ++ return(picturesDir); ++ ++ // set the codec for the current locale ++ TQTextStream s(&f); ++ s.setCodec( TQTextCodec::codecForLocale() ); ++ ++ TQString line = s.readLine(); ++ while (!line.isNull()) ++ { ++ if (line.startsWith("XDG_PICTURES_DIR=")) ++ picturesDir = line.remove("XDG_PICTURES_DIR=").remove("\"").replace("$HOME", QDir::homeDirPath()); ++ ++ line = s.readLine(); ++ } ++ return(picturesDir); ++} ++ + KSnapshot::KSnapshot(TQWidget *parent, const char *name, bool grabCurrent) + : DCOPObject("interface"), + KDialogBase(parent, name, true, TQString::null, Help|User1, User1, +@@ -99,7 +126,7 @@ + mainWidget->setDelay(conf->readNumEntry("delay",0)); + mainWidget->setMode( conf->readNumEntry( "mode", 0 ) ); + mainWidget->setIncludeDecorations(conf->readBoolEntry("includeDecorations",true)); +- filename = KURL::fromPathOrURL( conf->readPathEntry( "filename", TQDir::currentDirPath()+"/"+i18n("snapshot")+"1.png" )); ++ filename = KURL::fromPathOrURL( conf->readPathEntry( "filename", readXdgUserDirs()+"/"+i18n("snapshot")+"1.png" )); + + // Make sure the name is not already being used + while(KIO::NetAccess::exists( filename, false, this )) { |