Commit cce20994 authored by Gaute Hope's avatar Gaute Hope

GNOME applet disabled by default, with option to enable

GNOME 3 does not support GNOME 2 applets. The applet is now disabled by
default, but can be enabled by passing --enable-applet to configure
script.
parent c337516c
SUBDIRS = desktop src icons po servers help SUBDIRS = desktop src icons po help
if APPLET
SUBDIRS += servers
endif
intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in
......
2011-08-19:
* Applet disabled by default, not supported by GNOME 3
2011-01-29: 2011-01-29:
* Released 2.1.3 - updated translations * Released 2.1.3 - updated translations
......
...@@ -101,11 +101,25 @@ if test "$XSLTPROC" = "no"; then ...@@ -101,11 +101,25 @@ if test "$XSLTPROC" = "no"; then
AC_MSG_ERROR(xsltproc is required) AC_MSG_ERROR(xsltproc is required)
fi fi
dnl Enable applet, the applet is not compatible with GNOME 3
dnl and should be explicitily enabled.
AC_MSG_CHECKING(for whether to include GNOME panel applet..)
AC_ARG_ENABLE(applet,
[ --enable-applet enable applet for the GNOME panel (GNOME 2 only)],
[applet=yes])
AM_CONDITIONAL([APPLET], [test x$applet = xyes])
if test "$applet" = "yes"; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
dnl ******************************* dnl *******************************
dnl Internationalization dnl Internationalization
dnl ******************************* dnl *******************************
GETTEXT_PACKAGE=gnome-schedule GETTEXT_PACKAGE=gnome-schedule
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE") AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
AC_SUBST(GETTEXT_PACKAGE) AC_SUBST(GETTEXT_PACKAGE)
...@@ -131,3 +145,4 @@ servers/Makefile ...@@ -131,3 +145,4 @@ servers/Makefile
servers/GNOME_GnomeSchedule.server.in servers/GNOME_GnomeSchedule.server.in
help/Makefile help/Makefile
]) ])
...@@ -6,4 +6,6 @@ server_DATA = $(server_in_files:.server.in=.server) ...@@ -6,4 +6,6 @@ server_DATA = $(server_in_files:.server.in=.server)
DISTCLEANFILES = $(server_DATA) DISTCLEANFILES = $(server_DATA)
if APPLET
EXTRA_DIST = $(server_DATA) EXTRA_DIST = $(server_DATA)
endif
...@@ -14,28 +14,33 @@ gnomeschedule_PYTHON = \ ...@@ -14,28 +14,33 @@ gnomeschedule_PYTHON = \
addWindow.py \ addWindow.py \
atEditor.py \ atEditor.py \
data.py \ data.py \
scheduleapplet.py \
template.py \ template.py \
template_chooser.py \ template_chooser.py \
template_manager.py \ template_manager.py \
xwrapper.py xwrapper.py
if APPLET
gnomeschedule_PYTHON += scheduleapplet.py
endif
uidir = $(datadir)/gnome-schedule uidir = $(datadir)/gnome-schedule
ui_DATA = \ ui_DATA = \
gnome-schedule.glade \ gnome-schedule.glade
gnome-schedule-applet.xml
if APPLET
ui_DATA += gnome-schedule-applet.xml
endif
DISTCLEANFILES = \ DISTCLEANFILES = \
$(bin_SCRIPTS) \ $(bin_SCRIPTS) \
config.py \ config.py \
gnome-schedule.glade.bak \ gnome-schedule.glade.bak \
gnome-schedule.gladep.bak \ gnome-schedule.gladep.bak \
gnome-schedule.gladep gnome-schedule.gladep
EXTRA_DIST = \ EXTRA_DIST = \
$(bin_SCRIPTS) \ $(bin_SCRIPTS) \
$(gnomeschedule_PYTHON) \ $(gnomeschedule_PYTHON) \
$(ui_DATA) $(ui_DATA)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment