diff options
| author | William Jon McCann <mccann@jhu.edu> | 2008-01-25 01:39:44 +0000 |
|---|---|---|
| committer | William Jon McCann <mccann@src.gnome.org> | 2008-01-25 01:39:44 +0000 |
| commit | 325c4eb5c71bd764e5e76732d044526464c6d93e (patch) | |
| tree | 8556e7d99780f82803bf432d2486f5171e74cc2e /daemon/gdm-display-store.c | |
| parent | 641911030f689eb864b9e8910a8cd9f36045c3f4 (diff) | |
| download | gdm-325c4eb5c71bd764e5e76732d044526464c6d93e.tar.gz | |
Use the LocalDisplayFactory to assign X11 Display numbers to all local
2008-01-24 William Jon McCann <mccann@jhu.edu>
* daemon/Makefile.am:
* daemon/gdm-display-store.c: (gdm_display_store_clear),
(gdm_display_store_remove), (gdm_display_store_finalize):
* daemon/gdm-factory-slave.c: (create_product_display),
(gdm_factory_slave_stop):
* daemon/gdm-local-display-factory.c: (listify_hash), (sort_nums),
(take_next_display_number), (on_display_disposed), (store_display),
(gdm_local_display_factory_create_transient_display),
(gdm_local_display_factory_create_product_display),
(create_display_for_device), (register_factory), (connect_to_hal),
(gdm_local_display_factory_constructor),
(gdm_local_display_factory_class_init),
(gdm_local_display_factory_init),
(gdm_local_display_factory_finalize):
* daemon/gdm-local-display-factory.h:
* daemon/gdm-local-display-factory.xml:
* daemon/gdm-static-factory-display.c:
(gdm_static_factory_display_set_property),
(gdm_static_factory_display_get_property),
(gdm_static_factory_display_class_init),
(gdm_static_factory_display_new):
* daemon/gdm-static-factory-display.h:
* daemon/gdm-static-factory-display.xml:
* daemon/gdm-transient-display.c:
(gdm_transient_display_create_authority),
(gdm_transient_display_add_user_authorization),
(gdm_transient_display_remove_user_authorization),
(gdm_transient_display_manage), (gdm_transient_display_finish),
(gdm_transient_display_unmanage),
(gdm_transient_display_set_property),
(gdm_transient_display_get_property),
(gdm_transient_display_class_init), (gdm_transient_display_init),
(gdm_transient_display_finalize), (gdm_transient_display_new):
* daemon/gdm-transient-display.h:
* daemon/gdm-transient-display.xml:
Use the LocalDisplayFactory to assign X11 Display numbers
to all local displays. Try to assign the lowest available.
Add a stub for a TransientDisplay that can be used to
do FUS logins.
svn path=/trunk/; revision=5632
Diffstat (limited to 'daemon/gdm-display-store.c')
| -rw-r--r-- | daemon/gdm-display-store.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/daemon/gdm-display-store.c b/daemon/gdm-display-store.c index e962f28d..ac3b51d1 100644 --- a/daemon/gdm-display-store.c +++ b/daemon/gdm-display-store.c @@ -37,7 +37,7 @@ struct GdmDisplayStorePrivate { - GHashTable *displays; + GHashTable *displays; }; enum { @@ -68,6 +68,7 @@ gdm_display_store_error_quark (void) void gdm_display_store_clear (GdmDisplayStore *store) { + g_return_if_fail (store != NULL); g_debug ("GdmDisplayStore: Clearing display store"); g_hash_table_remove_all (store->priv->displays); } @@ -76,6 +77,8 @@ gboolean gdm_display_store_remove (GdmDisplayStore *store, GdmDisplay *display) { + g_return_val_if_fail (store != NULL, FALSE); + g_warning ("GdmDisplayStore: Implement me"); return FALSE; } @@ -197,14 +200,16 @@ gdm_display_store_init (GdmDisplayStore *store) static void gdm_display_store_finalize (GObject *object) { - GdmDisplayStore *display_store; + GdmDisplayStore *store; g_return_if_fail (object != NULL); g_return_if_fail (GDM_IS_DISPLAY_STORE (object)); - display_store = GDM_DISPLAY_STORE (object); + store = GDM_DISPLAY_STORE (object); + + g_return_if_fail (store->priv != NULL); - g_return_if_fail (display_store->priv != NULL); + g_hash_table_destroy (store->priv->displays); G_OBJECT_CLASS (gdm_display_store_parent_class)->finalize (object); } |