diff options
| author | Ray Strode <rstrode@redhat.com> | 2008-02-20 19:56:33 +0000 |
|---|---|---|
| committer | Ray Strode <halfline@src.gnome.org> | 2008-02-20 19:56:33 +0000 |
| commit | 83bedbf04361758ccc0f31f36a9133e7a836456c (patch) | |
| tree | a64514209b95e4ee679b0eebae90e4c2dce126c9 | |
| parent | 9400160560215c509759efca6fb365f12e4a8bc5 (diff) | |
| download | gdm-83bedbf04361758ccc0f31f36a9133e7a836456c.tar.gz | |
don't call create_authority here anymore, since it's handled by
2008-02-20 Ray Strode <rstrode@redhat.com>
* daemon/gdm-local-display-factory.c
(gdm_local_display_factory_create_transient_display):
* daemon/gdm-xdmcp-display-factory.c:
(gdm_xdmcp_display_create):
don't call create_authority here anymore, since it's
handled by gdm_display_manage now.
svn path=/trunk/; revision=5822
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | daemon/gdm-local-display-factory.c | 5 | ||||
| -rw-r--r-- | daemon/gdm-xdmcp-display-factory.c | 6 |
3 files changed, 9 insertions, 11 deletions
@@ -1,3 +1,12 @@ +2008-02-20 Ray Strode <rstrode@redhat.com> + + * daemon/gdm-local-display-factory.c + (gdm_local_display_factory_create_transient_display): + * daemon/gdm-xdmcp-display-factory.c: + (gdm_xdmcp_display_create): + don't call create_authority here anymore, since it's + handled by gdm_display_manage now. + 2008-02-20 William Jon McCann <jmccann@redhat.com> * common/gdm-settings-client.c: (gdm_settings_client_get_string): diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c index a6f98b83..64f69934 100644 --- a/daemon/gdm-local-display-factory.c +++ b/daemon/gdm-local-display-factory.c @@ -205,11 +205,6 @@ gdm_local_display_factory_create_transient_display (GdmLocalDisplayFactory *fact display = gdm_transient_display_new (num); - if (! gdm_display_create_authority (display)) { - display = NULL; - goto out; - } - /* FIXME: don't hardcode seat1? */ g_object_set (display, "seat-id", CK_SEAT1_PATH, NULL); diff --git a/daemon/gdm-xdmcp-display-factory.c b/daemon/gdm-xdmcp-display-factory.c index bd6a4952..57695a1d 100644 --- a/daemon/gdm-xdmcp-display-factory.c +++ b/daemon/gdm-xdmcp-display-factory.c @@ -2041,12 +2041,6 @@ gdm_xdmcp_display_create (GdmXdmcpDisplayFactory *factory, goto out; } - if (! gdm_display_create_authority (display)) { - g_object_unref (display); - display = NULL; - goto out; - } - store = gdm_display_factory_get_display_store (GDM_DISPLAY_FACTORY (factory)); gdm_display_store_add (store, display); |