commit c74cc16be2449b4ae40e460b54f82e0890f9e712 parent 1d11f6c51b7c90d7c54729de0f9fab6d8425376e Author: Colin Leroy <colin@colino.net> Date: Sun, 17 Feb 2013 21:56:48 +0000 2013-02-17 [colin] 3.9.0cvs76 * src/plugins/notification/Makefile.am * src/plugins/notification/notification_banner.c * src/plugins/notification/notification_banner.h * src/plugins/notification/notification_command.c * src/plugins/notification/notification_command.h * src/plugins/notification/notification_core.c * src/plugins/notification/notification_foldercheck.c * src/plugins/notification/notification_foldercheck.h * src/plugins/notification/notification_hotkeys.c * src/plugins/notification/notification_hotkeys.h * src/plugins/notification/notification_indicator.c * src/plugins/notification/notification_indicator.h * src/plugins/notification/notification_lcdproc.c * src/plugins/notification/notification_lcdproc.h * src/plugins/notification/notification_plugin.c * src/plugins/notification/notification_plugin.h * src/plugins/notification/notification_popup.c * src/plugins/notification/notification_popup.h * src/plugins/notification/notification_prefs.c * src/plugins/notification/notification_prefs.h * src/plugins/notification/notification_trayicon.c * src/plugins/notification/notification_trayicon.h Activate and fix notification (without libindicate) Diffstat:
25 files changed, 162 insertions(+), 36 deletions(-)
diff --git a/ChangeLog b/ChangeLog @@ -1,3 +1,29 @@ +2013-02-17 [colin] 3.9.0cvs76 + + * src/plugins/notification/Makefile.am + * src/plugins/notification/notification_banner.c + * src/plugins/notification/notification_banner.h + * src/plugins/notification/notification_command.c + * src/plugins/notification/notification_command.h + * src/plugins/notification/notification_core.c + * src/plugins/notification/notification_foldercheck.c + * src/plugins/notification/notification_foldercheck.h + * src/plugins/notification/notification_hotkeys.c + * src/plugins/notification/notification_hotkeys.h + * src/plugins/notification/notification_indicator.c + * src/plugins/notification/notification_indicator.h + * src/plugins/notification/notification_lcdproc.c + * src/plugins/notification/notification_lcdproc.h + * src/plugins/notification/notification_plugin.c + * src/plugins/notification/notification_plugin.h + * src/plugins/notification/notification_popup.c + * src/plugins/notification/notification_popup.h + * src/plugins/notification/notification_prefs.c + * src/plugins/notification/notification_prefs.h + * src/plugins/notification/notification_trayicon.c + * src/plugins/notification/notification_trayicon.h + Activate and fix notification (without libindicate) + 2013-02-17 [colin] 3.9.0cvs75 * src/plugins/Makefile.am diff --git a/PATCHSETS b/PATCHSETS @@ -4573,3 +4573,4 @@ ( cvs diff -u -r 1.8.2.11 -r 1.8.2.12 src/plugins/Makefile.am; diff -u /dev/null src/plugins/acpi_notifier/Makefile.am; diff -u /dev/null src/plugins/acpi_notifier/acpi_notifier.c; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/acpi_notifier/placeholder.txt; diff -u /dev/null src/plugins/address_keeper/Makefile.am; diff -u /dev/null src/plugins/address_keeper/address_keeper.c; diff -u /dev/null src/plugins/address_keeper/address_keeper.h; diff -u /dev/null src/plugins/address_keeper/address_keeper_prefs.c; diff -u /dev/null src/plugins/address_keeper/address_keeper_prefs.h; diff -u /dev/null src/plugins/address_keeper/claws.def; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/address_keeper/placeholder.txt; diff -u /dev/null src/plugins/address_keeper/plugin.def; diff -u /dev/null src/plugins/address_keeper/version.rc; diff -u /dev/null src/plugins/attachwarner/Makefile.am; diff -u /dev/null src/plugins/attachwarner/attachwarner.c; diff -u /dev/null src/plugins/attachwarner/attachwarner.h; diff -u /dev/null src/plugins/attachwarner/attachwarner_prefs.c; diff -u /dev/null src/plugins/attachwarner/attachwarner_prefs.h; diff -u /dev/null src/plugins/attachwarner/claws.def; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/attachwarner/placeholder.txt; diff -u /dev/null src/plugins/attachwarner/plugin.def; diff -u /dev/null src/plugins/attachwarner/version.rc; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/vcalendar/libical/libical/icalversion.h; cvs diff -u -r 1.53.2.42 -r 1.53.2.43 po/POTFILES.in; cvs diff -u -r 1.21.2.12 -r 1.21.2.13 po/bg.po; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 po/ca.po; cvs diff -u -r 1.9.2.29 -r 1.9.2.30 po/cs.po; cvs diff -u -r 1.58.2.55 -r 1.58.2.56 po/de.po; cvs diff -u -r 1.12.2.21 -r 1.12.2.22 po/en_GB.po; cvs diff -u -r 1.60.2.69 -r 1.60.2.70 po/es.po; cvs diff -u -r 1.1.2.32 -r 1.1.2.33 po/fi.po; cvs diff -u -r 1.42.2.62 -r 1.42.2.63 po/fr.po; cvs diff -u -r 1.5.2.26 -r 1.5.2.27 po/hu.po; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 po/id_ID.po; cvs diff -u -r 1.34.2.33 -r 1.34.2.34 po/it.po; cvs diff -u -r 1.16.2.15 -r 1.16.2.16 po/ja.po; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 po/lt.po; cvs diff -u -r 1.28.2.18 -r 1.28.2.19 po/nl.po; cvs diff -u -r 1.10.2.21 -r 1.10.2.22 po/pl.po; cvs diff -u -r 1.50.2.48 -r 1.50.2.49 po/pt_BR.po; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 po/pt_PT.po; cvs diff -u -r 1.17.2.25 -r 1.17.2.26 po/ru.po; cvs diff -u -r 1.2.2.40 -r 1.2.2.41 po/sk.po; cvs diff -u -r 1.17.2.31 -r 1.17.2.32 po/sr.po; cvs diff -u -r 1.4.2.16 -r 1.4.2.17 po/sv.po; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 po/uk.po; cvs diff -u -r 1.5.2.34 -r 1.5.2.35 po/zh_CN.po; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 po/zh_TW.po; ) > 3.9.0cvs73.patchset ( cvs diff -u -r 1.53.2.43 -r 1.53.2.44 po/POTFILES.in; cvs diff -u -r 1.21.2.13 -r 1.21.2.14 po/bg.po; cvs diff -u -r 1.1.2.23 -r 1.1.2.24 po/ca.po; cvs diff -u -r 1.9.2.30 -r 1.9.2.31 po/cs.po; cvs diff -u -r 1.58.2.56 -r 1.58.2.57 po/de.po; cvs diff -u -r 1.12.2.22 -r 1.12.2.23 po/en_GB.po; cvs diff -u -r 1.60.2.70 -r 1.60.2.71 po/es.po; cvs diff -u -r 1.1.2.33 -r 1.1.2.34 po/fi.po; cvs diff -u -r 1.42.2.63 -r 1.42.2.64 po/fr.po; cvs diff -u -r 1.5.2.27 -r 1.5.2.28 po/hu.po; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 po/id_ID.po; cvs diff -u -r 1.34.2.34 -r 1.34.2.35 po/it.po; cvs diff -u -r 1.16.2.16 -r 1.16.2.17 po/ja.po; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 po/lt.po; cvs diff -u -r 1.28.2.19 -r 1.28.2.20 po/nl.po; cvs diff -u -r 1.10.2.22 -r 1.10.2.23 po/pl.po; cvs diff -u -r 1.50.2.49 -r 1.50.2.50 po/pt_BR.po; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 po/pt_PT.po; cvs diff -u -r 1.17.2.26 -r 1.17.2.27 po/ru.po; cvs diff -u -r 1.2.2.41 -r 1.2.2.42 po/sk.po; cvs diff -u -r 1.4.2.17 -r 1.4.2.18 po/sv.po; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 po/uk.po; cvs diff -u -r 1.5.2.35 -r 1.5.2.36 po/zh_CN.po; cvs diff -u -r 1.1.2.9 -r 1.1.2.10 po/zh_TW.po; cvs diff -u -r 1.8.2.12 -r 1.8.2.13 src/plugins/Makefile.am; diff -u /dev/null src/plugins/archive/.cvsignore; diff -u /dev/null src/plugins/archive/Makefile.am; diff -u /dev/null src/plugins/archive/archiver.c; diff -u /dev/null src/plugins/archive/archiver.h; diff -u /dev/null src/plugins/archive/archiver_gtk.c; diff -u /dev/null src/plugins/archive/archiver_prefs.c; diff -u /dev/null src/plugins/archive/archiver_prefs.h; diff -u /dev/null src/plugins/archive/libarchive_archive.c; diff -u /dev/null src/plugins/archive/libarchive_archive.h; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/archive/placeholder.txt; diff -u /dev/null src/plugins/att_remover/.cvsignore; diff -u /dev/null src/plugins/att_remover/Makefile.am; diff -u /dev/null src/plugins/att_remover/att_remover.c; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/att_remover/placeholder.txt; diff -u /dev/null src/plugins/bsfilter/.cvsignore; diff -u /dev/null src/plugins/bsfilter/Makefile.am; diff -u /dev/null src/plugins/bsfilter/bsfilter.c; diff -u /dev/null src/plugins/bsfilter/bsfilter.h; diff -u /dev/null src/plugins/bsfilter/bsfilter_gtk.c; diff -u /dev/null src/plugins/bsfilter/claws.def; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/bsfilter/placeholder.txt; diff -u /dev/null src/plugins/bsfilter/plugin.def; diff -u /dev/null src/plugins/bsfilter/version.rc; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/vcalendar/Makefile.in; cvs diff -u -r -1.1.2.3 -r -1.1.2.4 src/plugins/vcalendar/libical/libical/icalversion.h; ) > 3.9.0cvs74.patchset ( cvs diff -u -r 1.8.2.13 -r 1.8.2.14 src/plugins/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/archive/Makefile.am; diff -u /dev/null src/plugins/clamd/Makefile.am; diff -u /dev/null src/plugins/clamd/clamav_plugin.c; diff -u /dev/null src/plugins/clamd/clamav_plugin.h; diff -u /dev/null src/plugins/clamd/clamav_plugin_gtk.c; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/clamd/placeholder.txt; diff -u /dev/null src/plugins/clamd/libclamd/Makefile.am; diff -u /dev/null src/plugins/clamd/libclamd/clamd-plugin.c; diff -u /dev/null src/plugins/clamd/libclamd/clamd-plugin.h; diff -u /dev/null src/plugins/fetchinfo/Makefile.am; diff -u /dev/null src/plugins/fetchinfo/fetchinfo_plugin.c; diff -u /dev/null src/plugins/fetchinfo/fetchinfo_plugin.h; diff -u /dev/null src/plugins/fetchinfo/fetchinfo_plugin_gtk.c; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/fetchinfo/placeholder.txt; diff -u /dev/null src/plugins/gdata/Makefile.am; diff -u /dev/null src/plugins/gdata/cm_gdata_contacts.c; diff -u /dev/null src/plugins/gdata/cm_gdata_contacts.h; diff -u /dev/null src/plugins/gdata/cm_gdata_prefs.c; diff -u /dev/null src/plugins/gdata/cm_gdata_prefs.h; diff -u /dev/null src/plugins/gdata/gdata_plugin.c; diff -u /dev/null src/plugins/gdata/gdata_plugin.h; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/gdata/placeholder.txt; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/geolocation/placeholder.txt; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/gtkhtml2_viewer/placeholder.txt; diff -u /dev/null src/plugins/mailmbox/Makefile.am; diff -u /dev/null src/plugins/mailmbox/carray.c; diff -u /dev/null src/plugins/mailmbox/carray.h; diff -u /dev/null src/plugins/mailmbox/chash.c; diff -u /dev/null src/plugins/mailmbox/chash.h; diff -u /dev/null src/plugins/mailmbox/clist.c; diff -u /dev/null src/plugins/mailmbox/clist.h; diff -u /dev/null src/plugins/mailmbox/mailimf.c; diff -u /dev/null src/plugins/mailmbox/mailimf.h; diff -u /dev/null src/plugins/mailmbox/mailimf_types.c; diff -u /dev/null src/plugins/mailmbox/mailimf_types.h; diff -u /dev/null src/plugins/mailmbox/mailimf_types_helper.c; diff -u /dev/null src/plugins/mailmbox/mailimf_types_helper.h; diff -u /dev/null src/plugins/mailmbox/mailimf_write.c; diff -u /dev/null src/plugins/mailmbox/mailimf_write.h; diff -u /dev/null src/plugins/mailmbox/maillock.c; diff -u /dev/null src/plugins/mailmbox/maillock.h; diff -u /dev/null src/plugins/mailmbox/mailmbox.c; diff -u /dev/null src/plugins/mailmbox/mailmbox.h; diff -u /dev/null src/plugins/mailmbox/mailmbox_folder.c; diff -u /dev/null src/plugins/mailmbox/mailmbox_folder.h; diff -u /dev/null src/plugins/mailmbox/mailmbox_gtk.deps; diff -u /dev/null src/plugins/mailmbox/mailmbox_parse.c; diff -u /dev/null src/plugins/mailmbox/mailmbox_parse.h; diff -u /dev/null src/plugins/mailmbox/mailmbox_types.c; diff -u /dev/null src/plugins/mailmbox/mailmbox_types.h; diff -u /dev/null src/plugins/mailmbox/mmapstring.c; diff -u /dev/null src/plugins/mailmbox/mmapstring.h; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/mailmbox/placeholder.txt; diff -u /dev/null src/plugins/mailmbox/plugin.c; diff -u /dev/null src/plugins/mailmbox/plugin_gtk.c; diff -u /dev/null src/plugins/mailmbox/plugin_gtk.h; diff -u /dev/null src/plugins/newmail/Makefile.am; diff -u /dev/null src/plugins/newmail/newmail.c; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/newmail/placeholder.txt; diff -u /dev/null src/plugins/notification/Makefile.am; diff -u /dev/null src/plugins/notification/claws.def; diff -u /dev/null src/plugins/notification/notification_banner.c; diff -u /dev/null src/plugins/notification/notification_banner.h; diff -u /dev/null src/plugins/notification/notification_command.c; diff -u /dev/null src/plugins/notification/notification_command.h; diff -u /dev/null src/plugins/notification/notification_core.c; diff -u /dev/null src/plugins/notification/notification_core.h; diff -u /dev/null src/plugins/notification/notification_foldercheck.c; diff -u /dev/null src/plugins/notification/notification_foldercheck.h; diff -u /dev/null src/plugins/notification/notification_hotkeys.c; diff -u /dev/null src/plugins/notification/notification_hotkeys.h; diff -u /dev/null src/plugins/notification/notification_indicator.c; diff -u /dev/null src/plugins/notification/notification_indicator.h; diff -u /dev/null src/plugins/notification/notification_lcdproc.c; diff -u /dev/null src/plugins/notification/notification_lcdproc.h; diff -u /dev/null src/plugins/notification/notification_pixbuf.c; diff -u /dev/null src/plugins/notification/notification_pixbuf.h; diff -u /dev/null src/plugins/notification/notification_plugin.c; diff -u /dev/null src/plugins/notification/notification_plugin.h; diff -u /dev/null src/plugins/notification/notification_popup.c; diff -u /dev/null src/plugins/notification/notification_popup.h; diff -u /dev/null src/plugins/notification/notification_prefs.c; diff -u /dev/null src/plugins/notification/notification_prefs.h; diff -u /dev/null src/plugins/notification/notification_trayicon.c; diff -u /dev/null src/plugins/notification/notification_trayicon.h; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/notification/placeholder.txt; diff -u /dev/null src/plugins/notification/plugin.def; diff -u /dev/null src/plugins/notification/raw_claws_mail_logo_64x64.h; diff -u /dev/null src/plugins/notification/version.rc; diff -u /dev/null src/plugins/pdf_viewer/Makefile.am; diff -u /dev/null src/plugins/pdf_viewer/doc_index.xpm; diff -u /dev/null src/plugins/pdf_viewer/doc_index_close.xpm; diff -u /dev/null src/plugins/pdf_viewer/doc_info.xpm; diff -u /dev/null src/plugins/pdf_viewer/first_arrow.xpm; diff -u /dev/null src/plugins/pdf_viewer/last_arrow.xpm; diff -u /dev/null src/plugins/pdf_viewer/left_arrow.xpm; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/pdf_viewer/placeholder.txt; diff -u /dev/null src/plugins/pdf_viewer/poppler_viewer.c; diff -u /dev/null src/plugins/pdf_viewer/poppler_viewer.h; diff -u /dev/null src/plugins/pdf_viewer/right_arrow.xpm; diff -u /dev/null src/plugins/pdf_viewer/rotate_left.xpm; diff -u /dev/null src/plugins/pdf_viewer/rotate_right.xpm; diff -u /dev/null src/plugins/pdf_viewer/zoom_fit.xpm; diff -u /dev/null src/plugins/pdf_viewer/zoom_in.xpm; diff -u /dev/null src/plugins/pdf_viewer/zoom_out.xpm; diff -u /dev/null src/plugins/pdf_viewer/zoom_width.xpm; diff -u /dev/null src/plugins/perl/Makefile.am; diff -u /dev/null src/plugins/perl/perl_gtk.c; diff -u /dev/null src/plugins/perl/perl_gtk.h; diff -u /dev/null src/plugins/perl/perl_plugin.c; diff -u /dev/null src/plugins/perl/perl_plugin.h; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/perl/placeholder.txt; diff -u /dev/null src/plugins/python/Makefile.am; diff -u /dev/null src/plugins/python/clawsmailmodule.c; diff -u /dev/null src/plugins/python/clawsmailmodule.h; diff -u /dev/null src/plugins/python/composewindowtype.c; diff -u /dev/null src/plugins/python/composewindowtype.h; diff -u /dev/null src/plugins/python/foldertype.c; diff -u /dev/null src/plugins/python/foldertype.h; diff -u /dev/null src/plugins/python/messageinfotype.c; diff -u /dev/null src/plugins/python/messageinfotype.h; diff -u /dev/null src/plugins/python/nodetype.c; diff -u /dev/null src/plugins/python/nodetype.h; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/python/placeholder.txt; diff -u /dev/null src/plugins/python/python-hooks.c; diff -u /dev/null src/plugins/python/python-hooks.h; diff -u /dev/null src/plugins/python/python-shell.c; diff -u /dev/null src/plugins/python/python-shell.h; diff -u /dev/null src/plugins/python/python_plugin.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/vcalendar/Makefile.in; ) > 3.9.0cvs75.patchset +( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/notification_banner.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/notification_banner.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/notification_command.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/notification_command.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/notification_core.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/notification_foldercheck.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/notification_foldercheck.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/notification_hotkeys.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/notification_hotkeys.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/notification_indicator.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/notification_indicator.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/notification_lcdproc.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/notification_lcdproc.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/notification_plugin.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/notification_plugin.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/notification_popup.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/notification_popup.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/notification_prefs.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/notification_prefs.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/notification_trayicon.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/notification/notification_trayicon.h; ) > 3.9.0cvs76.patchset diff --git a/configure.ac b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=9 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=75 +EXTRA_VERSION=76 EXTRA_RELEASE= EXTRA_GTK2_VERSION= @@ -1098,8 +1098,22 @@ dnl --- notification - disabled - too many autofoo annoyances for today --- AC_MSG_CHECKING([whether to build notification plugin]) AC_ARG_ENABLE(notification-plugin, [ --disable-notification-plugin do not build notification plugin], - [ac_cv_enable_notification_plugin=$enableval], [ac_cv_enable_notification_plugin=no]) + [ac_cv_enable_notification_plugin=$enableval], [ac_cv_enable_notification_plugin=yes]) if test x"$ac_cv_enable_notification_plugin" = xyes; then + LIBNOTIFY_REQUIRED=0.4.3 + PKG_CHECK_MODULES(libnotify, libnotify >= $LIBNOTIFY_REQUIRED, + [AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if libnotify support is enabled])], + [AC_MSG_ERROR([libnotify not found])]) + AC_SUBST(libnotify_CFLAGS) + AC_SUBST(libnotify_LIBS) + + AC_DEFINE(NOTIFICATION_POPUP, 1, Activate notification popup) + AC_DEFINE(NOTIFICATION_BANNER, 1, Activate notification banner) + AC_DEFINE(NOTIFICATION_COMMAND, 1, Activate notification shell command) + AC_DEFINE(NOTIFICATION_TRAYICON, 1, Activate notification trayicon) + AC_DEFINE(NOTIFICATION_LCDPROC, 1, Activate lcdproc support) + #AC_DEFINE(NOTIFICATION_INDICATOR, 1, [Activate support for indicators]) + PLUGINS="notification $PLUGINS" AC_MSG_RESULT(yes) else @@ -1460,6 +1474,7 @@ src/plugins/fetchinfo/Makefile src/plugins/gdata/Makefile src/plugins/mailmbox/Makefile src/plugins/newmail/Makefile +src/plugins/notification/Makefile src/plugins/pdf_viewer/Makefile src/plugins/perl/Makefile src/plugins/python/Makefile diff --git a/src/plugins/notification/Makefile.am b/src/plugins/notification/Makefile.am @@ -1,10 +1,10 @@ -if BUILD_HOTKEYS -hotkey_lib = libcmnpgtkhotkey.la -hotkey_lib_path = $(top_builddir)/src/plugins/notification/gtkhotkey/libcmnpgtkhotkey.la -else +#if BUILD_HOTKEYS +#hotkey_lib = libcmnpgtkhotkey.la +#hotkey_lib_path = $(top_builddir)/src/plugins/notification/gtkhotkey/libcmnpgtkhotkey.la +#else hotkey_lib = hotkey_lib_path = -endif +#endif EXTRA_DIST = claws.def plugin.def version.rc diff --git a/src/plugins/notification/notification_banner.c b/src/plugins/notification/notification_banner.c @@ -15,7 +15,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pluginconfig.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "claws-features.h" +#endif + +#include <glib.h> +#include <glib/gi18n.h> #ifdef NOTIFICATION_BANNER diff --git a/src/plugins/notification/notification_banner.h b/src/plugins/notification/notification_banner.h @@ -18,7 +18,10 @@ #ifndef NOTIFICATION_BANNER_H #define NOTIFICATION_BANNER_H NOTIFICATION_BANNER_H -#include "pluginconfig.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "claws-features.h" +#endif #ifdef NOTIFICATION_BANNER diff --git a/src/plugins/notification/notification_command.c b/src/plugins/notification/notification_command.c @@ -15,7 +15,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pluginconfig.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "claws-features.h" +#endif #ifdef NOTIFICATION_COMMAND diff --git a/src/plugins/notification/notification_command.h b/src/plugins/notification/notification_command.h @@ -18,7 +18,10 @@ #ifndef NOTIFICATION_COMMAND_H #define NOTIFICATION_COMMAND_H NOTIFICATION_COMMAND_H -#include "pluginconfig.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "claws-features.h" +#endif #ifdef NOTIFICATION_COMMAND diff --git a/src/plugins/notification/notification_core.c b/src/plugins/notification/notification_core.c @@ -15,7 +15,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pluginconfig.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "claws-features.h" +#endif #include "folder.h" #include "folderview.h" diff --git a/src/plugins/notification/notification_foldercheck.c b/src/plugins/notification/notification_foldercheck.c @@ -18,7 +18,13 @@ /* This code is based on foldersel.c in Claws Mail. * Some functions are only slightly modified, almost 1:1 copies from there. */ -#include "pluginconfig.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "claws-features.h" +#endif + +#include <glib.h> +#include <glib/gi18n.h> /* Basic definitions first */ #include "common/defs.h" diff --git a/src/plugins/notification/notification_foldercheck.h b/src/plugins/notification/notification_foldercheck.h @@ -20,7 +20,10 @@ #include <gtk/gtk.h> -#include "pluginconfig.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "claws-features.h" +#endif void notification_foldercheck_sel_folders_cb(GtkButton*, gpointer); guint notification_register_folder_specific_list(gchar*); diff --git a/src/plugins/notification/notification_hotkeys.c b/src/plugins/notification/notification_hotkeys.c @@ -15,7 +15,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pluginconfig.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "claws-features.h" +#endif #ifdef NOTIFICATION_HOTKEYS diff --git a/src/plugins/notification/notification_hotkeys.h b/src/plugins/notification/notification_hotkeys.h @@ -18,7 +18,10 @@ #ifndef NOTIFICATION_HOTKEYS_H #define NOTIFICATION_HOTKEYS_H NOTIFICATION_HOTKEYS_H -#include "pluginconfig.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "claws-features.h" +#endif #ifdef NOTIFICATION_HOTKEYS diff --git a/src/plugins/notification/notification_indicator.c b/src/plugins/notification/notification_indicator.c @@ -15,7 +15,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pluginconfig.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "claws-features.h" +#endif #ifdef NOTIFICATION_INDICATOR diff --git a/src/plugins/notification/notification_indicator.h b/src/plugins/notification/notification_indicator.h @@ -18,7 +18,10 @@ #ifndef NOTIFICATION_INDICATOR_H #define NOTIFICATION_INDICATOR_H NOTIFICATION_INDICATOR_H -#include "pluginconfig.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "claws-features.h" +#endif #ifdef NOTIFICATION_INDICATOR diff --git a/src/plugins/notification/notification_lcdproc.c b/src/plugins/notification/notification_lcdproc.c @@ -15,7 +15,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pluginconfig.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "claws-features.h" +#endif + +#include <glib.h> +#include <glib/gi18n.h> #ifdef NOTIFICATION_LCDPROC diff --git a/src/plugins/notification/notification_lcdproc.h b/src/plugins/notification/notification_lcdproc.h @@ -18,7 +18,10 @@ #ifndef NOTIFICATION_LCDPROC_H #define NOTIFICATION_LCDPROC_H NOTIFICATION_LCDPROC_H -#include "pluginconfig.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "claws-features.h" +#endif #ifdef NOTIFICATION_LCDPROC diff --git a/src/plugins/notification/notification_plugin.c b/src/plugins/notification/notification_plugin.c @@ -15,7 +15,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pluginconfig.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "claws-features.h" +#endif + +#include <glib.h> +#include <glib/gi18n.h> #include "common/claws.h" #include "common/version.h" diff --git a/src/plugins/notification/notification_plugin.h b/src/plugins/notification/notification_plugin.h @@ -18,7 +18,10 @@ #ifndef NOTIFICATION_PLUGIN_H #define NOTIFICATION_PLUGIN_H NOTIFICATION_PLUGIN_H -#include "pluginconfig.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "claws-features.h" +#endif #ifdef NOTIFICATION_BANNER void notification_update_banner(void); diff --git a/src/plugins/notification/notification_popup.c b/src/plugins/notification/notification_popup.c @@ -15,7 +15,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pluginconfig.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "claws-features.h" +#endif + +#include <glib.h> +#include <glib/gi18n.h> #ifdef NOTIFICATION_POPUP diff --git a/src/plugins/notification/notification_popup.h b/src/plugins/notification/notification_popup.h @@ -18,7 +18,10 @@ #ifndef NOTIFICATION_POPUP_H #define NOTIFICATION_POPUP_H NOTIFICATION_POPUP_H -#include "pluginconfig.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "claws-features.h" +#endif #ifdef NOTIFICATION_POPUP diff --git a/src/plugins/notification/notification_prefs.c b/src/plugins/notification/notification_prefs.c @@ -15,7 +15,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "pluginconfig.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "claws-features.h" +#endif + +#include <glib.h> +#include <glib/gi18n.h> #include <math.h> @@ -387,7 +393,7 @@ void notify_gtk_init(void) { static gchar *path[3]; - path[0] = D_("claws-mail", "Plugins"); + path[0] = _("Plugins"); path[1] = _("Notification"); path[2] = NULL; @@ -401,7 +407,7 @@ void notify_gtk_init(void) { static gchar *hotkeys_path[4]; - hotkeys_path[0] = D_("claws-mail", "Plugins"); + hotkeys_path[0] = _("Plugins"); hotkeys_path[1] = _("Notification"); hotkeys_path[2] = _("Hotkeys"); hotkeys_path[3] = NULL; @@ -419,7 +425,7 @@ void notify_gtk_init(void) { static gchar *banner_path[4]; - banner_path[0] = D_("claws-mail", "Plugins"); + banner_path[0] = _("Plugins"); banner_path[1] = _("Notification"); banner_path[2] = _("Banner"); banner_path[3] = NULL; @@ -436,7 +442,7 @@ void notify_gtk_init(void) { static gchar *popup_path[4]; - popup_path[0] = D_("claws-mail", "Plugins"); + popup_path[0] = _("Plugins"); popup_path[1] = _("Notification"); popup_path[2] = _("Popup"); popup_path[3] = NULL; @@ -453,7 +459,7 @@ void notify_gtk_init(void) { static gchar *command_path[4]; - command_path[0] = D_("claws-mail", "Plugins"); + command_path[0] = _("Plugins"); command_path[1] = _("Notification"); command_path[2] = _("Command"); command_path[3] = NULL; @@ -470,7 +476,7 @@ void notify_gtk_init(void) { static gchar *lcdproc_path[4]; - lcdproc_path[0] = D_("claws-mail", "Plugins"); + lcdproc_path[0] = _("Plugins"); lcdproc_path[1] = _("Notification"); lcdproc_path[2] = _("LCD"); lcdproc_path[3] = NULL; @@ -487,7 +493,7 @@ void notify_gtk_init(void) { static gchar *trayicon_path[4]; - trayicon_path[0] = D_("claws-mail", "Plugins"); + trayicon_path[0] = _("Plugins"); trayicon_path[1] = _("Notification"); trayicon_path[2] = _("SysTrayicon"); trayicon_path[3] = NULL; @@ -504,7 +510,7 @@ void notify_gtk_init(void) { static gchar *indicator_path[4]; - indicator_path[0] = D_("claws-mail", "Plugins"); + indicator_path[0] = _("Plugins"); indicator_path[1] = _("Notification"); indicator_path[2] = _("Indicator"); indicator_path[3] = NULL; diff --git a/src/plugins/notification/notification_prefs.h b/src/plugins/notification/notification_prefs.h @@ -18,7 +18,10 @@ #ifndef NOTIFICATION_PREFS_H #define NOTIFICATION_PREFS_H NOTIFICATION_PREFS_H -#include "pluginconfig.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "claws-features.h" +#endif #include <glib.h> diff --git a/src/plugins/notification/notification_trayicon.c b/src/plugins/notification/notification_trayicon.c @@ -18,7 +18,13 @@ /* This module is of course inspired by the trayicon plugin which is * shipped with Claws-Mail, copyrighted by the Claws-Mail Team. */ -#include "pluginconfig.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "claws-features.h" +#endif + +#include <glib.h> +#include <glib/gi18n.h> #ifdef NOTIFICATION_TRAYICON diff --git a/src/plugins/notification/notification_trayicon.h b/src/plugins/notification/notification_trayicon.h @@ -18,7 +18,10 @@ #ifndef NOTIFICATION_TRAYICON_H #define NOTIFICATION_TRAYICON_H NOTIFICATION_TRAYICON_H -#include "pluginconfig.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +# include "claws-features.h" +#endif #ifdef NOTIFICATION_TRAYICON