[Spice-commits] 2 commits - client/application.cpp server/smartcard.h

[Christophe Fergau]

 client/application.cpp |    2 +-
 server/smartcard.h     |    2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit f045886a0623fcec38c390c31570971b4fb8d2d5
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Mon Jul 18 20:32:39 2011 +0200

    remove unused function

diff --git a/server/smartcard.h b/server/smartcard.h
index cc74d9b..e7fa457 100644
--- a/server/smartcard.h
+++ b/server/smartcard.h
@@ -29,7 +29,5 @@
 int smartcard_device_connect(SpiceCharDeviceInstance *char_device);
 void smartcard_device_disconnect(SpiceCharDeviceInstance *char_device);
 
-void smartcard_channel_init(void);
-
 #endif // __SMART_CARD_H__
 
commit b8a1de32749fe536b331ca69c04e4d9b85e7e30d
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Tue Jul 19 13:26:05 2011 +0200

    client: add missing "," in option list
    
    In commit 44073d1b38e2 - client: improve WAN option description
    one "," was missing at the end of the line. Since the next argument
    was a string too, gcc silently concatenated them, and thanks to C++
    polymorphic functions, the compiler didn't complain about the
    missing argument, so it went unnoticed.
    The effects are pretty bad though, since it prevents spicec from
    running because it thinks command line parsing fails.

diff --git a/client/application.cpp b/client/application.cpp
index 18101a5..5ebcce7 100644
--- a/client/application.cpp
+++ b/client/application.cpp
@@ -2276,7 +2276,7 @@ bool Application::process_cmd_line(int argc, char** argv, bool &full_screen)
     parser.add(SPICE_OPT_CANVAS_TYPE, "canvas-type", "set rendering canvas", "canvas_type", true);
     parser.set_multi(SPICE_OPT_CANVAS_TYPE, ',');
 
-    parser.add(SPICE_OPT_DISPLAY_COLOR_DEPTH, "color-depth", "guest display color depth (if supported by the guest vdagent)"
+    parser.add(SPICE_OPT_DISPLAY_COLOR_DEPTH, "color-depth", "guest display color depth (if supported by the guest vdagent)",
                "16/32", true);
 
     parser.add(SPICE_OPT_DISABLE_DISPLAY_EFFECTS, "disable-effects",