[Spice-commits] 2 commits - src/spice-session.c src/spice-widget.c

[GitLab Mirror]

 src/spice-session.c |   24 +++++++++++-------------
 src/spice-widget.c  |    2 +-
 2 files changed, 12 insertions(+), 14 deletions(-)

New commits:
commit db59d50f5c44a59d5d16648fde2ca286aa563382
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Fri Sep 6 15:16:51 2019 +0100

    Use g_clear_object instead of g_clear_pointer if possible
    
    If the pointer is freed with g_object_unref the two do the
    same.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Signed-off-by: Snir Sheriber <ssheribe at redhat.com>

diff --git a/src/spice-session.c b/src/spice-session.c
index 37f8693..6e533e8 100644
--- a/src/spice-session.c
+++ b/src/spice-session.c
@@ -1831,7 +1831,7 @@ void spice_session_abort_migration(SpiceSession *session)
 end:
     g_clear_pointer(&s->migration_left, g_list_free);
     session_disconnect(s->migration, FALSE);
-    g_clear_pointer(&s->migration, g_object_unref);
+    g_clear_object(&s->migration);
 
     s->migrate_wait_init = FALSE;
     if (s->after_main_init) {
@@ -1870,7 +1870,7 @@ void spice_session_channel_migrate(SpiceSession *session, SpiceChannel *channel)
     if (g_list_length(s->migration_left) == 0) {
         CHANNEL_DEBUG(channel, "migration: all channel migrated, success");
         session_disconnect(s->migration, FALSE);
-        g_clear_pointer(&s->migration, g_object_unref);
+        g_clear_object(&s->migration);
         spice_session_set_migration_state(session, SPICE_SESSION_MIGRATION_NONE);
     }
 }
diff --git a/src/spice-widget.c b/src/spice-widget.c
index 9d6899c..8b91f52 100644
--- a/src/spice-widget.c
+++ b/src/spice-widget.c
@@ -2921,7 +2921,7 @@ static void cursor_set(SpiceCursorChannel *channel,
 #endif
     if (d->show_cursor) {
         /* unhide */
-        g_clear_pointer(&d->show_cursor, g_object_unref);
+        g_clear_object(&d->show_cursor);
         if (d->mouse_mode == SPICE_MOUSE_MODE_SERVER) {
             /* keep a hidden cursor, will be shown in cursor_move() */
             d->show_cursor = cursor;
commit 7f7542f4908cb82b7289c1e5703dace19b96779c
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Fri Sep 6 08:53:56 2019 +0100

    spice-session: Remove goto statement and label
    
    Just a style change.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Signed-off-by: Snir Sheriber <ssheribe at redhat.com>

diff --git a/src/spice-session.c b/src/spice-session.c
index eebb6f4..37f8693 100644
--- a/src/spice-session.c
+++ b/src/spice-session.c
@@ -2814,18 +2814,16 @@ PhodavServer* spice_session_get_webdav_server(SpiceSession *session)
 
     g_mutex_lock(&mutex);
 
-    if (priv->webdav)
-        goto end;
-
-    priv->webdav = phodav_server_new(shared_dir);
-    g_object_bind_property(session,  "share-dir-ro",
-                           priv->webdav, "read-only",
-                           G_BINDING_SYNC_CREATE|G_BINDING_BIDIRECTIONAL);
-    g_object_bind_property(session,  "shared-dir",
-                           priv->webdav, "root",
-                           G_BINDING_SYNC_CREATE|G_BINDING_BIDIRECTIONAL);
+    if (priv->webdav == NULL) {
+        priv->webdav = phodav_server_new(shared_dir);
+        g_object_bind_property(session,  "share-dir-ro",
+                               priv->webdav, "read-only",
+                               G_BINDING_SYNC_CREATE|G_BINDING_BIDIRECTIONAL);
+        g_object_bind_property(session,  "shared-dir",
+                               priv->webdav, "root",
+                               G_BINDING_SYNC_CREATE|G_BINDING_BIDIRECTIONAL);
+    }
 
-end:
     g_mutex_unlock(&mutex);
 #endif