From: Ray Strode <rstrode@redhat.com>
Date: Wed, 13 Aug 2008 03:56:00 +0000 (-0400)
Subject: Ship a gdm autostart file with viewer
X-Git-Tag: 0.6.0~203
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2204e8f715495f7990a955f9d58691af4dc88b60;p=thirdparty%2Fplymouth.git

Ship a gdm autostart file with viewer

This way when there is an error the user can see it
at the login screen.
---

diff --git a/configure.ac b/configure.ac
index da4d8b93..4436dc20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,10 @@ AC_ARG_WITH(boot-entry, AS_HELP_STRING([--with-boot-entry],[create initrd and gr
 
 AM_CONDITIONAL(ADD_BOOT_ENTRY,  [test "$with_boot_entry" = yes])
 
+AC_ARG_WITH(gdm-autostart-file, AS_HELP_STRING([--with-gdm-autostart-file],[start log viewer from gdm on boot errors]),with_gdm_autostart_file=$withval,with_gdm_autostart_file=yes)
+
+AM_CONDITIONAL(START_FROM_GDM,  [test "$with_gdm_autostart_file" = yes])
+
 AC_ARG_WITH(logo, AC_HELP_STRING([--with-logo], [logo used by boot splash plugins]),logofile=${withval},logofile=$datadir/plymouth/bizcom.png)
 AC_SUBST(logofile)
 
diff --git a/src/viewer/Makefile.am b/src/viewer/Makefile.am
index 333a4aa9..1e652980 100644
--- a/src/viewer/Makefile.am
+++ b/src/viewer/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS = .
+EXTRA_DIST=
 
 INCLUDES = -I$(top_srcdir)                                                    \
            -I$(srcdir)
@@ -9,4 +10,10 @@ plymouth_log_viewer_CFLAGS = $(GTK_CFLAGS) -DPLYMOUTH_LOG_DIRECTORY=\"$(localsta
 plymouth_log_viewer_LDADD = $(GTK_LIBS)
 plymouth_log_viewer_SOURCES = $(srcdir)/plymouth-log-viewer.c
 
+if START_FROM_GDM
+gdmautostartdir = $(datadir)/gdm/autostart/LoginWindow
+gdmautostart_DATA = plymouth-log-viewer.desktop
+EXTRA_DIST += plymouth-log-viewer.desktop
+endif
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/viewer/plymouth-log-viewer.desktop b/src/viewer/plymouth-log-viewer.desktop
new file mode 100644
index 00000000..d157d19e
--- /dev/null
+++ b/src/viewer/plymouth-log-viewer.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Boot messages
+Comment=Boot messages
+Exec=plymouth-log-viewer --icon
+Terminal=false
+Type=Application
+Categories=
+OnlyShowIn=GNOME;XFCE;