[Spice-commits] 3 commits - src/channel-display.c src/spice-widget.c src/spicy.c

[Pavel Grunt]

 src/channel-display.c |    6 +++++-
 src/spice-widget.c    |   12 ------------
 src/spicy.c           |    2 +-
 3 files changed, 6 insertions(+), 14 deletions(-)

New commits:
commit 923d74b5a7949cff6a4c46512091ed6e530618cb
Author: Pavel Grunt <pgrunt at redhat.com>
Date:   Wed Mar 16 14:46:53 2016 +0100

    spicy: s/Automagic/Automatic/
    
    Acked-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>

diff --git a/src/spicy.c b/src/spicy.c
index 12ae653..a3f357a 100644
--- a/src/spicy.c
+++ b/src/spicy.c
@@ -738,7 +738,7 @@ static const GtkToggleActionEntry tentries[] = {
         .callback    = G_CALLBACK(menu_cb_bool_prop),
     },{
         .name        = "auto-clipboard",
-        .label       = "Automagic clipboard sharing between host and guest",
+        .label       = "Automatic clipboard sharing between host and guest",
         .callback    = G_CALLBACK(menu_cb_bool_prop),
     },{
         .name        = "auto-usbredir",
commit ff3380d406b751897acb3767b2ec1c82c3edd747
Author: Pavel Grunt <pgrunt at redhat.com>
Date:   Wed Mar 16 14:46:52 2016 +0100

    spice-display: Remove auto-clipboard notify
    
    It was used to notify the (deprecated) auto-clipboard property of
    the SpiceDisplay everytime the SpiceGtkSession emits its auto-clipboard
    notify.
    
    The commit 70a00b8fcc2ca85d3601f6ac4895f906f9032e77 removed the property
    from SpiceDisplay causing a runtime warning:
    
    GLib-GObject-WARNING **: g_object_notify: object class 'SpiceDisplay' has no property named 'auto-clipboard'
    Acked-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>

diff --git a/src/spice-widget.c b/src/spice-widget.c
index f86054f..30426be 100644
--- a/src/spice-widget.c
+++ b/src/spice-widget.c
@@ -390,15 +390,6 @@ static void spice_display_set_property(GObject      *object,
     }
 }
 
-static void gtk_session_property_changed(GObject    *gobject,
-                                         GParamSpec *pspec,
-                                         gpointer    user_data)
-{
-    SpiceDisplay *display = user_data;
-
-    g_object_notify(G_OBJECT(display), g_param_spec_get_name(pspec));
-}
-
 static void session_inhibit_keyboard_grab_changed(GObject    *gobject,
                                                   GParamSpec *pspec,
                                                   gpointer    user_data)
@@ -689,9 +680,6 @@ spice_display_constructor(GType                  gtype,
     }
     g_list_free(list);
 
-    spice_g_signal_connect_object(d->gtk_session, "notify::auto-clipboard",
-                                  G_CALLBACK(gtk_session_property_changed), display, 0);
-
     spice_g_signal_connect_object(d->session, "notify::inhibit-keyboard-grab",
                                   G_CALLBACK(session_inhibit_keyboard_grab_changed),
                                   display, 0);
commit c0c721bbaae50d3ad1991d22df1c4397f24f7acb
Author: Pavel Grunt <pgrunt at redhat.com>
Date:   Wed Mar 16 14:46:51 2016 +0100

    display: Lower level of warning for empty monitor config
    
    It is a valid case when a guest requests to turn off monitors, eg:
     xrandr --output Virtual-0 --off
    
    Related:
    https://bugzilla.redhat.com/show_bug.cgi?id=1061942
    
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/src/channel-display.c b/src/channel-display.c
index cdaba9d..f576679 100644
--- a/src/channel-display.c
+++ b/src/channel-display.c
@@ -1813,7 +1813,11 @@ static void display_handle_monitors_config(SpiceChannel *channel, SpiceMsgIn *in
     guint i;
 
     g_return_if_fail(config != NULL);
-    g_return_if_fail(config->count > 0);
+
+    if (config->count == 0) {
+        CHANNEL_DEBUG(channel, "received empty monitor config");
+        return;
+    }
 
     CHANNEL_DEBUG(channel, "received new monitors config from guest: n: %d/%d", config->count, config->max_allowed);