mail-notification

Fork of Jean-Yves Lefort's mail-notification, a tray icon to notify of new mail
git clone https://code.djc.id.au/git/mail-notification/
commit fe344c808d02ff4df5a96fec379f1b4dd41cbb05
parent 2b3d04d1b5e2118643ffb8d3e4ae567c9ca6b678
Author: Jean-Yves Lefort <jylefort@brutele.be>
Date:   Wed, 14 Jun 2006 17:50:29 +1000

mail-notification-3.0

* Updated translations:
        * Japanese (Hiroshi Hasebe)

Diffstat:
MMakefile.in | 1+
MNEWS | 5+++++
Macinclude.m4 | 19+++++++++++++++++++
Mart/Makefile.in | 1+
Mconfigure | 92+++++++++++++++++++++++++++++++++++++++++++++++++------------------------------
Mconfigure.ac | 3++-
Mdata/Makefile.in | 1+
Mhelp/C/Makefile.in | 1+
Mhelp/C/mail-notification-C.omf | 4++--
Mhelp/C/mail-notification.xml | 19+++++++++++++++----
Mhelp/Makefile.in | 1+
Mm4/Makefile.in | 1+
Mpo/cs.po | 4++--
Mpo/fr.po | 4++--
Mpo/ja.po | 48++++++++++++++++++++++++------------------------
Mpo/nl.po | 4++--
Mpo/sv.po | 4++--
Msrc/Makefile.am | 2++
Msrc/Makefile.in | 12+++++++-----
Mtests/Makefile.am | 2+-
Mtests/Makefile.in | 3++-
Mui/Makefile.in | 1+
22 files changed, 151 insertions(+), 81 deletions(-)
diff --git a/Makefile.in b/Makefile.in
@@ -103,6 +103,7 @@ CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO = @ECHO@
diff --git a/NEWS b/NEWS
@@ -1,3 +1,8 @@
+3.0					June 14, 2006
+
+	* Updated translations:
+		* Japanese (Hiroshi Hasebe)
+
 3.0 Release Candidate 2			May 18, 2006
 
 	* Evolution changes:
diff --git a/acinclude.m4 b/acinclude.m4
@@ -91,6 +91,25 @@ fi
 
 AC_SUBST(WARN_CFLAGS)])
 
+dnl MN_ARG_DEBUG
+dnl
+AC_DEFUN([MN_ARG_DEBUG],
+[AC_ARG_ENABLE(debug,
+AS_HELP_STRING([--enable-debug],
+[enable assertions and cast checks]),
+[case "$enableval" in
+	yes|no) enable_debug=$enableval ;;
+	*) AC_MSG_ERROR([bad value $enableval for --enable-debug]) ;;
+esac], [enable_debug=no])
+
+if test $enable_debug = no; then
+	DEBUG_CFLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
+else
+	DEBUG_CFLAGS=
+fi
+
+AC_SUBST(DEBUG_CFLAGS)])
+
 ### report ####################################################################
 
 dnl MN_REPORT(NAME, VALUE)
diff --git a/art/Makefile.in b/art/Makefile.in
@@ -93,6 +93,7 @@ CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO = @ECHO@
diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for Mail Notification 3.0-rc2.
+# Generated by GNU Autoconf 2.59 for Mail Notification 3.0.
 #
 # Report bugs to <jylefort@brutele.be>.
 #
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='Mail Notification'
 PACKAGE_TARNAME='mail-notification'
-PACKAGE_VERSION='3.0-rc2'
-PACKAGE_STRING='Mail Notification 3.0-rc2'
+PACKAGE_VERSION='3.0'
+PACKAGE_STRING='Mail Notification 3.0'
 PACKAGE_BUGREPORT='jylefort@brutele.be'
 
 ac_unique_file="src/mn-main.c"
@@ -465,7 +465,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ac_prefix_program WARN_CFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT PKG_CONFIG GTK_CFLAGS GTK_LIBS ac_pt_PKG_CONFIG GNOME_CFLAGS GNOME_LIBS GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE gnome_prefix gnome_cappletdir GCONFTOOL ORBIT_IDL BONOBO_IDLFLAGS AML GOB2 GMIME_CFLAGS GMIME_LIBS OPENSSL_CFLAGS OPENSSL_LIBS SASL_CFLAGS SASL_LIBS EVOLUTION_PLUGIN_CFLAGS EVOLUTION_PLUGIN_LIBS evolution_plugindir evolution_source_dir WITH_MBOX_TRUE WITH_MBOX_FALSE WITH_MH_TRUE WITH_MH_FALSE WITH_MAILDIR_TRUE WITH_MAILDIR_FALSE WITH_POP3_TRUE WITH_POP3_FALSE WITH_IMAP_TRUE WITH_IMAP_FALSE WITH_POP3_OR_IMAP_TRUE WITH_POP3_OR_IMAP_FALSE WITH_POP3_OR_IMAP_OR_GMAIL_TRUE WITH_POP3_OR_IMAP_OR_GMAIL_FALSE WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE WITH_SSL_TRUE WITH_SSL_FALSE WITH_SASL_TRUE WITH_SASL_FALSE WITH_GMAIL_TRUE WITH_GMAIL_FALSE WITH_EVOLUTION_TRUE WITH_EVOLUTION_FALSE WITH_SYLPHEED_TRUE WITH_SYLPHEED_FALSE WITH_MIME_TRUE WITH_MIME_FALSE WITH_REGRESSION_TESTS_TRUE WITH_REGRESSION_TESTS_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ac_prefix_program WARN_CFLAGS DEBUG_CFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT PKG_CONFIG GTK_CFLAGS GTK_LIBS ac_pt_PKG_CONFIG GNOME_CFLAGS GNOME_LIBS GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE gnome_prefix gnome_cappletdir GCONFTOOL ORBIT_IDL BONOBO_IDLFLAGS AML GOB2 GMIME_CFLAGS GMIME_LIBS OPENSSL_CFLAGS OPENSSL_LIBS SASL_CFLAGS SASL_LIBS EVOLUTION_PLUGIN_CFLAGS EVOLUTION_PLUGIN_LIBS evolution_plugindir evolution_source_dir WITH_MBOX_TRUE WITH_MBOX_FALSE WITH_MH_TRUE WITH_MH_FALSE WITH_MAILDIR_TRUE WITH_MAILDIR_FALSE WITH_POP3_TRUE WITH_POP3_FALSE WITH_IMAP_TRUE WITH_IMAP_FALSE WITH_POP3_OR_IMAP_TRUE WITH_POP3_OR_IMAP_FALSE WITH_POP3_OR_IMAP_OR_GMAIL_TRUE WITH_POP3_OR_IMAP_OR_GMAIL_FALSE WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE WITH_SSL_TRUE WITH_SSL_FALSE WITH_SASL_TRUE WITH_SASL_FALSE WITH_GMAIL_TRUE WITH_GMAIL_FALSE WITH_EVOLUTION_TRUE WITH_EVOLUTION_FALSE WITH_SYLPHEED_TRUE WITH_SYLPHEED_FALSE WITH_MIME_TRUE WITH_MIME_FALSE WITH_REGRESSION_TESTS_TRUE WITH_REGRESSION_TESTS_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -982,7 +982,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Mail Notification 3.0-rc2 to adapt to many kinds of systems.
+\`configure' configures Mail Notification 3.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1049,7 +1049,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Mail Notification 3.0-rc2:";;
+     short | recursive ) echo "Configuration of Mail Notification 3.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1071,6 +1071,7 @@ Optional Features:
                           enable .sylpheed_mark locking
   --enable-compile-warnings=no|yes|error
                           enable compiler warnings [no]
+  --enable-debug          enable assertions and cast checks
   --enable-regression-tests
                           build and run regression tests
   --enable-maintainer-mode  enable make rules and dependencies not useful
@@ -1228,7 +1229,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-Mail Notification configure 3.0-rc2
+Mail Notification configure 3.0
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1242,7 +1243,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Mail Notification $as_me 3.0-rc2, which was
+It was created by Mail Notification $as_me 3.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1837,6 +1838,26 @@ else
 fi
 
 
+# Check whether --enable-debug or --disable-debug was given.
+if test "${enable_debug+set}" = set; then
+  enableval="$enable_debug"
+  case "$enableval" in
+	yes|no) enable_debug=$enableval ;;
+	*) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-debug" >&5
+echo "$as_me: error: bad value $enableval for --enable-debug" >&2;}
+   { (exit 1); exit 1; }; } ;;
+esac
+else
+  enable_debug=no
+fi;
+
+if test $enable_debug = no; then
+	DEBUG_CFLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
+else
+	DEBUG_CFLAGS=
+fi
+
+
 # Check whether --enable-regression-tests or --disable-regression-tests was given.
 if test "${enable_regression_tests+set}" = set; then
   enableval="$enable_regression_tests"
@@ -2243,7 +2264,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mail-notification'
- VERSION='3.0-rc2'
+ VERSION='3.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4069,7 +4090,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4072 "configure"' > conftest.$ac_ext
+  echo '#line 4093 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5668,7 +5689,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:5671:" \
+echo "$as_me:5692:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6731,11 +6752,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6734: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6755: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6738: \$? = $ac_status" >&5
+   echo "$as_me:6759: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6999,11 +7020,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7002: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7023: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7006: \$? = $ac_status" >&5
+   echo "$as_me:7027: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7103,11 +7124,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7106: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7127: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7110: \$? = $ac_status" >&5
+   echo "$as_me:7131: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9448,7 +9469,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9451 "configure"
+#line 9472 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9548,7 +9569,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9551 "configure"
+#line 9572 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11888,11 +11909,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11891: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11912: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11895: \$? = $ac_status" >&5
+   echo "$as_me:11916: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11992,11 +12013,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11995: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12016: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11999: \$? = $ac_status" >&5
+   echo "$as_me:12020: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13562,11 +13583,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13565: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13586: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13569: \$? = $ac_status" >&5
+   echo "$as_me:13590: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13666,11 +13687,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13669: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13690: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13673: \$? = $ac_status" >&5
+   echo "$as_me:13694: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15869,11 +15890,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15872: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15893: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15876: \$? = $ac_status" >&5
+   echo "$as_me:15897: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16137,11 +16158,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16140: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16161: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16144: \$? = $ac_status" >&5
+   echo "$as_me:16165: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16241,11 +16262,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16244: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16265: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16248: \$? = $ac_status" >&5
+   echo "$as_me:16269: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -24789,7 +24810,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by Mail Notification $as_me 3.0-rc2, which was
+This file was extended by Mail Notification $as_me 3.0, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24852,7 +24873,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Mail Notification config.status 3.0-rc2
+Mail Notification config.status 3.0
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -25070,6 +25091,7 @@ s,@ECHO_T@,$ECHO_T,;t t
 s,@LIBS@,$LIBS,;t t
 s,@ac_prefix_program@,$ac_prefix_program,;t t
 s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t
+s,@DEBUG_CFLAGS@,$DEBUG_CFLAGS,;t t
 s,@build@,$build,;t t
 s,@build_cpu@,$build_cpu,;t t
 s,@build_vendor@,$build_vendor,;t t
diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Mail Notification], 3.0-rc2, jylefort@brutele.be)
+AC_INIT([Mail Notification], 3.0, jylefort@brutele.be)
 AC_CONFIG_SRCDIR(src/mn-main.c)
 
 AC_PREREQ(2.59)
@@ -22,6 +22,7 @@ MN_ARG_ENABLE(sylpheed, [disable Sylpheed support])
 MN_ARG_ENABLE(sylpheed-locking, [enable .sylpheed_mark locking], no)
 
 MN_ARG_COMPILE_WARNINGS
+MN_ARG_DEBUG
 MN_ARG_ENABLE(regression-tests, [build and run regression tests], no)
 
 ### initialization
diff --git a/data/Makefile.in b/data/Makefile.in
@@ -93,6 +93,7 @@ CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO = @ECHO@
diff --git a/help/C/Makefile.in b/help/C/Makefile.in
@@ -143,6 +143,7 @@ CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO = @ECHO@
diff --git a/help/C/mail-notification-C.omf b/help/C/mail-notification-C.omf
@@ -12,9 +12,9 @@
       Mail Notification Manual
     </title>
     <date>
-      2006-05-18
+      2006-06-14
     </date>
-    <version identifier="2.14" date="2006-05-18" description="Fifteenth release"/>
+    <version identifier="2.15" date="2006-06-14" description="Sixteenth release"/>
     <subject category="GNOME|Internet"/>
     <description>
       Mail Notification Manual
diff --git a/help/C/mail-notification.xml b/help/C/mail-notification.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
   <!ENTITY app "<application>Mail Notification</application>">
-  <!ENTITY appversion "3.0 Release Candidate 2">
-  <!ENTITY manrevision "2.14">
-  <!ENTITY date "Thursday, May 18, 2006">
+  <!ENTITY appversion "3.0">
+  <!ENTITY manrevision "2.15">
+  <!ENTITY date "Wednesday, June 14, 2006">
 
   <!ENTITY project "The Mail Notification Project">
 
@@ -26,7 +26,7 @@
   <!ENTITY gnomevfs "<link linkend=&#34;gnomevfs&#34;>GnomeVFS</link>">
 ]>
 
-<!-- $Id: mail-notification.xml,v 1.132 2006/05/18 13:28:55 jylefort Exp $ -->
+<!-- $Id: mail-notification.xml,v 1.133 2006/06/14 07:44:48 jylefort Exp $ -->
 <!-- Mail Notification Manual -->
 
 <!-- Copyright (C) 2004-2006 Jean-Yves Lefort -->
@@ -136,6 +136,17 @@
 	</revdescription>
       </revision>
       <revision>
+	<revnumber>Mail Notification Manual V2.14</revnumber>
+	<date>Thursday, May 18, 2006</date>
+	<revdescription>
+	  <para role="author">
+	    Jean-Yves Lefort
+	    <email>jylefort@brutele.be</email>
+	  </para>
+	  <para role="publisher">&project;</para>
+	</revdescription>
+      </revision>
+      <revision>
 	<revnumber>Mail Notification Manual V2.13</revnumber>
 	<date>Tuesday, May 16, 2006</date>
 	<revdescription>
diff --git a/help/Makefile.in b/help/Makefile.in
@@ -86,6 +86,7 @@ CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO = @ECHO@
diff --git a/m4/Makefile.in b/m4/Makefile.in
@@ -77,6 +77,7 @@ CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO = @ECHO@
diff --git a/po/cs.po b/po/cs.po
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mail-notification 3.0-rc2\n"
+"Project-Id-Version: mail-notification 3.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-05-16 09:18+0200\n"
-"PO-Revision-Date: 2006-05-18 14:59+0200\n"
+"PO-Revision-Date: 2006-06-14 09:23+0200\n"
 "Last-Translator: Pav Lucistnik <pav@FreeBSD.org>\n"
 "Language-Team: Pav Lucistnik <pav@FreeBSD.org>\n"
 "MIME-Version: 1.0\n"
diff --git a/po/fr.po b/po/fr.po
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mail-notification 3.0-rc2\n"
+"Project-Id-Version: mail-notification 3.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-05-16 02:11+0200\n"
-"PO-Revision-Date: 2006-05-18 15:00+0200\n"
+"PO-Revision-Date: 2006-06-14 09:23+0200\n"
 "Last-Translator: Jean-Yves Lefort <jylefort@brutele.be>\n"
 "Language-Team: Jean-Yves Lefort <jylefort@brutele.be>\n"
 "MIME-Version: 1.0\n"
diff --git a/po/ja.po b/po/ja.po
@@ -8,10 +8,10 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: mail-notification 3.0-rc2\n"
+"Project-Id-Version: mail-notification 3.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-04-29 11:50+0900\n"
-"PO-Revision-Date: 2006-05-18 15:27+0200\n"
+"PO-Revision-Date: 2006-06-14 09:22+0200\n"
 "Last-Translator: Hiroshi Hasebe <hhasebe@DVOI.COM>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -166,8 +166,8 @@ msgid ""
 "The aspect source of the mail summary popup fonts. Must be \"theme\" or "
 "\"custom\"."
 msgstr ""
-"メール一覧ポップアップで使うフォントの選択基準. \"theme\" もしくは \"custom"
-"\" を指定."
+"メール一覧ポップアップで使うフォントの選択基準. \"theme\"もしくは\"custom"
+"\"を指定."
 
 #: data/mail-notification.schemas.in.h:26
 msgid "The command to run when all mail is read."
@@ -340,12 +340,12 @@ msgstr "ファイルもしくはフォルダを選択"
 #: src/mn-client-session.c:247
 #, c-format
 msgid "resolving %s"
-msgstr "%s を解決中"
+msgstr "%sを解決中"
 
 #: src/mn-client-session.c:263
 #, c-format
 msgid "unable to resolve %s: %s"
-msgstr "%s の解決に失敗: %s"
+msgstr "%sの解決に失敗: %s"
 
 #: src/mn-client-session.c:304
 #, c-format
@@ -360,7 +360,7 @@ msgstr "ネットワークアドレス#%iの文字列への変換に失敗: %s"
 #: src/mn-client-session.c:318
 #, c-format
 msgid "%s: unsupported address family"
-msgstr "%s: そのアドレス形式はサポートされていません"
+msgstr "%s: サポートされていないアドレス形式"
 
 #: src/mn-client-session.c:325
 #, c-format
@@ -385,7 +385,7 @@ msgstr "接続に成功"
 #: src/mn-client-session.c:351
 #, c-format
 msgid "unable to connect to %s"
-msgstr "%s への接続に失敗"
+msgstr "%sへの接続に失敗"
 
 #: src/mn-client-session.c:378
 #, c-format
@@ -449,12 +449,12 @@ msgstr "信頼性が確認されていないサーバーに接続しますか?"
 #: src/mn-client-session.c:590
 #, c-format
 msgid "response \"%s\" is not valid in current context"
-msgstr "このコンテキストでの応答 \"%s\" は無効です"
+msgstr "このコンテキストでの応答\"%s\"は無効です"
 
 #: src/mn-client-session.c:619
 #, c-format
 msgid "unable to parse response \"%s\""
-msgstr "応答 \"%s\" の解析に失敗"
+msgstr "応答\"%s\"の解析に失敗"
 
 #: src/mn-client-session.c:669 src/mn-client-session.c:676
 #, c-format
@@ -468,7 +468,7 @@ msgstr "サーバーからの読み出しに失敗: EOF"
 #: src/mn-client-session.c:686
 #, c-format
 msgid "unable to decode data using SASL: %s"
-msgstr "SALSでデコードに失敗: %s"
+msgstr "SASLでデコードに失敗: %s"
 
 #: src/mn-client-session.c:831
 #, c-format
@@ -604,7 +604,7 @@ msgstr "メール着信通知システムの内部でコマンドエラーが発
 #: src/mn-conf.c:1138
 #, c-format
 msgid "Unable to execute \"%s\": %s."
-msgstr "\"%s\" の実行に失敗: %s."
+msgstr "\"%s\"の実行に失敗: %s."
 
 #: src/mn-custom-vfs-mailbox.gob:76
 msgid "invalid location"
@@ -624,7 +624,7 @@ msgid ""
 "Mail Notification can not contact Evolution. Make sure that Evolution is "
 "running and that the Evolution Mail Notification plugin is loaded."
 msgstr ""
-"Evolutionに接続できません. Evolutionが稼働しており, "
+"Evolutionに接続できません. Evolutionが稼働しており, かつ"
 "Evolutionプラグインが読み込まれていることをご確認ください."
 
 #: src/mn-evolution-mailbox.gob:75
@@ -645,7 +645,7 @@ msgid ""
 "Bonobo could not locate the %s server. Please check your Mail Notification "
 "installation."
 msgstr ""
-"Bonoboが%sサーバーを検出できませんでした. メール着信通知システムが正しく"
+"Bonoboがサーバー%sを検出できませんでした. メール着信通知システムが正しく"
 "インストールされているかどうかをご確認ください."
 
 #: src/mn-evolution-plugin.c:140 src/mn-main.c:460
@@ -654,7 +654,7 @@ msgid ""
 "Bonobo was unable to register the %s server. Please check your Mail "
 "Notification installation."
 msgstr ""
-"Bonoboが%sサーバーを登録できませんでした. メール着信通知システムが正しく"
+"Bonoboがサーバー%sを登録できませんでした. メール着信通知システムが正しく"
 "インストールされているかどうかをご確認ください."
 
 #: src/mn-gmail-mailbox.gob:103
@@ -726,7 +726,7 @@ msgstr "常に(_W)"
 
 #: src/mn-imap-mailbox-properties.gob:174
 msgid "Use the <span style=\"italic\">IDLE</span> extension:"
-msgstr "拡張機能 <span style=\"italic\">IDLE</span> を使用します:"
+msgstr "拡張機能<span style=\"italic\">IDLE</span>を使用します:"
 
 #: src/mn-imap-mailbox.gob:384
 msgid "server did not send capabilities"
@@ -754,7 +754,7 @@ msgid ""
 "\"Use the IDLE extension\" set to \"never\" in the mailbox properties, "
 "logging out"
 msgstr ""
-"メールボックスの設定で \"Use the IDLE extension\" が \"never\" "
+"メールボックスの設定で\"Use the IDLE extension\"が\"never\""
 "になっています. ログアウトします"
 
 #: src/mn-imap-mailbox.gob:858
@@ -767,8 +767,8 @@ msgstr "サーバーで%sが稼働しています. 拡張機能IDLEは使用し
 msgid ""
 "the remote server runs %s, the IDLE extension might not function properly"
 msgstr ""
-"サーバーで%sが稼働しています. 拡張機能 IDLE が正常に"
-"機能しないおそれがあります"
+"サーバーで%sが稼働しています. 拡張機能 IDLE が正常に機能しないおそれが"
+"あります"
 
 #: src/mn-imap-mailbox.gob:872
 msgid "the remote server does not support the IDLE extension, logging out"
@@ -783,7 +783,7 @@ msgid ""
 "a SASL authentication mechanism was selected but SASL support has not been "
 "compiled in"
 msgstr ""
-"SASL認証が選択されていますが, コンパイル時にSASLの使用が指定されて"
+"SASL認証が選択されましたが, コンパイル時にSASLの使用が指定されて"
 "いません"
 
 #: src/mn-imap-mailbox.gob:1411 src/mn-pop3-mailbox.gob:967
@@ -794,7 +794,7 @@ msgstr "\"%s\"は未知の認証方式です"
 #: src/mn-imap-mailbox.gob:1443 src/mn-pop3-mailbox.gob:1003
 #, c-format
 msgid "disabling mechanism \"%s\" and retrying SASL authentication"
-msgstr "\"%s\"を無効にし, SASL認証を再試行します"
+msgstr "\"%s\"を無効にし, SASL認証で再試行します"
 
 #: src/mn-imap-mailbox.gob:1455
 msgid "falling back to IMAP LOGIN authentication"
@@ -1000,7 +1000,7 @@ msgstr "%sバージョン%s\n"
 
 #: src/mn-main.c:137
 msgid "Mailbox backends:\n"
-msgstr "メールボックスバックエンド:\n"
+msgstr "メールボックスのバックエンド:\n"
 
 #: src/mn-main.c:142
 msgid "POP3 and IMAP features:\n"
@@ -1139,7 +1139,7 @@ msgstr "SSL/TLSポートの番号を指定(_R)"
 
 #: src/mn-pi-mailbox-properties.gob:73
 msgid "Ho_stname:"
-msgstr "サーバー(_H):"
+msgstr "サーバー(_S):"
 
 #. translators: header capitalization
 #: src/mn-pi-mailbox-properties.gob:94
@@ -1289,7 +1289,7 @@ msgstr "未知のSSL/TLSエラー"
 
 #: src/mn-standard-message-view.gob:64
 msgid "Unreadable message:"
-msgstr "メッセージを判読できません"
+msgstr "メッセージを判読できません:"
 
 #: src/mn-standard-message-view.gob:67
 msgid "From:"
diff --git a/po/nl.po b/po/nl.po
@@ -8,10 +8,10 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: mail-notification 3.0-rc2\n"
+"Project-Id-Version: mail-notification 3.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-05-16 13:49+0200\n"
-"PO-Revision-Date: 2006-05-18 15:01+0200\n"
+"PO-Revision-Date: 2006-06-14 09:23+0200\n"
 "Last-Translator: Marcel J. Zwiebel <mj.zwiebel@nonux.nl>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
diff --git a/po/sv.po b/po/sv.po
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mail-notification 3.0-rc2\n"
+"Project-Id-Version: mail-notification 3.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-05-15 16:36+0200\n"
-"PO-Revision-Date: 2006-05-18 15:03+0200\n"
+"PO-Revision-Date: 2006-06-14 09:23+0200\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -2,6 +2,7 @@
 include $(top_srcdir)/aml.make
 bin_PROGRAMS = mail-notification
 mail_notification_CPPFLAGS = $(WARN_CFLAGS)
+mail_notification_CPPFLAGS += $(DEBUG_CFLAGS)
 mail_notification_CPPFLAGS += -I$(top_srcdir)
 mail_notification_CPPFLAGS += -DG_LOG_DOMAIN="\"$(PACKAGE)\""
 mail_notification_CPPFLAGS += -DPREFIX="\"$(prefix)\""
@@ -313,6 +314,7 @@ endif
 if WITH_EVOLUTION
 evolution_plugin_LTLIBRARIES = liborg-gnome-mail-notification.la
 liborg_gnome_mail_notification_la_CPPFLAGS = $(WARN_CFLAGS)
+liborg_gnome_mail_notification_la_CPPFLAGS += $(DEBUG_CFLAGS)
 liborg_gnome_mail_notification_la_CPPFLAGS += -I$(top_srcdir)
 liborg_gnome_mail_notification_la_CPPFLAGS += -DG_LOG_DOMAIN="\"$(PACKAGE)\""
 liborg_gnome_mail_notification_la_LDFLAGS = -avoid-version -module
diff --git a/src/Makefile.in b/src/Makefile.in
@@ -611,6 +611,7 @@ CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO = @ECHO@
@@ -794,10 +795,10 @@ target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
 GOBFLAGS = --always-private-header --no-touch --exit-on-warn
-mail_notification_CPPFLAGS = $(WARN_CFLAGS) -I$(top_srcdir) \
-	-DG_LOG_DOMAIN="\"$(PACKAGE)\"" -DPREFIX="\"$(prefix)\"" \
-	-DSYSCONFDIR="\"$(sysconfdir)\"" -DDATADIR="\"$(datadir)\"" \
-	-DLIBDIR="\"$(libdir)\"" \
+mail_notification_CPPFLAGS = $(WARN_CFLAGS) $(DEBUG_CFLAGS) \
+	-I$(top_srcdir) -DG_LOG_DOMAIN="\"$(PACKAGE)\"" \
+	-DPREFIX="\"$(prefix)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" \
+	-DDATADIR="\"$(datadir)\"" -DLIBDIR="\"$(libdir)\"" \
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
 	-DGNOMEPIXMAPSDIR="\"$(datadir)/pixmaps\"" \
 	-DUIDIR="\"$(pkgdatadir)/ui\"" $(GNOME_CFLAGS) \
@@ -928,7 +929,8 @@ CLEANFILES = GNOME_MailNotification-common.c \
 	GNOME_MailNotification.h $(am__append_49) $(evolution_eplug)
 @WITH_EVOLUTION_TRUE@evolution_plugin_LTLIBRARIES = liborg-gnome-mail-notification.la
 @WITH_EVOLUTION_TRUE@liborg_gnome_mail_notification_la_CPPFLAGS =  \
-@WITH_EVOLUTION_TRUE@	$(WARN_CFLAGS) -I$(top_srcdir) \
+@WITH_EVOLUTION_TRUE@	$(WARN_CFLAGS) $(DEBUG_CFLAGS) \
+@WITH_EVOLUTION_TRUE@	-I$(top_srcdir) \
 @WITH_EVOLUTION_TRUE@	-DG_LOG_DOMAIN="\"$(PACKAGE)\"" \
 @WITH_EVOLUTION_TRUE@	$(EVOLUTION_PLUGIN_CFLAGS)
 @WITH_EVOLUTION_TRUE@liborg_gnome_mail_notification_la_LDFLAGS =  \
diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -23,7 +23,7 @@ test_vfs_read_line_largeblock_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DREAD_LINE_BLOCK_SIZE=16384
 
 AM_LDFLAGS = $(GNOME_LIBS)
-AM_CPPFLAGS = $(WARN_CFLAGS) $(G_ASSERTIONS) $(GNOME_CFLAGS) \
+AM_CPPFLAGS = $(WARN_CFLAGS) $(DEBUG_CFLAGS) $(GNOME_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
 	-DMN_REGRESSION_TEST
diff --git a/tests/Makefile.in b/tests/Makefile.in
@@ -110,6 +110,7 @@ CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO = @ECHO@
@@ -313,7 +314,7 @@ test_vfs_read_line_largeblock_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DREAD_LINE_BLOCK_SIZE=16384
 
 AM_LDFLAGS = $(GNOME_LIBS)
-AM_CPPFLAGS = $(WARN_CFLAGS) $(G_ASSERTIONS) $(GNOME_CFLAGS) \
+AM_CPPFLAGS = $(WARN_CFLAGS) $(DEBUG_CFLAGS) $(GNOME_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
 	-DMN_REGRESSION_TEST
diff --git a/ui/Makefile.in b/ui/Makefile.in
@@ -88,6 +88,7 @@ CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUG_CFLAGS = @DEBUG_CFLAGS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO = @ECHO@