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

[GitLab Mirror]

 src/spice-session-priv.h |    3 ---
 src/spice-session.c      |   19 +++++--------------
 2 files changed, 5 insertions(+), 17 deletions(-)

New commits:
commit 62328c2838f01a4ca096b279ff9ee5f4c8c8b25e
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Sep 27 07:10:41 2018 +0100

    spice-session: Make some functions static
    
    Unused since commit 85ed26847c.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Marc-André Lureau <marcandre.lureau at gmail.com>

diff --git a/src/spice-session-priv.h b/src/spice-session-priv.h
index d2a557b..0190c1f 100644
--- a/src/spice-session-priv.h
+++ b/src/spice-session-priv.h
@@ -86,8 +86,6 @@ void spice_session_set_name(SpiceSession *session, const gchar *name);
 gboolean spice_session_is_playback_active(SpiceSession *session);
 guint32 spice_session_get_playback_latency(SpiceSession *session);
 void spice_session_sync_playback_latency(SpiceSession *session);
-const gchar* spice_session_get_shared_dir(SpiceSession *session);
-void spice_session_set_shared_dir(SpiceSession *session, const gchar *dir);
 gboolean spice_session_get_audio_enabled(SpiceSession *session);
 gboolean spice_session_get_smartcard_enabled(SpiceSession *session);
 gboolean spice_session_get_usbredir_enabled(SpiceSession *session);
diff --git a/src/spice-session.c b/src/spice-session.c
index 8030eb6..7ea1c21 100644
--- a/src/spice-session.c
+++ b/src/spice-session.c
@@ -221,6 +221,9 @@ static const GEnumValue _spice_image_compress_values[] = {
 
 G_STATIC_ASSERT(G_N_ELEMENTS(_spice_image_compress_values) == SPICE_IMAGE_COMPRESSION_ENUM_END + 1);
 
+static const gchar* spice_session_get_shared_dir(SpiceSession *session);
+static void spice_session_set_shared_dir(SpiceSession *session, const gchar *dir);
+
 GType
 spice_image_compress_get_type (void)
 {
@@ -2574,8 +2577,7 @@ guint32 spice_session_get_playback_latency(SpiceSession *session)
     }
 }
 
-G_GNUC_INTERNAL
-const gchar* spice_session_get_shared_dir(SpiceSession *session)
+static const gchar* spice_session_get_shared_dir(SpiceSession *session)
 {
     g_return_val_if_fail(SPICE_IS_SESSION(session), NULL);
 
@@ -2584,8 +2586,7 @@ const gchar* spice_session_get_shared_dir(SpiceSession *session)
     return s->shared_dir;
 }
 
-G_GNUC_INTERNAL
-void spice_session_set_shared_dir(SpiceSession *session, const gchar *dir)
+static void spice_session_set_shared_dir(SpiceSession *session, const gchar *dir)
 {
     g_return_if_fail(SPICE_IS_SESSION(session));
 
commit f00b8d8fee48e21132f2b94c7dcf89ff163fe5ad
Author: Frediano Ziglio <fziglio at redhat.com>
Date:   Thu Sep 27 07:09:32 2018 +0100

    spice-session: Remove unused spice_session_set_main_channel function
    
    Unused since commit ab33cf5f81924a78eac5096ac21ebce08aebf8e1.
    
    Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
    Acked-by: Marc-André Lureau <marcandre.lureau at gmail.com>

diff --git a/src/spice-session-priv.h b/src/spice-session-priv.h
index 03005aa..d2a557b 100644
--- a/src/spice-session-priv.h
+++ b/src/spice-session-priv.h
@@ -96,7 +96,6 @@ const guint8* spice_session_get_webdav_magic(SpiceSession *session);
 PhodavServer *spice_session_get_webdav_server(SpiceSession *session);
 PhodavServer* channel_webdav_server_new(SpiceSession *session);
 guint spice_session_get_n_display_channels(SpiceSession *session);
-void spice_session_set_main_channel(SpiceSession *session, SpiceChannel *channel);
 gboolean spice_session_set_migration_session(SpiceSession *session, SpiceSession *mig_session);
 SpiceAudio *spice_audio_get(SpiceSession *session, GMainContext *context);
 const gchar* spice_audio_data_mode_to_string(gint mode);
diff --git a/src/spice-session.c b/src/spice-session.c
index 2b7c675..8030eb6 100644
--- a/src/spice-session.c
+++ b/src/spice-session.c
@@ -2778,16 +2778,6 @@ gboolean spice_session_is_for_migration(SpiceSession *session)
 }
 
 G_GNUC_INTERNAL
-void spice_session_set_main_channel(SpiceSession *session, SpiceChannel *channel)
-{
-    g_return_if_fail(SPICE_IS_SESSION(session));
-    g_return_if_fail(SPICE_IS_CHANNEL(channel));
-    g_return_if_fail(session->priv->cmain == NULL);
-
-    session->priv->cmain = channel;
-}
-
-G_GNUC_INTERNAL
 gboolean spice_session_set_migration_session(SpiceSession *session, SpiceSession *mig_session)
 {
     g_return_val_if_fail(SPICE_IS_SESSION(session), FALSE);