Drop theme code

6 files changed, 18 insertions, 148 deletions

diff --git a/greeters/gtk/Makefile.am b/greeters/gtk/Makefile.am
index 26523f51..8b01748c 100644
--- a/greeters/gtk/Makefile.am
+++ b/greeters/gtk/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS = lightdm-gtk-greeter
 
-uidir = $(datadir)/lightdm-gtk-greeter
-dist_ui_DATA = greeter.ui
+greeterdatadir = $(datadir)/lightdm-gtk-greeter
+dist_greeterdata_DATA = greeter.ui
 
 xsessiondir = $(datadir)/xsessions
 dist_xsession_DATA = lightdm-gtk-greeter.desktop
@@ -10,7 +10,7 @@ lightdm_gtk_greeter_SOURCES = \
 	lightdm-gtk-greeter.c
 
 lightdm_gtk_greeter_CFLAGS = \
-	-DUI_DIR=\""$(uidir)"\" \
+	-DGREETER_DATA_DIR=\""$(greeterdatadir)"\" \
 	-I$(top_srcdir)/liblightdm-gobject \
 	$(LIGHTDM_GTK_GREETER_CFLAGS) \
 	$(WARN_CFLAGS)
diff --git a/greeters/gtk/lightdm-gtk-greeter.c b/greeters/gtk/lightdm-gtk-greeter.c
index 322fb0d3..29d04372 100644
--- a/greeters/gtk/lightdm-gtk-greeter.c
+++ b/greeters/gtk/lightdm-gtk-greeter.c
@@ -432,7 +432,7 @@ connected_cb (LdmGreeter *greeter)
     GtkTreeModel *model;
     GtkTreeIter iter;
     GtkCellRenderer *renderer;
-    gchar *theme_dir, *rc_file, *background_image;
+    gchar *rc_file, *background_image;
     GError *error = NULL;
 
     display = gdk_display_get_default ();
@@ -441,18 +441,17 @@ connected_cb (LdmGreeter *greeter)
     screen_height = gdk_screen_get_height (screen);
 
     g_object_get (gtk_settings_get_default (), "gtk-theme-name", &theme_name, NULL);
-    theme_dir = g_path_get_dirname (ldm_greeter_get_theme (greeter));
-    rc_file = ldm_greeter_get_string_property (greeter, "gtkrc");
+    rc_file = NULL; // FIXME
     if (rc_file)
     {
-        gchar *path = g_build_filename (theme_dir, rc_file, NULL);
+        gchar *path = g_build_filename (GREETER_DATA_DIR, rc_file, NULL);
         g_free (rc_file);
         gtk_rc_add_default_file (path);
         g_free (path);
     }
 
     builder = gtk_builder_new ();
-    if (!gtk_builder_add_from_file (builder, UI_DIR "/greeter.ui", &error))
+    if (!gtk_builder_add_from_file (builder, GREETER_DATA_DIR "/greeter.ui", &error))
     {
         g_warning ("Error loading UI: %s", error->message);
         return;
@@ -467,14 +466,14 @@ connected_cb (LdmGreeter *greeter)
   
     gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (builder, "hostname_label")), ldm_greeter_get_hostname (greeter));
 
-    background_image = ldm_greeter_get_string_property (greeter, "background-image");
+    background_image = NULL; // FIXME
     if (background_image)
     {
         gchar *path;
         GdkPixbuf *pixbuf;
         GError *error = NULL;
 
-        path = g_build_filename (theme_dir, background_image, NULL);
+        path = g_build_filename (GREETER_DATA_DIR, background_image, NULL);
         g_free (background_image);
         pixbuf = gdk_pixbuf_new_from_file (path, &error);
         if (!pixbuf)
diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c
index 2fdb50f0..7b2868e7 100644
--- a/liblightdm-gobject/greeter.c
+++ b/liblightdm-gobject/greeter.c
@@ -72,9 +72,6 @@ struct _LdmGreeterPrivate
 
     gchar *hostname;
 
-    gchar *theme;
-    GKeyFile *theme_file;
-
     /* File monitor for password file */
     GFileMonitor *passwd_monitor;
   
@@ -238,17 +235,20 @@ static guint32 get_packet_length (LdmGreeter *greeter)
 static void
 handle_connected (LdmGreeter *greeter, gsize *offset)
 {
-    greeter->priv->theme = read_string (greeter, offset);
+    gchar *version;
+
+    version = read_string (greeter, offset);
     greeter->priv->default_session = read_string (greeter, offset);
     greeter->priv->selected_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-session=%s timed-user=%s login-delay=%d guest-account-supported=%s",
-             greeter->priv->theme,
+    g_debug ("Connected version=%s default-session=%s timed-user=%s login-delay=%d guest-account-supported=%s",
+             version,
              greeter->priv->default_session,
              greeter->priv->selected_user, greeter->priv->login_delay,
              greeter->priv->guest_account_supported ? "true" : "false");
+    g_free (version);
 
     if (greeter->priv->selected_user[0] == '\0')
         greeter->priv->selected_user = NULL;
@@ -510,111 +510,6 @@ ldm_greeter_get_hostname (LdmGreeter *greeter)
     return greeter->priv->hostname;
 }
 
-/**
- * ldm_greeter_get_theme:
- * @greeter: a #LdmGreeter
- *
- * Return value: The theme this greeter is using
- **/
-const gchar *
-ldm_greeter_get_theme (LdmGreeter *greeter)
-{
-    g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL);
-    return greeter->priv->theme;
-}
-
-static void
-load_theme (LdmGreeter *greeter)
-{
-    GError *error = NULL;
-
-    if (greeter->priv->theme_file)
-        return;
-
-    greeter->priv->theme_file = g_key_file_new ();
-    if (!g_key_file_load_from_file (greeter->priv->theme_file, greeter->priv->theme, G_KEY_FILE_NONE, &error))
-        g_warning ("Failed to read theme file: %s", error->message);
-    g_clear_error (&error);
-}
-
-/**
- * ldm_greeter_get_string_property:
- * @greeter: a #LdmGreeter
- * @name: the name of the property to get
- *
- * Return value: The value of this property or NULL if it is not defined
- **/
-gchar *
-ldm_greeter_get_string_property (LdmGreeter *greeter, const gchar *name)
-{
-    GError *error = NULL;
-    gchar *result;
-
-    g_return_val_if_fail (LDM_IS_GREETER (greeter), NULL);
-    g_return_val_if_fail (name != NULL, NULL);
-
-    load_theme (greeter);
-
-    result = g_key_file_get_string (greeter->priv->theme_file, "theme", name, &error);
-    if (!result)
-        g_warning ("Error reading theme property: %s", error->message); // FIXME: Can handle G_KEY_FILE_ERROR_KEY_NOT_FOUND and G_KEY_FILE_ERROR_GROUP_NOT_FOUND
-    g_clear_error (&error);
-
-    return result;
-}
-
-/**
- * ldm_greeter_get_integer_property:
- * @greeter: a #LdmGreeter
- * @name: the name of the property to get
- *
- * Return value: The value of this property or 0 if it is not defined
- **/
-gint
-ldm_greeter_get_integer_property (LdmGreeter *greeter, const gchar *name)
-{
-    GError *error = NULL;
-    gint result;
-
-    g_return_val_if_fail (LDM_IS_GREETER (greeter), 0);
-    g_return_val_if_fail (name != NULL, 0);
-
-    load_theme (greeter);
-
-    result = g_key_file_get_integer (greeter->priv->theme_file, "theme", name, &error);
-    if (!result)
-        g_warning ("Error reading theme property: %s", error->message); // FIXME: Can handle G_KEY_FILE_ERROR_KEY_NOT_FOUND and G_KEY_FILE_ERROR_GROUP_NOT_FOUND
-    g_clear_error (&error);
-
-    return result;
-}
-
-/**
- * ldm_greeter_get_boolean_property:
- * @greeter: a #LdmGreeter
- * @name: the name of the property to get
- *
- * Return value: The value of this property or FALSE if it is not defined
- **/
-gboolean
-ldm_greeter_get_boolean_property (LdmGreeter *greeter, const gchar *name)
-{
-    GError *error = NULL;
-    gboolean result;
-
-    g_return_val_if_fail (LDM_IS_GREETER (greeter), FALSE);
-    g_return_val_if_fail (name != NULL, FALSE);
-
-    load_theme (greeter);
-
-    result = g_key_file_get_boolean (greeter->priv->theme_file, "theme", name, &error);
-    if (!result)
-        g_warning ("Error reading theme property: %s", error->message); // FIXME: Can handle G_KEY_FILE_ERROR_KEY_NOT_FOUND and G_KEY_FILE_ERROR_GROUP_NOT_FOUND
-    g_clear_error (&error);
-
-    return result;
-}
-
 static LdmUser *
 get_user_by_name (LdmGreeter *greeter, const gchar *username)
 {
diff --git a/liblightdm-gobject/lightdm/greeter.h b/liblightdm-gobject/lightdm/greeter.h
index c10c4a84..a1cf3249 100644
--- a/liblightdm-gobject/lightdm/greeter.h
+++ b/liblightdm-gobject/lightdm/greeter.h
@@ -74,14 +74,6 @@ gboolean ldm_greeter_connect_to_server (LdmGreeter *greeter);
 
 const gchar *ldm_greeter_get_hostname (LdmGreeter *greeter);
 
-const gchar *ldm_greeter_get_theme (LdmGreeter *greeter);
-
-gchar *ldm_greeter_get_string_property (LdmGreeter *greeter, const gchar *name);
-
-gint ldm_greeter_get_integer_property (LdmGreeter *greeter, const gchar *name);
-
-gboolean ldm_greeter_get_boolean_property (LdmGreeter *greeter, const gchar *name);
-
 gint ldm_greeter_get_num_users (LdmGreeter *greeter);
 
 GList *ldm_greeter_get_users (LdmGreeter *greeter);
diff --git a/liblightdm-qt/QLightDM/greeter.cpp b/liblightdm-qt/QLightDM/greeter.cpp
index 2bbc8ec1..1907e70d 100644
--- a/liblightdm-qt/QLightDM/greeter.cpp
+++ b/liblightdm-qt/QLightDM/greeter.cpp
@@ -54,7 +54,6 @@ using namespace QLightDM;
 class GreeterPrivate
 {
 public:
-    QString theme;
     QString defaultSession;
     QString timedUser;
     int loginDelay;
@@ -317,16 +316,16 @@ void Greeter::onRead(int fd)
     int id = readInt(&offset);
     readInt(&offset);
     int nMessages, sequenceNumber, returnCode;
-    QString username;
+    QString version, username;
     switch(id)
     {
     case GREETER_MESSAGE_CONNECTED:
-        d->theme = readString(&offset);
+        version = 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-session=" << d->defaultSession << " timed-user=" << d->timedUser << " login-delay" << d->loginDelay << " guestAccountSupported" << d->guestAccountSupported;
+        qDebug() << "Connected version=" << version << " 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)
@@ -400,18 +399,6 @@ QString Greeter::hostname() const
     return QHostInfo::localHostName();
 }
 
-QString Greeter::theme() const
-{
-    return d->theme;
-}
-
-QVariant Greeter::getProperty(const QString &name) const
-{
-    QUrl themeUrl(d->theme);
-    QSettings themeInfo(themeUrl.path(), QSettings::IniFormat);
-    return themeInfo.value(name);
-}
-
 QString Greeter::defaultLanguage() const
 {
     return getenv("LANG");
diff --git a/liblightdm-qt/QLightDM/greeter.h b/liblightdm-qt/QLightDM/greeter.h
index d20954db..6fe3541b 100644
--- a/liblightdm-qt/QLightDM/greeter.h
+++ b/liblightdm-qt/QLightDM/greeter.h
@@ -40,9 +40,6 @@ namespace QLightDM
 
 	/** The hostname of the machine */
 	QString hostname() const;
-	QString theme() const;
-
-	Q_INVOKABLE QVariant getProperty(const QString &name) const;
 
 	QString timedLoginUser() const;
 	int timedLoginDelay() const;