[X2Go-Commits] [x2goclient] 06/08: onmainwindow.cpp: fix compile error triggered by a missing parenthesis/typo.

git-admin at x2go.org git-admin at x2go.org
Mon May 11 07:02:31 CEST 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/translation
in repository x2goclient.

commit 2df78cd9c2b127be77e4d662d7eef5f05181dc15
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon May 11 07:00:06 2015 +0200

    onmainwindow.cpp: fix compile error triggered by a missing parenthesis/typo.
---
 debian/changelog     |    2 ++
 src/onmainwindow.cpp |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 11da0d3..471c601 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -390,6 +390,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
     - onmainwindow.cpp: correctly call QLocale::uiLanguages ().
     - onmainwindow.cpp: copy strings before manipulating them.
     - onmainwindow.h: make get_translator() const. Does not change any state.
+    - onmainwindow.cpp: fix compile error triggered by a missing
+      parenthesis/typo.
 
   [ Fernando Pedemonte ]
   * New upstream release (4.0.4.0):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index df555b8..76c210d 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -584,7 +584,7 @@ bool ONMainWindow::get_translator (QString file_name_start, QTranslator **transl
     bool translator_found = false;
     for (QStringList::const_iterator it = ui_languages.constBegin (); it != ui_languages.constEnd (); ++it) {
         /* Respect English locales. Don't try to load any translation, because we do not ship nop-English translations. */
-        if (*it.startsWith ("en") {
+        if ((*it).startsWith ("en")) {
             x2goWarningf (1) << tr ("English language requested, not loading translator");
             break;
         }
@@ -592,7 +592,7 @@ bool ONMainWindow::get_translator (QString file_name_start, QTranslator **transl
             load_filename = filename;
             load_filename.append ("_").append (*it);
 
-            if (tmp_ranslator->load (load_filename) {
+            if (tmp_translator->load (load_filename)) {
                 /* Some translation successfully loaded. That's good enough. */
                 x2goInfof (4) << tr ("Translator: ") + load_filename.toAscii () + tr (" found.");
                 translator_found = true;

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list