From: Paul Mangan Date: Wed, 3 Nov 2004 04:41:29 +0000 (+0000) Subject: 2004-11-03 [paul] 0.9.12cvs138.1 X-Git-Tag: gtk2_win32_last_merge~112 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=ebfbc002a02fc1672b85f5f60e6afc88f7ba381a 2004-11-03 [paul] 0.9.12cvs138.1 * ChangeLog.claws * configure.ac * po/POTFILES.in * src/prefs_ext_prog.c * src/procmime.c * tools/kdeservicemenu/README * tools/kdeservicemenu/template_sylpheed-attach-files.desktop * tools/kdeservicemenu/template_sylpheed-compress-attach.desktop sync with HEAD --- diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index a9809d055..71a3159df 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,15 @@ +2004-11-03 [paul] 0.9.12cvs138.1 + + * ChangeLog.claws + * configure.ac + * po/POTFILES.in + * src/prefs_ext_prog.c + * src/procmime.c + * tools/kdeservicemenu/README + * tools/kdeservicemenu/template_sylpheed-attach-files.desktop + * tools/kdeservicemenu/template_sylpheed-compress-attach.desktop + sync with HEAD + 2004-11-01 [christoph] 0.9.12cvs136.2 * src/procmime.c diff --git a/ChangeLog.claws b/ChangeLog.claws index be8938c8a..9b33e9bde 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,32 @@ +2004-11-03 [paul] 0.9.12cvs138 + + * po/POTFILES.in + add 'src/plugins/pgpmime/prefs_gpg.c'. + Patch submitted by Fabien Vantard + + * src/prefs_ext_prog.c + fix typos. Patch submitted by Fabien Vantard + + * tools/kdeservicemenu/template_sylpheed-attach-files.desktop + * tools/kdeservicemenu/template_sylpheed-compress-attach.desktop + add German, Spanish, Italian, Brazilian Portuguese, + and Slovak translations. Submitted by Thomas Gilgin, + J. José del Río 'partymola', Andrea Spadaccini, + Frederico Goncalves Guimaraes, and Andrej Kacian + +2004-11-01 [christoph] 0.9.12cvs137 + + * src/procmime.c + implement RFC2231's parameter encoding + +2004-10-29 [colin] 0.9.12cvs136 + + * src/common/utils.c + Fix boundary delimiter (a Pine user gets this: + > Malformed message: Unexpected characters at end of parameters: + > =_Thu__28_Oct_2) + + 2004-10-29 [paul] * tools/textviewer.sh diff --git a/PATCHSETS b/PATCHSETS index 150470121..bc264e2f1 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -212,3 +212,4 @@ ( cvs diff -u -r 1.654.2.244 -r 1.654.2.245 configure.ac; cvs diff -u -r 0 -r 1 doc/src/rfc2231.txt; cvs diff -u -r 1.49.2.13 -r 1.49.2.14 src/procmime.c; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 src/common/quoted-printable.c; cvs diff -u -r 1.36.2.11 -r 1.36.2.12 src/common/utils.c; cvs diff -u -r 1.20.2.8 -r 1.20.2.9 src/common/utils.h; ) > 0.9.12cvs135.1.patchset ( cvs diff -u -r 1.36.2.12 -r 1.36.2.13 src/common/utils.c; ) > 0.9.12cvs136.1.patchset ( cvs diff -u -r 1.49.2.14 -r 1.49.2.15 src/procmime.c; ) > 0.9.12cvs136.2.patchset +( cvs diff -u -r 1.2504.2.28 -r 1.2504.2.29 ChangeLog.claws; cvs diff -u -r 1.654.2.247 -r 1.654.2.248 configure.ac; cvs diff -u -r 1.53.2.7 -r 1.53.2.8 po/POTFILES.in; cvs diff -u -r 1.3.2.2 -r 1.3.2.3 src/prefs_ext_prog.c; cvs diff -u -r 1.49.2.15 -r 1.49.2.16 src/procmime.c; cvs diff -u -r 1.2.2.2 -r 1.2.2.3 tools/kdeservicemenu/README; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 tools/kdeservicemenu/template_sylpheed-attach-files.desktop; cvs diff -u -r 1.3.2.1 -r 1.3.2.2 tools/kdeservicemenu/template_sylpheed-compress-attach.desktop; ) > 0.9.12cvs138.1.patchset diff --git a/configure.ac b/configure.ac index d3213f747..da63e550e 100644 --- a/configure.ac +++ b/configure.ac @@ -11,9 +11,9 @@ MINOR_VERSION=9 MICRO_VERSION=12 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=136 +EXTRA_VERSION=138 EXTRA_RELEASE= -EXTRA_GTK2_VERSION=.2 +EXTRA_GTK2_VERSION=.1 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION} diff --git a/po/POTFILES.in b/po/POTFILES.in index 910a11001..cd1780b6d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -73,9 +73,11 @@ src/plugins/image_viewer/plugin.c src/plugins/image_viewer/viewer.c src/plugins/image_viewer/viewerprefs.c src/plugins/mathml_viewer/mathml_viewer.c -src/plugins/pgpmime/sgpgme.c src/plugins/pgpmime/passphrase.c +src/plugins/pgpmime/plugin.c +src/plugins/pgpmime/prefs_gpg.c src/plugins/pgpmime/select-keys.c +src/plugins/pgpmime/sgpgme.c src/plugins/spamassassin/spamassassin.c src/plugins/spamassassin/spamassassin_gtk.c src/plugins/trayicon/trayicon.c diff --git a/src/prefs_ext_prog.c b/src/prefs_ext_prog.c index 80ed6a0dd..453495fd0 100644 --- a/src/prefs_ext_prog.c +++ b/src/prefs_ext_prog.c @@ -121,8 +121,8 @@ void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window, gtk_table_attach(GTK_TABLE (table2), uri_label, 0, 1, 0, 1, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 2); - gtk_label_set_justify(GTK_LABEL (hint_label), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment(GTK_MISC (hint_label), 1, 0.5); + gtk_label_set_justify(GTK_LABEL (uri_label), GTK_JUSTIFY_RIGHT); + gtk_misc_set_alignment(GTK_MISC (uri_label), 1, 0.5); uri_combo = gtk_combo_new (); gtk_widget_show (uri_combo); @@ -150,8 +150,8 @@ void prefs_ext_prog_create_widget(PrefsPage *_page, GtkWindow *window, gtk_table_attach(GTK_TABLE (table2), printcmd_label, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 2); - gtk_label_set_justify(GTK_LABEL (hint_label), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment(GTK_MISC (hint_label), 1, 0.5); + gtk_label_set_justify(GTK_LABEL (printcmd_label), GTK_JUSTIFY_RIGHT); + gtk_misc_set_alignment(GTK_MISC (printcmd_label), 1, 0.5); printcmd_entry = gtk_entry_new (); gtk_widget_show (printcmd_entry); diff --git a/src/procmime.c b/src/procmime.c index 6f07f6b19..1b565c077 100644 --- a/src/procmime.c +++ b/src/procmime.c @@ -1632,8 +1632,6 @@ static void write_parameters(gpointer key, gpointer value, gpointer user_data) FILE *fp = user_data; EncodeAs encas = ENC_AS_TOKEN; - fprintf(fp, "; %s=", param); - for (valpos = val; *valpos != 0; valpos++) { if (!IS_ASCII(*valpos)) { encas = ENC_AS_EXTENDED; @@ -1671,16 +1669,27 @@ static void write_parameters(gpointer key, gpointer value, gpointer user_data) switch (encas) { case ENC_AS_TOKEN: + fprintf(fp, "; %s=", param); fprintf(fp, "%s", val); break; case ENC_AS_QUOTED_STRING: + fprintf(fp, "; %s=", param); fprintf(fp, "\"%s\"", val); break; case ENC_AS_EXTENDED: - /* FIXME: not yet handled */ - fprintf(fp, "%s", val); + fprintf(fp, "; %s*=", param); + fprintf(fp, "%s''", conv_get_current_charset_str()); + for (valpos = val; *valpos != '\0'; valpos++) { + if (IS_ASCII(*valpos) && isalnum(*valpos)) + fprintf(fp, "%c", *valpos); + else { + gchar hexstr[3] = "XX"; + get_hex_str(hexstr, *valpos); + fprintf(fp, "%%%s", hexstr); + } + } break; } } diff --git a/tools/kdeservicemenu/README b/tools/kdeservicemenu/README index 1e1a600c3..fb522a52d 100644 --- a/tools/kdeservicemenu/README +++ b/tools/kdeservicemenu/README @@ -53,7 +53,13 @@ and is released under the GPL. It was originally part of his and has been adapted for Sylpheed servicemenu for Konqueror -French Translation: Fabien Vantard +Translators: +[de] Thomas Gilgin +[es] J. José del Río 'partymola' +[fr] Fabien Vantard +[it] Andrea Spadaccini +[pt_BR] Frederico Goncalves Guimaraes +[sk] Andrej Kacian LINKS Sylpheed-Claws diff --git a/tools/kdeservicemenu/template_sylpheed-attach-files.desktop b/tools/kdeservicemenu/template_sylpheed-attach-files.desktop index 33c32beae..a828c9674 100644 --- a/tools/kdeservicemenu/template_sylpheed-attach-files.desktop +++ b/tools/kdeservicemenu/template_sylpheed-attach-files.desktop @@ -6,18 +6,33 @@ ServiceTypes=all/allfiles [Desktop Action AttachFiles] Name=Attach File(s) +Name[de]=Datei(en) anhängen +Name[es]=Adjuntar fichero(s) Name[fr]=Joindre le(s) Fichier(s) +Name[it]=Allega file +Name[pt_BR]=Anexar arquivo(s) +Name[sk]=PripojiÅ¥ súbor(y) Icon=sylpheed Exec=SCRIPT_PATH attachfile %F [Desktop Action GZipAndAttach] Name=Attach as GZip File(s) +Name[de]=Als GZip-Datei(en) anhängen +Name[es]=Adjuntar como fichero(s) GZip Name[fr]=Joindre comme Fichier(s) GZip +Name[it]=Allega come file .gz +Name[pt_BR]=Anexar como arquivo(s) GZip +Name[sk]=PripojiÅ¥ ako súbor(y) GZip Icon=sylpheed Exec=SCRIPT_PATH gz %F [Desktop Action BZipAndAttach] Name=Attach as BZip File(s) +Name[de]=Als BZip-Datei(en) anhängen +Name[es]=Adjuntar como fichero(s) BZip Name[fr]=Joindre comme Fichier(s) Bzip +Name[it]=Allega come file .bz +Name[pt_BR]=Anexar como arquivo(s) BZip +Name[sk]=PripojiÅ¥ ako súbor(y) Bzip Icon=sylpheed Exec=SCRIPT_PATH bz2 %F diff --git a/tools/kdeservicemenu/template_sylpheed-compress-attach.desktop b/tools/kdeservicemenu/template_sylpheed-compress-attach.desktop index de8b33d89..2916e737e 100644 --- a/tools/kdeservicemenu/template_sylpheed-compress-attach.desktop +++ b/tools/kdeservicemenu/template_sylpheed-compress-attach.desktop @@ -6,24 +6,44 @@ ServiceTypes=all/all [Desktop Action TarAndAttach] Name=Attach as Tar Archive +Name[de]=Als Tar-Archiv anhängen +Name[es]=Adjuntar como Archivo Tar Name[fr]=Joindre comme Archive Tar +Name[it]=Allega come file tar +Name[pt_BR]=Anexar como arquivo Tar +Name[sk]=Pripoji» ako archív Tar Icon=sylpheed Exec=SCRIPT_PATH tar %F [Desktop Action TarBzipAndAttach] Name=Attach as Bzipped Tar Archive -Name[fr]=Joindre comme Archive Tar Bzippée +Name[de]=Als BZip Tar-Archiv anhängen +Name[es]=Adjuntar como Archivo Tar Bzipeado +Name[fr]=Joindre comme Archive Tar Bzippée +Name[it]=Allega come file tar.bz +Name[pt_BR]=Anexar como arquivo Tar compactado com BZip +Name[sk]=Pripoji» ako Bzip-om komprimovaný archív Tar Icon=sylpheed Exec=SCRIPT_PATH tar.bz2 %F [Desktop Action TarGzipAndAttach] Name=Attach as Gzipped Tar Archive -Name[fr]=Joindre comme Archive Tar Gzippée +Name[de]=Als Gzip Tar-Archiv anhängen +Name[es]=Adjuntar como Archivo Tar Gzipeado +Name[fr]=Joindre comme Archive Tar Gzippée +Name[it]=Allega come file tar.gz +Name[pt_BR]=Anexar como arquivo Tar compactado com GZip +Name[sk]=Pripoji» ako Gzip-om komprimovaný archív Tar Icon=sylpheed Exec=SCRIPT_PATH tar.gz %F [Desktop Action ZipAndAttach] Name=Attach as Zip Archive +Name[de]=Als Zip-Archiv anhängen +Name[es]=Adjuntar como Archivo Zip Name[fr]=Joindre comme Archive Zip +Name[it]=Allega come file zip +Name[pt_BR]=Anexar como arquivo Zip +Name[sk]=Pripoji» ako archív Zip Icon=sylpheed Exec=SCRIPT_PATH zip %F