[Spice-commits] 3 commits - gtk/channel-main.c gtk/smartcard-manager.c gtk/spice-channel.h gtk/spice-option.c gtk/spice-session.c gtk/spice-session.h spice-common
Marc-André Lureau
elmarco at kemper.freedesktop.org
Mon Jan 28 08:07:33 PST 2013
gtk/channel-main.c | 6 ++++--
gtk/smartcard-manager.c | 8 ++++----
gtk/spice-channel.h | 1 -
gtk/spice-option.c | 2 +-
gtk/spice-session.c | 17 +++++++++--------
gtk/spice-session.h | 2 --
spice-common | 2 +-
7 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 2db9b8dd037e22d2b04e8e2aeecfd685524b7fef
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date: Mon Jan 28 17:06:47 2013 +0100
Fix a bunch of gtkdoc/giscan warnings
diff --git a/gtk/channel-main.c b/gtk/channel-main.c
index a64aa89..40d27cc 100644
--- a/gtk/channel-main.c
+++ b/gtk/channel-main.c
@@ -593,7 +593,8 @@ static void spice_main_channel_class_init(SpiceMainChannelClass *klass)
* SpiceMainChannel::main-clipboard-request:
* @main: the #SpiceMainChannel that emitted the signal
* @types: the VD_AGENT_CLIPBOARD request type
- * Returns: %TRUE if the request is successful
+ *
+ * Return value: %TRUE if the request is successful
*
* Request clipbard data from the client.
*
@@ -614,7 +615,8 @@ static void spice_main_channel_class_init(SpiceMainChannelClass *klass)
* SpiceMainChannel::main-clipboard-selection-request:
* @main: the #SpiceMainChannel that emitted the signal
* @types: the VD_AGENT_CLIPBOARD request type
- * Returns: %TRUE if the request is successful
+ *
+ * Return value: %TRUE if the request is successful
*
* Request clipbard data from the client.
*
diff --git a/gtk/smartcard-manager.c b/gtk/smartcard-manager.c
index 8e22e6c..ab3229f 100644
--- a/gtk/smartcard-manager.c
+++ b/gtk/smartcard-manager.c
@@ -241,7 +241,7 @@ static SpiceSmartcardManager *spice_smartcard_manager_new(void)
/* public api */
/**
- * spice_smartcard_manager_get
+ * spice_smartcard_manager_get:
*
* #SpiceSmartcardManager is a singleton, use this function to get a pointer
* to it. A new SpiceSmartcardManager instance will be created the first
@@ -397,7 +397,7 @@ static guint smartcard_monitor_add(SmartcardSourceFunc callback,
#define SPICE_SOFTWARE_READER_NAME "Spice Software Smartcard"
/**
- * spice_smartcard_reader_is_software
+ * spice_smartcard_reader_is_software:
* @reader: a #SpiceSmartcardReader
*
* Tests if @reader is a software (emulated) smartcard reader.
@@ -528,7 +528,7 @@ gboolean spice_smartcard_manager_init_finish(SpiceSession *session,
}
/**
- * spice_smartcard_manager_insert_card
+ * spice_smartcard_manager_insert_card:
* @manager: a #SpiceSmartcardManager
*
* Simulates the insertion of a smartcard in the guest. Valid certificates
@@ -552,7 +552,7 @@ gboolean spice_smartcard_manager_insert_card(SpiceSmartcardManager *manager)
}
/**
- * spice_smartcard_manager_remove_card
+ * spice_smartcard_manager_remove_card:
* @manager: a #SpiceSmartcardManager
*
* Simulates the removal of a smartcard in the guest. At the moment, only
diff --git a/gtk/spice-channel.h b/gtk/spice-channel.h
index 52ecd97..4b2af33 100644
--- a/gtk/spice-channel.h
+++ b/gtk/spice-channel.h
@@ -37,7 +37,6 @@ typedef struct _SpiceMsgOut SpiceMsgOut;
/**
* SpiceChannelEvent:
- *
* @SPICE_CHANNEL_NONE: no event, or ignored event
* @SPICE_CHANNEL_OPENED: connection is authentified and ready
* @SPICE_CHANNEL_CLOSED: connection is closed normally (sent if channel was ready)
diff --git a/gtk/spice-option.c b/gtk/spice-option.c
index 56ec795..9ae1381 100644
--- a/gtk/spice-option.c
+++ b/gtk/spice-option.c
@@ -115,7 +115,7 @@ static gboolean parse_usbredir_filter(const gchar *option_name,
/**
- * spice_get_option_group:
+ * spice_get_option_group: (skip)
*
* Returns: (transfer full): a #GOptionGroup for the commandline
* arguments specific to Spice. You have to call
diff --git a/gtk/spice-session.c b/gtk/spice-session.c
index fac7682..0e405bc 100644
--- a/gtk/spice-session.c
+++ b/gtk/spice-session.c
@@ -894,7 +894,7 @@ static void spice_session_class_init(SpiceSessionClass *klass)
* hardware smartcard reader. If it's set to a NULL-terminated string
* array containing the names of 3 valid certificates, these will be
* used to simulate a smartcard in the guest
- * @see_also: spice_smartcard_manager_insert_card()
+ * See also spice_smartcard_manager_insert_card()
*
* Since: 0.7
**/
@@ -944,7 +944,7 @@ static void spice_session_class_init(SpiceSessionClass *klass)
G_PARAM_STATIC_STRINGS));
/**
- * SpiceSession::inhibit-keyboard-grab
+ * SpiceSession::inhibit-keyboard-grab:
*
* This boolean is set by the usbredir channel to indicate to #SpiceDisplay
* that the keyboard grab should be temporarily released, because it is
diff --git a/gtk/spice-session.h b/gtk/spice-session.h
index 4895288..b07f525 100644
--- a/gtk/spice-session.h
+++ b/gtk/spice-session.h
@@ -34,7 +34,6 @@ G_BEGIN_DECLS
/**
* SpiceSessionVerify:
- *
* @SPICE_SESSION_VERIFY_PUBKEY: verify certificate public key matching
* @SPICE_SESSION_VERIFY_HOSTNAME: verify certificate hostname matching
* @SPICE_SESSION_VERIFY_SUBJECT: verify certificate subject matching
@@ -49,7 +48,6 @@ typedef enum {
/**
* SpiceSessionMigration:
- *
* @SPICE_SESSION_MIGRATION_NONE: no migration going on
* @SPICE_SESSION_MIGRATION_SWITCHING: the session is switching host (destroy and reconnect)
* @SPICE_SESSION_MIGRATION_MIGRATING: the session is migrating seamlessly (reconnect)
commit 33db6b6c7d843f3b43ef79337e40466eceb2d04f
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date: Mon Jan 28 15:46:16 2013 +0100
Update spice-common
diff --git a/spice-common b/spice-common
index 8a10919..c08e04b 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit 8a10919658950aa600bd5fcaf12c28b026fd70ad
+Subproject commit c08e04b478376e9503ea62b5a09ea679dc16c220
commit aca8a36469413776fe96f16f032d22013ac079b6
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date: Wed Jan 23 18:32:57 2013 +0100
session: simplify a little bit open_host_idle_cb
open_host->error is only set if we try to use a proxy. Let´s make that
more clear.
diff --git a/gtk/spice-session.c b/gtk/spice-session.c
index f1d6250..fac7682 100644
--- a/gtk/spice-session.c
+++ b/gtk/spice-session.c
@@ -1675,17 +1675,18 @@ static gboolean open_host_idle_cb(gpointer data)
#if GLIB_CHECK_VERSION(2,26,0)
open_host->proxy = get_proxy(&open_host->error);
- if (open_host->proxy) {
+ if (open_host->error != NULL) {
+ coroutine_yieldto(open_host->from, NULL);
+ return FALSE;
+ }
+
+ if (open_host->proxy)
g_resolver_lookup_by_name_async(g_resolver_get_default(),
spice_proxy_get_hostname(open_host->proxy),
open_host->cancellable,
proxy_lookup_ready, open_host);
- } else
+ else
#endif
- if (open_host->error != NULL) {
- coroutine_yieldto(open_host->from, NULL);
- return FALSE;
- } else
open_host_connectable_connect(open_host,
g_network_address_new(s->host, open_host->port));
More information about the Spice-commits
mailing list