diff options
33 files changed, 40 insertions, 592 deletions
@@ -33,12 +33,10 @@ doc/*.stamp doc/tmpl/*-unused.sgml doc/*.txt doc/xml -greeters/gtk/lightdm-example-gtk-greeter -greeters/qt/lightdm-example-qt-greeter +greeters/gtk/lightdm-gtk-greeter +greeters/qt/lightdm-qt-greeter greeters/qt/*_moc.cpp greeters/qt/ui_*.h -greeters/vala-gtk/lightdm-example-vala-gtk-greeter -greeters/vala-gtk/*.c liblightdm-gobject/*.gir liblightdm-gobject/*.typelib liblightdm-gobject/*.vapi diff --git a/Makefile.am b/Makefile.am index c3282ada..c7cb5426 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ endif if COMPILE_LIBLIGHTDM_QT SUBDIRS += liblightdm-qt endif -SUBDIRS += data greeters po src themes doc tests +SUBDIRS += data greeters po src doc tests DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc @@ -15,6 +15,11 @@ Overview of changes in lightdm 0.4.5 - Split the user accounts configuration into /etc/lightdm/users.conf so the main config can be private. * Drop most of the configure options, they aren't necessary + * Removed the Vala and Python GTK+ greeters, they weren't being well + maintained. + * Drop "example" from the name of the GTK+ and Qt greeters and make them + official default greeters. + * Greeters are now just standard X sessions Overview of changes in lightdm 0.4.4 diff --git a/configure.ac b/configure.ac index fbaf3ad0..8960723a 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,6 @@ AC_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE LT_INIT AM_PROG_CC_C_O -AM_PROG_VALAC AC_PROG_CXX AC_PROG_LIBTOOL AM_MAINTAINER_MODE @@ -28,7 +27,6 @@ PKG_CHECK_MODULES(LIGHTDM, [ glib-2.0 gio-2.0 >= 2.26 gio-unix-2.0 - xcb xdmcp ]) @@ -79,13 +77,6 @@ elif test x"$enable_liblightdm_gobject" = "xyes"; then fi AM_CONDITIONAL(COMPILE_LIBLIGHTDM_GOBJECT, test x"$compile_liblightdm_gobject" != "xno") -if test x"$VALAC" = "x"; then - have_vala=no -else - have_vala=yes -fi -AM_CONDITIONAL(HAVE_VALA_GTK_GREETER, test $have_vala = yes) - AC_ARG_ENABLE(liblightdm-qt, AS_HELP_STRING([--enable-liblightdm-qt],[Enable LightDM client QT libraries [[default=auto]]]), [enable_liblightdm_qt=$enableval], @@ -109,14 +100,14 @@ AM_CONDITIONAL(COMPILE_LIBLIGHTDM_QT, test x"$compile_liblightdm_qt" != "xno") have_qt=no if test x"$compile_liblightdm_qt" = "xyes"; then - PKG_CHECK_MODULES(LIGHTDM_EXAMPLE_QT_GREETER, [ + PKG_CHECK_MODULES(LIGHTDM_QT_GREETER, [ QtCore QtGui ], have_qt=yes, have_qt=no) fi AM_CONDITIONAL(HAVE_QT_GREETER, test $have_qt = yes) -PKG_CHECK_MODULES(LIGHTDM_EXAMPLE_GTK_GREETER, [ +PKG_CHECK_MODULES(LIGHTDM_GTK_GREETER, [ gtk+-2.0 gmodule-export-2.0 ], have_gtk=yes, have_gtk=no) @@ -126,12 +117,6 @@ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) AC_PATH_PROG(DBUSBINDINGTOOL, dbus-binding-tool) AC_SUBST(DBUSBINDINGTOOL) -GREETER_THEME_DIR=${datarootdir}/lightdm/themes -AC_SUBST(GREETER_THEME_DIR) - -GREETER_THEME_ENGINE_DIR=${libexecdir} -AC_SUBST(GREETER_THEME_ENGINE_DIR) - dnl ########################################################################### dnl Configurable values dnl ########################################################################### @@ -147,7 +132,13 @@ AC_ARG_WITH(default-session, AC_SUBST(DEFAULT_SESSION) AC_DEFINE_UNQUOTED(DEFAULT_SESSION, "$DEFAULT_SESSION", Default session) -GREETER_SESSION=example-gtk-gnome +if test $have_gtk = yes; then +GREETER_SESSION=lightdm-gtk-greeter +elif test $have_qt = yes; then +GREETER_SESSION=lightdm-qt-greeter +else +GREETER_SESSION= +fi AC_ARG_WITH(theme, AS_HELP_STRING(--with-greeter-session=<session>, Greeter session), @@ -183,9 +174,7 @@ data/init/Makefile doc/Makefile greeters/Makefile greeters/gtk/Makefile -greeters/python-gtk/Makefile greeters/qt/Makefile -greeters/vala-gtk/Makefile liblightdm-gobject/liblightdm-gobject-0.pc liblightdm-gobject/Makefile liblightdm-gobject/lightdm/Makefile @@ -196,11 +185,6 @@ po/Makefile.in src/Makefile tests/Makefile tests/src/Makefile -themes/Makefile -themes/example-gtk-gnome/Makefile -themes/example-python-gtk-gnome/Makefile -themes/example-qt-kde/Makefile -themes/example-vala-gtk-gnome/Makefile ], [chmod +x tests/src/test-setup-guest tests/src/test-cleanup-guest]) AC_OUTPUT @@ -216,12 +200,9 @@ echo " prefix: $prefix Greeter session: $GREETER_SESSION Default session: $DEFAULT_SESSION - - Greeters: liblightdm-gobject: $compile_liblightdm_gobject GObject introspection: $found_introspection liblightdm-qt: $compile_liblightdm_qt GTK+ Greeter: $have_gtk - Vala Greeter: $have_vala Qt Greeter: $have_qt " diff --git a/greeters/Makefile.am b/greeters/Makefile.am index a097bbc1..8495c292 100644 --- a/greeters/Makefile.am +++ b/greeters/Makefile.am @@ -1,13 +1,9 @@ -SUBDIRS = python-gtk +SUBDIRS = if HAVE_GTK_GREETER SUBDIRS += gtk endif -if HAVE_VALA_GTK_GREETER -SUBDIRS += vala-gtk -endif - if HAVE_QT_GREETER SUBDIRS += qt endif diff --git a/greeters/gtk/Makefile.am b/greeters/gtk/Makefile.am index 2140fecb..26523f51 100644 --- a/greeters/gtk/Makefile.am +++ b/greeters/gtk/Makefile.am @@ -1,21 +1,24 @@ -libexec_PROGRAMS = lightdm-example-gtk-greeter +bin_PROGRAMS = lightdm-gtk-greeter -uidir = $(datadir)/lightdm-example-gtk-greeter +uidir = $(datadir)/lightdm-gtk-greeter dist_ui_DATA = greeter.ui -lightdm_example_gtk_greeter_SOURCES = \ - lightdm-example-gtk-greeter.c +xsessiondir = $(datadir)/xsessions +dist_xsession_DATA = lightdm-gtk-greeter.desktop -lightdm_example_gtk_greeter_CFLAGS = \ +lightdm_gtk_greeter_SOURCES = \ + lightdm-gtk-greeter.c + +lightdm_gtk_greeter_CFLAGS = \ -DUI_DIR=\""$(uidir)"\" \ -I$(top_srcdir)/liblightdm-gobject \ - $(LIGHTDM_EXAMPLE_GTK_GREETER_CFLAGS) \ + $(LIGHTDM_GTK_GREETER_CFLAGS) \ $(WARN_CFLAGS) -lightdm_example_gtk_greeter_LDADD = \ +lightdm_gtk_greeter_LDADD = \ -L$(top_builddir)/liblightdm-gobject \ -llightdm-gobject-0 \ - $(LIGHTDM_EXAMPLE_GTK_GREETER_LIBS) + $(LIGHTDM_GTK_GREETER_LIBS) DISTCLEANFILES = \ Makefile.in diff --git a/greeters/gtk/lightdm-example-gtk-greeter.c b/greeters/gtk/lightdm-gtk-greeter.c index 322fb0d3..322fb0d3 100644 --- a/greeters/gtk/lightdm-example-gtk-greeter.c +++ b/greeters/gtk/lightdm-gtk-greeter.c diff --git a/greeters/gtk/lightdm-gtk-greeter.desktop b/greeters/gtk/lightdm-gtk-greeter.desktop new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/greeters/gtk/lightdm-gtk-greeter.desktop diff --git a/greeters/python-gtk/Makefile.am b/greeters/python-gtk/Makefile.am deleted file mode 100644 index 1d9919f4..00000000 --- a/greeters/python-gtk/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -dist_libexec_SCRIPTS = lightdm-example-python-gtk-greeter diff --git a/greeters/python-gtk/lightdm-example-python-gtk-greeter b/greeters/python-gtk/lightdm-example-python-gtk-greeter deleted file mode 100755 index 082052c8..00000000 --- a/greeters/python-gtk/lightdm-example-python-gtk-greeter +++ /dev/null @@ -1,303 +0,0 @@ -#!/usr/bin/python - -from gi.repository import GLib -from gi.repository import Gdk -from gi.repository import GdkPixbuf -from gi.repository import Gtk -from gi.repository import LightDM - -class Greeter: - def __init__(self): - self.greeter = LightDM.Greeter() - self.greeter.connect('connected', self.connect_cb) - self.greeter.connect('show-prompt', self.show_prompt_cb) - self.greeter.connect('show-message', self.show_message_cb) - self.greeter.connect('authentication-complete', self.authentication_complete_cb) - self.greeter.connect('timed-login', self.timed_login_cb) - self.greeter.connect('quit', self.quit_cb) - - def connect_to_server(self): - self.greeter.connect_to_server() - - def connect_cb(self, greeter): - theme_dir = GLib.path_get_dirname(greeter.get_theme()) - rc_file = greeter.get_string_property('gtkrc') - if rc_file is not None: - Gtk.rc_add_default_file(GLib.build_filenamev((theme_dir, rc_file))) - - settings = Gtk.Settings.get_default() - self.theme_name = settings.get_property('gtk-theme-name') - - display = Gdk.Display.get_default() - screen = display.get_default_screen() - screen_width = screen.get_width() - screen_height = screen.get_height() - - # FIXME: Not introspectable - #root = Gdk.Window.get_default_root() - #root.set_cursor(Gdk.Cursor(GDK_LEFT_PTR)) - - self.window = Gtk.Window() - self.window.app_paintable = True - self.window.set_default_size(screen_width, screen_height) - self.window.fullscreen() - self.window.realize() - - background_image = greeter.get_string_property('background-image') - if background_image is not None: - path = GLib.build_filenamev((theme_dir, background_image)) - pixbuf = GdkPixbuf.Pixbuf.new_from_file(path) - self.background = pixbuf.scale_simple(screen_width, screen_height, GdkPixbuf.InterpType.BILINEAR) - # FIXME: Convert to cairo surface - self.window.connect('draw', self.draw_background_cb) - - vbox = Gtk.VBox() - self.window.add(vbox) - - menu_bar = Gtk.MenuBar () - vbox.pack_start(menu_bar, False, True, 0) - - menu_item = Gtk.ImageMenuItem() - menu_item.set_image(Gtk.Image.new_from_icon_name('preferences-desktop-accessibility', Gtk.IconSize.LARGE_TOOLBAR)) - menu_item.set_label('') # NOTE: Needed to make the icon show as selected - menu_item.set_always_show_image(True) - menu_bar.append(menu_item) - menu = Gtk.Menu() - menu_item.set_submenu(menu) - - menu_item = Gtk.CheckMenuItem.new_with_label("Large Font") - menu_item.connect('toggled', self.a11y_font_cb) - menu.append(menu_item) - - menu_item = Gtk.CheckMenuItem.new_with_label("High Constrast") - menu_item.connect('toggled', self.a11y_contrast_cb) - menu.append(menu_item) - - menu_item = Gtk.MenuItem.new_with_label("Options") - menu_bar.append(menu_item) - option_menu = Gtk.Menu() - menu_item.set_submenu(option_menu) - - menu_item = Gtk.MenuItem.new_with_label("Language") - option_menu.append(menu_item) - menu = Gtk.Menu() - menu_item.set_submenu(menu) - - language_radio_list = [] - for l in greeter.get_languages(): - if l.get_name() == "": - label = l.get_code() - else: - label = '%s - %s' % (l.get_name(), l.get_territory()) - menu_item = Gtk.RadioMenuItem.new_with_label(language_radio_list, label) - language_radio_list = menu_item.get_group() - menu.append(menu_item) - - if l.matches(greeter.get_default_language()): - menu_item.set_active(True) - - menu_item.set_data('language', l.get_code()) - - menu_item = Gtk.MenuItem.new_with_label("Keyboard Layout") - option_menu.append(menu_item) - menu = Gtk.Menu() - menu_item.set_submenu(menu) - - layout_radio_list = [] - for l in greeter.get_layouts(): - menu_item = Gtk.RadioMenuItem.new_with_label(layout_radio_list, l.get_description()) - layout_radio_list = menu_item.get_group() - menu.append(menu_item) - - if l.get_name() == greeter.get_default_layout(): - menu_item.set_active(True) - - menu_item.set_data('layout', l.get_name()) - menu_item.connect('toggled', self.layout_changed_cb) - - menu_item = Gtk.MenuItem.new_with_label("Session") - option_menu.append(menu_item) - menu = Gtk.Menu() - menu_item.set_submenu(menu) - - session_radio_list = [] - for s in greeter.get_sessions(): - menu_item = Gtk.RadioMenuItem.new_with_label(session_radio_list, s.get_name()) - session_radio_list = menu_item.get_group() - menu.append(menu_item) - - if s.get_key() == greeter.get_default_session(): - menu_item.set_active(True) - - menu_item.set_data('key', s.get_key()) - - power_menu = Gtk.Menu() - n_power_items = 0 - if greeter.get_can_suspend(): - menu_item = Gtk.MenuItem('Suspend') - power_menu.append(menu_item) - menu_item.connect('activate', self.suspend_cb) - n_power_items += 1 - if greeter.get_can_hibernate(): - menu_item = Gtk.MenuItem('Hibernate') - power_menu.append(menu_item) - menu_item.connect('activate', self.hibernate_cb) - n_power_items += 1 - if greeter.get_can_restart(): - menu_item = Gtk.MenuItem('Restart...') - power_menu.append(menu_item) - menu_item.connect('activate', self.restart_cb) - n_power_items += 1 - if greeter.get_can_shutdown(): - menu_item = Gtk.MenuItem('Shutdown...') - power_menu.append(menu_item) - menu_item.connect('activate', self.shutdown_cb) - n_power_items += 1 - - if n_power_items > 0: - menu_item = Gtk.ImageMenuItem() - menu_item.set_always_show_image(True) - menu_item.set_right_justified(True) - menu_item.set_image(Gtk.Image.new_from_icon_name('system-shutdown', Gtk.IconSize.LARGE_TOOLBAR)) - menu_item.set_label('') # NOTE: Needed to make the icon show as selected - menu_item.set_submenu(power_menu) - menu_bar.append(menu_item) - - login_align = Gtk.Alignment() - login_align.set(0.5, 0.5, 0.0, 0.0) - vbox.pack_start(login_align, True, True, 0) - - notebook = Gtk.Notebook() - notebook.set_show_tabs(False) - login_align.add(notebook) - - login_vbox = Gtk.VBox() - login_vbox.set_border_width(12) - notebook.add(login_vbox) - - logo_image = Gtk.Image.new_from_icon_name('computer', Gtk.IconSize.DIALOG) - logo_image.set_pixel_size(64) - login_vbox.pack_start(logo_image, False, False, 0) - login_vbox.pack_start(Gtk.Label(greeter.get_hostname()), False, False, 0) - - self.message_label = Gtk.Label() - login_vbox.pack_start(self.message_label, False, False, 0) - self.message_label.set_no_show_all(True) - - users = greeter.get_users() - user_view = None - if True:#users is None: - self.username_entry = Gtk.Entry() - login_vbox.pack_start(self.username_entry, False, False, 0) - self.username_entry.connect('activate', self.username_activate_cb) - else: - model = Gtk.ListStore(str, str, GdkPixbuf.Pixbuf, bool) - for user in users: - image = user.get_image() - pixbuf = None - if image != None: - path = GLib.filename_from_uri(image) - pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(path, 64, 64, True) - model.append((user.get_name(), user.get_display_name(), pixbuf, True)) - user_view = Gtk.TreeView() - user_view.set_model(model) - user_view.set_headers_visible(False) - user_view.set_grid_lines(Gtk.TreeViewGridLines.NONE) - user_view.append_column(Gtk.TreeViewColumn('Face', Gtk.CellRendererPixbuf(), pixbuf = 2, sensitive = 3)) - user_view.append_column(Gtk.TreeViewColumn('Name', Gtk.CellRendererText(), text = 1)) - user_view.connect('row-activated', self.user_view_activate_cb) - user_view.connect('button-press-event', self.user_view_click_cb) - i = model.get_iter_first() - if i is not None: - user_view.get_selection().select_iter(i) - - login_vbox.pack_start(user_view, False, False, 0) - - self.prompt_entry = Gtk.Entry() - self.prompt_entry.set_sensitive(False) - login_vbox.pack_start(self.prompt_entry, False, False, 0) - self.prompt_entry.connect('activate', self.password_activate_cb) - self.prompt_entry.set_no_show_all(True) - - self.window.show_all() - if user_view is not None: - user_view.grab_focus() - - def draw_background_cb(self, widget, context): - pass#self.background - - def username_activate_cb(self, widget): - # FIXME if self.greeter.get_user_defaults - # FIXME if user_model - if self.username_entry is not None: - self.username_entry.set_sensitive(False) - self.greeter.login(self.username_entry.get_text()) - - def password_activate_cb(self, widget): - self.prompt_entry.set_sensitive(False) - self.greeter.respond(self.prompt_entry.get_text()) - - def show_prompt_cb(self, greeter, text, type): - self.prompt_entry.show() - self.prompt_entry.set_sensitive(True) - self.prompt_entry.set_visibility(type != LightDM.PROMPT_TYPE_SECRET) - self.prompt_entry.grab_focus() - - def show_message_cb(self, greeter, text, type): - self.message_label.show() - self.message_label.set_text(text) - - def authentication_complete_cb(self, greeter): - self.prompt_entry.hide() - self.prompt_entry.set_text('') - - # Clear row shading - # FIXME - if self.username_entry is not None: - self.username_entry.set_text('') - self.username_entry.set_sentitive(True) - - if user_view is not None: - user_view.grab_focus() - else: - username_entry.grab_focus() - - if self.greeter.is_authenticated: - self.greeter.start_session_with_defaults() - - def timed_login_cb(self, greeter, username): - self.greeter.login(greeter.get_timed_login_user()) - - def quit_cb(self, greeter): - Gtk.main_quit() - - def user_view_activate_cb(self, widget): - pass - - def user_view_click_cb(self, widget): - pass - - def layout_changed_cb(self, widget): - pass - - def a11y_font_cb(self, widget): - pass - - def a11y_contrast_cb(self, widget): - pass - - def suspend_cb(self, widget): - self.greeter.suspend() - - def hibernate_cb(self, widget): - self.greeter.hibernate() - - def restart_cb(self, widget): - pass - - def shutdown_cb(self, widget): - pass - -g = Greeter() -g.connect_to_server() -Gtk.main() diff --git a/greeters/qt/Makefile.am b/greeters/qt/Makefile.am index 0917e57e..0448ff72 100644 --- a/greeters/qt/Makefile.am +++ b/greeters/qt/Makefile.am @@ -1,4 +1,7 @@ -libexec_PROGRAMS = lightdm-example-qt-greeter +bin_PROGRAMS = lightdm-qt-greeter + +xsessiondir = $(datadir)/xsessions +dist_xsession_DATA = lightdm-qt-greeter.desktop greeter_moc.cpp: greeter.h moc $< -o $@ @@ -15,7 +18,7 @@ ui_panel.h: panel.ui loginprompt.cpp: ui_loginprompt.h panel.cpp: ui_panel.h -lightdm_example_qt_greeter_SOURCES = \ +lightdm_qt_greeter_SOURCES = \ greeter.cpp \ greeter.h \ loginprompt.cpp \ @@ -27,14 +30,14 @@ lightdm_example_qt_greeter_SOURCES = \ loginprompt_moc.cpp \ panel_moc.cpp -lightdm_example_qt_greeter_CXXFLAGS = \ +lightdm_qt_greeter_CXXFLAGS = \ -I$(top_srcdir)/liblightdm-qt \ - $(LIGHTDM_EXAMPLE_QT_GREETER_CFLAGS) + $(LIGHTDM_QT_GREETER_CFLAGS) -lightdm_example_qt_greeter_LDADD = \ +lightdm_qt_greeter_LDADD = \ -L$(top_builddir)/liblightdm-qt/QLightDM \ -llightdm-qt-0 \ - $(LIGHTDM_EXAMPLE_QT_GREETER_LIBS) + $(LIGHTDM_QT_GREETER_LIBS) CLEANFILES = \ greeter_moc.cpp \ diff --git a/greeters/qt/lightdm-qt-greeter.desktop b/greeters/qt/lightdm-qt-greeter.desktop new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/greeters/qt/lightdm-qt-greeter.desktop diff --git a/greeters/vala-gtk/Makefile.am b/greeters/vala-gtk/Makefile.am deleted file mode 100644 index 25070366..00000000 --- a/greeters/vala-gtk/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -libexec_PROGRAMS = lightdm-example-vala-gtk-greeter - -lightdm_example_vala_gtk_greeter_SOURCES = \ - lightdm-example-vala-gtk-greeter.vala - -lightdm_example_vala_gtk_greeter_VALAFLAGS = \ - --pkg gtk+-2.0 \ - --vapidir $(top_builddir)/liblightdm-gobject \ - --pkg liblightdm-gobject-0 - -lightdm_example_vala_gtk_greeter_CFLAGS = \ - -I$(top_srcdir)/liblightdm-gobject \ - $(LIGHTDM_EXAMPLE_GTK_GREETER_CFLAGS) \ - $(WARN_CFLAGS) - -lightdm_example_vala_gtk_greeter_LDADD = \ - -L$(top_builddir)/liblightdm-gobject \ - -llightdm-gobject-0 \ - $(LIGHTDM_EXAMPLE_GTK_GREETER_LIBS) - -DISTCLEANFILES = \ - Makefile.in diff --git a/greeters/vala-gtk/lightdm-example-vala-gtk-greeter.vala b/greeters/vala-gtk/lightdm-example-vala-gtk-greeter.vala deleted file mode 100644 index 2ec6c0bd..00000000 --- a/greeters/vala-gtk/lightdm-example-vala-gtk-greeter.vala +++ /dev/null @@ -1,128 +0,0 @@ -class Greeter -{ - private LightDM.Greeter greeter; - private Gtk.Entry username_entry; - private Gtk.Entry password_entry; - private Gtk.Label message_label; - - public Greeter () - { - greeter = new LightDM.Greeter (); - greeter.connected.connect (connect_cb); - greeter.show_prompt.connect (show_prompt_cb); - greeter.show_message.connect (show_message_cb); - greeter.authentication_complete.connect (authentication_complete_cb); - greeter.timed_login.connect (timed_login_cb); - greeter.quit.connect (quit_cb); - } - - public void start () - { - greeter.connect_to_server (); - } - - private void username_activate_cb (Gtk.Entry entry) - { - username_entry.sensitive = false; - greeter.login (username_entry.text); - } - - private void password_activate_cb (Gtk.Entry entry) - { - password_entry.sensitive = false; - greeter.respond (password_entry.text); - } - - private void connect_cb (LightDM.Greeter greeter) - { - var display = Gdk.Display.get_default (); - var screen = display.get_default_screen (); - - var window = new Gtk.Window (); - window.set_default_size (screen.get_width (), screen.get_height ()); - - var vbox = new Gtk.VBox (false, 0); - window.add (vbox); - - var login_align = new Gtk.Alignment (0.5f, 0.5f, 0.0f, 0.0f); - vbox.pack_start (login_align, true, true, 0); - - var login_vbox = new Gtk.VBox (false, 6); - login_vbox.border_width = 12; - login_align.add (login_vbox); - - var logo_image = new Gtk.Image.from_icon_name ("computer", Gtk.IconSize.DIALOG); - logo_image.pixel_size = 64; - login_vbox.pack_start (logo_image, false, false, 0); - login_vbox.pack_start (new Gtk.Label (greeter.hostname), false, false, 0); - - message_label = new Gtk.Label (""); - login_vbox.pack_start (message_label, false, false, 0); - message_label.no_show_all = true; - - username_entry = new Gtk.Entry (); - login_vbox.pack_start (username_entry, false, false, 0); - username_entry.activate.connect (username_activate_cb); - - password_entry = new Gtk.Entry (); - password_entry.sensitive = false; - login_vbox.pack_start (password_entry, false, false, 0); - password_entry.activate.connect (password_activate_cb); - password_entry.no_show_all = true; - - window.show_all (); - username_entry.grab_focus (); - } - - private void show_prompt_cb (LightDM.Greeter greeter, string text, LightDM.PromptType type) - { - password_entry.show (); - password_entry.sensitive = true; - password_entry.visibility = type != LightDM.PromptType.SECRET; - password_entry.grab_focus (); - } - - private void show_message_cb (LightDM.Greeter greeter, string text, LightDM.MessageType type) - { - message_label.label = text; - message_label.show (); - } - - private void authentication_complete_cb (LightDM.Greeter greeter) - { - password_entry.hide (); - password_entry.text = ""; - username_entry.text = ""; - username_entry.sensitive = true; - username_entry.grab_focus (); - if (greeter.is_authenticated) - greeter.start_default_session (); - else - { - message_label.label = "Failed to authenticate"; - message_label.show (); - } - } - - private void timed_login_cb (LightDM.Greeter greeter, string username) - { - greeter.login (greeter.timed_login_user); - } - - private void quit_cb (LightDM.Greeter greeter) - { - Gtk.main_quit (); - } - - static int main (string[] args) - { - Gtk.init (ref args); - - var g = new Greeter (); - g.start (); - - Gtk.main (); - - return 0; - } -} diff --git a/liblightdm-gobject/liblightdm-gobject-0.pc.in b/liblightdm-gobject/liblightdm-gobject-0.pc.in index bcb193f5..f21aeece 100644 --- a/liblightdm-gobject/liblightdm-gobject-0.pc.in +++ b/liblightdm-gobject/liblightdm-gobject-0.pc.in @@ -3,9 +3,6 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -themedir=@GREETER_THEME_DIR@ -greeterdir=@GREETER_THEME_ENGINE_DIR@ - Name: liblightdm-gobject Description: LightDM client library Version: @VERSION@ diff --git a/liblightdm-qt/QLightDM/liblightdm-qt-0.pc.in b/liblightdm-qt/QLightDM/liblightdm-qt-0.pc.in index b72c04ed..adb6a559 100644 --- a/liblightdm-qt/QLightDM/liblightdm-qt-0.pc.in +++ b/liblightdm-qt/QLightDM/liblightdm-qt-0.pc.in @@ -3,9 +3,6 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -themedir=@GREETER_THEME_DIR@ -greeterdir=@GREETER_THEME_ENGINE_DIR@ - Name: liblightdm-qt Description: LightDM client library Version: @VERSION@ diff --git a/src/Makefile.am b/src/Makefile.am index 6776b7e5..35e8d1b3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -77,9 +77,7 @@ lightdm_CFLAGS = \ -DRUN_DIR=\"$(localstatedir)/run/lightdm\" \ -DCACHE_DIR=\"$(localstatedir)/cache/lightdm\" \ -DLOG_DIR=\"$(localstatedir)/log/lightdm\" \ - -DGREETER_THEME_ENGINE_DIR=\"$(GREETER_THEME_ENGINE_DIR)\" \ - -DGREETER_THEME_DIR=\"$(GREETER_THEME_DIR)\" \ - -DXSESSIONS_DIR=\"/usr/share/xsessions\" + -DXSESSIONS_DIR=\"$(datadir)/xsessions\" lightdm_LDADD = \ $(LIGHTDM_LIBS) \ diff --git a/src/xdisplay.c b/src/xdisplay.c index 1ceed796..899e7539 100644 --- a/src/xdisplay.c +++ b/src/xdisplay.c @@ -23,6 +23,7 @@ xdisplay_new (const gchar *config_section, XServer *server) g_return_val_if_fail (server != NULL, NULL); + display_load_config (DISPLAY (self), config_section); display_set_display_server (DISPLAY (self), DISPLAY_SERVER (server)); return self; diff --git a/themes/Makefile.am b/themes/Makefile.am deleted file mode 100644 index b4fede69..00000000 --- a/themes/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -SUBDIRS = example-gtk-gnome example-python-gtk-gnome example-qt-kde example-vala-gtk-gnome - -DISTCLEANFILES = \ - Makefile.in diff --git a/themes/example-gtk-gnome/Makefile.am b/themes/example-gtk-gnome/Makefile.am deleted file mode 100644 index 1c6e45d0..00000000 --- a/themes/example-gtk-gnome/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -themedir = $(GREETER_THEME_DIR)/example-gtk-gnome -dist_theme_DATA = index.theme gtkrc bg.jpg - -DISTCLEANFILES = \ - Makefile.in diff --git a/themes/example-gtk-gnome/bg.jpg b/themes/example-gtk-gnome/bg.jpg Binary files differdeleted file mode 100644 index 132dfd21..00000000 --- a/themes/example-gtk-gnome/bg.jpg +++ /dev/null diff --git a/themes/example-gtk-gnome/gtkrc b/themes/example-gtk-gnome/gtkrc deleted file mode 100644 index 817e1f75..00000000 --- a/themes/example-gtk-gnome/gtkrc +++ /dev/null @@ -1,9 +0,0 @@ -gtk_theme_name = "HumanLogin" -gtk_icon_theme_name = "LoginIcons" -gtk_cursor_theme_name = "DMZ-White" -gtk_font_name = "UbuntuBeta 10" -# Not working, but set to 96*1024 (=96dpi) -gtk_xft_dpi = 98304 -gtk_xft_hinting = 1 -gtk_xft_hintstyle = "hintslight" -gtk_xft_rgba = "rgb" diff --git a/themes/example-gtk-gnome/index.theme b/themes/example-gtk-gnome/index.theme deleted file mode 100644 index 71509f47..00000000 --- a/themes/example-gtk-gnome/index.theme +++ /dev/null @@ -1,7 +0,0 @@ -[theme] -name=GNOME Example Theme -description=GNOME Example Theme -engine=lightdm-example-gtk-greeter -session=gnome -gtkrc=gtkrc -background-image=bg.jpg diff --git a/themes/example-python-gtk-gnome/Makefile.am b/themes/example-python-gtk-gnome/Makefile.am deleted file mode 100644 index c59398a1..00000000 --- a/themes/example-python-gtk-gnome/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -themedir = $(GREETER_THEME_DIR)/example-python-gtk-gnome -dist_theme_DATA = index.theme gtkrc bg.jpg - -DISTCLEANFILES = \ - Makefile.in diff --git a/themes/example-python-gtk-gnome/bg.jpg b/themes/example-python-gtk-gnome/bg.jpg Binary files differdeleted file mode 100644 index 132dfd21..00000000 --- a/themes/example-python-gtk-gnome/bg.jpg +++ /dev/null diff --git a/themes/example-python-gtk-gnome/gtkrc b/themes/example-python-gtk-gnome/gtkrc deleted file mode 100644 index 817e1f75..00000000 --- a/themes/example-python-gtk-gnome/gtkrc +++ /dev/null @@ -1,9 +0,0 @@ -gtk_theme_name = "HumanLogin" -gtk_icon_theme_name = "LoginIcons" -gtk_cursor_theme_name = "DMZ-White" -gtk_font_name = "UbuntuBeta 10" -# Not working, but set to 96*1024 (=96dpi) -gtk_xft_dpi = 98304 -gtk_xft_hinting = 1 -gtk_xft_hintstyle = "hintslight" -gtk_xft_rgba = "rgb" diff --git a/themes/example-python-gtk-gnome/index.theme b/themes/example-python-gtk-gnome/index.theme deleted file mode 100644 index 6ba22128..00000000 --- a/themes/example-python-gtk-gnome/index.theme +++ /dev/null @@ -1,7 +0,0 @@ -[theme] -name=GNOME Example Theme (Python) -description=GNOME Example Theme (Python) -engine=lightdm-example-python-gtk-greeter -session=gnome -gtkrc=gtkrc -background-image=bg.jpg diff --git a/themes/example-qt-kde/Makefile.am b/themes/example-qt-kde/Makefile.am deleted file mode 100644 index 350874db..00000000 --- a/themes/example-qt-kde/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -themedir = $(GREETER_THEME_DIR)/example-qt-kde -dist_theme_DATA = index.theme - -DISTCLEANFILES = \ - Makefile.in diff --git a/themes/example-qt-kde/index.theme b/themes/example-qt-kde/index.theme deleted file mode 100644 index 74684a51..00000000 --- a/themes/example-qt-kde/index.theme +++ /dev/null @@ -1,5 +0,0 @@ -[theme] -name=KDE Example Theme -description=KDE Example Theme -engine=lightdm-example-qt-greeter -session=kde diff --git a/themes/example-vala-gtk-gnome/Makefile.am b/themes/example-vala-gtk-gnome/Makefile.am deleted file mode 100644 index 1daf8f12..00000000 --- a/themes/example-vala-gtk-gnome/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -themedir = $(GREETER_THEME_DIR)/example-vala-gtk-gnome -dist_theme_DATA = index.theme gtkrc bg.jpg - -DISTCLEANFILES = \ - Makefile.in diff --git a/themes/example-vala-gtk-gnome/bg.jpg b/themes/example-vala-gtk-gnome/bg.jpg Binary files differdeleted file mode 100644 index 132dfd21..00000000 --- a/themes/example-vala-gtk-gnome/bg.jpg +++ /dev/null diff --git a/themes/example-vala-gtk-gnome/gtkrc b/themes/example-vala-gtk-gnome/gtkrc deleted file mode 100644 index 817e1f75..00000000 --- a/themes/example-vala-gtk-gnome/gtkrc +++ /dev/null @@ -1,9 +0,0 @@ -gtk_theme_name = "HumanLogin" -gtk_icon_theme_name = "LoginIcons" -gtk_cursor_theme_name = "DMZ-White" -gtk_font_name = "UbuntuBeta 10" -# Not working, but set to 96*1024 (=96dpi) -gtk_xft_dpi = 98304 -gtk_xft_hinting = 1 -gtk_xft_hintstyle = "hintslight" -gtk_xft_rgba = "rgb" diff --git a/themes/example-vala-gtk-gnome/index.theme b/themes/example-vala-gtk-gnome/index.theme deleted file mode 100644 index 86603e6f..00000000 --- a/themes/example-vala-gtk-gnome/index.theme +++ /dev/null @@ -1,7 +0,0 @@ -[theme] -name=GNOME Example Theme (Vala) -description=GNOME Example Theme (Vala) -engine=lightdm-example-vala-gtk-greeter -session=gnome -gtkrc=gtkrc -background-image=bg.jpg |
