Changeset 121 for smplayer/vendor/current/src/paths.cpp

Timestamp:

Mar 15, 2012, 5:14:10 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer 0.7.1: vendor update

File:

• smplayer/vendor/current/src/paths.cpp (modified) (4 diffs)

smplayer/vendor/current/src/paths.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2012 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -103 +103 @@
 }
 
-QString Paths::doc(QString file, QString locale) {
+QString Paths::doc(QString file, QString locale, bool english_fallback) {
         if (locale.isEmpty()) {
                 locale = QLocale::system().name();
@@ -119 +119 @@
         }
 
-        f = docPath() + "/en/" + file;
-        return f;
+        if (english_fallback) {
+                f = docPath() + "/en/" + file;
+                return f;
+        }
+
+        return QString::null;
 }
 
@@ -137 +141 @@
                 const char * XDG_CONFIG_HOME = getenv("XDG_CONFIG_HOME");
                 if (XDG_CONFIG_HOME!=NULL) {
-                        qDebug("Paths::configPath: XDG_CONFIG_HOME: %s", XDG_CONFIG_HOME);
+                        /* qDebug("Paths::configPath: XDG_CONFIG_HOME: %s", XDG_CONFIG_HOME); */
                         return QString(XDG_CONFIG_HOME) + "/smplayer";
                 }