diff options
author | Ray Strode <rstrode@redhat.com> | 2015-02-16 11:24:15 -0500 |
---|---|---|
committer | Ray Strode <rstrode@redhat.com> | 2015-02-18 17:34:11 -0500 |
commit | 8c21038afcbfac2f8aa22a42b041804bda926d27 (patch) | |
tree | 9c7446abaca1528437ebfc1ea0dfeb84122a8055 /daemon/gdm-local-display-factory.c | |
parent | 2cb9568900adc5fd7f7f5033ae746b91001054d0 (diff) | |
download | gdm-8c21038afcbfac2f8aa22a42b041804bda926d27.tar.gz |
local-display-factory: rename 'displays' to 'used-display-numbers'
GdmLocalDisplayFactory has a hash table called "displays" that doesn't
hold displays. It instead holds a list of used display numbers.
This commit renames the hash table accordingly.
https://bugzilla.gnome.org/show_bug.cgi?id=744764
Diffstat (limited to 'daemon/gdm-local-display-factory.c')
-rw-r--r-- | daemon/gdm-local-display-factory.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c index ba7757d5..bf5a220a 100644 --- a/daemon/gdm-local-display-factory.c +++ b/daemon/gdm-local-display-factory.c @@ -52,7 +52,7 @@ struct GdmLocalDisplayFactoryPrivate { GdmDBusLocalDisplayFactory *skeleton; GDBusConnection *connection; - GHashTable *displays; + GHashTable *used_display_numbers; /* FIXME: this needs to be per seat? */ guint num_failures; @@ -131,7 +131,7 @@ take_next_display_number (GdmLocalDisplayFactory *factory) ret = 0; list = NULL; - g_hash_table_foreach (factory->priv->displays, (GHFunc)listify_hash, &list); + g_hash_table_foreach (factory->priv->used_display_numbers, (GHFunc)listify_hash, &list); if (list == NULL) { goto out; } @@ -163,7 +163,7 @@ take_next_display_number (GdmLocalDisplayFactory *factory) /* now reserve this number */ g_debug ("GdmLocalDisplayFactory: Reserving X display: %u", ret); - g_hash_table_insert (factory->priv->displays, GUINT_TO_POINTER (ret), NULL); + g_hash_table_insert (factory->priv->used_display_numbers, GUINT_TO_POINTER (ret), NULL); return ret; } @@ -191,7 +191,7 @@ store_display (GdmLocalDisplayFactory *factory, gdm_display_store_add (store, display); /* now fill our reserved spot */ - g_hash_table_insert (factory->priv->displays, GUINT_TO_POINTER (num), NULL); + g_hash_table_insert (factory->priv->used_display_numbers, GUINT_TO_POINTER (num), NULL); } static const char * @@ -287,9 +287,9 @@ on_display_status_changed (GdmDisplay *display, g_debug ("GdmLocalDisplayFactory: display status changed: %d", status); switch (status) { case GDM_DISPLAY_FINISHED: - /* remove the display number from factory->priv->displays + /* remove the display number from factory->priv->used_display_numbers so that it may be reused */ - g_hash_table_remove (factory->priv->displays, GUINT_TO_POINTER (num)); + g_hash_table_remove (factory->priv->used_display_numbers, GUINT_TO_POINTER (num)); gdm_display_store_remove (store, display); /* Create a new equivalent display if it was static */ @@ -301,7 +301,7 @@ on_display_status_changed (GdmDisplay *display, } break; case GDM_DISPLAY_FAILED: - /* leave the display number in factory->priv->displays + /* leave the display number in factory->priv->used_display_numbers so that it doesn't get reused */ gdm_display_store_remove (store, display); @@ -397,7 +397,7 @@ delete_display (GdmLocalDisplayFactory *factory, GdmDisplayStore *store; - g_debug ("GdmLocalDisplayFactory: Removing displays on seat %s", seat_id); + g_debug ("GdmLocalDisplayFactory: Removing used_display_numbers on seat %s", seat_id); store = gdm_display_factory_get_display_store (GDM_DISPLAY_FACTORY (factory)); gdm_display_store_foreach_remove (store, lookup_by_seat_id, (gpointer) seat_id); @@ -668,7 +668,7 @@ gdm_local_display_factory_init (GdmLocalDisplayFactory *factory) { factory->priv = GDM_LOCAL_DISPLAY_FACTORY_GET_PRIVATE (factory); - factory->priv->displays = g_hash_table_new (NULL, NULL); + factory->priv->used_display_numbers = g_hash_table_new (NULL, NULL); } static void @@ -686,7 +686,7 @@ gdm_local_display_factory_finalize (GObject *object) g_clear_object (&factory->priv->connection); g_clear_object (&factory->priv->skeleton); - g_hash_table_destroy (factory->priv->displays); + g_hash_table_destroy (factory->priv->used_display_numbers); #ifdef WITH_SYSTEMD gdm_local_display_factory_stop_monitor (factory); |