diff options
| author | Sean Davis <smd.seandavis@gmail.com> | 2014-02-09 15:03:35 -0500 |
|---|---|---|
| committer | Sean Davis <smd.seandavis@gmail.com> | 2014-02-09 15:03:35 -0500 |
| commit | 0f2fe26ba25eb337b2700eb3baaf71c558565c3f (patch) | |
| tree | ee2c4a445d46dfb827a39c2eeb48811bd4f1f0bc | |
| parent | 8e1f521133b2f50d8fdf395be4d6c24045894de7 (diff) | |
| download | lightdm-gtk-greeter-git-0f2fe26ba25eb337b2700eb3baaf71c558565c3f.tar.gz | |
Fix loading of indicators, document indicator changes in conf template file
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | data/lightdm-gtk-greeter.conf | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index f88c549..7c76110 100644 --- a/configure.ac +++ b/configure.ac @@ -61,12 +61,12 @@ AS_IF([test "x$enable_libindicator" = "xyes"], [ AC_SUBST(UNITY_INDICATORDIR) AC_DEFINE([HAVE_LIBINDICATOR], [1], [Define if "$INDICATOR_PKG" is present]) - CFLAGS_OLD="$CPPFLAGS" - CFLAGS="$GTK_CFLAGS $LIBIDO_CFLAGS $CFLAGS" + CPPFLAGS_OLD="$CPPFLAGS" + CPPFLAGS=`$PKG_CONFIG --cflags ${INDICATOR_PKG}` AC_CHECK_HEADER([libindicator/indicator-ng.h], [AC_DEFINE([HAVE_LIBINDICATOR_NG], [], [Define if "libindicator/indicator-ng.h" is present])], [], [-]) - CFLAGS="$CFLAGS_OLD" + CPPFLAGS="$CPPFLAGS_OLD" ]) ], [ AC_MSG_CHECKING([for optional package $INDICATOR_PKG]) diff --git a/data/lightdm-gtk-greeter.conf b/data/lightdm-gtk-greeter.conf index 12165cc..793bcc4 100644 --- a/data/lightdm-gtk-greeter.conf +++ b/data/lightdm-gtk-greeter.conf @@ -7,7 +7,7 @@ # xft-dpi = Resolution for Xft in dots per inch (e.g. 96) # xft-hintstyle = What degree of hinting to use (none, slight, medium, or hintfull) # xft-rgba = Type of subpixel antialiasing (none, rgb, bgr, vrgb or vbgr) -# show-indicators = semi-colon ";" separated list of allowed indicator modules (e.g. libsoundmenu.so) +# show-indicators = semi-colon ";" separated list of allowed indicator modules. Built-in indicators include "~a11y", "~language", "~session", "~power". Unity indicators can be represented by short name (e.g. "sound", "power"), service file name, or absolute path # show-clock (true or false) # clock-format = strftime-format string, e.g. %H:%M # keyboard = command to launch on-screen keyboard |