[Spice-devel] [PATCHv2 10/22] Rename display_channels_count/n_display_channels

[Marc-André Lureau]

---
 gtk/channel-main.c       | 2 +-
 gtk/spice-session-priv.h | 6 +++---
 gtk/spice-session.c      | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gtk/channel-main.c b/gtk/channel-main.c
index b62da60..7af4a2e 100644
--- a/gtk/channel-main.c
+++ b/gtk/channel-main.c
@@ -1298,7 +1298,7 @@ static gboolean timer_set_display(gpointer data)
 
     /* ensure we have an explicit monitor configuration at least for
        number of display channels */
-    for (i = 0; i < spice_session_get_display_channels_count(session); i++)
+    for (i = 0; i < spice_session_get_n_display_channels(session); i++)
         if (!c->display[i].enabled_set) {
             SPICE_DEBUG("Not sending monitors config, missing monitors");
             return FALSE;
diff --git a/gtk/spice-session-priv.h b/gtk/spice-session-priv.h
index e150fc7..95fc078 100644
--- a/gtk/spice-session-priv.h
+++ b/gtk/spice-session-priv.h
@@ -109,7 +109,7 @@ struct _SpiceSessionPrivate {
     int               images_cache_size;
     int               glz_window_size;
     uint32_t          pci_ram_size;
-    uint32_t          display_channels_count;
+    uint32_t          n_display_channels;
     guint8            uuid[WEBDAV_MAGIC_SIZE];
     gchar             *name;
 
@@ -157,7 +157,7 @@ void spice_session_get_ca(SpiceSession *session, guint8 **ca, guint *size);
 
 void spice_session_set_caches_hints(SpiceSession *session,
                                     uint32_t pci_ram_size,
-                                    uint32_t display_channels_count);
+                                    uint32_t n_display_channels);
 void spice_session_get_caches(SpiceSession *session,
                               display_cache **images,
                               SpiceGlzDecoderWindow **glz_window);
@@ -178,7 +178,7 @@ gboolean spice_session_get_smartcard_enabled(SpiceSession *session);
 gboolean spice_session_get_usbredir_enabled(SpiceSession *session);
 
 const guint8* spice_session_get_webdav_magic(SpiceSession *session);
-guint spice_session_get_display_channels_count(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);
 
diff --git a/gtk/spice-session.c b/gtk/spice-session.c
index a2e79bb..5c1966e 100644
--- a/gtk/spice-session.c
+++ b/gtk/spice-session.c
@@ -2177,14 +2177,14 @@ void spice_session_get_caches(SpiceSession *session,
 G_GNUC_INTERNAL
 void spice_session_set_caches_hints(SpiceSession *session,
                                     uint32_t pci_ram_size,
-                                    uint32_t display_channels_count)
+                                    uint32_t n_display_channels)
 {
     g_return_if_fail(SPICE_IS_SESSION(session));
 
     SpiceSessionPrivate *s = session->priv;
 
     s->pci_ram_size = pci_ram_size;
-    s->display_channels_count = display_channels_count;
+    s->n_display_channels = n_display_channels;
 
     /* TODO: when setting cache and window size, we should consider the client's
      *       available memory and the number of display channels */
@@ -2199,11 +2199,11 @@ void spice_session_set_caches_hints(SpiceSession *session,
 }
 
 G_GNUC_INTERNAL
-guint spice_session_get_display_channels_count(SpiceSession *session)
+guint spice_session_get_n_display_channels(SpiceSession *session)
 {
     g_return_val_if_fail(session != NULL, 0);
 
-    return session->priv->display_channels_count;
+    return session->priv->n_display_channels;
 }
 
 G_GNUC_INTERNAL
-- 
2.1.0