[gdm] server: Remove unused properties
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm] server: Remove unused properties
- Date: Thu, 13 Feb 2014 18:49:28 +0000 (UTC)
commit f379aa285d70ff57a274d48a3b93e81f3ebe696d
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Wed Feb 12 20:38:08 2014 -0500
server: Remove unused properties
daemon/gdm-server.c | 36 +-----------------------------------
daemon/gdm-slave.c | 9 ---------
2 files changed, 1 insertions(+), 44 deletions(-)
---
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
index ef149ad..1606b3a 100644
--- a/daemon/gdm-server.c
+++ b/daemon/gdm-server.c
@@ -93,11 +93,6 @@ struct GdmServerPrivate
char *display_seat_id;
char *auth_file;
- gboolean is_parented;
- char *parent_display_name;
- char *parent_auth_file;
- char *chosen_hostname;
-
guint child_watch_id;
guint sigusr1_id;
@@ -110,15 +105,7 @@ enum {
PROP_DISPLAY_SEAT_ID,
PROP_DISPLAY_DEVICE,
PROP_AUTH_FILE,
- PROP_IS_PARENTED,
- PROP_PARENT_DISPLAY_NAME,
- PROP_PARENT_AUTH_FILE,
- PROP_CHOSEN_HOSTNAME,
- PROP_COMMAND,
- PROP_PRIORITY,
PROP_USER_NAME,
- PROP_SESSION_ARGS,
- PROP_LOG_DIR,
PROP_DISABLE_TCP,
PROP_IS_INITIAL,
};
@@ -365,14 +352,6 @@ gdm_server_resolve_command_line (GdmServer *server,
}
#endif
- if (server->priv->chosen_hostname) {
- /* run just one session */
- argv[len++] = g_strdup ("-terminate");
- argv[len++] = g_strdup ("-query");
- argv[len++] = g_strdup (server->priv->chosen_hostname);
- query_in_arglist = TRUE;
- }
-
if (server->priv->disable_tcp && ! query_in_arglist) {
argv[len++] = g_strdup ("-nolisten");
argv[len++] = g_strdup ("tcp");
@@ -623,17 +602,7 @@ get_server_environment (GdmServer *server)
}
/* modify environment here */
- if (server->priv->is_parented) {
- if (server->priv->parent_auth_file != NULL) {
- g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup
(server->priv->parent_auth_file));
- }
-
- if (server->priv->parent_display_name != NULL) {
- g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup
(server->priv->parent_display_name));
- }
- } else {
- g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (server->priv->display_name));
- }
+ g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (server->priv->display_name));
if (server->priv->user_name != NULL) {
struct passwd *pwent;
@@ -1131,9 +1100,6 @@ gdm_server_finalize (GObject *object)
g_free (server->priv->display_seat_id);
g_free (server->priv->display_device);
g_free (server->priv->auth_file);
- g_free (server->priv->parent_display_name);
- g_free (server->priv->parent_auth_file);
- g_free (server->priv->chosen_hostname);
G_OBJECT_CLASS (gdm_server_parent_class)->finalize (object);
}
diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c
index 4738c50..17c302c 100644
--- a/daemon/gdm-slave.c
+++ b/daemon/gdm-slave.c
@@ -89,7 +89,6 @@ struct GdmSlavePrivate
int display_number;
char *display_hostname;
gboolean display_is_local;
- gboolean display_is_parented;
char *display_seat_id;
char *display_x11_authority_file;
char *parent_display_name;
@@ -231,14 +230,6 @@ get_script_environment (GdmSlave *slave,
}
}
-#if 0
- if (display_is_parented) {
- g_hash_table_insert (hash, g_strdup ("GDM_PARENT_DISPLAY"), g_strdup (parent_display_name));
-
- /*g_hash_table_insert (hash, "GDM_PARENT_XAUTHORITY"),
slave->priv->parent_temp_auth_file));*/
- }
-#endif
-
if (! slave->priv->display_is_local) {
g_hash_table_insert (hash, g_strdup ("REMOTE_HOST"), g_strdup
(slave->priv->display_hostname));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]