diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 21 | ||||
| -rw-r--r-- | gui/Makefile.am | 1 | ||||
| -rw-r--r-- | gui/settings-daemon/Makefile.am | 31 | ||||
| -rw-r--r-- | gui/settings-daemon/main.c | 48 | ||||
| -rw-r--r-- | gui/simple-chooser/Makefile.am | 5 |
6 files changed, 99 insertions, 16 deletions
@@ -1,5 +1,14 @@ 2007-10-25 William Jon McCann <mccann@jhu.edu> + * configure.ac: + * gui/Makefile.am: + * gui/settings-daemon/Makefile.am: + * gui/settings-daemon/main.c: (main): + * gui/simple-chooser/Makefile.am: + Add a stub for settings-daemon. + +2007-10-25 William Jon McCann <mccann@jhu.edu> + * gui/simple-greeter/greeter-main.c (set_fatal_warnings): Change to abort on criticals not just warnings. diff --git a/configure.ac b/configure.ac index 7f31cb00..0dcd82dc 100644 --- a/configure.ac +++ b/configure.ac @@ -66,13 +66,6 @@ PKG_CHECK_MODULES(DAEMON, AC_SUBST(DAEMON_CFLAGS) AC_SUBST(DAEMON_LIBS) -PKG_CHECK_MODULES(GREETER, - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION -) -AC_SUBST(GREETER_CFLAGS) -AC_SUBST(GREETER_LIBS) - PKG_CHECK_MODULES(SIMPLE_GREETER, dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION @@ -82,13 +75,6 @@ PKG_CHECK_MODULES(SIMPLE_GREETER, AC_SUBST(SIMPLE_GREETER_CFLAGS) AC_SUBST(SIMPLE_GREETER_LIBS) -PKG_CHECK_MODULES(CHOOSER, - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION - gtk+-2.0 >= $GTK_REQUIRED_VERSION -) -AC_SUBST(CHOOSER_CFLAGS) -AC_SUBST(CHOOSER_LIBS) - PKG_CHECK_MODULES(SIMPLE_CHOOSER, dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION @@ -98,6 +84,12 @@ PKG_CHECK_MODULES(SIMPLE_CHOOSER, AC_SUBST(SIMPLE_CHOOSER_CFLAGS) AC_SUBST(SIMPLE_CHOOSER_LIBS) +PKG_CHECK_MODULES(SETTINGS_DAEMON, + gtk+-2.0 >= $GTK_REQUIRED_VERSION +) +AC_SUBST(SETTINGS_DAEMON_CFLAGS) +AC_SUBST(SETTINGS_DAEMON_LIBS) + AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) AC_PATH_XTRA @@ -1279,6 +1271,7 @@ AC_OUTPUT([ Makefile daemon/Makefile gui/Makefile +gui/settings-daemon/Makefile gui/simple-greeter/Makefile gui/simple-greeter/libnotificationarea/Makefile gui/simple-chooser/Makefile diff --git a/gui/Makefile.am b/gui/Makefile.am index 2f054d98..ff67e7bf 100644 --- a/gui/Makefile.am +++ b/gui/Makefile.am @@ -1,6 +1,7 @@ NULL = SUBDIRS = \ + settings-daemon \ simple-chooser \ simple-greeter \ $(NULL) diff --git a/gui/settings-daemon/Makefile.am b/gui/settings-daemon/Makefile.am new file mode 100644 index 00000000..b547f792 --- /dev/null +++ b/gui/settings-daemon/Makefile.am @@ -0,0 +1,31 @@ +NULL = + +INCLUDES = \ + -I$(top_srcdir)/common \ + -DAUTHDIR=\""$(authdir)"\" \ + -DDATADIR=\""$(datadir)"\" \ + -DGDMCONFDIR=\"$(gdmconfdir)\" \ + -DDMCONFDIR=\""$(dmconfdir)"\" \ + -DGDMLOCALEDIR=\""$(gdmlocaledir)"\" \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DLIBEXECDIR=\""$(libexecdir)"\" \ + -DSBINDIR=\""$(sbindir)"\" \ + -DPIXMAPDIR=\""$(pixmapdir)"\" \ + $(SETTINGS_DAEMON_CFLAGS) \ + $(NULL) + +libexec_PROGRAMS = \ + gdm-settings-daemon \ + $(NULL) + +gdm_settings_daemon_SOURCES = \ + main.c \ + $(NULL) + +gdm_settings_daemon_LDADD = \ + $(SETTINGS_DAEMON_LIBS) \ + $(top_builddir)/common/libgdmcommon.la \ + $(NULL) + +EXTRA_DIST = \ + $(NULL) diff --git a/gui/settings-daemon/main.c b/gui/settings-daemon/main.c new file mode 100644 index 00000000..c9fd59bf --- /dev/null +++ b/gui/settings-daemon/main.c @@ -0,0 +1,48 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * + * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu> + * + * 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 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" + +#include <stdlib.h> +#include <libintl.h> +#include <locale.h> + +#include <glib/gi18n.h> +#include <gtk/gtk.h> + +#include "gdm-common.h" + +int +main (int argc, char *argv[]) +{ + + bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + textdomain (GETTEXT_PACKAGE); + + setlocale (LC_ALL, ""); + + g_type_init (); + + gtk_init (&argc, &argv); + + gtk_main (); + + return 0; +} diff --git a/gui/simple-chooser/Makefile.am b/gui/simple-chooser/Makefile.am index aa5e44c6..32543b07 100644 --- a/gui/simple-chooser/Makefile.am +++ b/gui/simple-chooser/Makefile.am @@ -14,8 +14,9 @@ INCLUDES = \ $(SIMPLE_CHOOSER_CFLAGS) \ $(NULL) -libexec_PROGRAMS = \ - gdm-simple-chooser +libexec_PROGRAMS = \ + gdm-simple-chooser \ + $(NULL) gdm_simple_chooser_SOURCES = \ chooser-main.c \ |