# ChangeLog for mail-client/evolution
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.166 2007/03/22 20:24:25 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.167 2007/03/27 16:02:45 dang Exp $
+
+*evolution-2.10.0 (27 Mar 2007)
+
+ 27 Mar 2007; Daniel Gryniewicz <dang@gentoo.org>
+ -files/evolution-2.7.3-bf-junk.patch.gz,
+ +files/evolution-2.8.2.1-certificate-manager-filtering.patch,
+ +files/evolution-2.9.2-bf-junk.patch.gz,
+ +files/evolution-2.9.91-cal-reply.patch, +evolution-2.10.0.ebuild:
+ gnome 2.18.0
22 Mar 2007; Zac Medico <zmedico@gentoo.org> evolution-2.8.3-r1.ebuild:
Prefer >=app-crypt/gnupg-2.0.1-r2 over =app-crypt/gnupg-1.4* as a workaround
MD5 d4f9b28fa25d52fd14a8144f22682ba9 files/evolution-2.6.2-as-needed.patch 503
RMD160 11a3c2c6bee5b14e267747dccfa7aca4eaf14fdd files/evolution-2.6.2-as-needed.patch 503
SHA256 b59fe688da890c40d5deef4c9ed791223d5dcba54a2a7286c0b588e5d974b49c files/evolution-2.6.2-as-needed.patch 503
-AUX evolution-2.7.3-bf-junk.patch.gz 10418 RMD160 8945624b19ac72b6047921b476ef968d4e9c2591 SHA1 66db9d34202c06c8fa0483bb1b321825ac245575 SHA256 a3aec31580402fb4113554acac684d12a083d22b80f273634d96e77364676dad
-MD5 74c3c80932b7e89b3b44ad3569c3cc49 files/evolution-2.7.3-bf-junk.patch.gz 10418
-RMD160 8945624b19ac72b6047921b476ef968d4e9c2591 files/evolution-2.7.3-bf-junk.patch.gz 10418
-SHA256 a3aec31580402fb4113554acac684d12a083d22b80f273634d96e77364676dad files/evolution-2.7.3-bf-junk.patch.gz 10418
AUX evolution-2.8.0-uri.patch.gz 5564 RMD160 9e92e018adfec82ffdf572cc02ef638b4a62053d SHA1 6a52be2358153d0b18a1478b58f473654491839a SHA256 04401695c07ae85490151f65432becdcc23370a55e3c3add40c2618bd398a268
MD5 a6083b552bc93e9224baecb1a4583941 files/evolution-2.8.0-uri.patch.gz 5564
RMD160 9e92e018adfec82ffdf572cc02ef638b4a62053d files/evolution-2.8.0-uri.patch.gz 5564
MD5 dbf53f4869faead04a951a25d974805e files/evolution-2.8.2.1-bf-junk.patch.gz 10431
RMD160 86f5a645ebbc69a757b6087e17186f87d1953e4e files/evolution-2.8.2.1-bf-junk.patch.gz 10431
SHA256 a6b21ef3f465c8b10e1c0b07402ec3f0697432b70eac08b369ffe31f80f3c981 files/evolution-2.8.2.1-bf-junk.patch.gz 10431
+AUX evolution-2.8.2.1-certificate-manager-filtering.patch 3040 RMD160 6e1bc22a4b83982e9405578b9a44223a9c364cfd SHA1 91211a275d79e26adf5510f45fedd3f0d569c945 SHA256 3b496e2ff6a6ba270e1f806b94ce8a910aaa5fbe14291c23a7856784d362e1fa
+MD5 23f69aad2b126a730a90295215baace3 files/evolution-2.8.2.1-certificate-manager-filtering.patch 3040
+RMD160 6e1bc22a4b83982e9405578b9a44223a9c364cfd files/evolution-2.8.2.1-certificate-manager-filtering.patch 3040
+SHA256 3b496e2ff6a6ba270e1f806b94ce8a910aaa5fbe14291c23a7856784d362e1fa files/evolution-2.8.2.1-certificate-manager-filtering.patch 3040
AUX evolution-2.8.2.1-pilot-link-as-needed.patch 594 RMD160 621f459ae77f8a98dd5bb503b40a82595c71fe21 SHA1 af81da7f16b690fe634cc83a4b605b7453a3ff07 SHA256 fe54434610d0779328b2e8ad843342d347a6b1e0b0d077a1c19041dc63b08f57
MD5 673ffa9d140881b086ec73c13d9abdc9 files/evolution-2.8.2.1-pilot-link-as-needed.patch 594
RMD160 621f459ae77f8a98dd5bb503b40a82595c71fe21 files/evolution-2.8.2.1-pilot-link-as-needed.patch 594
MD5 4431d899b1e6fff9d8ea9e3b23f33af7 files/evolution-2.8.3-missing-groupwise-feature.patch 429
RMD160 2ca3bfa4bce41eb1e7fa4f298dfd000fe6f4cb6b files/evolution-2.8.3-missing-groupwise-feature.patch 429
SHA256 88a4e262ef67d3465e4a06b11be2f23e7872b445f85a3c4e9ef41436b20182b4 files/evolution-2.8.3-missing-groupwise-feature.patch 429
+AUX evolution-2.9.2-bf-junk.patch.gz 10431 RMD160 26825a37ca603267293a8a063b3499f4c3535376 SHA1 974dbe1870d92cd4ad3d75b682f36a899bcff71b SHA256 f9de9826bd2acfaf79af15e7f41c73289693c1f77c6811f80bce1f6027de1493
+MD5 ca5ce673002b921efb90cc6df8c4872e files/evolution-2.9.2-bf-junk.patch.gz 10431
+RMD160 26825a37ca603267293a8a063b3499f4c3535376 files/evolution-2.9.2-bf-junk.patch.gz 10431
+SHA256 f9de9826bd2acfaf79af15e7f41c73289693c1f77c6811f80bce1f6027de1493 files/evolution-2.9.2-bf-junk.patch.gz 10431
+AUX evolution-2.9.91-cal-reply.patch 1679 RMD160 c8bc0e84a77b43a705ad00c7db5b93a1f1dcaabc SHA1 7ddc72ee4f6e55bbec91476713895ddd9c733c2f SHA256 5837a56bf1079f2e703d6cc5316425f583ae4975a977a2ec80684962f1be826f
+MD5 6d4ba6287ad008ef6c396d7d70efa36e files/evolution-2.9.91-cal-reply.patch 1679
+RMD160 c8bc0e84a77b43a705ad00c7db5b93a1f1dcaabc files/evolution-2.9.91-cal-reply.patch 1679
+SHA256 5837a56bf1079f2e703d6cc5316425f583ae4975a977a2ec80684962f1be826f files/evolution-2.9.91-cal-reply.patch 1679
+DIST evolution-2.10.0.tar.bz2 15525569 RMD160 ab12f69a0588d932399405982bd2561392f87aac SHA1 c1d42323250672c70655288eab83de70003b9470 SHA256 46035f6ea64c9310d6f5c9ebe0cdd851e3a3d6748d0e7d545e088dd2682251c7
DIST evolution-2.5.5.1-bf-junk.tar.bz2 10771 RMD160 7ae764761607d50024fbec32680bc57e04ac7879 SHA1 465205cf50770b72641995ec59617010dadaf204 SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045
DIST evolution-2.6.2.tar.bz2 12394719 RMD160 72133312fb9cceae74d9f0e570dd898d5119a10b SHA1 08a6a9bf3754fff71cbdf82857337b1edc13ef46 SHA256 a69c45e9deae3a2eea06af08eacb9266e6cdcd452dd600ad96c2de23effa56f5
DIST evolution-2.8.2.1.tar.bz2 12921518 RMD160 9198236aded4c8b905eb990b725d01d399308491 SHA1 ccd38cddd96a0ed0375b315eb1e8dc536ef8bc90 SHA256 4fb4b7b987a8e0677b270b44d567e7821007f2b1c4af236c66d81f35a5b4c144
DIST evolution-2.8.3.tar.bz2 12931527 RMD160 cbf86ecbee7619f54ea6e60780d5c182208c5bf3 SHA1 afde414298d65ec344f52648c1915629bf7b79c3 SHA256 08819f459185de7f36ac43702bb5314d1b2a9fae33db9ac4c5d9dfb3aaabca90
+EBUILD evolution-2.10.0.ebuild 6604 RMD160 b58ae6840a59209b4aea47b0ae1559225c8464bf SHA1 d493c3c21e37da3885ad86a13c95e11c4a8a9889 SHA256 5677bb4a8be7f2858840d2e36dea1efaa0caf021aee6d0e9a0d53c6b05d72a32
+MD5 ddc89b424bcd53f862b023ab718d135b evolution-2.10.0.ebuild 6604
+RMD160 b58ae6840a59209b4aea47b0ae1559225c8464bf evolution-2.10.0.ebuild 6604
+SHA256 5677bb4a8be7f2858840d2e36dea1efaa0caf021aee6d0e9a0d53c6b05d72a32 evolution-2.10.0.ebuild 6604
EBUILD evolution-2.6.2-r1.ebuild 6093 RMD160 80ba324287a41d60582fc9983d74d55ad9781ef0 SHA1 325ef903fe2670a8ba51e7b00899a534d01fc868 SHA256 2b82e23e800e9856955cb39b1f3fd91caae4def71b7e58aa11c4388b44cec9a3
MD5 7ec60cee6b484082d89e292811a06d2b evolution-2.6.2-r1.ebuild 6093
RMD160 80ba324287a41d60582fc9983d74d55ad9781ef0 evolution-2.6.2-r1.ebuild 6093
MD5 f2a3101c8a4999257d8a994cb2c87f71 evolution-2.8.3-r1.ebuild 6622
RMD160 26988b75fcd8264975701cad78bc69b8ddc6c4b3 evolution-2.8.3-r1.ebuild 6622
SHA256 f7c1cc01084ef119d5bca42345c90943ff99826f92d7afa9a04a1dd0adcace4b evolution-2.8.3-r1.ebuild 6622
-MISC ChangeLog 41605 RMD160 70bbd72fc942c9f354c9ba06708c14182a92b5a2 SHA1 794fbc00454cb1c324fb4a8d89f8f7732bafb16d SHA256 c2c1da1a8ee19c9ef3829dd636911f343b5bb88944f02b028c49aec5252f4082
-MD5 2f6c379f9517300c626820c03d366844 ChangeLog 41605
-RMD160 70bbd72fc942c9f354c9ba06708c14182a92b5a2 ChangeLog 41605
-SHA256 c2c1da1a8ee19c9ef3829dd636911f343b5bb88944f02b028c49aec5252f4082 ChangeLog 41605
+MISC ChangeLog 41921 RMD160 8e4edd181149e400cac6670ee262057fac80bbf7 SHA1 9c60692bdeb8b223e10bc4f58507167be2084409 SHA256 51736c719e35ede435a016e6545c0598bd6751c454251613b036fd6b6f387398
+MD5 6c312ca16e0b5a1a57dc32a0a29cb670 ChangeLog 41921
+RMD160 8e4edd181149e400cac6670ee262057fac80bbf7 ChangeLog 41921
+SHA256 51736c719e35ede435a016e6545c0598bd6751c454251613b036fd6b6f387398 ChangeLog 41921
MISC metadata.xml 228 RMD160 56f093a5237fbe1d26c6914d47d4092d9de0cbcf SHA1 a7000d8d92e63e8b0bcb2531adea06af0fb4ceac SHA256 2f477aca2b0940f4b8d5a5817f1def0daa79846e5d3cb9b6c832a02ee7be298a
MD5 adc1e2cec38f3e23b706de11a2ac0d92 metadata.xml 228
RMD160 56f093a5237fbe1d26c6914d47d4092d9de0cbcf metadata.xml 228
SHA256 2f477aca2b0940f4b8d5a5817f1def0daa79846e5d3cb9b6c832a02ee7be298a metadata.xml 228
+MD5 f8d4aba59d751576bb8b1210d5b9c0bd files/digest-evolution-2.10.0 536
+RMD160 20927d7c2ffb555e659935abb3a8da6e834c761e files/digest-evolution-2.10.0 536
+SHA256 055cde66f45f8cf2ca1958819b0d8550283dac9720747cb0d885c88b9c10deae files/digest-evolution-2.10.0 536
MD5 f58ca96f6e0006d63acada5e98d62982 files/digest-evolution-2.6.2-r1 533
RMD160 94fb86de744f42bcae39b6f5a0d6276ed559014e files/digest-evolution-2.6.2-r1 533
SHA256 730a2ffe0655db234cb17adecb91357a37e42064f41dc64cccfb7ab2fda0614d files/digest-evolution-2.6.2-r1 533
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.3 (GNU/Linux)
-iD8DBQFGAuX+/ejvha5XGaMRAqsUAKDfODvuBX+oc8vPzDKV7s069PU8eQCdHnV1
-oiV4nFxyvKHgx5izQFzfpD8=
-=3u10
+iD8DBQFGCT/EomPajV0RnrERAmMCAJoDEDJhyQC8TOUZNLIH8+g+Q+ZAaQCdFYve
++e9XvSrN0+UV++YZD+auGVU=
+=Sb0u
-----END PGP SIGNATURE-----
--- /dev/null
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.10.0.ebuild,v 1.1 2007/03/27 16:02:45 dang Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="1.9"
+inherit eutils flag-o-matic alternatives gnome2 autotools
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+SRC_URI="${SRC_URI}
+ bogofilter? ( mirror://gentoo/${PN}-2.5.5.1-bf-junk.tar.bz2 )"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+# gstreamer for audio-inline, when it uses 0.10
+IUSE="bogofilter crypt dbus debug doc hal ipv6 kerberos krb4 ldap mono networkmanager nntp pda profile spell ssl"
+
+# Pango dependency required to avoid font rendering problems
+RDEPEND=">=x11-themes/gnome-icon-theme-1.2
+ dev-libs/atk
+ >=gnome-extra/gtkhtml-3.14.0
+ >=dev-libs/glib-2.10
+ >=gnome-base/orbit-2.9.8
+ >=gnome-base/libbonobo-2
+ >=gnome-extra/evolution-data-server-1.9.4
+ >=gnome-base/libbonoboui-2.4.2
+ >=gnome-base/gnome-vfs-2.4
+ >=gnome-base/libgnomeui-2
+ >=gnome-base/libglade-2
+ >=gnome-base/libgnomecanvas-2
+ >=dev-libs/libxml2-2
+ >=gnome-base/gconf-2
+ >=gnome-base/libgnomeprintui-2.2.1
+ >=x11-libs/gtk+-2
+ >=gnome-base/libgnome-2
+ >=net-libs/libsoup-2.2.96
+ >=x11-libs/pango-1.8.1
+ x11-libs/libnotify
+ hal? ( >=sys-apps/hal-0.5.4 )
+ pda? (
+ >=app-pda/gnome-pilot-2
+ >=app-pda/gnome-pilot-conduits-2 )
+ spell? ( >=app-text/gnome-spell-1.0.5 )
+ crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) )
+ ssl? (
+ >=dev-libs/nspr-4.6.1
+ >=dev-libs/nss-3.11 )
+ ldap? ( >=net-nds/openldap-2 )
+ kerberos? ( virtual/krb5 )
+ krb4? ( virtual/krb5 )
+ dbus? ( || (
+ dev-libs/dbus-glib
+ ~sys-apps/dbus-0.62 ) )
+ networkmanager? ( net-misc/networkmanager )
+ mono? ( >=dev-lang/mono-1 )
+ bogofilter? ( mail-filter/bogofilter )
+ !bogofilter? ( mail-filter/spamassassin )"
+# gstreamer? (
+# >=media-libs/gstreamer-0.10
+# >=media-libs/gst-plugins-base-0.10 )
+
+DEPEND="${RDEPEND}
+ >=dev-util/pkgconfig-0.9
+ >=dev-util/intltool-0.35.5
+ sys-devel/gettext
+ sys-devel/bison
+ app-text/scrollkeeper
+ >=gnome-base/gnome-common-2.12.0
+ doc? ( >=dev-util/gtk-doc-0.6 )"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+ELTCONF="--reverse-deps"
+
+
+pkg_setup() {
+ G2CONF="--disable-default-binary \
+ --without-kde-applnk-path \
+ $(use_enable ssl nss) \
+ $(use_enable ssl smime) \
+ $(use_enable ipv6) \
+ $(use_enable mono) \
+ $(use_enable nntp) \
+ $(use_enable pda pilot-conduits) \
+ $(use_enable profile profiling) \
+ $(use_with ldap openldap) \
+ $(use_with kerberos krb5 /usr)"
+
+ # We need a graphical pinentry frontend to be able to ask for the GPG
+ # password from inside evolution, bug 160302
+ if use crypt && has_version '>=app-crypt/gnupg-2.0.1-r2'; then
+ if ! built_with_use -o app-crypt/pinentry gtk qt3; then
+ die "You must build app-crypt/pinentry with GTK or QT3 support"
+ fi
+ fi
+
+ if use krb4 && ! built_with_use virtual/krb5 krb4; then
+ ewarn
+ ewarn "In order to add kerberos 4 support, you have to emerge"
+ ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
+ ewarn
+ ewarn "Skipping for now."
+ ewarn
+ G2CONF="${G2CONF} --without-krb4"
+ else
+ G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
+ fi
+
+ # Plug-ins to install. Normally we would want something similar to
+ # --enable-plugins=all (plugins_base + plugins_standard), except for some
+ # special cases.
+ local plugins="calendar-file calendar-http calendar-weather \
+ itip-formatter plugin-manager default-source addressbook-file \
+ startup-wizard print-message mark-all-read groupwise-features \
+ groupwise-account-setup hula-account-setup mail-account-disable \
+ publish-calendar caldav imap-features \
+ bbdb subject-thread save-calendar select-one-source copy-tool \
+ mail-to-task mark-calendar-offline mailing-list-actions \
+ new-mail-notify default-mailer import-ics-attachments"
+
+ # For dev releases, add experimental plugins
+ plugins="${plugins} backup-restore folder-unsubscribe mail-to-meeting \
+ prefer-plain save-attachments"
+
+ if use bogofilter; then
+ plugins="${plugins} bf-junk-plugin"
+ else
+ plugins="${plugins} sa-junk-plugin"
+ fi
+
+ # The special cases
+
+ # remove this due to bug #128035 re-enable later if it doesn't dep on
+ # gstreamer-0.8
+ # use gstreamer && plugins="${plugins} audio-inline"
+ use dbus && plugins="${plugins} new-mail-notify"
+ use mono && plugins="${plugins} mono"
+
+ if built_with_use gnome-extra/evolution-data-server ldap; then
+ plugins="${plugins} exchange-operations"
+ fi
+
+ local pluginlist=""
+ for p in $plugins; do
+ [ "x$pluginlist" != "x" ] && pluginlist="${pluginlist},"
+ pluginlist="${pluginlist}${p}"
+ done
+
+ G2CONF="${G2CONF} --enable-plugins=${pluginlist}"
+}
+
+src_unpack() {
+ gnome2_src_unpack
+
+ # Accept the list of plugins separated by commas instead of spaces.
+ epatch "${FILESDIR}"/${PN}-2.3.7-configure_plugins.patch
+
+ # Fix 64-bit warnings
+ epatch "${FILESDIR}"/${PN}-2.8.1.1-64-bit.patch
+
+ # Fix linking against pilot-link wiht --as-needed; bug #154453
+ epatch "${FILESDIR}"/${PN}-2.8.2.1-pilot-link-as-needed.patch
+
+ # Fix "reply to meeting" buffer overruns
+ epatch "${FILESDIR}"/${PN}-2.9.91-cal-reply.patch
+
+ # Add bogofilter junk plugin source
+ use bogofilter && epatch "${FILESDIR}"/${PN}-2.9.2-bf-junk.patch.gz
+
+ # certificate filtering for clueless users (and even for those who know)
+ epatch ${FILESDIR}/${PN}-2.8.2.1-certificate-manager-filtering.patch
+
+ eautoreconf
+}
+
+src_compile() {
+ # Use NSS/NSPR only if 'ssl' is enabled.
+ if use ssl ; then
+ sed -i -e "s|mozilla-nss|nss|
+ s|mozilla-nspr|nspr|" ${S}/configure
+ G2CONF="${G2CONF} --enable-nss=yes"
+ else
+ G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
+ --without-nss-libs --without-nss-includes"
+ fi
+
+ # problems with -O3 on gcc-3.3.1
+ replace-flags -O3 -O2
+
+ if [ "${ARCH}" = "hppa" ]; then
+ append-flags "-fPIC -ffunction-sections"
+ export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
+ fi
+
+ gnome2_src_compile
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9][0-9]"
+ elog "To change the default browser if you are not using GNOME, do:"
+ elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
+ elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
+ elog ""
+ elog "Replace 'mozilla %s' with which ever browser you use."
+}
--- /dev/null
+MD5 68d32e518f235bea9d768ae55e91bffc evolution-2.10.0.tar.bz2 15525569
+RMD160 ab12f69a0588d932399405982bd2561392f87aac evolution-2.10.0.tar.bz2 15525569
+SHA256 46035f6ea64c9310d6f5c9ebe0cdd851e3a3d6748d0e7d545e088dd2682251c7 evolution-2.10.0.tar.bz2 15525569
+MD5 31456188591167083628df719adc8f22 evolution-2.5.5.1-bf-junk.tar.bz2 10771
+RMD160 7ae764761607d50024fbec32680bc57e04ac7879 evolution-2.5.5.1-bf-junk.tar.bz2 10771
+SHA256 b8988b28836a201606d8fa651f48722ebac8c984dcc171f7f7a3b860d0f7a045 evolution-2.5.5.1-bf-junk.tar.bz2 10771
--- /dev/null
+Index: smime/gui/certificate-manager.c
+===================================================================
+--- smime/gui/certificate-manager.c (révision 33213)
++++ smime/gui/certificate-manager.c (copie de travail)
+@@ -133,6 +133,8 @@
+ const char *filename;
+
+ #ifdef USE_GTKFILECHOOSER
++ GtkFileFilter* filter;
++
+ filesel = gtk_file_chooser_dialog_new (_("Select a certificate to import..."),
+ NULL,
+ GTK_FILE_CHOOSER_ACTION_OPEN,
+@@ -140,6 +142,16 @@
+ GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ NULL);
+ gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_OK);
++
++ filter = gtk_file_filter_new();
++ gtk_file_filter_set_name (filter, _("All PKCS12 files"));
++ gtk_file_filter_add_mime_type (filter, "application/x-pkcs12");
++ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
++
++ filter = gtk_file_filter_new ();
++ gtk_file_filter_set_name (filter, _("All files"));
++ gtk_file_filter_add_pattern (filter, "*");
++ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
+ #else
+ filesel = gtk_file_selection_new (_("Select a certificate to import..."));
+ #endif
+@@ -372,6 +384,8 @@
+ const char *filename;
+
+ #ifdef USE_GTKFILECHOOSER
++ GtkFileFilter *filter;
++
+ filesel = gtk_file_chooser_dialog_new (_("Select a certificate to import..."),
+ NULL,
+ GTK_FILE_CHOOSER_ACTION_OPEN,
+@@ -379,6 +393,16 @@
+ GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ NULL);
+ gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_OK);
++
++ filter = gtk_file_filter_new();
++ gtk_file_filter_set_name (filter, _("All email certificate files"));
++ gtk_file_filter_add_mime_type (filter, "application/x-x509-email-cert");
++ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
++
++ filter = gtk_file_filter_new ();
++ gtk_file_filter_set_name (filter, _("All files"));
++ gtk_file_filter_add_pattern (filter, "*");
++ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
+ #else
+ filesel = gtk_file_selection_new (_("Select a certificate to import..."));
+ #endif
+@@ -592,6 +616,8 @@
+ const char *filename;
+
+ #ifdef USE_GTKFILECHOOSER
++ GtkFileFilter *filter;
++
+ filesel = gtk_file_chooser_dialog_new (_("Select a certificate to import..."),
+ NULL,
+ GTK_FILE_CHOOSER_ACTION_OPEN,
+@@ -599,6 +625,16 @@
+ GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ NULL);
+ gtk_dialog_set_default_response (GTK_DIALOG (filesel), GTK_RESPONSE_OK);
++
++ filter = gtk_file_filter_new();
++ gtk_file_filter_set_name (filter, _("All CA certificate files"));
++ gtk_file_filter_add_mime_type (filter, "application/x-x509-ca-cert");
++ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
++
++ filter = gtk_file_filter_new ();
++ gtk_file_filter_set_name (filter, _("All files"));
++ gtk_file_filter_add_pattern (filter, "*");
++ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (filesel), filter);
+ #else
+ filesel = gtk_file_selection_new (_("Select a certificate to import..."));
+ #endif
--- /dev/null
+diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN evolution-2.9.91.orig/calendar/gui/itip-utils.c evolution-2.9.91/calendar/gui/itip-utils.c
+--- evolution-2.9.91.orig/calendar/gui/itip-utils.c 2007-01-08 09:50:33.000000000 -0500
++++ evolution-2.9.91/calendar/gui/itip-utils.c 2007-02-15 17:37:12.000000000 -0500
+@@ -1476,28 +1476,28 @@ reply_to_calendar_comp (ECalComponentIti
+ body = "<br><br><hr><br><b>______ Original Appointment ______ </b><br><br><table>";
+
+ if (orig_from && *orig_from){
+- char *part1 = (char *) malloc (sizeof (char) * 200);
++ char *part1 = (char *) malloc (50 + strlen (orig_from));
+ sprintf (part1, "<tr><td><b>From</b></td><td>:</td><td>%s</td></tr>", orig_from);
+ body = g_strconcat (body, (gchar *)part1, NULL);
+ g_free (part1);
+ }
+
+ if (subject){
+- char *part2 = (char *) malloc (sizeof (char) * 100);
++ char *part2 = (char *) malloc (53 + strlen (subject));
+ sprintf (part2, "<tr><td><b>Subject</b></td><td>:</td><td>%s</td></tr>", subject);
+ body = g_strconcat (body, (gchar *)part2, NULL);
+ g_free (part2);
+ }
+
+ {
+- char *part3 = (char *) malloc (sizeof (char) * 100);
++ char *part3 = (char *) malloc (54 + strlen (location));
+ sprintf (part3, "<tr><td><b>Location</b></td><td>:</td><td>%s</td></tr>", location);
+ body = g_strconcat (body, (gchar *)part3, NULL);
+ g_free (part3);
+ }
+
+ if (time){
+- char *part4 = (char *) malloc (sizeof (char) * 100);
++ char *part4 = (char *) malloc (64 + strlen (time));
+ sprintf (part4, "<tr><td><b>Time</b></td><td>:</td><td>%s</td></tr></table><br>", time);
+ body = g_strconcat (body, (gchar *)part4, NULL);
+ g_free (part4);
projects / gentoo.git / commitdiff