[Spice-commits] 2 commits - gtk/spice-util.c spice-common

[Marc-André Lureau]

 gtk/spice-util.c |   12 ++++++++++++
 spice-common     |    2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit ec4787ad2b51de26535c29ea56ffa992887f20bd
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Sun Nov 3 16:56:09 2013 +0100

    util: document spice_uuid_to_string

diff --git a/gtk/spice-util.c b/gtk/spice-util.c
index e7c2dd7..1f35629 100644
--- a/gtk/spice-util.c
+++ b/gtk/spice-util.c
@@ -123,6 +123,16 @@ gboolean spice_strv_contains(const GStrv strv, const gchar *str)
     return FALSE;
 }
 
+/**
+ * spice_uuid_to_string:
+ * @uuid: UUID byte array
+ *
+ * Creates a string representation of @uuid, of the form
+ * "06e023d5-86d8-420e-8103-383e4566087a"
+ *
+ * Returns: A string that should be freed with g_free().
+ * Since: 0.22
+ **/
 gchar* spice_uuid_to_string(const guint8 uuid[16])
 {
     return g_strdup_printf(UUID_FMT, uuid[0], uuid[1],
commit 113b26b8ca1b64bb91b627817a28db92e3cda6fc
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Sun Oct 20 23:59:10 2013 +0200

    util: do not overwrite G_MESSAGES_DEBUG=all
    
    glib log handler only check for a single 'all' value, mixing it with
    other domains name will disable 'all' messages.

diff --git a/gtk/spice-util.c b/gtk/spice-util.c
index a76ffcc..e7c2dd7 100644
--- a/gtk/spice-util.c
+++ b/gtk/spice-util.c
@@ -48,6 +48,8 @@ static void spice_util_enable_debug_messages(void)
     const gchar *doms = g_getenv("G_MESSAGES_DEBUG");
     if (!doms) {
         g_setenv("G_MESSAGES_DEBUG", G_LOG_DOMAIN, 1);
+    } else if (g_str_equal(doms, "all")) {
+	return;
     } else if (!strstr(doms, G_LOG_DOMAIN)) {
         gchar *newdoms = g_strdup_printf("%s %s", doms, G_LOG_DOMAIN);
         g_setenv("G_MESSAGES_DEBUG", newdoms, 1);
diff --git a/spice-common b/spice-common
index f88e851..8705f24 160000
--- a/spice-common
+++ b/spice-common
@@ -1 +1 @@
-Subproject commit f88e851ed684f25d325e610b3ac2db2d6bc30848
+Subproject commit 8705f2438b450a35c0274fb864c8a604734c23db