[Spice-commits] 2 commits - server/dcc-send.c server/dispatcher.c

[Frediano Ziglio]

 server/dcc-send.c   |    1 -
 server/dispatcher.c |    6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 8fcfd9a4dfea4b3dcac9dadb6bf4755da72b9b49
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Nov 17 17:11:31 2016 +0000

    Rename self field to thread_id
    
    self is usually used for GObject, avoid confusion.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/server/dispatcher.c b/server/dispatcher.c
index 44624cc..f0479aa 100644
--- a/server/dispatcher.c
+++ b/server/dispatcher.c
@@ -47,7 +47,7 @@ G_DEFINE_TYPE(Dispatcher, dispatcher, G_TYPE_OBJECT)
 struct DispatcherPrivate {
     int recv_fd;
     int send_fd;
-    pthread_t self;
+    pthread_t thread_id;
     pthread_mutex_t lock;
     DispatcherMessage *messages;
     int stage;  /* message parser stage - sender has no stages */
@@ -136,7 +136,7 @@ static void dispatcher_constructed(GObject *object)
     pthread_mutex_init(&self->priv->lock, NULL);
     self->priv->recv_fd = channels[0];
     self->priv->send_fd = channels[1];
-    self->priv->self = pthread_self();
+    self->priv->thread_id = pthread_self();
 
     self->priv->messages = g_new0(DispatcherMessage,
                                   self->priv->max_message_type);
@@ -420,5 +420,5 @@ int dispatcher_get_recv_fd(Dispatcher *dispatcher)
 
 pthread_t dispatcher_get_thread_id(Dispatcher *self)
 {
-    return self->priv->self;
+    return self->priv->thread_id;
 }
commit 867c3a734a08b4cd7de1e472531e11c5a628f4c3
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Nov 24 10:36:59 2016 +0000

    dcc: Remove unneeded private header inclusion
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Christophe Fergeau <cfergeau at redhat.com>

diff --git a/server/dcc-send.c b/server/dcc-send.c
index 8dca56c..4c739c8 100644
--- a/server/dcc-send.c
+++ b/server/dcc-send.c
@@ -24,7 +24,6 @@
 
 #include "dcc-private.h"
 #include "display-channel-private.h"
-#include "red-channel-client-private.h"
 
 typedef enum {
     FILL_BITS_TYPE_INVALID,