Drop ldm_greeter_get_default_layout (X controls the layout), some cleanups in src...

diff --git a/NEWS b/NEWS
index e2ea7d20c19cc40808db75aef5cca7e9aac48d2f..4666c08cdb445b83c70c6754e29cc0f0f107120b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,10 @@
 Overview of changes in lightdm 0.3.8
 
-    * liblightdm API change:
+    * liblightdm API changes:
       - ldm_greeter_start_authentication becomes ldm_greeter_login
       - The existing ldm_greeter_login is now ldm_greeter_start_session
         and the username parameter is not required.
+      - Drop ldm_greeter_get_default_layout (X controls the layout)
     * Add guest account logins
 
 Overview of changes in lightdm 0.3.7

diff --git a/data/lightdm.conf b/data/lightdm.conf
index 1f6c508e9bccdb24f888bf143cdffdd07784601f..0ccb92cc5555284d54f664d699dc37b1eb81b5aa 100644 (file)
--- a/data/lightdm.conf
+++ b/data/lightdm.conf
@@ -18,7 +18,6 @@ displays=default-display
 # Display configuration
 #
 # vt = Virtual terminal to start on (0-n or 'active')
-# layout = Default keyboard layout to use in greeter and in sessions
 # greeter-theme = Greeter theme
 # greeter-user = User to run greeter process as
 # session = Default session
@@ -32,7 +31,6 @@ displays=default-display
 #
 [default-display]
 vt=active
-#layout=us
 #greeter-theme=example-gtk-gnome
 #greeter-user=lightdm
 #session=gnome

diff --git a/doc/lightdm-gobject-0-sections.txt b/doc/lightdm-gobject-0-sections.txt
index 59c2cb65c6e93e9a7989d31ef4687cca5e5faea9..8368c962ce96d0e63fd84cf255272270b51a7f47 100644 (file)
--- a/doc/lightdm-gobject-0-sections.txt
+++ b/doc/lightdm-gobject-0-sections.txt
@@ -113,7 +113,6 @@ ldm_greeter_get_users
 ldm_greeter_get_user_by_name
 ldm_greeter_get_default_language
 ldm_greeter_get_languages
-ldm_greeter_get_default_layout
 ldm_greeter_get_layouts
 ldm_greeter_get_layout
 ldm_greeter_set_layout

diff --git a/doc/tmpl/greeter.sgml b/doc/tmpl/greeter.sgml
index 94f879e4fa456fac1d35b97aa78b121a89560321..1f3bb75a5b97c12506e6db578881a2249154b67a 100644 (file)
--- a/doc/tmpl/greeter.sgml
+++ b/doc/tmpl/greeter.sgml
@@ -334,15 +334,6 @@ g_object_connect (G_OBJECT (greeter), "quit", G_CALLBACK (quit_cb), NULL);
 @Returns: 
 
 
-<!-- ##### FUNCTION ldm_greeter_get_default_layout ##### -->
-<para>
-
-</para>
-
-@greeter: 
-@Returns: 
-
-
 <!-- ##### FUNCTION ldm_greeter_get_layouts ##### -->
 <para>
 

diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c
index 1286963d51d3fbdbc8e9d2a370cd562f4419b0bb..39094ec0aff73f0e048596f50088662820ad4035 100644 (file)
--- a/liblightdm-gobject/greeter.c
+++ b/liblightdm-gobject/greeter.c
@@ -93,7 +93,6 @@ struct _LdmGreeterPrivate
     gboolean have_languages;
     GList *languages;
 
-    gchar *default_layout;
     XklEngine *xkl_engine;
     XklConfigRec *xkl_config;
     gboolean have_layouts;
@@ -327,15 +326,14 @@ from_server_cb (GIOChannel *source, GIOCondition condition, gpointer data)
     {
     case GREETER_MESSAGE_CONNECTED:
         greeter->priv->theme = read_string (greeter, &offset);
-        greeter->priv->default_layout = read_string (greeter, &offset);
         greeter->priv->default_session = read_string (greeter, &offset);
         greeter->priv->timed_user = read_string (greeter, &offset);
         greeter->priv->login_delay = read_int (greeter, &offset);
         greeter->priv->guest_account_supported = read_int (greeter, &offset) != 0;
 
-        g_debug ("Connected theme=%s default-layout=%s default-session=%s timed-user=%s login-delay=%d guest-account-supported=%s",
+        g_debug ("Connected theme=%s default-session=%s timed-user=%s login-delay=%d guest-account-supported=%s",
                  greeter->priv->theme,
-                 greeter->priv->default_layout, greeter->priv->default_session,
+                 greeter->priv->default_session,
                  greeter->priv->timed_user, greeter->priv->login_delay,
                  greeter->priv->guest_account_supported ? "true" : "false");
 
@@ -964,13 +962,6 @@ ldm_greeter_get_languages (LdmGreeter *greeter)
     return greeter->priv->languages;
 }
 
-const gchar *
-ldm_greeter_get_default_layout (LdmGreeter *greeter)
-{
-    g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL);
-    return greeter->priv->default_layout;
-}
-
 static void
 layout_cb (XklConfigRegistry *config,
            const XklConfigItem *item,

diff --git a/liblightdm-gobject/lightdm/greeter.h b/liblightdm-gobject/lightdm/greeter.h
index 0369785843bf2618674834ab0fb446c867872d41..5698ecbdeb6d300510237df926664f842a572210 100644 (file)
--- a/liblightdm-gobject/lightdm/greeter.h
+++ b/liblightdm-gobject/lightdm/greeter.h
@@ -81,8 +81,6 @@ const gchar *ldm_greeter_get_default_language (LdmGreeter *greeter);
 
 const GList *ldm_greeter_get_languages (LdmGreeter *greeter);
 
-const gchar *ldm_greeter_get_default_layout (LdmGreeter *greeter);
-
 const GList *ldm_greeter_get_layouts (LdmGreeter *greeter);
 
 void ldm_greeter_set_layout (LdmGreeter *greeter, const gchar *layout);

diff --git a/liblightdm-qt/QLightDM/greeter.cpp b/liblightdm-qt/QLightDM/greeter.cpp
index 9b5d7bca8c5e73d2743f63c59515cdf93de8903f..b2ee25a920fda00e6faf5e622994bcdba51b3473 100644 (file)
--- a/liblightdm-qt/QLightDM/greeter.cpp
+++ b/liblightdm-qt/QLightDM/greeter.cpp
@@ -43,7 +43,6 @@ class GreeterPrivate
 {
 public:
     QString theme;
-    QString defaultLayout;
     QString defaultSession;
     QString timedUser;
     int loginDelay;
@@ -314,12 +313,11 @@ void Greeter::onRead(int fd)
     {
     case GREETER_MESSAGE_CONNECTED:
         d->theme = readString(&offset);
-        d->defaultLayout = readString(&offset);
         d->defaultSession = readString(&offset);
         d->timedUser = readString(&offset);
         d->loginDelay = readInt(&offset);
         d->guestAccountSupported = readInt(&offset) != 0;
-        qDebug() << "Connected theme=" << d->theme << " default-layout=" << d->defaultLayout << " default-session=" << d->defaultSession << " timed-user=" << d->timedUser << " login-delay" << d->loginDelay << " guestAccountSupported" << d->guestAccountSupported;
+        qDebug() << "Connected theme=" << d->theme << " default-session=" << d->defaultSession << " timed-user=" << d->timedUser << " login-delay" << d->loginDelay << " guestAccountSupported" << d->guestAccountSupported;
 
         /* Set timeout for default login */
         if(d->timedUser != "" && d->loginDelay > 0)
@@ -394,11 +392,6 @@ QString Greeter::defaultLanguage() const
     return getenv("LANG");
 }
 
-QString Greeter::defaultLayout() const
-{
-    return d->defaultLayout;
-}
-
 QString Greeter::defaultSession() const
 {
     return d->defaultSession;

diff --git a/liblightdm-qt/QLightDM/greeter.h b/liblightdm-qt/QLightDM/greeter.h
index 36d53de40dc951396c4850e4543a1759cd73fe55..2cb15e40431f8ddf3a39c80f4f4da204340a0680 100644 (file)
--- a/liblightdm-qt/QLightDM/greeter.h
+++ b/liblightdm-qt/QLightDM/greeter.h
@@ -41,7 +41,6 @@ namespace QLightDM
        QString defaultLanguage() const;
 
        //QList<LdmLayout> layouts() const;
-       QString defaultLayout() const;
        QString layout() const;
 
     QLightDM::Config *config() const;

diff --git a/src/display-manager.c b/src/display-manager.c
index d3f7008a706a4806eb06449b53e844e4096e63eb..428eaeaf1c8b858fe873867b9f76db315ab793f1 100644 (file)
--- a/src/display-manager.c
+++ b/src/display-manager.c
@@ -638,10 +638,6 @@ display_manager_start (DisplayManager *manager)
             g_free (vt);
         }
 
-        value = g_key_file_get_string (manager->priv->config, display_name, "layout", NULL);
-        if (value)
-            display_set_default_layout (display, value);
-        g_free (value);
         value = g_key_file_get_string (manager->priv->config, display_name, "session", NULL);
         if (value)
             display_set_default_session (display, value);

diff --git a/src/display.c b/src/display.c
index 9f5c0995931d82e16b1f076802c557a57d209b6d..c891f50d201f9de8c69c228081d84f0fddd764fb 100644 (file)
--- a/src/display.c
+++ b/src/display.c
@@ -55,9 +55,6 @@ struct DisplayPrivate
     /* Number of times have logged in */
     gint login_count;
 
-    /* Layout to use in greeter/sessions */
-    gchar *default_layout;
-
     /* User to run greeter as */
     gchar *greeter_user;
 
@@ -190,19 +187,6 @@ display_get_greeter_theme (Display *display)
     return display->priv->greeter_theme;
 }
 
-void
-display_set_default_layout (Display *display, const gchar *layout)
-{
-    g_free (display->priv->default_layout);
-    display->priv->default_layout = g_strdup (layout);
-}
-
-const gchar *
-display_get_default_layout (Display *display)
-{
-    return display->priv->default_layout;
-}
-
 void
 display_set_default_session (Display *display, const gchar *session)
 {
@@ -510,8 +494,6 @@ start_user_session (Display *display, const gchar *session, const gchar *languag
         g_key_file_remove_key (dmrc_file, "Desktop", "LCMess", NULL);
     }
     g_free (old_language);
-    if (!g_key_file_has_key (dmrc_file, "Desktop", "Layout", NULL))
-        g_key_file_set_string (dmrc_file, "Desktop", "Layout", display->priv->default_layout);
 
     filename = g_strdup_printf ("%s.desktop", session);
     path = g_build_filename (XSESSIONS_DIR, filename, NULL);
@@ -731,8 +713,7 @@ start_greeter (Display *display)
         display->priv->greeter_session = greeter_new ();
         greeter_set_theme (display->priv->greeter_session, display->priv->greeter_theme);
         greeter_set_default_user (display->priv->greeter_session, display->priv->default_user, display->priv->timeout);
-        greeter_set_layout (display->priv->greeter_session, display->priv->default_layout);
-        greeter_set_session (display->priv->greeter_session, display->priv->default_session);
+        greeter_set_default_session (display->priv->greeter_session, display->priv->default_session);
         g_signal_connect (G_OBJECT (display->priv->greeter_session), "start-session", G_CALLBACK (greeter_start_session_cb), display);
         g_signal_connect (G_OBJECT (display->priv->greeter_session), "quit", G_CALLBACK (greeter_quit_cb), display);
         session_set_username (SESSION (display->priv->greeter_session), username);
@@ -807,7 +788,6 @@ display_init (Display *display)
     if (strcmp (GREETER_USER, "") != 0)
         display->priv->greeter_user = g_strdup (GREETER_USER);
     display->priv->greeter_theme = g_strdup (GREETER_THEME);
-    display->priv->default_layout = g_strdup ("us"); // FIXME: Is there a better default to get?
     display->priv->default_session = g_strdup (DEFAULT_SESSION);
 }
 
@@ -835,7 +815,6 @@ display_finalize (GObject *object)
     g_free (self->priv->greeter_user);
     g_free (self->priv->greeter_theme);
     g_free (self->priv->default_user);
-    g_free (self->priv->default_layout);
     g_free (self->priv->default_session);
 
     G_OBJECT_CLASS (display_parent_class)->finalize (object);

diff --git a/src/display.h b/src/display.h
index 7d58595809ff5589df5f92728ee1661c70b5310b..42d37711b7dc18e7676e208a56fcc2bb230d7e90 100644 (file)
--- a/src/display.h
+++ b/src/display.h
@@ -69,10 +69,6 @@ void display_set_greeter_theme (Display *display, const gchar *greeter_theme);
 
 const gchar *display_get_greeter_theme (Display *display);
 
-void display_set_default_layout (Display *display, const gchar *layout);
-
-const gchar *display_get_default_layout (Display *display);
-
 void display_set_default_session (Display *display, const gchar *session);
 
 const gchar *display_get_default_session (Display *display);

diff --git a/src/greeter.c b/src/greeter.c
index 6106147efbef32ee570d5df81ccd5899134e955c..1012dfdf6a2e6ba06444933ccb09661088076f21 100644 (file)
--- a/src/greeter.c
+++ b/src/greeter.c
@@ -30,21 +30,32 @@ static guint signals[LAST_SIGNAL] = { 0 };
 
 struct GreeterPrivate
 {
+    /* TRUE if the greeter has connected to the daemon pipe */
     gboolean connected;
 
     /* Pipe to communicate to greeter */
     int pipe[2];
+
+    /* Buffer for data read from greeter */
     gchar *read_buffer;
     gsize n_read;
-  
+
+    /* Theme for greeter to use */
     gchar *theme;
-    gchar *layout;
-    gchar *session;
+
+    /* Default session to use */   
+    gchar *default_session;
+
+    /* Default user to log in as, or NULL for no default */
     gchar *default_user;
+
+    /* Time in seconds to wait until logging in as default user */
     gint autologin_timeout;
 
+    /* Timeout for greeter to respond to quit request */
     guint quit_timeout;
-  
+
+    /* PAM session being constructed by the greeter */
     PAMSession *pam_session;    
 };
 
@@ -72,29 +83,16 @@ greeter_set_theme (Greeter *greeter, const gchar *theme)
 }
 
 void
-greeter_set_layout (Greeter *greeter, const gchar *layout)
-{
-    g_free (greeter->priv->layout);
-    greeter->priv->layout = g_strdup (layout);
-}
-
-const gchar *
-greeter_get_layout (Greeter *greeter)
-{
-    return greeter->priv->layout;
-}
-
-void
-greeter_set_session (Greeter *greeter, const gchar *session)
+greeter_set_default_session (Greeter *greeter, const gchar *session)
 {
-    g_free (greeter->priv->session);
-    greeter->priv->session = g_strdup (session);
+    g_free (greeter->priv->default_session);
+    greeter->priv->default_session = g_strdup (session);
 }
 
 const gchar *
-greeter_get_session (Greeter *greeter)
+greeter_get_default_session (Greeter *greeter)
 {
-    return greeter->priv->session;
+    return greeter->priv->default_session;
 }
 
 PAMSession *
@@ -159,10 +157,9 @@ handle_connect (Greeter *greeter)
 
     theme = g_build_filename (THEME_DIR, greeter->priv->theme, "index.theme", NULL);
 
-    write_header (greeter, GREETER_MESSAGE_CONNECTED, string_length (theme) + string_length (greeter->priv->layout) + string_length (greeter->priv->session) + string_length (greeter->priv->default_user ? greeter->priv->default_user : "") + int_length () + int_length ());
+    write_header (greeter, GREETER_MESSAGE_CONNECTED, string_length (theme) + string_length (greeter->priv->default_session) + string_length (greeter->priv->default_user ? greeter->priv->default_user : "") + int_length () + int_length ());
     write_string (greeter, theme);
-    write_string (greeter, greeter->priv->layout);
-    write_string (greeter, greeter->priv->session);
+    write_string (greeter, greeter->priv->default_session);
     write_string (greeter, greeter->priv->default_user ? greeter->priv->default_user : "");
     write_int (greeter, greeter->priv->autologin_timeout);
     write_int (greeter, FALSE);
@@ -362,7 +359,7 @@ handle_start_session (Greeter *greeter, gchar *session, gchar *language)
         return;
     }*/
 
-    g_debug ("Greeter start session %s with language", session, language);
+    g_debug ("Greeter start session %s with language %s", session, language);
 
     g_signal_emit (greeter, signals[START_SESSION], 0, session, language);
 }
@@ -617,8 +614,7 @@ greeter_finalize (GObject *object)
   
     g_free (self->priv->read_buffer);
     g_free (self->priv->theme);
-    g_free (self->priv->layout);
-    g_free (self->priv->session);
+    g_free (self->priv->default_session);
     g_free (self->priv->default_user);
   
     G_OBJECT_CLASS (greeter_parent_class)->finalize (object);

diff --git a/src/greeter.h b/src/greeter.h
index adc3e9e84ade86c0357bcc5c96007ce609e69cb1..10bdbc947cd3888d173d501e17d0b2c5ce624946 100644 (file)
--- a/src/greeter.h
+++ b/src/greeter.h
@@ -47,9 +47,9 @@ void greeter_set_layout (Greeter *greeter, const gchar *layout);
 
 const gchar *greeter_get_layout (Greeter *greeter);
 
-void greeter_set_session (Greeter *greeter, const gchar *session);
+void greeter_set_default_session (Greeter *greeter, const gchar *session);
 
-const gchar *greeter_get_session (Greeter *greeter);
+const gchar *greeter_get_default_session (Greeter *greeter);
 
 PAMSession *greeter_get_pam_session (Greeter *greeter);