[X2Go-Commits] [x2goclient] 233/276: src/onmainwindow.h: move generateKey () declaration around.

git-admin at x2go.org git-admin at x2go.org
Sat Dec 31 01:35:32 CET 2016


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

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

commit d9e96a2fa0a85580d43b8b1e83c21597b858a4e2
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Sep 24 04:25:39 2016 +0200

    src/onmainwindow.h: move generateKey () declaration around.
---
 debian/changelog   |    1 +
 src/onmainwindow.h |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0af7275..95782c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -421,6 +421,7 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
       Returns the default key size in bits for the selected key type, after
       checking for validity.
     - src/onmainwindow.cpp: use the new functions in generateKey ().
+    - src/onmainwindow.h: move generateKey () declaration around.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.0.5.3):
diff --git a/src/onmainwindow.h b/src/onmainwindow.h
index d01d789..a952da2 100644
--- a/src/onmainwindow.h
+++ b/src/onmainwindow.h
@@ -1204,7 +1204,6 @@ private:
 #endif
     void filterDesktops ( const QString& filter,
                           bool strict=false );
-    QString generateKey(key_types key_type, bool host_key = false);
     void generateEtcFiles();
     QString u3DataPath();
     void cleanPortable();
@@ -1220,6 +1219,7 @@ private:
     key_types check_key_type (key_types key_type);
     QString key_type_to_string (key_types key_type);
     std::size_t default_size_for_key_type (key_types key_type);
+    QString generateKey(key_types key_type, bool host_key = false);
 
 ////////////////plugin stuff////////////////////
 #ifdef CFGPLUGIN

--
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