]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Move Webkit greeter into separate module
authorunknown <robert.ancell@canonical.com>
Sat, 12 Feb 2011 00:49:20 +0000 (11:49 +1100)
committerunknown <robert.ancell@canonical.com>
Sat, 12 Feb 2011 00:49:20 +0000 (11:49 +1100)
.bzrignore
configure.ac
greeters/Makefile.am
greeters/ldm-webkit-greeter.c [deleted file]
po/POTFILES.in
themes/Makefile.am
themes/webkit/Makefile.am [deleted file]
themes/webkit/bg.jpg [deleted file]
themes/webkit/index.html [deleted file]
themes/webkit/index.theme [deleted file]

index ddce3ab14e2dfb83185ea171d2e5c8b9050956c1..483ec373c2f8720aba8c71e2b89edfef2c81bbce 100644 (file)
@@ -31,7 +31,6 @@ doc/tmpl/*-unused.sgml
 doc/*.txt
 doc/xml
 greeters/ldm-gtk-greeter
-greeters/ldm-webkit-greeter
 liblightdm-gobject/*.gir
 liblightdm-gobject/*.typelib
 liblightdm-gobject/*.vapi
index 5b35d21c225dfa3a90f280761c64f27e0e676d9d..bc1f8c68fb50ffc45c1f9aa60466bda1e54c0680 100644 (file)
@@ -85,13 +85,6 @@ PKG_CHECK_MODULES(LIGHTDM_GTK_GREETER, [
 ], have_gtk=yes, have_gtk=no)
 AM_CONDITIONAL(HAVE_GTK_GREETER, test $have_gtk = yes)
 
-PKG_CHECK_MODULES(LIGHTDM_WEBKIT_GREETER, [
-    gtk+-2.0
-    webkit-1.0
-    dbus-glib-1
-], have_webkit=yes, have_webkit=no)
-AM_CONDITIONAL(HAVE_WEBKIT_GREETER, test $have_webkit = yes)
-
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 AC_PATH_PROG(DBUSBINDINGTOOL, dbus-binding-tool)
 AC_SUBST(DBUSBINDINGTOOL)
@@ -259,7 +252,6 @@ po/Makefile.in
 src/Makefile
 themes/Makefile
 themes/gnome/Makefile
-themes/webkit/Makefile
 ])
 
 dnl ###########################################################################
@@ -288,5 +280,4 @@ echo "
         GObject introspection:    $found_introspection
         liblightdm-qt:            $compile_liblightdm_qt
         GTK+:                     $have_gtk
-        Webkit:                   $have_webkit
 "
index f7a1253a1a48df47834190925fdf0a067131cd14..ce021d832787cf4480fb7b92ced55d53540a7797 100644 (file)
@@ -3,9 +3,6 @@ libexec_PROGRAMS =
 if HAVE_GTK_GREETER
 libexec_PROGRAMS += ldm-gtk-greeter
 endif
-if HAVE_WEBKIT_GREETER
-libexec_PROGRAMS += ldm-webkit-greeter
-endif
 
 LIBLIGHTDM_LIB = $(top_builddir)/liblightdm-gobject/liblightdm-gobject.la
 LIBLIGHTDM_CFLAGS = \
@@ -30,21 +27,5 @@ ldm_gtk_greeter_LDADD = \
        $(LIBLIGHTDM_LDADD) \
        $(LIGHTDM_GTK_GREETER_LIBS)
 
-ldm_webkit_greeter_SOURCES = \
-       ldm-webkit-greeter.c
-
-ldm_webkit_greeter_CFLAGS = \
-       $(LIBLIGHTDM_CFLAGS) \
-       $(LIGHTDM_WEBKIT_GREETER_CFLAGS) \
-       $(WARN_CFLAGS) \
-       -DVERSION=\"$(VERSION)\" \
-       -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
-       -DLOCALE_DIR=\"$(localedir)\" \
-       -DLIGHTDM_WEBKIT_GREETER_BINARY=\"ldm-webkit-greeter\"
-
-ldm_webkit_greeter_LDADD = \
-       $(LIBLIGHTDM_LDADD) \
-       $(LIGHTDM_WEBKIT_GREETER_LIBS)
-
 DISTCLEANFILES = \
        Makefile.in
diff --git a/greeters/ldm-webkit-greeter.c b/greeters/ldm-webkit-greeter.c
deleted file mode 100644 (file)
index 2b63d94..0000000
+++ /dev/null
@@ -1,1171 +0,0 @@
-/*
- * Copyright (C) 2010 Robert Ancell.
- * Author: Robert Ancell <robert.ancell@canonical.com>
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version. See http://www.gnu.org/copyleft/gpl.html the full text of the
- * license.
- */
-
-#include <stdlib.h>
-#include <gtk/gtk.h>
-#include <webkit/webkit.h>
-#include <JavaScriptCore/JavaScript.h>
-#include <glib/gi18n.h>
-
-#include "greeter.h"
-
-static JSClassRef gettext_class, ldm_greeter_class, ldm_user_class, ldm_language_class, ldm_layout_class, ldm_session_class;
-
-static GtkWidget *window;
-
-static void
-show_prompt_cb (LdmGreeter *greeter, const gchar *text, WebKitWebView *view)
-{
-    gchar *command;
-
-    command = g_strdup_printf ("show_prompt('%s')", text); // FIXME: Escape text
-    webkit_web_view_execute_script (view, command);
-    g_free (command);
-}
-
-static void
-show_message_cb (LdmGreeter *greeter, const gchar *text, WebKitWebView *view)
-{
-    gchar *command;
-
-    command = g_strdup_printf ("show_message('%s')", text); // FIXME: Escape text
-    webkit_web_view_execute_script (view, command);
-    g_free (command);
-}
-
-static void
-authentication_complete_cb (LdmGreeter *greeter, WebKitWebView *view)
-{
-    webkit_web_view_execute_script (view, "authentication_complete()");
-}
-
-static void
-timed_login_cb (LdmGreeter *greeter, const gchar *username, WebKitWebView *view)
-{
-    gchar *command;
-
-    command = g_strdup_printf ("timed_login('%s')", username); // FIXME: Escape text
-    webkit_web_view_execute_script (view, command);
-    g_free (command);
-}
-
-static gboolean
-fade_timer_cb (gpointer data)
-{
-    gdouble opacity;
-
-    opacity = gtk_window_get_opacity (GTK_WINDOW (window));
-    opacity -= 0.1;
-    if (opacity <= 0)
-    {
-        gtk_main_quit ();
-        return FALSE;
-    }
-    gtk_window_set_opacity (GTK_WINDOW (window), opacity);
-
-    return TRUE;
-}
-
-static void
-quit_cb (LdmGreeter *greeter, const gchar *username)
-{
-    /* Fade out the greeter */
-    g_timeout_add (40, (GSourceFunc) fade_timer_cb, NULL);
-}
-
-static JSValueRef
-get_user_name_cb (JSContextRef context,
-                  JSObjectRef thisObject,
-                  JSStringRef propertyName,
-                  JSValueRef *exception)
-{
-    LdmUser *user = JSObjectGetPrivate (thisObject);
-    JSStringRef string;
-
-    string = JSStringCreateWithUTF8CString (ldm_user_get_name (user));
-    return JSValueMakeString (context, string);
-}
-
-static JSValueRef
-get_user_real_name_cb (JSContextRef context,
-                       JSObjectRef thisObject,
-                       JSStringRef propertyName,
-                       JSValueRef *exception)
-{
-    LdmUser *user = JSObjectGetPrivate (thisObject);
-    JSStringRef string;
-
-    string = JSStringCreateWithUTF8CString (ldm_user_get_real_name (user));
-    return JSValueMakeString (context, string);
-}
-
-static JSValueRef
-get_user_display_name_cb (JSContextRef context,
-                          JSObjectRef thisObject,
-                          JSStringRef propertyName,
-                          JSValueRef *exception)
-{
-    LdmUser *user = JSObjectGetPrivate (thisObject);
-    JSStringRef string;
-
-    string = JSStringCreateWithUTF8CString (ldm_user_get_display_name (user));
-    return JSValueMakeString (context, string);
-}
-
-static JSValueRef
-get_user_image_cb (JSContextRef context,
-                   JSObjectRef thisObject,
-                   JSStringRef propertyName,
-                   JSValueRef *exception)
-{
-    LdmUser *user = JSObjectGetPrivate (thisObject);
-    JSStringRef string;
-
-    string = JSStringCreateWithUTF8CString (ldm_user_get_image (user));
-    return JSValueMakeString (context, string);
-}
-
-static JSValueRef
-get_user_language_cb (JSContextRef context,
-                      JSObjectRef thisObject,
-                      JSStringRef propertyName,
-                      JSValueRef *exception)
-{
-    LdmUser *user = JSObjectGetPrivate (thisObject);
-    const gchar *language = ldm_user_get_language (user);
-    JSStringRef string;
-
-    if (!language)
-        return JSValueMakeNull (context);
-
-    string = JSStringCreateWithUTF8CString (language);
-    return JSValueMakeString (context, string);
-}
-
-static JSValueRef
-get_user_layout_cb (JSContextRef context,
-                    JSObjectRef thisObject,
-                    JSStringRef propertyName,
-                    JSValueRef *exception)
-{
-    LdmUser *user = JSObjectGetPrivate (thisObject);
-    const gchar *layout = ldm_user_get_layout (user);
-    JSStringRef string;
-
-    if (!layout)
-        return JSValueMakeNull (context);
-
-    string = JSStringCreateWithUTF8CString (layout);
-    return JSValueMakeString (context, string);
-}
-
-static JSValueRef
-get_user_session_cb (JSContextRef context,
-                     JSObjectRef thisObject,
-                     JSStringRef propertyName,
-                     JSValueRef *exception)
-{
-    LdmUser *user = JSObjectGetPrivate (thisObject);
-    const gchar *session = ldm_user_get_session (user);
-    JSStringRef string;
-
-    if (!session)
-        return JSValueMakeNull (context);
-
-    string = JSStringCreateWithUTF8CString (session);
-    return JSValueMakeString (context, string);
-}
-
-static JSValueRef
-get_user_logged_in_cb (JSContextRef context,
-                       JSObjectRef thisObject,
-                       JSStringRef propertyName,
-                       JSValueRef *exception)
-{
-    LdmUser *user = JSObjectGetPrivate (thisObject);
-    return JSValueMakeBoolean (context, ldm_user_get_logged_in (user));
-}
-
-static JSValueRef
-get_language_code_cb (JSContextRef context,
-                      JSObjectRef thisObject,
-                      JSStringRef propertyName,
-                      JSValueRef *exception)
-{
-    LdmLanguage *language = JSObjectGetPrivate (thisObject);
-    JSStringRef string;
-
-    string = JSStringCreateWithUTF8CString (ldm_language_get_code (language));
-    return JSValueMakeString (context, string);
-}
-
-static JSValueRef
-get_language_name_cb (JSContextRef context,
-                      JSObjectRef thisObject,
-                      JSStringRef propertyName,
-                      JSValueRef *exception)
-{
-    LdmLanguage *language = JSObjectGetPrivate (thisObject);
-    JSStringRef string;
-
-    string = JSStringCreateWithUTF8CString (ldm_language_get_name (language));
-    return JSValueMakeString (context, string);
-}
-
-static JSValueRef
-get_language_territory_cb (JSContextRef context,
-                           JSObjectRef thisObject,
-                           JSStringRef propertyName,
-                           JSValueRef *exception)
-{
-    LdmLanguage *language = JSObjectGetPrivate (thisObject);
-    JSStringRef string;
-
-    string = JSStringCreateWithUTF8CString (ldm_language_get_territory (language));
-    return JSValueMakeString (context, string);
-}
-
-static JSValueRef
-get_layout_name_cb (JSContextRef context,
-                    JSObjectRef thisObject,
-                    JSStringRef propertyName,
-                    JSValueRef *exception)
-{
-    LdmLayout *layout = JSObjectGetPrivate (thisObject);
-    JSStringRef string;
-
-    string = JSStringCreateWithUTF8CString (ldm_layout_get_name (layout));
-    return JSValueMakeString (context, string);
-}
-
-static JSValueRef
-get_layout_short_description_cb (JSContextRef context,
-                                 JSObjectRef thisObject,
-                                 JSStringRef propertyName,
-                                 JSValueRef *exception)
-{
-    LdmLayout *layout = JSObjectGetPrivate (thisObject);
-    JSStringRef string;
-
-    string = JSStringCreateWithUTF8CString (ldm_layout_get_short_description (layout));
-    return JSValueMakeString (context, string);
-}
-
-static JSValueRef
-get_layout_description_cb (JSContextRef context,
-                           JSObjectRef thisObject,
-                           JSStringRef propertyName,
-                           JSValueRef *exception)
-{
-    LdmLayout *layout = JSObjectGetPrivate (thisObject);
-    JSStringRef string;
-
-    string = JSStringCreateWithUTF8CString (ldm_layout_get_description (layout));
-    return JSValueMakeString (context, string);
-}
-
-static JSValueRef
-get_session_key_cb (JSContextRef context,
-                    JSObjectRef thisObject,
-                    JSStringRef propertyName,
-                    JSValueRef *exception)
-{
-    LdmSession *session = JSObjectGetPrivate (thisObject);
-    JSStringRef string;
-
-    string = JSStringCreateWithUTF8CString (ldm_session_get_key (session));
-    return JSValueMakeString (context, string);
-
-}
-static JSValueRef
-get_session_name_cb (JSContextRef context,
-                     JSObjectRef thisObject,
-                     JSStringRef propertyName,
-                     JSValueRef *exception)
-{
-    LdmSession *session = JSObjectGetPrivate (thisObject);
-    JSStringRef string;
-
-    string = JSStringCreateWithUTF8CString (ldm_session_get_name (session));
-    return JSValueMakeString (context, string);
-}
-
-static JSValueRef
-get_session_comment_cb (JSContextRef context,
-                        JSObjectRef thisObject,
-                        JSStringRef propertyName,
-                        JSValueRef *exception)
-{
-    LdmSession *session = JSObjectGetPrivate (thisObject);
-    JSStringRef string;
-
-    string = JSStringCreateWithUTF8CString (ldm_session_get_comment (session));
-    return JSValueMakeString (context, string);
-}
-
-static JSValueRef
-get_hostname_cb (JSContextRef context,
-                 JSObjectRef thisObject,
-                 JSStringRef propertyName,
-                 JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    JSStringRef string;
-
-    string = JSStringCreateWithUTF8CString (ldm_greeter_get_hostname (greeter));
-
-    return JSValueMakeString (context, string);
-}
-
-static JSValueRef
-get_num_users_cb (JSContextRef context,
-                  JSObjectRef thisObject,
-                  JSStringRef propertyName,
-                  JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    gint num_users;
-
-    num_users = ldm_greeter_get_num_users (greeter);
-    return JSValueMakeNumber (context, num_users);
-}
-
-static JSValueRef
-get_users_cb (JSContextRef context,
-              JSObjectRef thisObject,
-              JSStringRef propertyName,
-              JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    JSObjectRef array;
-    const GList *users, *link;
-    guint i, n_users = 0;
-    JSValueRef *args;
-
-    users = ldm_greeter_get_users (greeter);
-    n_users = g_list_length ((GList *)users);
-    args = g_malloc (sizeof (JSValueRef) * (n_users + 1));
-    for (i = 0, link = users; link; i++, link = link->next)
-    {
-        LdmUser *user = link->data;
-        g_object_ref (user);
-        args[i] = JSObjectMake (context, ldm_user_class, user);
-    }
-
-    array = JSObjectMakeArray (context, n_users, args, NULL);
-    g_free (args);
-    return array;
-}
-
-static JSValueRef
-get_languages_cb (JSContextRef context,
-                  JSObjectRef thisObject,
-                  JSStringRef propertyName,
-                  JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    JSObjectRef array;
-    const GList *languages, *link;
-    guint i, n_languages = 0;
-    JSValueRef *args;
-
-    languages = ldm_greeter_get_languages (greeter);
-    n_languages = g_list_length ((GList *)languages);
-    args = g_malloc (sizeof (JSValueRef) * (n_languages + 1));
-    for (i = 0, link = languages; link; i++, link = link->next)
-    {
-        LdmLanguage *language = link->data;
-        g_object_ref (language);
-        args[i] = JSObjectMake (context, ldm_language_class, language);
-    }
-
-    array = JSObjectMakeArray (context, n_languages, args, NULL);
-    g_free (args);
-    return array;
-}
-
-static JSValueRef
-get_default_language_cb (JSContextRef context,
-                         JSObjectRef thisObject,
-                         JSStringRef propertyName,
-                         JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    JSStringRef string;
-
-    string = JSStringCreateWithUTF8CString (ldm_greeter_get_default_language (greeter));
-
-    return JSValueMakeString (context, string);
-}
-
-static JSValueRef
-get_default_layout_cb (JSContextRef context,
-                       JSObjectRef thisObject,
-                       JSStringRef propertyName,
-                       JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    JSStringRef string;
-
-    string = JSStringCreateWithUTF8CString (ldm_greeter_get_default_layout (greeter));
-
-    return JSValueMakeString (context, string);
-}
-
-static JSValueRef
-get_layouts_cb (JSContextRef context,
-                JSObjectRef thisObject,
-                JSStringRef propertyName,
-                JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    JSObjectRef array;
-    const GList *layouts, *link;
-    guint i, n_layouts = 0;
-    JSValueRef *args;
-
-    layouts = ldm_greeter_get_layouts (greeter);
-    n_layouts = g_list_length ((GList *)layouts);
-    args = g_malloc (sizeof (JSValueRef) * (n_layouts + 1));
-    for (i = 0, link = layouts; link; i++, link = link->next)
-    {
-        LdmLayout *layout = link->data;
-        g_object_ref (layout);
-        args[i] = JSObjectMake (context, ldm_layout_class, layout);
-    }
-
-    array = JSObjectMakeArray (context, n_layouts, args, NULL);
-    g_free (args);
-    return array;
-}
-
-static JSValueRef
-get_layout_cb (JSContextRef context,
-               JSObjectRef thisObject,
-               JSStringRef propertyName,
-               JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    JSStringRef string;
-
-    string = JSStringCreateWithUTF8CString (ldm_greeter_get_layout (greeter));
-
-    return JSValueMakeString (context, string);
-}
-
-static bool
-set_layout_cb (JSContextRef context,
-               JSObjectRef thisObject,
-               JSStringRef propertyName,
-               JSValueRef value,
-               JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    JSStringRef layout_arg;
-    char layout[1024];
-
-    // FIXME: Throw exception
-    if (JSValueGetType (context, value) != kJSTypeString)
-        return false;
-
-    layout_arg = JSValueToStringCopy (context, value, NULL);
-    JSStringGetUTF8CString (layout_arg, layout, 1024);
-    JSStringRelease (layout_arg);
-
-    ldm_greeter_set_layout (greeter, layout);
-
-    return true;
-}
-
-static JSValueRef
-get_sessions_cb (JSContextRef context,
-                 JSObjectRef thisObject,
-                 JSStringRef propertyName,
-                 JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    JSObjectRef array;
-    const GList *sessions, *link;
-    guint i, n_sessions = 0;
-    JSValueRef *args;
-
-    sessions = ldm_greeter_get_sessions (greeter);
-    n_sessions = g_list_length ((GList *)sessions);
-    args = g_malloc (sizeof (JSValueRef) * (n_sessions + 1));
-    for (i = 0, link = sessions; link; i++, link = link->next)
-    {
-        LdmSession *session = link->data;
-        g_object_ref (session);
-        args[i] = JSObjectMake (context, ldm_session_class, session);
-    }
-
-    array = JSObjectMakeArray (context, n_sessions, args, NULL);
-    g_free (args);
-    return array;
-}
-
-static JSValueRef
-get_default_session_cb (JSContextRef context,
-                        JSObjectRef thisObject,
-                        JSStringRef propertyName,
-                        JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    JSStringRef string;
-
-    string = JSStringCreateWithUTF8CString (ldm_greeter_get_default_session (greeter));
-
-    return JSValueMakeString (context, string);
-}
-
-static JSValueRef
-get_timed_login_user_cb (JSContextRef context,
-                         JSObjectRef thisObject,
-                         JSStringRef propertyName,
-                         JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    JSStringRef string;
-
-    string = JSStringCreateWithUTF8CString (ldm_greeter_get_timed_login_user (greeter));
-
-    return JSValueMakeString (context, string);
-}
-
-static JSValueRef
-get_timed_login_delay_cb (JSContextRef context,
-                          JSObjectRef thisObject,
-                          JSStringRef propertyName,
-                          JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    gint delay;
-
-    delay = ldm_greeter_get_timed_login_delay (greeter);
-    return JSValueMakeNumber (context, delay);
-}
-
-static JSValueRef
-get_string_property_cb (JSContextRef context,
-                        JSObjectRef function,
-                        JSObjectRef thisObject,
-                        size_t argumentCount,
-                        const JSValueRef arguments[],
-                        JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    JSStringRef name_arg;
-    char name[1024];
-    gchar *value;
-    JSStringRef string;
-
-    // FIXME: Throw exception
-    if (argumentCount != 1)
-        return JSValueMakeNull (context);
-
-    name_arg = JSValueToStringCopy (context, arguments[0], NULL);
-    JSStringGetUTF8CString (name_arg, name, 1024);
-    JSStringRelease (name_arg);
-
-    value = ldm_greeter_get_string_property (greeter, name);
-
-    if (!value)
-        return JSValueMakeNull (context);
-
-    string = JSStringCreateWithUTF8CString (value);
-    g_free (value);
-    return JSValueMakeString (context, string);
-}
-
-static JSValueRef
-get_integer_property_cb (JSContextRef context,
-                         JSObjectRef function,
-                         JSObjectRef thisObject,
-                         size_t argumentCount,
-                         const JSValueRef arguments[],
-                         JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    JSStringRef name_arg;
-    char name[1024];
-
-    // FIXME: Throw exception
-    if (argumentCount != 1)
-        return JSValueMakeNull (context);
-
-    name_arg = JSValueToStringCopy (context, arguments[0], NULL);
-    JSStringGetUTF8CString (name_arg, name, 1024);
-    JSStringRelease (name_arg);
-
-    return JSValueMakeNumber (context, ldm_greeter_get_integer_property (greeter, name));
-}
-
-static JSValueRef
-get_boolean_property_cb (JSContextRef context,
-                         JSObjectRef function,
-                         JSObjectRef thisObject,
-                         size_t argumentCount,
-                         const JSValueRef arguments[],
-                         JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    JSStringRef name_arg;
-    char name[1024];
-
-    // FIXME: Throw exception
-    if (argumentCount != 1)
-        return JSValueMakeNull (context);
-
-    name_arg = JSValueToStringCopy (context, arguments[0], NULL);
-    JSStringGetUTF8CString (name_arg, name, 1024);
-    JSStringRelease (name_arg);
-
-    return JSValueMakeBoolean (context, ldm_greeter_get_boolean_property (greeter, name));
-}
-
-static JSValueRef
-cancel_timed_login_cb (JSContextRef context,
-                       JSObjectRef function,
-                       JSObjectRef thisObject,
-                       size_t argumentCount,
-                       const JSValueRef arguments[],
-                       JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-
-    // FIXME: Throw exception
-    if (argumentCount != 0)
-        return JSValueMakeNull (context);
-
-    ldm_greeter_cancel_timed_login (greeter);
-    return JSValueMakeNull (context);
-}
-
-static JSValueRef
-start_authentication_cb (JSContextRef context,
-                         JSObjectRef function,
-                         JSObjectRef thisObject,
-                         size_t argumentCount,
-                         const JSValueRef arguments[],
-                         JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    JSStringRef name_arg;
-    char name[1024];
-
-    // FIXME: Throw exception
-    if (!(argumentCount == 1 && JSValueGetType (context, arguments[0]) == kJSTypeString))
-        return JSValueMakeNull (context);
-
-    name_arg = JSValueToStringCopy (context, arguments[0], NULL);
-    JSStringGetUTF8CString (name_arg, name, 1024);
-    JSStringRelease (name_arg);
-
-    ldm_greeter_start_authentication (greeter, name);
-    return JSValueMakeNull (context);
-}
-
-static JSValueRef
-provide_secret_cb (JSContextRef context,
-                   JSObjectRef function,
-                   JSObjectRef thisObject,
-                   size_t argumentCount,
-                   const JSValueRef arguments[],
-                   JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    JSStringRef secret_arg;
-    char secret[1024];
-
-    // FIXME: Throw exception
-    if (!(argumentCount == 1 && JSValueGetType (context, arguments[0]) == kJSTypeString))
-        return JSValueMakeNull (context);
-
-    secret_arg = JSValueToStringCopy (context, arguments[0], NULL);
-    JSStringGetUTF8CString (secret_arg, secret, 1024);
-    JSStringRelease (secret_arg);
-
-    ldm_greeter_provide_secret (greeter, secret);
-    return JSValueMakeNull (context);
-}
-
-static JSValueRef
-cancel_authentication_cb (JSContextRef context,
-                          JSObjectRef function,
-                          JSObjectRef thisObject,
-                          size_t argumentCount,
-                          const JSValueRef arguments[],
-                          JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-
-    // FIXME: Throw exception
-    if (argumentCount != 0)
-        return JSValueMakeNull (context);
-
-    ldm_greeter_cancel_authentication (greeter);
-    return JSValueMakeNull (context);
-}
-
-static JSValueRef
-get_authentication_user_cb (JSContextRef context,
-                            JSObjectRef thisObject,
-                            JSStringRef propertyName,
-                            JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    return JSValueMakeString (context, JSStringCreateWithUTF8CString (ldm_greeter_get_authentication_user (greeter)));
-}
-
-static JSValueRef
-get_is_authenticated_cb (JSContextRef context,
-                         JSObjectRef thisObject,
-                         JSStringRef propertyName,
-                         JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    return JSValueMakeBoolean (context, ldm_greeter_get_is_authenticated (greeter));
-}
-
-static JSValueRef
-get_can_suspend_cb (JSContextRef context,
-                    JSObjectRef thisObject,
-                    JSStringRef propertyName,
-                    JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    return JSValueMakeBoolean (context, ldm_greeter_get_can_suspend (greeter));
-}
-
-static JSValueRef
-suspend_cb (JSContextRef context,
-            JSObjectRef function,
-            JSObjectRef thisObject,
-            size_t argumentCount,
-            const JSValueRef arguments[],
-            JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-
-    // FIXME: Throw exception
-    if (argumentCount != 0)
-        return JSValueMakeNull (context);
-
-    ldm_greeter_suspend (greeter);
-    return JSValueMakeNull (context);
-}
-
-static JSValueRef
-get_can_hibernate_cb (JSContextRef context,
-                      JSObjectRef thisObject,
-                      JSStringRef propertyName,
-                      JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    return JSValueMakeBoolean (context, ldm_greeter_get_can_hibernate (greeter));
-}
-
-static JSValueRef
-hibernate_cb (JSContextRef context,
-              JSObjectRef function,
-              JSObjectRef thisObject,
-              size_t argumentCount,
-              const JSValueRef arguments[],
-              JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-
-    // FIXME: Throw exception
-    if (argumentCount != 0)
-        return JSValueMakeNull (context);
-
-    ldm_greeter_hibernate (greeter);
-    return JSValueMakeNull (context);
-}
-
-static JSValueRef
-get_can_restart_cb (JSContextRef context,
-                    JSObjectRef thisObject,
-                    JSStringRef propertyName,
-                    JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    return JSValueMakeBoolean (context, ldm_greeter_get_can_restart (greeter));
-}
-
-static JSValueRef
-restart_cb (JSContextRef context,
-            JSObjectRef function,
-            JSObjectRef thisObject,
-            size_t argumentCount,
-            const JSValueRef arguments[],
-            JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-
-    // FIXME: Throw exception
-    if (argumentCount != 0)
-        return JSValueMakeNull (context);
-
-    ldm_greeter_restart (greeter);
-    return JSValueMakeNull (context);
-}
-
-static JSValueRef
-get_can_shutdown_cb (JSContextRef context,
-                     JSObjectRef thisObject,
-                     JSStringRef propertyName,
-                     JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    return JSValueMakeBoolean (context, ldm_greeter_get_can_shutdown (greeter));
-}
-
-static JSValueRef
-shutdown_cb (JSContextRef context,
-             JSObjectRef function,
-             JSObjectRef thisObject,
-             size_t argumentCount,
-             const JSValueRef arguments[],
-             JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-
-    // FIXME: Throw exception
-    if (argumentCount != 0)
-        return JSValueMakeNull (context);
-
-    ldm_greeter_shutdown (greeter);
-    return JSValueMakeNull (context);
-}
-
-static JSValueRef
-login_cb (JSContextRef context,
-          JSObjectRef function,
-          JSObjectRef thisObject,
-          size_t argumentCount,
-          const JSValueRef arguments[],
-          JSValueRef *exception)
-{
-    LdmGreeter *greeter = JSObjectGetPrivate (thisObject);
-    JSStringRef arg;
-    char username[1024], *session = NULL, *language = NULL;
-
-    // FIXME: Throw exception
-    if (argumentCount < 1 || argumentCount > 3)
-        return JSValueMakeNull (context);
-
-    arg = JSValueToStringCopy (context, arguments[0], NULL);
-    JSStringGetUTF8CString (arg, username, 1024);
-    JSStringRelease (arg);
-
-    if (argumentCount > 1)
-    {
-        arg = JSValueToStringCopy (context, arguments[1], NULL);
-        session = g_malloc (sizeof (char) * 1024);
-        JSStringGetUTF8CString (arg, session, 1024);
-        JSStringRelease (arg);
-    }
-
-    if (argumentCount > 2)
-    {
-        arg = JSValueToStringCopy (context, arguments[1], NULL);
-        language = g_malloc (sizeof (char) * 1024);
-        JSStringGetUTF8CString (arg, language, 1024);
-        JSStringRelease (arg);
-    }
-
-    ldm_greeter_login (greeter, username, session, language);
-    g_free (session);
-    g_free (language);
-
-    return JSValueMakeNull (context);
-}
-
-static JSValueRef
-gettext_cb (JSContextRef context,
-            JSObjectRef function,
-            JSObjectRef thisObject,
-            size_t argumentCount,
-            const JSValueRef arguments[],
-            JSValueRef *exception)
-{
-    JSStringRef string_arg, result;
-    char string[1024];
-
-    // FIXME: Throw exception
-    if (argumentCount != 1)
-        return JSValueMakeNull (context);
-
-    string_arg = JSValueToStringCopy (context, arguments[0], NULL);
-    JSStringGetUTF8CString (string_arg, string, 1024);
-    JSStringRelease (string_arg);
-
-    result = JSStringCreateWithUTF8CString (gettext (string));
-    return JSValueMakeString (context, result);
-}
-
-static JSValueRef
-ngettext_cb (JSContextRef context,
-             JSObjectRef function,
-             JSObjectRef thisObject,
-             size_t argumentCount,
-             const JSValueRef arguments[],
-             JSValueRef *exception)
-{
-    JSStringRef string_arg, plural_string_arg, result;
-    char string[1024], plural_string[1024];
-    unsigned int n;
-
-    // FIXME: Throw exception
-    if (argumentCount != 3)
-        return JSValueMakeNull (context);
-
-    string_arg = JSValueToStringCopy (context, arguments[0], NULL);
-    JSStringGetUTF8CString (string_arg, string, 1024);
-    JSStringRelease (string_arg);
-
-    plural_string_arg = JSValueToStringCopy (context, arguments[1], NULL);
-    JSStringGetUTF8CString (plural_string_arg, string, 1024);
-    JSStringRelease (plural_string_arg);
-
-    n = JSValueToNumber (context, arguments[2], NULL);
-
-    result = JSStringCreateWithUTF8CString (ngettext (string, plural_string, n));
-    return JSValueMakeString (context, result);
-}
-
-static const JSStaticValue ldm_user_values[] =
-{
-    { "name", get_user_name_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "real_name", get_user_real_name_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "display_name", get_user_display_name_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "image", get_user_image_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "language", get_user_language_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "layout", get_user_layout_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "session", get_user_session_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "logged_in", get_user_logged_in_cb, NULL, kJSPropertyAttributeReadOnly },
-    { NULL, NULL, NULL, 0 }
-};
-
-static const JSStaticValue ldm_language_values[] =
-{
-    { "code", get_language_code_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "name", get_language_name_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "territory", get_language_territory_cb, NULL, kJSPropertyAttributeReadOnly },
-    { NULL, NULL, NULL, 0 }
-};
-
-static const JSStaticValue ldm_layout_values[] =
-{
-    { "name", get_layout_name_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "short_description", get_layout_short_description_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "description", get_layout_description_cb, NULL, kJSPropertyAttributeReadOnly },
-    { NULL, NULL, NULL, 0 }
-};
-
-static const JSStaticValue ldm_session_values[] =
-{
-    { "key", get_session_key_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "name", get_session_name_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "comment", get_session_comment_cb, NULL, kJSPropertyAttributeReadOnly },
-    { NULL, NULL, NULL, 0 }
-};
-
-static const JSStaticValue ldm_greeter_values[] =
-{
-    { "hostname", get_hostname_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "users", get_users_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "default_language", get_default_language_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "languages", get_languages_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "default_layout", get_default_layout_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "layouts", get_layouts_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "layout", get_layout_cb, set_layout_cb, kJSPropertyAttributeReadOnly },
-    { "sessions", get_sessions_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "num_users", get_num_users_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "default_session", get_default_session_cb, NULL, kJSPropertyAttributeNone },
-    { "timed_login_user", get_timed_login_user_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "timed_login_delay", get_timed_login_delay_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "authentication_user", get_authentication_user_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "is_authenticated", get_is_authenticated_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "can_suspend", get_can_suspend_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "can_hibernate", get_can_hibernate_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "can_restart", get_can_restart_cb, NULL, kJSPropertyAttributeReadOnly },
-    { "can_shutdown", get_can_shutdown_cb, NULL, kJSPropertyAttributeReadOnly },
-    { NULL, NULL, NULL, 0 }
-};
-
-static const JSStaticFunction ldm_greeter_functions[] =
-{
-    { "get_string_property", get_string_property_cb, kJSPropertyAttributeReadOnly },
-    { "get_integer_property", get_integer_property_cb, kJSPropertyAttributeReadOnly },
-    { "get_boolean_property", get_boolean_property_cb, kJSPropertyAttributeReadOnly },
-    { "cancel_timed_login", cancel_timed_login_cb, kJSPropertyAttributeReadOnly },
-    { "start_authentication", start_authentication_cb, kJSPropertyAttributeReadOnly },
-    { "provide_secret", provide_secret_cb, kJSPropertyAttributeReadOnly },
-    { "cancel_authentication", cancel_authentication_cb, kJSPropertyAttributeReadOnly },
-    { "suspend", suspend_cb, kJSPropertyAttributeReadOnly },
-    { "hibernate", hibernate_cb, kJSPropertyAttributeReadOnly },
-    { "restart", restart_cb, kJSPropertyAttributeReadOnly },
-    { "shutdown", shutdown_cb, kJSPropertyAttributeReadOnly },
-    { "login", login_cb, kJSPropertyAttributeReadOnly },
-    { NULL, NULL, 0 }
-};
-
-static const JSStaticFunction gettext_functions[] =
-{
-    { "gettext", gettext_cb, kJSPropertyAttributeReadOnly },
-    { "ngettext", ngettext_cb, kJSPropertyAttributeReadOnly },
-    { NULL, NULL, 0 }
-};
-
-static const JSClassDefinition ldm_user_definition =
-{
-    0,                     /* Version */
-    kJSClassAttributeNone, /* Attributes */
-    "LdmUser",             /* Class name */
-    NULL,                  /* Parent class */
-    ldm_user_values,       /* Static values */
-};
-
-static const JSClassDefinition ldm_language_definition =
-{
-    0,                     /* Version */
-    kJSClassAttributeNone, /* Attributes */
-    "LdmLanguage",         /* Class name */
-    NULL,                  /* Parent class */
-    ldm_language_values,   /* Static values */
-};
-
-static const JSClassDefinition ldm_layout_definition =
-{
-    0,                     /* Version */
-    kJSClassAttributeNone, /* Attributes */
-    "LdmLayout",           /* Class name */
-    NULL,                  /* Parent class */
-    ldm_layout_values,     /* Static values */
-};
-
-static const JSClassDefinition ldm_session_definition =
-{
-    0,                     /* Version */
-    kJSClassAttributeNone, /* Attributes */
-    "LdmSession",          /* Class name */
-    NULL,                  /* Parent class */
-    ldm_session_values,    /* Static values */
-};
-
-static const JSClassDefinition ldm_greeter_definition =
-{
-    0,                     /* Version */
-    kJSClassAttributeNone, /* Attributes */
-    "LdmGreeter",          /* Class name */
-    NULL,                  /* Parent class */
-    ldm_greeter_values,    /* Static values */
-    ldm_greeter_functions, /* Static functions */
-};
-
-static const JSClassDefinition gettext_definition =
-{
-    0,                     /* Version */
-    kJSClassAttributeNone, /* Attributes */
-    "GettextClass",        /* Class name */
-    NULL,                  /* Parent class */
-    NULL,
-    gettext_functions,     /* Static functions */
-};
-
-static void
-window_object_cleared_cb (WebKitWebView  *web_view,
-                          WebKitWebFrame *frame,
-                          JSGlobalContextRef context,
-                          JSObjectRef window_object,
-                          LdmGreeter *greeter)
-{
-    JSObjectRef gettext_object, ldm_greeter_object;
-
-    gettext_class = JSClassCreate (&gettext_definition);
-    ldm_greeter_class = JSClassCreate (&ldm_greeter_definition);
-    ldm_user_class = JSClassCreate (&ldm_user_definition);
-    ldm_language_class = JSClassCreate (&ldm_language_definition);
-    ldm_layout_class = JSClassCreate (&ldm_layout_definition);
-    ldm_session_class = JSClassCreate (&ldm_session_definition);
-
-    gettext_object = JSObjectMake (context, gettext_class, NULL);
-    JSObjectSetProperty (context,
-                         JSContextGetGlobalObject (context),
-                         JSStringCreateWithUTF8CString ("gettext"),
-                         gettext_object, kJSPropertyAttributeNone, NULL);
-
-    ldm_greeter_object = JSObjectMake (context, ldm_greeter_class, greeter);
-    JSObjectSetProperty (context,
-                         JSContextGetGlobalObject (context),
-                         JSStringCreateWithUTF8CString ("lightdm"),
-                         ldm_greeter_object, kJSPropertyAttributeNone, NULL);
-}
-
-static void
-sigterm_cb (int signum)
-{
-    exit (0);
-}
-
-int
-main(int argc, char **argv)
-{
-    LdmGreeter *greeter;
-    GdkDisplay *display;
-    GdkScreen *screen;
-    gint screen_width, screen_height;
-    GtkWidget *web_view;
-    gchar *url;
-
-    signal (SIGTERM, sigterm_cb);
-
-    gtk_init (&argc, &argv);
-
-    if (argc != 2) {
-        g_printerr ("Usage: %s <url>\n", argv[0]);
-        return 1;
-    }
-    url = argv[1];
-
-    greeter = ldm_greeter_new ();
-
-    display = gdk_display_get_default ();
-    screen = gdk_display_get_default_screen (display);
-    screen_width = gdk_screen_get_width (screen);
-    screen_height = gdk_screen_get_height (screen);
-
-    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-    gtk_window_set_default_size (GTK_WINDOW (window), screen_width, screen_height);
-    gtk_window_fullscreen (GTK_WINDOW (window));
-
-    web_view = webkit_web_view_new ();
-    g_signal_connect (G_OBJECT (web_view), "window-object-cleared", G_CALLBACK (window_object_cleared_cb), greeter);
-    gtk_container_add (GTK_CONTAINER (window), web_view);
-
-    g_signal_connect (G_OBJECT (greeter), "show-prompt", G_CALLBACK (show_prompt_cb), web_view);
-    g_signal_connect (G_OBJECT (greeter), "show-message", G_CALLBACK (show_message_cb), web_view);
-    g_signal_connect (G_OBJECT (greeter), "show-error", G_CALLBACK (show_message_cb), web_view);
-    g_signal_connect (G_OBJECT (greeter), "authentication-complete", G_CALLBACK (authentication_complete_cb), web_view);
-    g_signal_connect (G_OBJECT (greeter), "timed-login", G_CALLBACK (timed_login_cb), web_view);
-    g_signal_connect (G_OBJECT (greeter), "quit", G_CALLBACK (quit_cb), web_view);
-
-    webkit_web_view_load_uri (WEBKIT_WEB_VIEW (web_view), url);
-    ldm_greeter_connect (greeter);
-
-    gtk_widget_show_all (window);
-
-    gtk_main ();
-
-    return 0;
-}
index a2fadd3570fd10ecda1826c14198a42b81cd451e..80b41e083f5bada4a8f9e4c24f553449de5dccdc 100644 (file)
@@ -2,7 +2,6 @@
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
 greeters/ldm-gtk-greeter.c
-greeters/ldm-webkit-greeter.c
 liblightdm-gobject/greeter.c
 liblightdm-gobject/language.c
 liblightdm-gobject/layout.c
index cffde7618277ab184cb725b65ee415c8ec859830..42ad9e5e75b18d97da9f15c01c9ba27564d6642c 100644 (file)
@@ -1,4 +1,4 @@
-SUBDIRS = gnome webkit
+SUBDIRS = gnome
 
 DISTCLEANFILES = \
        Makefile.in
diff --git a/themes/webkit/Makefile.am b/themes/webkit/Makefile.am
deleted file mode 100644 (file)
index 96e8627..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-themedir = $(THEME_DIR)/webkit
-theme_DATA = index.theme index.html bg.jpg
-
-EXTRA_DIST = $(theme_DATA)
-
-DISTCLEANFILES = \
-       Makefile.in
diff --git a/themes/webkit/bg.jpg b/themes/webkit/bg.jpg
deleted file mode 100644 (file)
index 132dfd2..0000000
Binary files a/themes/webkit/bg.jpg and /dev/null differ
diff --git a/themes/webkit/index.html b/themes/webkit/index.html
deleted file mode 100644 (file)
index b0cb0d4..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-<html>
-<head>
-<style type="text/css">
-body
-{
-    background-image: url('bg.jpg');
-}
-
-td
-{
-    font-size: 20px;
-    color: white;
-    verical-align: middle;
-}
-
-</style>
-<script type="text/javascript">
-
-password_prompt = false;
-selected_user = null;
-time_remaining = 0
-
-function show_prompt(text)
-{
-   password_prompt = true;
-
-   label = document.getElementById('password_prompt');
-   label.innerHTML = text;
-   
-   user_table = document.getElementById('user_table');   
-   for (i in user_table.rows)
-   {
-       row = user_table.rows[i];
-       if (row.id != ('user_' + selected_user) && row.style != null) // FIXME: Don't know why there are rows with styles
-           row.style.opacity = 0.25;
-   }
-
-   entry = document.getElementById('password_entry');
-   entry.value = '';
-
-   table = document.getElementById('password_table');
-   table.style.visibility = "visible";
-
-   entry.focus();
-}
-
-function show_message(text)
-{
-   table = document.getElementById('message_table');
-   label = document.getElementById('message_label');
-   label.innerHTML = text;
-   if (text.length > 0)
-       table.style.visibility = "visible";
-   else
-       table.style.visibility = "hidden";
-}
-
-function show_error(text)
-{
-   show_message (text);
-}
-
-function reset()
-{
-   user_table = document.getElementById('user_table');   
-   for (i in user_table.rows)
-   {
-       row = user_table.rows[i];
-       if (row.style != null) // FIXME: Don't know why there are rows with styles
-           row.style.opacity = 1;
-   }
-   table = document.getElementById('password_table');
-   table.style.visibility = "hidden";
-   password_prompt = false;
-}
-
-loading_text = ''
-
-function throbber()
-{
-   loading_text += '.';
-   if (loading_text == '....')
-       loading_text = '.'
-   label = document.getElementById('countdown_label');
-   label.innerHTML = loading_text;
-   setTimeout('throbber()', 1000);
-}
-
-function authentication_complete()
-{
-   if (lightdm.is_authenticated)
-       lightdm.login (lightdm.authentication_user, lightdm.default_session);
-   else
-       show_message ("Authentication Failed");
-
-   reset ();
-   setTimeout('throbber()', 1000);
-}
-
-function timed_login(user)
-{
-   lightdm.login (lightdm.timed_login_user);
-   setTimeout('throbber()', 1000);
-}
-
-function start_authentication(username)
-{
-   lightdm.cancel_timed_login ();
-   label = document.getElementById('countdown_label');
-   if (label != null)
-       label.style.visibility = "hidden";
-
-   show_message("");
-   if (!password_prompt) {
-       selected_user = username;
-       lightdm.start_authentication(username);
-   }
-}
-
-function provide_secret()
-{
-   entry = document.getElementById('password_entry');
-   lightdm.provide_secret(entry.value);
-}
-
-function countdown()
-{
-   label = document.getElementById('countdown_label');
-   label.innerHTML = ' in ' + time_remaining + ' seconds'
-   time_remaining--;
-   if (time_remaining >= 0)
-       setTimeout('countdown()', 1000);
-}
-
-document.write('<table id="user_table" style="margin: auto;">');
-for (i in lightdm.users)
-{
-   user = lightdm.users[i];
-
-   if (user.image.length > 0)
-      image = user.image
-   else
-      image = 'file:///usr/share/icons/gnome/32x32/stock/generic/stock_person.png'
-
-   document.write('<tr id="user_' + user.name +'"onclick="start_authentication(\'' + user.name + '\')" style="cursor: pointer;">');
-   document.write('<td><img width="48px" height="48px" src="' + image + '" /></td>');
-   document.write('<td>' + user.display_name + '</td>');
-   if (user.name == lightdm.timed_login_user && lightdm.timed_login_delay > 0)
-       document.write('<td id="countdown_label"></td>');
-   document.write('</tr>');
-}
-document.write('</table>');
-document.write('<table id="message_table" style="margin: auto; visibility: hidden;"><td id="message_label"></td></table>');
-document.write('<table id="password_table" style="margin: auto; visibility: hidden; color: red;"><tr>');
-document.write('<td id="password_prompt"></td>');
-document.write('<td><form action="javascript: provide_secret()"><input id="password_entry" type="password" /></form></td>');
-document.write('</tr></table>');
-
-time_remaining = lightdm.timed_login_delay;
-if (time_remaining > 0)
-    countdown();
-</script>
-</head>
-
-<body>
-</body>
-
-</html>
diff --git a/themes/webkit/index.theme b/themes/webkit/index.theme
deleted file mode 100644 (file)
index 0b5877f..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-[theme]
-name=WebKit
-description=WebKit Theme
-engine=webkit
-url=index.html
-session=gnome