[Spice-commits] 2 commits - NEWS client/application.cpp client/application.h client/gui configure.ac server/spice.h

[Hans de Goede]

 NEWS                   |    7 ++++++-
 client/application.cpp |    2 --
 client/application.h   |    2 +-
 client/gui/gui.cpp     |    4 ++--
 configure.ac           |    2 +-
 server/spice.h         |    2 +-
 6 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 023d9c0d9118afe64ef17295cd683594413bd36e
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Oct 18 14:52:43 2010 +0200

    Release 0.6.3

diff --git a/NEWS b/NEWS
index 75a8f09..f160f67 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Major changes in 0.6.2:
+Major changes in 0.6.3:
 =======================
 Major changes in this release:
 * Foreign menu and controller support for the client for XPI / ActiveX
@@ -8,6 +8,11 @@ Major changes in this release:
 * Fix fullscreen mode of the X client under compiz and KDE
 * Various portability and bug fixes
 
+Major changes in 0.6.2:
+=======================
+0.6.2 was skipped because a small but nasty bug was found while preparing
+the release (and it was already tagged as 0.6.2 in git).
+
 Major changes in 0.6.1:
 =======================
 Major changes in this release:
diff --git a/configure.ac b/configure.ac
index 91f4b14..0ab6dd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.57])
 
 m4_define([SPICE_MAJOR], 0)
 m4_define([SPICE_MINOR], 6)
-m4_define([SPICE_MICRO], 2)
+m4_define([SPICE_MICRO], 3)
 
 AC_INIT(spice, [SPICE_MAJOR.SPICE_MINOR.SPICE_MICRO], [], spice)
 
diff --git a/server/spice.h b/server/spice.h
index 61a168b..898a32d 100644
--- a/server/spice.h
+++ b/server/spice.h
@@ -21,7 +21,7 @@
 #include <stdint.h>
 #include <sys/socket.h>
 
-#define SPICE_SERVER_VERSION 0x000602 /* release 0.6.2 */
+#define SPICE_SERVER_VERSION 0x000603 /* release 0.6.3 */
 
 /* interface base type */
 
commit df6df8e58720b7cc4ef41b73a09abd1577556407
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Oct 18 14:43:06 2010 +0200

    Make the gui use Application::hide_gui rather then hide_me
    
    Now that Application::hide_me actually does what the name suggests
    (hide the entire client, ie all client windows), the gui using it to
    not show the gui layer leads to the entire client disappearing when
    one presses close in the GUI or dismisses a GUI dialog. This patch makes
    the GUI code call hide_gui instead of hide_me, fixing this.

diff --git a/client/application.cpp b/client/application.cpp
index 15916f7..212b20e 100644
--- a/client/application.cpp
+++ b/client/application.cpp
@@ -1786,8 +1786,6 @@ void Application::show_me(bool full_screen)
 
 void Application::hide_me()
 {
-//  hide_gui();
-//  FIXME: this instead?
     if (_full_screen) {
         exit_full_screen();
     }
diff --git a/client/application.h b/client/application.h
index 2cff2d5..c01e08b 100644
--- a/client/application.h
+++ b/client/application.h
@@ -254,6 +254,7 @@ public:
 
 #ifdef USE_GUI
     bool is_disconnect_allowed();
+    void hide_gui();
 #endif
 
     const std::string& get_host();
@@ -318,7 +319,6 @@ private:
     void attach_gui_barriers();
     void detach_gui_barriers();
     void show_gui();
-    void hide_gui();
     void create_gui_barrier(RedScreen& screen, int id);
     void destroyed_gui_barrier(int id);
     void destroyed_gui_barriers();
diff --git a/client/gui/gui.cpp b/client/gui/gui.cpp
index 9152ff1..f1ca13d 100644
--- a/client/gui/gui.cpp
+++ b/client/gui/gui.cpp
@@ -420,7 +420,7 @@ void GUI::Dialog::handle_message_click(int id)
     }
 
     if (_close_on_message_click) {
-        application().hide_me();
+        application().hide_gui();
     }
 }
 
@@ -840,7 +840,7 @@ public:
 bool SettingsDialog::handle_close(const CEGUI::EventArgs& e)
 {
     DBG(0, "");
-    application().hide_me();
+    application().hide_gui();
     return true;
 }