commit a77023f052f6fb77a8c930565d4ba1690595b89d
parent d27a07b38eb3ea7f49b4ce21af7cf261d9c146aa
Author: Jean-Yves Lefort <jylefort@brutele.be>
Date: Tue, 16 Nov 2004 01:16:49 +1000
mail-notification-0.99
* The IMAP capabilities sent in a PREAUTH, AUTHENTICATE or
LOGIN response were ignored, and a CAPABILITY command was
not re-issued after a successful authentication: fixed
* Added a "Display mail summary in tooltip" option
Diffstat:
74 files changed, 2258 insertions(+), 1780 deletions(-)
diff --git a/Makefile.in b/Makefile.in
@@ -40,9 +40,9 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
compile config.guess config.sub depcomp install-sh missing \
mkinstalldirs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
- $(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/sasl2.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/openssl.m4 \
+ $(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -138,6 +138,7 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBBONOBO_IDL = @LIBBONOBO_IDL@
diff --git a/NEWS b/NEWS
@@ -1,3 +1,10 @@
+0.99 November 15, 2004
+
+ * The IMAP capabilities sent in a PREAUTH, AUTHENTICATE or
+ LOGIN response were ignored, and a CAPABILITY command was
+ not re-issued after a successful authentication: fixed
+ * Added a "Display mail summary in tooltip" option
+
0.8.1 November 4, 2004
* Mail summary popup fixes and improvements:
diff --git a/TODO b/TODO
@@ -2,3 +2,5 @@
(RFC 3501, section 11.1)
* See if we can add an Evolution data server mailbox backend
+
+* List the available IMAP folders in the mailbox properties dialog
diff --git a/aclocal.m4 b/aclocal.m4
@@ -393,6 +393,195 @@ AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
])dnl
+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
+# serial 1 IT_PROG_INTLTOOL
+AC_DEFUN([IT_PROG_INTLTOOL],
+[
+
+if test -n "$1"; then
+ AC_MSG_CHECKING(for intltool >= $1)
+
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ printf "%d", $[1] * 100 + $[2]; }'`
+ INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $[2]; }' < ${ac_aux_dir}/intltool-update.in`
+ changequote({{,}})
+ INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split(${{2}}, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${ac_aux_dir}/intltool-update.in`
+ changequote([,])
+
+ if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then
+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+ else
+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found. Your intltool is too old. You need intltool $1 or later.])
+ exit 1
+ fi
+fi
+
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+
+AC_SUBST(INTLTOOL_DESKTOP_RULE)
+AC_SUBST(INTLTOOL_DIRECTORY_RULE)
+AC_SUBST(INTLTOOL_KEYS_RULE)
+AC_SUBST(INTLTOOL_PROP_RULE)
+AC_SUBST(INTLTOOL_OAF_RULE)
+AC_SUBST(INTLTOOL_PONG_RULE)
+AC_SUBST(INTLTOOL_SERVER_RULE)
+AC_SUBST(INTLTOOL_SHEET_RULE)
+AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
+AC_SUBST(INTLTOOL_UI_RULE)
+AC_SUBST(INTLTOOL_XAM_RULE)
+AC_SUBST(INTLTOOL_KBD_RULE)
+AC_SUBST(INTLTOOL_XML_RULE)
+AC_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+AC_SUBST(INTLTOOL_CAVES_RULE)
+AC_SUBST(INTLTOOL_SCHEMAS_RULE)
+AC_SUBST(INTLTOOL_THEME_RULE)
+
+# Use the tools built into the package, not the ones that are installed.
+
+INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
+INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
+INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
+
+AC_SUBST(INTLTOOL_EXTRACT)
+AC_SUBST(INTLTOOL_MERGE)
+AC_SUBST(INTLTOOL_UPDATE)
+
+AC_PATH_PROG(INTLTOOL_PERL, perl)
+if test -z "$INTLTOOL_PERL"; then
+ AC_MSG_ERROR([perl not found; required for intltool])
+fi
+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+ AC_MSG_ERROR([perl 5.x required for intltool])
+fi
+if test "x$2" != "xno-xml"; then
+ AC_MSG_CHECKING([for XML::Parser])
+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+ AC_MSG_RESULT([ok])
+ else
+ AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+ fi
+fi
+
+AC_PATH_PROG(ICONV, iconv, iconv)
+AC_PATH_PROG(MSGFMT, msgfmt, msgfmt)
+AC_PATH_PROG(MSGMERGE, msgmerge, msgmerge)
+AC_PATH_PROG(XGETTEXT, xgettext, xgettext)
+
+# Remove file type tags (using []) from po/POTFILES.
+
+ifdef([AC_DIVERSION_ICMDS],[
+ AC_DIVERT_PUSH(AC_DIVERSION_ICMDS)
+ changequote(,)
+ mv -f po/POTFILES po/POTFILES.tmp
+ sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES
+ rm -f po/POTFILES.tmp
+ changequote([,])
+ AC_DIVERT_POP()
+],[
+ ifdef([AC_CONFIG_COMMANDS_PRE],[
+ AC_CONFIG_COMMANDS_PRE([
+ changequote(,)
+ mv -f po/POTFILES po/POTFILES.tmp
+ sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES
+ rm -f po/POTFILES.tmp
+ changequote([,])
+ ])
+ ])
+
+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+ # Keeping the `.' argument allows $(mkdir_p) to be used without
+ # argument. Indeed, we sometimes output rules like
+ # $(mkdir_p) $(somedir)
+ # where $(somedir) is conditionally defined.
+ # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
+ # expensive solution, as it forces Make to start a sub-shell.)
+ mkdir_p='mkdir -p -- .'
+else
+ # On NextStep and OpenStep, the `mkdir' command does not
+ # recognize any option. It will interpret all options as
+ # directories to create, and then abort because `.' already
+ # exists.
+ for d in ./-p ./--version;
+ do
+ test -d $d && rmdir $d
+ done
+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+ if test -f "$ac_aux_dir/mkinstalldirs"; then
+ mkdir_p='$(mkinstalldirs)'
+ else
+ mkdir_p='$(install_sh) -d'
+ fi
+fi
+AC_SUBST([mkdir_p])
+])
+
+# Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT.
+
+AC_CONFIG_COMMANDS([intltool], [
+
+intltool_edit="-e 's:@INTLTOOL_EXTRACT@:`pwd`/intltool-extract:g' \
+ -e 's:@INTLTOOL_ICONV@:${ICONV}:g' \
+ -e 's:@INTLTOOL_MSGFMT@:${MSGFMT}:g' \
+ -e 's:@INTLTOOL_MSGMERGE@:${MSGMERGE}:g' \
+ -e 's:@INTLTOOL_XGETTEXT@:${XGETTEXT}:g' \
+ -e 's:@INTLTOOL_PERL@:${INTLTOOL_PERL}:g'"
+
+eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-extract.in \
+ > intltool-extract.out
+if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then
+ rm -f intltool-extract.out
+else
+ mv -f intltool-extract.out intltool-extract
+fi
+chmod ugo+x intltool-extract
+chmod u+w intltool-extract
+
+eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-merge.in \
+ > intltool-merge.out
+if cmp -s intltool-merge intltool-merge.out 2>/dev/null; then
+ rm -f intltool-merge.out
+else
+ mv -f intltool-merge.out intltool-merge
+fi
+chmod ugo+x intltool-merge
+chmod u+w intltool-merge
+
+eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-update.in \
+ > intltool-update.out
+if cmp -s intltool-update intltool-update.out 2>/dev/null; then
+ rm -f intltool-update.out
+else
+ mv -f intltool-update.out intltool-update
+fi
+chmod ugo+x intltool-update
+chmod u+w intltool-update
+
+], INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir=${ac_aux_dir}
+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' ICONV='${ICONV}'
+MSGFMT='${MSGFMT}' MSGMERGE='${MSGMERGE}' XGETTEXT='${XGETTEXT}')
+
+])
+
+# deprecated macros
+AC_DEFUN([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL($@)])
+
+
+
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
dnl also defines GSTUFF_PKG_ERRORS on error
@@ -1521,7 +1710,6 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
-m4_include([m4/intltool.m4])
m4_include([m4/openssl.m4])
m4_include([m4/sasl2.m4])
dnl AM_GCONF_SOURCE_2
diff --git a/art/Makefile.in b/art/Makefile.in
@@ -38,9 +38,9 @@ subdir = art
DIST_COMMON = $(dist_app_pixmaps_DATA) $(dist_gnome_pixmaps_DATA) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
- $(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/sasl2.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/openssl.m4 \
+ $(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -126,6 +126,7 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBBONOBO_IDL = @LIBBONOBO_IDL@
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 0.8.1.
+# Generated by GNU Autoconf 2.59 for mail-notification 0.99.
#
# Report bugs to <jylefort@brutele.be>.
#
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='mail-notification'
PACKAGE_TARNAME='mail-notification'
-PACKAGE_VERSION='0.8.1'
-PACKAGE_STRING='mail-notification 0.8.1'
+PACKAGE_VERSION='0.99'
+PACKAGE_STRING='mail-notification 0.99'
PACKAGE_BUGREPORT='jylefort@brutele.be'
ac_unique_file="src/mn-main.c"
@@ -311,7 +311,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 WARN_CFLAGS 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 GETTEXT_PACKAGE 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 CPP EGREP 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_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ICONV MSGMERGE PKG_CONFIG GTK_CFLAGS GTK_LIBS GNOME_CFLAGS GNOME_LIBS GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GCONFTOOL ORBIT_IDL LIBBONOBO_IDL BONOBO_ACTIVATION_IDL GOB2 OPENSSL_CFLAGS OPENSSL_LIBS SASL_CFLAGS SASL_LIBS SOUP_CFLAGS SOUP_LIBS GMIME_CFLAGS GMIME_LIBS 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_SSL_TRUE WITH_SSL_FALSE WITH_SASL_TRUE WITH_SASL_FALSE WITH_SYLPHEED_TRUE WITH_SYLPHEED_FALSE WITH_GMAIL_TRUE WITH_GMAIL_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 WARN_CFLAGS 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 GETTEXT_PACKAGE 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 CPP EGREP 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_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ICONV MSGMERGE PKG_CONFIG GTK_CFLAGS GTK_LIBS GNOME_CFLAGS GNOME_LIBS GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GCONFTOOL ORBIT_IDL LIBBONOBO_IDL BONOBO_ACTIVATION_IDL GOB2 OPENSSL_CFLAGS OPENSSL_LIBS SASL_CFLAGS SASL_LIBS SOUP_CFLAGS SOUP_LIBS GMIME_CFLAGS GMIME_LIBS 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_SSL_TRUE WITH_SSL_FALSE WITH_SASL_TRUE WITH_SASL_FALSE WITH_SYLPHEED_TRUE WITH_SYLPHEED_FALSE WITH_GMAIL_TRUE WITH_GMAIL_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.
@@ -780,7 +780,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 0.8.1 to adapt to many kinds of systems.
+\`configure' configures mail-notification 0.99 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -842,7 +842,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mail-notification 0.8.1:";;
+ short | recursive ) echo "Configuration of mail-notification 0.99:";;
esac
cat <<\_ACEOF
@@ -986,7 +986,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-mail-notification configure 0.8.1
+mail-notification configure 0.99
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1000,7 +1000,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 0.8.1, which was
+It was created by mail-notification $as_me 0.99, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1819,7 +1819,7 @@ fi
# Define the identity of the package.
PACKAGE='mail-notification'
- VERSION='0.8.1'
+ VERSION='0.99'
cat >>confdefs.h <<_ACEOF
@@ -4984,6 +4984,7 @@ INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcar
INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -5007,6 +5008,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcar
+
# Use the tools built into the package, not the ones that are installed.
INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
@@ -5247,6 +5249,32 @@ fi
+if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+ # Keeping the `.' argument allows $(mkdir_p) to be used without
+ # argument. Indeed, we sometimes output rules like
+ # $(mkdir_p) $(somedir)
+ # where $(somedir) is conditionally defined.
+ # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
+ # expensive solution, as it forces Make to start a sub-shell.)
+ mkdir_p='mkdir -p -- .'
+else
+ # On NextStep and OpenStep, the `mkdir' command does not
+ # recognize any option. It will interpret all options as
+ # directories to create, and then abort because `.' already
+ # exists.
+ for d in ./-p ./--version;
+ do
+ test -d $d && rmdir $d
+ done
+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+ if test -f "$ac_aux_dir/mkinstalldirs"; then
+ mkdir_p='$(mkinstalldirs)'
+ else
+ mkdir_p='$(install_sh) -d'
+ fi
+fi
+
+
# Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT.
@@ -8476,7 +8504,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by mail-notification $as_me 0.8.1, which was
+This file was extended by mail-notification $as_me 0.99, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8539,7 +8567,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-mail-notification config.status 0.8.1
+mail-notification config.status 0.99
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -8825,6 +8853,7 @@ s,@INTLTOOL_UI_RULE@,$INTLTOOL_UI_RULE,;t t
s,@INTLTOOL_XAM_RULE@,$INTLTOOL_XAM_RULE,;t t
s,@INTLTOOL_KBD_RULE@,$INTLTOOL_KBD_RULE,;t t
s,@INTLTOOL_XML_RULE@,$INTLTOOL_XML_RULE,;t t
+s,@INTLTOOL_XML_NOMERGE_RULE@,$INTLTOOL_XML_NOMERGE_RULE,;t t
s,@INTLTOOL_CAVES_RULE@,$INTLTOOL_CAVES_RULE,;t t
s,@INTLTOOL_SCHEMAS_RULE@,$INTLTOOL_SCHEMAS_RULE,;t t
s,@INTLTOOL_THEME_RULE@,$INTLTOOL_THEME_RULE,;t t
diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(mail-notification, 0.8.1, jylefort@brutele.be)
+AC_INIT(mail-notification, 0.99, jylefort@brutele.be)
AC_CONFIG_SRCDIR(src/mn-main.c)
AC_PREREQ(2.59)
diff --git a/data/Makefile.in b/data/Makefile.in
@@ -37,9 +37,9 @@ POST_UNINSTALL = :
subdir = data
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
- $(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/sasl2.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/openssl.m4 \
+ $(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -130,6 +130,7 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBBONOBO_IDL = @LIBBONOBO_IDL@
diff --git a/data/mail-notification.schemas.in b/data/mail-notification.schemas.in
@@ -339,5 +339,16 @@
<long>The action to perform when the icon is double-clicked. Must be "display-mail-summary" or "launch-mail-reader".</long>
</locale>
</schema>
+ <schema>
+ <key>/schemas/apps/mail-notification/summary-tooltip</key>
+ <applyto>/apps/mail-notification/summary-tooltip</applyto>
+ <owner>mail-notification</owner>
+ <type>bool</type>
+ <default>1</default>
+ <locale name="C">
+ <short>Display mail summary in tooltip</short>
+ <long>Whether to display the mail summary in the status icon tooltip or not.</long>
+ </locale>
+ </schema>
</schemalist>
</gconfschemafile>
diff --git a/help/C/Makefile.in b/help/C/Makefile.in
@@ -99,9 +99,9 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/help/omf.make $(top_srcdir)/help/xmldocs.make
subdir = help/C
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
- $(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/sasl2.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/openssl.m4 \
+ $(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -176,6 +176,7 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBBONOBO_IDL = @LIBBONOBO_IDL@
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>
- 2004-11-04
+ 2004-11-15
</date>
- <version identifier="2.8" date="2004-11-04" description="Ninth release"/>
+ <version identifier="2.9" date="2004-11-15" description="Tenth 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 "0.8.1">
- <!ENTITY manrevision "2.8">
- <!ENTITY date "Thursday, November 4, 2004">
+ <!ENTITY appversion "0.99">
+ <!ENTITY manrevision "2.9">
+ <!ENTITY date "Monday, November 15, 2004">
<!ENTITY project "The Mail Notification Project">
@@ -26,7 +26,7 @@
<!ENTITY gnomevfs "<link linkend="gnomevfs">GnomeVFS</link>">
]>
-<!-- $Id: mail-notification.xml,v 1.78 2004/11/04 10:52:35 jylefort Exp $ -->
+<!-- $Id: mail-notification.xml,v 1.79 2004/11/15 15:03:17 jylefort Exp $ -->
<!-- Mail Notification Manual -->
<!-- Copyright (c) 2004 Jean-Yves Lefort -->
@@ -134,6 +134,17 @@
</revdescription>
</revision>
<revision>
+ <revnumber>Mail Notification Manual V2.8</revnumber>
+ <date>Thursday, November 4, 2004</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.7</revnumber>
<date>Sunday, October 31, 2004</date>
<revdescription>
@@ -497,6 +508,15 @@
</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><guilabel>Display mail summary in tooltip</guilabel></term>
+ <listitem>
+ <para>
+ If this option is enabled, the mail summary will
+ be displayed in the status icon tooltip.
+ </para>
+ </listitem>
+ </varlistentry>
</variablelist>
</listitem>
</varlistentry>
@@ -1278,6 +1298,7 @@ widget "*" style "mn-icons"</programlisting>
<listitem><para>Filip Miletic</para></listitem>
<listitem><para>Phil Nelson</para></listitem>
<listitem><para>Vladimir Petkov</para></listitem>
+ <listitem><para>Edwin Shin</para></listitem>
</itemizedlist>
</sect2>
diff --git a/help/Makefile.in b/help/Makefile.in
@@ -36,9 +36,9 @@ POST_UNINSTALL = :
subdir = help
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
- $(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/sasl2.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/openssl.m4 \
+ $(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -122,6 +122,7 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBBONOBO_IDL = @LIBBONOBO_IDL@
diff --git a/intltool-extract.in b/intltool-extract.in
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
my $PACKAGE = "intltool";
-my $VERSION = "0.31.3";
+my $VERSION = "0.32.1";
## Loaded modules
use strict;
@@ -394,7 +394,7 @@ sub type_glade {
# Glade sometimes uses tags that normally mark translatable things for
# little bits of non-translatable content. We work around this by not
# translating strings that only includes something like label4 or window1.
- $messages{entity_decode($2)} = [] unless $2 =~ /^(window|label)[0-9]+$/;
+ $messages{entity_decode($2)} = [] unless $2 =~ /^(window|label|dialog)[0-9]+$/;
}
while ($input =~ /<items>(..[^<]*)<\/items>/sg) {
@@ -404,8 +404,11 @@ sub type_glade {
}
## handle new glade files
- while ($input =~ /<(property|atkproperty)\s+[^>]*translatable\s*=\s*"yes"[^>]*>([^<]+)<\/\1>/sg) {
- $messages{entity_decode($2)} = [] unless $2 =~ /^(window|label)[0-9]+$/;
+ while ($input =~ /<(property|atkproperty)\s+[^>]*translatable\s*=\s*"yes"(?:\s+[^>]*comments\s*=\s*"([^"]*)")?[^>]*>([^<]+)<\/\1>/sg) {
+ $messages{entity_decode($3)} = [] unless $3 =~ /^(window|label)[0-9]+$/;
+ if (defined($2) and !($3 =~ /^(window|label)[0-9]+$/)) {
+ $comments{entity_decode($3)} = entity_decode($2) ;
+ }
}
while ($input =~ /<atkaction\s+action_name="([^>]*)"\s+description="([^>]+)"\/>/sg) {
$messages{entity_decode_minimal($2)} = [];
@@ -413,8 +416,47 @@ sub type_glade {
}
sub type_scheme {
- while ($input =~ /_\w*\(?"((?:[^"\\]+|\\.)*)"\)?/sg) {
- $messages{$1} = [];
+ my ($line, $i, $state, $str, $trcomment, $char);
+ for $line (split(/\n/, $input)) {
+ $i = 0;
+ $state = 0; # 0 - nothing, 1 - string, 2 - translatable string
+ while ($i < length($line)) {
+ if (substr($line,$i,1) eq "\"") {
+ if ($state == 2) {
+ $comments{$str} = $trcomment if ($trcomment);
+ $messages{$str} = [];
+ $str = '';
+ $state = 0; $trcomment = "";
+ } elsif ($state == 1) {
+ $str = '';
+ $state = 0; $trcomment = "";
+ } else {
+ $state = 1;
+ $str = '';
+ if ($i>0 && substr($line,$i-1,1) eq '_') {
+ $state = 2;
+ }
+ }
+ } elsif (!$state) {
+ if (substr($line,$i,1) eq ";") {
+ $trcomment = substr($line,$i+1);
+ $trcomment =~ s/^;*\s*//;
+ $i = length($line);
+ } elsif ($trcomment && substr($line,$i,1) !~ /\s|\(|\)|_/) {
+ $trcomment = "";
+ }
+ } else {
+ if (substr($line,$i,1) eq "\\") {
+ $char = substr($line,$i+1,1);
+ if ($char ne "\"" && $char ne "\\") {
+ $str = $str . "\\";
+ }
+ $i++;
+ }
+ $str = $str . substr($line,$i,1);
+ }
+ $i++;
+ }
}
}
diff --git a/intltool-merge.in b/intltool-merge.in
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool";
-my $VERSION = "0.31.3";
+my $VERSION = "0.32.1";
## Loaded modules
use strict;
@@ -111,6 +111,7 @@ elsif ($HELP_ARG)
}
elsif ($BA_STYLE_ARG && @ARGV > 2)
{
+ &utf8_sanity_check;
&preparation;
&print_message;
&ba_merge_translations;
@@ -118,41 +119,41 @@ elsif ($BA_STYLE_ARG && @ARGV > 2)
}
elsif ($XML_STYLE_ARG && @ARGV > 2)
{
- &utf8_sanity_check;
+ &utf8_sanity_check;
&preparation;
&print_message;
-
- &xml_merge_output;
-
+ &xml_merge_output;
&finalize;
}
elsif ($KEYS_STYLE_ARG && @ARGV > 2)
{
- &utf8_sanity_check;
- &preparation;
- &print_message;
- &keys_merge_translations;
+ &utf8_sanity_check;
+ &preparation;
+ &print_message;
+ &keys_merge_translations;
&finalize;
}
elsif ($DESKTOP_STYLE_ARG && @ARGV > 2)
{
- &preparation;
- &print_message;
- &desktop_merge_translations;
+ &utf8_sanity_check;
+ &preparation;
+ &print_message;
+ &desktop_merge_translations;
&finalize;
}
elsif ($SCHEMAS_STYLE_ARG && @ARGV > 2)
{
- &preparation;
- &print_message;
- &schemas_merge_translations;
+ &utf8_sanity_check;
+ &preparation;
+ &print_message;
+ &schemas_merge_translations;
&finalize;
}
elsif ($RFC822DEB_STYLE_ARG && @ARGV > 2)
{
- &preparation;
- &print_message;
- &rfc822deb_merge_translations;
+ &preparation;
+ &print_message;
+ &rfc822deb_merge_translations;
&finalize;
}
else
@@ -194,9 +195,9 @@ Mandatory options: (exactly one must be specified)
-x, --xml-style includes translations in the standard xml style
Other options:
- -u, --utf8 convert all strings to UTF-8 before merging
- -p, --pass-through use strings as found in .po files, without
- conversion (STRONGLY unrecommended with -x)
+ -u, --utf8 convert all strings to UTF-8 before merging
+ (default for everything except RFC822 style)
+ -p, --pass-through deprecated, does nothing and issues a warning
-m, --multiple-output output one localized file per locale, instead of
a single file containing all localized elements
-c, --cache=FILE specify cache file name
@@ -308,13 +309,8 @@ sub get_po_encoding
sub utf8_sanity_check
{
- if (!$UTF8_ARG)
- {
- if (!$PASS_THROUGH_ARG)
- {
- $PASS_THROUGH_ARG="1";
- }
- }
+ print STDERR "Warning: option --pass-through has been removed.\n" if $PASS_THROUGH_ARG;
+ $UTF8_ARG = 1;
}
sub get_translation_database
@@ -462,9 +458,17 @@ sub unescape_one_sequence
return "\\" if $sequence eq "\\\\";
return "\"" if $sequence eq "\\\"";
return "\n" if $sequence eq "\\n";
+ return "\r" if $sequence eq "\\r";
+ return "\t" if $sequence eq "\\t";
+ return "\b" if $sequence eq "\\b";
+ return "\f" if $sequence eq "\\f";
+ return "\a" if $sequence eq "\\a";
+ return chr(11) if $sequence eq "\\v"; # vertical tab, see ascii(7)
- # gettext also handles \n, \t, \b, \r, \f, \v, \a, \xxx (octal),
- # \xXX (hex) and has a comment saying they want to handle \u and \U.
+ return chr(hex($1)) if ($sequence =~ /\\x([0-9a-fA-F]{2})/);
+ return chr(oct($1)) if ($sequence =~ /\\([0-7]{3})/);
+
+ # FIXME: Is \0 supported as well? Kenneth and Rodney don't want it, see bug #48489
return $sequence;
}
@@ -473,7 +477,7 @@ sub unescape_po_string
{
my ($string) = @_;
- $string =~ s/(\\.)/unescape_one_sequence($1)/eg;
+ $string =~ s/(\\x[0-9a-fA-F]{2}|\\[0-7]{3}|\\.)/unescape_one_sequence($1)/eg;
return $string;
}
@@ -494,8 +498,7 @@ sub entity_decode
# entity_encode: (string)
#
-# Encode the given string to XML format (encode '<' etc). It also
-# encodes high bit if not in UTF-8 mode.
+# Encode the given string to XML format (encode '<' etc).
sub entity_encode
{
@@ -503,15 +506,8 @@ sub entity_encode
my @list_of_chars = unpack ('C*', $pre_encoded);
- if ($PASS_THROUGH_ARG)
- {
- return join ('', map (&entity_encode_int_even_high_bit, @list_of_chars));
- }
- else
- {
- # with UTF-8 we only encode minimalistic
- return join ('', map (&entity_encode_int_minimalist, @list_of_chars));
- }
+ # with UTF-8 we only encode minimalistic
+ return join ('', map (&entity_encode_int_minimalist, @list_of_chars));
}
sub entity_encode_int_minimalist
@@ -523,19 +519,6 @@ sub entity_encode_int_minimalist
return chr $_;
}
-sub entity_encode_int_even_high_bit
-{
- if ($_ > 127 || $_ == 34 || $_ == 38 || $_ == 39 || $_ == 60)
- {
- # the ($_ > 127) should probably be removed
- return "&#" . $_ . ";";
- }
- else
- {
- return chr $_;
- }
-}
-
sub entity_encoded_translation
{
my ($lang, $string) = @_;
@@ -608,6 +591,7 @@ sub getAttributeString
my $do_translate = shift || 0;
my $language = shift || "";
my $result = "";
+ my $translate = shift;
foreach my $e (reverse(sort(keys %{ $sub }))) {
my $key = $e;
my $string = $sub->{$e};
@@ -634,8 +618,11 @@ sub getAttributeString
if ($translation) {
$translation = entity_encode($translation);
$string = $translation;
+ $$translate = 2;
}
- }
+ } else {
+ $$translate = 1 if ($translate && (!$$translate)); # watch not to "overwrite" if $translate == 2
+ }
}
$result .= " $key=$quote$string$quote";
@@ -657,6 +644,7 @@ sub getXMLstring
my $count = scalar(@list);
my $attrs = $list[0];
my $index = 1;
+
while ($index < $count) {
my $type = $list[$index];
my $content = $list[$index+1];
@@ -664,7 +652,7 @@ sub getXMLstring
# We've got CDATA
if ($content) {
# lets strip the whitespace here, and *ONLY* here
- $content =~ s/\s+/ /gs;
+ $content =~ s/\s+/ /gs if (!((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/)));
$result .= ($content);
} else {
#print "no cdata content when expected it\n"; # is this possible, is this ok?
@@ -674,7 +662,7 @@ sub getXMLstring
} else {
# We've got another element
$result .= "<$type";
- $result .= getAttributeString($attrs, 0); # no nested translatable elements
+ $result .= getAttributeString(@{$content}[0], 0); # no nested translatable elements
if ($content) {
my $subresult = getXMLstring($content);
if ($subresult) {
@@ -707,23 +695,26 @@ sub traverse
# element
my @all = @{ $content };
my $attrs = shift @all;
- my $outattr = getAttributeString($attrs, 1, $language);
my $translate = 0;
+ my $outattr = getAttributeString($attrs, 1, $language, \$translate);
if ($nodename =~ /^_/) {
$translate = 1;
$nodename =~ s/^_//;
}
my $lookup = '';
- print $fh "<$nodename$outattr";
+ print $fh "<$nodename", $outattr;
if ($translate) {
$lookup = getXMLstring($content);
- $lookup =~ s/^\s+//s;
- $lookup =~ s/\s+$//s;
+ if (!((exists $attrs->{"xml:space"}) && ($attrs->{"xml:space"} =~ /^["']?preserve["']?$/))) {
+ $lookup =~ s/^\s+//s;
+ $lookup =~ s/\s+$//s;
+ }
- if ($lookup) {
+ if ($lookup || $translate == 2) {
my $translation = $translations{$language, $lookup};
- if ($MULTIPLE_OUTPUT && $translation) {
+ if ($MULTIPLE_OUTPUT && ($translation || $translate == 2)) {
+ $translation = $lookup if (!$translation);
print $fh " xml:lang=\"", $language, "\"";
print $fh ">", $translation, "</$nodename>";
return; # this means there will be no same translation with xml:lang="$language"...
@@ -734,20 +725,22 @@ sub traverse
} else {
print $fh "/>";
}
-
-
+
for my $lang (sort keys %po_files_by_lang) {
if ($MULTIPLE_OUTPUT && $lang ne "$language") {
next;
}
if ($lang) {
-
# Handle translation
#
- my $localattrs = getAttributeString($attrs, 1, $lang);
- my $decode_string = ($lookup); #entity_decode($lookup);
- my $translation = $translations{$lang, $decode_string};
- if ($translation) {
+ my $translate = 0;
+ my $localattrs = getAttributeString($attrs, 1, $lang, \$translate);
+ my $translation = $translations{$lang, $lookup};
+ if ($translate && !$translation) {
+ $translation = $lookup;
+ }
+
+ if ($translation || $translate) {
$translation = ($translation);
print $fh "\n";
$leading_space =~ s/.*\n//g;
diff --git a/intltool-update.in b/intltool-update.in
@@ -30,7 +30,7 @@
## Release information
my $PROGRAM = "intltool-update";
-my $VERSION = "0.31.3";
+my $VERSION = "0.32.1";
my $PACKAGE = "intltool";
## Loaded modules
@@ -74,6 +74,7 @@ my $xml_support =
"kbd(?:\\.in)+"; # GOK specific.
my $ini_support =
+"icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec
"desktop(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec
"caves(?:\\.in)+|". # GNOME Games specific
"directory(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec
@@ -283,6 +284,13 @@ sub TextFile_DetermineEncoding ($)
return $gettext_code;
}
+sub isNotValidMissing
+{
+ my ($file) = @_;
+
+ return if $file =~ /^\{arch\}\/.*$/;
+ return if $file =~ /^$varhash{"PACKAGE"}-$varhash{"VERSION"}\/.*$/;
+}
sub FindLeftoutFiles
{
@@ -397,15 +405,19 @@ sub FindLeftoutFiles
if (/\.GetString ?\(QUOTEDTEXT/)
{
- ## Remove the first 3 chars and add newline
- push @buf_allfiles, unpack("x3 A*", $file) . "\n";
+ if (defined isNotValidMissing (unpack("x3 A*", $file))) {
+ ## Remove the first 3 chars and add newline
+ push @buf_allfiles, unpack("x3 A*", $file) . "\n";
+ }
last;
}
if (/_\(QUOTEDTEXT/)
{
- ## Remove the first 3 chars and add newline
- push @buf_allfiles, unpack("x3 A*", $file) . "\n";
+ if (defined isNotValidMissing (unpack("x3 A*", $file))) {
+ ## Remove the first 3 chars and add newline
+ push @buf_allfiles, unpack("x3 A*", $file) . "\n";
+ }
last;
}
}
@@ -421,7 +433,9 @@ sub FindLeftoutFiles
# FIXME: share the pattern matching code with intltool-extract
if (/\s_(.*)=\"/ || /<_[^>]+>/ || /translatable=\"yes\"/)
{
- push @buf_allfiles, unpack("x3 A*", $file) . "\n";
+ if (defined isNotValidMissing (unpack("x3 A*", $file))) {
+ push @buf_allfiles, unpack("x3 A*", $file) . "\n";
+ }
last;
}
}
@@ -435,7 +449,9 @@ sub FindLeftoutFiles
{
if (/_(.*)=/)
{
- push @buf_allfiles, unpack("x3 A*", $file) . "\n";
+ if (defined isNotValidMissing (unpack("x3 A*", $file))) {
+ push @buf_allfiles, unpack("x3 A*", $file) . "\n";
+ }
last;
}
}
@@ -444,7 +460,9 @@ sub FindLeftoutFiles
foreach my $file (@buf_i18n_xml_unmarked)
{
- push @buf_allfiles, unpack("x3 A*", $file) . "\n";
+ if (defined isNotValidMissing (unpack("x3 A*", $file))) {
+ push @buf_allfiles, unpack("x3 A*", $file) . "\n";
+ }
}
@@ -997,7 +1015,7 @@ sub FindPackageName
sub FindPOTKeywords
{
- my $keywords = "--keyword\=\_ --keyword\=N\_ --keyword\=U\_";
+ my $keywords = "--keyword\=\_ --keyword\=N\_ --keyword\=U\_ --keyword\=Q\_";
my $varname = "XGETTEXT_OPTIONS";
my $make_source; {
local (*IN);
diff --git a/m4/Makefile.in b/m4/Makefile.in
@@ -36,9 +36,9 @@ POST_UNINSTALL = :
subdir = m4
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
- $(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/sasl2.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/openssl.m4 \
+ $(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -113,6 +113,7 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBBONOBO_IDL = @LIBBONOBO_IDL@
diff --git a/m4/intltool.m4 b/m4/intltool.m4
@@ -1,179 +0,0 @@
-## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
-## Copyright (C) 2001 Eazel, Inc.
-## Author: Maciej Stachowiak <mjs@noisehavoc.org>
-## Kenneth Christiansen <kenneth@gnu.org>
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-##
-## This program is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-##
-## As a special exception to the GNU General Public License, if you
-## distribute this file as part of a program that contains a
-## configuration script generated by Autoconf, you may include it under
-## the same distribution terms that you use for the rest of that program.
-
-dnl AC_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 1 AC_PROG_INTLTOOL
-AC_DEFUN([AC_PROG_INTLTOOL],
-[
-
-if test -n "$1"; then
- AC_MSG_CHECKING(for intltool >= $1)
-
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ printf "%d", $[1] * 100 + $[2]; }'`
- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $[2]; }' < ${ac_aux_dir}/intltool-update.in`
- changequote({{,}})
- INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split(${{2}}, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${ac_aux_dir}/intltool-update.in`
- changequote([,])
-
- if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then
- AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
- else
- AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found. Your intltool is too old. You need intltool $1 or later.])
- exit 1
- fi
-fi
-
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
-AC_SUBST(INTLTOOL_DESKTOP_RULE)
-AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-AC_SUBST(INTLTOOL_KEYS_RULE)
-AC_SUBST(INTLTOOL_PROP_RULE)
-AC_SUBST(INTLTOOL_OAF_RULE)
-AC_SUBST(INTLTOOL_PONG_RULE)
-AC_SUBST(INTLTOOL_SERVER_RULE)
-AC_SUBST(INTLTOOL_SHEET_RULE)
-AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
-AC_SUBST(INTLTOOL_UI_RULE)
-AC_SUBST(INTLTOOL_XAM_RULE)
-AC_SUBST(INTLTOOL_KBD_RULE)
-AC_SUBST(INTLTOOL_XML_RULE)
-AC_SUBST(INTLTOOL_CAVES_RULE)
-AC_SUBST(INTLTOOL_SCHEMAS_RULE)
-AC_SUBST(INTLTOOL_THEME_RULE)
-
-# Use the tools built into the package, not the ones that are installed.
-
-INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
-INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
-INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
-
-AC_SUBST(INTLTOOL_EXTRACT)
-AC_SUBST(INTLTOOL_MERGE)
-AC_SUBST(INTLTOOL_UPDATE)
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
- AC_MSG_ERROR([perl not found; required for intltool])
-fi
-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
- AC_MSG_ERROR([perl 5.x required for intltool])
-fi
-if test "x$2" != "xno-xml"; then
- AC_MSG_CHECKING([for XML::Parser])
- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
- AC_MSG_RESULT([ok])
- else
- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
- fi
-fi
-
-AC_PATH_PROG(ICONV, iconv, iconv)
-AC_PATH_PROG(MSGFMT, msgfmt, msgfmt)
-AC_PATH_PROG(MSGMERGE, msgmerge, msgmerge)
-AC_PATH_PROG(XGETTEXT, xgettext, xgettext)
-
-# Remove file type tags (using []) from po/POTFILES.
-
-ifdef([AC_DIVERSION_ICMDS],[
- AC_DIVERT_PUSH(AC_DIVERSION_ICMDS)
- changequote(,)
- mv -f po/POTFILES po/POTFILES.tmp
- sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES
- rm -f po/POTFILES.tmp
- changequote([,])
- AC_DIVERT_POP()
-],[
- ifdef([AC_CONFIG_COMMANDS_PRE],[
- AC_CONFIG_COMMANDS_PRE([
- changequote(,)
- mv -f po/POTFILES po/POTFILES.tmp
- sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES
- rm -f po/POTFILES.tmp
- changequote([,])
- ])
- ])
-])
-
-# Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT.
-
-AC_CONFIG_COMMANDS([intltool], [
-
-intltool_edit="-e 's:@INTLTOOL_EXTRACT@:`pwd`/intltool-extract:g' \
- -e 's:@INTLTOOL_ICONV@:${ICONV}:g' \
- -e 's:@INTLTOOL_MSGFMT@:${MSGFMT}:g' \
- -e 's:@INTLTOOL_MSGMERGE@:${MSGMERGE}:g' \
- -e 's:@INTLTOOL_XGETTEXT@:${XGETTEXT}:g' \
- -e 's:@INTLTOOL_PERL@:${INTLTOOL_PERL}:g'"
-
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-extract.in \
- > intltool-extract.out
-if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then
- rm -f intltool-extract.out
-else
- mv -f intltool-extract.out intltool-extract
-fi
-chmod ugo+x intltool-extract
-chmod u+w intltool-extract
-
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-merge.in \
- > intltool-merge.out
-if cmp -s intltool-merge intltool-merge.out 2>/dev/null; then
- rm -f intltool-merge.out
-else
- mv -f intltool-merge.out intltool-merge
-fi
-chmod ugo+x intltool-merge
-chmod u+w intltool-merge
-
-eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-update.in \
- > intltool-update.out
-if cmp -s intltool-update intltool-update.out 2>/dev/null; then
- rm -f intltool-update.out
-else
- mv -f intltool-update.out intltool-update
-fi
-chmod ugo+x intltool-update
-chmod u+w intltool-update
-
-], INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir=${ac_aux_dir}
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' ICONV='${ICONV}'
-MSGFMT='${MSGFMT}' MSGMERGE='${MSGMERGE}' XGETTEXT='${XGETTEXT}')
-
-])
diff --git a/po/bg.gmo b/po/bg.gmo
Binary files differ.
diff --git a/po/bg.po b/po/bg.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnome in bulgarian 0.6.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-04 11:04+0100\n"
+"POT-Creation-Date: 2004-11-15 16:03+0100\n"
"PO-Revision-Date: 2004-10-05 16:13+0200\n"
"Last-Translator: Vladimir \"Kaladan\" Petkov <vpetkov@i-space.org>\n"
"Language-Team: Bulgarian <bg@li.org>\n"
@@ -59,277 +59,285 @@ msgid "Delay between mail checks (seconds part)."
msgstr "Период между проверките за поща (секунди)."
#: data/mail-notification.schemas.in.h:5
-msgid "Do not show the immediate notification error dialog"
+msgid "Display mail summary in tooltip"
msgstr ""
#: data/mail-notification.schemas.in.h:6
+msgid "Do not show the immediate notification error dialog"
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:7
#, fuzzy
msgid "Double-click action"
msgstr "Команда при двойна натискане"
-#: data/mail-notification.schemas.in.h:7
+#: data/mail-notification.schemas.in.h:8
msgid "Enable mail summary popup"
msgstr ""
-#: data/mail-notification.schemas.in.h:8
+#: data/mail-notification.schemas.in.h:9
msgid "Fingerprints of trusted X509 certificates"
msgstr "Пръстови отпечатъци на проверени X509 сертификати"
-#: data/mail-notification.schemas.in.h:9
+#: data/mail-notification.schemas.in.h:10
msgid "Has already been run"
msgstr "Вече е стартиран"
-#: data/mail-notification.schemas.in.h:10
+#: data/mail-notification.schemas.in.h:11
#, fuzzy
msgid "Height of mail summary dialog"
msgstr "Височина на диалоговия прозорец за настройките"
-#: data/mail-notification.schemas.in.h:11
+#: data/mail-notification.schemas.in.h:12
msgid "Height of properties dialog"
msgstr "Височина на диалоговия прозорец за настройките"
-#: data/mail-notification.schemas.in.h:12
+#: data/mail-notification.schemas.in.h:13
#, fuzzy
msgid "Mail read command"
msgstr "Нова команда за поща"
-#: data/mail-notification.schemas.in.h:13
+#: data/mail-notification.schemas.in.h:14
#, fuzzy
msgid "Mail reader command"
msgstr "Нова команда за поща"
-#: data/mail-notification.schemas.in.h:14
+#: data/mail-notification.schemas.in.h:15
msgid "Mail summary popup contents font"
msgstr ""
-#: data/mail-notification.schemas.in.h:15
+#: data/mail-notification.schemas.in.h:16
msgid "Mail summary popup horizontal offset"
msgstr ""
-#: data/mail-notification.schemas.in.h:16
+#: data/mail-notification.schemas.in.h:17
msgid "Mail summary popup position"
msgstr ""
-#: data/mail-notification.schemas.in.h:17
+#: data/mail-notification.schemas.in.h:18
msgid "Mail summary popup title font"
msgstr ""
-#: data/mail-notification.schemas.in.h:18
+#: data/mail-notification.schemas.in.h:19
msgid "Mail summary popup vertical offset"
msgstr ""
-#: data/mail-notification.schemas.in.h:19
+#: data/mail-notification.schemas.in.h:20
#, fuzzy
msgid "Mailbox list"
msgstr "Списък на пощенските кутии"
-#: data/mail-notification.schemas.in.h:20
+#: data/mail-notification.schemas.in.h:21
msgid "Minutes between mail checks"
msgstr "Минути между проверките"
-#: data/mail-notification.schemas.in.h:21
+#: data/mail-notification.schemas.in.h:22
msgid "Minutes to wait before closing the mail summary popup"
msgstr ""
-#: data/mail-notification.schemas.in.h:22
+#: data/mail-notification.schemas.in.h:23
msgid "New mail command"
msgstr "Нова команда за поща"
-#: data/mail-notification.schemas.in.h:23
+#: data/mail-notification.schemas.in.h:24
msgid "Only display recent mail in mail summary popup"
msgstr ""
-#: data/mail-notification.schemas.in.h:24
+#: data/mail-notification.schemas.in.h:25
#, fuzzy
msgid "Run a command when all mail is read"
msgstr "Стартиране на команда при пристигането на нова поща"
-#: data/mail-notification.schemas.in.h:25
+#: data/mail-notification.schemas.in.h:26
msgid "Run a command when new mail arrives"
msgstr "Стартиране на команда при пристигането на нова поща"
-#: data/mail-notification.schemas.in.h:26
+#: data/mail-notification.schemas.in.h:27
msgid "Seconds between mail checks"
msgstr "Секунди между проверките за поща"
-#: data/mail-notification.schemas.in.h:27
+#: data/mail-notification.schemas.in.h:28
msgid "Seconds to wait before closing the mail summary popup"
msgstr ""
-#: data/mail-notification.schemas.in.h:28
+#: data/mail-notification.schemas.in.h:29
#, fuzzy
msgid "Set a mail reader"
msgstr "Избор на файл или папка"
-#: data/mail-notification.schemas.in.h:29
+#: data/mail-notification.schemas.in.h:30
msgid ""
"The action to perform when the icon is double-clicked. Must be \"display-"
"mail-summary\" or \"launch-mail-reader\"."
msgstr ""
-#: data/mail-notification.schemas.in.h:30
+#: data/mail-notification.schemas.in.h:31
#, fuzzy
msgid ""
"The amount of time to wait before closing the mail summary popup (minutes "
"part)."
msgstr "Времевият интервал за изчакване между проверките за нова поща"
-#: data/mail-notification.schemas.in.h:31
+#: data/mail-notification.schemas.in.h:32
#, fuzzy
msgid ""
"The amount of time to wait before closing the mail summary popup (seconds "
"part)."
msgstr "Времевият интервал за изчакване между проверките за нова поща"
-#: data/mail-notification.schemas.in.h:32
+#: data/mail-notification.schemas.in.h:33
#, fuzzy
msgid "The command to run to launch the mail reader."
msgstr "Командата, която да се стартира при пристигането на нова поща."
-#: data/mail-notification.schemas.in.h:33
+#: data/mail-notification.schemas.in.h:34
#, fuzzy
msgid "The command to run when all mail is read."
msgstr "Командата, която да се стартира при пристигането на нова поща."
-#: data/mail-notification.schemas.in.h:34
+#: data/mail-notification.schemas.in.h:35
msgid "The command to run when new mail arrives."
msgstr "Командата, която да се стартира при пристигането на нова поща."
-#: data/mail-notification.schemas.in.h:35
+#: data/mail-notification.schemas.in.h:36
msgid "The custom font to use for the contents of the mail summary popup."
msgstr ""
-#: data/mail-notification.schemas.in.h:36
+#: data/mail-notification.schemas.in.h:37
msgid "The custom font to use for the title of the mail summary popup."
msgstr ""
-#: data/mail-notification.schemas.in.h:37
+#: data/mail-notification.schemas.in.h:38
#, fuzzy
msgid "The height of the mail summary dialog in pixels."
msgstr "Височината в пиксели на диалоговия прозорец за настройките."
-#: data/mail-notification.schemas.in.h:38
+#: data/mail-notification.schemas.in.h:39
msgid "The height of the properties dialog in pixels."
msgstr "Височината в пиксели на диалоговия прозорец за настройките."
-#: data/mail-notification.schemas.in.h:39
+#: data/mail-notification.schemas.in.h:40
msgid "The list of mailboxes to monitor."
msgstr "Списъкът на пощенските кутии за следене."
-#: data/mail-notification.schemas.in.h:40
+#: data/mail-notification.schemas.in.h:41
msgid ""
"The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
"certificate."
msgstr ""
-#: data/mail-notification.schemas.in.h:41
+#: data/mail-notification.schemas.in.h:42
msgid ""
"The list of trusted X509 certificates, represented by their MD5 fingerprint."
msgstr ""
"Списъкът на проверените сертификати тип X509, представени от техните "
"пръстови отпечатъци в MD5 формат."
-#: data/mail-notification.schemas.in.h:42
+#: data/mail-notification.schemas.in.h:43
msgid ""
"The number of pixels to leave between the left or right side of the screen "
"and the mail summary popup."
msgstr ""
-#: data/mail-notification.schemas.in.h:43
+#: data/mail-notification.schemas.in.h:44
msgid ""
"The number of pixels to leave between the top or bottom side of the screen "
"and the mail summary popup."
msgstr ""
-#: data/mail-notification.schemas.in.h:44
+#: data/mail-notification.schemas.in.h:45
msgid ""
"The position of the mail summary popup. Must be \"top-left\", \"top-right\", "
"\"bottom-left\" or \"bottom-right\"."
msgstr ""
-#: data/mail-notification.schemas.in.h:45
+#: data/mail-notification.schemas.in.h:46
#, fuzzy
msgid "The width of the mail summary dialog in pixels."
msgstr "Ширината на диалоговия прозорец за настройките в пиксели."
-#: data/mail-notification.schemas.in.h:46
+#: data/mail-notification.schemas.in.h:47
msgid "The width of the properties dialog in pixels."
msgstr "Ширината на диалоговия прозорец за настройките в пиксели."
-#: data/mail-notification.schemas.in.h:47
+#: data/mail-notification.schemas.in.h:48
msgid "Trusted servers list"
msgstr "Списък на проверените сървъри"
-#: data/mail-notification.schemas.in.h:48
+#: data/mail-notification.schemas.in.h:49
msgid "Use a custom font for the contents of the mail summary popup"
msgstr ""
-#: data/mail-notification.schemas.in.h:49
+#: data/mail-notification.schemas.in.h:50
msgid "Use a custom font for the title of the mail summary popup"
msgstr ""
-#: data/mail-notification.schemas.in.h:50
+#: data/mail-notification.schemas.in.h:51
msgid "Whether Mail Notification has already been run or not."
msgstr "Дали известяването за поща вече е стартирано или не."
-#: data/mail-notification.schemas.in.h:51
+#: data/mail-notification.schemas.in.h:52
msgid "Whether the status icon should blink on errors or not."
msgstr "Дали иконата за състоянието да мига при грешки или не"
-#: data/mail-notification.schemas.in.h:52
+#: data/mail-notification.schemas.in.h:53
#, fuzzy
msgid "Whether to automatically close the mail summary popup or not."
msgstr "Дали да се стартира команда при пристигането на нова поща или не"
-#: data/mail-notification.schemas.in.h:53
+#: data/mail-notification.schemas.in.h:54
+msgid "Whether to display the mail summary in the status icon tooltip or not."
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:55
#, fuzzy
msgid "Whether to display the mail summary popup when new mail arrives or not."
msgstr "Дали да се стартира команда при пристигането на нова поща или не"
-#: data/mail-notification.schemas.in.h:54
+#: data/mail-notification.schemas.in.h:56
msgid ""
"Whether to hide previously displayed mail in the mail summary popup or not."
msgstr ""
-#: data/mail-notification.schemas.in.h:55
+#: data/mail-notification.schemas.in.h:57
msgid ""
"Whether to prevent the immediate notification error dialog from being "
"displayed or not."
msgstr ""
-#: data/mail-notification.schemas.in.h:56
+#: data/mail-notification.schemas.in.h:58
#, fuzzy
msgid "Whether to run a command when all mail is read or not."
msgstr "Дали да се стартира команда при пристигането на нова поща или не"
-#: data/mail-notification.schemas.in.h:57
+#: data/mail-notification.schemas.in.h:59
msgid "Whether to run a command when new mail arrives or not."
msgstr "Дали да се стартира команда при пристигането на нова поща или не"
-#: data/mail-notification.schemas.in.h:58
+#: data/mail-notification.schemas.in.h:60
#, fuzzy
msgid "Whether to set a mail reader or not."
msgstr "Дали известяването за поща вече е стартирано или не."
-#: data/mail-notification.schemas.in.h:59
+#: data/mail-notification.schemas.in.h:61
#, fuzzy
msgid ""
"Whether to use a custom font for the contents of the mail summary popup or "
"not."
msgstr "Дали да се стартира команда при пристигането на нова поща или не"
-#: data/mail-notification.schemas.in.h:60
+#: data/mail-notification.schemas.in.h:62
#, fuzzy
msgid ""
"Whether to use a custom font for the title of the mail summary popup or not."
msgstr "Дали да се стартира команда при пристигането на нова поща или не"
-#: data/mail-notification.schemas.in.h:61
+#: data/mail-notification.schemas.in.h:63
#, fuzzy
msgid "Width of mail summary dialog"
msgstr "Ширина на диалоговия прозорец за настройките"
-#: data/mail-notification.schemas.in.h:62
+#: data/mail-notification.schemas.in.h:64
msgid "Width of properties dialog"
msgstr "Ширина на диалоговия прозорец за настройките"
@@ -735,68 +743,68 @@ msgstr "Номера на порта на IMAP сървъра"
msgid "The mailbox name"
msgstr "Име на пощенската кутия"
-#: src/mn-imap-mailbox.gob:164 src/mn-pop3-mailbox.gob:142
+#: src/mn-imap-mailbox.gob:165 src/mn-pop3-mailbox.gob:142
msgid "SSL/TLS support has not been compiled in"
msgstr ""
-#: src/mn-imap-mailbox.gob:253
+#: src/mn-imap-mailbox.gob:244
msgid "server did not send capabilities"
msgstr ""
-#: src/mn-imap-mailbox.gob:374
+#: src/mn-imap-mailbox.gob:390
msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
msgstr ""
-#: src/mn-imap-mailbox.gob:375
+#: src/mn-imap-mailbox.gob:391
msgid "unable to login"
msgstr "неуспех при влизането"
#. compliance error
-#: src/mn-imap-mailbox.gob:516
+#: src/mn-imap-mailbox.gob:538
#, fuzzy
msgid "server did not send search results"
msgstr "сървърът не изпраща състоянието"
#. compliance error
-#: src/mn-imap-mailbox.gob:596
+#: src/mn-imap-mailbox.gob:618
#, fuzzy
msgid "server did not send all the messages we requested"
msgstr "сървърът не изпраща състоянието"
-#: src/mn-imap-mailbox.gob:645
+#: src/mn-imap-mailbox.gob:667
#, fuzzy
msgid "unable to fetch message"
msgstr "неуспех при свързването: %s"
#. compliance error
-#: src/mn-imap-mailbox.gob:763
+#: src/mn-imap-mailbox.gob:785
msgid "server did not send status"
msgstr "сървърът не изпраща състоянието"
-#: src/mn-imap-mailbox.gob:1035 src/mn-pop3-mailbox.gob:922
+#: src/mn-imap-mailbox.gob:1057 src/mn-pop3-mailbox.gob:922
msgid "unknown server error"
msgstr "неизвестна грешка в сървъра"
-#: src/mn-imap-mailbox.gob:1106 src/mn-pop3-mailbox.gob:226
+#: src/mn-imap-mailbox.gob:1147 src/mn-pop3-mailbox.gob:226
msgid "server does not support in-band SSL/TLS"
msgstr ""
-#: src/mn-imap-mailbox.gob:1125 src/mn-pop3-mailbox.gob:841
+#: src/mn-imap-mailbox.gob:1168 src/mn-pop3-mailbox.gob:841
msgid ""
"a SASL authentication mechanism was selected but SASL support has not been "
"compiled in"
msgstr ""
-#: src/mn-imap-mailbox.gob:1133 src/mn-pop3-mailbox.gob:853
+#: src/mn-imap-mailbox.gob:1176 src/mn-pop3-mailbox.gob:853
#, c-format
msgid "unknown authentication mechanism \"%s\""
msgstr "неизвестен механизъм за идентификация \"%s\""
-#: src/mn-imap-mailbox.gob:1151
+#: src/mn-imap-mailbox.gob:1194
msgid "falling back to IMAP LOGIN authentication"
msgstr ""
-#: src/mn-imap-mailbox.gob:1156 src/mn-pop3-mailbox.gob:888
+#: src/mn-imap-mailbox.gob:1199 src/mn-pop3-mailbox.gob:888
msgid "authentication failed"
msgstr "неуспешна идентификация"
@@ -1244,52 +1252,52 @@ msgstr ""
msgid "falling back to USER/PASS authentication"
msgstr ""
-#: src/mn-properties.c:191
+#: src/mn-properties.c:193
#, fuzzy
msgid "top left"
msgstr "Завършено"
-#: src/mn-properties.c:192
+#: src/mn-properties.c:194
msgid "top right"
msgstr ""
-#: src/mn-properties.c:193
+#: src/mn-properties.c:195
msgid "bottom left"
msgstr ""
-#: src/mn-properties.c:194
+#: src/mn-properties.c:196
msgid "bottom right"
msgstr ""
-#: src/mn-properties.c:284
+#: src/mn-properties.c:287
msgid "No mailbox selected."
msgstr "Няма избрана кутия."
-#: src/mn-properties.c:289
+#: src/mn-properties.c:292
#, fuzzy, c-format
msgid "%i mailbox selected."
msgid_plural "%i mailboxes selected."
msgstr[0] "%i избрана кутия."
msgstr[1] "%i избрана кутия."
-#: src/mn-shell.gob:92
+#: src/mn-shell.gob:93
msgid "You have new mail."
msgstr "Имате поща."
-#: src/mn-shell.gob:347
+#: src/mn-shell.gob:360
msgid "Mailboxes Having New Mail"
msgstr ""
-#: src/mn-shell.gob:349
+#: src/mn-shell.gob:362
msgid "Errors"
msgstr ""
-#: src/mn-shell.gob:351
+#: src/mn-shell.gob:364
#, fuzzy
msgid "Unsupported Mailboxes"
msgstr "Системна кутия"
-#: src/mn-shell.gob:364 ui/summary-dialog.glade.h:1
+#: src/mn-shell.gob:381 ui/summary-dialog.glade.h:1
msgid "Mail Summary"
msgstr ""
@@ -1406,7 +1414,7 @@ msgstr "Грешка с командите се получи в известяв
msgid "Unable to execute \"%s\": %s."
msgstr "неуспех при намирането на %s: %s"
-#: ui/authentication.glade.h:1 ui/properties.glade.h:2
+#: ui/authentication.glade.h:1
msgid "*"
msgstr "*"
@@ -1423,34 +1431,38 @@ msgstr "_Тип на пощенската кутия:"
msgid " "
msgstr " "
-#: ui/properties.glade.h:3
+#: ui/properties.glade.h:2
msgid "<span weight=\"bold\">Commands</span>"
msgstr "<span weight=\"bold\">Команди</span>"
-#: ui/properties.glade.h:4
+#: ui/properties.glade.h:3
#, fuzzy
msgid "<span weight=\"bold\">Double-click Action</span>"
msgstr "<span weight=\"bold\">Основни</span>"
-#: ui/properties.glade.h:5
+#: ui/properties.glade.h:4
#, fuzzy
msgid "<span weight=\"bold\">Fonts</span>"
msgstr "<span weight=\"bold\">Команди</span>"
-#: ui/properties.glade.h:6
+#: ui/properties.glade.h:5
msgid "<span weight=\"bold\">General</span>"
msgstr "<span weight=\"bold\">Основни</span>"
-#: ui/properties.glade.h:7
+#: ui/properties.glade.h:6
#, fuzzy
msgid "<span weight=\"bold\">Mailbox List</span>"
msgstr "<span weight=\"bold\">Пощенски кутии</span>"
-#: ui/properties.glade.h:8
+#: ui/properties.glade.h:7
#, fuzzy
msgid "<span weight=\"bold\">Position</span>"
msgstr "<span weight=\"bold\">Команди</span>"
+#: ui/properties.glade.h:8
+msgid "Dis_play mail summary in tooltip"
+msgstr ""
+
#: ui/properties.glade.h:9
msgid "General"
msgstr ""
@@ -1535,102 +1547,106 @@ msgid "Whether to automatically close the mail summary popup or not"
msgstr "Дали да се стартира команда при пристигането на нова поща или не"
#: ui/properties.glade.h:27
+msgid "Whether to display the mail summary in the status icon tooltip or not"
+msgstr ""
+
+#: ui/properties.glade.h:28
#, fuzzy
msgid "Whether to display the mail summary popup when new mail arrives or not"
msgstr "Дали да се стартира команда при пристигането на нова поща или не"
-#: ui/properties.glade.h:28
+#: ui/properties.glade.h:29
msgid "Whether to hide previously displayed mail or not"
msgstr ""
-#: ui/properties.glade.h:29
+#: ui/properties.glade.h:30
#, fuzzy
msgid "Whether to run a command when all mail is read or not"
msgstr "Дали да се стартира команда при пристигането на нова поща или не"
-#: ui/properties.glade.h:30
+#: ui/properties.glade.h:31
msgid "Whether to run a command when new mail arrives or not"
msgstr "Дали да се стартира команда при пристигането на нова поща или не"
-#: ui/properties.glade.h:31
+#: ui/properties.glade.h:32
#, fuzzy
msgid "Whether to set a mail reader or not"
msgstr "Дали да се стартира команда при пристигането на нова поща или не"
-#: ui/properties.glade.h:32
+#: ui/properties.glade.h:33
msgid ""
"Whether to start Mail Notification when you log into your GNOME session or "
"not"
msgstr ""
"Дали да се стартира известяването за поща, когато влизате в GNOME или не"
-#: ui/properties.glade.h:33
+#: ui/properties.glade.h:34
#, fuzzy
msgid ""
"Whether to use a custom font for the contents of the mail summary popup or "
"not"
msgstr "Дали да се стартира команда при пристигането на нова поща или не"
-#: ui/properties.glade.h:34
+#: ui/properties.glade.h:35
#, fuzzy
msgid ""
"Whether to use a custom font for the title of the mail summary popup or not"
msgstr "Дали да се стартира команда при пристигането на нова поща или не"
-#: ui/properties.glade.h:35
+#: ui/properties.glade.h:36
msgid "_Automatically close after:"
msgstr ""
-#: ui/properties.glade.h:36
+#: ui/properties.glade.h:37
msgid "_Blink on errors"
msgstr "_Мигане при грешки"
-#: ui/properties.glade.h:37
+#: ui/properties.glade.h:38
msgid "_Contents font:"
msgstr ""
-#: ui/properties.glade.h:38
+#: ui/properties.glade.h:39
msgid "_Delay between mail checks:"
msgstr "_Време между проверките за поща:"
-#: ui/properties.glade.h:39
+#: ui/properties.glade.h:40
#, fuzzy
msgid "_Display the mail summary dialog"
msgstr "Изобразяване на диалоговия прозорец с информацията"
-#: ui/properties.glade.h:40
+#: ui/properties.glade.h:41
msgid "_Enable mail summary popup"
msgstr ""
-#: ui/properties.glade.h:41
+#: ui/properties.glade.h:42
msgid "_Launch the mail reader"
msgstr ""
-#: ui/properties.glade.h:42
+#: ui/properties.glade.h:43
msgid "_Mail reader:"
msgstr ""
-#: ui/properties.glade.h:43
+#: ui/properties.glade.h:44
msgid "_Start Mail Notification on GNOME login"
msgstr "_Стартиране на известяването за поща при влизане в GNOME"
-#: ui/properties.glade.h:44
+#: ui/properties.glade.h:45
msgid "_Title font:"
msgstr ""
-#: ui/properties.glade.h:45
+#: ui/properties.glade.h:46
msgid "_Vertical offset:"
msgstr ""
-#: ui/properties.glade.h:46
+#: ui/properties.glade.h:47
msgid "minutes"
msgstr "минути"
-#: ui/properties.glade.h:47
+#: ui/properties.glade.h:48
msgid "pixels"
msgstr ""
-#: ui/properties.glade.h:48
+#: ui/properties.glade.h:49
msgid "seconds"
msgstr "секунди"
diff --git a/po/de.gmo b/po/de.gmo
Binary files differ.
diff --git a/po/de.po b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mail-notification 0.7.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-04 11:04+0100\n"
+"POT-Creation-Date: 2004-11-15 16:03+0100\n"
"PO-Revision-Date: 2004-10-24 10:59+0200\n"
"Last-Translator: Hendrik Brandt <eru@gmx.li>\n"
"Language-Team: German <gnome-de@gnome.org>\n"
@@ -59,162 +59,167 @@ msgid "Delay between mail checks (seconds part)."
msgstr "Abstand zwischen Eingangsüberprüfung (Sekundenteil)."
#: data/mail-notification.schemas.in.h:5
+#, fuzzy
+msgid "Display mail summary in tooltip"
+msgstr "Die Nachrichtenübersicht anzeigen"
+
+#: data/mail-notification.schemas.in.h:6
msgid "Do not show the immediate notification error dialog"
msgstr "Den Fehlerdialog der Sofortbenachrichtigung nicht sofort anzeigen"
-#: data/mail-notification.schemas.in.h:6
+#: data/mail-notification.schemas.in.h:7
msgid "Double-click action"
msgstr ""
-#: data/mail-notification.schemas.in.h:7
+#: data/mail-notification.schemas.in.h:8
msgid "Enable mail summary popup"
msgstr "Nachrichtenübersicht aktivieren"
-#: data/mail-notification.schemas.in.h:8
+#: data/mail-notification.schemas.in.h:9
msgid "Fingerprints of trusted X509 certificates"
msgstr "Fingerabdrücke vertrauensvoller X509-Zertifikate"
-#: data/mail-notification.schemas.in.h:9
+#: data/mail-notification.schemas.in.h:10
msgid "Has already been run"
msgstr "Wurde schon einmal gestartet"
-#: data/mail-notification.schemas.in.h:10
+#: data/mail-notification.schemas.in.h:11
msgid "Height of mail summary dialog"
msgstr "Höhe der Nachrichtenübersicht"
-#: data/mail-notification.schemas.in.h:11
+#: data/mail-notification.schemas.in.h:12
msgid "Height of properties dialog"
msgstr "Höhe des Einstellungen-Dialogs"
-#: data/mail-notification.schemas.in.h:12
+#: data/mail-notification.schemas.in.h:13
msgid "Mail read command"
msgstr "Befehl zum Lesen einer Nachricht"
-#: data/mail-notification.schemas.in.h:13
+#: data/mail-notification.schemas.in.h:14
#, fuzzy
msgid "Mail reader command"
msgstr "Befehl zum Lesen einer Nachricht"
-#: data/mail-notification.schemas.in.h:14
+#: data/mail-notification.schemas.in.h:15
#, fuzzy
msgid "Mail summary popup contents font"
msgstr "Position der Nachrichtenübersicht"
-#: data/mail-notification.schemas.in.h:15
+#: data/mail-notification.schemas.in.h:16
msgid "Mail summary popup horizontal offset"
msgstr "Horizontaler Abstand der Nachrichtenübersicht"
-#: data/mail-notification.schemas.in.h:16
+#: data/mail-notification.schemas.in.h:17
msgid "Mail summary popup position"
msgstr "Position der Nachrichtenübersicht"
-#: data/mail-notification.schemas.in.h:17
+#: data/mail-notification.schemas.in.h:18
#, fuzzy
msgid "Mail summary popup title font"
msgstr "Position der Nachrichtenübersicht"
-#: data/mail-notification.schemas.in.h:18
+#: data/mail-notification.schemas.in.h:19
msgid "Mail summary popup vertical offset"
msgstr "Vertikaler"
-#: data/mail-notification.schemas.in.h:19
+#: data/mail-notification.schemas.in.h:20
msgid "Mailbox list"
msgstr "Liste der Postfächer"
-#: data/mail-notification.schemas.in.h:20
+#: data/mail-notification.schemas.in.h:21
msgid "Minutes between mail checks"
msgstr "Minuten zwischen den Aktualisierungen"
-#: data/mail-notification.schemas.in.h:21
+#: data/mail-notification.schemas.in.h:22
msgid "Minutes to wait before closing the mail summary popup"
msgstr "Wartezeit bis zum Schließen der Nachrichtenübersicht"
-#: data/mail-notification.schemas.in.h:22
+#: data/mail-notification.schemas.in.h:23
msgid "New mail command"
msgstr "Befehl bei neuer Nachricht"
-#: data/mail-notification.schemas.in.h:23
+#: data/mail-notification.schemas.in.h:24
#, fuzzy
msgid "Only display recent mail in mail summary popup"
msgstr "Die Nachrichtenübersicht schließen"
-#: data/mail-notification.schemas.in.h:24
+#: data/mail-notification.schemas.in.h:25
msgid "Run a command when all mail is read"
msgstr "Einen Befehl ausführen, wenn alle Nachrichten gelesen sind"
-#: data/mail-notification.schemas.in.h:25
+#: data/mail-notification.schemas.in.h:26
msgid "Run a command when new mail arrives"
msgstr "Einen Befehl ausführen, wenn eine neue Nachricht eintrifft"
-#: data/mail-notification.schemas.in.h:26
+#: data/mail-notification.schemas.in.h:27
msgid "Seconds between mail checks"
msgstr "Sekunden zwischen den Aktualisierungen"
-#: data/mail-notification.schemas.in.h:27
+#: data/mail-notification.schemas.in.h:28
msgid "Seconds to wait before closing the mail summary popup"
msgstr "Wartezeit in Sekunden bis zum Schließen der Nachrichtenübersicht"
-#: data/mail-notification.schemas.in.h:28
+#: data/mail-notification.schemas.in.h:29
#, fuzzy
msgid "Set a mail reader"
msgstr "Wählen Sie eine Datei oder ein Verzeichnis"
-#: data/mail-notification.schemas.in.h:29
+#: data/mail-notification.schemas.in.h:30
msgid ""
"The action to perform when the icon is double-clicked. Must be \"display-"
"mail-summary\" or \"launch-mail-reader\"."
msgstr ""
-#: data/mail-notification.schemas.in.h:30
+#: data/mail-notification.schemas.in.h:31
msgid ""
"The amount of time to wait before closing the mail summary popup (minutes "
"part)."
msgstr ""
"Die Zeitspanne bis zum Schließen der Nachrichtenübersicht (Minutenteil)."
-#: data/mail-notification.schemas.in.h:31
+#: data/mail-notification.schemas.in.h:32
msgid ""
"The amount of time to wait before closing the mail summary popup (seconds "
"part)."
msgstr ""
"Die Zeitspanne bis zum Schließen der Nachrichtenübersicht (Sekundenteil)."
-#: data/mail-notification.schemas.in.h:32
+#: data/mail-notification.schemas.in.h:33
#, fuzzy
msgid "The command to run to launch the mail reader."
msgstr "Der Befehl der ausgeführt wird, wenn alle Nachrichten gelesen wurden"
-#: data/mail-notification.schemas.in.h:33
+#: data/mail-notification.schemas.in.h:34
msgid "The command to run when all mail is read."
msgstr "Der Befehl der ausgeführt wird, wenn alle Nachrichten gelesen wurden"
-#: data/mail-notification.schemas.in.h:34
+#: data/mail-notification.schemas.in.h:35
msgid "The command to run when new mail arrives."
msgstr "Der Befehl der ausgeführt wird, wenn eine neue Nachricht eintrifft."
-#: data/mail-notification.schemas.in.h:35
+#: data/mail-notification.schemas.in.h:36
#, fuzzy
msgid "The custom font to use for the contents of the mail summary popup."
msgstr "Die Wartedauer ehe die Nachrichtenübersicht geschlossen wurde"
-#: data/mail-notification.schemas.in.h:36
+#: data/mail-notification.schemas.in.h:37
#, fuzzy
msgid "The custom font to use for the title of the mail summary popup."
msgstr "Die Wartedauer ehe die Nachrichtenübersicht geschlossen wurde"
-#: data/mail-notification.schemas.in.h:37
+#: data/mail-notification.schemas.in.h:38
msgid "The height of the mail summary dialog in pixels."
msgstr "Die Höhe der Nachrichtenübersicht in Pixel."
-#: data/mail-notification.schemas.in.h:38
+#: data/mail-notification.schemas.in.h:39
msgid "The height of the properties dialog in pixels."
msgstr "Die Höhe des Einstellungsdialogs in Pixel."
-#: data/mail-notification.schemas.in.h:39
+#: data/mail-notification.schemas.in.h:40
msgid "The list of mailboxes to monitor."
msgstr "Die Liste der zu überwachenden Postfächer."
-#: data/mail-notification.schemas.in.h:40
+#: data/mail-notification.schemas.in.h:41
msgid ""
"The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
"certificate."
@@ -222,14 +227,14 @@ msgstr ""
"Die Liste vertrauensvoller SSL/TLS-Server (Host-Name:Port) ohne X509-"
"Zertifikat."
-#: data/mail-notification.schemas.in.h:41
+#: data/mail-notification.schemas.in.h:42
msgid ""
"The list of trusted X509 certificates, represented by their MD5 fingerprint."
msgstr ""
"Die Liste vertrauensvoller X509-Zertifikate, repräsentiert durch ihre MD5-"
"Fingerabdrücke."
-#: data/mail-notification.schemas.in.h:42
+#: data/mail-notification.schemas.in.h:43
msgid ""
"The number of pixels to leave between the left or right side of the screen "
"and the mail summary popup."
@@ -237,7 +242,7 @@ msgstr ""
"Die Anzahl an Pixeln die zwischen dem linken oder rechten Bildschirmrand und "
"der Nachrichtenübersicht."
-#: data/mail-notification.schemas.in.h:43
+#: data/mail-notification.schemas.in.h:44
msgid ""
"The number of pixels to leave between the top or bottom side of the screen "
"and the mail summary popup."
@@ -245,7 +250,7 @@ msgstr ""
"Die Anzahl an Pixeln die zwischen dem oberen oder runteren Bildschirmrand "
"und der Nachrichtenübersicht."
-#: data/mail-notification.schemas.in.h:44
+#: data/mail-notification.schemas.in.h:45
msgid ""
"The position of the mail summary popup. Must be \"top-left\", \"top-right\", "
"\"bottom-left\" or \"bottom-right\"."
@@ -253,82 +258,89 @@ msgstr ""
"Die Position der Nachrichtenübersicht. Der Wert muss »oben-links«, »oben-"
"rechts«, »unten-links« oder »unten-rechts« sein."
-#: data/mail-notification.schemas.in.h:45
+#: data/mail-notification.schemas.in.h:46
msgid "The width of the mail summary dialog in pixels."
msgstr "Die Breite der Nachrichtenübersicht in Pixel."
-#: data/mail-notification.schemas.in.h:46
+#: data/mail-notification.schemas.in.h:47
msgid "The width of the properties dialog in pixels."
msgstr "Die Breite des Einstellungen-Dialogs in Pixel."
-#: data/mail-notification.schemas.in.h:47
+#: data/mail-notification.schemas.in.h:48
msgid "Trusted servers list"
msgstr "Liste vertrauensvoller Server"
-#: data/mail-notification.schemas.in.h:48
+#: data/mail-notification.schemas.in.h:49
#, fuzzy
msgid "Use a custom font for the contents of the mail summary popup"
msgstr "Wartezeit in Sekunden bis zum Schließen der Nachrichtenübersicht"
-#: data/mail-notification.schemas.in.h:49
+#: data/mail-notification.schemas.in.h:50
#, fuzzy
msgid "Use a custom font for the title of the mail summary popup"
msgstr "Die Wartedauer ehe die Nachrichtenübersicht geschlossen wurde"
-#: data/mail-notification.schemas.in.h:50
+#: data/mail-notification.schemas.in.h:51
msgid "Whether Mail Notification has already been run or not."
msgstr ""
"Legt fest, ob die E-Mail-Eingangsüberwachnung schon einmal gestartet wurde."
-#: data/mail-notification.schemas.in.h:51
+#: data/mail-notification.schemas.in.h:52
msgid "Whether the status icon should blink on errors or not."
msgstr ""
"Legt fest, ob das Nachrichtensymbol bei Auftreten eines Fehlers blinkt."
-#: data/mail-notification.schemas.in.h:52
+#: data/mail-notification.schemas.in.h:53
msgid "Whether to automatically close the mail summary popup or not."
msgstr ""
"Legt fest, ob ein Befehl ausgeführt wird, wenn eine neue Nachricht eintrifft."
-#: data/mail-notification.schemas.in.h:53
+#: data/mail-notification.schemas.in.h:54
+#, fuzzy
+msgid "Whether to display the mail summary in the status icon tooltip or not."
+msgstr ""
+"Legt fest, ob die Nachrichtenübersicht angezeigt wird, wenn eine neue "
+"Nachricht eintrifft."
+
+#: data/mail-notification.schemas.in.h:55
msgid "Whether to display the mail summary popup when new mail arrives or not."
msgstr ""
"Legt fest, ob die Nachrichtenübersicht angezeigt wird, wenn eine neue "
"Nachricht eintrifft."
-#: data/mail-notification.schemas.in.h:54
+#: data/mail-notification.schemas.in.h:56
#, fuzzy
msgid ""
"Whether to hide previously displayed mail in the mail summary popup or not."
msgstr ""
"Legt fest, ob ein Befehl ausgeführt wird, wenn eine neue Nachricht eintrifft."
-#: data/mail-notification.schemas.in.h:55
+#: data/mail-notification.schemas.in.h:57
msgid ""
"Whether to prevent the immediate notification error dialog from being "
"displayed or not."
msgstr ""
"Legt fest, ob der Fehlerdialog der Sofortbenachrichtigung angezeigt wird."
-#: data/mail-notification.schemas.in.h:56
+#: data/mail-notification.schemas.in.h:58
msgid "Whether to run a command when all mail is read or not."
msgstr ""
"Legt fest, ob ein Befehl ausgeführt wird, wenn alle Nachrichten gelesen "
"wurden."
-#: data/mail-notification.schemas.in.h:57
+#: data/mail-notification.schemas.in.h:59
msgid "Whether to run a command when new mail arrives or not."
msgstr ""
"Legt fest, ob ein Befehl ausgeführt wird, wenn eine neue Nachricht eintrifft."
-#: data/mail-notification.schemas.in.h:58
+#: data/mail-notification.schemas.in.h:60
#, fuzzy
msgid "Whether to set a mail reader or not."
msgstr ""
"Legt fest, ob ein Befehl ausgeführt wird, wenn alle Nachrichten gelesen "
"wurden."
-#: data/mail-notification.schemas.in.h:59
+#: data/mail-notification.schemas.in.h:61
#, fuzzy
msgid ""
"Whether to use a custom font for the contents of the mail summary popup or "
@@ -336,18 +348,18 @@ msgid ""
msgstr ""
"Legt fest, ob ein Befehl ausgeführt wird, wenn eine neue Nachricht eintrifft."
-#: data/mail-notification.schemas.in.h:60
+#: data/mail-notification.schemas.in.h:62
#, fuzzy
msgid ""
"Whether to use a custom font for the title of the mail summary popup or not."
msgstr ""
"Legt fest, ob ein Befehl ausgeführt wird, wenn eine neue Nachricht eintrifft."
-#: data/mail-notification.schemas.in.h:61
+#: data/mail-notification.schemas.in.h:63
msgid "Width of mail summary dialog"
msgstr "Breite der Nachrichtenübersicht"
-#: data/mail-notification.schemas.in.h:62
+#: data/mail-notification.schemas.in.h:64
msgid "Width of properties dialog"
msgstr "Breite des Einstellungen-Dialogs"
@@ -785,54 +797,54 @@ msgstr "Die Port-Nummer auf dem IMAP-Server"
msgid "The mailbox name"
msgstr "Der Postfachname"
-#: src/mn-imap-mailbox.gob:164 src/mn-pop3-mailbox.gob:142
+#: src/mn-imap-mailbox.gob:165 src/mn-pop3-mailbox.gob:142
msgid "SSL/TLS support has not been compiled in"
msgstr ""
"Die Unterstützung für SSL/TLS wurde beim Erstellen des Programms nicht "
"eingebaut"
-#: src/mn-imap-mailbox.gob:253
+#: src/mn-imap-mailbox.gob:244
msgid "server did not send capabilities"
msgstr "Der Server hat seine Fähigkeiten nicht bekannt gegeben"
-#: src/mn-imap-mailbox.gob:374
+#: src/mn-imap-mailbox.gob:390
msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
msgstr ""
"Der Server gibt LOGINDISABLED zurück, LOGIN-Authentifizierung wird nicht "
"verwendet"
-#: src/mn-imap-mailbox.gob:375
+#: src/mn-imap-mailbox.gob:391
msgid "unable to login"
msgstr "Anmeldung fehlgeschlagen"
#. compliance error
-#: src/mn-imap-mailbox.gob:516
+#: src/mn-imap-mailbox.gob:538
msgid "server did not send search results"
msgstr "Der Server hat keine Suchergebnisse gesendet"
#. compliance error
-#: src/mn-imap-mailbox.gob:596
+#: src/mn-imap-mailbox.gob:618
msgid "server did not send all the messages we requested"
msgstr "Der Server hat nicht alle angeforderten Nachrichten gesendet"
-#: src/mn-imap-mailbox.gob:645
+#: src/mn-imap-mailbox.gob:667
msgid "unable to fetch message"
msgstr "Nachrichten konnten nicht abgerufen werden"
#. compliance error
-#: src/mn-imap-mailbox.gob:763
+#: src/mn-imap-mailbox.gob:785
msgid "server did not send status"
msgstr "Der Server hat seinen Status nicht bekannt gegeben"
-#: src/mn-imap-mailbox.gob:1035 src/mn-pop3-mailbox.gob:922
+#: src/mn-imap-mailbox.gob:1057 src/mn-pop3-mailbox.gob:922
msgid "unknown server error"
msgstr "Unbekannter Server-Fehler"
-#: src/mn-imap-mailbox.gob:1106 src/mn-pop3-mailbox.gob:226
+#: src/mn-imap-mailbox.gob:1147 src/mn-pop3-mailbox.gob:226
msgid "server does not support in-band SSL/TLS"
msgstr "Der Server unterstütz kein band-internes SSL/TLS"
-#: src/mn-imap-mailbox.gob:1125 src/mn-pop3-mailbox.gob:841
+#: src/mn-imap-mailbox.gob:1168 src/mn-pop3-mailbox.gob:841
msgid ""
"a SASL authentication mechanism was selected but SASL support has not been "
"compiled in"
@@ -840,16 +852,16 @@ msgstr ""
"Sie haben eine Authentifizierung mit SASL ausgewählt, jedoch wurde die "
"Unterstützung für SASL beim Erstellen des Programms nicht eingebaut"
-#: src/mn-imap-mailbox.gob:1133 src/mn-pop3-mailbox.gob:853
+#: src/mn-imap-mailbox.gob:1176 src/mn-pop3-mailbox.gob:853
#, c-format
msgid "unknown authentication mechanism \"%s\""
msgstr "Unbekannte Authentifizierungsmethode »%s«"
-#: src/mn-imap-mailbox.gob:1151
+#: src/mn-imap-mailbox.gob:1194
msgid "falling back to IMAP LOGIN authentication"
msgstr "Es wird auf die Authentifizierung per IMAP LOGIN zurückgegriffen"
-#: src/mn-imap-mailbox.gob:1156 src/mn-pop3-mailbox.gob:888
+#: src/mn-imap-mailbox.gob:1199 src/mn-pop3-mailbox.gob:888
msgid "authentication failed"
msgstr "Authentifizierung fehlgeschlagen"
@@ -1322,51 +1334,51 @@ msgid "falling back to USER/PASS authentication"
msgstr ""
"Es wird auf Authentifizierung per Nutzername und Passwort zurück gegriffen."
-#: src/mn-properties.c:191
+#: src/mn-properties.c:193
msgid "top left"
msgstr "oben links"
-#: src/mn-properties.c:192
+#: src/mn-properties.c:194
msgid "top right"
msgstr "oben rechts"
-#: src/mn-properties.c:193
+#: src/mn-properties.c:195
msgid "bottom left"
msgstr "unten links"
-#: src/mn-properties.c:194
+#: src/mn-properties.c:196
msgid "bottom right"
msgstr "unten rechts"
-#: src/mn-properties.c:284
+#: src/mn-properties.c:287
msgid "No mailbox selected."
msgstr "Kein Postfach ausgewählt."
-#: src/mn-properties.c:289
+#: src/mn-properties.c:292
#, c-format
msgid "%i mailbox selected."
msgid_plural "%i mailboxes selected."
msgstr[0] "Ein Posfach ausgewählt."
msgstr[1] "%i Postfächer ausgewählt."
-#: src/mn-shell.gob:92
+#: src/mn-shell.gob:93
msgid "You have new mail."
msgstr "Sie haben neue Nachrichten."
-#: src/mn-shell.gob:347
+#: src/mn-shell.gob:360
msgid "Mailboxes Having New Mail"
msgstr ""
-#: src/mn-shell.gob:349
+#: src/mn-shell.gob:362
msgid "Errors"
msgstr ""
-#: src/mn-shell.gob:351
+#: src/mn-shell.gob:364
#, fuzzy
msgid "Unsupported Mailboxes"
msgstr "Systempostfach"
-#: src/mn-shell.gob:364 ui/summary-dialog.glade.h:1
+#: src/mn-shell.gob:381 ui/summary-dialog.glade.h:1
msgid "Mail Summary"
msgstr "Nachrichtenübersicht"
@@ -1486,7 +1498,7 @@ msgstr ""
msgid "Unable to execute \"%s\": %s."
msgstr "»%s« konnte nicht ausgeführt werden: %s."
-#: ui/authentication.glade.h:1 ui/properties.glade.h:2
+#: ui/authentication.glade.h:1
msgid "*"
msgstr "*"
@@ -1502,32 +1514,37 @@ msgstr "_Art des Postfachs:"
msgid " "
msgstr " "
-#: ui/properties.glade.h:3
+#: ui/properties.glade.h:2
msgid "<span weight=\"bold\">Commands</span>"
msgstr "<span weight=\"bold\">Befehle</span>"
-#: ui/properties.glade.h:4
+#: ui/properties.glade.h:3
#, fuzzy
msgid "<span weight=\"bold\">Double-click Action</span>"
msgstr "<span weight=\"bold\">Position</span>"
-#: ui/properties.glade.h:5
+#: ui/properties.glade.h:4
#, fuzzy
msgid "<span weight=\"bold\">Fonts</span>"
msgstr "<span weight=\"bold\">Befehle</span>"
-#: ui/properties.glade.h:6
+#: ui/properties.glade.h:5
msgid "<span weight=\"bold\">General</span>"
msgstr "<span weight=\"bold\">Allgemein</span>"
-#: ui/properties.glade.h:7
+#: ui/properties.glade.h:6
msgid "<span weight=\"bold\">Mailbox List</span>"
msgstr "<span weight=\"bold\">Postfächer</span>"
-#: ui/properties.glade.h:8
+#: ui/properties.glade.h:7
msgid "<span weight=\"bold\">Position</span>"
msgstr "<span weight=\"bold\">Position</span>"
+#: ui/properties.glade.h:8
+#, fuzzy
+msgid "Dis_play mail summary in tooltip"
+msgstr "Die Nachrichtenübersicht anzeigen"
+
#: ui/properties.glade.h:9
msgid "General"
msgstr "Allgemein"
@@ -1614,34 +1631,41 @@ msgid "Whether to automatically close the mail summary popup or not"
msgstr "Legt fest, ob die Nachrichtenübersicht automatisch geschlossen wird"
#: ui/properties.glade.h:27
-msgid "Whether to display the mail summary popup when new mail arrives or not"
+#, fuzzy
+msgid "Whether to display the mail summary in the status icon tooltip or not"
msgstr ""
"Legt fest, ob die Nachrichtenübersicht aufklappt wenn eine neue Nachricht "
"eintrifft"
#: ui/properties.glade.h:28
+msgid "Whether to display the mail summary popup when new mail arrives or not"
+msgstr ""
+"Legt fest, ob die Nachrichtenübersicht aufklappt wenn eine neue Nachricht "
+"eintrifft"
+
+#: ui/properties.glade.h:29
#, fuzzy
msgid "Whether to hide previously displayed mail or not"
msgstr "Legt fest, ob das Postfach neue Nachrichten enthält"
-#: ui/properties.glade.h:29
+#: ui/properties.glade.h:30
msgid "Whether to run a command when all mail is read or not"
msgstr ""
"Legt fest, ob ein Befehl ausgeführt wird wenn alle Nachrichten gelesen wurden"
-#: ui/properties.glade.h:30
+#: ui/properties.glade.h:31
msgid "Whether to run a command when new mail arrives or not"
msgstr ""
"Wenn diese Option ausgewählt ist, können Sie einen Befehl angeben der "
"ausgeführt wird, sobald eine neue Nachricht eintrifft."
-#: ui/properties.glade.h:31
+#: ui/properties.glade.h:32
#, fuzzy
msgid "Whether to set a mail reader or not"
msgstr ""
"Legt fest, ob ein Befehl ausgeführt wird wenn alle Nachrichten gelesen wurden"
-#: ui/properties.glade.h:32
+#: ui/properties.glade.h:33
msgid ""
"Whether to start Mail Notification when you log into your GNOME session or "
"not"
@@ -1649,74 +1673,74 @@ msgstr ""
"Wenn diese Option ausgewählt ist, wird die E-Mail-Eingangsüberwachnung beim "
"Starten von GNOME ebenfalls gestartet."
-#: ui/properties.glade.h:33
+#: ui/properties.glade.h:34
#, fuzzy
msgid ""
"Whether to use a custom font for the contents of the mail summary popup or "
"not"
msgstr "Legt fest, ob die Nachrichtenübersicht automatisch geschlossen wird"
-#: ui/properties.glade.h:34
+#: ui/properties.glade.h:35
#, fuzzy
msgid ""
"Whether to use a custom font for the title of the mail summary popup or not"
msgstr "Legt fest, ob die Nachrichtenübersicht automatisch geschlossen wird"
-#: ui/properties.glade.h:35
+#: ui/properties.glade.h:36
msgid "_Automatically close after:"
msgstr "_Automatisch schließen nach:"
-#: ui/properties.glade.h:36
+#: ui/properties.glade.h:37
msgid "_Blink on errors"
msgstr "_Bei Fehler blinken"
-#: ui/properties.glade.h:37
+#: ui/properties.glade.h:38
msgid "_Contents font:"
msgstr ""
-#: ui/properties.glade.h:38
+#: ui/properties.glade.h:39
msgid "_Delay between mail checks:"
msgstr "_Nach neuen Nachrichten sehen alle:"
-#: ui/properties.glade.h:39
+#: ui/properties.glade.h:40
#, fuzzy
msgid "_Display the mail summary dialog"
msgstr "Die Nachrichtenübersicht anzeigen"
-#: ui/properties.glade.h:40
+#: ui/properties.glade.h:41
msgid "_Enable mail summary popup"
msgstr "_Aufklappende Nachrichtenübersicht aktivieren"
-#: ui/properties.glade.h:41
+#: ui/properties.glade.h:42
msgid "_Launch the mail reader"
msgstr ""
-#: ui/properties.glade.h:42
+#: ui/properties.glade.h:43
#, fuzzy
msgid "_Mail reader:"
msgstr "_Nachrichtenübersicht"
-#: ui/properties.glade.h:43
+#: ui/properties.glade.h:44
msgid "_Start Mail Notification on GNOME login"
msgstr "_Laden beim Starten von GNOME"
-#: ui/properties.glade.h:44
+#: ui/properties.glade.h:45
msgid "_Title font:"
msgstr ""
-#: ui/properties.glade.h:45
+#: ui/properties.glade.h:46
msgid "_Vertical offset:"
msgstr "_Vertikaler Abstand:"
-#: ui/properties.glade.h:46
+#: ui/properties.glade.h:47
msgid "minutes"
msgstr "Minuten"
-#: ui/properties.glade.h:47
+#: ui/properties.glade.h:48
msgid "pixels"
msgstr "Pixel"
-#: ui/properties.glade.h:48
+#: ui/properties.glade.h:49
msgid "seconds"
msgstr "Sekunden"
diff --git a/po/fr.gmo b/po/fr.gmo
Binary files differ.
diff --git a/po/fr.po b/po/fr.po
@@ -8,10 +8,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: mail-notification 0.8.1\n"
+"Project-Id-Version: mail-notification 0.99\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-04 11:04+0100\n"
-"PO-Revision-Date: 2004-11-04 11:52+0100\n"
+"POT-Creation-Date: 2004-11-15 16:03+0100\n"
+"PO-Revision-Date: 2004-11-15 16:11+0100\n"
"Last-Translator: Jean-Yves Lefort <jylefort@brutele.be>\n"
"Language-Team: Jean-Yves Lefort <jylefort@brutele.be>\n"
"MIME-Version: 1.0\n"
@@ -59,105 +59,109 @@ msgid "Delay between mail checks (seconds part)."
msgstr "Délai entre les vérifications de courrier (partie secondes)."
#: data/mail-notification.schemas.in.h:5
+msgid "Display mail summary in tooltip"
+msgstr "Afficher l'aperçu du courrier dans le tooltip"
+
+#: data/mail-notification.schemas.in.h:6
msgid "Do not show the immediate notification error dialog"
msgstr ""
"Ne pas afficher la boîte de dialogue contenant l'erreur de notification "
"immédiate"
-#: data/mail-notification.schemas.in.h:6
+#: data/mail-notification.schemas.in.h:7
msgid "Double-click action"
msgstr "Action du Double-click"
-#: data/mail-notification.schemas.in.h:7
+#: data/mail-notification.schemas.in.h:8
msgid "Enable mail summary popup"
msgstr "Activer le popup d'aperçu du courrier"
-#: data/mail-notification.schemas.in.h:8
+#: data/mail-notification.schemas.in.h:9
msgid "Fingerprints of trusted X509 certificates"
msgstr "Empreintes digitales des certificats X509 de confiance"
-#: data/mail-notification.schemas.in.h:9
+#: data/mail-notification.schemas.in.h:10
msgid "Has already been run"
msgstr "A déjà été exécuté"
-#: data/mail-notification.schemas.in.h:10
+#: data/mail-notification.schemas.in.h:11
msgid "Height of mail summary dialog"
msgstr "Hauteur de la boîte de dialogue contenant l'aperçu du courrier"
-#: data/mail-notification.schemas.in.h:11
+#: data/mail-notification.schemas.in.h:12
msgid "Height of properties dialog"
msgstr "Hauteur de la boîte de dialogue contenant les propriétés"
-#: data/mail-notification.schemas.in.h:12
+#: data/mail-notification.schemas.in.h:13
msgid "Mail read command"
msgstr "Commande de courrier lu"
-#: data/mail-notification.schemas.in.h:13
+#: data/mail-notification.schemas.in.h:14
msgid "Mail reader command"
msgstr "Commande de lecteur de courrier"
-#: data/mail-notification.schemas.in.h:14
+#: data/mail-notification.schemas.in.h:15
msgid "Mail summary popup contents font"
msgstr "Police du contenu du popup d'aperçu du courrier"
-#: data/mail-notification.schemas.in.h:15
+#: data/mail-notification.schemas.in.h:16
msgid "Mail summary popup horizontal offset"
msgstr "Décalage horizontal du popup d'aperçu du courrier"
-#: data/mail-notification.schemas.in.h:16
+#: data/mail-notification.schemas.in.h:17
msgid "Mail summary popup position"
msgstr "Position du popup d'aperçu du courrier"
-#: data/mail-notification.schemas.in.h:17
+#: data/mail-notification.schemas.in.h:18
msgid "Mail summary popup title font"
msgstr "Police du titre du popup d'aperçu du courrier"
-#: data/mail-notification.schemas.in.h:18
+#: data/mail-notification.schemas.in.h:19
msgid "Mail summary popup vertical offset"
msgstr "Décalage vertical du popup d'aperçu du courrier"
-#: data/mail-notification.schemas.in.h:19
+#: data/mail-notification.schemas.in.h:20
msgid "Mailbox list"
msgstr "Liste des boîtes aux lettres"
-#: data/mail-notification.schemas.in.h:20
+#: data/mail-notification.schemas.in.h:21
msgid "Minutes between mail checks"
msgstr "Minutes entre les vérifications de courrier"
-#: data/mail-notification.schemas.in.h:21
+#: data/mail-notification.schemas.in.h:22
msgid "Minutes to wait before closing the mail summary popup"
msgstr "Minutes à attendre avant de fermer le popup d'aperçu du courrier"
-#: data/mail-notification.schemas.in.h:22
+#: data/mail-notification.schemas.in.h:23
msgid "New mail command"
msgstr "Commande de nouveau message"
-#: data/mail-notification.schemas.in.h:23
+#: data/mail-notification.schemas.in.h:24
msgid "Only display recent mail in mail summary popup"
msgstr ""
"Afficher uniquement le courrier récent dans le popup d'aperçu du courrier"
-#: data/mail-notification.schemas.in.h:24
+#: data/mail-notification.schemas.in.h:25
msgid "Run a command when all mail is read"
msgstr "Exécuter une commande lorsque tout le courrier est lu"
-#: data/mail-notification.schemas.in.h:25
+#: data/mail-notification.schemas.in.h:26
msgid "Run a command when new mail arrives"
msgstr "Exécuter une commande lorsque du nouveau courrier arrive"
-#: data/mail-notification.schemas.in.h:26
+#: data/mail-notification.schemas.in.h:27
msgid "Seconds between mail checks"
msgstr "Secondes entre les vérifications de courrier"
-#: data/mail-notification.schemas.in.h:27
+#: data/mail-notification.schemas.in.h:28
msgid "Seconds to wait before closing the mail summary popup"
msgstr "Secondes à attendre avant de fermer le popup d'aperçu du courrier"
-#: data/mail-notification.schemas.in.h:28
+#: data/mail-notification.schemas.in.h:29
msgid "Set a mail reader"
msgstr "Spécifier un lecteur de courrier"
-#: data/mail-notification.schemas.in.h:29
+#: data/mail-notification.schemas.in.h:30
msgid ""
"The action to perform when the icon is double-clicked. Must be \"display-"
"mail-summary\" or \"launch-mail-reader\"."
@@ -165,7 +169,7 @@ msgstr ""
"L'action à effectuer lorsque l'icône est double-clickée. Doit être \"display-"
"mail-summary\" ou \"launch-mail-reader\"."
-#: data/mail-notification.schemas.in.h:30
+#: data/mail-notification.schemas.in.h:31
msgid ""
"The amount of time to wait before closing the mail summary popup (minutes "
"part)."
@@ -173,7 +177,7 @@ msgstr ""
"La quantité de temps à attendre avant de fermer le popup d'aperçu du "
"courrier (partie minutes)."
-#: data/mail-notification.schemas.in.h:31
+#: data/mail-notification.schemas.in.h:32
msgid ""
"The amount of time to wait before closing the mail summary popup (seconds "
"part)."
@@ -181,44 +185,44 @@ msgstr ""
"La quantité de temps à attendre avant de fermer le popup d'aperçu du "
"courrier (partie secondes)."
-#: data/mail-notification.schemas.in.h:32
+#: data/mail-notification.schemas.in.h:33
msgid "The command to run to launch the mail reader."
msgstr "La commande à exécuter pour démarrer le lecteur de courrier."
-#: data/mail-notification.schemas.in.h:33
+#: data/mail-notification.schemas.in.h:34
msgid "The command to run when all mail is read."
msgstr "La commande à exécuter lorsque tout le courrier est lu"
-#: data/mail-notification.schemas.in.h:34
+#: data/mail-notification.schemas.in.h:35
msgid "The command to run when new mail arrives."
msgstr "La commande à exécuter lorsque du nouveau courrier arrive."
-#: data/mail-notification.schemas.in.h:35
+#: data/mail-notification.schemas.in.h:36
msgid "The custom font to use for the contents of the mail summary popup."
msgstr ""
"La police de caractères à utiliser pour le contenu du popup d'aperçu du "
"courrier."
-#: data/mail-notification.schemas.in.h:36
+#: data/mail-notification.schemas.in.h:37
msgid "The custom font to use for the title of the mail summary popup."
msgstr ""
"La police de caractères à utiliser pour le titre du popup d'aperçu du "
"courrier."
-#: data/mail-notification.schemas.in.h:37
+#: data/mail-notification.schemas.in.h:38
msgid "The height of the mail summary dialog in pixels."
msgstr ""
"La hauteur de la boîte de dialogue contenant l'aperçu du courrier en pixels."
-#: data/mail-notification.schemas.in.h:38
+#: data/mail-notification.schemas.in.h:39
msgid "The height of the properties dialog in pixels."
msgstr "La hauteur de la boîte de dialogue contenant les propriétés en pixels."
-#: data/mail-notification.schemas.in.h:39
+#: data/mail-notification.schemas.in.h:40
msgid "The list of mailboxes to monitor."
msgstr "La liste des boîtes aux lettres à surveiller."
-#: data/mail-notification.schemas.in.h:40
+#: data/mail-notification.schemas.in.h:41
msgid ""
"The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
"certificate."
@@ -226,14 +230,14 @@ msgstr ""
"La liste des serveurs SSL/TLS (hôte:port) de confiance auxquels il manque un "
"certificat X509."
-#: data/mail-notification.schemas.in.h:41
+#: data/mail-notification.schemas.in.h:42
msgid ""
"The list of trusted X509 certificates, represented by their MD5 fingerprint."
msgstr ""
"La liste des certificats X509 de confiance, représentés par leur empreinte "
"digitale."
-#: data/mail-notification.schemas.in.h:42
+#: data/mail-notification.schemas.in.h:43
msgid ""
"The number of pixels to leave between the left or right side of the screen "
"and the mail summary popup."
@@ -241,7 +245,7 @@ msgstr ""
"Le nombre de pixels à laisser entre la gauche ou la droite de l'écran et le "
"popup d'aperçu du courrier."
-#: data/mail-notification.schemas.in.h:43
+#: data/mail-notification.schemas.in.h:44
msgid ""
"The number of pixels to leave between the top or bottom side of the screen "
"and the mail summary popup."
@@ -249,7 +253,7 @@ msgstr ""
"Le nombre de pixels à laisser entre le haut ou le bas de l'écran et le popup "
"d'aperçu du courrier."
-#: data/mail-notification.schemas.in.h:44
+#: data/mail-notification.schemas.in.h:45
msgid ""
"The position of the mail summary popup. Must be \"top-left\", \"top-right\", "
"\"bottom-left\" or \"bottom-right\"."
@@ -257,58 +261,64 @@ msgstr ""
"La position du popup d'aperçu du courrier. Doit etre \"top-left\", \"top-"
"right\", \"bottom-left\" or \"bottom-right\"."
-#: data/mail-notification.schemas.in.h:45
+#: data/mail-notification.schemas.in.h:46
msgid "The width of the mail summary dialog in pixels."
msgstr ""
"La largeur de la boîte de dialogue contenant l'aperçu du courrier en pixels."
-#: data/mail-notification.schemas.in.h:46
+#: data/mail-notification.schemas.in.h:47
msgid "The width of the properties dialog in pixels."
msgstr "La largeur de la boîte de dialogue contenant les propriétés en pixels."
-#: data/mail-notification.schemas.in.h:47
+#: data/mail-notification.schemas.in.h:48
msgid "Trusted servers list"
msgstr "Liste des serveurs de confiance"
-#: data/mail-notification.schemas.in.h:48
+#: data/mail-notification.schemas.in.h:49
msgid "Use a custom font for the contents of the mail summary popup"
msgstr ""
"Utiliser une police de caractères à la carte pour le contenu du popup "
"d'aperçu du courrier"
-#: data/mail-notification.schemas.in.h:49
+#: data/mail-notification.schemas.in.h:50
msgid "Use a custom font for the title of the mail summary popup"
msgstr ""
"Utiliser une police de caractères à la carte pour le titre du popup d'aperçu "
"du courrier"
-#: data/mail-notification.schemas.in.h:50
+#: data/mail-notification.schemas.in.h:51
msgid "Whether Mail Notification has already been run or not."
msgstr "Si la Notification de Courrier a déjà été exécutée ou pas."
-#: data/mail-notification.schemas.in.h:51
+#: data/mail-notification.schemas.in.h:52
msgid "Whether the status icon should blink on errors or not."
msgstr "Si l'icône de statut doit clignoter lors d'erreurs ou pas."
-#: data/mail-notification.schemas.in.h:52
+#: data/mail-notification.schemas.in.h:53
msgid "Whether to automatically close the mail summary popup or not."
msgstr ""
"Si le popup d'aperçu du courrier doit être automatiquement fermé ou pas."
-#: data/mail-notification.schemas.in.h:53
+#: data/mail-notification.schemas.in.h:54
+msgid "Whether to display the mail summary in the status icon tooltip or not."
+msgstr ""
+"Si l'aperçu du courrier doit être affiché dans le tooltip de l'icône de "
+"statut ou pas."
+
+#: data/mail-notification.schemas.in.h:55
msgid "Whether to display the mail summary popup when new mail arrives or not."
msgstr ""
"Si le popup d'aperçu du courrier doit être affiché lorsque du nouveau "
"courrier arrive ou pas."
-#: data/mail-notification.schemas.in.h:54
+#: data/mail-notification.schemas.in.h:56
msgid ""
"Whether to hide previously displayed mail in the mail summary popup or not."
msgstr ""
"Si le courrier précédemment affiché dans le popup d'aperçu du courrier doit "
"être caché ou pas."
-#: data/mail-notification.schemas.in.h:55
+#: data/mail-notification.schemas.in.h:57
msgid ""
"Whether to prevent the immediate notification error dialog from being "
"displayed or not."
@@ -316,21 +326,21 @@ msgstr ""
"Si il faut empêcher la boîte de dialogue contenant l'erreur de notification "
"immédiate de s'afficher ou pas."
-#: data/mail-notification.schemas.in.h:56
+#: data/mail-notification.schemas.in.h:58
msgid "Whether to run a command when all mail is read or not."
msgstr ""
"Si une commande doit être exécutée lorsque tout le courrier est lu ou pas."
-#: data/mail-notification.schemas.in.h:57
+#: data/mail-notification.schemas.in.h:59
msgid "Whether to run a command when new mail arrives or not."
msgstr ""
"Si une commande doit être exécutée lorsque du nouveau courrier arrive ou pas."
-#: data/mail-notification.schemas.in.h:58
+#: data/mail-notification.schemas.in.h:60
msgid "Whether to set a mail reader or not."
msgstr "Si un lecteur de courrier est spécifié ou pas."
-#: data/mail-notification.schemas.in.h:59
+#: data/mail-notification.schemas.in.h:61
msgid ""
"Whether to use a custom font for the contents of the mail summary popup or "
"not."
@@ -338,18 +348,18 @@ msgstr ""
"Si une police de caractères à la carte doit être utilisée pour le contenu du "
"popup d'aperçu du courrier ou pas."
-#: data/mail-notification.schemas.in.h:60
+#: data/mail-notification.schemas.in.h:62
msgid ""
"Whether to use a custom font for the title of the mail summary popup or not."
msgstr ""
"Si une police de caractères à la carte doit être utilisée pour le titre du "
"popup d'aperçu du courrier ou pas."
-#: data/mail-notification.schemas.in.h:61
+#: data/mail-notification.schemas.in.h:63
msgid "Width of mail summary dialog"
msgstr "Largeur de la boîte de dialogue contenant l'aperçu du courrier"
-#: data/mail-notification.schemas.in.h:62
+#: data/mail-notification.schemas.in.h:64
msgid "Width of properties dialog"
msgstr "Largeur de la boîte de dialogue contenant les propriétés"
@@ -785,52 +795,52 @@ msgstr "Le numéro de port du serveur IMAP"
msgid "The mailbox name"
msgstr "Le nom de la boîte aux lettres"
-#: src/mn-imap-mailbox.gob:164 src/mn-pop3-mailbox.gob:142
+#: src/mn-imap-mailbox.gob:165 src/mn-pop3-mailbox.gob:142
msgid "SSL/TLS support has not been compiled in"
msgstr "le support SSL/TLS n'a pas été inclus lors de la compilation"
-#: src/mn-imap-mailbox.gob:253
+#: src/mn-imap-mailbox.gob:244
msgid "server did not send capabilities"
msgstr "le serveur n'a pas envoyé ses possibilités"
-#: src/mn-imap-mailbox.gob:374
+#: src/mn-imap-mailbox.gob:390
msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
msgstr ""
"le serveur a annoncé LOGINDISABLED, pas d'utilisation de l'authentification "
"LOGIN"
-#: src/mn-imap-mailbox.gob:375
+#: src/mn-imap-mailbox.gob:391
msgid "unable to login"
msgstr "impossible d'ouvrir la session"
#. compliance error
-#: src/mn-imap-mailbox.gob:516
+#: src/mn-imap-mailbox.gob:538
msgid "server did not send search results"
msgstr "le serveur n'a pas envoyé les résultats de la recherche"
#. compliance error
-#: src/mn-imap-mailbox.gob:596
+#: src/mn-imap-mailbox.gob:618
msgid "server did not send all the messages we requested"
msgstr "le serveur n'a pas envoyé tous les messages que nous avons demandé"
-#: src/mn-imap-mailbox.gob:645
+#: src/mn-imap-mailbox.gob:667
msgid "unable to fetch message"
msgstr "impossible d'obtenir le message"
#. compliance error
-#: src/mn-imap-mailbox.gob:763
+#: src/mn-imap-mailbox.gob:785
msgid "server did not send status"
msgstr "le serveur n'a pas envoyé de statut"
-#: src/mn-imap-mailbox.gob:1035 src/mn-pop3-mailbox.gob:922
+#: src/mn-imap-mailbox.gob:1057 src/mn-pop3-mailbox.gob:922
msgid "unknown server error"
msgstr "erreur serveur inconnue"
-#: src/mn-imap-mailbox.gob:1106 src/mn-pop3-mailbox.gob:226
+#: src/mn-imap-mailbox.gob:1147 src/mn-pop3-mailbox.gob:226
msgid "server does not support in-band SSL/TLS"
msgstr "le serveur ne supporte pas le mode SSL/TLS interne"
-#: src/mn-imap-mailbox.gob:1125 src/mn-pop3-mailbox.gob:841
+#: src/mn-imap-mailbox.gob:1168 src/mn-pop3-mailbox.gob:841
msgid ""
"a SASL authentication mechanism was selected but SASL support has not been "
"compiled in"
@@ -838,16 +848,16 @@ msgstr ""
"un mécanisme d'authentification SASL a été sélectionné mais le support SASL "
"n'a pas été inclus lors de la compilation"
-#: src/mn-imap-mailbox.gob:1133 src/mn-pop3-mailbox.gob:853
+#: src/mn-imap-mailbox.gob:1176 src/mn-pop3-mailbox.gob:853
#, c-format
msgid "unknown authentication mechanism \"%s\""
msgstr "mécanisme d'authentification inconnu \"%s\""
-#: src/mn-imap-mailbox.gob:1151
+#: src/mn-imap-mailbox.gob:1194
msgid "falling back to IMAP LOGIN authentication"
msgstr "rétrogradation vers l'authentification IMAP LOGIN"
-#: src/mn-imap-mailbox.gob:1156 src/mn-pop3-mailbox.gob:888
+#: src/mn-imap-mailbox.gob:1199 src/mn-pop3-mailbox.gob:888
msgid "authentication failed"
msgstr "l'authentification a échoué"
@@ -1308,50 +1318,50 @@ msgstr "rétrogradation vers l'authentification APOP"
msgid "falling back to USER/PASS authentication"
msgstr "rétrogradation vers l'authentification USER/PASS"
-#: src/mn-properties.c:191
+#: src/mn-properties.c:193
msgid "top left"
msgstr "en haut à gauche"
-#: src/mn-properties.c:192
+#: src/mn-properties.c:194
msgid "top right"
msgstr "en haut à droite"
-#: src/mn-properties.c:193
+#: src/mn-properties.c:195
msgid "bottom left"
msgstr "en bas à gauche"
-#: src/mn-properties.c:194
+#: src/mn-properties.c:196
msgid "bottom right"
msgstr "en bas à droite"
-#: src/mn-properties.c:284
+#: src/mn-properties.c:287
msgid "No mailbox selected."
msgstr "Pas de boîte aux lettres sélectionnée."
-#: src/mn-properties.c:289
+#: src/mn-properties.c:292
#, c-format
msgid "%i mailbox selected."
msgid_plural "%i mailboxes selected."
msgstr[0] "%i boîte aux lettres sélectionnée"
msgstr[1] "%i boîtes aux lettres sélectionnées"
-#: src/mn-shell.gob:92
+#: src/mn-shell.gob:93
msgid "You have new mail."
msgstr "Vous avez du nouveau courrier."
-#: src/mn-shell.gob:347
+#: src/mn-shell.gob:360
msgid "Mailboxes Having New Mail"
msgstr "Boîtes aux Lettres Ayant du Nouveau Courrier"
-#: src/mn-shell.gob:349
+#: src/mn-shell.gob:362
msgid "Errors"
msgstr "Erreurs"
-#: src/mn-shell.gob:351
+#: src/mn-shell.gob:364
msgid "Unsupported Mailboxes"
msgstr "Boîtes aux Lettres Non Supportées"
-#: src/mn-shell.gob:364 ui/summary-dialog.glade.h:1
+#: src/mn-shell.gob:381 ui/summary-dialog.glade.h:1
msgid "Mail Summary"
msgstr "Aperçu du Courrier"
@@ -1468,7 +1478,7 @@ msgstr "Une erreur de commande s'est produite dans la Notification de Courrier"
msgid "Unable to execute \"%s\": %s."
msgstr "Impossible d'exécuter \"%s\": %s"
-#: ui/authentication.glade.h:1 ui/properties.glade.h:2
+#: ui/authentication.glade.h:1
msgid "*"
msgstr "*"
@@ -1484,30 +1494,34 @@ msgstr "_Type de boîte aux lettres:"
msgid " "
msgstr " "
-#: ui/properties.glade.h:3
+#: ui/properties.glade.h:2
msgid "<span weight=\"bold\">Commands</span>"
msgstr "<span weight=\"bold\">Commandes</span>"
-#: ui/properties.glade.h:4
+#: ui/properties.glade.h:3
msgid "<span weight=\"bold\">Double-click Action</span>"
msgstr "<span weight=\"bold\">Action du Double-Click</span>"
-#: ui/properties.glade.h:5
+#: ui/properties.glade.h:4
msgid "<span weight=\"bold\">Fonts</span>"
msgstr "<span weight=\"bold\">Polices de Caractères</span>"
-#: ui/properties.glade.h:6
+#: ui/properties.glade.h:5
msgid "<span weight=\"bold\">General</span>"
msgstr "<span weight=\"bold\">Général</span>"
-#: ui/properties.glade.h:7
+#: ui/properties.glade.h:6
msgid "<span weight=\"bold\">Mailbox List</span>"
msgstr "<span weight=\"bold\">Liste des Boîtes aux Lettres</span>"
-#: ui/properties.glade.h:8
+#: ui/properties.glade.h:7
msgid "<span weight=\"bold\">Position</span>"
msgstr "<span weight=\"bold\">Position</span>"
+#: ui/properties.glade.h:8
+msgid "Dis_play mail summary in tooltip"
+msgstr "Afficher l'a_perçu du courrier dans le tooltip"
+
#: ui/properties.glade.h:9
msgid "General"
msgstr "Général"
@@ -1591,30 +1605,36 @@ msgstr ""
"Si le popup d'aperçu du courrier doit être automatiquement fermé ou pas"
#: ui/properties.glade.h:27
+msgid "Whether to display the mail summary in the status icon tooltip or not"
+msgstr ""
+"Si l'aperçu du courrier doit être affiché dans le tooltip de l'icône de "
+"statut ou pas"
+
+#: ui/properties.glade.h:28
msgid "Whether to display the mail summary popup when new mail arrives or not"
msgstr ""
"Si le popup d'aperçu du courrier doit être affiché lorsque du nouveau "
"courrier arrive ou pas"
-#: ui/properties.glade.h:28
+#: ui/properties.glade.h:29
msgid "Whether to hide previously displayed mail or not"
msgstr "Si le courrier précédemment affiché doit être caché ou pas"
-#: ui/properties.glade.h:29
+#: ui/properties.glade.h:30
msgid "Whether to run a command when all mail is read or not"
msgstr ""
"Si une commande doit être exécutée lorsque tout le courrier est lu ou pas"
-#: ui/properties.glade.h:30
+#: ui/properties.glade.h:31
msgid "Whether to run a command when new mail arrives or not"
msgstr ""
"Si une commande doit être exécutée lorsque du nouveau courrier arrive ou pas"
-#: ui/properties.glade.h:31
+#: ui/properties.glade.h:32
msgid "Whether to set a mail reader or not"
msgstr "Si un lecteur de courrier est spécifié ou pas"
-#: ui/properties.glade.h:32
+#: ui/properties.glade.h:33
msgid ""
"Whether to start Mail Notification when you log into your GNOME session or "
"not"
@@ -1622,7 +1642,7 @@ msgstr ""
"Si la Notification de Courrier doit être démarrée lorsque vous ouvrez votre "
"session GNOME ou pas"
-#: ui/properties.glade.h:33
+#: ui/properties.glade.h:34
msgid ""
"Whether to use a custom font for the contents of the mail summary popup or "
"not"
@@ -1630,67 +1650,67 @@ msgstr ""
"Si une police de caractères à la carte doit être utilisée pour le contenu du "
"popup d'aperçu du courrier ou pas"
-#: ui/properties.glade.h:34
+#: ui/properties.glade.h:35
msgid ""
"Whether to use a custom font for the title of the mail summary popup or not"
msgstr ""
"Si une police de caractères à la carte doit être utilisée pour le titre du "
"popup d'aperçu du courrier ou pas"
-#: ui/properties.glade.h:35
+#: ui/properties.glade.h:36
msgid "_Automatically close after:"
msgstr "_Fermer automatiquement après:"
-#: ui/properties.glade.h:36
+#: ui/properties.glade.h:37
msgid "_Blink on errors"
msgstr "_Clignoter lors d'erreurs"
-#: ui/properties.glade.h:37
+#: ui/properties.glade.h:38
msgid "_Contents font:"
msgstr "Police du _contenu:"
-#: ui/properties.glade.h:38
+#: ui/properties.glade.h:39
msgid "_Delay between mail checks:"
msgstr "_Délai entre les vérifications de courrier:"
-#: ui/properties.glade.h:39
+#: ui/properties.glade.h:40
msgid "_Display the mail summary dialog"
msgstr "_Afficher la boîte de dialogue contenant l'aperçu du courrier"
-#: ui/properties.glade.h:40
+#: ui/properties.glade.h:41
msgid "_Enable mail summary popup"
msgstr "_Activer le popup d'aperçu du courrier"
-#: ui/properties.glade.h:41
+#: ui/properties.glade.h:42
msgid "_Launch the mail reader"
msgstr "_Exécuter le lecteur de courrier"
-#: ui/properties.glade.h:42
+#: ui/properties.glade.h:43
msgid "_Mail reader:"
msgstr "_Lecteur de courrier:"
-#: ui/properties.glade.h:43
+#: ui/properties.glade.h:44
msgid "_Start Mail Notification on GNOME login"
msgstr ""
"_Démarrer la Notification de Courrier lors de l'ouverture de session GNOME"
-#: ui/properties.glade.h:44
+#: ui/properties.glade.h:45
msgid "_Title font:"
msgstr "Police du _titre:"
-#: ui/properties.glade.h:45
+#: ui/properties.glade.h:46
msgid "_Vertical offset:"
msgstr "Décalage _vertical:"
-#: ui/properties.glade.h:46
+#: ui/properties.glade.h:47
msgid "minutes"
msgstr "minutes"
-#: ui/properties.glade.h:47
+#: ui/properties.glade.h:48
msgid "pixels"
msgstr "pixels"
-#: ui/properties.glade.h:48
+#: ui/properties.glade.h:49
msgid "seconds"
msgstr "secondes"
diff --git a/po/mail-notification.pot b/po/mail-notification.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-04 11:04+0100\n"
+"POT-Creation-Date: 2004-11-15 16:03+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -57,255 +57,263 @@ msgid "Delay between mail checks (seconds part)."
msgstr ""
#: data/mail-notification.schemas.in.h:5
-msgid "Do not show the immediate notification error dialog"
+msgid "Display mail summary in tooltip"
msgstr ""
#: data/mail-notification.schemas.in.h:6
-msgid "Double-click action"
+msgid "Do not show the immediate notification error dialog"
msgstr ""
#: data/mail-notification.schemas.in.h:7
-msgid "Enable mail summary popup"
+msgid "Double-click action"
msgstr ""
#: data/mail-notification.schemas.in.h:8
-msgid "Fingerprints of trusted X509 certificates"
+msgid "Enable mail summary popup"
msgstr ""
#: data/mail-notification.schemas.in.h:9
-msgid "Has already been run"
+msgid "Fingerprints of trusted X509 certificates"
msgstr ""
#: data/mail-notification.schemas.in.h:10
-msgid "Height of mail summary dialog"
+msgid "Has already been run"
msgstr ""
#: data/mail-notification.schemas.in.h:11
-msgid "Height of properties dialog"
+msgid "Height of mail summary dialog"
msgstr ""
#: data/mail-notification.schemas.in.h:12
-msgid "Mail read command"
+msgid "Height of properties dialog"
msgstr ""
#: data/mail-notification.schemas.in.h:13
-msgid "Mail reader command"
+msgid "Mail read command"
msgstr ""
#: data/mail-notification.schemas.in.h:14
-msgid "Mail summary popup contents font"
+msgid "Mail reader command"
msgstr ""
#: data/mail-notification.schemas.in.h:15
-msgid "Mail summary popup horizontal offset"
+msgid "Mail summary popup contents font"
msgstr ""
#: data/mail-notification.schemas.in.h:16
-msgid "Mail summary popup position"
+msgid "Mail summary popup horizontal offset"
msgstr ""
#: data/mail-notification.schemas.in.h:17
-msgid "Mail summary popup title font"
+msgid "Mail summary popup position"
msgstr ""
#: data/mail-notification.schemas.in.h:18
-msgid "Mail summary popup vertical offset"
+msgid "Mail summary popup title font"
msgstr ""
#: data/mail-notification.schemas.in.h:19
-msgid "Mailbox list"
+msgid "Mail summary popup vertical offset"
msgstr ""
#: data/mail-notification.schemas.in.h:20
-msgid "Minutes between mail checks"
+msgid "Mailbox list"
msgstr ""
#: data/mail-notification.schemas.in.h:21
-msgid "Minutes to wait before closing the mail summary popup"
+msgid "Minutes between mail checks"
msgstr ""
#: data/mail-notification.schemas.in.h:22
-msgid "New mail command"
+msgid "Minutes to wait before closing the mail summary popup"
msgstr ""
#: data/mail-notification.schemas.in.h:23
-msgid "Only display recent mail in mail summary popup"
+msgid "New mail command"
msgstr ""
#: data/mail-notification.schemas.in.h:24
-msgid "Run a command when all mail is read"
+msgid "Only display recent mail in mail summary popup"
msgstr ""
#: data/mail-notification.schemas.in.h:25
-msgid "Run a command when new mail arrives"
+msgid "Run a command when all mail is read"
msgstr ""
#: data/mail-notification.schemas.in.h:26
-msgid "Seconds between mail checks"
+msgid "Run a command when new mail arrives"
msgstr ""
#: data/mail-notification.schemas.in.h:27
-msgid "Seconds to wait before closing the mail summary popup"
+msgid "Seconds between mail checks"
msgstr ""
#: data/mail-notification.schemas.in.h:28
-msgid "Set a mail reader"
+msgid "Seconds to wait before closing the mail summary popup"
msgstr ""
#: data/mail-notification.schemas.in.h:29
+msgid "Set a mail reader"
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:30
msgid ""
"The action to perform when the icon is double-clicked. Must be \"display-"
"mail-summary\" or \"launch-mail-reader\"."
msgstr ""
-#: data/mail-notification.schemas.in.h:30
+#: data/mail-notification.schemas.in.h:31
msgid ""
"The amount of time to wait before closing the mail summary popup (minutes "
"part)."
msgstr ""
-#: data/mail-notification.schemas.in.h:31
+#: data/mail-notification.schemas.in.h:32
msgid ""
"The amount of time to wait before closing the mail summary popup (seconds "
"part)."
msgstr ""
-#: data/mail-notification.schemas.in.h:32
+#: data/mail-notification.schemas.in.h:33
msgid "The command to run to launch the mail reader."
msgstr ""
-#: data/mail-notification.schemas.in.h:33
+#: data/mail-notification.schemas.in.h:34
msgid "The command to run when all mail is read."
msgstr ""
-#: data/mail-notification.schemas.in.h:34
+#: data/mail-notification.schemas.in.h:35
msgid "The command to run when new mail arrives."
msgstr ""
-#: data/mail-notification.schemas.in.h:35
+#: data/mail-notification.schemas.in.h:36
msgid "The custom font to use for the contents of the mail summary popup."
msgstr ""
-#: data/mail-notification.schemas.in.h:36
+#: data/mail-notification.schemas.in.h:37
msgid "The custom font to use for the title of the mail summary popup."
msgstr ""
-#: data/mail-notification.schemas.in.h:37
+#: data/mail-notification.schemas.in.h:38
msgid "The height of the mail summary dialog in pixels."
msgstr ""
-#: data/mail-notification.schemas.in.h:38
+#: data/mail-notification.schemas.in.h:39
msgid "The height of the properties dialog in pixels."
msgstr ""
-#: data/mail-notification.schemas.in.h:39
+#: data/mail-notification.schemas.in.h:40
msgid "The list of mailboxes to monitor."
msgstr ""
-#: data/mail-notification.schemas.in.h:40
+#: data/mail-notification.schemas.in.h:41
msgid ""
"The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
"certificate."
msgstr ""
-#: data/mail-notification.schemas.in.h:41
+#: data/mail-notification.schemas.in.h:42
msgid ""
"The list of trusted X509 certificates, represented by their MD5 fingerprint."
msgstr ""
-#: data/mail-notification.schemas.in.h:42
+#: data/mail-notification.schemas.in.h:43
msgid ""
"The number of pixels to leave between the left or right side of the screen "
"and the mail summary popup."
msgstr ""
-#: data/mail-notification.schemas.in.h:43
+#: data/mail-notification.schemas.in.h:44
msgid ""
"The number of pixels to leave between the top or bottom side of the screen "
"and the mail summary popup."
msgstr ""
-#: data/mail-notification.schemas.in.h:44
+#: data/mail-notification.schemas.in.h:45
msgid ""
"The position of the mail summary popup. Must be \"top-left\", \"top-right\", "
"\"bottom-left\" or \"bottom-right\"."
msgstr ""
-#: data/mail-notification.schemas.in.h:45
+#: data/mail-notification.schemas.in.h:46
msgid "The width of the mail summary dialog in pixels."
msgstr ""
-#: data/mail-notification.schemas.in.h:46
+#: data/mail-notification.schemas.in.h:47
msgid "The width of the properties dialog in pixels."
msgstr ""
-#: data/mail-notification.schemas.in.h:47
+#: data/mail-notification.schemas.in.h:48
msgid "Trusted servers list"
msgstr ""
-#: data/mail-notification.schemas.in.h:48
+#: data/mail-notification.schemas.in.h:49
msgid "Use a custom font for the contents of the mail summary popup"
msgstr ""
-#: data/mail-notification.schemas.in.h:49
+#: data/mail-notification.schemas.in.h:50
msgid "Use a custom font for the title of the mail summary popup"
msgstr ""
-#: data/mail-notification.schemas.in.h:50
+#: data/mail-notification.schemas.in.h:51
msgid "Whether Mail Notification has already been run or not."
msgstr ""
-#: data/mail-notification.schemas.in.h:51
+#: data/mail-notification.schemas.in.h:52
msgid "Whether the status icon should blink on errors or not."
msgstr ""
-#: data/mail-notification.schemas.in.h:52
+#: data/mail-notification.schemas.in.h:53
msgid "Whether to automatically close the mail summary popup or not."
msgstr ""
-#: data/mail-notification.schemas.in.h:53
+#: data/mail-notification.schemas.in.h:54
+msgid "Whether to display the mail summary in the status icon tooltip or not."
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:55
msgid "Whether to display the mail summary popup when new mail arrives or not."
msgstr ""
-#: data/mail-notification.schemas.in.h:54
+#: data/mail-notification.schemas.in.h:56
msgid ""
"Whether to hide previously displayed mail in the mail summary popup or not."
msgstr ""
-#: data/mail-notification.schemas.in.h:55
+#: data/mail-notification.schemas.in.h:57
msgid ""
"Whether to prevent the immediate notification error dialog from being "
"displayed or not."
msgstr ""
-#: data/mail-notification.schemas.in.h:56
+#: data/mail-notification.schemas.in.h:58
msgid "Whether to run a command when all mail is read or not."
msgstr ""
-#: data/mail-notification.schemas.in.h:57
+#: data/mail-notification.schemas.in.h:59
msgid "Whether to run a command when new mail arrives or not."
msgstr ""
-#: data/mail-notification.schemas.in.h:58
+#: data/mail-notification.schemas.in.h:60
msgid "Whether to set a mail reader or not."
msgstr ""
-#: data/mail-notification.schemas.in.h:59
+#: data/mail-notification.schemas.in.h:61
msgid ""
"Whether to use a custom font for the contents of the mail summary popup or "
"not."
msgstr ""
-#: data/mail-notification.schemas.in.h:60
+#: data/mail-notification.schemas.in.h:62
msgid ""
"Whether to use a custom font for the title of the mail summary popup or not."
msgstr ""
-#: data/mail-notification.schemas.in.h:61
+#: data/mail-notification.schemas.in.h:63
msgid "Width of mail summary dialog"
msgstr ""
-#: data/mail-notification.schemas.in.h:62
+#: data/mail-notification.schemas.in.h:64
msgid "Width of properties dialog"
msgstr ""
@@ -711,65 +719,65 @@ msgstr ""
msgid "The mailbox name"
msgstr ""
-#: src/mn-imap-mailbox.gob:164 src/mn-pop3-mailbox.gob:142
+#: src/mn-imap-mailbox.gob:165 src/mn-pop3-mailbox.gob:142
msgid "SSL/TLS support has not been compiled in"
msgstr ""
-#: src/mn-imap-mailbox.gob:253
+#: src/mn-imap-mailbox.gob:244
msgid "server did not send capabilities"
msgstr ""
-#: src/mn-imap-mailbox.gob:374
+#: src/mn-imap-mailbox.gob:390
msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
msgstr ""
-#: src/mn-imap-mailbox.gob:375
+#: src/mn-imap-mailbox.gob:391
msgid "unable to login"
msgstr ""
#. compliance error
-#: src/mn-imap-mailbox.gob:516
+#: src/mn-imap-mailbox.gob:538
msgid "server did not send search results"
msgstr ""
#. compliance error
-#: src/mn-imap-mailbox.gob:596
+#: src/mn-imap-mailbox.gob:618
msgid "server did not send all the messages we requested"
msgstr ""
-#: src/mn-imap-mailbox.gob:645
+#: src/mn-imap-mailbox.gob:667
msgid "unable to fetch message"
msgstr ""
#. compliance error
-#: src/mn-imap-mailbox.gob:763
+#: src/mn-imap-mailbox.gob:785
msgid "server did not send status"
msgstr ""
-#: src/mn-imap-mailbox.gob:1035 src/mn-pop3-mailbox.gob:922
+#: src/mn-imap-mailbox.gob:1057 src/mn-pop3-mailbox.gob:922
msgid "unknown server error"
msgstr ""
-#: src/mn-imap-mailbox.gob:1106 src/mn-pop3-mailbox.gob:226
+#: src/mn-imap-mailbox.gob:1147 src/mn-pop3-mailbox.gob:226
msgid "server does not support in-band SSL/TLS"
msgstr ""
-#: src/mn-imap-mailbox.gob:1125 src/mn-pop3-mailbox.gob:841
+#: src/mn-imap-mailbox.gob:1168 src/mn-pop3-mailbox.gob:841
msgid ""
"a SASL authentication mechanism was selected but SASL support has not been "
"compiled in"
msgstr ""
-#: src/mn-imap-mailbox.gob:1133 src/mn-pop3-mailbox.gob:853
+#: src/mn-imap-mailbox.gob:1176 src/mn-pop3-mailbox.gob:853
#, c-format
msgid "unknown authentication mechanism \"%s\""
msgstr ""
-#: src/mn-imap-mailbox.gob:1151
+#: src/mn-imap-mailbox.gob:1194
msgid "falling back to IMAP LOGIN authentication"
msgstr ""
-#: src/mn-imap-mailbox.gob:1156 src/mn-pop3-mailbox.gob:888
+#: src/mn-imap-mailbox.gob:1199 src/mn-pop3-mailbox.gob:888
msgid "authentication failed"
msgstr ""
@@ -1207,50 +1215,50 @@ msgstr ""
msgid "falling back to USER/PASS authentication"
msgstr ""
-#: src/mn-properties.c:191
+#: src/mn-properties.c:193
msgid "top left"
msgstr ""
-#: src/mn-properties.c:192
+#: src/mn-properties.c:194
msgid "top right"
msgstr ""
-#: src/mn-properties.c:193
+#: src/mn-properties.c:195
msgid "bottom left"
msgstr ""
-#: src/mn-properties.c:194
+#: src/mn-properties.c:196
msgid "bottom right"
msgstr ""
-#: src/mn-properties.c:284
+#: src/mn-properties.c:287
msgid "No mailbox selected."
msgstr ""
-#: src/mn-properties.c:289
+#: src/mn-properties.c:292
#, c-format
msgid "%i mailbox selected."
msgid_plural "%i mailboxes selected."
msgstr[0] ""
msgstr[1] ""
-#: src/mn-shell.gob:92
+#: src/mn-shell.gob:93
msgid "You have new mail."
msgstr ""
-#: src/mn-shell.gob:347
+#: src/mn-shell.gob:360
msgid "Mailboxes Having New Mail"
msgstr ""
-#: src/mn-shell.gob:349
+#: src/mn-shell.gob:362
msgid "Errors"
msgstr ""
-#: src/mn-shell.gob:351
+#: src/mn-shell.gob:364
msgid "Unsupported Mailboxes"
msgstr ""
-#: src/mn-shell.gob:364 ui/summary-dialog.glade.h:1
+#: src/mn-shell.gob:381 ui/summary-dialog.glade.h:1
msgid "Mail Summary"
msgstr ""
@@ -1363,7 +1371,7 @@ msgstr ""
msgid "Unable to execute \"%s\": %s."
msgstr ""
-#: ui/authentication.glade.h:1 ui/properties.glade.h:2
+#: ui/authentication.glade.h:1
msgid "*"
msgstr ""
@@ -1379,30 +1387,34 @@ msgstr ""
msgid " "
msgstr ""
-#: ui/properties.glade.h:3
+#: ui/properties.glade.h:2
msgid "<span weight=\"bold\">Commands</span>"
msgstr ""
-#: ui/properties.glade.h:4
+#: ui/properties.glade.h:3
msgid "<span weight=\"bold\">Double-click Action</span>"
msgstr ""
-#: ui/properties.glade.h:5
+#: ui/properties.glade.h:4
msgid "<span weight=\"bold\">Fonts</span>"
msgstr ""
-#: ui/properties.glade.h:6
+#: ui/properties.glade.h:5
msgid "<span weight=\"bold\">General</span>"
msgstr ""
-#: ui/properties.glade.h:7
+#: ui/properties.glade.h:6
msgid "<span weight=\"bold\">Mailbox List</span>"
msgstr ""
-#: ui/properties.glade.h:8
+#: ui/properties.glade.h:7
msgid "<span weight=\"bold\">Position</span>"
msgstr ""
+#: ui/properties.glade.h:8
+msgid "Dis_play mail summary in tooltip"
+msgstr ""
+
#: ui/properties.glade.h:9
msgid "General"
msgstr ""
@@ -1480,95 +1492,99 @@ msgid "Whether to automatically close the mail summary popup or not"
msgstr ""
#: ui/properties.glade.h:27
-msgid "Whether to display the mail summary popup when new mail arrives or not"
+msgid "Whether to display the mail summary in the status icon tooltip or not"
msgstr ""
#: ui/properties.glade.h:28
-msgid "Whether to hide previously displayed mail or not"
+msgid "Whether to display the mail summary popup when new mail arrives or not"
msgstr ""
#: ui/properties.glade.h:29
-msgid "Whether to run a command when all mail is read or not"
+msgid "Whether to hide previously displayed mail or not"
msgstr ""
#: ui/properties.glade.h:30
-msgid "Whether to run a command when new mail arrives or not"
+msgid "Whether to run a command when all mail is read or not"
msgstr ""
#: ui/properties.glade.h:31
-msgid "Whether to set a mail reader or not"
+msgid "Whether to run a command when new mail arrives or not"
msgstr ""
#: ui/properties.glade.h:32
+msgid "Whether to set a mail reader or not"
+msgstr ""
+
+#: ui/properties.glade.h:33
msgid ""
"Whether to start Mail Notification when you log into your GNOME session or "
"not"
msgstr ""
-#: ui/properties.glade.h:33
+#: ui/properties.glade.h:34
msgid ""
"Whether to use a custom font for the contents of the mail summary popup or "
"not"
msgstr ""
-#: ui/properties.glade.h:34
+#: ui/properties.glade.h:35
msgid ""
"Whether to use a custom font for the title of the mail summary popup or not"
msgstr ""
-#: ui/properties.glade.h:35
+#: ui/properties.glade.h:36
msgid "_Automatically close after:"
msgstr ""
-#: ui/properties.glade.h:36
+#: ui/properties.glade.h:37
msgid "_Blink on errors"
msgstr ""
-#: ui/properties.glade.h:37
+#: ui/properties.glade.h:38
msgid "_Contents font:"
msgstr ""
-#: ui/properties.glade.h:38
+#: ui/properties.glade.h:39
msgid "_Delay between mail checks:"
msgstr ""
-#: ui/properties.glade.h:39
+#: ui/properties.glade.h:40
msgid "_Display the mail summary dialog"
msgstr ""
-#: ui/properties.glade.h:40
+#: ui/properties.glade.h:41
msgid "_Enable mail summary popup"
msgstr ""
-#: ui/properties.glade.h:41
+#: ui/properties.glade.h:42
msgid "_Launch the mail reader"
msgstr ""
-#: ui/properties.glade.h:42
+#: ui/properties.glade.h:43
msgid "_Mail reader:"
msgstr ""
-#: ui/properties.glade.h:43
+#: ui/properties.glade.h:44
msgid "_Start Mail Notification on GNOME login"
msgstr ""
-#: ui/properties.glade.h:44
+#: ui/properties.glade.h:45
msgid "_Title font:"
msgstr ""
-#: ui/properties.glade.h:45
+#: ui/properties.glade.h:46
msgid "_Vertical offset:"
msgstr ""
-#: ui/properties.glade.h:46
+#: ui/properties.glade.h:47
msgid "minutes"
msgstr ""
-#: ui/properties.glade.h:47
+#: ui/properties.glade.h:48
msgid "pixels"
msgstr ""
-#: ui/properties.glade.h:48
+#: ui/properties.glade.h:49
msgid "seconds"
msgstr ""
diff --git a/po/pt.gmo b/po/pt.gmo
Binary files differ.
diff --git a/po/pt.po b/po/pt.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mail-notification 0.7.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-04 11:04+0100\n"
+"POT-Creation-Date: 2004-11-15 16:03+0100\n"
"PO-Revision-Date: 2004-10-24 11:06+0200\n"
"Last-Translator: Duarte Henriques <duarte_henriques@myrealbox.com>\n"
"Language-Team: Duarte Henriques <duarte_henriques@myrealbox.com>\n"
@@ -59,114 +59,119 @@ msgid "Delay between mail checks (seconds part)."
msgstr "Intervalo entre verificações de correio (segundos)."
#: data/mail-notification.schemas.in.h:5
+#, fuzzy
+msgid "Display mail summary in tooltip"
+msgstr "Mostrar o diálogo de resumo de correio"
+
+#: data/mail-notification.schemas.in.h:6
msgid "Do not show the immediate notification error dialog"
msgstr "Não mostrar o diálogo de erro de notificação imediata"
-#: data/mail-notification.schemas.in.h:6
+#: data/mail-notification.schemas.in.h:7
#, fuzzy
msgid "Double-click action"
msgstr "Comando de duplo-clique"
-#: data/mail-notification.schemas.in.h:7
+#: data/mail-notification.schemas.in.h:8
msgid "Enable mail summary popup"
msgstr "Activar popup de resumo de correio"
-#: data/mail-notification.schemas.in.h:8
+#: data/mail-notification.schemas.in.h:9
msgid "Fingerprints of trusted X509 certificates"
msgstr "Impressões digitais de certificados x509 confiados"
-#: data/mail-notification.schemas.in.h:9
+#: data/mail-notification.schemas.in.h:10
msgid "Has already been run"
msgstr "Já foi executado"
-#: data/mail-notification.schemas.in.h:10
+#: data/mail-notification.schemas.in.h:11
msgid "Height of mail summary dialog"
msgstr "Altura do diálogo de resumo de correio"
-#: data/mail-notification.schemas.in.h:11
+#: data/mail-notification.schemas.in.h:12
msgid "Height of properties dialog"
msgstr "Altura do diálogo de propriedades"
-#: data/mail-notification.schemas.in.h:12
+#: data/mail-notification.schemas.in.h:13
msgid "Mail read command"
msgstr "Comando de leitura de correio"
-#: data/mail-notification.schemas.in.h:13
+#: data/mail-notification.schemas.in.h:14
#, fuzzy
msgid "Mail reader command"
msgstr "Comando de leitura de correio"
-#: data/mail-notification.schemas.in.h:14
+#: data/mail-notification.schemas.in.h:15
#, fuzzy
msgid "Mail summary popup contents font"
msgstr "Posição do popup de resumo de correio"
-#: data/mail-notification.schemas.in.h:15
+#: data/mail-notification.schemas.in.h:16
msgid "Mail summary popup horizontal offset"
msgstr "Intervalo horizontal do popup de resumo de correio"
-#: data/mail-notification.schemas.in.h:16
+#: data/mail-notification.schemas.in.h:17
msgid "Mail summary popup position"
msgstr "Posição do popup de resumo de correio"
-#: data/mail-notification.schemas.in.h:17
+#: data/mail-notification.schemas.in.h:18
#, fuzzy
msgid "Mail summary popup title font"
msgstr "Posição do popup de resumo de correio"
-#: data/mail-notification.schemas.in.h:18
+#: data/mail-notification.schemas.in.h:19
msgid "Mail summary popup vertical offset"
msgstr "Intervalo vertical do popup de resumo de correio"
-#: data/mail-notification.schemas.in.h:19
+#: data/mail-notification.schemas.in.h:20
msgid "Mailbox list"
msgstr "Lista de Caixas de Correio"
-#: data/mail-notification.schemas.in.h:20
+#: data/mail-notification.schemas.in.h:21
msgid "Minutes between mail checks"
msgstr "Minutos entre verificações de correio"
-#: data/mail-notification.schemas.in.h:21
+#: data/mail-notification.schemas.in.h:22
msgid "Minutes to wait before closing the mail summary popup"
msgstr "Minutos a esperar antes de fechar o popup de resumo de correio"
-#: data/mail-notification.schemas.in.h:22
+#: data/mail-notification.schemas.in.h:23
msgid "New mail command"
msgstr "Novo comando de correio"
-#: data/mail-notification.schemas.in.h:23
+#: data/mail-notification.schemas.in.h:24
#, fuzzy
msgid "Only display recent mail in mail summary popup"
msgstr "Fechar o popup de resumo de correio"
-#: data/mail-notification.schemas.in.h:24
+#: data/mail-notification.schemas.in.h:25
msgid "Run a command when all mail is read"
msgstr "Executar um comando quando todo o correio está lido"
-#: data/mail-notification.schemas.in.h:25
+#: data/mail-notification.schemas.in.h:26
msgid "Run a command when new mail arrives"
msgstr "Executar um comando quando chega novo correio"
-#: data/mail-notification.schemas.in.h:26
+#: data/mail-notification.schemas.in.h:27
msgid "Seconds between mail checks"
msgstr "Segundos entre verificações de correio"
-#: data/mail-notification.schemas.in.h:27
+#: data/mail-notification.schemas.in.h:28
msgid "Seconds to wait before closing the mail summary popup"
msgstr "Segundos a esperar antes de fechar o popup de resumo de correio"
-#: data/mail-notification.schemas.in.h:28
+#: data/mail-notification.schemas.in.h:29
#, fuzzy
msgid "Set a mail reader"
msgstr "Escolha um Ficheiro ou Pasta"
-#: data/mail-notification.schemas.in.h:29
+#: data/mail-notification.schemas.in.h:30
msgid ""
"The action to perform when the icon is double-clicked. Must be \"display-"
"mail-summary\" or \"launch-mail-reader\"."
msgstr ""
-#: data/mail-notification.schemas.in.h:30
+#: data/mail-notification.schemas.in.h:31
msgid ""
"The amount of time to wait before closing the mail summary popup (minutes "
"part)."
@@ -174,7 +179,7 @@ msgstr ""
"A quantidade de tempo a esperar antes de fechar o popup de resumo de correio "
"(parte dos minutos)."
-#: data/mail-notification.schemas.in.h:31
+#: data/mail-notification.schemas.in.h:32
msgid ""
"The amount of time to wait before closing the mail summary popup (seconds "
"part)."
@@ -182,44 +187,44 @@ msgstr ""
"A quantidade de tempo a esperar antes de fechar o popup de resumo de correio "
"(parte dos segundos)."
-#: data/mail-notification.schemas.in.h:32
+#: data/mail-notification.schemas.in.h:33
#, fuzzy
msgid "The command to run to launch the mail reader."
msgstr "O comando a executar quando todo o correio está lido."
-#: data/mail-notification.schemas.in.h:33
+#: data/mail-notification.schemas.in.h:34
msgid "The command to run when all mail is read."
msgstr "O comando a executar quando todo o correio está lido."
-#: data/mail-notification.schemas.in.h:34
+#: data/mail-notification.schemas.in.h:35
msgid "The command to run when new mail arrives."
msgstr "O comando a executar quando chega novo correio."
-#: data/mail-notification.schemas.in.h:35
+#: data/mail-notification.schemas.in.h:36
#, fuzzy
msgid "The custom font to use for the contents of the mail summary popup."
msgstr ""
"A quantidade de tempo a esperar antes de fechar o popup de resumo de correio"
-#: data/mail-notification.schemas.in.h:36
+#: data/mail-notification.schemas.in.h:37
#, fuzzy
msgid "The custom font to use for the title of the mail summary popup."
msgstr ""
"A quantidade de tempo a esperar antes de fechar o popup de resumo de correio"
-#: data/mail-notification.schemas.in.h:37
+#: data/mail-notification.schemas.in.h:38
msgid "The height of the mail summary dialog in pixels."
msgstr "A altura em pixeis do diálogo de resumo de correio."
-#: data/mail-notification.schemas.in.h:38
+#: data/mail-notification.schemas.in.h:39
msgid "The height of the properties dialog in pixels."
msgstr "A altura em pixeis do diálogo de propriedades."
-#: data/mail-notification.schemas.in.h:39
+#: data/mail-notification.schemas.in.h:40
msgid "The list of mailboxes to monitor."
msgstr "A lista de caixas de correio a monitorizar."
-#: data/mail-notification.schemas.in.h:40
+#: data/mail-notification.schemas.in.h:41
msgid ""
"The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
"certificate."
@@ -227,14 +232,14 @@ msgstr ""
"A lista de servidores SSL/TLS confiados (hostname:port) se faltar um "
"certificado x509."
-#: data/mail-notification.schemas.in.h:41
+#: data/mail-notification.schemas.in.h:42
msgid ""
"The list of trusted X509 certificates, represented by their MD5 fingerprint."
msgstr ""
"A lista de certificados x509 confiados, representados pela sua fingerprint "
"MD5."
-#: data/mail-notification.schemas.in.h:42
+#: data/mail-notification.schemas.in.h:43
msgid ""
"The number of pixels to leave between the left or right side of the screen "
"and the mail summary popup."
@@ -242,7 +247,7 @@ msgstr ""
"O número de pixeis a deixar entre o extremo esquerdo ou direito do ecran e o "
"popup de resumo de correio."
-#: data/mail-notification.schemas.in.h:43
+#: data/mail-notification.schemas.in.h:44
msgid ""
"The number of pixels to leave between the top or bottom side of the screen "
"and the mail summary popup."
@@ -250,7 +255,7 @@ msgstr ""
"O número de pixeis a deixar entre o topo ou fundo do ecran e o popup de "
"resumo de correio."
-#: data/mail-notification.schemas.in.h:44
+#: data/mail-notification.schemas.in.h:45
msgid ""
"The position of the mail summary popup. Must be \"top-left\", \"top-right\", "
"\"bottom-left\" or \"bottom-right\"."
@@ -258,78 +263,85 @@ msgstr ""
"A posição do popup de resumo de correio. Tem de ser \"top-left\", \"top-right"
"\", \"bottom-left\" ou \"bottom-right\"."
-#: data/mail-notification.schemas.in.h:45
+#: data/mail-notification.schemas.in.h:46
msgid "The width of the mail summary dialog in pixels."
msgstr "A largura em pixeis do diálogo de resumo de correio."
-#: data/mail-notification.schemas.in.h:46
+#: data/mail-notification.schemas.in.h:47
msgid "The width of the properties dialog in pixels."
msgstr "A largura em pixeis do diálogo de propriedades."
-#: data/mail-notification.schemas.in.h:47
+#: data/mail-notification.schemas.in.h:48
msgid "Trusted servers list"
msgstr "Lista de servidores confiados"
-#: data/mail-notification.schemas.in.h:48
+#: data/mail-notification.schemas.in.h:49
#, fuzzy
msgid "Use a custom font for the contents of the mail summary popup"
msgstr "Segundos a esperar antes de fechar o popup de resumo de correio"
-#: data/mail-notification.schemas.in.h:49
+#: data/mail-notification.schemas.in.h:50
#, fuzzy
msgid "Use a custom font for the title of the mail summary popup"
msgstr ""
"A quantidade de tempo a esperar antes de fechar o popup de resumo de correio"
-#: data/mail-notification.schemas.in.h:50
+#: data/mail-notification.schemas.in.h:51
msgid "Whether Mail Notification has already been run or not."
msgstr "Se a Notificação de Correio já foi executada ou não."
-#: data/mail-notification.schemas.in.h:51
+#: data/mail-notification.schemas.in.h:52
msgid "Whether the status icon should blink on errors or not."
msgstr "Se o ícone de estado deve piscar em erros ou não."
-#: data/mail-notification.schemas.in.h:52
+#: data/mail-notification.schemas.in.h:53
msgid "Whether to automatically close the mail summary popup or not."
msgstr ""
"Se o popup de resumo de correio deve ser automaticamente fechado ou não."
-#: data/mail-notification.schemas.in.h:53
+#: data/mail-notification.schemas.in.h:54
+#, fuzzy
+msgid "Whether to display the mail summary in the status icon tooltip or not."
+msgstr ""
+"Se o popup de resumo de correio deve ser mostrado quando chega correio ou "
+"não."
+
+#: data/mail-notification.schemas.in.h:55
msgid "Whether to display the mail summary popup when new mail arrives or not."
msgstr ""
"Se o popup de resumo de correio deve ser mostrado quando chega correio ou "
"não."
-#: data/mail-notification.schemas.in.h:54
+#: data/mail-notification.schemas.in.h:56
#, fuzzy
msgid ""
"Whether to hide previously displayed mail in the mail summary popup or not."
msgstr ""
"Se o popup de resumo de correio deve ser automaticamente fechado ou não."
-#: data/mail-notification.schemas.in.h:55
+#: data/mail-notification.schemas.in.h:57
msgid ""
"Whether to prevent the immediate notification error dialog from being "
"displayed or not."
msgstr ""
"Se se evita o diálogo de erro de notificação imediata de ser mostrado ou não."
-#: data/mail-notification.schemas.in.h:56
+#: data/mail-notification.schemas.in.h:58
msgid "Whether to run a command when all mail is read or not."
msgstr ""
"Se um comando deverá ser executado quando todo o correio é lido ou não."
-#: data/mail-notification.schemas.in.h:57
+#: data/mail-notification.schemas.in.h:59
msgid "Whether to run a command when new mail arrives or not."
msgstr "Se um comando deverá ser executado quando chega novo correio."
-#: data/mail-notification.schemas.in.h:58
+#: data/mail-notification.schemas.in.h:60
#, fuzzy
msgid "Whether to set a mail reader or not."
msgstr ""
"Se um comando deverá ser executado quando todo o correio é lido ou não."
-#: data/mail-notification.schemas.in.h:59
+#: data/mail-notification.schemas.in.h:61
#, fuzzy
msgid ""
"Whether to use a custom font for the contents of the mail summary popup or "
@@ -337,18 +349,18 @@ msgid ""
msgstr ""
"Se o popup de resumo de correio deve ser automaticamente fechado ou não."
-#: data/mail-notification.schemas.in.h:60
+#: data/mail-notification.schemas.in.h:62
#, fuzzy
msgid ""
"Whether to use a custom font for the title of the mail summary popup or not."
msgstr ""
"Se o popup de resumo de correio deve ser automaticamente fechado ou não."
-#: data/mail-notification.schemas.in.h:61
+#: data/mail-notification.schemas.in.h:63
msgid "Width of mail summary dialog"
msgstr "Largura do diálogo de resumo de correio"
-#: data/mail-notification.schemas.in.h:62
+#: data/mail-notification.schemas.in.h:64
msgid "Width of properties dialog"
msgstr "Largura do diálogo de propriedades"
@@ -777,50 +789,50 @@ msgstr "O número do porto do servidor IMAP"
msgid "The mailbox name"
msgstr "O nome da caixa de correio"
-#: src/mn-imap-mailbox.gob:164 src/mn-pop3-mailbox.gob:142
+#: src/mn-imap-mailbox.gob:165 src/mn-pop3-mailbox.gob:142
msgid "SSL/TLS support has not been compiled in"
msgstr "suporte SSL/TLS não foi compilado"
-#: src/mn-imap-mailbox.gob:253
+#: src/mn-imap-mailbox.gob:244
msgid "server did not send capabilities"
msgstr "servidor não enviou habilidades"
-#: src/mn-imap-mailbox.gob:374
+#: src/mn-imap-mailbox.gob:390
msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
msgstr "servidor anunciou LOGINDISABLED, não usando a autenticação LOGIN"
-#: src/mn-imap-mailbox.gob:375
+#: src/mn-imap-mailbox.gob:391
msgid "unable to login"
msgstr "incapaz de ligar"
#. compliance error
-#: src/mn-imap-mailbox.gob:516
+#: src/mn-imap-mailbox.gob:538
msgid "server did not send search results"
msgstr "servidor não enviou resultados da procura"
#. compliance error
-#: src/mn-imap-mailbox.gob:596
+#: src/mn-imap-mailbox.gob:618
msgid "server did not send all the messages we requested"
msgstr "servidor não enviou todas as mensagens pedidas"
-#: src/mn-imap-mailbox.gob:645
+#: src/mn-imap-mailbox.gob:667
msgid "unable to fetch message"
msgstr "incapaz de obter mensagem"
#. compliance error
-#: src/mn-imap-mailbox.gob:763
+#: src/mn-imap-mailbox.gob:785
msgid "server did not send status"
msgstr "servidor não enviou estado"
-#: src/mn-imap-mailbox.gob:1035 src/mn-pop3-mailbox.gob:922
+#: src/mn-imap-mailbox.gob:1057 src/mn-pop3-mailbox.gob:922
msgid "unknown server error"
msgstr "erro de servidor desconhecido"
-#: src/mn-imap-mailbox.gob:1106 src/mn-pop3-mailbox.gob:226
+#: src/mn-imap-mailbox.gob:1147 src/mn-pop3-mailbox.gob:226
msgid "server does not support in-band SSL/TLS"
msgstr "servidor não suporta SSL/TLS in-band"
-#: src/mn-imap-mailbox.gob:1125 src/mn-pop3-mailbox.gob:841
+#: src/mn-imap-mailbox.gob:1168 src/mn-pop3-mailbox.gob:841
msgid ""
"a SASL authentication mechanism was selected but SASL support has not been "
"compiled in"
@@ -828,16 +840,16 @@ msgstr ""
"foi escolhido um mecanismo de autenticação SASL, mas o suporte SASL não foi "
"compilado"
-#: src/mn-imap-mailbox.gob:1133 src/mn-pop3-mailbox.gob:853
+#: src/mn-imap-mailbox.gob:1176 src/mn-pop3-mailbox.gob:853
#, c-format
msgid "unknown authentication mechanism \"%s\""
msgstr "mecanismo de autenticação desconhecido \"%s\""
-#: src/mn-imap-mailbox.gob:1151
+#: src/mn-imap-mailbox.gob:1194
msgid "falling back to IMAP LOGIN authentication"
msgstr "recorrendo à autenticação IMAP LOGIN"
-#: src/mn-imap-mailbox.gob:1156 src/mn-pop3-mailbox.gob:888
+#: src/mn-imap-mailbox.gob:1199 src/mn-pop3-mailbox.gob:888
msgid "authentication failed"
msgstr "autenticação falhou"
@@ -1298,51 +1310,51 @@ msgstr "recorrendo a autenticação APOP"
msgid "falling back to USER/PASS authentication"
msgstr "recorrendo a autenticação USER/PASS"
-#: src/mn-properties.c:191
+#: src/mn-properties.c:193
msgid "top left"
msgstr "topo esquerdo"
-#: src/mn-properties.c:192
+#: src/mn-properties.c:194
msgid "top right"
msgstr "topo direito"
-#: src/mn-properties.c:193
+#: src/mn-properties.c:195
msgid "bottom left"
msgstr "fundo esquerdo"
-#: src/mn-properties.c:194
+#: src/mn-properties.c:196
msgid "bottom right"
msgstr "fundo direito"
-#: src/mn-properties.c:284
+#: src/mn-properties.c:287
msgid "No mailbox selected."
msgstr "Nenhuma caixa de correio seleccionada."
-#: src/mn-properties.c:289
+#: src/mn-properties.c:292
#, c-format
msgid "%i mailbox selected."
msgid_plural "%i mailboxes selected."
msgstr[0] "%i caixa de correio seleccionada."
msgstr[1] "%i caixas de correio seleccionadas."
-#: src/mn-shell.gob:92
+#: src/mn-shell.gob:93
msgid "You have new mail."
msgstr "Tem novo correio."
-#: src/mn-shell.gob:347
+#: src/mn-shell.gob:360
msgid "Mailboxes Having New Mail"
msgstr ""
-#: src/mn-shell.gob:349
+#: src/mn-shell.gob:362
msgid "Errors"
msgstr ""
-#: src/mn-shell.gob:351
+#: src/mn-shell.gob:364
#, fuzzy
msgid "Unsupported Mailboxes"
msgstr "Caixa de Correio de Sistema"
-#: src/mn-shell.gob:364 ui/summary-dialog.glade.h:1
+#: src/mn-shell.gob:381 ui/summary-dialog.glade.h:1
msgid "Mail Summary"
msgstr "Resumo de Correio"
@@ -1459,7 +1471,7 @@ msgstr "Ocorreu um erro de comando na Notificação de Correio"
msgid "Unable to execute \"%s\": %s."
msgstr "incapaz de executar \"%s\": %s."
-#: ui/authentication.glade.h:1 ui/properties.glade.h:2
+#: ui/authentication.glade.h:1
msgid "*"
msgstr "*"
@@ -1475,32 +1487,37 @@ msgstr "_Tipo de caixa de correio:"
msgid " "
msgstr " "
-#: ui/properties.glade.h:3
+#: ui/properties.glade.h:2
msgid "<span weight=\"bold\">Commands</span>"
msgstr "<span weight=\"bold\">Comandos</span>"
-#: ui/properties.glade.h:4
+#: ui/properties.glade.h:3
#, fuzzy
msgid "<span weight=\"bold\">Double-click Action</span>"
msgstr "<span weight=\"bold\">Posição</span>"
-#: ui/properties.glade.h:5
+#: ui/properties.glade.h:4
#, fuzzy
msgid "<span weight=\"bold\">Fonts</span>"
msgstr "<span weight=\"bold\">Comandos</span>"
-#: ui/properties.glade.h:6
+#: ui/properties.glade.h:5
msgid "<span weight=\"bold\">General</span>"
msgstr "<span weight=\"bold\">Geral</span>"
-#: ui/properties.glade.h:7
+#: ui/properties.glade.h:6
msgid "<span weight=\"bold\">Mailbox List</span>"
msgstr "<span weight=\"bold\">Lista de Caixas de Correio</span>"
-#: ui/properties.glade.h:8
+#: ui/properties.glade.h:7
msgid "<span weight=\"bold\">Position</span>"
msgstr "<span weight=\"bold\">Posição</span>"
+#: ui/properties.glade.h:8
+#, fuzzy
+msgid "Dis_play mail summary in tooltip"
+msgstr "Mostrar o diálogo de resumo de correio"
+
#: ui/properties.glade.h:9
msgid "General"
msgstr "Geral"
@@ -1585,29 +1602,35 @@ msgstr ""
"Se o popup de resumo de correio deve ser automaticamente fechado ou não"
#: ui/properties.glade.h:27
-msgid "Whether to display the mail summary popup when new mail arrives or not"
+#, fuzzy
+msgid "Whether to display the mail summary in the status icon tooltip or not"
msgstr ""
"Se o popup de resumo de correio deve ser mostrado quando chega correio ou não"
#: ui/properties.glade.h:28
+msgid "Whether to display the mail summary popup when new mail arrives or not"
+msgstr ""
+"Se o popup de resumo de correio deve ser mostrado quando chega correio ou não"
+
+#: ui/properties.glade.h:29
#, fuzzy
msgid "Whether to hide previously displayed mail or not"
msgstr "Se a caixa de correio tem novo correio"
-#: ui/properties.glade.h:29
+#: ui/properties.glade.h:30
msgid "Whether to run a command when all mail is read or not"
msgstr "Se deve ser executado um comando quando todo o correio está lido"
-#: ui/properties.glade.h:30
+#: ui/properties.glade.h:31
msgid "Whether to run a command when new mail arrives or not"
msgstr "Se deve ser executado um comando quando chega novo correio"
-#: ui/properties.glade.h:31
+#: ui/properties.glade.h:32
#, fuzzy
msgid "Whether to set a mail reader or not"
msgstr "Se deve ser executado um comando quando todo o correio está lido"
-#: ui/properties.glade.h:32
+#: ui/properties.glade.h:33
msgid ""
"Whether to start Mail Notification when you log into your GNOME session or "
"not"
@@ -1615,7 +1638,7 @@ msgstr ""
"Se a Notificação de Correio deve ser iniciada quando faz se liga à sessão "
"GNOME ou não"
-#: ui/properties.glade.h:33
+#: ui/properties.glade.h:34
#, fuzzy
msgid ""
"Whether to use a custom font for the contents of the mail summary popup or "
@@ -1623,68 +1646,68 @@ msgid ""
msgstr ""
"Se o popup de resumo de correio deve ser automaticamente fechado ou não"
-#: ui/properties.glade.h:34
+#: ui/properties.glade.h:35
#, fuzzy
msgid ""
"Whether to use a custom font for the title of the mail summary popup or not"
msgstr ""
"Se o popup de resumo de correio deve ser automaticamente fechado ou não"
-#: ui/properties.glade.h:35
+#: ui/properties.glade.h:36
msgid "_Automatically close after:"
msgstr "Fechar _Automáticamente após:"
-#: ui/properties.glade.h:36
+#: ui/properties.glade.h:37
msgid "_Blink on errors"
msgstr "_Piscar em erros"
-#: ui/properties.glade.h:37
+#: ui/properties.glade.h:38
msgid "_Contents font:"
msgstr ""
-#: ui/properties.glade.h:38
+#: ui/properties.glade.h:39
msgid "_Delay between mail checks:"
msgstr "_Intervalo entre verificações de correio:"
-#: ui/properties.glade.h:39
+#: ui/properties.glade.h:40
#, fuzzy
msgid "_Display the mail summary dialog"
msgstr "Mostrar o diálogo de resumo de correio"
-#: ui/properties.glade.h:40
+#: ui/properties.glade.h:41
msgid "_Enable mail summary popup"
msgstr "_Activar popup de resumo de correio"
-#: ui/properties.glade.h:41
+#: ui/properties.glade.h:42
msgid "_Launch the mail reader"
msgstr ""
-#: ui/properties.glade.h:42
+#: ui/properties.glade.h:43
#, fuzzy
msgid "_Mail reader:"
msgstr "_Resumo de Correio"
-#: ui/properties.glade.h:43
+#: ui/properties.glade.h:44
msgid "_Start Mail Notification on GNOME login"
msgstr "_Iniciar Notificação de Correio no login GNOME"
-#: ui/properties.glade.h:44
+#: ui/properties.glade.h:45
msgid "_Title font:"
msgstr ""
-#: ui/properties.glade.h:45
+#: ui/properties.glade.h:46
msgid "_Vertical offset:"
msgstr "Intervalo _vertical:"
-#: ui/properties.glade.h:46
+#: ui/properties.glade.h:47
msgid "minutes"
msgstr "minutos"
-#: ui/properties.glade.h:47
+#: ui/properties.glade.h:48
msgid "pixels"
msgstr "pixeis"
-#: ui/properties.glade.h:48
+#: ui/properties.glade.h:49
msgid "seconds"
msgstr "segundos"
diff --git a/po/ru.gmo b/po/ru.gmo
Binary files differ.
diff --git a/po/ru.po b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mail-notification 0.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-04 11:04+0100\n"
+"POT-Creation-Date: 2004-11-15 16:03+0100\n"
"PO-Revision-Date: 2004-07-21 21:58+0200\n"
"Last-Translator: Dan Korostelev <dan@ats.energo.ru>\n"
"Language-Team: Russian\n"
@@ -64,260 +64,268 @@ msgid "Delay between mail checks (seconds part)."
msgstr ""
#: data/mail-notification.schemas.in.h:5
-msgid "Do not show the immediate notification error dialog"
+msgid "Display mail summary in tooltip"
msgstr ""
#: data/mail-notification.schemas.in.h:6
-msgid "Double-click action"
+msgid "Do not show the immediate notification error dialog"
msgstr ""
#: data/mail-notification.schemas.in.h:7
-msgid "Enable mail summary popup"
+msgid "Double-click action"
msgstr ""
#: data/mail-notification.schemas.in.h:8
-msgid "Fingerprints of trusted X509 certificates"
+msgid "Enable mail summary popup"
msgstr ""
#: data/mail-notification.schemas.in.h:9
-msgid "Has already been run"
+msgid "Fingerprints of trusted X509 certificates"
msgstr ""
#: data/mail-notification.schemas.in.h:10
-msgid "Height of mail summary dialog"
+msgid "Has already been run"
msgstr ""
#: data/mail-notification.schemas.in.h:11
-msgid "Height of properties dialog"
+msgid "Height of mail summary dialog"
msgstr ""
#: data/mail-notification.schemas.in.h:12
-msgid "Mail read command"
+msgid "Height of properties dialog"
msgstr ""
#: data/mail-notification.schemas.in.h:13
-msgid "Mail reader command"
+msgid "Mail read command"
msgstr ""
#: data/mail-notification.schemas.in.h:14
-msgid "Mail summary popup contents font"
+msgid "Mail reader command"
msgstr ""
#: data/mail-notification.schemas.in.h:15
-msgid "Mail summary popup horizontal offset"
+msgid "Mail summary popup contents font"
msgstr ""
#: data/mail-notification.schemas.in.h:16
-msgid "Mail summary popup position"
+msgid "Mail summary popup horizontal offset"
msgstr ""
#: data/mail-notification.schemas.in.h:17
-msgid "Mail summary popup title font"
+msgid "Mail summary popup position"
msgstr ""
#: data/mail-notification.schemas.in.h:18
-msgid "Mail summary popup vertical offset"
+msgid "Mail summary popup title font"
msgstr ""
#: data/mail-notification.schemas.in.h:19
-msgid "Mailbox list"
+msgid "Mail summary popup vertical offset"
msgstr ""
#: data/mail-notification.schemas.in.h:20
-msgid "Minutes between mail checks"
+msgid "Mailbox list"
msgstr ""
#: data/mail-notification.schemas.in.h:21
-msgid "Minutes to wait before closing the mail summary popup"
+msgid "Minutes between mail checks"
msgstr ""
#: data/mail-notification.schemas.in.h:22
-msgid "New mail command"
+msgid "Minutes to wait before closing the mail summary popup"
msgstr ""
#: data/mail-notification.schemas.in.h:23
-msgid "Only display recent mail in mail summary popup"
+msgid "New mail command"
msgstr ""
#: data/mail-notification.schemas.in.h:24
+msgid "Only display recent mail in mail summary popup"
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:25
#, fuzzy
msgid "Run a command when all mail is read"
msgstr ""
"Иконка в области уведомления панели, уведомляющая о приходе новой почты."
-#: data/mail-notification.schemas.in.h:25
+#: data/mail-notification.schemas.in.h:26
#, fuzzy
msgid "Run a command when new mail arrives"
msgstr ""
"Иконка в области уведомления панели, уведомляющая о приходе новой почты."
-#: data/mail-notification.schemas.in.h:26
+#: data/mail-notification.schemas.in.h:27
msgid "Seconds between mail checks"
msgstr ""
-#: data/mail-notification.schemas.in.h:27
+#: data/mail-notification.schemas.in.h:28
msgid "Seconds to wait before closing the mail summary popup"
msgstr ""
-#: data/mail-notification.schemas.in.h:28
+#: data/mail-notification.schemas.in.h:29
msgid "Set a mail reader"
msgstr ""
-#: data/mail-notification.schemas.in.h:29
+#: data/mail-notification.schemas.in.h:30
msgid ""
"The action to perform when the icon is double-clicked. Must be \"display-"
"mail-summary\" or \"launch-mail-reader\"."
msgstr ""
-#: data/mail-notification.schemas.in.h:30
+#: data/mail-notification.schemas.in.h:31
msgid ""
"The amount of time to wait before closing the mail summary popup (minutes "
"part)."
msgstr ""
-#: data/mail-notification.schemas.in.h:31
+#: data/mail-notification.schemas.in.h:32
msgid ""
"The amount of time to wait before closing the mail summary popup (seconds "
"part)."
msgstr ""
-#: data/mail-notification.schemas.in.h:32
+#: data/mail-notification.schemas.in.h:33
#, fuzzy
msgid "The command to run to launch the mail reader."
msgstr ""
"Иконка в области уведомления панели, уведомляющая о приходе новой почты."
-#: data/mail-notification.schemas.in.h:33
+#: data/mail-notification.schemas.in.h:34
#, fuzzy
msgid "The command to run when all mail is read."
msgstr ""
"Иконка в области уведомления панели, уведомляющая о приходе новой почты."
-#: data/mail-notification.schemas.in.h:34
+#: data/mail-notification.schemas.in.h:35
#, fuzzy
msgid "The command to run when new mail arrives."
msgstr ""
"Иконка в области уведомления панели, уведомляющая о приходе новой почты."
-#: data/mail-notification.schemas.in.h:35
+#: data/mail-notification.schemas.in.h:36
msgid "The custom font to use for the contents of the mail summary popup."
msgstr ""
-#: data/mail-notification.schemas.in.h:36
+#: data/mail-notification.schemas.in.h:37
msgid "The custom font to use for the title of the mail summary popup."
msgstr ""
-#: data/mail-notification.schemas.in.h:37
+#: data/mail-notification.schemas.in.h:38
msgid "The height of the mail summary dialog in pixels."
msgstr ""
-#: data/mail-notification.schemas.in.h:38
+#: data/mail-notification.schemas.in.h:39
msgid "The height of the properties dialog in pixels."
msgstr ""
-#: data/mail-notification.schemas.in.h:39
+#: data/mail-notification.schemas.in.h:40
msgid "The list of mailboxes to monitor."
msgstr ""
-#: data/mail-notification.schemas.in.h:40
+#: data/mail-notification.schemas.in.h:41
msgid ""
"The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
"certificate."
msgstr ""
-#: data/mail-notification.schemas.in.h:41
+#: data/mail-notification.schemas.in.h:42
msgid ""
"The list of trusted X509 certificates, represented by their MD5 fingerprint."
msgstr ""
-#: data/mail-notification.schemas.in.h:42
+#: data/mail-notification.schemas.in.h:43
msgid ""
"The number of pixels to leave between the left or right side of the screen "
"and the mail summary popup."
msgstr ""
-#: data/mail-notification.schemas.in.h:43
+#: data/mail-notification.schemas.in.h:44
msgid ""
"The number of pixels to leave between the top or bottom side of the screen "
"and the mail summary popup."
msgstr ""
-#: data/mail-notification.schemas.in.h:44
+#: data/mail-notification.schemas.in.h:45
msgid ""
"The position of the mail summary popup. Must be \"top-left\", \"top-right\", "
"\"bottom-left\" or \"bottom-right\"."
msgstr ""
-#: data/mail-notification.schemas.in.h:45
+#: data/mail-notification.schemas.in.h:46
msgid "The width of the mail summary dialog in pixels."
msgstr ""
-#: data/mail-notification.schemas.in.h:46
+#: data/mail-notification.schemas.in.h:47
msgid "The width of the properties dialog in pixels."
msgstr ""
-#: data/mail-notification.schemas.in.h:47
+#: data/mail-notification.schemas.in.h:48
msgid "Trusted servers list"
msgstr ""
-#: data/mail-notification.schemas.in.h:48
+#: data/mail-notification.schemas.in.h:49
msgid "Use a custom font for the contents of the mail summary popup"
msgstr ""
-#: data/mail-notification.schemas.in.h:49
+#: data/mail-notification.schemas.in.h:50
msgid "Use a custom font for the title of the mail summary popup"
msgstr ""
-#: data/mail-notification.schemas.in.h:50
+#: data/mail-notification.schemas.in.h:51
msgid "Whether Mail Notification has already been run or not."
msgstr ""
-#: data/mail-notification.schemas.in.h:51
+#: data/mail-notification.schemas.in.h:52
msgid "Whether the status icon should blink on errors or not."
msgstr ""
-#: data/mail-notification.schemas.in.h:52
+#: data/mail-notification.schemas.in.h:53
#, fuzzy
msgid "Whether to automatically close the mail summary popup or not."
msgstr ""
"Иконка в области уведомления панели, уведомляющая о приходе новой почты."
-#: data/mail-notification.schemas.in.h:53
+#: data/mail-notification.schemas.in.h:54
+msgid "Whether to display the mail summary in the status icon tooltip or not."
+msgstr ""
+
+#: data/mail-notification.schemas.in.h:55
#, fuzzy
msgid "Whether to display the mail summary popup when new mail arrives or not."
msgstr ""
"Иконка в области уведомления панели, уведомляющая о приходе новой почты."
-#: data/mail-notification.schemas.in.h:54
+#: data/mail-notification.schemas.in.h:56
msgid ""
"Whether to hide previously displayed mail in the mail summary popup or not."
msgstr ""
-#: data/mail-notification.schemas.in.h:55
+#: data/mail-notification.schemas.in.h:57
msgid ""
"Whether to prevent the immediate notification error dialog from being "
"displayed or not."
msgstr ""
-#: data/mail-notification.schemas.in.h:56
+#: data/mail-notification.schemas.in.h:58
#, fuzzy
msgid "Whether to run a command when all mail is read or not."
msgstr ""
"Иконка в области уведомления панели, уведомляющая о приходе новой почты."
-#: data/mail-notification.schemas.in.h:57
+#: data/mail-notification.schemas.in.h:59
#, fuzzy
msgid "Whether to run a command when new mail arrives or not."
msgstr ""
"Иконка в области уведомления панели, уведомляющая о приходе новой почты."
-#: data/mail-notification.schemas.in.h:58
+#: data/mail-notification.schemas.in.h:60
#, fuzzy
msgid "Whether to set a mail reader or not."
msgstr ""
"Иконка в области уведомления панели, уведомляющая о приходе новой почты."
-#: data/mail-notification.schemas.in.h:59
+#: data/mail-notification.schemas.in.h:61
#, fuzzy
msgid ""
"Whether to use a custom font for the contents of the mail summary popup or "
@@ -325,18 +333,18 @@ msgid ""
msgstr ""
"Иконка в области уведомления панели, уведомляющая о приходе новой почты."
-#: data/mail-notification.schemas.in.h:60
+#: data/mail-notification.schemas.in.h:62
#, fuzzy
msgid ""
"Whether to use a custom font for the title of the mail summary popup or not."
msgstr ""
"Иконка в области уведомления панели, уведомляющая о приходе новой почты."
-#: data/mail-notification.schemas.in.h:61
+#: data/mail-notification.schemas.in.h:63
msgid "Width of mail summary dialog"
msgstr ""
-#: data/mail-notification.schemas.in.h:62
+#: data/mail-notification.schemas.in.h:64
msgid "Width of properties dialog"
msgstr ""
@@ -742,65 +750,65 @@ msgstr ""
msgid "The mailbox name"
msgstr ""
-#: src/mn-imap-mailbox.gob:164 src/mn-pop3-mailbox.gob:142
+#: src/mn-imap-mailbox.gob:165 src/mn-pop3-mailbox.gob:142
msgid "SSL/TLS support has not been compiled in"
msgstr ""
-#: src/mn-imap-mailbox.gob:253
+#: src/mn-imap-mailbox.gob:244
msgid "server did not send capabilities"
msgstr ""
-#: src/mn-imap-mailbox.gob:374
+#: src/mn-imap-mailbox.gob:390
msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
msgstr ""
-#: src/mn-imap-mailbox.gob:375
+#: src/mn-imap-mailbox.gob:391
msgid "unable to login"
msgstr ""
#. compliance error
-#: src/mn-imap-mailbox.gob:516
+#: src/mn-imap-mailbox.gob:538
msgid "server did not send search results"
msgstr ""
#. compliance error
-#: src/mn-imap-mailbox.gob:596
+#: src/mn-imap-mailbox.gob:618
msgid "server did not send all the messages we requested"
msgstr ""
-#: src/mn-imap-mailbox.gob:645
+#: src/mn-imap-mailbox.gob:667
msgid "unable to fetch message"
msgstr ""
#. compliance error
-#: src/mn-imap-mailbox.gob:763
+#: src/mn-imap-mailbox.gob:785
msgid "server did not send status"
msgstr ""
-#: src/mn-imap-mailbox.gob:1035 src/mn-pop3-mailbox.gob:922
+#: src/mn-imap-mailbox.gob:1057 src/mn-pop3-mailbox.gob:922
msgid "unknown server error"
msgstr ""
-#: src/mn-imap-mailbox.gob:1106 src/mn-pop3-mailbox.gob:226
+#: src/mn-imap-mailbox.gob:1147 src/mn-pop3-mailbox.gob:226
msgid "server does not support in-band SSL/TLS"
msgstr ""
-#: src/mn-imap-mailbox.gob:1125 src/mn-pop3-mailbox.gob:841
+#: src/mn-imap-mailbox.gob:1168 src/mn-pop3-mailbox.gob:841
msgid ""
"a SASL authentication mechanism was selected but SASL support has not been "
"compiled in"
msgstr ""
-#: src/mn-imap-mailbox.gob:1133 src/mn-pop3-mailbox.gob:853
+#: src/mn-imap-mailbox.gob:1176 src/mn-pop3-mailbox.gob:853
#, c-format
msgid "unknown authentication mechanism \"%s\""
msgstr ""
-#: src/mn-imap-mailbox.gob:1151
+#: src/mn-imap-mailbox.gob:1194
msgid "falling back to IMAP LOGIN authentication"
msgstr ""
-#: src/mn-imap-mailbox.gob:1156 src/mn-pop3-mailbox.gob:888
+#: src/mn-imap-mailbox.gob:1199 src/mn-pop3-mailbox.gob:888
msgid "authentication failed"
msgstr ""
@@ -1239,50 +1247,50 @@ msgstr ""
msgid "falling back to USER/PASS authentication"
msgstr ""
-#: src/mn-properties.c:191
+#: src/mn-properties.c:193
msgid "top left"
msgstr ""
-#: src/mn-properties.c:192
+#: src/mn-properties.c:194
msgid "top right"
msgstr ""
-#: src/mn-properties.c:193
+#: src/mn-properties.c:195
msgid "bottom left"
msgstr ""
-#: src/mn-properties.c:194
+#: src/mn-properties.c:196
msgid "bottom right"
msgstr ""
-#: src/mn-properties.c:284
+#: src/mn-properties.c:287
msgid "No mailbox selected."
msgstr ""
-#: src/mn-properties.c:289
+#: src/mn-properties.c:292
#, c-format
msgid "%i mailbox selected."
msgid_plural "%i mailboxes selected."
msgstr[0] ""
msgstr[1] ""
-#: src/mn-shell.gob:92
+#: src/mn-shell.gob:93
msgid "You have new mail."
msgstr ""
-#: src/mn-shell.gob:347
+#: src/mn-shell.gob:360
msgid "Mailboxes Having New Mail"
msgstr ""
-#: src/mn-shell.gob:349
+#: src/mn-shell.gob:362
msgid "Errors"
msgstr ""
-#: src/mn-shell.gob:351
+#: src/mn-shell.gob:364
msgid "Unsupported Mailboxes"
msgstr ""
-#: src/mn-shell.gob:364 ui/summary-dialog.glade.h:1
+#: src/mn-shell.gob:381 ui/summary-dialog.glade.h:1
msgid "Mail Summary"
msgstr ""
@@ -1395,7 +1403,7 @@ msgstr ""
msgid "Unable to execute \"%s\": %s."
msgstr ""
-#: ui/authentication.glade.h:1 ui/properties.glade.h:2
+#: ui/authentication.glade.h:1
msgid "*"
msgstr ""
@@ -1411,30 +1419,34 @@ msgstr ""
msgid " "
msgstr ""
-#: ui/properties.glade.h:3
+#: ui/properties.glade.h:2
msgid "<span weight=\"bold\">Commands</span>"
msgstr ""
-#: ui/properties.glade.h:4
+#: ui/properties.glade.h:3
msgid "<span weight=\"bold\">Double-click Action</span>"
msgstr ""
-#: ui/properties.glade.h:5
+#: ui/properties.glade.h:4
msgid "<span weight=\"bold\">Fonts</span>"
msgstr ""
-#: ui/properties.glade.h:6
+#: ui/properties.glade.h:5
msgid "<span weight=\"bold\">General</span>"
msgstr ""
-#: ui/properties.glade.h:7
+#: ui/properties.glade.h:6
msgid "<span weight=\"bold\">Mailbox List</span>"
msgstr ""
-#: ui/properties.glade.h:8
+#: ui/properties.glade.h:7
msgid "<span weight=\"bold\">Position</span>"
msgstr ""
+#: ui/properties.glade.h:8
+msgid "Dis_play mail summary in tooltip"
+msgstr ""
+
#: ui/properties.glade.h:9
msgid "General"
msgstr ""
@@ -1517,38 +1529,42 @@ msgid "Whether to automatically close the mail summary popup or not"
msgstr ""
#: ui/properties.glade.h:27
+msgid "Whether to display the mail summary in the status icon tooltip or not"
+msgstr ""
+
+#: ui/properties.glade.h:28
#, fuzzy
msgid "Whether to display the mail summary popup when new mail arrives or not"
msgstr ""
"Иконка в области уведомления панели, уведомляющая о приходе новой почты."
-#: ui/properties.glade.h:28
+#: ui/properties.glade.h:29
msgid "Whether to hide previously displayed mail or not"
msgstr ""
-#: ui/properties.glade.h:29
+#: ui/properties.glade.h:30
#, fuzzy
msgid "Whether to run a command when all mail is read or not"
msgstr ""
"Иконка в области уведомления панели, уведомляющая о приходе новой почты."
-#: ui/properties.glade.h:30
+#: ui/properties.glade.h:31
msgid "Whether to run a command when new mail arrives or not"
msgstr ""
-#: ui/properties.glade.h:31
+#: ui/properties.glade.h:32
#, fuzzy
msgid "Whether to set a mail reader or not"
msgstr ""
"Иконка в области уведомления панели, уведомляющая о приходе новой почты."
-#: ui/properties.glade.h:32
+#: ui/properties.glade.h:33
msgid ""
"Whether to start Mail Notification when you log into your GNOME session or "
"not"
msgstr ""
-#: ui/properties.glade.h:33
+#: ui/properties.glade.h:34
#, fuzzy
msgid ""
"Whether to use a custom font for the contents of the mail summary popup or "
@@ -1556,67 +1572,67 @@ msgid ""
msgstr ""
"Иконка в области уведомления панели, уведомляющая о приходе новой почты."
-#: ui/properties.glade.h:34
+#: ui/properties.glade.h:35
#, fuzzy
msgid ""
"Whether to use a custom font for the title of the mail summary popup or not"
msgstr ""
"Иконка в области уведомления панели, уведомляющая о приходе новой почты."
-#: ui/properties.glade.h:35
+#: ui/properties.glade.h:36
msgid "_Automatically close after:"
msgstr ""
-#: ui/properties.glade.h:36
+#: ui/properties.glade.h:37
msgid "_Blink on errors"
msgstr ""
-#: ui/properties.glade.h:37
+#: ui/properties.glade.h:38
msgid "_Contents font:"
msgstr ""
-#: ui/properties.glade.h:38
+#: ui/properties.glade.h:39
msgid "_Delay between mail checks:"
msgstr ""
-#: ui/properties.glade.h:39
+#: ui/properties.glade.h:40
msgid "_Display the mail summary dialog"
msgstr ""
-#: ui/properties.glade.h:40
+#: ui/properties.glade.h:41
msgid "_Enable mail summary popup"
msgstr ""
-#: ui/properties.glade.h:41
+#: ui/properties.glade.h:42
msgid "_Launch the mail reader"
msgstr ""
-#: ui/properties.glade.h:42
+#: ui/properties.glade.h:43
msgid "_Mail reader:"
msgstr ""
-#: ui/properties.glade.h:43
+#: ui/properties.glade.h:44
#, fuzzy
msgid "_Start Mail Notification on GNOME login"
msgstr "Иконка входящих сообщений"
-#: ui/properties.glade.h:44
+#: ui/properties.glade.h:45
msgid "_Title font:"
msgstr ""
-#: ui/properties.glade.h:45
+#: ui/properties.glade.h:46
msgid "_Vertical offset:"
msgstr ""
-#: ui/properties.glade.h:46
+#: ui/properties.glade.h:47
msgid "minutes"
msgstr ""
-#: ui/properties.glade.h:47
+#: ui/properties.glade.h:48
msgid "pixels"
msgstr ""
-#: ui/properties.glade.h:48
+#: ui/properties.glade.h:49
msgid "seconds"
msgstr ""
diff --git a/po/sr.gmo b/po/sr.gmo
Binary files differ.
diff --git a/po/sr.po b/po/sr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mail-notification 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-04 11:04+0100\n"
+"POT-Creation-Date: 2004-11-15 16:03+0100\n"
"PO-Revision-Date: 2004-11-01 23:00+0100\n"
"Last-Translator: Филип Милетић <filmil@gmail.com>\n"
"Language-Team: Serbian (sr) <gnu@prevod.org>\n"
@@ -60,105 +60,110 @@ msgid "Delay between mail checks (seconds part)."
msgstr "Размак између две провере (секунде)."
#: data/mail-notification.schemas.in.h:5
+#, fuzzy
+msgid "Display mail summary in tooltip"
+msgstr "Прикажи прозор са сажетком порука"
+
+#: data/mail-notification.schemas.in.h:6
msgid "Do not show the immediate notification error dialog"
msgstr "Не показуј прозор са обавештењем о грешкама"
-#: data/mail-notification.schemas.in.h:6
+#: data/mail-notification.schemas.in.h:7
msgid "Double-click action"
msgstr "Изврши на двоструки клик"
-#: data/mail-notification.schemas.in.h:7
+#: data/mail-notification.schemas.in.h:8
msgid "Enable mail summary popup"
msgstr "Дозволи приказ сажетка порука"
-#: data/mail-notification.schemas.in.h:8
+#: data/mail-notification.schemas.in.h:9
msgid "Fingerprints of trusted X509 certificates"
msgstr "Отисци проверених X509 сертификата"
-#: data/mail-notification.schemas.in.h:9
+#: data/mail-notification.schemas.in.h:10
msgid "Has already been run"
msgstr "Већ је покренут"
-#: data/mail-notification.schemas.in.h:10
+#: data/mail-notification.schemas.in.h:11
msgid "Height of mail summary dialog"
msgstr "Висина прозора са сажетком порука"
-#: data/mail-notification.schemas.in.h:11
+#: data/mail-notification.schemas.in.h:12
msgid "Height of properties dialog"
msgstr "Висина прозора са поставкама"
-#: data/mail-notification.schemas.in.h:12
+#: data/mail-notification.schemas.in.h:13
msgid "Mail read command"
msgstr "Команда за читање поште"
-#: data/mail-notification.schemas.in.h:13
+#: data/mail-notification.schemas.in.h:14
msgid "Mail reader command"
msgstr "Команда за читање поште"
-#: data/mail-notification.schemas.in.h:14
+#: data/mail-notification.schemas.in.h:15
#, fuzzy
msgid "Mail summary popup contents font"
msgstr "Број хоризонталних тачака за прозор са сажетком порука"
-#: data/mail-notification.schemas.in.h:15
+#: data/mail-notification.schemas.in.h:16
msgid "Mail summary popup horizontal offset"
msgstr "Померај хоризонталних тачака за прозор са сажетком порука"
-#: data/mail-notification.schemas.in.h:16
+#: data/mail-notification.schemas.in.h:17
msgid "Mail summary popup position"
msgstr "Број хоризонталних тачака за прозор са сажетком порука"
-#: data/mail-notification.schemas.in.h:17
+#: data/mail-notification.schemas.in.h:18
#, fuzzy
msgid "Mail summary popup title font"
msgstr "Број хоризонталних тачака за прозор са сажетком порука"
-#: data/mail-notification.schemas.in.h:18
+#: data/mail-notification.schemas.in.h:19
msgid "Mail summary popup vertical offset"
msgstr "Померај вертикалних тачака ѕа прозор са сажетком порука"
-#: data/mail-notification.schemas.in.h:19
+#: data/mail-notification.schemas.in.h:20
msgid "Mailbox list"
msgstr "Списак сандучића"
-#: data/mail-notification.schemas.in.h:20
+#: data/mail-notification.schemas.in.h:21
msgid "Minutes between mail checks"
msgstr "Минута између две провере"
-#: data/mail-notification.schemas.in.h:21
+#: data/mail-notification.schemas.in.h:22
msgid "Minutes to wait before closing the mail summary popup"
msgstr ""
"Број минута који треба да протекне пре затварања прозора са сажетком порука"
-#: data/mail-notification.schemas.in.h:22
+#: data/mail-notification.schemas.in.h:23
msgid "New mail command"
msgstr "Изврши када пошта стигне"
-#: data/mail-notification.schemas.in.h:23
+#: data/mail-notification.schemas.in.h:24
msgid "Only display recent mail in mail summary popup"
msgstr "Прикажи само скоро приспеле поруке у сажетку"
-#: data/mail-notification.schemas.in.h:24
+#: data/mail-notification.schemas.in.h:25
msgid "Run a command when all mail is read"
msgstr "Покрени команду када је сва пошта прочитана"
-#: data/mail-notification.schemas.in.h:25
+#: data/mail-notification.schemas.in.h:26
msgid "Run a command when new mail arrives"
msgstr "Покрени команду када стигне нова пошта"
-#: data/mail-notification.schemas.in.h:26
+#: data/mail-notification.schemas.in.h:27
msgid "Seconds between mail checks"
msgstr "Секунди између две провере"
-#: data/mail-notification.schemas.in.h:27
+#: data/mail-notification.schemas.in.h:28
msgid "Seconds to wait before closing the mail summary popup"
msgstr "Број секунди који треба да протекне пре затварања сажетка порука"
-#: data/mail-notification.schemas.in.h:28
+#: data/mail-notification.schemas.in.h:29
msgid "Set a mail reader"
msgstr "Изаберите читач поште"
-#: data/mail-notification.schemas.in.h:29
+#: data/mail-notification.schemas.in.h:30
msgid ""
"The action to perform when the icon is double-clicked. Must be \"display-"
"mail-summary\" or \"launch-mail-reader\"."
@@ -166,65 +171,65 @@ msgstr ""
"Постављање наредбе која се извршава при двоструком клику на сличицу. Могући "
"избори су: „прикажи-сажетак-поште‟ или „покрени-читач-поште‟."
-#: data/mail-notification.schemas.in.h:30
+#: data/mail-notification.schemas.in.h:31
msgid ""
"The amount of time to wait before closing the mail summary popup (minutes "
"part)."
msgstr "Пауза пре затварања прозора са сажетком порука (минути)."
-#: data/mail-notification.schemas.in.h:31
+#: data/mail-notification.schemas.in.h:32
msgid ""
"The amount of time to wait before closing the mail summary popup (seconds "
"part)."
msgstr "Пауза пре затварања прозора са сажетком порука (секунде)."
-#: data/mail-notification.schemas.in.h:32
+#: data/mail-notification.schemas.in.h:33
msgid "The command to run to launch the mail reader."
msgstr "Команда којом се покреће читач поште"
-#: data/mail-notification.schemas.in.h:33
+#: data/mail-notification.schemas.in.h:34
msgid "The command to run when all mail is read."
msgstr "Команда коју треба покренути када је сва пошта прочитана."
-#: data/mail-notification.schemas.in.h:34
+#: data/mail-notification.schemas.in.h:35
msgid "The command to run when new mail arrives."
msgstr "Покрени ову команду када стигне нова пошта."
-#: data/mail-notification.schemas.in.h:35
+#: data/mail-notification.schemas.in.h:36
#, fuzzy
msgid "The custom font to use for the contents of the mail summary popup."
msgstr "Пауза пре затварања прозора са сажетком порука"
-#: data/mail-notification.schemas.in.h:36
+#: data/mail-notification.schemas.in.h:37
#, fuzzy
msgid "The custom font to use for the title of the mail summary popup."
msgstr "Пауза пре затварања прозора са сажетком порука"
-#: data/mail-notification.schemas.in.h:37
+#: data/mail-notification.schemas.in.h:38
msgid "The height of the mail summary dialog in pixels."
msgstr "Висина прозора са сажетком порука изражена у тачкама."
-#: data/mail-notification.schemas.in.h:38
+#: data/mail-notification.schemas.in.h:39
msgid "The height of the properties dialog in pixels."
msgstr "Висина прозора са поставкама изражена у тачкама."
-#: data/mail-notification.schemas.in.h:39
+#: data/mail-notification.schemas.in.h:40
msgid "The list of mailboxes to monitor."
msgstr "Списак сандучића који се прате."
-#: data/mail-notification.schemas.in.h:40
+#: data/mail-notification.schemas.in.h:41
msgid ""
"The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
"certificate."
msgstr ""
"Списак проверених SSL/TLS сервера (рачунар:порт) који немају X509 сертификат."
-#: data/mail-notification.schemas.in.h:41
+#: data/mail-notification.schemas.in.h:42
msgid ""
"The list of trusted X509 certificates, represented by their MD5 fingerprint."
msgstr "Списак проверених X509 сертификата, представљених MD5 отиском."
-#: data/mail-notification.schemas.in.h:42
+#: data/mail-notification.schemas.in.h:43
msgid ""
"The number of pixels to leave between the left or right side of the screen "
"and the mail summary popup."
@@ -232,7 +237,7 @@ msgstr ""
"Број тачака које треба оставити између леве, одн. десне стране екрана и "
"прозора са сажетком порука."
-#: data/mail-notification.schemas.in.h:43
+#: data/mail-notification.schemas.in.h:44
msgid ""
"The number of pixels to leave between the top or bottom side of the screen "
"and the mail summary popup."
@@ -240,7 +245,7 @@ msgstr ""
"Број тачака које треба оставити између врха, одн. дна екрана и прозора са "
"сажетком порука."
-#: data/mail-notification.schemas.in.h:44
+#: data/mail-notification.schemas.in.h:45
msgid ""
"The position of the mail summary popup. Must be \"top-left\", \"top-right\", "
"\"bottom-left\" or \"bottom-right\"."
@@ -248,71 +253,76 @@ msgstr ""
"Положај прозора са сажетком порука. Може бити: „горе-лево‟, „горе-десно‟, "
"„доле-лево‟ или „доле-десно‟."
-#: data/mail-notification.schemas.in.h:45
+#: data/mail-notification.schemas.in.h:46
msgid "The width of the mail summary dialog in pixels."
msgstr "Ширина прозора са сажетком порука изражена у тачкама."
-#: data/mail-notification.schemas.in.h:46
+#: data/mail-notification.schemas.in.h:47
msgid "The width of the properties dialog in pixels."
msgstr "Ширина прозора са поставкама изражена у тачкама."
-#: data/mail-notification.schemas.in.h:47
+#: data/mail-notification.schemas.in.h:48
msgid "Trusted servers list"
msgstr "Списак проверених сервера"
-#: data/mail-notification.schemas.in.h:48
+#: data/mail-notification.schemas.in.h:49
#, fuzzy
msgid "Use a custom font for the contents of the mail summary popup"
msgstr "Број секунди који треба да протекне пре затварања сажетка порука"
-#: data/mail-notification.schemas.in.h:49
+#: data/mail-notification.schemas.in.h:50
#, fuzzy
msgid "Use a custom font for the title of the mail summary popup"
msgstr "Пауза пре затварања прозора са сажетком порука"
-#: data/mail-notification.schemas.in.h:50
+#: data/mail-notification.schemas.in.h:51
msgid "Whether Mail Notification has already been run or not."
msgstr "Да ли је програм покретан пре или није."
-#: data/mail-notification.schemas.in.h:51
+#: data/mail-notification.schemas.in.h:52
msgid "Whether the status icon should blink on errors or not."
msgstr "Да ли сличица треба да трепери ако дође до грешке или не."
-#: data/mail-notification.schemas.in.h:52
+#: data/mail-notification.schemas.in.h:53
msgid "Whether to automatically close the mail summary popup or not."
msgstr ""
"Да ли треба или не треба аутоматски затворити прозор са сажетком поште."
-#: data/mail-notification.schemas.in.h:53
+#: data/mail-notification.schemas.in.h:54
+#, fuzzy
+msgid "Whether to display the mail summary in the status icon tooltip or not."
+msgstr "Да ли треба приказати сажетак порука када стигне нова пошта."
+
+#: data/mail-notification.schemas.in.h:55
msgid "Whether to display the mail summary popup when new mail arrives or not."
msgstr "Да ли треба приказати сажетак порука када стигне нова пошта."
-#: data/mail-notification.schemas.in.h:54
+#: data/mail-notification.schemas.in.h:56
msgid ""
"Whether to hide previously displayed mail in the mail summary popup or not."
msgstr ""
"Да ли из сажетка треба уклонити поруке које су се у њему већ пре појавиле."
-#: data/mail-notification.schemas.in.h:55
+#: data/mail-notification.schemas.in.h:57
msgid ""
"Whether to prevent the immediate notification error dialog from being "
"displayed or not."
msgstr "Да ли треба или не треба спречити појаву прозора са описом грешака."
-#: data/mail-notification.schemas.in.h:56
+#: data/mail-notification.schemas.in.h:58
msgid "Whether to run a command when all mail is read or not."
msgstr ""
"Да ли треба или не треба покренути неку команду када је сва пошта прочитана."
-#: data/mail-notification.schemas.in.h:57
+#: data/mail-notification.schemas.in.h:59
msgid "Whether to run a command when new mail arrives or not."
msgstr "Да ли треба покренути неку команду када стигне нова пошта."
-#: data/mail-notification.schemas.in.h:58
+#: data/mail-notification.schemas.in.h:60
msgid "Whether to set a mail reader or not."
msgstr "Да ли треба поставити читач поште или не."
-#: data/mail-notification.schemas.in.h:59
+#: data/mail-notification.schemas.in.h:61
#, fuzzy
msgid ""
"Whether to use a custom font for the contents of the mail summary popup or "
@@ -320,18 +330,18 @@ msgid ""
msgstr ""
"Да ли треба или не треба аутоматски затворити прозор са сажетком поште."
-#: data/mail-notification.schemas.in.h:60
+#: data/mail-notification.schemas.in.h:62
#, fuzzy
msgid ""
"Whether to use a custom font for the title of the mail summary popup or not."
msgstr ""
"Да ли треба или не треба аутоматски затворити прозор са сажетком поште."
-#: data/mail-notification.schemas.in.h:61
+#: data/mail-notification.schemas.in.h:63
msgid "Width of mail summary dialog"
msgstr "Ширина прозора са сажетком порука"
-#: data/mail-notification.schemas.in.h:62
+#: data/mail-notification.schemas.in.h:64
msgid "Width of properties dialog"
msgstr "Ширина прозора са поставкама"
@@ -759,50 +769,50 @@ msgstr "Број порта на IMAP серверу"
msgid "The mailbox name"
msgstr "Име сандучета"
-#: src/mn-imap-mailbox.gob:164 src/mn-pop3-mailbox.gob:142
+#: src/mn-imap-mailbox.gob:165 src/mn-pop3-mailbox.gob:142
msgid "SSL/TLS support has not been compiled in"
msgstr "Подршка за SSL/TLS није уграђена"
-#: src/mn-imap-mailbox.gob:253
+#: src/mn-imap-mailbox.gob:244
msgid "server did not send capabilities"
msgstr "сервер није обавестио о својим могућностима"
-#: src/mn-imap-mailbox.gob:374
+#: src/mn-imap-mailbox.gob:390
msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
msgstr "сервер је дојавио LOGINDISABLED, LOGIN пријавa неће бити коришћена"
-#: src/mn-imap-mailbox.gob:375
+#: src/mn-imap-mailbox.gob:391
msgid "unable to login"
msgstr "пријава није могућа"
#. compliance error
-#: src/mn-imap-mailbox.gob:516
+#: src/mn-imap-mailbox.gob:538
msgid "server did not send search results"
msgstr "сервер није послао резултате претраге"
#. compliance error
-#: src/mn-imap-mailbox.gob:596
+#: src/mn-imap-mailbox.gob:618
msgid "server did not send all the messages we requested"
msgstr "сервер није послао све тражене поруке"
-#: src/mn-imap-mailbox.gob:645
+#: src/mn-imap-mailbox.gob:667
msgid "unable to fetch message"
msgstr "није могуће добавити поруку"
#. compliance error
-#: src/mn-imap-mailbox.gob:763
+#: src/mn-imap-mailbox.gob:785
msgid "server did not send status"
msgstr "сервер није послао статус"
-#: src/mn-imap-mailbox.gob:1035 src/mn-pop3-mailbox.gob:922
+#: src/mn-imap-mailbox.gob:1057 src/mn-pop3-mailbox.gob:922
msgid "unknown server error"
msgstr "непозната грешка на серверу"
-#: src/mn-imap-mailbox.gob:1106 src/mn-pop3-mailbox.gob:226
+#: src/mn-imap-mailbox.gob:1147 src/mn-pop3-mailbox.gob:226
msgid "server does not support in-band SSL/TLS"
msgstr "сервер не подржава заштиту путем SSL/TLS"
-#: src/mn-imap-mailbox.gob:1125 src/mn-pop3-mailbox.gob:841
+#: src/mn-imap-mailbox.gob:1168 src/mn-pop3-mailbox.gob:841
msgid ""
"a SASL authentication mechanism was selected but SASL support has not been "
"compiled in"
@@ -810,16 +820,16 @@ msgstr ""
"изабран је механизам за пријаву који користи SASL али подршка за SASL није "
"уграђена у програм"
-#: src/mn-imap-mailbox.gob:1133 src/mn-pop3-mailbox.gob:853
+#: src/mn-imap-mailbox.gob:1176 src/mn-pop3-mailbox.gob:853
#, c-format
msgid "unknown authentication mechanism \"%s\""
msgstr "непознат механизам за пријаву \"%s\""
-#: src/mn-imap-mailbox.gob:1151
+#: src/mn-imap-mailbox.gob:1194
msgid "falling back to IMAP LOGIN authentication"
msgstr "повратак на IMAP LOGIN пријаву"
-#: src/mn-imap-mailbox.gob:1156 src/mn-pop3-mailbox.gob:888
+#: src/mn-imap-mailbox.gob:1199 src/mn-pop3-mailbox.gob:888
msgid "authentication failed"
msgstr "пријава није успела"
@@ -1301,27 +1311,27 @@ msgstr "прелазим на APOP пријаву"
msgid "falling back to USER/PASS authentication"
msgstr "прелазим на пријаву помоћу имена и лозинке"
-#: src/mn-properties.c:191
+#: src/mn-properties.c:193
msgid "top left"
msgstr "горе-лево"
-#: src/mn-properties.c:192
+#: src/mn-properties.c:194
msgid "top right"
msgstr "горе-десно"
-#: src/mn-properties.c:193
+#: src/mn-properties.c:195
msgid "bottom left"
msgstr "доле-лево"
-#: src/mn-properties.c:194
+#: src/mn-properties.c:196
msgid "bottom right"
msgstr "доле-десно"
-#: src/mn-properties.c:284
+#: src/mn-properties.c:287
msgid "No mailbox selected."
msgstr "Ниједно сандуче није изабрано."
-#: src/mn-properties.c:289
+#: src/mn-properties.c:292
#, c-format
msgid "%i mailbox selected."
msgid_plural "%i mailboxes selected."
@@ -1329,23 +1339,23 @@ msgstr[0] "Изабрано %i сандуче"
msgstr[1] "Изабрана %i сандучета"
msgstr[2] "Изабрано %i сандучета"
-#: src/mn-shell.gob:92
+#: src/mn-shell.gob:93
msgid "You have new mail."
msgstr "Имате нову пошту."
-#: src/mn-shell.gob:347
+#: src/mn-shell.gob:360
msgid "Mailboxes Having New Mail"
msgstr "Сандучићи са новом поштом"
-#: src/mn-shell.gob:349
+#: src/mn-shell.gob:362
msgid "Errors"
msgstr "Грешке"
-#: src/mn-shell.gob:351
+#: src/mn-shell.gob:364
msgid "Unsupported Mailboxes"
msgstr "Неподржани сандучићи"
-#: src/mn-shell.gob:364 ui/summary-dialog.glade.h:1
+#: src/mn-shell.gob:381 ui/summary-dialog.glade.h:1
msgid "Mail Summary"
msgstr "Сажетак порука"
@@ -1460,7 +1470,7 @@ msgstr "Дошло је до грешке у командама"
msgid "Unable to execute \"%s\": %s."
msgstr "Није могуће извршити %s: %s"
-#: ui/authentication.glade.h:1 ui/properties.glade.h:2
+#: ui/authentication.glade.h:1
msgid "*"
msgstr "*"
@@ -1476,31 +1486,36 @@ msgstr "_Врста сандучета:"
msgid " "
msgstr " "
-#: ui/properties.glade.h:3
+#: ui/properties.glade.h:2
msgid "<span weight=\"bold\">Commands</span>"
msgstr "<span weight=\"bold\">Наредбе</span>"
-#: ui/properties.glade.h:4
+#: ui/properties.glade.h:3
msgid "<span weight=\"bold\">Double-click Action</span>"
msgstr "<span weight=\"bold\">Наредба за дупли клик</span>"
-#: ui/properties.glade.h:5
+#: ui/properties.glade.h:4
#, fuzzy
msgid "<span weight=\"bold\">Fonts</span>"
msgstr "<span weight=\"bold\">Наредбе</span>"
-#: ui/properties.glade.h:6
+#: ui/properties.glade.h:5
msgid "<span weight=\"bold\">General</span>"
msgstr "<span weight=\"bold\">Опште</span>"
-#: ui/properties.glade.h:7
+#: ui/properties.glade.h:6
msgid "<span weight=\"bold\">Mailbox List</span>"
msgstr "<span weight=\"bold\">Сандучићи</span>"
-#: ui/properties.glade.h:8
+#: ui/properties.glade.h:7
msgid "<span weight=\"bold\">Position</span>"
msgstr "<span weight=\"bold\">Место</span>"
+#: ui/properties.glade.h:8
+#, fuzzy
+msgid "Dis_play mail summary in tooltip"
+msgstr "Прикажи прозор са сажетком порука"
+
#: ui/properties.glade.h:9
msgid "General"
msgstr "Опште"
@@ -1583,33 +1598,39 @@ msgstr ""
"Да ли треба или не треба аутоматски затворити прозор са сажетком порука"
#: ui/properties.glade.h:27
-msgid "Whether to display the mail summary popup when new mail arrives or not"
+#, fuzzy
+msgid "Whether to display the mail summary in the status icon tooltip or not"
msgstr ""
"Да ли треба или не треба приказивати сажетак порука када стигне нова пошта"
#: ui/properties.glade.h:28
+msgid "Whether to display the mail summary popup when new mail arrives or not"
+msgstr ""
+"Да ли треба или не треба приказивати сажетак порука када стигне нова пошта"
+
+#: ui/properties.glade.h:29
msgid "Whether to hide previously displayed mail or not"
msgstr "Да ли треба приказивати претходно приказане поруке или не"
-#: ui/properties.glade.h:29
+#: ui/properties.glade.h:30
msgid "Whether to run a command when all mail is read or not"
msgstr "Да ли се покреће или не покреће команда када је сва пошта прочитана"
-#: ui/properties.glade.h:30
+#: ui/properties.glade.h:31
msgid "Whether to run a command when new mail arrives or not"
msgstr "Да ли се покреће команда када стигне пошта или не"
-#: ui/properties.glade.h:31
+#: ui/properties.glade.h:32
msgid "Whether to set a mail reader or not"
msgstr "Да ли треба поставити читач поште"
-#: ui/properties.glade.h:32
+#: ui/properties.glade.h:33
msgid ""
"Whether to start Mail Notification when you log into your GNOME session or "
"not"
msgstr "Да ли покренути дојаву поште када се пријавите на систем"
-#: ui/properties.glade.h:33
+#: ui/properties.glade.h:34
#, fuzzy
msgid ""
"Whether to use a custom font for the contents of the mail summary popup or "
@@ -1617,66 +1638,66 @@ msgid ""
msgstr ""
"Да ли треба или не треба аутоматски затворити прозор са сажетком порука"
-#: ui/properties.glade.h:34
+#: ui/properties.glade.h:35
#, fuzzy
msgid ""
"Whether to use a custom font for the title of the mail summary popup or not"
msgstr ""
"Да ли треба или не треба аутоматски затворити прозор са сажетком порука"
-#: ui/properties.glade.h:35
+#: ui/properties.glade.h:36
msgid "_Automatically close after:"
msgstr "_Аутоматски затвори после:"
-#: ui/properties.glade.h:36
+#: ui/properties.glade.h:37
msgid "_Blink on errors"
msgstr "_Трепери при грешкама"
-#: ui/properties.glade.h:37
+#: ui/properties.glade.h:38
msgid "_Contents font:"
msgstr ""
-#: ui/properties.glade.h:38
+#: ui/properties.glade.h:39
msgid "_Delay between mail checks:"
msgstr "_Пауза између провера:"
-#: ui/properties.glade.h:39
+#: ui/properties.glade.h:40
msgid "_Display the mail summary dialog"
msgstr "Прикажи прозор са сажетком порука"
-#: ui/properties.glade.h:40
+#: ui/properties.glade.h:41
msgid "_Enable mail summary popup"
msgstr "Дозволи приказ сажетка порука"
-#: ui/properties.glade.h:41
+#: ui/properties.glade.h:42
msgid "_Launch the mail reader"
msgstr "П_окрени читач поште"
-#: ui/properties.glade.h:42
+#: ui/properties.glade.h:43
msgid "_Mail reader:"
msgstr "_Читач поште:"
-#: ui/properties.glade.h:43
+#: ui/properties.glade.h:44
msgid "_Start Mail Notification on GNOME login"
msgstr "Покрени _дојаву при пријави"
-#: ui/properties.glade.h:44
+#: ui/properties.glade.h:45
msgid "_Title font:"
msgstr ""
-#: ui/properties.glade.h:45
+#: ui/properties.glade.h:46
msgid "_Vertical offset:"
msgstr "_Вертикални помак:"
-#: ui/properties.glade.h:46
+#: ui/properties.glade.h:47
msgid "minutes"
msgstr "минута"
-#: ui/properties.glade.h:47
+#: ui/properties.glade.h:48
msgid "pixels"
msgstr "тачака"
-#: ui/properties.glade.h:48
+#: ui/properties.glade.h:49
msgid "seconds"
msgstr "секунди"
diff --git a/po/sr@Latn.gmo b/po/sr@Latn.gmo
Binary files differ.
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mail-notification 0.8.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-04 11:04+0100\n"
+"POT-Creation-Date: 2004-11-15 16:03+0100\n"
"PO-Revision-Date: 2004-11-01 23:00+0100\n"
"Last-Translator: Filip Miletić <filmil@gmail.com>\n"
"Language-Team: Serbian (sr) <gnu@prevod.org>\n"
@@ -60,105 +60,110 @@ msgid "Delay between mail checks (seconds part)."
msgstr "Razmak između dve provere (sekunde)."
#: data/mail-notification.schemas.in.h:5
+#, fuzzy
+msgid "Display mail summary in tooltip"
+msgstr "Prikaži prozor sa sažetkom poruka"
+
+#: data/mail-notification.schemas.in.h:6
msgid "Do not show the immediate notification error dialog"
msgstr "Ne pokazuj prozor sa obaveštenjem o greškama"
-#: data/mail-notification.schemas.in.h:6
+#: data/mail-notification.schemas.in.h:7
msgid "Double-click action"
msgstr "Izvrši na dvostruki klik"
-#: data/mail-notification.schemas.in.h:7
+#: data/mail-notification.schemas.in.h:8
msgid "Enable mail summary popup"
msgstr "Dozvoli prikaz sažetka poruka"
-#: data/mail-notification.schemas.in.h:8
+#: data/mail-notification.schemas.in.h:9
msgid "Fingerprints of trusted X509 certificates"
msgstr "Otisci proverenih X509 sertifikata"
-#: data/mail-notification.schemas.in.h:9
+#: data/mail-notification.schemas.in.h:10
msgid "Has already been run"
msgstr "Već je pokrenut"
-#: data/mail-notification.schemas.in.h:10
+#: data/mail-notification.schemas.in.h:11
msgid "Height of mail summary dialog"
msgstr "Visina prozora sa sažetkom poruka"
-#: data/mail-notification.schemas.in.h:11
+#: data/mail-notification.schemas.in.h:12
msgid "Height of properties dialog"
msgstr "Visina prozora sa postavkama"
-#: data/mail-notification.schemas.in.h:12
+#: data/mail-notification.schemas.in.h:13
msgid "Mail read command"
msgstr "Komanda za čitanje pošte"
-#: data/mail-notification.schemas.in.h:13
+#: data/mail-notification.schemas.in.h:14
msgid "Mail reader command"
msgstr "Komanda za čitanje pošte"
-#: data/mail-notification.schemas.in.h:14
+#: data/mail-notification.schemas.in.h:15
#, fuzzy
msgid "Mail summary popup contents font"
msgstr "Broj horizontalnih tačaka za prozor sa sažetkom poruka"
-#: data/mail-notification.schemas.in.h:15
+#: data/mail-notification.schemas.in.h:16
msgid "Mail summary popup horizontal offset"
msgstr "Pomeraj horizontalnih tačaka za prozor sa sažetkom poruka"
-#: data/mail-notification.schemas.in.h:16
+#: data/mail-notification.schemas.in.h:17
msgid "Mail summary popup position"
msgstr "Broj horizontalnih tačaka za prozor sa sažetkom poruka"
-#: data/mail-notification.schemas.in.h:17
+#: data/mail-notification.schemas.in.h:18
#, fuzzy
msgid "Mail summary popup title font"
msgstr "Broj horizontalnih tačaka za prozor sa sažetkom poruka"
-#: data/mail-notification.schemas.in.h:18
+#: data/mail-notification.schemas.in.h:19
msgid "Mail summary popup vertical offset"
msgstr "Pomeraj vertikalnih tačaka ѕa prozor sa sažetkom poruka"
-#: data/mail-notification.schemas.in.h:19
+#: data/mail-notification.schemas.in.h:20
msgid "Mailbox list"
msgstr "Spisak sandučića"
-#: data/mail-notification.schemas.in.h:20
+#: data/mail-notification.schemas.in.h:21
msgid "Minutes between mail checks"
msgstr "Minuta između dve provere"
-#: data/mail-notification.schemas.in.h:21
+#: data/mail-notification.schemas.in.h:22
msgid "Minutes to wait before closing the mail summary popup"
msgstr ""
"Broj minuta koji treba da protekne pre zatvaranja prozora sa sažetkom poruka"
-#: data/mail-notification.schemas.in.h:22
+#: data/mail-notification.schemas.in.h:23
msgid "New mail command"
msgstr "Izvrši kada pošta stigne"
-#: data/mail-notification.schemas.in.h:23
+#: data/mail-notification.schemas.in.h:24
msgid "Only display recent mail in mail summary popup"
msgstr "Prikaži samo skoro prispele poruke u sažetku"
-#: data/mail-notification.schemas.in.h:24
+#: data/mail-notification.schemas.in.h:25
msgid "Run a command when all mail is read"
msgstr "Pokreni komandu kada je sva pošta pročitana"
-#: data/mail-notification.schemas.in.h:25
+#: data/mail-notification.schemas.in.h:26
msgid "Run a command when new mail arrives"
msgstr "Pokreni komandu kada stigne nova pošta"
-#: data/mail-notification.schemas.in.h:26
+#: data/mail-notification.schemas.in.h:27
msgid "Seconds between mail checks"
msgstr "Sekundi između dve provere"
-#: data/mail-notification.schemas.in.h:27
+#: data/mail-notification.schemas.in.h:28
msgid "Seconds to wait before closing the mail summary popup"
msgstr "Broj sekundi koji treba da protekne pre zatvaranja sažetka poruka"
-#: data/mail-notification.schemas.in.h:28
+#: data/mail-notification.schemas.in.h:29
msgid "Set a mail reader"
msgstr "Izaberite čitač pošte"
-#: data/mail-notification.schemas.in.h:29
+#: data/mail-notification.schemas.in.h:30
msgid ""
"The action to perform when the icon is double-clicked. Must be \"display-"
"mail-summary\" or \"launch-mail-reader\"."
@@ -166,65 +171,65 @@ msgstr ""
"Postavljanje naredbe koja se izvršava pri dvostrukom kliku na sličicu. "
"Mogući izbori su: „prikaži-sažetak-pošte‟ ili „pokreni-čitač-pošte‟."
-#: data/mail-notification.schemas.in.h:30
+#: data/mail-notification.schemas.in.h:31
msgid ""
"The amount of time to wait before closing the mail summary popup (minutes "
"part)."
msgstr "Pauza pre zatvaranja prozora sa sažetkom poruka (minuti)."
-#: data/mail-notification.schemas.in.h:31
+#: data/mail-notification.schemas.in.h:32
msgid ""
"The amount of time to wait before closing the mail summary popup (seconds "
"part)."
msgstr "Pauza pre zatvaranja prozora sa sažetkom poruka (sekunde)."
-#: data/mail-notification.schemas.in.h:32
+#: data/mail-notification.schemas.in.h:33
msgid "The command to run to launch the mail reader."
msgstr "Komanda kojom se pokreće čitač pošte"
-#: data/mail-notification.schemas.in.h:33
+#: data/mail-notification.schemas.in.h:34
msgid "The command to run when all mail is read."
msgstr "Komanda koju treba pokrenuti kada je sva pošta pročitana."
-#: data/mail-notification.schemas.in.h:34
+#: data/mail-notification.schemas.in.h:35
msgid "The command to run when new mail arrives."
msgstr "Pokreni ovu komandu kada stigne nova pošta."
-#: data/mail-notification.schemas.in.h:35
+#: data/mail-notification.schemas.in.h:36
#, fuzzy
msgid "The custom font to use for the contents of the mail summary popup."
msgstr "Pauza pre zatvaranja prozora sa sažetkom poruka"
-#: data/mail-notification.schemas.in.h:36
+#: data/mail-notification.schemas.in.h:37
#, fuzzy
msgid "The custom font to use for the title of the mail summary popup."
msgstr "Pauza pre zatvaranja prozora sa sažetkom poruka"
-#: data/mail-notification.schemas.in.h:37
+#: data/mail-notification.schemas.in.h:38
msgid "The height of the mail summary dialog in pixels."
msgstr "Visina prozora sa sažetkom poruka izražena u tačkama."
-#: data/mail-notification.schemas.in.h:38
+#: data/mail-notification.schemas.in.h:39
msgid "The height of the properties dialog in pixels."
msgstr "Visina prozora sa postavkama izražena u tačkama."
-#: data/mail-notification.schemas.in.h:39
+#: data/mail-notification.schemas.in.h:40
msgid "The list of mailboxes to monitor."
msgstr "Spisak sandučića koji se prate."
-#: data/mail-notification.schemas.in.h:40
+#: data/mail-notification.schemas.in.h:41
msgid ""
"The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
"certificate."
msgstr ""
"Spisak proverenih SSL/TLS servera (računar:port) koji nemaju X509 sertifikat."
-#: data/mail-notification.schemas.in.h:41
+#: data/mail-notification.schemas.in.h:42
msgid ""
"The list of trusted X509 certificates, represented by their MD5 fingerprint."
msgstr "Spisak proverenih X509 sertifikata, predstavljenih MD5 otiskom."
-#: data/mail-notification.schemas.in.h:42
+#: data/mail-notification.schemas.in.h:43
msgid ""
"The number of pixels to leave between the left or right side of the screen "
"and the mail summary popup."
@@ -232,7 +237,7 @@ msgstr ""
"Broj tačaka koje treba ostaviti između leve, odn. desne strane ekrana i "
"prozora sa sažetkom poruka."
-#: data/mail-notification.schemas.in.h:43
+#: data/mail-notification.schemas.in.h:44
msgid ""
"The number of pixels to leave between the top or bottom side of the screen "
"and the mail summary popup."
@@ -240,7 +245,7 @@ msgstr ""
"Broj tačaka koje treba ostaviti između vrha, odn. dna ekrana i prozora sa "
"sažetkom poruka."
-#: data/mail-notification.schemas.in.h:44
+#: data/mail-notification.schemas.in.h:45
msgid ""
"The position of the mail summary popup. Must be \"top-left\", \"top-right\", "
"\"bottom-left\" or \"bottom-right\"."
@@ -248,71 +253,76 @@ msgstr ""
"Položaj prozora sa sažetkom poruka. Može biti: „gore-levo‟, „gore-desno‟, "
"„dole-levo‟ ili „dole-desno‟."
-#: data/mail-notification.schemas.in.h:45
+#: data/mail-notification.schemas.in.h:46
msgid "The width of the mail summary dialog in pixels."
msgstr "Širina prozora sa sažetkom poruka izražena u tačkama."
-#: data/mail-notification.schemas.in.h:46
+#: data/mail-notification.schemas.in.h:47
msgid "The width of the properties dialog in pixels."
msgstr "Širina prozora sa postavkama izražena u tačkama."
-#: data/mail-notification.schemas.in.h:47
+#: data/mail-notification.schemas.in.h:48
msgid "Trusted servers list"
msgstr "Spisak proverenih servera"
-#: data/mail-notification.schemas.in.h:48
+#: data/mail-notification.schemas.in.h:49
#, fuzzy
msgid "Use a custom font for the contents of the mail summary popup"
msgstr "Broj sekundi koji treba da protekne pre zatvaranja sažetka poruka"
-#: data/mail-notification.schemas.in.h:49
+#: data/mail-notification.schemas.in.h:50
#, fuzzy
msgid "Use a custom font for the title of the mail summary popup"
msgstr "Pauza pre zatvaranja prozora sa sažetkom poruka"
-#: data/mail-notification.schemas.in.h:50
+#: data/mail-notification.schemas.in.h:51
msgid "Whether Mail Notification has already been run or not."
msgstr "Da li je program pokretan pre ili nije."
-#: data/mail-notification.schemas.in.h:51
+#: data/mail-notification.schemas.in.h:52
msgid "Whether the status icon should blink on errors or not."
msgstr "Da li sličica treba da treperi ako dođe do greške ili ne."
-#: data/mail-notification.schemas.in.h:52
+#: data/mail-notification.schemas.in.h:53
msgid "Whether to automatically close the mail summary popup or not."
msgstr ""
"Da li treba ili ne treba automatski zatvoriti prozor sa sažetkom pošte."
-#: data/mail-notification.schemas.in.h:53
+#: data/mail-notification.schemas.in.h:54
+#, fuzzy
+msgid "Whether to display the mail summary in the status icon tooltip or not."
+msgstr "Da li treba prikazati sažetak poruka kada stigne nova pošta."
+
+#: data/mail-notification.schemas.in.h:55
msgid "Whether to display the mail summary popup when new mail arrives or not."
msgstr "Da li treba prikazati sažetak poruka kada stigne nova pošta."
-#: data/mail-notification.schemas.in.h:54
+#: data/mail-notification.schemas.in.h:56
msgid ""
"Whether to hide previously displayed mail in the mail summary popup or not."
msgstr ""
"Da li iz sažetka treba ukloniti poruke koje su se u njemu već pre pojavile."
-#: data/mail-notification.schemas.in.h:55
+#: data/mail-notification.schemas.in.h:57
msgid ""
"Whether to prevent the immediate notification error dialog from being "
"displayed or not."
msgstr "Da li treba ili ne treba sprečiti pojavu prozora sa opisom grešaka."
-#: data/mail-notification.schemas.in.h:56
+#: data/mail-notification.schemas.in.h:58
msgid "Whether to run a command when all mail is read or not."
msgstr ""
"Da li treba ili ne treba pokrenuti neku komandu kada je sva pošta pročitana."
-#: data/mail-notification.schemas.in.h:57
+#: data/mail-notification.schemas.in.h:59
msgid "Whether to run a command when new mail arrives or not."
msgstr "Da li treba pokrenuti neku komandu kada stigne nova pošta."
-#: data/mail-notification.schemas.in.h:58
+#: data/mail-notification.schemas.in.h:60
msgid "Whether to set a mail reader or not."
msgstr "Da li treba postaviti čitač pošte ili ne."
-#: data/mail-notification.schemas.in.h:59
+#: data/mail-notification.schemas.in.h:61
#, fuzzy
msgid ""
"Whether to use a custom font for the contents of the mail summary popup or "
@@ -320,18 +330,18 @@ msgid ""
msgstr ""
"Da li treba ili ne treba automatski zatvoriti prozor sa sažetkom pošte."
-#: data/mail-notification.schemas.in.h:60
+#: data/mail-notification.schemas.in.h:62
#, fuzzy
msgid ""
"Whether to use a custom font for the title of the mail summary popup or not."
msgstr ""
"Da li treba ili ne treba automatski zatvoriti prozor sa sažetkom pošte."
-#: data/mail-notification.schemas.in.h:61
+#: data/mail-notification.schemas.in.h:63
msgid "Width of mail summary dialog"
msgstr "Širina prozora sa sažetkom poruka"
-#: data/mail-notification.schemas.in.h:62
+#: data/mail-notification.schemas.in.h:64
msgid "Width of properties dialog"
msgstr "Širina prozora sa postavkama"
@@ -759,50 +769,50 @@ msgstr "Broj porta na IMAP serveru"
msgid "The mailbox name"
msgstr "Ime sandučeta"
-#: src/mn-imap-mailbox.gob:164 src/mn-pop3-mailbox.gob:142
+#: src/mn-imap-mailbox.gob:165 src/mn-pop3-mailbox.gob:142
msgid "SSL/TLS support has not been compiled in"
msgstr "Podrška za SSL/TLS nije ugrađena"
-#: src/mn-imap-mailbox.gob:253
+#: src/mn-imap-mailbox.gob:244
msgid "server did not send capabilities"
msgstr "server nije obavestio o svojim mogućnostima"
-#: src/mn-imap-mailbox.gob:374
+#: src/mn-imap-mailbox.gob:390
msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
msgstr "server je dojavio LOGINDISABLED, LOGIN prijava neće biti korišćena"
-#: src/mn-imap-mailbox.gob:375
+#: src/mn-imap-mailbox.gob:391
msgid "unable to login"
msgstr "prijava nije moguća"
#. compliance error
-#: src/mn-imap-mailbox.gob:516
+#: src/mn-imap-mailbox.gob:538
msgid "server did not send search results"
msgstr "server nije poslao rezultate pretrage"
#. compliance error
-#: src/mn-imap-mailbox.gob:596
+#: src/mn-imap-mailbox.gob:618
msgid "server did not send all the messages we requested"
msgstr "server nije poslao sve tražene poruke"
-#: src/mn-imap-mailbox.gob:645
+#: src/mn-imap-mailbox.gob:667
msgid "unable to fetch message"
msgstr "nije moguće dobaviti poruku"
#. compliance error
-#: src/mn-imap-mailbox.gob:763
+#: src/mn-imap-mailbox.gob:785
msgid "server did not send status"
msgstr "server nije poslao status"
-#: src/mn-imap-mailbox.gob:1035 src/mn-pop3-mailbox.gob:922
+#: src/mn-imap-mailbox.gob:1057 src/mn-pop3-mailbox.gob:922
msgid "unknown server error"
msgstr "nepoznata greška na serveru"
-#: src/mn-imap-mailbox.gob:1106 src/mn-pop3-mailbox.gob:226
+#: src/mn-imap-mailbox.gob:1147 src/mn-pop3-mailbox.gob:226
msgid "server does not support in-band SSL/TLS"
msgstr "server ne podržava zaštitu putem SSL/TLS"
-#: src/mn-imap-mailbox.gob:1125 src/mn-pop3-mailbox.gob:841
+#: src/mn-imap-mailbox.gob:1168 src/mn-pop3-mailbox.gob:841
msgid ""
"a SASL authentication mechanism was selected but SASL support has not been "
"compiled in"
@@ -810,16 +820,16 @@ msgstr ""
"izabran je mehanizam za prijavu koji koristi SASL ali podrška za SASL nije "
"ugrađena u program"
-#: src/mn-imap-mailbox.gob:1133 src/mn-pop3-mailbox.gob:853
+#: src/mn-imap-mailbox.gob:1176 src/mn-pop3-mailbox.gob:853
#, c-format
msgid "unknown authentication mechanism \"%s\""
msgstr "nepoznat mehanizam za prijavu \"%s\""
-#: src/mn-imap-mailbox.gob:1151
+#: src/mn-imap-mailbox.gob:1194
msgid "falling back to IMAP LOGIN authentication"
msgstr "povratak na IMAP LOGIN prijavu"
-#: src/mn-imap-mailbox.gob:1156 src/mn-pop3-mailbox.gob:888
+#: src/mn-imap-mailbox.gob:1199 src/mn-pop3-mailbox.gob:888
msgid "authentication failed"
msgstr "prijava nije uspela"
@@ -1301,27 +1311,27 @@ msgstr "prelazim na APOP prijavu"
msgid "falling back to USER/PASS authentication"
msgstr "prelazim na prijavu pomoću imena i lozinke"
-#: src/mn-properties.c:191
+#: src/mn-properties.c:193
msgid "top left"
msgstr "gore-levo"
-#: src/mn-properties.c:192
+#: src/mn-properties.c:194
msgid "top right"
msgstr "gore-desno"
-#: src/mn-properties.c:193
+#: src/mn-properties.c:195
msgid "bottom left"
msgstr "dole-levo"
-#: src/mn-properties.c:194
+#: src/mn-properties.c:196
msgid "bottom right"
msgstr "dole-desno"
-#: src/mn-properties.c:284
+#: src/mn-properties.c:287
msgid "No mailbox selected."
msgstr "Nijedno sanduče nije izabrano."
-#: src/mn-properties.c:289
+#: src/mn-properties.c:292
#, c-format
msgid "%i mailbox selected."
msgid_plural "%i mailboxes selected."
@@ -1329,23 +1339,23 @@ msgstr[0] "Izabrano %i sanduče"
msgstr[1] "Izabrana %i sandučeta"
msgstr[2] "Izabrano %i sandučeta"
-#: src/mn-shell.gob:92
+#: src/mn-shell.gob:93
msgid "You have new mail."
msgstr "Imate novu poštu."
-#: src/mn-shell.gob:347
+#: src/mn-shell.gob:360
msgid "Mailboxes Having New Mail"
msgstr "Sandučići sa novom poštom"
-#: src/mn-shell.gob:349
+#: src/mn-shell.gob:362
msgid "Errors"
msgstr "Greške"
-#: src/mn-shell.gob:351
+#: src/mn-shell.gob:364
msgid "Unsupported Mailboxes"
msgstr "Nepodržani sandučići"
-#: src/mn-shell.gob:364 ui/summary-dialog.glade.h:1
+#: src/mn-shell.gob:381 ui/summary-dialog.glade.h:1
msgid "Mail Summary"
msgstr "Sažetak poruka"
@@ -1460,7 +1470,7 @@ msgstr "Došlo je do greške u komandama"
msgid "Unable to execute \"%s\": %s."
msgstr "Nije moguće izvršiti %s: %s"
-#: ui/authentication.glade.h:1 ui/properties.glade.h:2
+#: ui/authentication.glade.h:1
msgid "*"
msgstr "*"
@@ -1476,31 +1486,36 @@ msgstr "_Vrsta sandučeta:"
msgid " "
msgstr " "
-#: ui/properties.glade.h:3
+#: ui/properties.glade.h:2
msgid "<span weight=\"bold\">Commands</span>"
msgstr "<span weight=\"bold\">Naredbe</span>"
-#: ui/properties.glade.h:4
+#: ui/properties.glade.h:3
msgid "<span weight=\"bold\">Double-click Action</span>"
msgstr "<span weight=\"bold\">Naredba za dupli klik</span>"
-#: ui/properties.glade.h:5
+#: ui/properties.glade.h:4
#, fuzzy
msgid "<span weight=\"bold\">Fonts</span>"
msgstr "<span weight=\"bold\">Naredbe</span>"
-#: ui/properties.glade.h:6
+#: ui/properties.glade.h:5
msgid "<span weight=\"bold\">General</span>"
msgstr "<span weight=\"bold\">Opšte</span>"
-#: ui/properties.glade.h:7
+#: ui/properties.glade.h:6
msgid "<span weight=\"bold\">Mailbox List</span>"
msgstr "<span weight=\"bold\">Sandučići</span>"
-#: ui/properties.glade.h:8
+#: ui/properties.glade.h:7
msgid "<span weight=\"bold\">Position</span>"
msgstr "<span weight=\"bold\">Mesto</span>"
+#: ui/properties.glade.h:8
+#, fuzzy
+msgid "Dis_play mail summary in tooltip"
+msgstr "Prikaži prozor sa sažetkom poruka"
+
#: ui/properties.glade.h:9
msgid "General"
msgstr "Opšte"
@@ -1583,33 +1598,39 @@ msgstr ""
"Da li treba ili ne treba automatski zatvoriti prozor sa sažetkom poruka"
#: ui/properties.glade.h:27
-msgid "Whether to display the mail summary popup when new mail arrives or not"
+#, fuzzy
+msgid "Whether to display the mail summary in the status icon tooltip or not"
msgstr ""
"Da li treba ili ne treba prikazivati sažetak poruka kada stigne nova pošta"
#: ui/properties.glade.h:28
+msgid "Whether to display the mail summary popup when new mail arrives or not"
+msgstr ""
+"Da li treba ili ne treba prikazivati sažetak poruka kada stigne nova pošta"
+
+#: ui/properties.glade.h:29
msgid "Whether to hide previously displayed mail or not"
msgstr "Da li treba prikazivati prethodno prikazane poruke ili ne"
-#: ui/properties.glade.h:29
+#: ui/properties.glade.h:30
msgid "Whether to run a command when all mail is read or not"
msgstr "Da li se pokreće ili ne pokreće komanda kada je sva pošta pročitana"
-#: ui/properties.glade.h:30
+#: ui/properties.glade.h:31
msgid "Whether to run a command when new mail arrives or not"
msgstr "Da li se pokreće komanda kada stigne pošta ili ne"
-#: ui/properties.glade.h:31
+#: ui/properties.glade.h:32
msgid "Whether to set a mail reader or not"
msgstr "Da li treba postaviti čitač pošte"
-#: ui/properties.glade.h:32
+#: ui/properties.glade.h:33
msgid ""
"Whether to start Mail Notification when you log into your GNOME session or "
"not"
msgstr "Da li pokrenuti dojavu pošte kada se prijavite na sistem"
-#: ui/properties.glade.h:33
+#: ui/properties.glade.h:34
#, fuzzy
msgid ""
"Whether to use a custom font for the contents of the mail summary popup or "
@@ -1617,66 +1638,66 @@ msgid ""
msgstr ""
"Da li treba ili ne treba automatski zatvoriti prozor sa sažetkom poruka"
-#: ui/properties.glade.h:34
+#: ui/properties.glade.h:35
#, fuzzy
msgid ""
"Whether to use a custom font for the title of the mail summary popup or not"
msgstr ""
"Da li treba ili ne treba automatski zatvoriti prozor sa sažetkom poruka"
-#: ui/properties.glade.h:35
+#: ui/properties.glade.h:36
msgid "_Automatically close after:"
msgstr "_Automatski zatvori posle:"
-#: ui/properties.glade.h:36
+#: ui/properties.glade.h:37
msgid "_Blink on errors"
msgstr "_Treperi pri greškama"
-#: ui/properties.glade.h:37
+#: ui/properties.glade.h:38
msgid "_Contents font:"
msgstr ""
-#: ui/properties.glade.h:38
+#: ui/properties.glade.h:39
msgid "_Delay between mail checks:"
msgstr "_Pauza između provera:"
-#: ui/properties.glade.h:39
+#: ui/properties.glade.h:40
msgid "_Display the mail summary dialog"
msgstr "Prikaži prozor sa sažetkom poruka"
-#: ui/properties.glade.h:40
+#: ui/properties.glade.h:41
msgid "_Enable mail summary popup"
msgstr "Dozvoli prikaz sažetka poruka"
-#: ui/properties.glade.h:41
+#: ui/properties.glade.h:42
msgid "_Launch the mail reader"
msgstr "P_okreni čitač pošte"
-#: ui/properties.glade.h:42
+#: ui/properties.glade.h:43
msgid "_Mail reader:"
msgstr "_Čitač pošte:"
-#: ui/properties.glade.h:43
+#: ui/properties.glade.h:44
msgid "_Start Mail Notification on GNOME login"
msgstr "Pokreni _dojavu pri prijavi"
-#: ui/properties.glade.h:44
+#: ui/properties.glade.h:45
msgid "_Title font:"
msgstr ""
-#: ui/properties.glade.h:45
+#: ui/properties.glade.h:46
msgid "_Vertical offset:"
msgstr "_Vertikalni pomak:"
-#: ui/properties.glade.h:46
+#: ui/properties.glade.h:47
msgid "minutes"
msgstr "minuta"
-#: ui/properties.glade.h:47
+#: ui/properties.glade.h:48
msgid "pixels"
msgstr "tačaka"
-#: ui/properties.glade.h:48
+#: ui/properties.glade.h:49
msgid "seconds"
msgstr "sekundi"
diff --git a/src/Makefile.in b/src/Makefile.in
@@ -40,9 +40,9 @@ bin_PROGRAMS = mail-notification$(EXEEXT)
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
- $(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/sasl2.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/openssl.m4 \
+ $(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -249,6 +249,7 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBBONOBO_IDL = @LIBBONOBO_IDL@
diff --git a/src/mn-about-dialog.c b/src/mn-about-dialog.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:05 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:35 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-auth-combo-box.c b/src/mn-auth-combo-box.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:05 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:35 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-authenticated-mailbox.c b/src/mn-authenticated-mailbox.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:05 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:35 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-autodetect-mailbox-properties.c b/src/mn-autodetect-mailbox-properties.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:05 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:35 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-automation.c b/src/mn-automation.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:05 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:35 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-blinking-image.c b/src/mn-blinking-image.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:05 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:35 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-client-session.c b/src/mn-client-session.c
@@ -1136,6 +1136,14 @@ mn_client_session_sasl_authentication_done (MNClientSession *session)
return TRUE;
}
+
+int
+mn_client_session_sasl_get_ssf (MNClientSession *session)
+{
+ g_return_val_if_fail(session != NULL, FALSE);
+
+ return session->sasl_ssf;
+}
#endif /* WITH_SASL */
void
diff --git a/src/mn-client-session.h b/src/mn-client-session.h
@@ -103,6 +103,7 @@ gboolean mn_client_session_sasl_authentication_start (MNClientSession *session,
int mn_client_session_sasl_authentication_step (MNClientSession *session,
const char *input);
gboolean mn_client_session_sasl_authentication_done (MNClientSession *session);
+int mn_client_session_sasl_get_ssf (MNClientSession *session);
#endif /* WITH_SASL */
void mn_client_session_notice (MNClientSession *session,
diff --git a/src/mn-conf.h b/src/mn-conf.h
@@ -139,6 +139,8 @@
MN_CONF_MAIL_SUMMARY_POPUP_FONTS_CONTENTS_NAMESPACE "/font"
#define MN_CONF_DOUBLE_CLICK_ACTION \
MN_CONF_NAMESPACE "/double-click-action"
+#define MN_CONF_SUMMARY_TOOLTIP \
+ MN_CONF_NAMESPACE "/summary-tooltip"
void mn_conf_init (void);
void mn_conf_unset_obsolete (void);
diff --git a/src/mn-gmail-mailbox-properties.c b/src/mn-gmail-mailbox-properties.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:05 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:35 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-gmail-mailbox.c b/src/mn-gmail-mailbox.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:05 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:35 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-gmime-stream-vfs.c b/src/mn-gmime-stream-vfs.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:05 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:35 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-imap-mailbox-private.h b/src/mn-imap-mailbox-private.h
@@ -16,11 +16,11 @@ extern "C" {
#line 18 "mn-imap-mailbox-private.h"
struct _MNIMAPMailboxPrivate {
-#line 143 "mn-imap-mailbox.gob"
+#line 144 "mn-imap-mailbox.gob"
int removed;
-#line 145 "mn-imap-mailbox.gob"
- MNClientSessionPrivate * idle_session;
#line 146 "mn-imap-mailbox.gob"
+ MNClientSessionPrivate * idle_session;
+#line 147 "mn-imap-mailbox.gob"
GMutex * idle_session_mutex;
#line 26 "mn-imap-mailbox-private.h"
};
diff --git a/src/mn-imap-mailbox-properties.c b/src/mn-imap-mailbox-properties.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:05 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:35 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-imap-mailbox.c b/src/mn-imap-mailbox.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:05 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:35 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
@@ -93,6 +93,7 @@
char **capabilities;
GSList *auth_mechanisms;
+ gboolean authenticated;
gboolean authentication_failed;
gboolean search_received;
@@ -126,7 +127,7 @@
char *arguments;
};
-#line 130 "mn-imap-mailbox.c"
+#line 131 "mn-imap-mailbox.c"
/* self casting macros */
#define SELF(x) MN_IMAP_MAILBOX(x)
#define SELF_CONST(x) MN_IMAP_MAILBOX_CONST(x)
@@ -176,6 +177,7 @@ static void mn_imap_mailbox_pre_read_cb (MNClientSession * session, MNClientSess
static void mn_imap_mailbox_post_read_cb (MNClientSession * session, MNClientSessionPrivate * priv) G_GNUC_UNUSED;
static void mn_imap_mailbox_session_set_error_from_arguments (MNClientSessionPrivate * priv, MNClientSessionResponse * response) G_GNUC_UNUSED;
static int mn_imap_mailbox_session_write (MNClientSessionPrivate * priv, const char * format, ...) G_GNUC_UNUSED;
+static void mn_imap_mailbox_handle_capability_code (MNClientSessionPrivate * priv, MNClientSessionResponse * response) G_GNUC_UNUSED;
static void mn_imap_mailbox_session_parse_capabilities (MNClientSessionPrivate * priv, const char * capabilities) G_GNUC_UNUSED;
static gboolean mn_imap_mailbox_session_has_capability (MNClientSessionPrivate * priv, const char * capability) G_GNUC_UNUSED;
static int mn_imap_mailbox_session_after_capability (MNClientSessionPrivate * priv) G_GNUC_UNUSED;
@@ -217,6 +219,7 @@ static MNAuthenticatedMailboxClass *parent_class = NULL;
#define self_post_read_cb mn_imap_mailbox_post_read_cb
#define self_session_set_error_from_arguments mn_imap_mailbox_session_set_error_from_arguments
#define self_session_write mn_imap_mailbox_session_write
+#define self_handle_capability_code mn_imap_mailbox_handle_capability_code
#define self_session_parse_capabilities mn_imap_mailbox_session_parse_capabilities
#define self_session_has_capability mn_imap_mailbox_session_has_capability
#define self_session_after_capability mn_imap_mailbox_session_after_capability
@@ -275,9 +278,9 @@ ___finalize(GObject *obj_self)
gpointer priv G_GNUC_UNUSED = self->_priv;
if(G_OBJECT_CLASS(parent_class)->finalize) \
(* G_OBJECT_CLASS(parent_class)->finalize)(obj_self);
-#line 146 "mn-imap-mailbox.gob"
+#line 147 "mn-imap-mailbox.gob"
if(self->_priv->idle_session_mutex) { g_mutex_free ((gpointer) self->_priv->idle_session_mutex); self->_priv->idle_session_mutex = NULL; }
-#line 281 "mn-imap-mailbox.c"
+#line 284 "mn-imap-mailbox.c"
}
#undef __GOB_FUNCTION__
@@ -286,15 +289,15 @@ mn_imap_mailbox_init (MNIMAPMailbox * o G_GNUC_UNUSED)
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::init"
o->_priv = G_TYPE_INSTANCE_GET_PRIVATE(o,TYPE_SELF,MNIMAPMailboxPrivate);
-#line 146 "mn-imap-mailbox.gob"
+#line 147 "mn-imap-mailbox.gob"
o->_priv->idle_session_mutex = g_mutex_new();
-#line 292 "mn-imap-mailbox.c"
+#line 295 "mn-imap-mailbox.c"
}
#undef __GOB_FUNCTION__
-#line 148 "mn-imap-mailbox.gob"
+#line 149 "mn-imap-mailbox.gob"
static void
mn_imap_mailbox_class_init (MNIMAPMailboxClass * class G_GNUC_UNUSED)
-#line 298 "mn-imap-mailbox.c"
+#line 301 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::class_init"
GObjectClass *g_object_class G_GNUC_UNUSED = (GObjectClass*) class;
@@ -305,32 +308,32 @@ mn_imap_mailbox_class_init (MNIMAPMailboxClass * class G_GNUC_UNUSED)
parent_class = g_type_class_ref (MN_TYPE_AUTHENTICATED_MAILBOX);
-#line 153 "mn-imap-mailbox.gob"
+#line 154 "mn-imap-mailbox.gob"
g_object_class->constructor = ___2_mn_imap_mailbox_constructor;
-#line 170 "mn-imap-mailbox.gob"
+#line 171 "mn-imap-mailbox.gob"
mn_mailbox_class->impl_is = ___3_mn_imap_mailbox_impl_is;
-#line 176 "mn-imap-mailbox.gob"
+#line 177 "mn-imap-mailbox.gob"
mn_mailbox_class->removed = ___4_mn_imap_mailbox_removed;
-#line 823 "mn-imap-mailbox.gob"
+#line 845 "mn-imap-mailbox.gob"
mn_authenticated_mailbox_class->impl_authenticated_check = ___1a_mn_imap_mailbox_impl_authenticated_check;
-#line 317 "mn-imap-mailbox.c"
+#line 320 "mn-imap-mailbox.c"
g_object_class->finalize = ___finalize;
{
-#line 149 "mn-imap-mailbox.gob"
+#line 150 "mn-imap-mailbox.gob"
MN_MAILBOX_CLASS(class)->format = "IMAP";
-#line 324 "mn-imap-mailbox.c"
+#line 327 "mn-imap-mailbox.c"
}
}
#undef __GOB_FUNCTION__
-#line 153 "mn-imap-mailbox.gob"
+#line 154 "mn-imap-mailbox.gob"
static GObject *
___2_mn_imap_mailbox_constructor (GType type G_GNUC_UNUSED, guint n_construct_properties, GObjectConstructParam * construct_params)
-#line 334 "mn-imap-mailbox.c"
+#line 337 "mn-imap-mailbox.c"
#define PARENT_HANDLER(___type,___n_construct_properties,___construct_params) \
((G_OBJECT_CLASS(parent_class)->constructor)? \
(* G_OBJECT_CLASS(parent_class)->constructor)(___type,___n_construct_properties,___construct_params): \
@@ -338,7 +341,7 @@ ___2_mn_imap_mailbox_constructor (GType type G_GNUC_UNUSED, guint n_construct_pr
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::constructor"
{
-#line 155 "mn-imap-mailbox.gob"
+#line 156 "mn-imap-mailbox.gob"
GObject *object;
MNMailbox *mailbox;
@@ -353,50 +356,50 @@ ___2_mn_imap_mailbox_constructor (GType type G_GNUC_UNUSED, guint n_construct_pr
return object;
}}
-#line 357 "mn-imap-mailbox.c"
+#line 360 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 170 "mn-imap-mailbox.gob"
+#line 171 "mn-imap-mailbox.gob"
static gboolean
___3_mn_imap_mailbox_impl_is (MNMailbox * dummy G_GNUC_UNUSED, MNURI * uri)
-#line 364 "mn-imap-mailbox.c"
+#line 367 "mn-imap-mailbox.c"
#define PARENT_HANDLER(___dummy,___uri) \
((MN_MAILBOX_CLASS(parent_class)->impl_is)? \
(* MN_MAILBOX_CLASS(parent_class)->impl_is)(___dummy,___uri): \
((gboolean )0))
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::impl_is"
-#line 170 "mn-imap-mailbox.gob"
+#line 171 "mn-imap-mailbox.gob"
g_return_val_if_fail (uri != NULL, (gboolean )0);
-#line 170 "mn-imap-mailbox.gob"
+#line 171 "mn-imap-mailbox.gob"
g_return_val_if_fail (MN_IS_URI (uri), (gboolean )0);
-#line 375 "mn-imap-mailbox.c"
+#line 378 "mn-imap-mailbox.c"
{
-#line 172 "mn-imap-mailbox.gob"
+#line 173 "mn-imap-mailbox.gob"
return MN_URI_IS_IMAP(uri);
}}
-#line 381 "mn-imap-mailbox.c"
+#line 384 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 176 "mn-imap-mailbox.gob"
+#line 177 "mn-imap-mailbox.gob"
static void
___4_mn_imap_mailbox_removed (MNMailbox * mailbox G_GNUC_UNUSED)
-#line 388 "mn-imap-mailbox.c"
+#line 391 "mn-imap-mailbox.c"
#define PARENT_HANDLER(___mailbox) \
{ if(MN_MAILBOX_CLASS(parent_class)->removed) \
(* MN_MAILBOX_CLASS(parent_class)->removed)(___mailbox); }
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::removed"
-#line 176 "mn-imap-mailbox.gob"
+#line 177 "mn-imap-mailbox.gob"
g_return_if_fail (mailbox != NULL);
-#line 176 "mn-imap-mailbox.gob"
+#line 177 "mn-imap-mailbox.gob"
g_return_if_fail (MN_IS_MAILBOX (mailbox));
-#line 398 "mn-imap-mailbox.c"
+#line 401 "mn-imap-mailbox.c"
{
-#line 178 "mn-imap-mailbox.gob"
+#line 179 "mn-imap-mailbox.gob"
Self *self = SELF(mailbox);
@@ -412,25 +415,25 @@ ___4_mn_imap_mailbox_removed (MNMailbox * mailbox G_GNUC_UNUSED)
PARENT_HANDLER(mailbox);
}}
-#line 416 "mn-imap-mailbox.c"
+#line 419 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 194 "mn-imap-mailbox.gob"
+#line 195 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_greeting_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 423 "mn-imap-mailbox.c"
+#line 426 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_greeting_cb"
-#line 194 "mn-imap-mailbox.gob"
+#line 195 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 194 "mn-imap-mailbox.gob"
+#line 195 "mn-imap-mailbox.gob"
g_return_val_if_fail (response != NULL, (int )0);
-#line 194 "mn-imap-mailbox.gob"
+#line 195 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 432 "mn-imap-mailbox.c"
+#line 435 "mn-imap-mailbox.c"
{
-#line 198 "mn-imap-mailbox.gob"
+#line 199 "mn-imap-mailbox.gob"
priv->session = session;
@@ -438,68 +441,58 @@ mn_imap_mailbox_handle_greeting_cb (MNClientSession * session, MNClientSessionRe
return MN_CLIENT_SESSION_RESULT_BAD_RESPONSE_FOR_CONTEXT;
else if (! response->tag && IS_OK(response))
{
- if (response->code)
- {
- if (! strcmp(response->code, "CAPABILITY"))
- self_session_parse_capabilities(priv, NULL);
- else if (g_str_has_prefix(response->code, "CAPABILITY "))
- self_session_parse_capabilities(priv, response->code + 11);
- }
-
+ self_handle_capability_code(priv, response);
return priv->capabilities
? self_session_after_capability(priv)
: STATE_CAPABILITY;
}
else if (! response->tag && IS(response, "PREAUTH"))
- return self_session_check_mail(priv);
+ {
+ self_handle_capability_code(priv, response);
+ return self_session_check_mail(priv);
+ }
else if (! response->tag && IS_BYE(response))
return RESULT_ERROR_END;
else
return MN_CLIENT_SESSION_RESULT_BAD_RESPONSE_FOR_CONTEXT;
}}
-#line 461 "mn-imap-mailbox.c"
+#line 460 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 225 "mn-imap-mailbox.gob"
+#line 222 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_enter_capability_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 467 "mn-imap-mailbox.c"
+#line 466 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::enter_capability_cb"
-#line 225 "mn-imap-mailbox.gob"
+#line 222 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 225 "mn-imap-mailbox.gob"
+#line 222 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 474 "mn-imap-mailbox.c"
+#line 473 "mn-imap-mailbox.c"
{
-#line 228 "mn-imap-mailbox.gob"
+#line 225 "mn-imap-mailbox.gob"
- g_strfreev(priv->capabilities);
- priv->capabilities = NULL;
-
- eel_g_slist_free_deep(priv->auth_mechanisms);
- priv->auth_mechanisms = NULL;
-
return self_session_write(priv, "CAPABILITY");
}}
-#line 486 "mn-imap-mailbox.c"
+#line 479 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 238 "mn-imap-mailbox.gob"
+#line 229 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_capability_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 492 "mn-imap-mailbox.c"
+#line 485 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_capability_cb"
-#line 238 "mn-imap-mailbox.gob"
+#line 229 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 238 "mn-imap-mailbox.gob"
+#line 229 "mn-imap-mailbox.gob"
g_return_val_if_fail (response != NULL, (int )0);
-#line 238 "mn-imap-mailbox.gob"
+#line 229 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 501 "mn-imap-mailbox.c"
+#line 494 "mn-imap-mailbox.c"
{
-#line 242 "mn-imap-mailbox.gob"
+#line 233 "mn-imap-mailbox.gob"
if (response->continuation)
return MN_CLIENT_SESSION_RESULT_BAD_RESPONSE_FOR_CONTEXT;
@@ -527,22 +520,22 @@ mn_imap_mailbox_handle_capability_cb (MNClientSession * session, MNClientSession
return RESULT_DEFAULT_HANDLER;
}}
-#line 531 "mn-imap-mailbox.c"
+#line 524 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 270 "mn-imap-mailbox.gob"
+#line 261 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_enter_starttls_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 537 "mn-imap-mailbox.c"
+#line 530 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::enter_starttls_cb"
-#line 270 "mn-imap-mailbox.gob"
+#line 261 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 270 "mn-imap-mailbox.gob"
+#line 261 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 544 "mn-imap-mailbox.c"
+#line 537 "mn-imap-mailbox.c"
{
-#line 273 "mn-imap-mailbox.gob"
+#line 264 "mn-imap-mailbox.gob"
#ifdef WITH_SSL
return self_session_write(priv, "STARTTLS");
@@ -550,24 +543,24 @@ mn_imap_mailbox_enter_starttls_cb (MNClientSession * session, MNClientSessionPri
g_return_val_if_reached(0);
#endif /* WITH_SSL */
}}
-#line 554 "mn-imap-mailbox.c"
+#line 547 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 281 "mn-imap-mailbox.gob"
+#line 272 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_starttls_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 560 "mn-imap-mailbox.c"
+#line 553 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_starttls_cb"
-#line 281 "mn-imap-mailbox.gob"
+#line 272 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 281 "mn-imap-mailbox.gob"
+#line 272 "mn-imap-mailbox.gob"
g_return_val_if_fail (response != NULL, (int )0);
-#line 281 "mn-imap-mailbox.gob"
+#line 272 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 569 "mn-imap-mailbox.c"
+#line 562 "mn-imap-mailbox.c"
{
-#line 285 "mn-imap-mailbox.gob"
+#line 276 "mn-imap-mailbox.gob"
#ifdef WITH_SSL
if (response->continuation)
@@ -595,22 +588,22 @@ mn_imap_mailbox_handle_starttls_cb (MNClientSession * session, MNClientSessionRe
g_return_val_if_reached(0);
#endif /* WITH_SSL */
}}
-#line 599 "mn-imap-mailbox.c"
+#line 592 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 313 "mn-imap-mailbox.gob"
+#line 304 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_enter_authenticate_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 605 "mn-imap-mailbox.c"
+#line 598 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::enter_authenticate_cb"
-#line 313 "mn-imap-mailbox.gob"
+#line 304 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 313 "mn-imap-mailbox.gob"
+#line 304 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 612 "mn-imap-mailbox.c"
+#line 605 "mn-imap-mailbox.c"
{
-#line 316 "mn-imap-mailbox.gob"
+#line 307 "mn-imap-mailbox.gob"
#ifdef WITH_SASL
/*
@@ -631,24 +624,24 @@ mn_imap_mailbox_enter_authenticate_cb (MNClientSession * session, MNClientSessio
g_return_val_if_reached(0);
#endif /* WITH_SASL */
}}
-#line 635 "mn-imap-mailbox.c"
+#line 628 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 337 "mn-imap-mailbox.gob"
+#line 328 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_authenticate_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 641 "mn-imap-mailbox.c"
+#line 634 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_authenticate_cb"
-#line 337 "mn-imap-mailbox.gob"
+#line 328 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 337 "mn-imap-mailbox.gob"
+#line 328 "mn-imap-mailbox.gob"
g_return_val_if_fail (response != NULL, (int )0);
-#line 337 "mn-imap-mailbox.gob"
+#line 328 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 650 "mn-imap-mailbox.c"
+#line 643 "mn-imap-mailbox.c"
{
-#line 341 "mn-imap-mailbox.gob"
+#line 332 "mn-imap-mailbox.gob"
#ifdef WITH_SASL
if (response->tag)
@@ -657,9 +650,34 @@ mn_imap_mailbox_handle_authenticate_cb (MNClientSession * session, MNClientSessi
{
if (IS_OK(response))
{
- return mn_client_session_sasl_authentication_done(session)
- ? self_session_check_mail(priv)
- : MN_CLIENT_SESSION_RESULT_END;
+ if (mn_client_session_sasl_authentication_done(session))
+ {
+ priv->authenticated = TRUE;
+ self_handle_capability_code(priv, response);
+
+ /*
+ * RFC 3501 2.2.2:
+ *
+ * A server MAY include a CAPABILITY response code
+ * in the tagged OK response of a successful
+ * AUTHENTICATE command in order to send
+ * capabilities automatically. It is unnecessary
+ * for a client to send a separate CAPABILITY
+ * command if it recognizes these automatic
+ * capabilities. This should only be done if a
+ * security layer was not negotiated by the
+ * AUTHENTICATE command, because the tagged OK
+ * response as part of an AUTHENTICATE command is
+ * not protected by encryption/integrity checking.
+ * [SASL] requires the client to re-issue a
+ * CAPABILITY command in this case.
+ */
+ return priv->capabilities && mn_client_session_sasl_get_ssf(session)
+ ? self_session_check_mail(priv)
+ : STATE_CAPABILITY;
+ }
+ else
+ return MN_CLIENT_SESSION_RESULT_END;
}
else if (IS_NO(response) || IS_BAD(response))
return self_session_authenticate_fallback(priv);
@@ -675,22 +693,22 @@ mn_imap_mailbox_handle_authenticate_cb (MNClientSession * session, MNClientSessi
g_return_val_if_reached(0);
#endif /* WITH_SASL */
}}
-#line 679 "mn-imap-mailbox.c"
+#line 697 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 368 "mn-imap-mailbox.gob"
+#line 384 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_enter_login_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 685 "mn-imap-mailbox.c"
+#line 703 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::enter_login_cb"
-#line 368 "mn-imap-mailbox.gob"
+#line 384 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 368 "mn-imap-mailbox.gob"
+#line 384 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 692 "mn-imap-mailbox.c"
+#line 710 "mn-imap-mailbox.c"
{
-#line 371 "mn-imap-mailbox.gob"
+#line 387 "mn-imap-mailbox.gob"
if (self_session_has_capability(priv, "LOGINDISABLED"))
{
@@ -713,24 +731,24 @@ mn_imap_mailbox_enter_login_cb (MNClientSession * session, MNClientSessionPrivat
return result;
}
}}
-#line 717 "mn-imap-mailbox.c"
+#line 735 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 394 "mn-imap-mailbox.gob"
+#line 410 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_login_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 723 "mn-imap-mailbox.c"
+#line 741 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_login_cb"
-#line 394 "mn-imap-mailbox.gob"
+#line 410 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 394 "mn-imap-mailbox.gob"
+#line 410 "mn-imap-mailbox.gob"
g_return_val_if_fail (response != NULL, (int )0);
-#line 394 "mn-imap-mailbox.gob"
+#line 410 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 732 "mn-imap-mailbox.c"
+#line 750 "mn-imap-mailbox.c"
{
-#line 398 "mn-imap-mailbox.gob"
+#line 414 "mn-imap-mailbox.gob"
if (response->continuation)
return MN_CLIENT_SESSION_RESULT_BAD_RESPONSE_FOR_CONTEXT;
@@ -739,7 +757,13 @@ mn_imap_mailbox_handle_login_cb (MNClientSession * session, MNClientSessionRespo
if (HAS_CURRENT_TAG(response, priv))
{
if (IS_OK(response))
- return self_session_check_mail(priv);
+ {
+ priv->authenticated = TRUE;
+ self_handle_capability_code(priv, response);
+ return priv->capabilities
+ ? STATE_CAPABILITY
+ : self_session_check_mail(priv);
+ }
else if (IS_NO(response) || IS_BAD(response))
{
priv->authentication_failed = TRUE;
@@ -752,22 +776,22 @@ mn_imap_mailbox_handle_login_cb (MNClientSession * session, MNClientSessionRespo
return RESULT_DEFAULT_HANDLER;
}}
-#line 756 "mn-imap-mailbox.c"
+#line 780 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 420 "mn-imap-mailbox.gob"
+#line 442 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_enter_examine_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 762 "mn-imap-mailbox.c"
+#line 786 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::enter_examine_cb"
-#line 420 "mn-imap-mailbox.gob"
+#line 442 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 420 "mn-imap-mailbox.gob"
+#line 442 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 769 "mn-imap-mailbox.c"
+#line 793 "mn-imap-mailbox.c"
{
-#line 423 "mn-imap-mailbox.gob"
+#line 445 "mn-imap-mailbox.gob"
char *quoted_mailbox;
int result;
@@ -778,24 +802,24 @@ mn_imap_mailbox_enter_examine_cb (MNClientSession * session, MNClientSessionPriv
return result;
}}
-#line 782 "mn-imap-mailbox.c"
+#line 806 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 434 "mn-imap-mailbox.gob"
+#line 456 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_examine_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 788 "mn-imap-mailbox.c"
+#line 812 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_examine_cb"
-#line 434 "mn-imap-mailbox.gob"
+#line 456 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 434 "mn-imap-mailbox.gob"
+#line 456 "mn-imap-mailbox.gob"
g_return_val_if_fail (response != NULL, (int )0);
-#line 434 "mn-imap-mailbox.gob"
+#line 456 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 797 "mn-imap-mailbox.c"
+#line 821 "mn-imap-mailbox.c"
{
-#line 438 "mn-imap-mailbox.gob"
+#line 460 "mn-imap-mailbox.gob"
if (response->continuation)
return MN_CLIENT_SESSION_RESULT_BAD_RESPONSE_FOR_CONTEXT;
@@ -814,22 +838,22 @@ mn_imap_mailbox_handle_examine_cb (MNClientSession * session, MNClientSessionRes
return RESULT_DEFAULT_HANDLER;
}}
-#line 818 "mn-imap-mailbox.c"
+#line 842 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 457 "mn-imap-mailbox.gob"
+#line 479 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_enter_search_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 824 "mn-imap-mailbox.c"
+#line 848 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::enter_search_cb"
-#line 457 "mn-imap-mailbox.gob"
+#line 479 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 457 "mn-imap-mailbox.gob"
+#line 479 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 831 "mn-imap-mailbox.c"
+#line 855 "mn-imap-mailbox.c"
{
-#line 460 "mn-imap-mailbox.gob"
+#line 482 "mn-imap-mailbox.gob"
priv->search_received = FALSE;
@@ -841,24 +865,24 @@ mn_imap_mailbox_enter_search_cb (MNClientSession * session, MNClientSessionPriva
return self_session_write(priv, "SEARCH UNSEEN");
}}
-#line 845 "mn-imap-mailbox.c"
+#line 869 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 472 "mn-imap-mailbox.gob"
+#line 494 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_search_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 851 "mn-imap-mailbox.c"
+#line 875 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_search_cb"
-#line 472 "mn-imap-mailbox.gob"
+#line 494 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 472 "mn-imap-mailbox.gob"
+#line 494 "mn-imap-mailbox.gob"
g_return_val_if_fail (response != NULL, (int )0);
-#line 472 "mn-imap-mailbox.gob"
+#line 494 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 860 "mn-imap-mailbox.c"
+#line 884 "mn-imap-mailbox.c"
{
-#line 476 "mn-imap-mailbox.gob"
+#line 498 "mn-imap-mailbox.gob"
if (response->continuation)
return MN_CLIENT_SESSION_RESULT_BAD_RESPONSE_FOR_CONTEXT;
@@ -940,22 +964,22 @@ mn_imap_mailbox_handle_search_cb (MNClientSession * session, MNClientSessionResp
return RESULT_DEFAULT_HANDLER;
}}
-#line 944 "mn-imap-mailbox.c"
+#line 968 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 558 "mn-imap-mailbox.gob"
+#line 580 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_enter_fetch_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 950 "mn-imap-mailbox.c"
+#line 974 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::enter_fetch_cb"
-#line 558 "mn-imap-mailbox.gob"
+#line 580 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 558 "mn-imap-mailbox.gob"
+#line 580 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 957 "mn-imap-mailbox.c"
+#line 981 "mn-imap-mailbox.c"
{
-#line 561 "mn-imap-mailbox.gob"
+#line 583 "mn-imap-mailbox.gob"
#ifdef WITH_MIME
g_return_val_if_fail(priv->fetch_set != NULL, 0);
@@ -971,24 +995,24 @@ mn_imap_mailbox_enter_fetch_cb (MNClientSession * session, MNClientSessionPrivat
g_return_val_if_reached(0);
#endif
}}
-#line 975 "mn-imap-mailbox.c"
+#line 999 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 577 "mn-imap-mailbox.gob"
+#line 599 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_fetch_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 981 "mn-imap-mailbox.c"
+#line 1005 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_fetch_cb"
-#line 577 "mn-imap-mailbox.gob"
+#line 599 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 577 "mn-imap-mailbox.gob"
+#line 599 "mn-imap-mailbox.gob"
g_return_val_if_fail (response != NULL, (int )0);
-#line 577 "mn-imap-mailbox.gob"
+#line 599 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 990 "mn-imap-mailbox.c"
+#line 1014 "mn-imap-mailbox.c"
{
-#line 581 "mn-imap-mailbox.gob"
+#line 603 "mn-imap-mailbox.gob"
#ifdef WITH_MIME
if (response->continuation)
@@ -1064,44 +1088,44 @@ mn_imap_mailbox_handle_fetch_cb (MNClientSession * session, MNClientSessionRespo
g_return_val_if_reached(0);
#endif
}}
-#line 1068 "mn-imap-mailbox.c"
+#line 1092 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 657 "mn-imap-mailbox.gob"
+#line 679 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_enter_idle_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 1074 "mn-imap-mailbox.c"
+#line 1098 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::enter_idle_cb"
-#line 657 "mn-imap-mailbox.gob"
+#line 679 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 657 "mn-imap-mailbox.gob"
+#line 679 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 1081 "mn-imap-mailbox.c"
+#line 1105 "mn-imap-mailbox.c"
{
-#line 660 "mn-imap-mailbox.gob"
+#line 682 "mn-imap-mailbox.gob"
priv->idle_state = IDLE_STATE_NORMAL;
return REMOVED(priv->self) ? STATE_LOGOUT : self_session_write(priv, "IDLE");
}}
-#line 1088 "mn-imap-mailbox.c"
+#line 1112 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 665 "mn-imap-mailbox.gob"
+#line 687 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_idle_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 1094 "mn-imap-mailbox.c"
+#line 1118 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_idle_cb"
-#line 665 "mn-imap-mailbox.gob"
+#line 687 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 665 "mn-imap-mailbox.gob"
+#line 687 "mn-imap-mailbox.gob"
g_return_val_if_fail (response != NULL, (int )0);
-#line 665 "mn-imap-mailbox.gob"
+#line 687 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 1103 "mn-imap-mailbox.c"
+#line 1127 "mn-imap-mailbox.c"
{
-#line 669 "mn-imap-mailbox.gob"
+#line 691 "mn-imap-mailbox.gob"
if (priv->idle_state == IDLE_STATE_IDLING)
{
@@ -1160,22 +1184,22 @@ mn_imap_mailbox_handle_idle_cb (MNClientSession * session, MNClientSessionRespon
return RESULT_DEFAULT_HANDLER;
}}
-#line 1164 "mn-imap-mailbox.c"
+#line 1188 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 728 "mn-imap-mailbox.gob"
+#line 750 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_enter_status_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 1170 "mn-imap-mailbox.c"
+#line 1194 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::enter_status_cb"
-#line 728 "mn-imap-mailbox.gob"
+#line 750 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 728 "mn-imap-mailbox.gob"
+#line 750 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 1177 "mn-imap-mailbox.c"
+#line 1201 "mn-imap-mailbox.c"
{
-#line 731 "mn-imap-mailbox.gob"
+#line 753 "mn-imap-mailbox.gob"
#ifndef WITH_MIME
char *quoted_mailbox;
@@ -1190,24 +1214,24 @@ mn_imap_mailbox_enter_status_cb (MNClientSession * session, MNClientSessionPriva
g_return_val_if_reached(0);
#endif
}}
-#line 1194 "mn-imap-mailbox.c"
+#line 1218 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 746 "mn-imap-mailbox.gob"
+#line 768 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_status_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 1200 "mn-imap-mailbox.c"
+#line 1224 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_status_cb"
-#line 746 "mn-imap-mailbox.gob"
+#line 768 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 746 "mn-imap-mailbox.gob"
+#line 768 "mn-imap-mailbox.gob"
g_return_val_if_fail (response != NULL, (int )0);
-#line 746 "mn-imap-mailbox.gob"
+#line 768 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 1209 "mn-imap-mailbox.c"
+#line 1233 "mn-imap-mailbox.c"
{
-#line 750 "mn-imap-mailbox.gob"
+#line 772 "mn-imap-mailbox.gob"
#ifndef WITH_MIME
if (response->continuation)
@@ -1253,43 +1277,43 @@ mn_imap_mailbox_handle_status_cb (MNClientSession * session, MNClientSessionResp
g_return_val_if_reached(0);
#endif
}}
-#line 1257 "mn-imap-mailbox.c"
+#line 1281 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 796 "mn-imap-mailbox.gob"
+#line 818 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_enter_logout_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 1263 "mn-imap-mailbox.c"
+#line 1287 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::enter_logout_cb"
-#line 796 "mn-imap-mailbox.gob"
+#line 818 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 796 "mn-imap-mailbox.gob"
+#line 818 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 1270 "mn-imap-mailbox.c"
+#line 1294 "mn-imap-mailbox.c"
{
-#line 799 "mn-imap-mailbox.gob"
+#line 821 "mn-imap-mailbox.gob"
return self_session_write(priv, "LOGOUT");
}}
-#line 1276 "mn-imap-mailbox.c"
+#line 1300 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 803 "mn-imap-mailbox.gob"
+#line 825 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_handle_logout_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 1282 "mn-imap-mailbox.c"
+#line 1306 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_logout_cb"
-#line 803 "mn-imap-mailbox.gob"
+#line 825 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 803 "mn-imap-mailbox.gob"
+#line 825 "mn-imap-mailbox.gob"
g_return_val_if_fail (response != NULL, (int )0);
-#line 803 "mn-imap-mailbox.gob"
+#line 825 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 1291 "mn-imap-mailbox.c"
+#line 1315 "mn-imap-mailbox.c"
{
-#line 807 "mn-imap-mailbox.gob"
+#line 829 "mn-imap-mailbox.gob"
if (response->continuation)
return MN_CLIENT_SESSION_RESULT_BAD_RESPONSE_FOR_CONTEXT;
@@ -1305,26 +1329,26 @@ mn_imap_mailbox_handle_logout_cb (MNClientSession * session, MNClientSessionResp
else
return MN_CLIENT_SESSION_RESULT_CONTINUE;
}}
-#line 1309 "mn-imap-mailbox.c"
+#line 1333 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 823 "mn-imap-mailbox.gob"
+#line 845 "mn-imap-mailbox.gob"
static MNAuthenticatedMailboxResult
___1a_mn_imap_mailbox_impl_authenticated_check (MNAuthenticatedMailbox * authenticated_mailbox G_GNUC_UNUSED, GError ** err)
-#line 1315 "mn-imap-mailbox.c"
+#line 1339 "mn-imap-mailbox.c"
#define PARENT_HANDLER(___authenticated_mailbox,___err) \
((MN_AUTHENTICATED_MAILBOX_CLASS(parent_class)->impl_authenticated_check)? \
(* MN_AUTHENTICATED_MAILBOX_CLASS(parent_class)->impl_authenticated_check)(___authenticated_mailbox,___err): \
((MNAuthenticatedMailboxResult )0))
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::impl_authenticated_check"
-#line 823 "mn-imap-mailbox.gob"
+#line 845 "mn-imap-mailbox.gob"
g_return_val_if_fail (authenticated_mailbox != NULL, (MNAuthenticatedMailboxResult )0);
-#line 823 "mn-imap-mailbox.gob"
+#line 845 "mn-imap-mailbox.gob"
g_return_val_if_fail (MN_IS_AUTHENTICATED_MAILBOX (authenticated_mailbox), (MNAuthenticatedMailboxResult )0);
-#line 1326 "mn-imap-mailbox.c"
+#line 1350 "mn-imap-mailbox.c"
{
-#line 826 "mn-imap-mailbox.gob"
+#line 848 "mn-imap-mailbox.gob"
MNMailbox *mailbox = MN_MAILBOX(authenticated_mailbox);
Self *self = SELF(authenticated_mailbox);
@@ -1403,46 +1427,46 @@ ___1a_mn_imap_mailbox_impl_authenticated_check (MNAuthenticatedMailbox * authent
? MN_AUTHENTICATED_MAILBOX_ERROR_AUTHENTICATION
: MN_AUTHENTICATED_MAILBOX_ERROR_OTHER);
}}
-#line 1407 "mn-imap-mailbox.c"
+#line 1431 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 905 "mn-imap-mailbox.gob"
+#line 927 "mn-imap-mailbox.gob"
static void
mn_imap_mailbox_notice_cb (MNClientSession * session, const char * str, MNClientSessionPrivate * priv)
-#line 1414 "mn-imap-mailbox.c"
+#line 1438 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::notice_cb"
-#line 905 "mn-imap-mailbox.gob"
+#line 927 "mn-imap-mailbox.gob"
g_return_if_fail (session != NULL);
-#line 905 "mn-imap-mailbox.gob"
+#line 927 "mn-imap-mailbox.gob"
g_return_if_fail (str != NULL);
-#line 905 "mn-imap-mailbox.gob"
+#line 927 "mn-imap-mailbox.gob"
g_return_if_fail (priv != NULL);
-#line 1423 "mn-imap-mailbox.c"
+#line 1447 "mn-imap-mailbox.c"
{
-#line 909 "mn-imap-mailbox.gob"
+#line 931 "mn-imap-mailbox.gob"
mn_mailbox_notice(priv->mailbox, "%s", str);
}}
-#line 1429 "mn-imap-mailbox.c"
+#line 1453 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 913 "mn-imap-mailbox.gob"
+#line 935 "mn-imap-mailbox.gob"
static MNClientSessionResponse *
mn_imap_mailbox_response_new_cb (MNClientSession * session, const char * input, MNClientSessionPrivate * priv)
-#line 1435 "mn-imap-mailbox.c"
+#line 1459 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::response_new_cb"
-#line 913 "mn-imap-mailbox.gob"
+#line 935 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (MNClientSessionResponse * )0);
-#line 913 "mn-imap-mailbox.gob"
+#line 935 "mn-imap-mailbox.gob"
g_return_val_if_fail (input != NULL, (MNClientSessionResponse * )0);
-#line 913 "mn-imap-mailbox.gob"
+#line 935 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (MNClientSessionResponse * )0);
-#line 1444 "mn-imap-mailbox.c"
+#line 1468 "mn-imap-mailbox.c"
{
-#line 917 "mn-imap-mailbox.gob"
+#line 939 "mn-imap-mailbox.gob"
MNClientSessionResponse *response = NULL;
@@ -1489,24 +1513,24 @@ mn_imap_mailbox_response_new_cb (MNClientSession * session, const char * input,
return response;
}}
-#line 1493 "mn-imap-mailbox.c"
+#line 1517 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 964 "mn-imap-mailbox.gob"
+#line 986 "mn-imap-mailbox.gob"
static void
mn_imap_mailbox_response_free_cb (MNClientSession * session, MNClientSessionResponse * response, MNClientSessionPrivate * priv)
-#line 1499 "mn-imap-mailbox.c"
+#line 1523 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::response_free_cb"
-#line 964 "mn-imap-mailbox.gob"
+#line 986 "mn-imap-mailbox.gob"
g_return_if_fail (session != NULL);
-#line 964 "mn-imap-mailbox.gob"
+#line 986 "mn-imap-mailbox.gob"
g_return_if_fail (response != NULL);
-#line 964 "mn-imap-mailbox.gob"
+#line 986 "mn-imap-mailbox.gob"
g_return_if_fail (priv != NULL);
-#line 1508 "mn-imap-mailbox.c"
+#line 1532 "mn-imap-mailbox.c"
{
-#line 968 "mn-imap-mailbox.gob"
+#line 990 "mn-imap-mailbox.gob"
g_free(response->continuation);
g_free(response->tag);
@@ -1515,24 +1539,24 @@ mn_imap_mailbox_response_free_cb (MNClientSession * session, MNClientSessionResp
g_free(response->arguments);
g_free(response);
}}
-#line 1519 "mn-imap-mailbox.c"
+#line 1543 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 977 "mn-imap-mailbox.gob"
+#line 999 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_custom_handler_cb (MNClientSession * session, MNClientSessionResponse * response, int result, MNClientSessionPrivate * priv)
-#line 1525 "mn-imap-mailbox.c"
+#line 1549 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::custom_handler_cb"
-#line 977 "mn-imap-mailbox.gob"
+#line 999 "mn-imap-mailbox.gob"
g_return_val_if_fail (session != NULL, (int )0);
-#line 977 "mn-imap-mailbox.gob"
+#line 999 "mn-imap-mailbox.gob"
g_return_val_if_fail (response != NULL, (int )0);
-#line 977 "mn-imap-mailbox.gob"
+#line 999 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 1534 "mn-imap-mailbox.c"
+#line 1558 "mn-imap-mailbox.c"
{
-#line 982 "mn-imap-mailbox.gob"
+#line 1004 "mn-imap-mailbox.gob"
switch (result)
{
@@ -1554,22 +1578,22 @@ mn_imap_mailbox_custom_handler_cb (MNClientSession * session, MNClientSessionRes
g_return_val_if_reached(0);
}
}}
-#line 1558 "mn-imap-mailbox.c"
+#line 1582 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1004 "mn-imap-mailbox.gob"
+#line 1026 "mn-imap-mailbox.gob"
static void
mn_imap_mailbox_pre_read_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 1564 "mn-imap-mailbox.c"
+#line 1588 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::pre_read_cb"
-#line 1004 "mn-imap-mailbox.gob"
+#line 1026 "mn-imap-mailbox.gob"
g_return_if_fail (session != NULL);
-#line 1004 "mn-imap-mailbox.gob"
+#line 1026 "mn-imap-mailbox.gob"
g_return_if_fail (priv != NULL);
-#line 1571 "mn-imap-mailbox.c"
+#line 1595 "mn-imap-mailbox.c"
{
-#line 1007 "mn-imap-mailbox.gob"
+#line 1029 "mn-imap-mailbox.gob"
if (priv->idle_state == IDLE_STATE_IDLING)
{
@@ -1578,22 +1602,22 @@ mn_imap_mailbox_pre_read_cb (MNClientSession * session, MNClientSessionPrivate *
g_mutex_unlock(priv->self->_priv->idle_session_mutex);
}
}}
-#line 1582 "mn-imap-mailbox.c"
+#line 1606 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1016 "mn-imap-mailbox.gob"
+#line 1038 "mn-imap-mailbox.gob"
static void
mn_imap_mailbox_post_read_cb (MNClientSession * session, MNClientSessionPrivate * priv)
-#line 1588 "mn-imap-mailbox.c"
+#line 1612 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::post_read_cb"
-#line 1016 "mn-imap-mailbox.gob"
+#line 1038 "mn-imap-mailbox.gob"
g_return_if_fail (session != NULL);
-#line 1016 "mn-imap-mailbox.gob"
+#line 1038 "mn-imap-mailbox.gob"
g_return_if_fail (priv != NULL);
-#line 1595 "mn-imap-mailbox.c"
+#line 1619 "mn-imap-mailbox.c"
{
-#line 1019 "mn-imap-mailbox.gob"
+#line 1041 "mn-imap-mailbox.gob"
if (priv->idle_state == IDLE_STATE_IDLING)
{
@@ -1602,44 +1626,44 @@ mn_imap_mailbox_post_read_cb (MNClientSession * session, MNClientSessionPrivate
g_mutex_unlock(priv->self->_priv->idle_session_mutex);
}
}}
-#line 1606 "mn-imap-mailbox.c"
+#line 1630 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1028 "mn-imap-mailbox.gob"
+#line 1050 "mn-imap-mailbox.gob"
static void
mn_imap_mailbox_session_set_error_from_arguments (MNClientSessionPrivate * priv, MNClientSessionResponse * response)
-#line 1612 "mn-imap-mailbox.c"
+#line 1636 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::session_set_error_from_arguments"
-#line 1028 "mn-imap-mailbox.gob"
+#line 1050 "mn-imap-mailbox.gob"
g_return_if_fail (priv != NULL);
-#line 1028 "mn-imap-mailbox.gob"
+#line 1050 "mn-imap-mailbox.gob"
g_return_if_fail (response != NULL);
-#line 1619 "mn-imap-mailbox.c"
+#line 1643 "mn-imap-mailbox.c"
{
-#line 1031 "mn-imap-mailbox.gob"
+#line 1053 "mn-imap-mailbox.gob"
if (response->arguments)
mn_client_session_error(priv->session, "\"%s\"", response->arguments);
else
mn_client_session_error(priv->session, _("unknown server error"));
}}
-#line 1628 "mn-imap-mailbox.c"
+#line 1652 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1038 "mn-imap-mailbox.gob"
+#line 1060 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_session_write (MNClientSessionPrivate * priv, const char * format, ...)
-#line 1634 "mn-imap-mailbox.c"
+#line 1658 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::session_write"
-#line 1038 "mn-imap-mailbox.gob"
+#line 1060 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 1038 "mn-imap-mailbox.gob"
+#line 1060 "mn-imap-mailbox.gob"
g_return_val_if_fail (format != NULL, (int )0);
-#line 1641 "mn-imap-mailbox.c"
+#line 1665 "mn-imap-mailbox.c"
{
-#line 1042 "mn-imap-mailbox.gob"
+#line 1064 "mn-imap-mailbox.gob"
va_list args;
char *command;
@@ -1658,21 +1682,52 @@ mn_imap_mailbox_session_write (MNClientSessionPrivate * priv, const char * forma
return result;
}}
-#line 1662 "mn-imap-mailbox.c"
+#line 1686 "mn-imap-mailbox.c"
+#undef __GOB_FUNCTION__
+
+#line 1083 "mn-imap-mailbox.gob"
+static void
+mn_imap_mailbox_handle_capability_code (MNClientSessionPrivate * priv, MNClientSessionResponse * response)
+#line 1692 "mn-imap-mailbox.c"
+{
+#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::handle_capability_code"
+#line 1083 "mn-imap-mailbox.gob"
+ g_return_if_fail (priv != NULL);
+#line 1083 "mn-imap-mailbox.gob"
+ g_return_if_fail (response != NULL);
+#line 1699 "mn-imap-mailbox.c"
+{
+#line 1086 "mn-imap-mailbox.gob"
+
+ if (response->code)
+ {
+ if (! strcmp(response->code, "CAPABILITY"))
+ self_session_parse_capabilities(priv, NULL);
+ else if (g_str_has_prefix(response->code, "CAPABILITY "))
+ self_session_parse_capabilities(priv, response->code + 11);
+ }
+ }}
+#line 1711 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1061 "mn-imap-mailbox.gob"
+#line 1096 "mn-imap-mailbox.gob"
static void
mn_imap_mailbox_session_parse_capabilities (MNClientSessionPrivate * priv, const char * capabilities)
-#line 1668 "mn-imap-mailbox.c"
+#line 1717 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::session_parse_capabilities"
-#line 1061 "mn-imap-mailbox.gob"
+#line 1096 "mn-imap-mailbox.gob"
g_return_if_fail (priv != NULL);
-#line 1673 "mn-imap-mailbox.c"
+#line 1722 "mn-imap-mailbox.c"
{
-#line 1064 "mn-imap-mailbox.gob"
+#line 1099 "mn-imap-mailbox.gob"
+ g_strfreev(priv->capabilities);
+ priv->capabilities = NULL;
+
+ eel_g_slist_free_deep(priv->auth_mechanisms);
+ priv->auth_mechanisms = NULL;
+
if (capabilities)
{
int i;
@@ -1686,22 +1741,22 @@ mn_imap_mailbox_session_parse_capabilities (MNClientSessionPrivate * priv, const
else
priv->capabilities = g_new0(char *, 1);
}}
-#line 1690 "mn-imap-mailbox.c"
+#line 1745 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1079 "mn-imap-mailbox.gob"
+#line 1120 "mn-imap-mailbox.gob"
static gboolean
mn_imap_mailbox_session_has_capability (MNClientSessionPrivate * priv, const char * capability)
-#line 1696 "mn-imap-mailbox.c"
+#line 1751 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::session_has_capability"
-#line 1079 "mn-imap-mailbox.gob"
+#line 1120 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (gboolean )0);
-#line 1079 "mn-imap-mailbox.gob"
+#line 1120 "mn-imap-mailbox.gob"
g_return_val_if_fail (capability != NULL, (gboolean )0);
-#line 1703 "mn-imap-mailbox.c"
+#line 1758 "mn-imap-mailbox.c"
{
-#line 1082 "mn-imap-mailbox.gob"
+#line 1123 "mn-imap-mailbox.gob"
int i;
@@ -1713,20 +1768,20 @@ mn_imap_mailbox_session_has_capability (MNClientSessionPrivate * priv, const cha
return FALSE;
}}
-#line 1717 "mn-imap-mailbox.c"
+#line 1772 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1094 "mn-imap-mailbox.gob"
+#line 1135 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_session_after_capability (MNClientSessionPrivate * priv)
-#line 1723 "mn-imap-mailbox.c"
+#line 1778 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::session_after_capability"
-#line 1094 "mn-imap-mailbox.gob"
+#line 1135 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 1728 "mn-imap-mailbox.c"
+#line 1783 "mn-imap-mailbox.c"
{
-#line 1096 "mn-imap-mailbox.gob"
+#line 1137 "mn-imap-mailbox.gob"
#ifdef WITH_SSL
if (MN_URI_IS_INBAND_SSL(priv->mailbox->uri)
@@ -1743,22 +1798,24 @@ mn_imap_mailbox_session_after_capability (MNClientSessionPrivate * priv)
}
else
#endif /* WITH_SSL */
- return self_session_authenticate(priv);
+ return priv->authenticated
+ ? self_session_check_mail(priv)
+ : self_session_authenticate(priv);
}}
-#line 1749 "mn-imap-mailbox.c"
+#line 1806 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1115 "mn-imap-mailbox.gob"
+#line 1158 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_session_authenticate (MNClientSessionPrivate * priv)
-#line 1755 "mn-imap-mailbox.c"
+#line 1812 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::session_authenticate"
-#line 1115 "mn-imap-mailbox.gob"
+#line 1158 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 1760 "mn-imap-mailbox.c"
+#line 1817 "mn-imap-mailbox.c"
{
-#line 1117 "mn-imap-mailbox.gob"
+#line 1160 "mn-imap-mailbox.gob"
if (priv->mailbox->uri->authmech)
{
@@ -1787,20 +1844,20 @@ mn_imap_mailbox_session_authenticate (MNClientSessionPrivate * priv)
return STATE_LOGIN;
}
}}
-#line 1791 "mn-imap-mailbox.c"
+#line 1848 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1146 "mn-imap-mailbox.gob"
+#line 1189 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_session_authenticate_fallback (MNClientSessionPrivate * priv)
-#line 1797 "mn-imap-mailbox.c"
+#line 1854 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::session_authenticate_fallback"
-#line 1146 "mn-imap-mailbox.gob"
+#line 1189 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 1802 "mn-imap-mailbox.c"
+#line 1859 "mn-imap-mailbox.c"
{
-#line 1148 "mn-imap-mailbox.gob"
+#line 1191 "mn-imap-mailbox.gob"
if (! priv->mailbox->uri->authmech)
{
@@ -1811,20 +1868,20 @@ mn_imap_mailbox_session_authenticate_fallback (MNClientSessionPrivate * priv)
priv->authentication_failed = TRUE;
return mn_client_session_error(priv->session, _("authentication failed"));
}}
-#line 1815 "mn-imap-mailbox.c"
+#line 1872 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
-#line 1159 "mn-imap-mailbox.gob"
+#line 1202 "mn-imap-mailbox.gob"
static int
mn_imap_mailbox_session_check_mail (MNClientSessionPrivate * priv)
-#line 1821 "mn-imap-mailbox.c"
+#line 1878 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::session_check_mail"
-#line 1159 "mn-imap-mailbox.gob"
+#line 1202 "mn-imap-mailbox.gob"
g_return_val_if_fail (priv != NULL, (int )0);
-#line 1826 "mn-imap-mailbox.c"
+#line 1883 "mn-imap-mailbox.c"
{
-#line 1161 "mn-imap-mailbox.gob"
+#line 1204 "mn-imap-mailbox.gob"
#ifdef WITH_MIME
return STATE_EXAMINE;
@@ -1834,7 +1891,7 @@ mn_imap_mailbox_session_check_mail (MNClientSessionPrivate * priv)
: STATE_STATUS;
#endif /* WITH_MIME */
}}
-#line 1838 "mn-imap-mailbox.c"
+#line 1895 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
/**
@@ -1845,17 +1902,17 @@ mn_imap_mailbox_session_check_mail (MNClientSessionPrivate * priv)
*
* Return value: the quoted string.
**/
-#line 1179 "mn-imap-mailbox.gob"
+#line 1222 "mn-imap-mailbox.gob"
static char *
mn_imap_mailbox_quote (const char * str)
-#line 1852 "mn-imap-mailbox.c"
+#line 1909 "mn-imap-mailbox.c"
{
#define __GOB_FUNCTION__ "MN:IMAP:Mailbox::quote"
-#line 1179 "mn-imap-mailbox.gob"
+#line 1222 "mn-imap-mailbox.gob"
g_return_val_if_fail (str != NULL, (char * )0);
-#line 1857 "mn-imap-mailbox.c"
+#line 1914 "mn-imap-mailbox.c"
{
-#line 1181 "mn-imap-mailbox.gob"
+#line 1224 "mn-imap-mailbox.gob"
GString *quoted;
int i;
@@ -1870,5 +1927,5 @@ mn_imap_mailbox_quote (const char * str)
return g_string_free(quoted, FALSE);
}}
-#line 1874 "mn-imap-mailbox.c"
+#line 1931 "mn-imap-mailbox.c"
#undef __GOB_FUNCTION__
diff --git a/src/mn-imap-mailbox.gob b/src/mn-imap-mailbox.gob
@@ -104,6 +104,7 @@ requires 2.0.10
char **capabilities;
GSList *auth_mechanisms;
+ gboolean authenticated;
gboolean authentication_failed;
gboolean search_received;
@@ -202,20 +203,16 @@ class MN:IMAP:Mailbox from MN:Authenticated:Mailbox
return MN_CLIENT_SESSION_RESULT_BAD_RESPONSE_FOR_CONTEXT;
else if (! response->tag && IS_OK(response))
{
- if (response->code)
- {
- if (! strcmp(response->code, "CAPABILITY"))
- self_session_parse_capabilities(priv, NULL);
- else if (g_str_has_prefix(response->code, "CAPABILITY "))
- self_session_parse_capabilities(priv, response->code + 11);
- }
-
+ self_handle_capability_code(priv, response);
return priv->capabilities
? self_session_after_capability(priv)
: STATE_CAPABILITY;
}
else if (! response->tag && IS(response, "PREAUTH"))
- return self_session_check_mail(priv);
+ {
+ self_handle_capability_code(priv, response);
+ return self_session_check_mail(priv);
+ }
else if (! response->tag && IS_BYE(response))
return RESULT_ERROR_END;
else
@@ -226,12 +223,6 @@ class MN:IMAP:Mailbox from MN:Authenticated:Mailbox
enter_capability_cb (MNClientSession *session (check null),
MNClientSessionPrivate *priv (check null))
{
- g_strfreev(priv->capabilities);
- priv->capabilities = NULL;
-
- eel_g_slist_free_deep(priv->auth_mechanisms);
- priv->auth_mechanisms = NULL;
-
return self_session_write(priv, "CAPABILITY");
}
@@ -346,9 +337,34 @@ class MN:IMAP:Mailbox from MN:Authenticated:Mailbox
{
if (IS_OK(response))
{
- return mn_client_session_sasl_authentication_done(session)
- ? self_session_check_mail(priv)
- : MN_CLIENT_SESSION_RESULT_END;
+ if (mn_client_session_sasl_authentication_done(session))
+ {
+ priv->authenticated = TRUE;
+ self_handle_capability_code(priv, response);
+
+ /*
+ * RFC 3501 2.2.2:
+ *
+ * A server MAY include a CAPABILITY response code
+ * in the tagged OK response of a successful
+ * AUTHENTICATE command in order to send
+ * capabilities automatically. It is unnecessary
+ * for a client to send a separate CAPABILITY
+ * command if it recognizes these automatic
+ * capabilities. This should only be done if a
+ * security layer was not negotiated by the
+ * AUTHENTICATE command, because the tagged OK
+ * response as part of an AUTHENTICATE command is
+ * not protected by encryption/integrity checking.
+ * [SASL] requires the client to re-issue a
+ * CAPABILITY command in this case.
+ */
+ return priv->capabilities && mn_client_session_sasl_get_ssf(session)
+ ? self_session_check_mail(priv)
+ : STATE_CAPABILITY;
+ }
+ else
+ return MN_CLIENT_SESSION_RESULT_END;
}
else if (IS_NO(response) || IS_BAD(response))
return self_session_authenticate_fallback(priv);
@@ -403,7 +419,13 @@ class MN:IMAP:Mailbox from MN:Authenticated:Mailbox
if (HAS_CURRENT_TAG(response, priv))
{
if (IS_OK(response))
- return self_session_check_mail(priv);
+ {
+ priv->authenticated = TRUE;
+ self_handle_capability_code(priv, response);
+ return priv->capabilities
+ ? STATE_CAPABILITY
+ : self_session_check_mail(priv);
+ }
else if (IS_NO(response) || IS_BAD(response))
{
priv->authentication_failed = TRUE;
@@ -1059,9 +1081,28 @@ class MN:IMAP:Mailbox from MN:Authenticated:Mailbox
}
private void
+ handle_capability_code (MNClientSessionPrivate *priv (check null),
+ MNClientSessionResponse *response (check null))
+ {
+ if (response->code)
+ {
+ if (! strcmp(response->code, "CAPABILITY"))
+ self_session_parse_capabilities(priv, NULL);
+ else if (g_str_has_prefix(response->code, "CAPABILITY "))
+ self_session_parse_capabilities(priv, response->code + 11);
+ }
+ }
+
+ private void
session_parse_capabilities (MNClientSessionPrivate *priv (check null),
const char *capabilities)
{
+ g_strfreev(priv->capabilities);
+ priv->capabilities = NULL;
+
+ eel_g_slist_free_deep(priv->auth_mechanisms);
+ priv->auth_mechanisms = NULL;
+
if (capabilities)
{
int i;
@@ -1109,7 +1150,9 @@ class MN:IMAP:Mailbox from MN:Authenticated:Mailbox
}
else
#endif /* WITH_SSL */
- return self_session_authenticate(priv);
+ return priv->authenticated
+ ? self_session_check_mail(priv)
+ : self_session_authenticate(priv);
}
private int
diff --git a/src/mn-mail-icon.c b/src/mn-mail-icon.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:06 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:36 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-mailbox-view.c b/src/mn-mailbox-view.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:06 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:36 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-mailbox.c b/src/mn-mailbox.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:06 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:36 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-mailboxes.c b/src/mn-mailboxes.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:06 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:36 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-maildir-mailbox.c b/src/mn-maildir-mailbox.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:04 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:35 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-mbox-mailbox.c b/src/mn-mbox-mailbox.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:04 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:35 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-message-box.c b/src/mn-message-box.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:06 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:36 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-message.c b/src/mn-message.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:06 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:36 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-mh-mailbox.c b/src/mn-mh-mailbox.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:04 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:35 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-pending-mailbox.c b/src/mn-pending-mailbox.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:06 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:36 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-pi-mailbox-properties.c b/src/mn-pi-mailbox-properties.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:05 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:35 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-pop3-mailbox-properties.c b/src/mn-pop3-mailbox-properties.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:05 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:35 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-pop3-mailbox.c b/src/mn-pop3-mailbox.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:05 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:35 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-properties.c b/src/mn-properties.c
@@ -36,6 +36,7 @@ typedef struct
/* general tab */
GtkWidget *autostart_check;
GtkWidget *blink_check;
+ GtkWidget *summary_tooltip_check;
GtkWidget *command_mail_reader_check;
GtkWidget *command_mail_reader_entry;
GtkWidget *command_new_mail_check;
@@ -122,6 +123,7 @@ mn_properties_display (void)
"notebook", &properties.notebook,
"autostart_check", &properties.autostart_check,
"blink_check", &properties.blink_check,
+ "summary_tooltip_check", &properties.summary_tooltip_check,
"command_mail_reader_check", &properties.command_mail_reader_check,
"command_mail_reader_entry", &properties.command_mail_reader_entry,
"command_new_mail_check", &properties.command_new_mail_check,
@@ -204,6 +206,7 @@ mn_properties_display (void)
mn_conf_link(properties.dialog, MN_CONF_PROPERTIES_DIALOG,
properties.blink_check, MN_CONF_BLINK_ON_ERRORS,
+ properties.summary_tooltip_check, MN_CONF_SUMMARY_TOOLTIP,
properties.command_mail_reader_check, MN_CONF_COMMANDS_MAIL_READER_ENABLED,
properties.command_mail_reader_entry, MN_CONF_COMMANDS_MAIL_READER_COMMAND,
properties.command_new_mail_check, MN_CONF_COMMANDS_NEW_MAIL_ENABLED,
diff --git a/src/mn-shell.c b/src/mn-shell.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:06 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:36 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
@@ -63,6 +63,7 @@ static void mn_shell_mailboxes_messages_changed_h (MNMailboxes * mailboxes, gboo
static void mn_shell_init_icon (MNShell * self) G_GNUC_UNUSED;
static void mn_shell_notify_blink_on_errors_cb (GConfClient * client, guint cnxn_id, GConfEntry * entry, gpointer user_data) G_GNUC_UNUSED;
static void mn_shell_notify_mail_reader_cb (GConfClient * client, guint cnxn_id, GConfEntry * entry, gpointer user_data) G_GNUC_UNUSED;
+static void mn_shell_notify_summary_tooltip_cb (GConfClient * client, guint cnxn_id, GConfEntry * entry, gpointer user_data) G_GNUC_UNUSED;
static void mn_shell_icon_activate_h (MNMailIcon * icon, gpointer user_data) G_GNUC_UNUSED;
static void mn_shell_icon_activate_summary_h (MNMailIcon * icon, gpointer user_data) G_GNUC_UNUSED;
static void mn_shell_icon_activate_mail_reader_h (MNMailIcon * icon, gpointer user_data) G_GNUC_UNUSED;
@@ -86,6 +87,7 @@ static GObjectClass *parent_class = NULL;
#define self_init_icon mn_shell_init_icon
#define self_notify_blink_on_errors_cb mn_shell_notify_blink_on_errors_cb
#define self_notify_mail_reader_cb mn_shell_notify_mail_reader_cb
+#define self_notify_summary_tooltip_cb mn_shell_notify_summary_tooltip_cb
#define self_icon_activate_h mn_shell_icon_activate_h
#define self_icon_activate_summary_h mn_shell_icon_activate_summary_h
#define self_icon_activate_mail_reader_h mn_shell_icon_activate_mail_reader_h
@@ -156,7 +158,7 @@ ___dispose (GObject *obj_self)
(* G_OBJECT_CLASS (parent_class)->dispose) (obj_self);
#line 47 "mn-shell.gob"
if(self->mailboxes) { g_object_unref ((gpointer) self->mailboxes); self->mailboxes = NULL; }
-#line 160 "mn-shell.c"
+#line 162 "mn-shell.c"
}
#undef __GOB_FUNCTION__
@@ -167,9 +169,9 @@ ___finalize(GObject *obj_self)
#define __GOB_FUNCTION__ "MN:Shell::finalize"
MNShell *self G_GNUC_UNUSED = MN_SHELL (obj_self);
gpointer priv G_GNUC_UNUSED = self->_priv;
-#line 78 "mn-shell.gob"
+#line 79 "mn-shell.gob"
___2_mn_shell_finalize(obj_self);
-#line 173 "mn-shell.c"
+#line 175 "mn-shell.c"
}
#undef __GOB_FUNCTION__
@@ -183,22 +185,22 @@ mn_shell_class_init (MNShellClass * c G_GNUC_UNUSED)
parent_class = g_type_class_ref (G_TYPE_OBJECT);
-#line 78 "mn-shell.gob"
+#line 79 "mn-shell.gob"
g_object_class->finalize = ___finalize;
-#line 189 "mn-shell.c"
+#line 191 "mn-shell.c"
g_object_class->dispose = ___dispose;
}
#undef __GOB_FUNCTION__
#line 52 "mn-shell.gob"
static void
mn_shell_init (MNShell * self G_GNUC_UNUSED)
-#line 196 "mn-shell.c"
+#line 198 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::init"
self->_priv = G_TYPE_INSTANCE_GET_PRIVATE(self,TYPE_SELF,MNShellPrivate);
#line 47 "mn-shell.gob"
self->mailboxes = mn_mailboxes_new();
-#line 202 "mn-shell.c"
+#line 204 "mn-shell.c"
{
#line 53 "mn-shell.gob"
@@ -210,6 +212,7 @@ mn_shell_init (MNShell * self G_GNUC_UNUSED)
eel_gconf_notification_add(MN_CONF_BLINK_ON_ERRORS, self_notify_blink_on_errors_cb, self);
eel_gconf_notification_add(MN_CONF_COMMANDS_MAIL_READER_NAMESPACE, self_notify_mail_reader_cb, self);
+ eel_gconf_notification_add(MN_CONF_SUMMARY_TOOLTIP, self_notify_summary_tooltip_cb, self);
g_object_connect(self->mailboxes,
"signal::messages-changed", self_mailboxes_messages_changed_h, self,
@@ -225,47 +228,47 @@ mn_shell_init (MNShell * self G_GNUC_UNUSED)
mn_summary_popup_init();
-#line 229 "mn-shell.c"
+#line 232 "mn-shell.c"
}
}
#undef __GOB_FUNCTION__
-#line 78 "mn-shell.gob"
+#line 79 "mn-shell.gob"
static void
___2_mn_shell_finalize (GObject * object G_GNUC_UNUSED)
-#line 239 "mn-shell.c"
+#line 242 "mn-shell.c"
#define PARENT_HANDLER(___object) \
{ if(G_OBJECT_CLASS(parent_class)->finalize) \
(* G_OBJECT_CLASS(parent_class)->finalize)(___object); }
{
#define __GOB_FUNCTION__ "MN:Shell::finalize"
{
-#line 80 "mn-shell.gob"
+#line 81 "mn-shell.gob"
gtk_main_quit();
PARENT_HANDLER(object);
}}
-#line 251 "mn-shell.c"
+#line 254 "mn-shell.c"
#undef __GOB_FUNCTION__
#undef PARENT_HANDLER
-#line 85 "mn-shell.gob"
+#line 86 "mn-shell.gob"
static void
mn_shell_mailboxes_messages_changed_h (MNMailboxes * mailboxes, gboolean has_new, gpointer user_data)
-#line 258 "mn-shell.c"
+#line 261 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::mailboxes_messages_changed_h"
-#line 85 "mn-shell.gob"
+#line 86 "mn-shell.gob"
g_return_if_fail (mailboxes != NULL);
-#line 85 "mn-shell.gob"
+#line 86 "mn-shell.gob"
g_return_if_fail (MN_IS_MAILBOXES (mailboxes));
-#line 85 "mn-shell.gob"
+#line 86 "mn-shell.gob"
g_return_if_fail (user_data != NULL);
-#line 267 "mn-shell.c"
+#line 270 "mn-shell.c"
{
-#line 89 "mn-shell.gob"
+#line 90 "mn-shell.gob"
if (has_new)
{
@@ -274,22 +277,22 @@ mn_shell_mailboxes_messages_changed_h (MNMailboxes * mailboxes, gboolean has_new
mn_execute_command(MN_CONF_COMMANDS_NEW_MAIL_COMMAND);
}
}}
-#line 278 "mn-shell.c"
+#line 281 "mn-shell.c"
#undef __GOB_FUNCTION__
-#line 98 "mn-shell.gob"
+#line 99 "mn-shell.gob"
static void
mn_shell_init_icon (MNShell * self)
-#line 284 "mn-shell.c"
+#line 287 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::init_icon"
-#line 98 "mn-shell.gob"
+#line 99 "mn-shell.gob"
g_return_if_fail (self != NULL);
-#line 98 "mn-shell.gob"
+#line 99 "mn-shell.gob"
g_return_if_fail (MN_IS_SHELL (self));
-#line 291 "mn-shell.c"
+#line 294 "mn-shell.c"
{
-#line 100 "mn-shell.gob"
+#line 101 "mn-shell.gob"
selfp->icon = MN_MAIL_ICON(mn_mail_icon_new());
@@ -308,20 +311,20 @@ mn_shell_init_icon (MNShell * self)
self_update_sensitivity(self);
self_update_icon(self);
}}
-#line 312 "mn-shell.c"
+#line 315 "mn-shell.c"
#undef __GOB_FUNCTION__
-#line 119 "mn-shell.gob"
+#line 120 "mn-shell.gob"
static void
mn_shell_notify_blink_on_errors_cb (GConfClient * client, guint cnxn_id, GConfEntry * entry, gpointer user_data)
-#line 318 "mn-shell.c"
+#line 321 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::notify_blink_on_errors_cb"
-#line 119 "mn-shell.gob"
+#line 120 "mn-shell.gob"
g_return_if_fail (user_data != NULL);
-#line 323 "mn-shell.c"
+#line 326 "mn-shell.c"
{
-#line 124 "mn-shell.gob"
+#line 125 "mn-shell.gob"
Self *self = user_data;
@@ -329,20 +332,20 @@ mn_shell_notify_blink_on_errors_cb (GConfClient * client, guint cnxn_id, GConfEn
self_update_icon(self);
GDK_THREADS_LEAVE();
}}
-#line 333 "mn-shell.c"
+#line 336 "mn-shell.c"
#undef __GOB_FUNCTION__
-#line 132 "mn-shell.gob"
+#line 133 "mn-shell.gob"
static void
mn_shell_notify_mail_reader_cb (GConfClient * client, guint cnxn_id, GConfEntry * entry, gpointer user_data)
-#line 339 "mn-shell.c"
+#line 342 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::notify_mail_reader_cb"
-#line 132 "mn-shell.gob"
+#line 133 "mn-shell.gob"
g_return_if_fail (user_data != NULL);
-#line 344 "mn-shell.c"
+#line 347 "mn-shell.c"
{
-#line 137 "mn-shell.gob"
+#line 138 "mn-shell.gob"
Self *self = user_data;
@@ -350,24 +353,45 @@ mn_shell_notify_mail_reader_cb (GConfClient * client, guint cnxn_id, GConfEntry
self_update_sensitivity(self);
GDK_THREADS_LEAVE();
}}
-#line 354 "mn-shell.c"
+#line 357 "mn-shell.c"
#undef __GOB_FUNCTION__
-#line 145 "mn-shell.gob"
+#line 146 "mn-shell.gob"
+static void
+mn_shell_notify_summary_tooltip_cb (GConfClient * client, guint cnxn_id, GConfEntry * entry, gpointer user_data)
+#line 363 "mn-shell.c"
+{
+#define __GOB_FUNCTION__ "MN:Shell::notify_summary_tooltip_cb"
+#line 146 "mn-shell.gob"
+ g_return_if_fail (user_data != NULL);
+#line 368 "mn-shell.c"
+{
+#line 151 "mn-shell.gob"
+
+ Self *self = user_data;
+
+ GDK_THREADS_ENTER();
+ self_update_tooltip(self);
+ GDK_THREADS_LEAVE();
+ }}
+#line 378 "mn-shell.c"
+#undef __GOB_FUNCTION__
+
+#line 159 "mn-shell.gob"
static void
mn_shell_icon_activate_h (MNMailIcon * icon, gpointer user_data)
-#line 360 "mn-shell.c"
+#line 384 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::icon_activate_h"
-#line 145 "mn-shell.gob"
+#line 159 "mn-shell.gob"
g_return_if_fail (icon != NULL);
-#line 145 "mn-shell.gob"
+#line 159 "mn-shell.gob"
g_return_if_fail (MN_IS_MAIL_ICON (icon));
-#line 145 "mn-shell.gob"
+#line 159 "mn-shell.gob"
g_return_if_fail (user_data != NULL);
-#line 369 "mn-shell.c"
+#line 393 "mn-shell.c"
{
-#line 148 "mn-shell.gob"
+#line 162 "mn-shell.gob"
MNAction action;
@@ -388,197 +412,197 @@ mn_shell_icon_activate_h (MNMailIcon * icon, gpointer user_data)
g_return_if_reached();
}
}}
-#line 392 "mn-shell.c"
+#line 416 "mn-shell.c"
#undef __GOB_FUNCTION__
-#line 169 "mn-shell.gob"
+#line 183 "mn-shell.gob"
static void
mn_shell_icon_activate_summary_h (MNMailIcon * icon, gpointer user_data)
-#line 398 "mn-shell.c"
+#line 422 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::icon_activate_summary_h"
-#line 169 "mn-shell.gob"
+#line 183 "mn-shell.gob"
g_return_if_fail (icon != NULL);
-#line 169 "mn-shell.gob"
+#line 183 "mn-shell.gob"
g_return_if_fail (MN_IS_MAIL_ICON (icon));
-#line 169 "mn-shell.gob"
+#line 183 "mn-shell.gob"
g_return_if_fail (user_data != NULL);
-#line 407 "mn-shell.c"
+#line 431 "mn-shell.c"
{
-#line 172 "mn-shell.gob"
+#line 186 "mn-shell.gob"
mn_summary_dialog_display();
}}
-#line 413 "mn-shell.c"
+#line 437 "mn-shell.c"
#undef __GOB_FUNCTION__
-#line 176 "mn-shell.gob"
+#line 190 "mn-shell.gob"
static void
mn_shell_icon_activate_mail_reader_h (MNMailIcon * icon, gpointer user_data)
-#line 419 "mn-shell.c"
+#line 443 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::icon_activate_mail_reader_h"
-#line 176 "mn-shell.gob"
+#line 190 "mn-shell.gob"
g_return_if_fail (icon != NULL);
-#line 176 "mn-shell.gob"
+#line 190 "mn-shell.gob"
g_return_if_fail (MN_IS_MAIL_ICON (icon));
-#line 176 "mn-shell.gob"
+#line 190 "mn-shell.gob"
g_return_if_fail (user_data != NULL);
-#line 428 "mn-shell.c"
+#line 452 "mn-shell.c"
{
-#line 179 "mn-shell.gob"
+#line 193 "mn-shell.gob"
if (eel_gconf_get_boolean(MN_CONF_COMMANDS_MAIL_READER_ENABLED))
mn_execute_command(MN_CONF_COMMANDS_MAIL_READER_COMMAND);
}}
-#line 435 "mn-shell.c"
+#line 459 "mn-shell.c"
#undef __GOB_FUNCTION__
-#line 184 "mn-shell.gob"
+#line 198 "mn-shell.gob"
static void
mn_shell_icon_activate_update_h (MNMailIcon * icon, gpointer user_data)
-#line 441 "mn-shell.c"
+#line 465 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::icon_activate_update_h"
-#line 184 "mn-shell.gob"
+#line 198 "mn-shell.gob"
g_return_if_fail (icon != NULL);
-#line 184 "mn-shell.gob"
+#line 198 "mn-shell.gob"
g_return_if_fail (MN_IS_MAIL_ICON (icon));
-#line 184 "mn-shell.gob"
+#line 198 "mn-shell.gob"
g_return_if_fail (user_data != NULL);
-#line 450 "mn-shell.c"
+#line 474 "mn-shell.c"
{
-#line 187 "mn-shell.gob"
+#line 201 "mn-shell.gob"
Self *self = user_data;
mn_mailboxes_check(self->mailboxes);
}}
-#line 457 "mn-shell.c"
+#line 481 "mn-shell.c"
#undef __GOB_FUNCTION__
-#line 192 "mn-shell.gob"
+#line 206 "mn-shell.gob"
static void
mn_shell_icon_activate_properties_h (MNMailIcon * icon, gpointer user_data)
-#line 463 "mn-shell.c"
+#line 487 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::icon_activate_properties_h"
-#line 192 "mn-shell.gob"
+#line 206 "mn-shell.gob"
g_return_if_fail (icon != NULL);
-#line 192 "mn-shell.gob"
+#line 206 "mn-shell.gob"
g_return_if_fail (MN_IS_MAIL_ICON (icon));
-#line 192 "mn-shell.gob"
+#line 206 "mn-shell.gob"
g_return_if_fail (user_data != NULL);
-#line 472 "mn-shell.c"
+#line 496 "mn-shell.c"
{
-#line 195 "mn-shell.gob"
+#line 209 "mn-shell.gob"
mn_properties_display();
}}
-#line 478 "mn-shell.c"
+#line 502 "mn-shell.c"
#undef __GOB_FUNCTION__
-#line 199 "mn-shell.gob"
+#line 213 "mn-shell.gob"
static void
mn_shell_icon_activate_help_h (MNMailIcon * icon, gpointer user_data)
-#line 484 "mn-shell.c"
+#line 508 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::icon_activate_help_h"
-#line 199 "mn-shell.gob"
+#line 213 "mn-shell.gob"
g_return_if_fail (icon != NULL);
-#line 199 "mn-shell.gob"
+#line 213 "mn-shell.gob"
g_return_if_fail (MN_IS_MAIL_ICON (icon));
-#line 199 "mn-shell.gob"
+#line 213 "mn-shell.gob"
g_return_if_fail (user_data != NULL);
-#line 493 "mn-shell.c"
+#line 517 "mn-shell.c"
{
-#line 202 "mn-shell.gob"
+#line 216 "mn-shell.gob"
mn_display_help(NULL, NULL);
}}
-#line 499 "mn-shell.c"
+#line 523 "mn-shell.c"
#undef __GOB_FUNCTION__
-#line 206 "mn-shell.gob"
+#line 220 "mn-shell.gob"
static void
mn_shell_icon_activate_about_h (MNMailIcon * icon, gpointer user_data)
-#line 505 "mn-shell.c"
+#line 529 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::icon_activate_about_h"
-#line 206 "mn-shell.gob"
+#line 220 "mn-shell.gob"
g_return_if_fail (icon != NULL);
-#line 206 "mn-shell.gob"
+#line 220 "mn-shell.gob"
g_return_if_fail (MN_IS_MAIL_ICON (icon));
-#line 206 "mn-shell.gob"
+#line 220 "mn-shell.gob"
g_return_if_fail (user_data != NULL);
-#line 514 "mn-shell.c"
+#line 538 "mn-shell.c"
{
-#line 209 "mn-shell.gob"
+#line 223 "mn-shell.gob"
Self *self = user_data;
self_display_about(self);
}}
-#line 521 "mn-shell.c"
+#line 545 "mn-shell.c"
#undef __GOB_FUNCTION__
-#line 214 "mn-shell.gob"
+#line 228 "mn-shell.gob"
static void
mn_shell_icon_activate_remove_h (MNMailIcon * icon, gpointer user_data)
-#line 527 "mn-shell.c"
+#line 551 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::icon_activate_remove_h"
-#line 214 "mn-shell.gob"
+#line 228 "mn-shell.gob"
g_return_if_fail (icon != NULL);
-#line 214 "mn-shell.gob"
+#line 228 "mn-shell.gob"
g_return_if_fail (MN_IS_MAIL_ICON (icon));
-#line 214 "mn-shell.gob"
+#line 228 "mn-shell.gob"
g_return_if_fail (user_data != NULL);
-#line 536 "mn-shell.c"
+#line 560 "mn-shell.c"
{
-#line 217 "mn-shell.gob"
+#line 231 "mn-shell.gob"
Self *self = user_data;
g_object_unref(self);
}}
-#line 543 "mn-shell.c"
+#line 567 "mn-shell.c"
#undef __GOB_FUNCTION__
-#line 222 "mn-shell.gob"
+#line 236 "mn-shell.gob"
static void
mn_shell_icon_destroy_h (GtkObject * object, gpointer user_data)
-#line 549 "mn-shell.c"
+#line 573 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::icon_destroy_h"
-#line 222 "mn-shell.gob"
+#line 236 "mn-shell.gob"
g_return_if_fail (object != NULL);
-#line 222 "mn-shell.gob"
+#line 236 "mn-shell.gob"
g_return_if_fail (GTK_IS_OBJECT (object));
-#line 222 "mn-shell.gob"
+#line 236 "mn-shell.gob"
g_return_if_fail (user_data != NULL);
-#line 558 "mn-shell.c"
+#line 582 "mn-shell.c"
{
-#line 225 "mn-shell.gob"
+#line 239 "mn-shell.gob"
Self *self = user_data;
/* The Notification Area applet has been terminated. Recreate the icon. */
self_init_icon(self);
}}
-#line 567 "mn-shell.c"
+#line 591 "mn-shell.c"
#undef __GOB_FUNCTION__
-#line 232 "mn-shell.gob"
+#line 246 "mn-shell.gob"
static void
mn_shell_update_sensitivity (MNShell * self)
-#line 573 "mn-shell.c"
+#line 597 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::update_sensitivity"
-#line 232 "mn-shell.gob"
+#line 246 "mn-shell.gob"
g_return_if_fail (self != NULL);
-#line 232 "mn-shell.gob"
+#line 246 "mn-shell.gob"
g_return_if_fail (MN_IS_SHELL (self));
-#line 580 "mn-shell.c"
+#line 604 "mn-shell.c"
{
-#line 234 "mn-shell.gob"
+#line 248 "mn-shell.gob"
gboolean mail_reader_sensitive = FALSE;
@@ -597,22 +621,22 @@ mn_shell_update_sensitivity (MNShell * self)
gtk_widget_set_sensitive(selfp->icon->mail_reader_item, mail_reader_sensitive);
gtk_widget_set_sensitive(selfp->icon->update_item, mn_mailboxes_get_must_poll(self->mailboxes));
}}
-#line 601 "mn-shell.c"
+#line 625 "mn-shell.c"
#undef __GOB_FUNCTION__
-#line 253 "mn-shell.gob"
+#line 267 "mn-shell.gob"
static void
mn_shell_update_icon (MNShell * self)
-#line 607 "mn-shell.c"
+#line 631 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::update_icon"
-#line 253 "mn-shell.gob"
+#line 267 "mn-shell.gob"
g_return_if_fail (self != NULL);
-#line 253 "mn-shell.gob"
+#line 267 "mn-shell.gob"
g_return_if_fail (MN_IS_SHELL (self));
-#line 614 "mn-shell.c"
+#line 638 "mn-shell.c"
{
-#line 255 "mn-shell.gob"
+#line 269 "mn-shell.gob"
GSList *mailboxes;
GSList *l;
@@ -645,26 +669,25 @@ mn_shell_update_icon (MNShell * self)
else
gtk_widget_hide(GTK_WIDGET(selfp->icon));
}}
-#line 649 "mn-shell.c"
+#line 673 "mn-shell.c"
#undef __GOB_FUNCTION__
-#line 288 "mn-shell.gob"
+#line 302 "mn-shell.gob"
static void
mn_shell_update_tooltip (MNShell * self)
-#line 655 "mn-shell.c"
+#line 679 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::update_tooltip"
-#line 288 "mn-shell.gob"
+#line 302 "mn-shell.gob"
g_return_if_fail (self != NULL);
-#line 288 "mn-shell.gob"
+#line 302 "mn-shell.gob"
g_return_if_fail (MN_IS_SHELL (self));
-#line 662 "mn-shell.c"
+#line 686 "mn-shell.c"
{
-#line 290 "mn-shell.gob"
+#line 304 "mn-shell.gob"
GtkWidget *vbox;
GSList *mailboxes;
- GSList *messages;
vbox = gtk_vbox_new(FALSE, 18);
@@ -729,44 +752,49 @@ mn_shell_update_tooltip (MNShell * self)
g_string_free(unsupported_string, TRUE);
}
- messages = mn_mailboxes_get_messages(mn_shell->mailboxes);
- if (messages)
+ if (eel_gconf_get_boolean(MN_CONF_SUMMARY_TOOLTIP))
{
- GtkWidget *hbox;
- GtkWidget *messages_vbox;
+ GSList *messages;
- hbox = self_tooltip_section_new(GTK_VBOX(vbox), _("Mail Summary"));
-
- messages_vbox = gtk_vbox_new(FALSE, 0);
- gtk_widget_set_name(messages_vbox, "mn-tooltip-section-body");
-
- mn_summary_update(GTK_VBOX(messages_vbox), messages, FALSE);
- mn_g_object_slist_free(messages);
-
- gtk_box_pack_start(GTK_BOX(hbox), messages_vbox, TRUE, TRUE, 0);
+ messages = mn_mailboxes_get_messages(mn_shell->mailboxes);
+ if (messages)
+ {
+ GtkWidget *hbox;
+ GtkWidget *messages_vbox;
+
+ hbox = self_tooltip_section_new(GTK_VBOX(vbox), _("Mail Summary"));
+
+ messages_vbox = gtk_vbox_new(FALSE, 0);
+ gtk_widget_set_name(messages_vbox, "mn-tooltip-section-body");
+
+ mn_summary_update(GTK_VBOX(messages_vbox), messages, FALSE);
+ mn_g_object_slist_free(messages);
+
+ gtk_box_pack_start(GTK_BOX(hbox), messages_vbox, TRUE, TRUE, 0);
+ }
}
gtk_widget_show_all(vbox);
mn_mail_icon_set_tip_widget(selfp->icon, vbox);
}}
-#line 753 "mn-shell.c"
+#line 781 "mn-shell.c"
#undef __GOB_FUNCTION__
-#line 379 "mn-shell.gob"
+#line 397 "mn-shell.gob"
static GtkWidget *
mn_shell_tooltip_section_new (GtkVBox * vbox, const char * title)
-#line 759 "mn-shell.c"
+#line 787 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::tooltip_section_new"
-#line 379 "mn-shell.gob"
+#line 397 "mn-shell.gob"
g_return_val_if_fail (vbox != NULL, (GtkWidget * )0);
-#line 379 "mn-shell.gob"
+#line 397 "mn-shell.gob"
g_return_val_if_fail (GTK_IS_VBOX (vbox), (GtkWidget * )0);
-#line 379 "mn-shell.gob"
+#line 397 "mn-shell.gob"
g_return_val_if_fail (title != NULL, (GtkWidget * )0);
-#line 768 "mn-shell.c"
+#line 796 "mn-shell.c"
{
-#line 382 "mn-shell.gob"
+#line 400 "mn-shell.gob"
GtkWidget *child_vbox;
char *markup;
@@ -795,26 +823,26 @@ mn_shell_tooltip_section_new (GtkVBox * vbox, const char * title)
return hbox;
}}
-#line 799 "mn-shell.c"
+#line 827 "mn-shell.c"
#undef __GOB_FUNCTION__
-#line 411 "mn-shell.gob"
+#line 429 "mn-shell.gob"
static void
mn_shell_tooltip_text_section_new (GtkVBox * vbox, const char * title, const char * text)
-#line 805 "mn-shell.c"
+#line 833 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::tooltip_text_section_new"
-#line 411 "mn-shell.gob"
+#line 429 "mn-shell.gob"
g_return_if_fail (vbox != NULL);
-#line 411 "mn-shell.gob"
+#line 429 "mn-shell.gob"
g_return_if_fail (GTK_IS_VBOX (vbox));
-#line 411 "mn-shell.gob"
+#line 429 "mn-shell.gob"
g_return_if_fail (title != NULL);
-#line 411 "mn-shell.gob"
+#line 429 "mn-shell.gob"
g_return_if_fail (text != NULL);
-#line 816 "mn-shell.c"
+#line 844 "mn-shell.c"
{
-#line 415 "mn-shell.gob"
+#line 433 "mn-shell.gob"
GtkWidget *hbox;
GtkWidget *label;
@@ -827,36 +855,36 @@ mn_shell_tooltip_text_section_new (GtkVBox * vbox, const char * title, const cha
gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);
}}
-#line 831 "mn-shell.c"
+#line 859 "mn-shell.c"
#undef __GOB_FUNCTION__
-#line 428 "mn-shell.gob"
+#line 446 "mn-shell.gob"
MNShell *
mn_shell_new (void)
-#line 837 "mn-shell.c"
+#line 865 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::new"
{
-#line 430 "mn-shell.gob"
+#line 448 "mn-shell.gob"
return GET_NEW;
}}
-#line 845 "mn-shell.c"
+#line 873 "mn-shell.c"
#undef __GOB_FUNCTION__
-#line 434 "mn-shell.gob"
+#line 452 "mn-shell.gob"
void
mn_shell_display_about (MNShell * self)
-#line 851 "mn-shell.c"
+#line 879 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::display_about"
-#line 434 "mn-shell.gob"
+#line 452 "mn-shell.gob"
g_return_if_fail (self != NULL);
-#line 434 "mn-shell.gob"
+#line 452 "mn-shell.gob"
g_return_if_fail (MN_IS_SHELL (self));
-#line 858 "mn-shell.c"
+#line 886 "mn-shell.c"
{
-#line 436 "mn-shell.gob"
+#line 454 "mn-shell.gob"
if (selfp->about)
{
@@ -868,22 +896,22 @@ mn_shell_display_about (MNShell * self)
eel_add_weak_pointer(&selfp->about);
gtk_widget_show(GTK_WIDGET(selfp->about));
}}
-#line 872 "mn-shell.c"
+#line 900 "mn-shell.c"
#undef __GOB_FUNCTION__
-#line 448 "mn-shell.gob"
+#line 466 "mn-shell.gob"
void
mn_shell_run_welcome (MNShell * self)
-#line 878 "mn-shell.c"
+#line 906 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::run_welcome"
-#line 448 "mn-shell.gob"
+#line 466 "mn-shell.gob"
g_return_if_fail (self != NULL);
-#line 448 "mn-shell.gob"
+#line 466 "mn-shell.gob"
g_return_if_fail (MN_IS_SHELL (self));
-#line 885 "mn-shell.c"
+#line 913 "mn-shell.c"
{
-#line 450 "mn-shell.gob"
+#line 468 "mn-shell.gob"
GtkWidget *dialog;
int response;
@@ -897,24 +925,24 @@ mn_shell_run_welcome (MNShell * self)
if (response == GTK_RESPONSE_OK)
mn_properties_display();
}}
-#line 901 "mn-shell.c"
+#line 929 "mn-shell.c"
#undef __GOB_FUNCTION__
-#line 464 "mn-shell.gob"
+#line 482 "mn-shell.gob"
void
mn_shell_report (MNShell * self, char ** report)
-#line 907 "mn-shell.c"
+#line 935 "mn-shell.c"
{
#define __GOB_FUNCTION__ "MN:Shell::report"
-#line 464 "mn-shell.gob"
+#line 482 "mn-shell.gob"
g_return_if_fail (self != NULL);
-#line 464 "mn-shell.gob"
+#line 482 "mn-shell.gob"
g_return_if_fail (MN_IS_SHELL (self));
-#line 464 "mn-shell.gob"
+#line 482 "mn-shell.gob"
g_return_if_fail (report != NULL);
-#line 916 "mn-shell.c"
+#line 944 "mn-shell.c"
{
-#line 466 "mn-shell.gob"
+#line 484 "mn-shell.gob"
GString *string;
GSList *l;
@@ -940,5 +968,5 @@ mn_shell_report (MNShell * self, char ** report)
*report = string->str;
g_string_free(string, FALSE);
}}
-#line 944 "mn-shell.c"
+#line 972 "mn-shell.c"
#undef __GOB_FUNCTION__
diff --git a/src/mn-shell.gob b/src/mn-shell.gob
@@ -59,6 +59,7 @@ class MN:Shell from G:Object
eel_gconf_notification_add(MN_CONF_BLINK_ON_ERRORS, self_notify_blink_on_errors_cb, self);
eel_gconf_notification_add(MN_CONF_COMMANDS_MAIL_READER_NAMESPACE, self_notify_mail_reader_cb, self);
+ eel_gconf_notification_add(MN_CONF_SUMMARY_TOOLTIP, self_notify_summary_tooltip_cb, self);
g_object_connect(self->mailboxes,
"signal::messages-changed", self_mailboxes_messages_changed_h, self,
@@ -143,6 +144,19 @@ class MN:Shell from G:Object
}
private void
+ notify_summary_tooltip_cb (GConfClient *client,
+ guint cnxn_id,
+ GConfEntry *entry,
+ gpointer user_data (check null))
+ {
+ Self *self = user_data;
+
+ GDK_THREADS_ENTER();
+ self_update_tooltip(self);
+ GDK_THREADS_LEAVE();
+ }
+
+ private void
icon_activate_h (MN:Mail:Icon *icon (check null type),
gpointer user_data (check null))
{
@@ -290,7 +304,6 @@ class MN:Shell from G:Object
{
GtkWidget *vbox;
GSList *mailboxes;
- GSList *messages;
vbox = gtk_vbox_new(FALSE, 18);
@@ -355,21 +368,26 @@ class MN:Shell from G:Object
g_string_free(unsupported_string, TRUE);
}
- messages = mn_mailboxes_get_messages(mn_shell->mailboxes);
- if (messages)
+ if (eel_gconf_get_boolean(MN_CONF_SUMMARY_TOOLTIP))
{
- GtkWidget *hbox;
- GtkWidget *messages_vbox;
+ GSList *messages;
- hbox = self_tooltip_section_new(GTK_VBOX(vbox), _("Mail Summary"));
-
- messages_vbox = gtk_vbox_new(FALSE, 0);
- gtk_widget_set_name(messages_vbox, "mn-tooltip-section-body");
-
- mn_summary_update(GTK_VBOX(messages_vbox), messages, FALSE);
- mn_g_object_slist_free(messages);
-
- gtk_box_pack_start(GTK_BOX(hbox), messages_vbox, TRUE, TRUE, 0);
+ messages = mn_mailboxes_get_messages(mn_shell->mailboxes);
+ if (messages)
+ {
+ GtkWidget *hbox;
+ GtkWidget *messages_vbox;
+
+ hbox = self_tooltip_section_new(GTK_VBOX(vbox), _("Mail Summary"));
+
+ messages_vbox = gtk_vbox_new(FALSE, 0);
+ gtk_widget_set_name(messages_vbox, "mn-tooltip-section-body");
+
+ mn_summary_update(GTK_VBOX(messages_vbox), messages, FALSE);
+ mn_g_object_slist_free(messages);
+
+ gtk_box_pack_start(GTK_BOX(hbox), messages_vbox, TRUE, TRUE, 0);
+ }
}
gtk_widget_show_all(vbox);
diff --git a/src/mn-sylpheed-mailbox.c b/src/mn-sylpheed-mailbox.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:05 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:35 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-system-mailbox-properties.c b/src/mn-system-mailbox-properties.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:06 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:36 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-tooltips.c b/src/mn-tooltips.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:06 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:36 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-unsupported-mailbox.c b/src/mn-unsupported-mailbox.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:06 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:36 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/src/mn-uri.c b/src/mn-uri.c
@@ -1,4 +1,4 @@
-/* Generated by GOB (v2.0.11) on Thu Nov 4 11:55:06 2004
+/* Generated by GOB (v2.0.11) on Mon Nov 15 16:14:36 2004
(do not edit directly) */
/* End world hunger, donate to the World Food Programme, http://www.wfp.org */
diff --git a/tests/Makefile.in b/tests/Makefile.in
@@ -43,9 +43,9 @@ noinst_PROGRAMS = test-uri$(EXEEXT) \
subdir = tests
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
- $(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/sasl2.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/openssl.m4 \
+ $(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -149,6 +149,7 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBBONOBO_IDL = @LIBBONOBO_IDL@
diff --git a/ui/Makefile.in b/ui/Makefile.in
@@ -38,9 +38,9 @@ subdir = ui
DIST_COMMON = $(am__dist_ui_DATA_DIST) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
- $(top_srcdir)/m4/openssl.m4 $(top_srcdir)/m4/sasl2.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/openssl.m4 \
+ $(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -127,6 +127,7 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
LIBBONOBO_IDL = @LIBBONOBO_IDL@
diff --git a/ui/properties.glade b/ui/properties.glade
@@ -184,6 +184,26 @@
<property name="fill">False</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkCheckButton" id="summary_tooltip_check">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Whether to display the mail summary in the status icon tooltip or not</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Dis_play mail summary in tooltip</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -303,7 +323,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
<signal name="changed" handler="mn_properties_mail_reader_entry_changed_h" after="yes" last_modification_time="Fri, 29 Oct 2004 16:48:44 GMT"/>
</widget>
@@ -358,7 +378,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>
@@ -412,7 +432,7 @@
<property name="max_length">0</property>
<property name="text" translatable="yes"></property>
<property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
+ <property name="invisible_char">*</property>
<property name="activates_default">False</property>
</widget>
<packing>