[gdm] daemon,greeter: drop support for keyboard layout selection
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm] daemon,greeter: drop support for keyboard layout selection
- Date: Tue, 1 Feb 2011 16:21:00 +0000 (UTC)
commit e280e791585ec1859143806519db2e312aa88051
Author: Ray Strode <rstrode redhat com>
Date: Mon Jan 31 18:38:28 2011 -0500
daemon,greeter: drop support for keyboard layout selection
It's no longer exposed in the UI, and it never really worked well,
so drop it for now.
daemon/gdm-factory-slave.c | 12 -
daemon/gdm-greeter-server.c | 51 ----
daemon/gdm-greeter-server.h | 4 -
daemon/gdm-product-slave.c | 24 --
daemon/gdm-session-direct.c | 122 ---------
daemon/gdm-session-private.h | 2 -
daemon/gdm-session-relay.c | 12 -
daemon/gdm-session-settings.c | 59 +-----
daemon/gdm-session-settings.h | 3 -
daemon/gdm-session-worker.c | 49 ----
daemon/gdm-session.c | 30 ---
daemon/gdm-session.h | 6 -
daemon/gdm-simple-slave.c | 29 ---
gui/simple-greeter/Makefile.am | 41 ---
gui/simple-greeter/gdm-greeter-client.c | 28 --
gui/simple-greeter/gdm-greeter-client.h | 4 -
gui/simple-greeter/gdm-greeter-panel.h | 5 -
gui/simple-greeter/gdm-greeter-session.c | 25 --
gui/simple-greeter/gdm-layout-chooser-dialog.c | 248 ------------------
gui/simple-greeter/gdm-layout-chooser-dialog.h | 59 -----
gui/simple-greeter/gdm-layout-chooser-widget.c | 207 ---------------
gui/simple-greeter/gdm-layout-chooser-widget.h | 58 -----
gui/simple-greeter/gdm-layout-option-widget.c | 294 ----------------------
gui/simple-greeter/gdm-layout-option-widget.h | 62 -----
gui/simple-greeter/gdm-layouts.c | 266 -------------------
gui/simple-greeter/gdm-layouts.h | 35 ---
gui/simple-greeter/gdm-simple-greeter.schemas.in | 12 -
gui/simple-greeter/test-layout-chooser.c | 61 -----
28 files changed, 1 insertions(+), 1807 deletions(-)
---
diff --git a/daemon/gdm-factory-slave.c b/daemon/gdm-factory-slave.c
index b413497..5727986 100644
--- a/daemon/gdm-factory-slave.c
+++ b/daemon/gdm-factory-slave.c
@@ -438,14 +438,6 @@ on_greeter_language_selected (GdmGreeterServer *greeter_server,
}
static void
-on_greeter_layout_selected (GdmGreeterServer *greeter_server,
- const char *text,
- GdmFactorySlave *slave)
-{
- gdm_session_select_layout (GDM_SESSION (slave->priv->session), text);
-}
-
-static void
on_greeter_user_selected (GdmGreeterServer *greeter_server,
const char *text,
GdmFactorySlave *slave)
@@ -538,10 +530,6 @@ run_greeter (GdmFactorySlave *slave)
G_CALLBACK (on_greeter_language_selected),
slave);
g_signal_connect (slave->priv->greeter_server,
- "layout-selected",
- G_CALLBACK (on_greeter_layout_selected),
- slave);
- g_signal_connect (slave->priv->greeter_server,
"user-selected",
G_CALLBACK (on_greeter_user_selected),
slave);
diff --git a/daemon/gdm-greeter-server.c b/daemon/gdm-greeter-server.c
index 1ab01e4..6a021d1 100644
--- a/daemon/gdm-greeter-server.c
+++ b/daemon/gdm-greeter-server.c
@@ -77,7 +77,6 @@ enum {
SESSION_SELECTED,
HOSTNAME_SELECTED,
LANGUAGE_SELECTED,
- LAYOUT_SELECTED,
USER_SELECTED,
CANCELLED,
CONNECTED,
@@ -275,13 +274,6 @@ gdm_greeter_server_default_language_name_changed (GdmGreeterServer *greeter_serv
}
void
-gdm_greeter_server_default_layout_name_changed (GdmGreeterServer *greeter_server,
- const char *layout_name)
-{
- send_dbus_string_signal (greeter_server, "DefaultLayoutNameChanged", layout_name);
-}
-
-void
gdm_greeter_server_default_session_name_changed (GdmGreeterServer *greeter_server,
const char *session_name)
{
@@ -512,33 +504,6 @@ handle_select_language (GdmGreeterServer *greeter_server,
}
static DBusHandlerResult
-handle_select_layout (GdmGreeterServer *greeter_server,
- DBusConnection *connection,
- DBusMessage *message)
-{
- DBusMessage *reply;
- DBusError error;
- const char *text;
-
- dbus_error_init (&error);
- if (! dbus_message_get_args (message, &error,
- DBUS_TYPE_STRING, &text,
- DBUS_TYPE_INVALID)) {
- g_warning ("ERROR: %s", error.message);
- }
-
- g_debug ("GreeterServer: SelectLayout: %s", text);
-
- reply = dbus_message_new_method_return (message);
- dbus_connection_send (connection, reply, NULL);
- dbus_message_unref (reply);
-
- g_signal_emit (greeter_server, signals [LAYOUT_SELECTED], 0, text);
-
- return DBUS_HANDLER_RESULT_HANDLED;
-}
-
-static DBusHandlerResult
handle_select_user (GdmGreeterServer *greeter_server,
DBusConnection *connection,
DBusMessage *message)
@@ -667,8 +632,6 @@ greeter_handle_child_message (DBusConnection *connection,
return handle_select_hostname (greeter_server, connection, message);
} else if (dbus_message_is_method_call (message, GDM_GREETER_SERVER_DBUS_INTERFACE, "SelectLanguage")) {
return handle_select_language (greeter_server, connection, message);
- } else if (dbus_message_is_method_call (message, GDM_GREETER_SERVER_DBUS_INTERFACE, "SelectLayout")) {
- return handle_select_layout (greeter_server, connection, message);
} else if (dbus_message_is_method_call (message, GDM_GREETER_SERVER_DBUS_INTERFACE, "SelectUser")) {
return handle_select_user (greeter_server, connection, message);
} else if (dbus_message_is_method_call (message, GDM_GREETER_SERVER_DBUS_INTERFACE, "Cancel")) {
@@ -756,9 +719,6 @@ do_introspect (DBusConnection *connection,
" <signal name=\"DefaultLanguageNameChanged\">\n"
" <arg name=\"language_name\" type=\"s\"/>\n"
" </signal>\n"
- " <signal name=\"DefaultLayoutNameChanged\">\n"
- " <arg name=\"layout_name\" type=\"s\"/>\n"
- " </signal>\n"
" <signal name=\"DefaultSessionNameChanged\">\n"
" <arg name=\"session_name\" type=\"s\"/>\n"
" </signal>\n"
@@ -1207,17 +1167,6 @@ gdm_greeter_server_class_init (GdmGreeterServerClass *klass)
G_TYPE_NONE,
1,
G_TYPE_STRING);
- signals [LAYOUT_SELECTED] =
- g_signal_new ("layout-selected",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (GdmGreeterServerClass, layout_selected),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__STRING,
- G_TYPE_NONE,
- 1,
- G_TYPE_STRING);
signals [USER_SELECTED] =
g_signal_new ("user-selected",
G_OBJECT_CLASS_TYPE (object_class),
diff --git a/daemon/gdm-greeter-server.h b/daemon/gdm-greeter-server.h
index f9c157f..7872201 100644
--- a/daemon/gdm-greeter-server.h
+++ b/daemon/gdm-greeter-server.h
@@ -57,8 +57,6 @@ typedef struct
const char *hostname);
void (* language_selected) (GdmGreeterServer *greeter_server,
const char *name);
- void (* layout_selected) (GdmGreeterServer *greeter_server,
- const char *name);
void (* user_selected) (GdmGreeterServer *greeter_server,
const char *name);
void (* cancelled) (GdmGreeterServer *greeter_server);
@@ -91,8 +89,6 @@ void gdm_greeter_server_selected_user_changed (GdmGreeterServer *
const char *text);
void gdm_greeter_server_default_language_name_changed (GdmGreeterServer *greeter_server,
const char *text);
-void gdm_greeter_server_default_layout_name_changed (GdmGreeterServer *greeter_server,
- const char *text);
void gdm_greeter_server_default_session_name_changed (GdmGreeterServer *greeter_server,
const char *text);
diff --git a/daemon/gdm-product-slave.c b/daemon/gdm-product-slave.c
index a423965..2d1109e 100644
--- a/daemon/gdm-product-slave.c
+++ b/daemon/gdm-product-slave.c
@@ -773,28 +773,6 @@ on_relay_language_selected (GdmProductSlave *slave,
}
static void
-on_relay_layout_selected (GdmProductSlave *slave,
- DBusMessage *message)
-{
- DBusError error;
- const char *text;
- dbus_bool_t res;
-
- dbus_error_init (&error);
- res = dbus_message_get_args (message,
- &error,
- DBUS_TYPE_STRING, &text,
- DBUS_TYPE_INVALID);
- if (res) {
- g_debug ("GdmProductSlave: Layout selected %s", text);
- gdm_session_select_layout (GDM_SESSION (slave->priv->session), text);
- } else {
- g_warning ("Unable to get arguments: %s", error.message);
- dbus_error_free (&error);
- }
-}
-
-static void
on_relay_user_selected (GdmProductSlave *slave,
DBusMessage *message)
{
@@ -1018,8 +996,6 @@ relay_dbus_handle_message (DBusConnection *connection,
on_relay_session_selected (slave, message);
} else if (dbus_message_is_signal (message, RELAY_SERVER_DBUS_INTERFACE, "LanguageSelected")) {
on_relay_language_selected (slave, message);
- } else if (dbus_message_is_signal (message, RELAY_SERVER_DBUS_INTERFACE, "LayoutSelected")) {
- on_relay_layout_selected (slave, message);
} else if (dbus_message_is_signal (message, RELAY_SERVER_DBUS_INTERFACE, "UserSelected")) {
on_relay_user_selected (slave, message);
} else if (dbus_message_is_signal (message, RELAY_SERVER_DBUS_INTERFACE, "OpenSession")) {
diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
index a7d77e3..c8361b4 100644
--- a/daemon/gdm-session-direct.c
+++ b/daemon/gdm-session-direct.c
@@ -74,8 +74,6 @@ struct _GdmSessionDirectPrivate
char *saved_session;
char *selected_language;
char *saved_language;
- char *selected_layout;
- char *saved_layout;
char *selected_user;
char *user_x11_authority_file;
@@ -613,49 +611,6 @@ get_default_language_name (GdmSessionDirect *session)
return setlocale (LC_MESSAGES, NULL);
}
-static char *
-get_system_default_layout (GdmSessionDirect *session)
-{
- char *result = NULL;
-#ifdef HAVE_LIBXKLAVIER
- static XklEngine *engine = NULL;
-
- if (engine == NULL) {
- Display *display = XOpenDisplay (session->priv->display_name);
- if (display != NULL) {
- engine = xkl_engine_get_instance (display);
- }
- /* do NOT call XCloseDisplay (display) here;
- * xkl_engine_get_instance() is a singleton which saves the display */
- }
-
- if (engine != NULL) {
- XklConfigRec *config = xkl_config_rec_new ();
- if (xkl_config_rec_get_from_server (config, engine) && config->layouts && config->layouts[0]) {
- if (config->variants && config->variants[0] && config->variants[0][0])
- result = g_strdup_printf("%s\t%s", config->layouts[0], config->variants[0]);
- else
- result = g_strdup (config->layouts[0]);
- }
- g_object_unref (config);
- }
-#endif
-
- if (!result)
- result = g_strdup ("us");
- return result;
-}
-
-static const char *
-get_default_layout_name (GdmSessionDirect *session)
-{
- if (!session->priv->saved_layout) {
- session->priv->saved_layout = get_system_default_layout (session);
- }
-
- return session->priv->saved_layout;
-}
-
static const char *
get_fallback_session_name (GdmSessionDirect *session_direct)
{
@@ -754,8 +709,6 @@ gdm_session_direct_defaults_changed (GdmSessionDirect *session)
{
_gdm_session_default_language_name_changed (GDM_SESSION (session),
get_default_language_name (session));
- _gdm_session_default_layout_name_changed (GDM_SESSION (session),
- get_default_layout_name (session));
_gdm_session_default_session_name_changed (GDM_SESSION (session),
get_default_session_name (session));
}
@@ -776,9 +729,6 @@ gdm_session_direct_select_user (GdmSession *session,
g_free (impl->priv->saved_language);
impl->priv->saved_language = NULL;
-
- g_free (impl->priv->saved_layout);
- impl->priv->saved_layout = NULL;
}
static DBusHandlerResult
@@ -1185,39 +1135,6 @@ gdm_session_direct_handle_saved_language_name_read (GdmSessionDirect *session,
}
static DBusHandlerResult
-gdm_session_direct_handle_saved_layout_name_read (GdmSessionDirect *session,
- DBusConnection *connection,
- DBusMessage *message)
-{
- DBusMessage *reply;
- DBusError error;
- const char *layout_name;
-
- dbus_error_init (&error);
- if (! dbus_message_get_args (message, &error,
- DBUS_TYPE_STRING, &layout_name,
- DBUS_TYPE_INVALID)) {
- g_warning ("ERROR: %s", error.message);
- }
-
- reply = dbus_message_new_method_return (message);
- dbus_connection_send (connection, reply, NULL);
- dbus_message_unref (reply);
-
- if (strcmp (layout_name,
- get_default_layout_name (session)) != 0) {
- g_free (session->priv->saved_layout);
- session->priv->saved_layout = g_strdup (layout_name);
-
- _gdm_session_default_layout_name_changed (GDM_SESSION (session),
- layout_name);
- }
-
-
- return DBUS_HANDLER_RESULT_HANDLED;
-}
-
-static DBusHandlerResult
gdm_session_direct_handle_saved_session_name_read (GdmSessionDirect *session,
DBusConnection *connection,
DBusMessage *message)
@@ -1310,8 +1227,6 @@ session_worker_message (DBusConnection *connection,
return gdm_session_direct_handle_session_died (session, connection, message);
} else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "SavedLanguageNameRead")) {
return gdm_session_direct_handle_saved_language_name_read (session, connection, message);
- } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "SavedLayoutNameRead")) {
- return gdm_session_direct_handle_saved_layout_name_read (session, connection, message);
} else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "SavedSessionNameRead")) {
return gdm_session_direct_handle_saved_session_name_read (session, connection, message);
}
@@ -1999,16 +1914,6 @@ get_language_name (GdmSessionDirect *session)
}
static const char *
-get_layout_name (GdmSessionDirect *session)
-{
- if (session->priv->selected_layout != NULL) {
- return session->priv->selected_layout;
- }
-
- return get_default_layout_name (session);
-}
-
-static const char *
get_session_name (GdmSessionDirect *session)
{
/* FIXME: test the session names before we use them? */
@@ -2172,12 +2077,6 @@ gdm_session_direct_close (GdmSession *session)
g_free (impl->priv->saved_language);
impl->priv->saved_language = NULL;
- g_free (impl->priv->selected_layout);
- impl->priv->selected_layout = NULL;
-
- g_free (impl->priv->saved_layout);
- impl->priv->saved_layout = NULL;
-
g_free (impl->priv->user_x11_authority_file);
impl->priv->user_x11_authority_file = NULL;
@@ -2309,24 +2208,6 @@ gdm_session_direct_select_language (GdmSession *session,
}
static void
-gdm_session_direct_select_layout (GdmSession *session,
- const char *text)
-{
- GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
-
- g_free (impl->priv->selected_layout);
-
- if (strcmp (text, "__previous") == 0) {
- impl->priv->selected_layout = NULL;
- } else {
- impl->priv->selected_layout = g_strdup (text);
- }
-
- send_dbus_string_signal (impl, "SetLayoutName",
- get_layout_name (impl));
-}
-
-static void
_gdm_session_direct_set_display_id (GdmSessionDirect *session,
const char *id)
{
@@ -2518,8 +2399,6 @@ gdm_session_direct_finalize (GObject *object)
g_free (session->priv->saved_session);
g_free (session->priv->selected_language);
g_free (session->priv->saved_language);
- g_free (session->priv->selected_layout);
- g_free (session->priv->saved_layout);
g_free (session->priv->fallback_session_name);
@@ -2598,7 +2477,6 @@ gdm_session_iface_init (GdmSessionIface *iface)
iface->answer_query = gdm_session_direct_answer_query;
iface->select_session = gdm_session_direct_select_session;
iface->select_language = gdm_session_direct_select_language;
- iface->select_layout = gdm_session_direct_select_layout;
iface->select_user = gdm_session_direct_select_user;
}
diff --git a/daemon/gdm-session-private.h b/daemon/gdm-session-private.h
index 7ccf0d7..88ac23c 100644
--- a/daemon/gdm-session-private.h
+++ b/daemon/gdm-session-private.h
@@ -59,8 +59,6 @@ void _gdm_session_closed (GdmSession *sessio
/* user settings read from ~/.dmrc / system defaults */
void _gdm_session_default_language_name_changed (GdmSession *session,
const char *language_name);
-void _gdm_session_default_layout_name_changed (GdmSession *session,
- const char *layout_name);
void _gdm_session_default_session_name_changed (GdmSession *session,
const char *session_name);
/* user is selected/changed internally */
diff --git a/daemon/gdm-session-relay.c b/daemon/gdm-session-relay.c
index da0ecb3..1ab4b05 100644
--- a/daemon/gdm-session-relay.c
+++ b/daemon/gdm-session-relay.c
@@ -274,14 +274,6 @@ gdm_session_relay_select_language (GdmSession *session,
}
static void
-gdm_session_relay_select_layout (GdmSession *session,
- const char *text)
-{
- GdmSessionRelay *impl = GDM_SESSION_RELAY (session);
- send_dbus_string_signal (impl, "LayoutSelected", text);
-}
-
-static void
gdm_session_relay_select_user (GdmSession *session,
const char *text)
{
@@ -884,9 +876,6 @@ do_introspect (DBusConnection *connection,
" <signal name=\"LanguageSelected\">\n"
" <arg name=\"language\" type=\"s\"/>\n"
" </signal>\n"
- " <signal name=\"LayoutSelected\">\n"
- " <arg name=\"layout\" type=\"s\"/>\n"
- " </signal>\n"
" <signal name=\"SessionSelected\">\n"
" <arg name=\"session\" type=\"s\"/>\n"
" </signal>\n"
@@ -1182,7 +1171,6 @@ gdm_session_iface_init (GdmSessionIface *iface)
iface->answer_query = gdm_session_relay_answer_query;
iface->select_session = gdm_session_relay_select_session;
iface->select_language = gdm_session_relay_select_language;
- iface->select_layout = gdm_session_relay_select_layout;
iface->select_user = gdm_session_relay_select_user;
}
diff --git a/daemon/gdm-session-settings.c b/daemon/gdm-session-settings.c
index 421d87a..7115acd 100644
--- a/daemon/gdm-session-settings.c
+++ b/daemon/gdm-session-settings.c
@@ -36,7 +36,6 @@ struct _GdmSessionSettingsPrivate
{
char *session_name;
char *language_name;
- char *layout_name;
};
static void gdm_session_settings_finalize (GObject *object);
@@ -56,7 +55,6 @@ enum {
PROP_0 = 0,
PROP_SESSION_NAME,
PROP_LANGUAGE_NAME,
- PROP_LAYOUT_NAME,
};
G_DEFINE_TYPE (GdmSessionSettings, gdm_session_settings, G_TYPE_OBJECT)
@@ -95,11 +93,6 @@ gdm_session_settings_class_install_properties (GdmSessionSettingsClass *settings
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
g_object_class_install_property (object_class, PROP_LANGUAGE_NAME, param_spec);
- param_spec = g_param_spec_string ("layout-name", "Keyboard Layout Name",
- "The name of the keyboard layout",
- NULL,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
- g_object_class_install_property (object_class, PROP_LAYOUT_NAME, param_spec);
}
static void
@@ -121,7 +114,6 @@ gdm_session_settings_finalize (GObject *object)
g_free (settings->priv->session_name);
g_free (settings->priv->language_name);
- g_free (settings->priv->layout_name);
parent_class = G_OBJECT_CLASS (gdm_session_settings_parent_class);
@@ -144,19 +136,6 @@ gdm_session_settings_set_language_name (GdmSessionSettings *settings,
}
void
-gdm_session_settings_set_layout_name (GdmSessionSettings *settings,
- const char *layout_name)
-{
- g_return_if_fail (GDM_IS_SESSION_SETTINGS (settings));
-
- if (settings->priv->layout_name == NULL ||
- strcmp (settings->priv->layout_name, layout_name) != 0) {
- settings->priv->layout_name = g_strdup (layout_name);
- g_object_notify (G_OBJECT (settings), "layout-name");
- }
-}
-
-void
gdm_session_settings_set_session_name (GdmSessionSettings *settings,
const char *session_name)
{
@@ -177,13 +156,6 @@ gdm_session_settings_get_language_name (GdmSessionSettings *settings)
}
char *
-gdm_session_settings_get_layout_name (GdmSessionSettings *settings)
-{
- g_return_val_if_fail (GDM_IS_SESSION_SETTINGS (settings), NULL);
- return g_strdup (settings->priv->layout_name);
-}
-
-char *
gdm_session_settings_get_session_name (GdmSessionSettings *settings)
{
g_return_val_if_fail (GDM_IS_SESSION_SETTINGS (settings), NULL);
@@ -205,10 +177,6 @@ gdm_session_settings_set_property (GObject *object,
gdm_session_settings_set_language_name (settings, g_value_get_string (value));
break;
- case PROP_LAYOUT_NAME:
- gdm_session_settings_set_layout_name (settings, g_value_get_string (value));
- break;
-
case PROP_SESSION_NAME:
gdm_session_settings_set_session_name (settings, g_value_get_string (value));
break;
@@ -237,10 +205,6 @@ gdm_session_settings_get_property (GObject *object,
g_value_set_string (value, settings->priv->language_name);
break;
- case PROP_LAYOUT_NAME:
- g_value_set_string (value, settings->priv->layout_name);
- break;
-
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
@@ -261,8 +225,7 @@ gboolean
gdm_session_settings_is_loaded (GdmSessionSettings *settings)
{
return settings->priv->session_name != NULL ||
- settings->priv->language_name != NULL ||
- settings->priv->layout_name != NULL;
+ settings->priv->language_name != NULL;
}
gboolean
@@ -275,7 +238,6 @@ gdm_session_settings_load (GdmSessionSettings *settings,
gboolean is_loaded;
char *session_name;
char *language_name;
- char *layout_name;
char *filename;
g_return_val_if_fail (settings != NULL, FALSE);
@@ -322,20 +284,6 @@ gdm_session_settings_load (GdmSessionSettings *settings,
goto out;
}
- layout_name = g_key_file_get_string (key_file, "Desktop", "Layout",
- &load_error);
-
- if (layout_name != NULL) {
- gdm_session_settings_set_layout_name (settings, layout_name);
- g_free (layout_name);
- } else if (g_error_matches (load_error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_KEY_NOT_FOUND)) {
- g_error_free (load_error);
- load_error = NULL;
- } else {
- g_propagate_error (error, load_error);
- goto out;
- }
-
is_loaded = TRUE;
out:
g_key_file_free (key_file);
@@ -380,11 +328,6 @@ gdm_session_settings_save (GdmSessionSettings *settings,
settings->priv->language_name);
}
- if (settings->priv->layout_name != NULL) {
- g_key_file_set_string (key_file, "Desktop", "Layout",
- settings->priv->layout_name);
- }
-
contents = g_key_file_to_data (key_file, &length, &file_error);
if (contents == NULL) {
diff --git a/daemon/gdm-session-settings.h b/daemon/gdm-session-settings.h
index d579d4a..f522c25 100644
--- a/daemon/gdm-session-settings.h
+++ b/daemon/gdm-session-settings.h
@@ -61,12 +61,9 @@ gboolean gdm_session_settings_save (GdmSessionSettings
GError **error);
gboolean gdm_session_settings_is_loaded (GdmSessionSettings *settings);
char *gdm_session_settings_get_language_name (GdmSessionSettings *settings);
-char *gdm_session_settings_get_layout_name (GdmSessionSettings *settings);
char *gdm_session_settings_get_session_name (GdmSessionSettings *settings);
void gdm_session_settings_set_language_name (GdmSessionSettings *settings,
const char *language_name);
-void gdm_session_settings_set_layout_name (GdmSessionSettings *settings,
- const char *layout_name);
void gdm_session_settings_set_session_name (GdmSessionSettings *settings,
const char *session_name);
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
index 281c554..b9a5a5d 100644
--- a/daemon/gdm-session-worker.c
+++ b/daemon/gdm-session-worker.c
@@ -2204,14 +2204,6 @@ gdm_session_worker_set_language_name (GdmSessionWorker *worker,
}
static void
-gdm_session_worker_set_layout_name (GdmSessionWorker *worker,
- const char *layout_name)
-{
- gdm_session_settings_set_layout_name (worker->priv->user_settings,
- layout_name);
-}
-
-static void
on_set_language_name (GdmSessionWorker *worker,
DBusMessage *message)
{
@@ -2234,28 +2226,6 @@ on_set_language_name (GdmSessionWorker *worker,
}
static void
-on_set_layout_name (GdmSessionWorker *worker,
- DBusMessage *message)
-{
- DBusError error;
- const char *layout_name;
- dbus_bool_t res;
-
- dbus_error_init (&error);
- res = dbus_message_get_args (message,
- &error,
- DBUS_TYPE_STRING, &layout_name,
- DBUS_TYPE_INVALID);
- if (res) {
- g_debug ("GdmSessionWorker: layout name set to %s", layout_name);
- gdm_session_worker_set_layout_name (worker, layout_name);
- } else {
- g_warning ("Unable to get arguments: %s", error.message);
- dbus_error_free (&error);
- }
-}
-
-static void
on_saved_language_name_read (GdmSessionWorker *worker)
{
char *language_name;
@@ -2268,18 +2238,6 @@ on_saved_language_name_read (GdmSessionWorker *worker)
}
static void
-on_saved_layout_name_read (GdmSessionWorker *worker)
-{
- char *layout_name;
-
- layout_name = gdm_session_settings_get_layout_name (worker->priv->user_settings);
- send_dbus_string_method (worker->priv->connection,
- "SavedLayoutNameRead",
- layout_name);
- g_free (layout_name);
-}
-
-static void
on_saved_session_name_read (GdmSessionWorker *worker)
{
char *session_name;
@@ -2305,11 +2263,6 @@ do_setup (GdmSessionWorker *worker)
worker);
g_signal_connect_swapped (worker->priv->user_settings,
- "notify::layout-name",
- G_CALLBACK (on_saved_layout_name_read),
- worker);
-
- g_signal_connect_swapped (worker->priv->user_settings,
"notify::session-name",
G_CALLBACK (on_saved_session_name_read),
worker);
@@ -2812,8 +2765,6 @@ worker_dbus_handle_message (DBusConnection *connection,
on_set_environment_variable (worker, message);
} else if (dbus_message_is_signal (message, GDM_SESSION_DBUS_INTERFACE, "SetLanguageName")) {
on_set_language_name (worker, message);
- } else if (dbus_message_is_signal (message, GDM_SESSION_DBUS_INTERFACE, "SetLayoutName")) {
- on_set_layout_name (worker, message);
} else if (dbus_message_is_signal (message, GDM_SESSION_DBUS_INTERFACE, "SetSessionName")) {
on_set_session_name (worker, message);
} else {
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
index 1e2af92..d6baa22 100644
--- a/daemon/gdm-session.c
+++ b/daemon/gdm-session.c
@@ -52,7 +52,6 @@ enum {
SESSION_DIED,
SELECTED_USER_CHANGED,
DEFAULT_LANGUAGE_NAME_CHANGED,
- DEFAULT_LAYOUT_NAME_CHANGED,
DEFAULT_SESSION_NAME_CHANGED,
LAST_SIGNAL
};
@@ -167,15 +166,6 @@ gdm_session_select_language (GdmSession *session,
}
void
-gdm_session_select_layout (GdmSession *session,
- const char *text)
-{
- g_return_if_fail (GDM_IS_SESSION (session));
-
- GDM_SESSION_GET_IFACE (session)->select_layout (session, text);
-}
-
-void
gdm_session_select_user (GdmSession *session,
const char *text)
{
@@ -470,17 +460,6 @@ gdm_session_class_init (gpointer g_iface)
G_TYPE_NONE,
1,
G_TYPE_STRING);
- signals [DEFAULT_LAYOUT_NAME_CHANGED] =
- g_signal_new ("default-layout-name-changed",
- iface_type,
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (GdmSessionIface, default_layout_name_changed),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__STRING,
- G_TYPE_NONE,
- 1,
- G_TYPE_STRING);
signals [DEFAULT_SESSION_NAME_CHANGED] =
g_signal_new ("default-session-name-changed",
iface_type,
@@ -677,15 +656,6 @@ _gdm_session_default_language_name_changed (GdmSession *session,
}
void
-_gdm_session_default_layout_name_changed (GdmSession *session,
- const char *layout_name)
-{
- g_return_if_fail (GDM_IS_SESSION (session));
-
- g_signal_emit (session, signals [DEFAULT_LAYOUT_NAME_CHANGED], 0, layout_name);
-}
-
-void
_gdm_session_default_session_name_changed (GdmSession *session,
const char *session_name)
{
diff --git a/daemon/gdm-session.h b/daemon/gdm-session.h
index fb199d3..a1e885d 100644
--- a/daemon/gdm-session.h
+++ b/daemon/gdm-session.h
@@ -61,8 +61,6 @@ struct _GdmSessionIface
const char *text);
void (* select_language) (GdmSession *session,
const char *text);
- void (* select_layout) (GdmSession *session,
- const char *text);
void (* select_session) (GdmSession *session,
const char *text);
void (* select_user) (GdmSession *session,
@@ -114,8 +112,6 @@ struct _GdmSessionIface
void (* default_language_name_changed) (GdmSession *session,
const char *text);
- void (* default_layout_name_changed) (GdmSession *session,
- const char *text);
void (* default_session_name_changed) (GdmSession *session,
const char *text);
};
@@ -143,8 +139,6 @@ void gdm_session_select_session (GdmSession *session,
const char *session_name);
void gdm_session_select_language (GdmSession *session,
const char *language);
-void gdm_session_select_layout (GdmSession *session,
- const char *language);
void gdm_session_select_user (GdmSession *session,
const char *username);
void gdm_session_cancel (GdmSession *session);
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index e3cb96d..a03ccfc 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -684,18 +684,6 @@ on_default_language_name_changed (GdmSession *session,
}
static void
-on_default_layout_name_changed (GdmSession *session,
- const char *text,
- GdmSimpleSlave *slave)
-{
- g_debug ("GdmSimpleSlave: Default layout name changed: %s", text);
-
- if (slave->priv->greeter_server != NULL) {
- gdm_greeter_server_default_layout_name_changed (slave->priv->greeter_server, text);
- }
-}
-
-static void
on_default_session_name_changed (GdmSession *session,
const char *text,
GdmSimpleSlave *slave)
@@ -840,11 +828,6 @@ create_new_session (GdmSimpleSlave *slave)
slave);
g_signal_connect (slave->priv->session,
- "default-layout-name-changed",
- G_CALLBACK (on_default_layout_name_changed),
- slave);
-
- g_signal_connect (slave->priv->session,
"default-session-name-changed",
G_CALLBACK (on_default_session_name_changed),
slave);
@@ -939,14 +922,6 @@ on_greeter_language_selected (GdmGreeterServer *greeter_server,
}
static void
-on_greeter_layout_selected (GdmGreeterServer *greeter_server,
- const char *text,
- GdmSimpleSlave *slave)
-{
- gdm_session_select_layout (GDM_SESSION (slave->priv->session), text);
-}
-
-static void
on_greeter_user_selected (GdmGreeterServer *greeter_server,
const char *text,
GdmSimpleSlave *slave)
@@ -1087,10 +1062,6 @@ start_greeter (GdmSimpleSlave *slave)
G_CALLBACK (on_greeter_language_selected),
slave);
g_signal_connect (slave->priv->greeter_server,
- "layout-selected",
- G_CALLBACK (on_greeter_layout_selected),
- slave);
- g_signal_connect (slave->priv->greeter_server,
"user-selected",
G_CALLBACK (on_greeter_user_selected),
slave);
diff --git a/gui/simple-greeter/Makefile.am b/gui/simple-greeter/Makefile.am
index de9fda2..74edd01 100644
--- a/gui/simple-greeter/Makefile.am
+++ b/gui/simple-greeter/Makefile.am
@@ -54,7 +54,6 @@ noinst_PROGRAMS = \
test-greeter-login-window \
test-greeter-panel \
test-language-chooser \
- test-layout-chooser \
test-languages \
test-sessions \
test-remote-login-window \
@@ -117,14 +116,6 @@ test_greeter_panel_SOURCES = \
gdm-language-chooser-dialog.c \
gdm-language-option-widget.h \
gdm-language-option-widget.c \
- gdm-layout-chooser-widget.h \
- gdm-layout-chooser-widget.c \
- gdm-layout-chooser-dialog.h \
- gdm-layout-chooser-dialog.c \
- gdm-layout-option-widget.h \
- gdm-layout-option-widget.c \
- gdm-layouts.h \
- gdm-layouts.c \
gdm-sessions.h \
gdm-sessions.c \
gdm-session-option-widget.h \
@@ -183,30 +174,6 @@ test_language_chooser_LDADD = \
$(GCONF_LIBS) \
$(NULL)
-test_layout_chooser_SOURCES = \
- test-layout-chooser.c \
- gdm-cell-renderer-timer.h \
- gdm-cell-renderer-timer.c \
- gdm-timer.h \
- gdm-timer.c \
- gdm-scrollable-widget.h \
- gdm-scrollable-widget.c \
- gdm-chooser-widget.h \
- gdm-chooser-widget.c \
- gdm-layouts.h \
- gdm-layouts.c \
- gdm-layout-chooser-widget.h \
- gdm-layout-chooser-widget.c \
- gdm-layout-chooser-dialog.h \
- gdm-layout-chooser-dialog.c \
- $(NULL)
-
-test_layout_chooser_LDADD = \
- $(GTK_LIBS) \
- $(GCONF_LIBS) \
- $(LIBXKLAVIER_LIBS) \
- $(NULL)
-
test_languages_SOURCES = \
test-languages.c \
gdm-languages.h \
@@ -295,14 +262,6 @@ gdm_simple_greeter_SOURCES = \
gdm-languages.c \
gdm-language-chooser-widget.h \
gdm-language-chooser-widget.c \
- gdm-layout-chooser-widget.h \
- gdm-layout-chooser-widget.c \
- gdm-layout-chooser-dialog.h \
- gdm-layout-chooser-dialog.c \
- gdm-layout-option-widget.h \
- gdm-layout-option-widget.c \
- gdm-layouts.h \
- gdm-layouts.c \
locarchive.h \
gdm-language-chooser-dialog.h \
gdm-language-chooser-dialog.c \
diff --git a/gui/simple-greeter/gdm-greeter-client.c b/gui/simple-greeter/gdm-greeter-client.c
index d02b3d1..10ba236 100644
--- a/gui/simple-greeter/gdm-greeter-client.c
+++ b/gui/simple-greeter/gdm-greeter-client.c
@@ -68,7 +68,6 @@ enum {
AUTHENTICATION_FAILED,
SELECTED_USER_CHANGED,
DEFAULT_LANGUAGE_NAME_CHANGED,
- DEFAULT_LAYOUT_NAME_CHANGED,
DEFAULT_SESSION_NAME_CHANGED,
TIMED_LOGIN_REQUESTED,
USER_AUTHORIZED,
@@ -177,13 +176,6 @@ on_default_language_name_changed (GdmGreeterClient *client,
}
static void
-on_default_layout_name_changed (GdmGreeterClient *client,
- DBusMessage *message)
-{
- emit_string_signal_for_message (client, "DefaultLayoutNameChanged", message, DEFAULT_LAYOUT_NAME_CHANGED);
-}
-
-static void
on_default_session_name_changed (GdmGreeterClient *client,
DBusMessage *message)
{
@@ -472,14 +464,6 @@ gdm_greeter_client_call_select_language (GdmGreeterClient *client,
}
void
-gdm_greeter_client_call_select_layout (GdmGreeterClient *client,
- const char *text)
-{
- send_dbus_string_method (client->priv->connection,
- "SelectLayout",
- text);
-}
-void
gdm_greeter_client_call_select_user (GdmGreeterClient *client,
const char *text)
{
@@ -663,8 +647,6 @@ client_dbus_handle_message (DBusConnection *connection,
on_selected_user_changed (client, message);
} else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "DefaultLanguageNameChanged")) {
on_default_language_name_changed (client, message);
- } else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "DefaultLayoutNameChanged")) {
- on_default_layout_name_changed (client, message);
} else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "DefaultSessionNameChanged")) {
on_default_session_name_changed (client, message);
} else if (dbus_message_is_signal (message, GREETER_SERVER_DBUS_INTERFACE, "TimedLoginRequested")) {
@@ -937,16 +919,6 @@ gdm_greeter_client_class_init (GdmGreeterClientClass *klass)
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE,
1, G_TYPE_STRING);
- gdm_greeter_client_signals[DEFAULT_LAYOUT_NAME_CHANGED] =
- g_signal_new ("default-layout-name-changed",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (GdmGreeterClientClass, default_layout_name_changed),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__STRING,
- G_TYPE_NONE,
- 1, G_TYPE_STRING);
gdm_greeter_client_signals[DEFAULT_SESSION_NAME_CHANGED] =
g_signal_new ("default-session-name-changed",
G_OBJECT_CLASS_TYPE (object_class),
diff --git a/gui/simple-greeter/gdm-greeter-client.h b/gui/simple-greeter/gdm-greeter-client.h
index 16ccef9..7938046 100644
--- a/gui/simple-greeter/gdm-greeter-client.h
+++ b/gui/simple-greeter/gdm-greeter-client.h
@@ -65,8 +65,6 @@ typedef struct
const char *session_name);
void (* default_language_name_changed) (GdmGreeterClient *client,
const char *language_name);
- void (* default_layout_name_changed) (GdmGreeterClient *client,
- const char *layout_name);
void (* timed_login_requested) (GdmGreeterClient *client,
const char *username,
int delay);
@@ -105,8 +103,6 @@ void gdm_greeter_client_call_select_user (GdmGreeter
const char *text);
void gdm_greeter_client_call_select_language (GdmGreeterClient *client,
const char *text);
-void gdm_greeter_client_call_select_layout (GdmGreeterClient *client,
- const char *text);
void gdm_greeter_client_call_select_session (GdmGreeterClient *client,
const char *text);
void gdm_greeter_client_call_answer_query (GdmGreeterClient *client,
diff --git a/gui/simple-greeter/gdm-greeter-panel.h b/gui/simple-greeter/gdm-greeter-panel.h
index 6a4848e..1354371 100644
--- a/gui/simple-greeter/gdm-greeter-panel.h
+++ b/gui/simple-greeter/gdm-greeter-panel.h
@@ -48,9 +48,6 @@ typedef struct
void (* language_selected) (GdmGreeterPanel *panel,
const char *text);
- void (* layout_selected) (GdmGreeterPanel *panel,
- const char *text);
-
void (* session_selected) (GdmGreeterPanel *panel,
const char *text);
} GdmGreeterPanelClass;
@@ -64,8 +61,6 @@ GtkWidget * gdm_greeter_panel_new (GdkScre
void gdm_greeter_panel_show_user_options (GdmGreeterPanel *panel);
void gdm_greeter_panel_hide_user_options (GdmGreeterPanel *panel);
void gdm_greeter_panel_reset (GdmGreeterPanel *panel);
-void gdm_greeter_panel_set_keyboard_layout (GdmGreeterPanel *panel,
- const char *layout_name);
void gdm_greeter_panel_set_default_language_name (GdmGreeterPanel *panel,
const char *language_name);
diff --git a/gui/simple-greeter/gdm-greeter-session.c b/gui/simple-greeter/gdm-greeter-session.c
index 195268d..3225105 100644
--- a/gui/simple-greeter/gdm-greeter-session.c
+++ b/gui/simple-greeter/gdm-greeter-session.c
@@ -158,14 +158,6 @@ on_default_language_name_changed (GdmGreeterClient *client,
}
static void
-on_default_layout_name_changed (GdmGreeterClient *client,
- const char *text,
- GdmGreeterSession *session)
-{
- g_debug ("GdmGreeterSession: default layout name changed: %s", text);
-}
-
-static void
on_default_session_name_changed (GdmGreeterClient *client,
const char *text,
GdmGreeterSession *session)
@@ -262,14 +254,6 @@ on_select_language (GdmGreeterSession *session,
}
static void
-on_select_layout (GdmGreeterSession *session,
- const char *text)
-{
- gdm_greeter_client_call_select_layout (session->priv->client,
- text);
-}
-
-static void
on_select_user (GdmGreeterLoginWindow *login_window,
const char *text,
GdmGreeterSession *session)
@@ -362,11 +346,6 @@ toggle_panel (GdmGreeterSession *session,
session);
g_signal_connect_swapped (session->priv->panel,
- "layout-selected",
- G_CALLBACK (on_select_layout),
- session);
-
- g_signal_connect_swapped (session->priv->panel,
"session-selected",
G_CALLBACK (on_select_session),
session);
@@ -601,10 +580,6 @@ gdm_greeter_session_init (GdmGreeterSession *session)
G_CALLBACK (on_default_language_name_changed),
session);
g_signal_connect (session->priv->client,
- "default-layout-name-changed",
- G_CALLBACK (on_default_layout_name_changed),
- session);
- g_signal_connect (session->priv->client,
"default-session-name-changed",
G_CALLBACK (on_default_session_name_changed),
session);
diff --git a/gui/simple-greeter/gdm-simple-greeter.schemas.in b/gui/simple-greeter/gdm-simple-greeter.schemas.in
index be94f24..fe598ad 100644
--- a/gui/simple-greeter/gdm-simple-greeter.schemas.in
+++ b/gui/simple-greeter/gdm-simple-greeter.schemas.in
@@ -79,18 +79,6 @@
</locale>
</schema>
<schema>
- <key>/schemas/apps/gdm/simple-greeter/recent-layouts</key>
- <applyto>/apps/gdm/simple-greeter/recent-layouts</applyto>
- <owner>gdm-simple-greeter</owner>
- <type>list</type>
- <list_type>string</list_type>
- <default>[]</default>
- <locale name="C">
- <short>Recently selected keyboard layouts</short>
- <long>Set to a list of keyboard layouts to be shown by default in the login window.</long>
- </locale>
- </schema>
- <schema>
<key>/schemas/apps/gdm/simple-greeter/wm_use_compiz</key>
<applyto>/apps/gdm/simple-greeter/wm_use_compiz</applyto>
<owner>gdm-simple-greeter</owner>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
