--- evolution-2.30.2.orig/debian/evolution-2.2.desktop +++ evolution-2.30.2/debian/evolution-2.2.desktop @@ -0,0 +1,117 @@ +[Desktop Entry] +Name=Evolution +Name[ar]=افُليوشِن +Name[az]=Evolution +Name[be]="Эвалюцыя" +Name[bg]=Evolution +Name[bn]=Evolution +Name[ca]=Evolution +Name[cs]=Evolution +Name[cy]=Evolution +Name[da]=Evolution +Name[de]=Evolution +Name[el]=Evolution +Name[en_CA]=Evolution +Name[en_GB]=Evolution +Name[es]=Evolution +Name[et]=Evolution +Name[eu]=Evolution +Name[fa]=Evolution +Name[fi]=Evolution +Name[fr]=Evolution +Name[ga]=Evolution +Name[gl]=Evolution +Name[gu]=ઈવોલ્યુશન +Name[hr]=Evolution +Name[hu]=Evolution +Name[id]=Evolution +Name[it]=Evolution +Name[ja]=Evolution +Name[ko]=Evolution +Name[lt]=Evolution +Name[lv]=Evolution +Name[mn]=Эволюшин +Name[ms]=Evolution +Name[nb]=Evolution +Name[ne]=इभुलोसन +Name[nl]=Evolution +Name[nn]=Evolution +Name[no]=Evolution +Name[pa]=ਈਵੇਲੂਸ਼ਨ +Name[pl]=Evolution +Name[pt]=Evolution +Name[pt_BR]=Evolution +Name[ro]=Evolution +Name[ru]=Evolution +Name[rw]=Impinduka +Name[sk]=Evolution +Name[sl]=Evolucija +Name[sq]=Evolution +Name[sr]=Еволуција +Name[sr@Latn]=Evolucija +Name[sv]=Evolution +Name[th]=Evolution +Name[tr]=Evolution +Name[uk]=Evolution +Name[vi]=Evolution +Name[wa]=Evolution +Name[xh]=I-Evolution +Name[zh_CN]=Evolution +Name[zh_TW]=Evolution +Comment=Manage email, calendar, contacts and tasks +Comment[bg]=Програма за работа в група Evolution +Comment[bn]=Evolution Groupware Suite +Comment[ca]=El paquet d'aplicacions de treball en grup Evolution +Comment[cs]=Sada nástrojů pro skupinovou spolupráci Evolution +Comment[cy]=Cyfres Meddalwedd Grŵp Evolution +Comment[da]=Samarbejdsprogrammellet Evolution +Comment[de]=Die Groupware-Suite Evolution +Comment[el]=Η σουίτα εφαρμογών του Evolution +Comment[en_CA]=The Evolution Groupware Suite +Comment[en_GB]=The Evolution Groupware Suite +Comment[es]=La suite de trabajo en grupo Evolution +Comment[et]=Evolution grupitarkvarakomplekt +Comment[eu]=Evolution-en talde-lanerako suitea +Comment[fi]=Evolution työryhmäohjelmisto +Comment[fr]=La suite de travail collaboratif Evolution +Comment[gu]=ઈવોલ્યુશન ગ્રુપવેર સેવા +Comment[hu]=Az Evolution csoportmunka-programcsomag +Comment[id]=The Evolution Groupware Suite +Comment[it]=La suite Evolution per il groupware +Comment[ja]=Evolution グループウェア・スイートです +Comment[ko]=Evolution 그룹웨어 모음 +Comment[lt]=Evolution grupinio darbo rinkinys +Comment[ms]=Sut perisian kumpulan Evolution +Comment[nb]=Gruppevaresuiten Evolution +Comment[ne]=इभोलुसन ग्रुपवेर सुट +Comment[nl]=De Evolution Groupware suite +Comment[nn]=Pakka Evolution Groupware +Comment[no]=Gruppevaresuiten Evolution +Comment[pa]=ਈਵੇਲੂਸ਼ਨ ਸਮੂਹਵੇਅਰ ਸਰੂਪ +Comment[pl]=Pakiet do pracy grupowej Evolution +Comment[pt]=O Pacote de Colaboração Evolution +Comment[pt_BR]=O Conjunto de Aplicações para Grupos de Trabalho Evolution +Comment[ro]=Suita Groupware Evolution +Comment[ru]=Набор приложений групповой работы Evolution +Comment[sq]=Suite Groupware e Evolution. +Comment[sr]=Пакет програма Еволуција +Comment[sr@Latn]=Paket programa Evolucija +Comment[sv]=Grupprogramvarusviten Evolution +Comment[th]=ชุดกรุ๊ปแวร์ Evolution +Comment[tr]=Evolution Groupware Programları +Comment[uk]=Набір програм для групової роботи Evolution +Comment[vi]=Bộ phần mềm nhóm Evolution +Comment[xh]=I-Groupware Suite ye-Evolution +Comment[zh_CN]=Evolution 群件套件 +Comment[zh_TW]=Evolution Groupware 套件 +Exec=evolution +Icon=evolution +Terminal=false +Type=Application +Categories=GNOME;Office;X-Red-Hat-Base; +NoDisplay=true +StartupNotify=true +X-GNOME-Bugzilla-Bugzilla=GNOME +X-GNOME-Bugzilla-Product=Evolution +X-GNOME-Bugzilla-Version=2.29.x +X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.30;evolution-exchange-storage;evolution-alarm-notify; --- evolution-2.30.2.orig/debian/evolution.install +++ evolution-2.30.2/debian/evolution.install @@ -0,0 +1,6 @@ +debian/tmp/etc/gconf +debian/tmp/etc/xdg +debian/tmp/usr/bin +debian/tmp/usr/lib/evolution/2.30/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,python,startup-wizard,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,gnome-evolution-webdav,mail-account-disable,publish-calendar,caldav,webdav,imap-features,google,sa-junk-plugin,bogo-junk-plugin,folder-permissions,folder-subscription}*.{so,eplug,xml} +debian/evolution-2.2.desktop usr/share/applications +debian/evolution.xpm usr/share/pixmaps/ --- evolution-2.30.2.orig/debian/evolution.menu +++ evolution-2.30.2/debian/evolution.menu @@ -0,0 +1,3 @@ +?package(evolution):needs="X11" section="Applications/Network/Communication" \ + title="Evolution" command="/usr/bin/evolution" \ + hints="Gnome,Mail,Calendar" icon="/usr/share/pixmaps/evolution.xpm" --- evolution-2.30.2.orig/debian/evolution-plugins-experimental.install +++ evolution-2.30.2/debian/evolution-plugins-experimental.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/evolution/2.30/plugins/*{folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,tnef-attachments,profiler}*.{so,eplug,xml} --- evolution-2.30.2.orig/debian/copyright +++ evolution-2.30.2/debian/copyright @@ -0,0 +1,210 @@ += Copyright and licensing information + +This package was debianized by Takuo KITAME on +Tue, 13 Feb 2001 21:33:43 +0900. + +It was downloaded from . + +== Authors: + +The full list is in the /usr/share/doc/evolution/AUTHORS file. + +=== Addressbook + Arturo Esponosa (Original Gnomecard author) + Nat Friedman + Chris Lahey + Chris Toshok + Jon Trowbridge + +=== Artwork + Tuomas Kuosmanen + Jakub Steiner + +=== Calendar + Seth Alves + Eric Busboom (libical author) + Arturo Esponosa (Gnomecal contributor) + Damon Chaplin + Federico Mena-Quintero + Rodrigo Moya + Jesse Pavel + JP Rosevear + Russell Steinthal (Gnomecal maintainer) + +=== Documentation + Kevin Breit + Aaron Weber + +=== Mailer + Radek Doulik + Larry Ewing + Bertrand Guiheneuf + Jason Leach + Matt Loper + Ettore Perazzoli + Jeffrey Stedfast + Jon Trowbridge + Peter Williams + Dan Winship + Michael Zucchi + +=== Notes + Anders Carlsson + +=== Pilot + JP Rosevear + +=== Shell + Miguel de Icaza + Jason Leach + Ettore Perazzoli + +=== Translations + Akira TAGOH + Andraz Tori + Andreas Hyden + Arjan Scherpenisse + Clara Tattoni + Fatih Demir + Gediminas Paulauskas + GNOME PL Team + Gustavo Maciel Dias Vieira + Héctor García Alvarez + Jesús Bravo Álvarez + Keld Simonsen + Kjartan Maraas + Matthias Warkus + Spiros Papadimitriou + Sung-Hyun Nam + Szabolcs BAN + Tiago Antão + Duarte Loreto + Valek Filippov + Vincent Renardias + Yuri Syrota + +=== UI + Anna Dirks + +=== Widgets + Damon Chaplin + Miguel de Icaza + Chris Lahey + Federico Mena-Quintero + Chris Toshok + + +== Licensing information + +=== Program license + +Evolution is licensed under the LGPLv2 or LGPLv3 license using following text: + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) version 3. + + 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the program; if not, see + +On Debian systems, the complete text of the GNU Less General Public License +(version 2) can be found in `/usr/share/common-licenses/LGPL-2'. + +=== Exceptions + +==== GPLv2 + +* addressbook/gui/widgets/e-addressbook-selector.{h,c} +* calendar/gui/e-calendar-selector.c +* calendar/gui/e-memo-list-selector.c +* calendar/gui/e-task-list-selector.c +* calendar/gui/e-task-list-selector.h +* calendar/gui/e-calendar-selector.h +* calendar/gui/e-memo-list-selector.h + +On Debian systems, the complete text of the GNU General Public License +(version 2) can be found in `/usr/share/common-licenses/GPL-2'. + +==== GPLv2+ + +* e-util/e-non-intrusive-error-dialog.{h,c} +* plugins/calendar-weather/calendar-weather.c +* plugins/calendar-http/calendar-http.c +* widgets/misc/e-spinner.{h,c} + + +On Debian systems, the complete text of the GNU General Public License +(version 2 or later) can be found in `/usr/share/common-licenses/GPL'. + +==== OpenLDAP license + +* modules/addressbook/openldap-extract.h + +---- + The OpenLDAP Public License + Version 2.8, 17 August 2003 + + Redistribution and use of this software and associated documentation + ("Software"), with or without modification, are permitted provided + that the following conditions are met: + + 1. Redistributions in source form must retain copyright statements + and notices, + + 2. Redistributions in binary form must reproduce applicable copyright + statements and notices, this list of conditions, and the following + disclaimer in the documentation and/or other materials provided + with the distribution, and + + 3. Redistributions must contain a verbatim copy of this document. + + The OpenLDAP Foundation may revise this license from time to time. + Each revision is distinguished by a version number. You may use + this Software under terms of this license revision or under the + terms of any subsequent revision of the license. + + THIS SOFTWARE IS PROVIDED BY THE OPENLDAP FOUNDATION AND ITS + CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY + AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + SHALL THE OPENLDAP FOUNDATION, ITS CONTRIBUTORS, OR THE AUTHOR(S) + OR OWNER(S) OF THE SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + The names of the authors and copyright holders must not be used in + advertising or otherwise to promote the sale, use or other dealing + in this Software without specific, written prior permission. Title + to copyright in this Software shall at all times remain with copyright + holders. + + OpenLDAP is a registered trademark of the OpenLDAP Foundation. + + Copyright 1999-2003 The OpenLDAP Foundation, Redwood City, + California, USA. All Rights Reserved. Permission to copy and + distribute verbatim copies of this document is granted. +---- + +==== MPL 1.1 / GPL2 / LGPL-2.1 + +* smime/lib/e-asn1-object.c +* smime/lib/e-cert.c +* smime/lib/e-pkcs12.c +* smime/lib/e-cert-db.c + +On Debian systems, the complete text of the GNU General Public License (version +2.1) can be found in `/usr/share/common-licenses/LGPL-2.1'. + + +// vim: filetype=asciidoc: --- evolution-2.30.2.orig/debian/watch +++ evolution-2.30.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.gnome.org/pub/GNOME/sources/evolution/([\d\.]+)[02468]/evolution-([\d\.]+)\.tar\.gz debian uupdate --- evolution-2.30.2.orig/debian/evolution-common.install +++ evolution-2.30.2/debian/evolution-common.install @@ -0,0 +1,9 @@ +debian/tmp/usr/share/applications +debian/tmp/usr/share/une/applications +debian/tmp/usr/share/mime-info +debian/tmp/usr/share/evolution +debian/tmp/usr/share/icons/hicolor +debian/tmp/usr/share/locale +debian/tmp/usr/share/gnome +debian/tmp/usr/share/omf +debian/lintian/evolution-common usr/share/lintian/overrides/ --- evolution-2.30.2.orig/debian/evolution-dev.install +++ evolution-2.30.2/debian/evolution-dev.install @@ -0,0 +1,26 @@ +debian/tmp/usr/lib/pkgconfig +debian/tmp/usr/include +debian/tmp/usr/lib/evolution/*/libcomposer.so +debian/tmp/usr/lib/evolution/*/libeabutil.so +debian/tmp/usr/lib/evolution/*/libeconduit.so +debian/tmp/usr/lib/evolution/*/libecontacteditor.so +debian/tmp/usr/lib/evolution/*/libecontactlisteditor.so +debian/tmp/usr/lib/evolution/*/libemformat.so +debian/tmp/usr/lib/evolution/*/libemiscwidgets.so +debian/tmp/usr/lib/evolution/*/libeshell.so +debian/tmp/usr/lib/evolution/*/libessmime.so +debian/tmp/usr/lib/evolution/*/libetable.so +debian/tmp/usr/lib/evolution/*/libetext.so +debian/tmp/usr/lib/evolution/*/libetimezonedialog.so +debian/tmp/usr/lib/evolution/*/libeutil.so +debian/tmp/usr/lib/evolution/*/libevolution-a11y.so +debian/tmp/usr/lib/evolution/*/libevolution-addressbook-importers.so +debian/tmp/usr/lib/evolution/*/libevolution-calendar-importers.so +debian/tmp/usr/lib/evolution/*/libevolution-calendar.so +debian/tmp/usr/lib/evolution/*/libevolution-mail-importers.so +debian/tmp/usr/lib/evolution/*/libevolution-mail-settings.so +debian/tmp/usr/lib/evolution/*/libevolution-mail.so +debian/tmp/usr/lib/evolution/*/libevolution-smime.so +debian/tmp/usr/lib/evolution/*/libfilter.so +debian/tmp/usr/lib/evolution/*/libmenus.so +debian/tmp/usr/share/gtk-doc --- evolution-2.30.2.orig/debian/control +++ evolution-2.30.2/debian/control @@ -0,0 +1,256 @@ +Source: evolution +Section: gnome +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Evolution Maintainers +Uploaders: Jordi Mallach , + Margarita Manterola , + Loic Minier , + Heikki Henriksen , + Oystein Gisnas , + Pedro Fragoso , + Yves-Alexis Perez +Standards-Version: 3.8.4 +Dm-Upload-Allowed: yes +Homepage: http://www.gnome.org/projects/evolution/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/unstable/evolution +Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution +Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/evolution/ubuntu +Build-Depends: debhelper (>= 5.0.0), + cdbs (>= 0.4.52), + dh-autoreconf (>= 1ubuntu1), + dpkg-dev (>= 1.14.16), + scrollkeeper, + flex, + bison, + intltool (>= 0.35.0), + libtool, + pkg-config (>= 0.16.0), + gnome-icon-theme (>= 2.19.92), + gnome-doc-utils (>= 0.3.2), + gtk-doc-tools (>= 0.6), + libatk1.0-dev, + libldap2-dev, + libgtkhtml3.14-dev (>= 3.30.1), + libgtkhtml-editor-dev (>= 3.30.1), + libkrb5-dev, + libnss3-dev, + psmisc, + libglib2.0-dev (>= 2.22.0), + evolution-data-server-dev (>= 2.30.2), + evolution-data-server-dev (<< 2.31), + libgtk2.0-dev (>= 2.18.0), + libgnomecanvas2-dev, + libxml2-dev, + libgconf2-dev, + libcamel1.2-dev (>= 2.30.2), + libedataserver1.2-dev (>= 2.30.2), + libegroupwise1.2-dev (>= 2.30.2), + libedataserverui1.2-dev (>= 2.30.2), + libebackend1.2-dev (>= 2.30.2), + libgdata1.2-dev (>= 2.30.2), + libgdata-google1.2-dev (>= 2.30.2), + libgnome2-dev, + libecal1.2-dev (>= 2.30.2), + libebook1.2-dev (>= 2.30.2), + libdbus-glib-1-dev, + libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libnotify-dev (>= 0.3.0), + libsoup2.4-dev, + libdbus-1-dev, + libgstreamer0.10-dev, + libytnef0-dev, + automake, + libtool, + libical-dev, + libicu-dev, + libgweather-dev (>= 2.25.3), + libgnome-desktop-dev (>= 2.26.0), + sharutils, + libunique-dev, + libcanberra-dev, + libcanberra-gtk-dev, + python-dev, + shared-mime-info (>= 0.22), + libpst-dev (>=0.6.41), + liblaunchpad-integration-dev + +Package: evolution +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + evolution-common (= ${source:Version}), + evolution-data-server (>= 2.30.2), + evolution-data-server (<< 2.31), + gnome-icon-theme (>= 2.19.92), + dbus +Recommends: gnome-desktop-data, + evolution-plugins, + evolution-webcal, + yelp, + bogofilter | spamassassin +Suggests: bug-buddy, + gnupg, + network-manager, + evolution-exchange, + evolution-dbg, + evolution-plugins-experimental +Provides: mail-reader, + imap-client +Description: groupware suite with mail client and organizer + Evolution is a groupware suite which integrates mail, calendar, + address book, to-do list and memo tools. + . + Additional features include integration with Exchange and Groupwise + servers, newsgroup client, LDAP support, web calendars and + synchronization with Palm devices. + . + Evolution is a graphical application that is part of GNOME, and + is distributed by Novell, Inc. + . + See http://www.novell.com/products/evolution/ for more + information. + . + The following plugins belonging to the "base" set are included. + - calendar-file + - calendar-http + - calendar-weather + - email-custom-headers + - itip-formatter + - plugin-manager + - python + - default-source + - addressbook-file + - startup-wizard + - mark-all-read + - groupwise-features + - groupwise-account-setup + - mail-account-disable + - publish-calendar + - caldav + - imap-features + - google-account-setup + - sa-junk-plugin + - bogo-junk-plugin + - mono + - webdav-account-setup + +Package: libevolution +Architecture: any +Depends: ${misc:Depends}, + ${shlibs:Depends} +Replaces: evolution (<< 2.29.1-1) +Description: evolution libraries + This package contains libraries used by evolution and the Anjal mail client. + +Package: evolution-common +Architecture: all +Depends: ${misc:Depends} +Recommends: evolution +Replaces: evolution-documentation-en, evolution-documentation-cs, evolution-documentation-de, evolution-documentation-el, evolution-documentation-es, evolution-documentation-fr, evolution-documentation-mk, evolution-documentation-oc, evolution-documentation-ru, evolution-documentation-sv +Conflicts: evolution-documentation-en, evolution-documentation-cs, evolution-documentation-de, evolution-documentation-el, evolution-documentation-es, evolution-documentation-fr, evolution-documentation-mk, evolution-documentation-oc, evolution-documentation-ru, evolution-documentation-sv +Provides: evolution-documentation-en, evolution-documentation-cs, evolution-documentation-de, evolution-documentation-el, evolution-documentation-es, evolution-documentation-fr, evolution-documentation-mk, evolution-documentation-oc, evolution-documentation-ru, evolution-documentation-sv +Description: architecture independent files for Evolution + Evolution is a groupware suite which integrates mail, calendar, + address book, to-do list and memo tools. + . + This package contains the architecture independent files needed + by the evolution package. + +Package: evolution-dev +Section: devel +Architecture: any +Depends: evolution (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends}, +# evolution-plugin + libxml2-dev, + libcamel1.2-dev, + libunique-dev, + libgtkhtml3.14-dev, + libgtkhtml-editor-dev, + libgnomecanvas2-dev, +# evolution-shell + libgconf2-dev, + libgnome-desktop-dev, + libgtk2.0-dev, + libedataserverui1.2-dev +Description: development library files for Evolution + Evolution is a groupware suite which integrates mail, calendar, + address book, to-do list and memo tools. + . + This package contains header and static library files + for developing Evolution components. + +Package: evolution-dbg +Section: debug +Priority: extra +Architecture: any +Depends: evolution (= ${binary:Version}), + ${misc:Depends} +Description: debugging symbols for Evolution + Evolution is a groupware suite which integrates mail, calendar, + address book, to-do list and memo tools. + . + This package contains unstripped binaries of evolution for + use in debugging. + +Package: evolution-plugins +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Conflicts: evolution-plugins-experimental (<< 2.29.2-1) +Replaces: evolution-plugins-experimental (<< 2.29.1-1) +Recommends: notification-daemon +Description: standard plugins for Evolution + Evolution is a groupware suite which integrates mail, calendar, + address book, to-do list and memo tools. + . + This package includes plugins for evolution. The plugins belong + to the set of "standard" plugins, which are useful, but not + necessary for a functioning application. + . + The following standard plugins are included. + - bbdb + - subject-thread + - save-calendar + - select-one-source + - copy-tool + - mail-to-task + - audio-inline + - mailing-list-actions + - default-mailer + - email-custom-header + - import-ics-attachments + - prefer-plain + - mail-notification + - attachment-reminder + - backup-restore + - templates + - vcard-inline + - image-inline + - pst-import + +Package: evolution-plugins-experimental +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + evolution (= ${binary:Version}), +Replaces: evolution-plugins (<< 2.27) +Description: experimental plugins for Evolution + Evolution is a groupware suite which integrates mail, calendar, + address book, to-do list and memo tools. + . + This package includes plugins for Evolution. The plugins belong + to the set of "experimental" plugins, which are unsupported, have + undergone little testing, and might cause problems to the rest of + Evolution. Use with care. + . + The following plugins are included. + - face + - folder-unsubscribe + - mail-to-meeting + - save-attachments + - external-editor + - tnef-attachments + - evolution-webdav --- evolution-2.30.2.orig/debian/evolution-common.debhelper.log +++ evolution-2.30.2/debian/evolution-common.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- evolution-2.30.2.orig/debian/rules +++ evolution-2.30.2/debian/rules @@ -0,0 +1,51 @@ +#!/usr/bin/make -f + +LDFLAGS=$(shell echo $$LDFLAGS | sed -e 's/-Wl,-Bsymbolic-functions//') +export LDFLAGS + +include /usr/share/cdbs/1/rules/buildvars.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/autoreconf.mk + +UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version | sed -ne 's/^Version: //g' -e 's/-[^-]*$$//pg') + + +ELIBDIR := usr/lib/evolution/2.30 + +DEB_SHLIBDEPS_INCLUDE := debian/evolution/$(ELIBDIR) +DEB_DH_MAKESHLIBS_ARGS_libevolution += -V'libevolution (>= ${UPSTREAM_VERSION})' --noscripts -X $(ELIBDIR)/modules +DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})' +DEB_DH_MAKESHLIBS_ARGS_ALL += --noscripts -X $(ELIBDIR)/plugins + + +CFLAGS += -fPIC + +DEB_CONFIGURE_EXTRA_FLAGS += \ + --with-openldap \ + --enable-nls \ + --disable-scrollkeeper \ + --disable-pilot-conduits \ + --with-krb5=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --enable-plugins=experimental \ + --enable-python \ + --disable-pst-import \ + --disable-image-inline \ + --disable-contacts-map + +ifneq ($(DEB_HOST_ARCH_OS), linux) + DEB_CONFIGURE_EXTRA_FLAGS+=--disable-nm +else + DEB_CONFIGURE_EXTRA_FLAGS+=--enable-nm +endif + +install/evolution-common:: + mv debian/tmp/usr/share/une/applications/evolution-mail-une.desktop debian/tmp/usr/share/une/applications/evolution.desktop + +clean:: + find -name '*.schemas' | xargs rm -f --- evolution-2.30.2.orig/debian/libevolution.debhelper.log +++ evolution-2.30.2/debian/libevolution.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- evolution-2.30.2.orig/debian/evolution-dev.debhelper.log +++ evolution-2.30.2/debian/evolution-dev.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- evolution-2.30.2.orig/debian/evolution-common.docs +++ evolution-2.30.2/debian/evolution-common.docs @@ -0,0 +1,5 @@ +NEWS +README +AUTHORS +HACKING +MAINTAINERS --- evolution-2.30.2.orig/debian/evolution.debhelper.log +++ evolution-2.30.2/debian/evolution.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- evolution-2.30.2.orig/debian/changelog +++ evolution-2.30.2/debian/changelog @@ -0,0 +1,2741 @@ +evolution (2.30.2-0ubuntu11.1) maverick; urgency=low + + * debian/patches/09_add_ubuntuone_email.patch: + - Add patch to add Ubuntu One introduction (LP: 615874) + + -- Rodrigo Moya Thu, 19 Aug 2010 17:37:22 +0200 + +evolution (2.30.2-0ubuntu11) maverick; urgency=low + + * debian/patches/89_express.patch: + - revert renaming of notjunk to not-junk as gnome-icon-theme changed it + (LP: #613413) + + -- Didier Roche Thu, 05 Aug 2010 22:38:21 +0200 + +evolution (2.30.2-0ubuntu10) maverick; urgency=low + + [ Bilal Akhtar ] + * debian/patches/11_remove_upstream_submit_bugreport.patch: + - Remove 'Submit Bug Report' option from Help menu. (LP: #105093) + + [ Sense Hofstede ] + * debian/patches/12_remove_not_recommended_for_top_posting.patch: + - Remove 'Not recommended' for top posting in the editor dialog + (LP: #588298) + + -- Bilal Akhtar Wed, 04 Aug 2010 23:00:20 +0530 + +evolution (2.30.2-0ubuntu9) maverick; urgency=low + + * debian/patches/03_lpi.patch: cleaning + * add debian/patches/90_disable_deprecation_warning.patch: + - fix FTBFS with new gtk deprecation + + -- Didier Roche Mon, 02 Aug 2010 12:44:58 +0200 + +evolution (2.30.2-0ubuntu8) maverick; urgency=low + + * debian/patches/89_add_une_desktop_file.patch: + - use different icons for evolution express + + -- Didier Roche Fri, 30 Jul 2010 14:06:34 +0200 + +evolution (2.30.2-0ubuntu7) maverick; urgency=low + + * Really include the patch with bzr add :) + * debian/evolution-common.install, debian/rules: + rename the mail desktop file + + -- Didier Roche Wed, 21 Jul 2010 12:57:57 +0200 + +evolution (2.30.2-0ubuntu6) maverick; urgency=low + + * debian/patches/89_add_une_desktop_file.patch, + debian/evolution-common.install: + - install express desktop files for UNE session + + -- Didier Roche Tue, 20 Jul 2010 17:41:41 +0200 + +evolution (2.30.2-0ubuntu5) maverick; urgency=low + + * debian/patches/89_remove_quit_button.patch: + remove prominent quit button on calendar for evolution express + + -- Didier Roche Tue, 13 Jul 2010 14:59:25 +0200 + +evolution (2.30.2-0ubuntu4) maverick; urgency=low + + * debian/evolution-alarm-notify.desktop, + debian/evolution-alarm-notify.desktop.in, + debian/patches/64_translate_autostart_strings.patch: + - drop local desktop copy since the upstream has it now + * debian/evolution.install: + - don't install the local copy desktop + * debian/libevolution.install: + - install evolution-alarm-notify there + + -- Sebastien Bacher Thu, 01 Jul 2010 21:49:50 +0200 + +evolution (2.30.2-0ubuntu3) maverick; urgency=low + + * debian/patches/91_git_fix_format_itip.patch: + - fix crasher when receiving a calendar event + + -- Didier Roche Mon, 28 Jun 2010 13:17:16 +0200 + +evolution (2.30.2-0ubuntu2) maverick; urgency=low + + * debian/patches/89_express.patch: + - add evolution express branch enhancement with slight modification + to make it apply with current e-d-s + * use dh-autoreconf: + - remove debian/patches/90_autoconf.patch + - add build-dep to debian/control + - include rule in debian/rules + + -- Didier Roche Thu, 24 Jun 2010 10:57:26 +0200 + +evolution (2.30.2-0ubuntu1) maverick; urgency=low + + * New upstream release: + - Proxy login window is not in focus. (Vibha Yadav) + - Mail inline parser doesn't always work (Milan Crha) (LP: #219104) + - [new-mail-notify] Intermittent notifications (Milan Crha) + - SIGSEGV in e_plugin_mono_register_type (bnc) + (Chenthill Palanisamy) + - Use camel_init() to initialize NSS consistently (David Woodhouse) + - Don't overwrite Date: header when writing Fcc (David Woodhouse) + - New folder window is not in focus in filter dialog (Milan Crha) + - Allow setting alarms on any meeting (Jim Ramsay) (LP: #528557) + - Reopened drafts shouldn't ask for save without change + (Milan Crha) (LP: #510529) + - Custom headers not displayed in message preview (Milan Crha) + - Calendar view not remembered (Milan Crha) + - Can't drag and drop multiple attachments (Matthew Barnes) + - 'Mark as junk' should be disabled in junk folder (Milan Crha) + - Crash in em_format_snoop_type (Michel Dänzer) + - No copyright/licensing information for geo-utils (Cedric Bosdonnat) + - Use cached table row height rather than recalculate (Michel Dänzer) + - Reduce junk icon size (LP: #582839) + - Preview pane's attachment bar accepts drop (Matthew Barnes) + - Use contact's free/busy URL only when not empty (Holger Mickler) + - New task pop up in calendar day view doesn't work (Matthew Barnes) + - Don't display attachment size if it's unknown (Matthew Barnes) + - Evolution allows moving IMAP Inbox to other folders (Milan Crha) + - Force 24h format for locales not supporting 12h format + (Gert Michael Kulyk) + - Set translation domain for e-mail-reader actions (Gert Kulyk) + - System timezone label not initialized in preferences (Matthew Barnes) + - Crash printing contacts in List View (Bharath Acharya) + - Quits without asking user to save unfinished messages + (Milan Crha) (LP: #572962) + - Various data file cleanups (Matthew Barnes) + - Missing icon in alarm dialog (Matthew Barnes) + - Mobile Phone of imported contacts not shown in preview (Milan Crha) + - "Mark All Messages as Read" shortcut missing (Matthew Barnes) + - Crash when viewing/closing messages quickly (Matthew Barnes) + - Mailer's crash avoidance features are broken (Matthew Barnes) + - mail_shell_backend_sync_store_cb() has wrong signature (Jonathon Jongsma) + - GtkHTML color settings not being honored (Matthew Barnes) + - system_tz_label is not translated in cal-prefs-dialog + (Gert Michael Kulyk) + - EventEditor: Disconnect signal handlers before disposing model + (Matthew Barnes) + - Next/prev shortcuts should focus message list (Matthew Barnes) + - Checkbox in vfolder deletion prompt is saved backwards (Matthew Barnes) + - Improve auto-selection of messages (Matthew Barnes) + - Due date is not displayed in message list (Matthew Barnes) + - Use default headers when none stored to display in mailer (Milan Crha) + Fix a typo on Makefile.am that prevents installation of a big + chunk of the stock icons (Fridrich Štrba) + - Create the source groups required to ensure local adresssbooks + and calendars are created (Chenthill Palanisamy) + - Improve attachment bar selection behavior. (Matthew Barnes) + - Fix alignment of lblCarset in composer-prefs-dialog + (Gert Michael Kulyk) + - Add more missing icons for GtkhtmlEditor. (Matthew Barnes) + - Warn the user before marking all messages as read (Chenthill Palanisamy) + - Various win32 improvements (Fridrich Štrba) + - Updated translations + * debian/patches/03_fix-segfault-on-some-mails-display.patch, + debian/patches/04_fix-crash-when-viewing-closing-mails-quickly.patch: + - remove as picked from upstream + * debian/control: + - update e-d-s dep + + -- Didier Roche Mon, 21 Jun 2010 15:14:56 +0200 + +evolution (2.30.1.2-3ubuntu1) maverick; urgency=low + + * Remerge from debian unstable, remaining changes: + + debian/control: + - add Vcs-Bzr tag + - don't use po-debconf + - build-depends on libpst, python and shared-mime-info + - don't split documentation since it goes to langpacks + - evolution-plugins-experimental replaces evolution-plugins (<< 2.27) + - updated descriptions to reflect binary installs + - build-dep on liblaunchpad-integration-dev + - remove libgtkimageview-dev build-dep: not in main, seems crashy right + now + + debian/docs: + - renamed evolution-common.docs + + debian/evolution-2.2.desktop: + - compatibility .desktop for users upgrading + + debian/evolution.gconf-defaults: + - don't display unstable warning on startup (Ubuntu: #91799) + + debian/evolution.install: + - install the autostart and compatibility desktop entries + - install webdav and python but not hula and print-message there + + debian/evolution-mail.desktop: + - don't reapply this ubuntu change and use only one menu entry + + debian/evolution-alarm-notify.desktop, + debian/evolution-alarm-notify.desktop.in, + #debian/patches/64_translate_autostart_strings.patch: # + - autostart desktop file to start evolution-alarm-notify with the session, + translate the entry + + debian/evolution-dev.install: + - detail the .so to install + + debian/evolution-plugins.install, + debian/evolution-plugins-experimental.install: + - install the .so in binaries corresponding to the upstream options + + debian/patches/01_dont-ship-evo-mail-notifier.png.patch: + - don't ship that change that debian added without reason + + debian/evolution.preinst, debian/evolution.templates: + - don't display debconf template on upgrade + + debian/patches/03_lpi.patch: + - launchpad-integration patch + + debian/patches/62_no_upstream_email_notification_by_default.patch: + - don't enable the notification icon by default since the message + indicator + is running + + debian/patches/10_desktop_shortcuts.patch + - Adds desktop shortcuts for the messaging menu. + + debian/rules: + - don't use -Bsymbolic-functions to workaround memos crashing + - don't use debconf translation there + - use --disable-scrollkeeper --enable-python configure option + - use --disable-inline-plugin: dep not in main, seems crashy right now + + debian/patches/90_autoconf.patch: + - refresh autotool + + -- Didier Roche Mon, 31 May 2010 12:43:31 +0200 + +evolution (2.30.1.2-3) unstable; urgency=low + + * debian/patches + - 03_fix-segfault-on-some-mails-display added. (LP: #584536) + - 04_fix-crash-when-viewing-closing-mails-quickly added, + cherry-picked from upstream. Fix crash when opening/closing mails + quickly. closes: #582564 + * debian/evolution.links dropped, upstream doesn't ship them in /usr/bin for + good reason, they're supposed to be called from evolution not directly by + user, and the interface might not be stable. closes: #582491 + * debian/watch updated to order the first directory too. + + -- Yves-Alexis Perez Tue, 25 May 2010 07:25:00 +0200 + +evolution (2.30.1.2-2ubuntu1) maverick; urgency=low + + * Remerge from debian unstable, remaining changes: + + debian/control: + - add Vcs-Bzr tag + - don't use po-debconf + - build-depends on libpst, python and shared-mime-info + - don't split documentation since it goes to langpacks + - evolution-plugins-experimental replaces evolution-plugins (<< 2.27) + - updated descriptions to reflect binary installs + - build-dep on liblaunchpad-integration-dev + - remove libgtkimageview-dev build-dep: not in main, seems crashy right + now + + debian/docs: + - renamed evolution-common.docs + + debian/evolution-2.2.desktop: + - compatibility .desktop for users upgrading + + debian/evolution.gconf-defaults: + - don't display unstable warning on startup (Ubuntu: #91799) + + debian/evolution.install: + - install the autostart and compatibility desktop entries + - install webdav and python but not hula and print-message there + + debian/evolution-mail.desktop: + - don't reapply this ubuntu change and use only one menu entry + + debian/evolution-alarm-notify.desktop, + debian/evolution-alarm-notify.desktop.in, + #debian/patches/64_translate_autostart_strings.patch: # + - autostart desktop file to start evolution-alarm-notify with the session, + translate the entry + + debian/evolution-dev.install: + - detail the .so to install + + debian/evolution-plugins.install, + debian/evolution-plugins-experimental.install: + - install the .so in binaries corresponding to the upstream options + + debian/patches/01_dont-ship-evo-mail-notifier.png.patch: + - don't ship that change that debian added without reason + + debian/evolution.preinst, debian/evolution.templates: + - don't display debconf template on upgrade + + debian/patches/03_lpi.patch: + - launchpad-integration patch + + debian/patches/62_no_upstream_email_notification_by_default.patch: + - don't enable the notification icon by default since the message + indicator + is running + + debian/patches/10_desktop_shortcuts.patch + - Adds desktop shortcuts for the messaging menu. + + debian/rules: + - don't use -Bsymbolic-functions to workaround memos crashing + - don't use debconf translation there + - use --disable-scrollkeeper --enable-python configure option + - use --disable-inline-plugin: dep not in main, seems crashy right now + + debian/patches/90_autoconf.patch: + - refresh autotool + + -- Didier Roche Fri, 21 May 2010 18:48:41 +0200 + +evolution (2.30.1.2-2) unstable; urgency=low + + * debian/rules: + - fix nm disabled in linux builds. closes: #579592 + * debian/control: + - drop recommends on gnome-pilot-conduits since we don't build anymore + with pilot support. closes: #580293 + - update evolution-dev dependencies according to pkgconfig files. + * debian/evolution-dev.install: + - ship documentation. + * Upload to unstable. + + -- Yves-Alexis Perez Mon, 17 May 2010 15:31:33 +0200 + +evolution (2.30.1.2-1ubuntu3) maverick; urgency=low + + * debian/control: + evolution-dev should depend on libgnome-desktop-dev, libunique-dev + + -- Didier Roche Fri, 21 May 2010 15:02:37 +0200 + +evolution (2.30.1.2-1ubuntu2) maverick; urgency=low + + * debian/control: + - build-dep on liblaunchpad-integration-dev + + -- Didier Roche Tue, 18 May 2010 17:12:58 +0200 + +evolution (2.30.1.2-1ubuntu1) maverick; urgency=low + + * Merge from debian experimental: + + debian/control: + - add Vcs-Bzr tag + - don't build depends on pilot-link it's not required + - don't use po-debconf there either + - build-depends on libpst, python and shared-mime-info + - set gnome-pilot-conduits as suggests + - don't split documentation since it goes to langpacks + - evolution replaces evolution-plugins (<< 2.22.2-1) + since the bogofilter plugin has been moved there + - evolution-plugins-experimental replaces evolution-plugins (<< 2.27) + - updated descriptions to reflect binary installs + - remove libgtkimageview-dev build-dep: not in main, seems crashy right + now + + debian/docs: + - renamed evolution-common.docs + + debian/evolution-2.2.desktop: + - compatibility .desktop for users upgrading + + debian/evolution.gconf-defaults: + - don't display unstable warning on startup (Ubuntu: #91799) + + debian/evolution.install: + - install the autostart and compatibility desktop entries + - install webdav and python but not hula and print-message there + + debian/evolution-mail.desktop: + - don't reapply this ubuntu change and use only one menu entry + + debian/evolution-alarm-notify.desktop, + debian/evolution-alarm-notify.desktop.in, + #debian/patches/64_translate_autostart_strings.patch: # + - autostart desktop file to start evolution-alarm-notify with the session, + translate the entry + + debian/evolution-dev.install: + - detail the .so to install + + debian/evolution-plugins.install, + debian/evolution-plugins-experimental.install: + - install the .so in binaries corresponding to the upstream options + + debian/patches/01_dont-ship-evo-mail-notifier.png.patch: + - don't ship that change that debian added without reason + + debian/evolution.preinst, debian/evolution.templates: + - don't display debconf template on upgrade + + debian/patches/03_lpi.patch: + - launchpad-integration patch + + debian/patches/62_no_upstream_email_notification_by_default.patch: + - don't enable the notification icon by default since the message indicator + is running + + debian/patches/10_desktop_shortcuts.patch + - Adds desktop shortcuts for the messaging menu. + + debian/rules: + - don't use -Bsymbolic-functions to workaround memos crashing + - don't use debconf translation there + - use --disable-scrollkeeper --enable-python configure option + - use --disable-inline-plugin: dep not in main, seems crashy right now + + debian/patches/90_autoconf.patch: + - refresh autotool + + -- Didier Roche Mon, 17 May 2010 13:54:05 +0200 + +evolution (2.30.1.2-1) experimental; urgency=low + + * New upstream bugfix release. + * debian/patches: + - 03_fix-face-plugin-linking dropped, included upstream. + + -- Yves-Alexis Perez Wed, 28 Apr 2010 21:36:23 +0200 + +evolution (2.30.1.1-1) experimental; urgency=low + + * New upstream bugfix release. (LP: #154752) + * debian/patches: + - 03_fix-face-plugin-linking, fix ftbfs with face plugin. + * debian/control: + - bump (build-)deps to gtkhtml/eds 2.30.1. + + -- Yves-Alexis Perez Mon, 26 Apr 2010 21:12:22 +0200 + +evolution (2.30.0.1-1) experimental; urgency=low + + * New upstream release. + * debian/watch updated to track stable releases. + * debian/control: + - bump eds and gtkhtml build-deps to 2.30. + * debian/evolution-mail.desktop: update components version to 2.30. + * debian/lintian/evolution-common: + - add an override for evolution-settings command not being in the package. + * debian/lintian: + - evolution-plugins dropped, useless now. + - evolution-plugins-experimental dropped as well. + * debian/evolution-plugins-experimental.install, + debian/evolution-plugins.install: don't install lintian overrides. + + + -- Yves-Alexis Perez Sat, 24 Apr 2010 13:40:06 +0200 + +evolution (2.29.92.1-1) experimental; urgency=low + + * New upstream release candidate. + * debian/copyright updated. + + -- Yves-Alexis Perez Sun, 21 Mar 2010 19:36:21 +0100 + +evolution (2.29.92-1) experimental; urgency=low + + * New upstream release candidate. (LP: #433674, #198392) + * debian/control: + - bump build-deps on eds and gtkhtml. + * debian/rules: + - remove deprecated --enable-nntp arg to configure. + + -- Yves-Alexis Perez Mon, 08 Mar 2010 23:16:12 +0100 + +evolution (2.29.91-1) experimental; urgency=low + + * New upstream release candidate. (LP: #478976, #409795, + * debian/control: + - bump build-deps on eds and gtkhtml. + + -- Yves-Alexis Perez Tue, 23 Feb 2010 21:38:32 +0100 + +evolution (2.29.90-1) experimental; urgency=low + + * New upstream release candidate. + * debian/control: + - bump build-deps on eds et gtkhtml. + - add build-dep on libunique-dev. + - bump standards version to 3.8.4. + + -- Yves-Alexis Perez Mon, 08 Feb 2010 22:36:39 +0100 + +evolution (2.29.6-1) experimental; urgency=low + + * New upstream development release. + * debian/control: + - bump eds and gtkhtml versions to 2.29.6. + * debian/rules: + - disable nm on non Linux builds, fix FTBFS on kFreeBSD. closes: #566928 + * debian/patches + - 02_fix-gtkdoc dropped. + + -- Yves-Alexis Perez Tue, 26 Jan 2010 20:06:10 +0100 + +evolution (2.29.5-1) experimental; urgency=low + + * New upstream development release. (LP: #471825) + * debian/control: + - drop build-dep on libgnomeprint. + - bump eds and gtkhtml versions to 2.29.5. + - bump GTK+ build-dep to 2.18. + - drop build-dep on hal. + - drop build-dep on gnome-pilot. + * debian/patches: + - drop 02_fix-ftbfs-pilot_charset. + - 02_fix-gtkdoc added, fix FTBFS with gtk-doc 1.13. + * drop gnome-pilot support. * + + -- Yves-Alexis Perez Sat, 16 Jan 2010 10:38:59 +0100 + +evolution (2.29.3.2-1) experimental; urgency=low + + * New upstream release. + * debian/control: + - add libgtkhtml3.14-dev to evolution-dev dependencies. + - bump glib build-dep to 2.22. + + -- Yves-Alexis Perez Tue, 15 Dec 2009 21:43:56 +0100 + +evolution (2.29.3-1) experimental; urgency=low + + * New upstream release. (LP: #414666, #289205) + * debian/control: + - update build deps for gtkhtml 3.29.3 and eds 2.29.3. + - drop libglade build-dep. + * debian/rules: + - don't build contact-map plugin for now. + * debian/patches: + - 02_fix-ftbfs-pilot_charset added, fix FTBFS because of unknown component + in structure by reverting the culprit commit (GNOME #603452). + * debian/*.install: + - don't install non existent .glade files. + * debian/libevolution.install: install killev in the package. + + -- Yves-Alexis Perez Thu, 03 Dec 2009 21:20:29 +0100 + +evolution (2.29.2-1) experimental; urgency=low + + [2.29.1] + * New upstream development release. (LP: #452044, #145132, #470169, #319910) + (LP: #251417, #460054, #429008, #444493, #365037, #182575, #431899) + (LP: #105849, #530255, #115039, #376523, #487655, #145354) + * debian/watch updated to track development releases. + * debian/control: + - add a new libevolution package to separate the libs from the main + package. + - update build deps: + + drop bonobo, gnomeui, and libexchange-storage ; + + add libunique-dev, libcanberra-dev, libcanberra-gtk-dev ; + + update gtkhtml and eds to 2.29.1. + * debian/{lib,}evolution.install: ship libs in the libevolution package. + * debian/rules: + - update ELIBDIR to 2.30. + - don't build exchange plugin now inexistant. + - drop unknown configure options: + + --without-openssl-includes, --without-openssl-libs, --disable-openssl + + --enable-cairo-calendar, + + --without-krb4, + + --enable-ipv6, + - don't build pstimport plugin since we don't have libpst in Debian. + * debian/lintian: update paths to 2.29. + * debian/*.install: + - update paths to 2.30 ; + - move vcard, custom-headers, webdav and templates plugin from + experimental to base package. + * debian/evolution-dev.install: + - drop bonobo interface folder. + + [2.29.2] + * New upstream development release. + * debian/control: + - update build-deps for 2.29.2. + - add build-deps on libgtkimageview-dev. + * debian/evolution-plugins.install: + - add inline image viewer plugin. + * debian/links: + - drop manpage symlink. + - add evolution-addressbook-clean and evolution-backup synlinks to + /usr/bin. + + -- Yves-Alexis Perez Mon, 16 Nov 2009 21:54:13 +0100 + +evolution (2.28.3-1) unstable; urgency=low + + * New upstream bugfix release. + * debian/patches: + - 03_evo-addr-export-segfault dropped, included upstream. + * debian/control: + - update build-deps to 2.28.3 for eds and gtkhtml. + - update standards version to 3.8.4. + + -- Yves-Alexis Perez Mon, 01 Mar 2010 19:10:50 +0100 + +evolution (2.28.3-0ubuntu9) lucid; urgency=low + + * debian/control + - Remove unnecessary build dependency libgnomevfs2-dev. (LP: #562368) + + -- Onkar Shinde Tue, 13 Apr 2010 19:09:38 +0530 + +evolution (2.28.3-0ubuntu8) lucid; urgency=low + + * debian/patches/80_git_rtl_bar.patch: + - git change to fix rendering issue in the composer in rtl locales + (lp: #545459) + + -- Sebastien Bacher Thu, 01 Apr 2010 00:11:16 +0200 + +evolution (2.28.3-0ubuntu7) lucid; urgency=low + + * Bump cdbs build dependency, to ensure that we are building with a + langpack.mk which works with multi-section .desktop files. (LP: #535650) + + -- Martin Pitt Mon, 22 Mar 2010 09:14:57 +0100 + +evolution (2.28.3-0ubuntu6) lucid; urgency=low + + * No-change rebuild against a reverted CDBS. + + -- Steve Kowalik Sat, 20 Mar 2010 18:27:47 +1100 + +evolution (2.28.3-0ubuntu5) lucid; urgency=low + + * Bump cdbs build dependency, to ensure that we are building with a + langpack.mk which works with multi-section .desktop files. (LP: #535650) + + -- Martin Pitt Fri, 19 Mar 2010 15:26:12 +0100 + +evolution (2.28.3-0ubuntu4) lucid; urgency=low + + * debian/patches/10_desktop_shortcuts.patch + - Make names translatable + + -- Ken VanDine Wed, 10 Mar 2010 13:49:00 -0500 + +evolution (2.28.3-0ubuntu3) lucid; urgency=low + + * debian/patches/10_desktop_shortcuts.patch + Adds desktop shortcuts for the messaging menu. + + -- Ted Gould Thu, 04 Mar 2010 00:08:13 -0600 + +evolution (2.28.3-0ubuntu2) lucid; urgency=low + + * debian/control: + - update the eds requirement to the current version + + -- Sebastien Bacher Tue, 02 Mar 2010 00:32:25 +0100 + +evolution (2.28.3-0ubuntu1) lucid; urgency=low + + * New upstream version: + Bug Fixes: + - #601551 - [PST] evolution crashed with SIGSEGV (lp: #471852) + - #554663 - Swap "Save" and "Save as Draft" accelerators in composer + (lp: #424416) + - #601787 - Double free in destroy_oof_data + - #602185 - Crash after 'Show only this calendar' + - #609042 - Convert quoted-printing to UTF-8 when copying to clipboard + - #610124 - Autosave errors dialogues can't be dismissed + - #607087 - Not all inlined text attachments are included in replies + - #607741 - Move folder to claims it's copying in status bar + - #607458 - Fix format security warning + - #603480 - [bbdb] Traverse lists in destinations properly + - #602827 - Disable broken plugins automatically + - #607234 - Open received attachments as read-only + - #604670 - addressbook-export segfaults when specifying addressbook + - #605485 - Keeps search from previous folder in message list + - #606449 - Empty mail-notification popups + - #599794 - Set composer as not changed on reply or forward action + (lp: #510529) + - #605600 - Meeting reminders with wrong times (lp: #242954) + - #565582 - Make sure the comp_data is not NULL before using it + (lp: #351617) + - #606340 - Crash on non-utf8 letter in mail folder name + - #549988 - "Empty Trash" in Trash popup empties all Trash folders + - #595501 - Crash on a changed mail filter action removal (lp: #452921) + - #599615 - i18n support for emae and filter-bar when used as lib + - #250046 - Do not count Post To addresses when not shown (lp: #485831) + * debian/patches/90_autoconf.patch: + - new version update + + -- Sebastien Bacher Mon, 01 Mar 2010 23:30:42 +0100 + +evolution (2.28.2-3) unstable; urgency=low + + * debian/patches: + - 03_evo-addr-export-segfault added, fix segfault in + evolution-addressbook-export. closes: #554442 + + -- Yves-Alexis Perez Thu, 14 Jan 2010 08:54:29 +0100 + +evolution (2.28.2-2) unstable; urgency=low + + [ Josselin Mouette ] + * Drop libgnomeprint build-dependencies. + + [ Yves-Alexis Perez ] + * debian/po: + - Try to really remove spurious spaces in debconf templates and unfuzzy + translations. closes: #548510 + - add pt_BR.po, thanks Fábio Ferreira. closes: #563034 + * debian/patches: + - 02_let-nss-search-for-nssckbi added, fix nss modules lookup, should fix + certificate verification in evolution. closes: #563253 + + -- Yves-Alexis Perez Tue, 12 Jan 2010 21:37:26 +0100 + +evolution (2.28.2-1ubuntu6) lucid; urgency=low + + * debian/evolution-alarm-notify.desktop, + debian/evolution-alarm-notify.desktop.in: + - use the new X-GNOME-Autostart-Delay autostart key + + -- Sebastien Bacher Mon, 01 Feb 2010 16:05:23 -0800 + +evolution (2.28.2-1ubuntu5) lucid; urgency=low + + * Rebuild to get the new gtkhtml shlib + + -- Sebastien Bacher Mon, 25 Jan 2010 15:58:31 +0100 + +evolution (2.28.2-1ubuntu4) lucid; urgency=low + + * debian/control: + - don't recommends gnome-pilot rather suggests it, it's not used by lot + of users nowadays and rather confusing (lp: #507362) + + -- Sebastien Bacher Thu, 14 Jan 2010 11:58:21 +0100 + +evolution (2.28.2-1ubuntu3) lucid; urgency=low + + * debian/control, debian/evolution-plugins-experimental.install: + - don't build ipodsync which upstream stopped shipping in new versions, + clean the libhal build-depends which was used only there (lp: #503607) + + -- Sebastien Bacher Wed, 06 Jan 2010 23:43:43 +0100 + +evolution (2.28.2-1ubuntu2) lucid; urgency=low + + * debian/control: + - use build-depends on libpst, python and shared-mime-info to fix build + + -- Sebastien Bacher Thu, 17 Dec 2009 10:41:31 +0100 + +evolution (2.28.2-1ubuntu1) lucid; urgency=low + + * Resync on Debian + * New upstream version: + Bug Fixes: + - #271836 - Incorrect signature for "model_cell_changed" signal handler + - #397265 - Image loading for new contact requires restarting Evolution + - #411768 - Drag and drop header columns (lp: #344373) + - #468736 - Prevent recursion in em-format + - #474502 - Don't check for contacts in broken address books + - #551464 - Paste files into composer as attachments + - #551603 - Special case "positive zero alarms" + - #554779 - Removal of task due date does not sync from Palm + - #555901 - Preserve Start/End/Due timezone when editing in list view + - #557613 - evolution crashed with SIGSEGV in try_open_e_book_cb + (lp: #287136) + - #570835 - Custom e-mail headers inserted with double column + - #590127 - Define ETable::vertical-spacing style property + - #596027 - In Anjal, although invalid mail address warning popup, mail's + tab closed automatically + - #596566 - Crash on quit with composer window opened (lp: #438382) + - #596827 - Don't remove meeting attendees after edit + - #597582 - Original Date: header should be given precedence + - #599124 - Signature always includes an empty line in front of text + (lp: #456220) + - #599190 - Drag and drop broken for received MIME parts (lp: #456690) + - #599245 - Use bitwise AND instead of logical AND for checking flags + - #599627 - Crash when adding a new task in a table + - #599792 - Anjal composer's Send button doesn't work after pressed Save + Drafts button + - #599882 - Crash in em_folder_tree_select_prev_path() when wrapping to + bottom + - #600132 - Direct print from composer fails when special characters used + - #600133 - Crash on day view print preview without all day events + (lp: #464197) + - #601202 - Evo deletes system addressbook + - #601218 - Accepted meeting doesn't show attachments in calendar view + - #601219 - Transient dialogs in composer window blocks main window + - #601644 - Disable rename for system folders + Other Changes: + Synchronize with attachment logic in Evolution 2.29. + Improve comments: widgets/misc/e-filter-bar.c + [PATCH] Output an error message on system filter rules loading error + Use same macro name for consistency + Add mail_component_show_status_bar + Explicitly dllimport/export comp_editor_registry on Windows + Support other forward types for Anjal. + Sync to disk the outbox, since if we crash, we endup sending mail again. + Add support for Googlemail and hotmail/live/msn.com accounts. + Translations + * debian/control: + - Build-Depends on liblpint-bonobo-dev for the lpi patch + - conflicts, replaces, provides the previous documentation binaries + - don't Build-Depends on libgnomeprint2.2-dev, libgnomeprintui2.2-dev + - don't build depends on pilot-link it's not required + - don't split documentation since it goes to langpacks + - don't use po-debconf there either + - evolution replaces evolution-plugins (<< 2.22.2-1) + since the bogofilter plugin has been moved there + - evolution-plugins-experimental replaces evolution-plugins (<< 2.27) + - updated descriptions to reflect binary installs + - updated evolution-data-server requirement + * debian/docs: + - renamed evolution-common.docs + * debian/evolution-2.2.desktop: + - compatibility .desktop for users upgrading + * debian/evolution.gconf-defaults: + - don't display unstable warning on startup (Ubuntu: #91799) + * debian/evolution.install: + - install the autostart and compatibility desktop entries + - install webdav and python but not hula and print-message there + * debian/evolution-common.install: + - install extra .glade + * debian/evolution-dev.install: + - detail the .so to install + * debian/evolution-plugins.install, + debian/evolution-plugins-experimental.install: + - install the .so in binaries corresponding to the upstream options + * debian/patches/01_dont-ship-evo-mail-notifier.png.patch: + - don't ship that change that debian added without reason + * debian/evolution-alarm-notify.desktop, + debian/evolution-alarm-notify.desktop.in, + debian/patches/64_translate_autostart_strings.patch: + - autostart desktop file to start evolution-alarm-notify with the session, + translate the entry + * debian/evolution-mail.desktop, debian/evolution-mail.desktop.in, + debian/patches/61_translate_menu_entry.patch: + - don't reapply this ubuntu change and use only one menu entry + * debian/evolution.preinst, + debian/evolution.templates: + - don't display debconf template on upgrade + * debian/patches/03_lpi.patch: + - launchpad-integration patch + * debian/patches/62_no_upstream_email_notification_by_default.patch: + - don't enable the notification icon by default since the message indicator + is running + * debian/patches/70_1024x600_contact-editor.glade.patch, + debian/patches/71_1024x600_em-account-editor.c.patch + debian/patches/72_1024x600_e-shell-settings-dialog.c.patch + debian/patches/73_1024x600_e-shell-window.c.patch + debian/patches/74_1024x600_e-sidebar.c.patch + debian/patches/75_1024x600_e-task-bar.c.patch + debian/patches/76_1024x600_e-timezone-dialog-1024x600.glade.patch + debian/patches/77_1024x600_mail-config.glade.patch + debian/patches/78_1024x600_startup-wizard.c.patch: + - change by Ying-Chun Liu to work better on small screens (lp: #8629) + * debian/patches/79_relayout_preferences.patch: + - change by Neil J. Patel to update the preferences dialog layout and get + options for the message indicator + * debian/patches/90_autoconf.patch: + - autoconf patch + * debian/rules: + - don't use -Bsymbolic-functions to workaround memos crashing + - don't use debconf translation there + - use --disable-scrollkeeper --enable-python configure option + + -- Sebastien Bacher Wed, 16 Dec 2009 22:45:56 +0100 + +evolution (2.28.2-1) unstable; urgency=low + + * New upstream release. + * debian/patches: + - 02_empty-line_signature dropped, included upstream. + - 03_GNOME-Bug-599792-Anjal-composer-s-Send-button-doesn-t-work too. + - 04_GNOME-Bug-596027-In-Anjal-although-invalid-mail-address-wa.patch too. + + -- Yves-Alexis Perez Tue, 15 Dec 2009 08:55:42 +0100 + +evolution (2.28.1-3) unstable; urgency=low + + [ Josselin Mouette ] + * 02_empty-line_signature.patch: stolen from upstream git. Stop + including an empty line in front of the signature. + + [ Yan Li ] + * debian/patches/03_GNOME-Bug-599792-Anjal-composer-s-Send-button-doesn-t-work.patch + - fixed GNOME Bug #599792 + * debian/patches/04_GNOME-Bug-596027-In-Anjal-although-invalid-mail-address-wa.patch + - fixed GNOME Bug #596027 + + [ Yves-Alexis Perez ] + * debian/control: + - adjust evolution-dev dependencies. closes: #559771 + + -- Yves-Alexis Perez Sat, 12 Dec 2009 17:02:42 +0100 + +evolution (2.28.1-2) unstable; urgency=low + + * debian/rules: + - disable nm on kfreebsd, fix FTBFS, thanks Petr Salinger. closes: # 555304 + * debian/control: + - build-dep on hal on kfreebsd. + + -- Yves-Alexis Perez Tue, 10 Nov 2009 08:01:55 +0100 + +evolution (2.28.1-1) unstable; urgency=low + + * New upstream release. + * debian/patches: + - 01_dont-ship-evo-mail-notifier.png.patch added, remove + evo_mail_notifier.png from Makefiles so it's not shipped at all. + + -- Yves-Alexis Perez Sun, 18 Oct 2009 20:33:50 +0200 + +evolution (2.28.0-2) unstable; urgency=low + + * Upload to unstable. + + -- Yves-Alexis Perez Thu, 24 Sep 2009 21:39:25 +0200 + +evolution (2.28.0-1) experimental; urgency=low + + * New upstream stable release. + * debian/watch updated to track stable releases. + * debian/control: + - (build-)deps updated for 2.28. + + -- Yves-Alexis Perez Tue, 22 Sep 2009 10:58:47 +0200 + +evolution (2.27.92-1) experimental; urgency=low + + * New upstream release candidate. + * debian/control: + - update build-deps on gtkhtml and eds. + + -- Yves-Alexis Perez Tue, 08 Sep 2009 15:08:13 +0200 + +evolution (2.27.91-1) experimental; urgency=low + + * New upstream beta release. + * debian/control: + - update standards version to 3.8.3. + - adjust build-deps to gtkhtml and eds 2.27.91. + * debian/patches: + - 01_fix-evolution-cal-shared-module dropped, included upstream. + + -- Yves-Alexis Perez Mon, 24 Aug 2009 19:28:39 +0200 + +evolution (2.27.90-2) experimental; urgency=low + + * debian/patches: + - 01_fix-evolution-cal-shared-module added, don't build + libevolution-cal-shared.so as a module. closes: #541195 + + -- Yves-Alexis Perez Thu, 13 Aug 2009 23:18:47 +0200 + +evolution (2.27.90-1) experimental; urgency=low + + * New upstream release candidate. + * debian/control: + - adjust build-deps to gtkhtml and eds 2.27.90. + - add build-dep on libgnome-desktop-dev. + - add shlibs:Depends to evolution-dev depends. + * debian/rules: + - ignore shlibs on libevolution-cal-shared.so. + + -- Yves-Alexis Perez Tue, 11 Aug 2009 21:07:28 +0200 + +evolution (2.27.5-1) experimental; urgency=low + + * New upstream development release. + * debian/control: + - adjust build-deps to gtkhtml and eds 2.27.5 + + -- Yves-Alexis Perez Tue, 04 Aug 2009 07:30:14 +0200 + +evolution (2.27.4-1) experimental; urgency=low + + [ Josselin Mouette ] + * Stop suggesting gnome-spell, evolution uses enchant now. + + [ Yves-Alexis Perez ] + * New upstream development release. + * debian/control: + - adjust build-deps to gtkhtml and eds 2.27.4 + + -- Yves-Alexis Perez Mon, 13 Jul 2009 22:55:22 +0200 + +evolution (2.27.3-1) experimental; urgency=low + + * New upstream development release. + * debian/watch: look in development folder. + * po: + - fr.po updated, unfuzzified. Thanks Christian Perrier. closes: #546232 + + -- Yves-Alexis Perez Fri, 11 Sep 2009 23:28:10 +0200 + +evolution (2.26.3-3) unstable; urgency=low + + * po: + - ja.po added, thanks Hideki Yamane. closes: #539596 + - sv.po added, thanks Martin Bagge. closes: #522972 + - de.po added, thanks Helge Kreutzmann. closes: #543728 + - remove spurious spaces in templates. Thanks Christian Perrier for + patch against all translations. closes: #543725 + * debian/control: + - update standards version to 3.8.3. + + -- Yves-Alexis Perez Tue, 08 Sep 2009 10:26:06 +0200 + +evolution (2.26.3-2) unstable; urgency=low + + * debian/control: + - bump build-deps for 2.26.3 release. closes: #536711 + + -- Yves-Alexis Perez Mon, 13 Jul 2009 08:03:05 +0200 + +evolution (2.26.3-1) unstable; urgency=low + + [ Yves-Alexis Perez ] + * New upstream bugfix release. + * debian/control: + - update standards version to 3.8.2. + * po: + - cs.po: add czech, thanks to Martin Šín. closes: #532165 + - fi.po: add finnish, thanks to Esko Arajärvi. closes: #534610 + * debian/control: + - update deps and build-deps for 2.27 branch. + - update standards version to 3.8.2. + * debian/*.install: update folder name to 2.28. + * debian/evolution-plugins-experimental.install + - add vcard-inline plugin. + * debian/lintian/*: + - update folder name to 2.28. + - update components to match real rpaths. + + -- Yves-Alexis Perez Sun, 12 Jul 2009 18:03:16 +0200 + +evolution (2.26.2-2) unstable; urgency=low + + * debian/control + - bump build-deps to 2.26.2. closes: #530746 + + -- Yves-Alexis Perez Wed, 27 May 2009 19:44:20 +0200 + +evolution (2.26.2-1) unstable; urgency=low + + * New upstream bugfix release. + * po: + - es.po: add spanish, thanks Fernando González de Requena. closes: #528970 + - it.po: add italian, thanks Luca Monducci. closes: #529159 + - ru.po: add russian, thanks Yuri Kozlov. closes: #529809 + + -- Yves-Alexis Perez Tue, 26 May 2009 08:11:35 +0200 + +evolution (2.26.1.1-2) unstable; urgency=low + + [ Josselin Mouette ] + * evolution.preinst: use pgrep to match evolution processes instead of + being so strict. Closes: #525985. + + [ Yves-Alexis Perez ] + * Debconf translations: + - sv.po added, thanks to Martin Bagge. + - pt.po added, thanks to Miguel Figueiredo. + - fr.po added, Yoann Ciabaud. + * debian/rules: + - re-enable weather calendar. closes: #526827 + - run debconf-updatepo at clean time. + * debian/control: + - build-dep on libgweather-dev and po-debconf. + - bump build deps on gtkhtml3.14 and evolution-data-server to be sure + to use the fixed ones. + + -- Yves-Alexis Perez Wed, 06 May 2009 23:18:32 +0200 + +evolution (2.26.1.1-1) unstable; urgency=low + + [ Yves-Alexis Perez ] + * New upstream release. + - 2.26 finally available. closes: #520766 + * debian/control: + - update standards version to 3.8.1. + - update (build-)deps for 2.26. + - add build-dep on libical-dev and libicu-dev. + * debian/*.install: upgrade paths to 2.26. + * debian/lintian/*: upgrade paths to 2.26. + + [ Josselin Mouette ] + * Fix section for the debug package. + + -- Yves-Alexis Perez Sun, 26 Apr 2009 09:51:16 +0200 + +evolution (2.24.5-3) unstable; urgency=low + + [ Yves-Alexis Perez ] + * debian/NEWS.Debian: warn user to make a backup and quit evolution + before upgrading. + + [ Josselin Mouette ] + * evolution.{preinst,templates): add a pre-upgrade check that prevents + any upgrade if evolution is currently running. Closes: #519206. + * Add a Pre-Depends on debconf for the debconf use in preinst. + + -- Josselin Mouette Wed, 01 Apr 2009 13:00:41 +0200 + +evolution (2.24.5-2) unstable; urgency=low + + * Upload to unstable. + + -- Yves-Alexis Perez Sun, 08 Mar 2009 13:42:30 +0100 + +evolution (2.24.5-1) experimental; urgency=low + + * New upstream release. + * debian/control: + - update build-deps on evolution-data-server. + - update build-deps on libgtkhtml3.14-dev and libgtkhtml-editor-dev + - drop build-dep on gtkhtml3.14. + - add myself to Uploaders:. + - add build-dep on automake and libtool. + - drop obsolete Conflicts/Replaces. + * debian/rules: + - run autoreconf at build time to relibtoolize the package. + - ignore plugin folder in dh_makeshlibs. + * debian/lintian/evolution-plugins: + - update overrides for private rpaths. + * debian/evolution-plugins-experimental.install + - install lintian override file. + - ship email-custom-header, evolution-webdav and templates plugin. + + -- Yves-Alexis Perez Sat, 28 Feb 2009 20:34:59 +0100 + +evolution (2.22.3.1-1) unstable; urgency=medium + + [ Pedro Fragoso ] + * New upstream bugfix release (Closes: #488782) + - Fixes security vulnerabilities CVE-2008-1108 and CVE-2008-1109 + (Closes: #484639) + - Set urgency to medium + * debian/control: + - Add myself to Uploaders + - Bump Standards-Version to 3.8.0 (no changes) + + -- Heikki Henriksen Sun, 06 Jul 2008 13:51:11 +0200 + +evolution (2.22.2-1) unstable; urgency=low + + * New upstream release + - bugfixes and translation updates + * Remove debian/lintian/evolution + - private-dir rpaths are finally ignored with lintian >= 1.23.49 + + -- Heikki Henriksen Mon, 26 May 2008 22:45:36 +0200 + +evolution (2.22.1.1-1) unstable; urgency=low + + [ Heikki Henriksen ] + * debian/evolution-mail.desktop: + Set X-GNOME-Bugzilla-Component=BugBuddyBugs (closes: #477213) + + [ Oystein Gisnas ] + * New upstream bugfix release + + -- Oystein Gisnas Sun, 04 May 2008 18:16:59 +0200 + +evolution (2.22.1-1) unstable; urgency=low + + [ Pedro Fragoso ] + * New upstream bugfix release + - 35_fix_tnef_locale.patch, Dropped, merged upstream + + [ Heikki Henriksen ] + * 2.22.1 fixes subject in composer window (closes: #475370) + + -- Heikki Henriksen Thu, 10 Apr 2008 19:43:54 +0200 + +evolution (2.22.0-3) unstable; urgency=low + + * Upload to unstable + * Add patch 35_fix_tnef_locale.patch + - fixes locale-bug in tnef-attachments (closes: #464670) + * Update DM-Upload-Allowed according to change in dpkg 1.14.16 and bump + build-dep on dpkg-dev + * Bump build-dep on cdbs to get dh_icons in postinst (closes: #473029) + * Update evolution.menu to follow newest menu sub-policy and use + Applications/Network/Communication (fixes lintian-warning) + * Convert copyright to UTF-8 (fixes lintian-warning) + * Update versioned dirs in lintian-overrides + * Add lintian override for desktop-command-not-in-package in + evolution-common, and install in evolution-common.install + + -- Heikki Henriksen Sat, 05 Apr 2008 19:25:32 +0200 + +evolution (2.22.0-2) experimental; urgency=low + + * Bump build-dep libcamel1.2-dev to >= 2.21.92 (closes: #472991) + * Fix file path to Google Calendar plugin (closes: #473309) + + -- Oystein Gisnas Mon, 31 Mar 2008 14:51:04 +0200 + +evolution (2.22.0-1) experimental; urgency=low + + [ Heikki Henriksen ] + * New upstream release + * Acknowledge NMU from Security Team: + - remove 80_CVE-2008-0072.patch: applied upstream + * Bump Standards-version to 3.7.3 + * Upgrade build-dep: + - libsoup2.4-dev from libsoup2.2-dev + * Bump build-deps: + - libglib2.0-dev (>= 2.15.3) + - libgtk2.0-dev (>= 2.12.0) + - evolution-data-server-dev (>= 2.21.92) + - evolution-data-server-dev (<< 2.23.0) + - gnome-icon-theme (>= 2.19.91) + - libbonobo2-dev (>= 2.20.3) + - libgtkhtml3.14-dev (>= 3.17.5) + - libgnome-pilot2-dev (>= 2.0.15) + - libnotify-dev (>= 0.3.0) + * Add build-dep: + - pilot-link + * Update base plugins: + - add google-account-setup + - add bogo-junk-plugin + - wait and evaluate on mono + * Update standard plugins: + - add audio-inline + - remove bogo-junk-plugin + - rename new-mail-notify to mail-notification + - add attachment-reminder + - add face + - add backup-restore + * Update experimental plugins: + - remove backup-restore + - add external-editor + - add tnef-attachments + * Remove patch: + - 70_no-mail-remote-plugin.patch - mail-remote-plugin never worked and is + removed upstream + + [ Oystein Gisnas ] + * Bump e-d-s build-deps to 2.21.92 + * Sync build-deps of -dev packages with pkg-config files + + -- Oystein Gisnas Tue, 18 Mar 2008 00:46:53 +0100 + +evolution (2.12.3-1.1) unstable; urgency=high + + * Non-maintainer upload by the Security Team. + * Fix Encrypted Message Version Format String Vulnerability + (CVE-2008-0072). + + -- Thijs Kinkhorst Tue, 04 Mar 2008 21:27:27 +0100 + +evolution (2.12.3-1) unstable; urgency=low + + [ Heikki Henriksen ] + * Conflict with older evolution-plugins and evolution-plugins-experimental + to ensure full upgrades (closes: #454473) + * Add recommends evolution-webcal (closes: #455598) + + [ Oystein Gisnas ] + * New upstream release (bugfixes and translations) + (closes: #454435, #458728, #443483) + * Remove configure flags --with-nspr-includes and --with-nss-includes + (closes: #461312, #460615, #460683) + + -- Oystein Gisnas Tue, 22 Jan 2008 08:19:08 +0100 + +evolution (2.12.2-1) unstable; urgency=low + + [ Heikki Henriksen ] + * New upstream release (bugfixes and translations) (closes: #446890) + * Swap bogofilter and spamassassin recommmends, since bogofilter is quite + lightweight (closes: #435635) + * Versioned build-dependency on eds-dev and dependency on eds (closes: + #445375) + * Update patch: 70_no-mail-remote-plugin.patch + * Upstream fix for glade-dir (closes: #450524) + * [debian/rules] Update ELIBDIR + * Remove patches applied upstream: + - 15_contact-list-editor-expand.patch + - 25_mute-debug-messages.patch + - 30_mute-alarm-notify.patch + - 50_filter_missing_gettext.patch + - 50_libnssckbi-location.patch + - 60_new_addressbook_set_relative_url.patch + * Add Dm-Upload-Allowed, Homepage, Vcs-Browser and Vcs-Svn fields in control + * Add build-dep on libytnef0-dev for experimental plugin tnef-attachments + * Add tnef-attachments to plugins-experimental + * Add build-dep on gtk-doc-tools to build gtk-doc development documentation + * Enable building of gtk-doc in rules + * Update lintian overrides (version-bumps in rpaths) + * Update evolution-mail.desktop + + -- Oystein Gisnas Mon, 03 Dec 2007 18:06:48 +0100 + +evolution (2.12.0-2) unstable; urgency=low + + * Conflicts with evolution-exchange (<< 2.11.90) (closes: #444012, #444018) + * Tighter build-dependency on libedataserver (>= 1.11.2) for new + data-structure, EFlag (closes: #444036) + + -- Heikki Henriksen Wed, 26 Sep 2007 14:58:24 +0200 + +evolution (2.12.0-1) unstable; urgency=low + + * New upstream release. + * Adjusted Build-Deps. + * Adjusted .install paths to reflect new upstream. + * Added attachment-reminder, audio-inline, bogo-junk-plugin, face, + mail-notification to the evolution-plugin package. + * Dropped patches: + 08_to_translate_list_update.patch - Applied upstream. + 20_minicard-email-colon.patch - Upstream has a better fix. + + -- Riccardo Setti Mon, 24 Sep 2007 01:43:12 +0200 + +evolution (2.10.3-1) unstable; urgency=low + + * New upstream stable release; bug fixes. + + -- Loic Minier Wed, 25 Jul 2007 16:38:09 +0200 + +evolution (2.10.2-1) unstable; urgency=low + + * New upstream release. (closes: #423060) + * 15_contact-list-editor-expand.patch: Fix contact list dialog resize + bug (bugzilla #424055) + * 20_minicard-email-colon.patch: Fix for missing row columns in + contacts minicard view (bugzilla #404239) + * 25_mute-debug-messages.patch: Mute console noise from plugins + * 30_mute-alarm-notify.patch: Mute noisy debug output from evolution- + alarm-notify + + -- Oystein Gisnas Mon, 28 May 2007 23:33:35 +0200 + +evolution (2.10.1-1) unstable; urgency=low + + [ Oystein Gisnas ] + * New upstream release + - Add gnome-doc-utils (>= 0.3.2) build-dep + - Change libgtkhtml3.8* dependencies to libgtkhtml3.14* + - Bump e-d-s build-deps to >= 1.9.4 + - Bump libgtk2.0-dev to >= 2.10.0 + - Add evolution Recommends: spamassassin | bogofilter + - Drop 10_etasks-missing-include.patch + - Drop 90_build_with_new_pisock.patch, fixed upstream + * 50_libnssckbi-location.patch: Adapt private library search path + to relocated xulruner libraries. + * Update watch file to track all stable versions + * 08_to_translate_list_update.patch: Translatable files + * Don't create shlibs.local - CDBS has been fixed long ago + * Create symlink for manpage evolution-2.10 + * Add lintian overrides + + [ Loic Minier ] + * Upload to unstable. + + -- Loic Minier Tue, 24 Apr 2007 16:36:09 +0200 + +evolution (2.8.3-1) experimental; urgency=low + + * New upstream stable release; bug fixes and translations. + * Drop Takuo Kitame from Uploaders. + + -- Loic Minier Thu, 05 Apr 2007 14:27:55 +0200 + +evolution (2.8.2.1-1) experimental; urgency=low + + * New upstream release. + - Fixes crash on exit; closes: #406492. + + -- Loic Minier Thu, 11 Jan 2007 17:28:35 +0100 + +evolution (2.8.2-1) experimental; urgency=low + + [ Jordi Mallach ] + * 50_filter_missing_gettext.patch: Add missing gettext() calls to the + filter dialogs (Bugzilla #359276). + + [ Oystein Gisnas ] + * New upstream release + - debian/control: Move prefer plain plugin to standard + - 70_no-mail-remote-plugin.patch: Update patch + - Treat data/evolution.{keys,mime} special + * Document mailbox summary corruption and removal of + IMAP4rev1 provider. [debian/README.Debian] + * Document common network-manager error messages. + [debian/README.Debian] + * Don't depend on HAL and NetworkManager on non-Linux archs. Thanks to + Petr Salinger. (closes: #401540) [debian/control] + + -- Oystein Gisnas Sun, 7 Jan 2007 22:52:16 +0100 + +evolution (2.8.1.1-1) experimental; urgency=low + + * New upstream release (closes: #347645) + - included: debian/patches/20_show-deleted-msgs-in-trash.patch + + -- Oystein Gisnas Tue, 31 Oct 2006 22:16:23 +0100 + +evolution (2.8.1-2) experimental; urgency=low + + * Pull patch from upstream (closes: #391250) + - debian/patches/20_show-deleted-msgs-in-trash.patch + + -- Oystein Gisnas Sun, 22 Oct 2006 09:52:34 +0200 + +evolution (2.8.1-1) experimental; urgency=low + + * New upstream release + * Fix symlinks to point to 2.8 [debian/evolution.links] (closes: #389272) + + -- Heikki Henriksen Tue, 3 Oct 2006 15:19:14 +0200 + +evolution (2.8.0-2) experimental; urgency=low + + * Remove superfluous libusb-dev build-dep [debian/control] + + -- Heikki Henriksen Tue, 26 Sep 2006 09:56:17 +0200 + +evolution (2.8.0-1) experimental; urgency=low + + [ Oystein Gisnas ] + * debian/patches/06_fix_inline_pgp_breaking_charset.patch: Applied + upstream + * remove debian/patches/11_window_settings_stored.patch + * debian/patches/11_window_settings_stored.patch: Applied upstream + * debian/patches/12_fix_icon_metaphors_bug_339626.patch: Applied + upstream + * debian/patches/17_fix_alarm_delay_for_calendar.patch: Doesn't apply + cleanly + * debian/patches/20_xulrunner.patch: Fixed upstream + * debian/patches/30_no-ipod-sync.patch: Doesn't apply cleanly + * debian/patches/31_no-audio-inline.patch: Doesn't apply cleanly + * debian/patches/40_disposition-notification.patch: Fixed upstream + * debian/patches/60_exchange-operations-create-addressbook.patch: + Applied upstream + * debian/patches/70_build-experimental-plugins.patch: Doesn't apply + cleanly + * debian/*.install: Update version number in filename paths + * Label typo patch applied upstream. + [debian/patches/18_fix_label_typo.patch] + * Gettext domain patch applied upstream. + [debian/patches/20_correct_gettext_domain.patch] + + [ Riccardo Setti ] + * Added patch to fix compile with the new libpisock (closes: #341172) + [debian/patches/90_build_with_new_pisock.patch] + + [ Heikki Henriksen ] + * New upstream release (1.8.0) + * Updated debian/watch to follow 2.8-series + * --enable-cairo-calender=yes [debian/rules] + * Missing include to avoid possible segfault applied upstream. + Thanks to Dann Frazier (closes: #384280) + * Remove patches fixed/applied upstream: + - 07_default_shell_only_with_no_uris.patch + - 10_pkg-config-rpath.patch + - 30_ipod-sync_missing-files.patch + - 55_fi-translation-fix.patch + - 60_alarm-list-dialog-peek.patch + - 61_itip-formatter-date-in-past.patch + - 65_null-camel-exception.patch + * Update patches: + + 10_etasks-missing-include.patch + + 70_no-mail-remote-plugin.patch + * Add build-dep on gtkhtml3.8 to find Editor.idl [debian/control] + * Temporary build-dep on libusb-dev until this is in place at the right + place (libpisock-dev) [debian/control] + * Bump build-dep on libgtk2.0-dev to (>= 2.8.0) to pull in cairo + [debian/control] + + -- Heikki Henriksen Fri, 22 Sep 2006 12:51:40 +0200 + +evolution (2.6.3-1) unstable; urgency=low + + [ Oystein Gisnas ] + * New upstream release + - does not ping when offline (closes: #360373) + * Reorder build-deps to match order in configure.in. [debian/control] + * Add build-deps for each e-d-s lib used. [debian/control] + * Patches applied upstream: + - debian/patches/18_fix_label_typo.patch + - debian/patches/20_correct_gettext_domain.patch + - debian/patches/31_no-audio-inline.patch: Obsolete + - debian/patches/70_build-experimental-plugins.patch: Obsolete + * Update patch debian/patches/70_no-mail-remote-plugin.patch + + [ Heikki Henriksen ] + * Check build-deps (closes: #383174) + * Re-add build-dep on gtkhtml3.8 to fix ftbfs + + -- Heikki Henriksen Tue, 15 Aug 2006 21:07:17 +0200 + +evolution (2.6.2-4) unstable; urgency=high + + * Add gnome-icon-theme build-dep. [debian/control] (Closes: #377161) + + -- Oystein Gisnas Fri, 7 Jul 2006 08:40:16 +0200 + +evolution (2.6.2-3) unstable; urgency=low + + * debian/control: Add ${misc:Depends} + * debian/control: Remove conflict with older evolution + * debian/evolution-dev.install: Remove .la files again + * debian/patches/10_pkg-config-rpath.patch: Add explicit -rpath to + private libs pkg-config to fix .la-less builds against these libs + * Convert icon to XPM format for Debian menu + * debian/control: Clean up dependencies + * Move icon, menu and .desktop from evolution-common to evolution + * debian/control: Depend on = source:Version of -common package + for binNMU compatibility + + -- Oystein Gisnas Thu, 6 Jul 2006 09:45:29 +0200 + +evolution (2.6.2-2) unstable; urgency=low + + * Make the package binNMU-safe: + - Build-depend on dpkg-dev >= 1.13.19. [debian/control] + - Use ${binary:Version} & ${source:Version} [debian/control] + - use UPSTREAM_VERSION [debian/rules] + + -- Heikki Henriksen Mon, 12 Jun 2006 09:53:50 +0200 + +evolution (2.6.2-1) unstable; urgency=low + + [ Oystein Gisnas ] + * debian/patches/61_itip-formatter-date-in-past.patch: (Closes: + #368920) + * Update manpages + * Move architecture independent files to package evolution-common + (Closes: #232890) + * Move experimental plugins to evolution-plugins-experimental + * debian/control: Update package descriptions + * debian/control: Correct Suggests: and Recommends: for plugins + + [ Heikki Henriksen ] + * New upstream release + * Update patches: + - debian/patches/17_fix_alarm_delay_for_calendar.patch + - debian/patches/31_no-audio-inline.patch + - debian/patches/55_fi-translation-fix.patch + - debian/patches/70_build-experimental-plugins.patch + * Drop patches applied upstream: + - debian/patches/06_fix_inline_pgp_breaking_charset.patch + - debian/patches/11_window_settings_stored.patch + - debian/patches/12_fix_icon_metaphors_bug_339626.patch + - debian/patches/40_disposition-notification.patch + - debian/patches/60_exchange-operations-create-addressbook.patch + * plugin for ipod-sync works again: + - debian/patches/30_no-ipod-sync.patch: dropped + - debian/patches/30_ipod-sync_missing-files.patch: added + - debian/control: bring back build-deps on hal >= 0.5.4 + - debian/evolution-plugins.install: add ipod-sync to experimental line + * debian/control: Change dep on Source-Version from = to >= to have it + binNMU-able + * debian/control: add dep on libhal-dev to evolution-dev + * debian/rules: Fix Version\: in dpkg-parsechangelog + * debian/rules: Don't overwrite DEB_SHLIBDEPS_INCLUDE & + DEB_DH_MAKESHLIBS_ARGS_? + * debian/evolution-dev.install: bring back *.la until we get broken + rpath in some libs fixed + + -- Heikki Henriksen Sun, 11 Jun 2006 20:18:06 +0200 + +evolution (2.6.1-3) unstable; urgency=low + + [ Oystein Gisnas ] + * debian/control: Move -dbg pkg to section gnome + * debian/control: Claim compliance with Debian Policy 3.7.2 + * debian/patches/60_new_addressbook_set_relative_url.patch: (Closes: #361995) + * debian/evolution-dev.install: drop installation of *.la + * Add manpages csv2vcard.1 and evolution-addressbook-export.1 + * debian/evolution.install: drop installation of + evolution-addressbook-clean (closes: #346088) + * debian/patches/65_null-camel-exception.patch: stop using NULL in + place of Camel exceptions + * debian/patches/70_build-experimental-plugins.patch: Build + experimental plugins. Thanks to Michel Dänzer. (Closes: #312288) + * debian/patches/evolution{,-plugins}.install: Move base plugins to + evolution package + + [ Heikki Henriksen ] + * patches pulled from ubuntu: + - debian/patches/06_fix_inline_pgp_breaking_charset.patch + - debian/patches/11_window_settings_stored.patch: (closes: #363259) + - debian/patches/12_fix_icon_metaphors_bug_339626.patch + - debian/patches/17_fix_alarm_delay_for_calendar.patch + - debian/patches/18_fix_label_typo.patch + - debian/patches/20_correct_gettext_domain.patch + + -- Oystein Gisnas Thu, 25 May 2006 08:09:47 +0200 + +evolution (2.6.1-2) unstable; urgency=low + + [ Oystein Gisnas ] + * debian/patches/60_exchange-operations-create-addressbook.patch: + Fix create addressbook breakage caused by exchange-operations plugin + * debian/control: Add dep dbus (closes: #365797) + + [ Heikki Henriksen ] + * debian/control: add dep on libnm-glib-dev & libgtkhtml3.8-dev for + evolution-dev + * debian/evolution-plugins.install: not install *.la + * debian/patches/60_alarm-list-dialog-peek.patch: fix segfault on certain + cases/archs. Thanks to Dann Frazier (closes: #365923) + + -- Oystein Gisnas Thu, 4 May 2006 12:25:51 +0200 + +evolution (2.6.1-1) unstable; urgency=low + + [ Heikki Henriksen ] + * Upload to unstable + * New upstream release (2.6.1) + * debian/control: add recommends notification-daemon to evolution-plugins + * debian/control: bump debhelper build-dep to >= 5.0.0 + * debian/control: added recommends: yelp (closes: #277707) + * debian/control: removed old unecessary conflicts/replaces + * debian/control: add suggests on evolution-dbg + * evolution-wombat has been removed some time ago + (closes: #236852, #265568, #160049, #211656, #218075, #196426) + * debian/evolution-mail.desktop: pull from ubuntu (and add norwegian + translations :) ) (closes: #257322) + * debian/rules: clean up clean:: + * debian/control: add build-dep libnm-glib-dev and suggest network-manager. + Provides NetworkManager-magic if available. + * Upstream fix for addressbook data-loss (uid vs relative_uri) + (closes: #361995) + * debian/watch: added + * debian/patches/40_disposition-notification.patch: + Fix crash on disposition-notification (upstream bug: 324327) + * debian/patches/31_no-audio-inline.patch & debian/control: + Remove build-dep on gstreamer0.8 and audio-inline-plugin until its' fixed + * Upstream fix for new-mail-plugin (closes: #341085) + + [ Oystein Gisnas ] + * Upstream fixes for mbox import (closes: #292810) + * Upstream fixes for yelp user guide category and title++ + (closes: #360860, #339500) + * Upstream support for contact groups (closes: #297236) + * Upstream LDAP fixes (closes: #187821, #190750, #251060, #139947) + * Remove obsolete README.SSL since SSL/TLS is builtin + * Upstream fix for creation of task from mail message (closes: #327406) + * debian/evolution.links: Fix link filename for evolution-2.6 manpage + * debian/rules: Add dh_shlibdeps flag to aviod unnecessary runs of ldconfig + * debian/evolution.menu: Remove obsolete tag in menu file (see #129131) + + [ Jordi Mallach ] + * debian/rules: + - don't overwrite CFLAGS, or we get unusable -dbg packages + (thanks seb128). + - likewise for DEB_CONFIGURE_EXTRA_FLAGS. + + -- Heikki Henriksen Fri, 28 Apr 2006 17:12:48 +0200 + +evolution (2.6.0-2) experimental; urgency=medium + + * Now updates count for drafts folder (closes: #284095) + * Build --without-krb4 (closes: #278242) + * Move spamassassin recommends to evolution-plugins (closes: #343987) + * Upstream fixes in ldif-import (closes: #357845) + * Bump debhelper compat to 5 + * remove camel-providers from evolution.install: + moved to e-d-s once upon a time + * remove evolution-importers from evolution.install: + goes under *so + + -- Heikki Henriksen Mon, 3 Apr 2006 20:02:52 +0200 + +evolution (2.6.0-1) experimental; urgency=low + + * New upstream release + * Added -dbg package with Priority: extra + * debian/patches/50_de-translation-typo.patch: + Removed - string is no longer valid + * debian/patches/55_fi-translation-fix.patch: + Updated + * debian/patches/80_default_mailer_free-fix.patch: + Removed - fixed upstream + * Enable experimental plugins and update plugin-list + (closes: #349163, #312288) + * debian/patches/07_default_shell_only_with_no_uris.patch: + Added from ubuntu's packages + * debian/patches/30_no-ipod-sync.patch: + Don't build ipod-sync-plugin (at least not until it wants to build) + + -- Heikki Henriksen Thu, 30 Mar 2006 17:56:35 +0200 + +evolution (2.4.2.1-2) unstable; urgency=medium + + * Acknowledge NMU (closes: #358432) + * Add myself to Uploaders + * Tighten dependency on libgtkhtml3.8-dev >= 3.8.1-1.1 + * Tighten dependency on e-d-s >= 1.4.2.1-1.1 + * 80_default_mailer_free-fix.patch: + fix crash on startup (closes: #358071) + * debian/patches/15_x-face-support.patch: + broken and not accepted upstream, so removed (closes: #347702) + + -- Heikki Henriksen Sun, 26 Mar 2006 17:26:15 +0100 + +evolution (2.4.2.1-1.1) unstable; urgency=low + + * NMU to fix crasher in startup (closes: #358071) + + -- Heikki Henriksen Wed, 22 Mar 2006 13:59:44 +0000 + +evolution (2.4.2.1-1) unstable; urgency=low + + [ Jordi Mallach ] + * New upstream release (closes: #336968). + - can introduce tasks (closes: #334026). + - won't crash when adding contacts (closes: #342725). + - won't crash on libsoup2.2 bugs (closes: #340488). + - should not loop, eating all memory (closes: #341694). + * Upload to unstable. + * Don't build-depend on automake1.7 [debian/control]. + + [ Loic Minier ] + * Add missing build-dep on gtkhtml3.8 (>= 3.7.0). (Closes: #340184) + [debian/control] + + -- Jordi Mallach Mon, 9 Jan 2006 14:13:13 +0100 + +evolution (2.4.1-3) experimental; urgency=low + + * Merge changes done in SVN by marga as "2.4.0-3", which were overriden in + experimental in kitame's "2.4.0-3". + - Re-add the updated translations patches (german and finish). + - Rename bugbuddy Suggests in bug-buddy. + * Update and rename patches to apply cleanly and in a defined order. + * Update X-Face support patch to cover Makefile.am too. + * Update pixmap PATH to 2.4. [debian/evolution.menu] + * Update description to not list the Evolution version. [debian/control] + * Update list of evolution-dev files. [debian/evolution-dev.install] + + -- Loic Minier Fri, 11 Nov 2005 15:58:25 +0100 + +evolution (2.4.1-2) experimental; urgency=low + + * Rebuild against evolution-data-server >= 1.4.1.1-1 and bump build-dep. + [debian/control] + * Remove anything related to gal, now merged in evolution-data-server. + [debian/control] + * Switch to experimental dbus by replacing dbus-1-dev and dbus-glib-1-dev + with libdbus-1-dev and libdbus-glib-1-dev. + [debian/control] + * Update copyright information, upstream URL, authors... + [debian/copyright] + * Add myself to Uploaders. + [debian/control] + * Remove all files from the Debian diff.gz not below debian/. + * Add CDBS' utils. [debian/rules] + + -- Loic Minier Mon, 7 Nov 2005 17:53:06 +0100 + +evolution (2.4.1-1) experimental; urgency=low + + * New upstream release + * Build againsta gtkhtml3.8 instead of gtkhtml + + -- Takuo KITAME Mon, 10 Oct 2005 05:50:53 +0900 + +evolution (2.4.0-3) experimental; urgency=low + + * Depends on untagged libgal-common and gtkhtml. + + -- Takuo KITAME Fri, 16 Sep 2005 15:19:14 +0900 + +evolution (2.4.0-2) experimental; urgency=low + + * fix libgal2.5-common dependency. + + -- Takuo KITAME Tue, 13 Sep 2005 12:23:37 +0900 + +evolution (2.4.0-1) experimental; urgency=low + + * New upstream release + * Depends on e-d-s 1.4.0, gal 2.5, gtkhtml3.8 + * remove translation fix patch at once. + + -- Takuo KITAME Mon, 12 Sep 2005 11:33:24 +0900 + +evolution (2.2.3-4) unstable; urgency=low + + * Erased unnecesary files from the debian/ directory, including + 02_help_is_not_included.patch which wasn't being applied anyway. + * Fix de.po translation, with the patch provided by Jens Seidel + (Closes: #314119). + * Add a suggestion for the evolution-exchange package (Closes: #304827). + * Fixed an "implicitly converted pointer" bug with the patch provided by + David Mosberger (Closes: #304708, #320892) + * Re-included the changelog entries that had been dropped during + experimental phase. + * Fixed build-dependencies (libpam-dev -> libpam0g-dev). + * Updated all libgal2.4 dependencies to > 2.4.3 + * Updated copyright file. + + -- Margarita Manterola Tue, 6 Sep 2005 16:32:25 -0300 + +evolution (2.2.3-3) unstable; urgency=high + + * security fix. (closes: Bug#32253) + - Multiple exploitable format string vulnerabilities + Applied unofficial security fix patch from + http://www.sitic.se/dokument/evolution.formatstring.patch + + -- Takuo KITAME Thu, 25 Aug 2005 14:58:34 +0900 + +evolution (2.2.3-2) unstable; urgency=low + + * Added "Evolution Team" in the Maintainer field, and listed the members of + the team as the Uploaders. + * Added a manpage provided by Lars Wirzenius (Closes: #239643). + * Added a symlink in /usr/bin for evolution-addressbook-export and + csv2vcard (Closes: #285174). + * Fixed finnish translations, as suggested by Lars Wirzenius, + by adding the corresponding patch (Closes: #279977, #288674) + * Build-depend on libkrb5-dev, since it's being used. (Closes: #318981) + * Update the libgal2.4-0 dependency, to prevent being installed with the + buggy version. + * Fixed the menu file (Closes: #307840, #318163) + + -- Margarita Manterola Mon, 1 Aug 2005 10:24:13 -0300 + +evolution (2.2.3-1) unstable; urgency=low + + * New upstream release + * change dependency to e-d-s instead of e-d-s1.2 + + -- Takuo KITAME Wed, 13 Jul 2005 15:13:40 +0900 + +evolution (2.2.2-4) unstable; urgency=low + + * remove unnecessary diffs from diff.gz (config.sub, config.guss, *.desktop) + * remove libdb4.2-dev from Build-Depends. + * Build-Depends on evolution-data-server1.2-dev (>= 1.2.2-4) + * build against latest e-d-s. + + -- Takuo KITAME Tue, 10 May 2005 12:29:37 +0900 + +evolution (2.2.2-3) unstable; urgency=low + + * added build-depends: dbus-glib-1-dev (closes: #305001) + + -- Takuo KITAME Sat, 30 Apr 2005 03:32:27 +0900 + +evolution (2.2.2-2) unstable; urgency=low + + * Oops. Previous release forgot to include plugins directory. + * Added build-depends for plugins. (libgstreamer0.8-dev, dbus-1-dev) + + -- Takuo KITAME Thu, 14 Apr 2005 11:42:22 +0900 + +evolution (2.2.2-1) unstable; urgency=low + + * New upstream release + * Fix debian menu (closes: #303657) + * --enable-plugins=all (closes: #304324) + + -- Takuo KITAME Wed, 13 Apr 2005 22:22:59 +0900 + +evolution (2.2.1.1-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 30 Mar 2005 12:06:30 +0900 + +evolution (2.2.1-1) unstable; urgency=low + + * New upstream release + * Upload to unstable/main + * Change package name to 'evolution' + + -- Takuo KITAME Tue, 22 Mar 2005 18:17:12 +0900 + +evolution2.2 (2.1.6-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 22 Mar 2005 15:39:39 +0900 + +evolution2.2 (2.1.5-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 22 Feb 2005 11:18:58 +0900 + +evolution2.2 (2.1.4-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Fri, 4 Feb 2005 14:57:30 +0900 + +evolution2.2 (2.1.3.2-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 13 Jan 2005 14:49:22 +0900 + +evolution2.2 (2.1.2-1) experimental; urgency=low + + * New upstream release + * fix build-depends (closes: #288572) + + -- Takuo KITAME Thu, 6 Jan 2005 15:05:08 +0900 + +evolution2.2 (2.1.1-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Fri, 17 Dec 2004 16:51:15 +0900 + +evolution2.2 (2.1.0-1) experimental; urgency=low + + * New upstream release + * experimental, tagged package name. + + -- Takuo KITAME Fri, 5 Nov 2004 14:37:51 +0900 + +evolution (2.0.4-2) testing-proposed-updates; urgency=high + + * remove broken patch: decode-rfc2047-invalid-encoded-word.patch + (closes: #280303) + * applied security fix patch. + - CAN-2005-0806: Remote denial of service in evolution 2.0.3 + (closes: #300815) + + -- Takuo KITAME Thu, 28 Apr 2005 12:35:33 +0900 + +evolution (2.0.4-1) unstable; urgency=low + + * Maintainer upload (closes: #285908) + + -- Takuo KITAME Wed, 16 Mar 2005 19:23:19 +0900 + +evolution (2.0.4-0.1) unstable; urgency=low + + * Non-maintainer upload. + * New upstream release. + * debian/patches/CAN-2005-0102.patch, + debian/patches/mail-preserve-auth-conf.patch: removed, applied upstream. + * debian/control: + - Build-Conflict on kerberos4kth-dev (closes: #285908). + - update Build-Depends for new requirements. + + -- Jordi Mallach Tue, 1 Mar 2005 18:42:43 +0100 + +evolution (2.0.3-1.2) unstable; urgency=HIGH + + * Non-maintainer upload to fix SECURITY issues. + * debian/patches/CAN-2005-0102.patch: + - camel/camel-lock-helper.c: malloc()'ing supplied path length + 1 allowed + an integer overflow and malloc()ation of a 0-byte buffer, which was then + filled by an arbitrary amount of user-supplied data. Now restrict + the length of the supplied path to at most 0xFFFF characters (patch + taken from Ubuntu USN-69-1, thanks pitti!). + * debian/patches/mail-preserve-auth-conf.patch: patch from Ximian Bugzilla + to fix the skipping of the needauth setting (closes: #290291). + * debian/rules: add DEB_FIXPERMS_EXCLUDE for camel-lock-helper. + * debian/evolution.postinst: removed, chmod/chgrp handled by make install + (this changes camel-lock-help from suid root to sgid mail). + + -- Jordi Mallach Tue, 25 Jan 2005 17:49:41 +0100 + +evolution (2.0.3-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * debian/control: bump several build dependencies to the versions + required by configure.in (closes: #285226). + + -- Jordi Mallach Tue, 14 Dec 2004 20:30:06 +0100 + +evolution (2.0.3-1) unstable; urgency=low + + * New upstream release + * remove camel-charset-map-patch. + * upstream fix: + - failed to migrate 1.4 data to 2.0 (closes: #276162) + * build-depends on debhelper >= 4.2.21 (closes: #282038) + + -- Takuo KITAME Thu, 9 Dec 2004 17:36:28 +0900 + +evolution (2.0.2-3) unstable; urgency=low + + * upload to unstable/main + + -- Takuo KITAME Fri, 15 Oct 2004 14:20:05 +0900 + +evolution (2.0.2-2) experimental; urgency=low + + * install help files, evolution-addressbook-export (closes: #274976, #275709) + + -- Takuo KITAME Wed, 13 Oct 2004 16:26:33 +0900 + +evolution (2.0.2-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 13 Oct 2004 12:52:30 +0900 + +evolution (2.0.1-1) experimental; urgency=low + + * New upstream release + * include help files. + + -- Takuo KITAME Wed, 29 Sep 2004 16:03:30 +0900 + +evolution (2.0.0-1) experimental; urgency=low + + * New upstream release, RC package for uploading into main. + * usr/share/idl is -dev files. + * chmod u+s /usr/lib/evolution/2.0/camel/camel-lock-helper + + -- Takuo KITAME Wed, 15 Sep 2004 13:51:07 +0900 + +evolution1.5 (1.5.94.1-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 31 Aug 2004 14:54:54 +0900 + +evolution1.5 (1.5.93-1) experimental; urgency=low + + * New upstream release + * try to decode rfc2047 invalid (non-lwsp separated e-word) mime subject. + * decode rfc2047 e-word in comment of User-Agent/X-Mailer (upstream patch) + * --enable-nntp (closes: #264280) + + -- Takuo KITAME Mon, 16 Aug 2004 12:59:41 +0900 + +evolution1.5 (1.5.92.1-1) experimental; urgency=low + + * New upstream release + * apply patch to decode encoded-word which is not space-separated. + + -- Takuo KITAME Thu, 5 Aug 2004 18:07:56 +0900 + +evolution1.5 (1.5.91-2) experimental; urgency=low + + * Applied http://primates.ximian.com/~fejj/camel-charset-map.patch + fix multibyte charset header encoding. + + -- Takuo KITAME Wed, 21 Jul 2004 18:42:49 +0900 + +evolution1.5 (1.5.91-1) experimental; urgency=low + + * New upstream release + some bugs were fixed by upstream (closes: #242014, #256707, #256830, #236333, #241003, #244703) + * Depends on gnome-icon-theme (closes: #259594) + * Recommends spamassasin (closes: #249822) + * clean up doc files (closes: #257404) + * --enable-ipv6 + + -- Takuo KITAME Fri, 16 Jul 2004 09:25:48 +0900 + +evolution1.5 (1.5.90-2) experimental; urgency=low + + * fix for local mailbox access (closes: #256988) + chgrp mail /usr/lib/evolution/1.5/camel/camel-lock-helper + chmod g+s /usr/lib/evolution/1.5/camel/camel-lock-helper + + -- Takuo KITAME Sun, 11 Jul 2004 23:35:33 +0900 + +evolution1.5 (1.5.90-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 8 Jul 2004 18:59:48 +0900 + +evolution1.5 (1.5.9.2-2) experimental; urgency=low + + * link againsta libcompface (closes: #257064) + + -- Takuo KITAME Thu, 1 Jul 2004 21:42:23 +0900 + +evolution1.5 (1.5.9.2-1) experimental; urgency=low + + * New upstream release (closes: #256476, #250840) + * use cdbs instead of dbs + + -- Takuo KITAME Mon, 28 Jun 2004 12:00:04 +0900 + +evolution1.5 (1.5.9.1-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Mon, 7 Jun 2004 12:14:39 +0900 + +evolution1.5 (1.5.8-2) experimental; urgency=low + + * update Dependency. + + -- Takuo KITAME Thu, 27 May 2004 08:57:51 +0900 + +evolution1.5 (1.5.8-1) experimental; urgency=low + + * New upstream release + * Applied X-Face header display support. + + -- Takuo KITAME Wed, 21 Apr 2004 15:13:24 +0900 + +evolution1.5 (1.5.7-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 20 Apr 2004 17:16:04 +0900 + +evolution1.5 (1.5.6.2-2) experimental; urgency=low + + * Build-Depends on libgail-dev (closes: #241157) + + -- Takuo KITAME Fri, 16 Apr 2004 23:20:40 +0900 + +evolution1.5 (1.5.6.2-1) experimental; urgency=low + + * New upstream release + libgtkhtml3.1-7 is still in incoming... :< + * Depends on e-d-s (>= 0.0.91) (closes: #236260, #236328) + * use tar.gz upstream source (closes: #241157) + * comment out #include (closes: #243390) + + -- Takuo KITAME Fri, 16 Apr 2004 13:48:42 +0900 + +evolution1.5 (1.5.6-1) experimental; urgency=low + + * New upstream release + * NOTE: + libgtkhtml3.1-7 package had been uploaded already. + But it marked as NEW package and waiting for ACCEPTED. + So please wait for installing into archive by ftp-maintainer. + + -- Takuo KITAME Wed, 7 Apr 2004 14:14:13 +0900 + +evolution1.5 (1.5.5-1) experimental; urgency=low + + * New upstream release + * NOTE: + libsoup2.2-3 and libgtkhtml3.1-6 package had been uploaded already. + But it marked as NEW package and waiting for ACCEPTED. + So please wait for installing into archive by ftp-maintainer. + + -- Takuo KITAME Tue, 9 Mar 2004 13:13:05 +0900 + +evolution1.5 (1.5.4-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 19 Feb 2004 15:02:12 +0900 + +evolution1.5 (1.5.3-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 3 Feb 2004 14:34:58 +0900 + +evolution1.5 (1.5.2-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 20 Jan 2004 17:03:35 +0900 + +evolution1.5 (1.5.1-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Fri, 9 Jan 2004 14:35:23 +0900 + +evolution1.5 (1.5-1) experimental; urgency=low + + * New upstream release + * remove db3 source + * Depends: on evolution-data-server + * experimental release, package name is evolution1.5 + + -- Takuo KITAME Mon, 15 Dec 2003 16:45:13 +0900 + +evolution (1.4.5-3) unstable; urgency=low + + * build against G2.4 (closes: #217681) + + -- Takuo KITAME Tue, 28 Oct 2003 17:22:55 +0900 + +evolution (1.4.5-2) unstable; urgency=low + + * applied patch imap-reduce-max-command-length (closes: #169209) + * Build-Depends on libgnomecanvas2-0 (>= 2.2.0.2) (closes: #211613) + * applied patch to handle +1300 time zone (closes: #214533) + + -- Takuo KITAME Fri, 17 Oct 2003 15:05:56 +0900 + +evolution (1.4.5-1) unstable; urgency=low + + * New upstream release (closes: #210976) + * Maintainer upload (closes: #211158, #210917) + + -- Takuo KITAME Wed, 24 Sep 2003 12:44:55 +0900 + +evolution (1.4.4-2.1) unstable; urgency=medium + + * NMU + * [debian/control] Added Build-Depends: libheimdal-dev; added evolution-dev + Depends: libsoup2.0-dev, libgal2.0-dev. (Closes: #211158) + * New build (using pbuilder), resulting in installable packages. + (Closes: #210917) + + -- J.H.M. Dassen (Ray) Sun, 21 Sep 2003 14:58:32 +0200 + +evolution (1.4.4-2) unstable; urgency=low + + * applied patch to use default encoding when message has no CT: charset= header. + * applied patch to fix invalid convert to UTF-8 via IMAP (closes: #207476) + * Build-Depends on latest autotools-dev (closes: #201421) + * fix debian/script/lib (closes: #158664) + * Recommends: gnome-desktop-data (closes: #198917) + + -- Takuo KITAME Wed, 3 Sep 2003 12:45:22 +0900 + +evolution (1.4.4-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 5 Aug 2003 14:43:40 +0900 + +evolution (1.4.3-2) unstable; urgency=low + + * Update build-depends (closes: 201320, 200958, 200942) + + -- Takuo KITAME Tue, 15 Jul 2003 11:15:15 +0900 + +evolution (1.4.3-1) unstable; urgency=low + + * New upstream release (closes: 200826) + + -- Takuo KITAME Fri, 11 Jul 2003 15:41:15 +0900 + +evolution (1.4.0-4) unstable; urgency=low + + * camel-pop3-store.c: don't send CAPA after login like evo1.2 (closes: #196141) + * fix Makefile of conduits (closes: #197682) + + -- Takuo KITAME Tue, 17 Jun 2003 16:27:47 +0900 + +evolution (1.4.0-3) unstable; urgency=low + + * Depends on scrollkeeper (${misc:Depends})(closes: #197380) + * Fix mozilla depenedency (closes: #197314) + * Build with -fPIC (closes: #197561) + * regenerate evolution.desktop (closes: #197213, #197248) + + -- Takuo KITAME Mon, 16 Jun 2003 12:18:36 +0900 + +evolution (1.4.0-2) unstable; urgency=low + + * Fix debian menu entry (closes: #197209, #192760) + * Fix GNOME menu entry (closes: #197213, #197248) + * Build-Depends: on libgnome-pilot2-dev (>= 2.0.9-2) (closes: 196629) + * use dh_scrollkeeper (closes: #197111) + + -- Takuo KITAME Fri, 13 Jun 2003 11:54:58 +0900 + +evolution (1.4.0-1) unstable; urgency=low + + * New upstream release (closes: #196977) + * fix build-depends. referred to configure script to know which version is really needed. (closes: #196542) + * fix description (closes: #197033) + + -- Takuo KITAME Thu, 12 Jun 2003 12:12:00 +0900 + +evolution (1.3.92-2) unstable; urgency=low + + * Remove unnecessary debconf configs (closes: #196229) + * debian/evolution.menu: fix entry (closes: #162898,#196299) + * debian/rules: Recommends: gnome-pilot-conduits (closes: #161242) + + -- Takuo KITAME Fri, 6 Jun 2003 11:37:46 +0900 + +evolution (1.3.92-1) unstable; urgency=low + + * Upload into unstable/main + * fix crash on startup (closes: #195536, #195137, #195133, #195142, #196031, #195986, #195400) + * enable pilot support (closes: #195400, #185107) + + -- Takuo KITAME Wed, 4 Jun 2003 11:34:52 +0900 + +evolution1.3 (1.3.92-1) experimental; urgency=low + + * New upstream release + * Depends on libgal2.0-common (closes: #194301) + + -- Takuo KITAME Wed, 28 May 2003 11:41:18 +0900 + +evolution1.3 (1.3.3-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 7 May 2003 14:01:04 +0900 + +evolution1.3 (1.3.2-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Thu, 24 Apr 2003 11:30:33 +0900 + +evolution1.3 (1.3.1-2) experimental; urgency=low + + * disable broken IPv6 support. + + -- Takuo KITAME Mon, 31 Mar 2003 17:01:54 +0900 + +evolution1.3 (1.3.1-1) experimental; urgency=low + + * New upstream release + + -- Takuo KITAME Wed, 19 Mar 2003 18:27:07 +0900 + +evolution (1.2.2-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Mon, 10 Feb 2003 14:14:21 +0900 + +evolution (1.2.1-3) unstable; urgency=low + + * Build Depends on psmisc (closes: #169181, #176672, #178642) + + -- Takuo KITAME Tue, 28 Jan 2003 14:23:56 +0900 + +evolution (1.2.1-2) unstable; urgency=low + + * Build-Depends on pilot-link (>= 0.11.7),libncurses5-dev (closes: #175308, #175037) + * update ja.po + + -- Takuo KITAME Fri, 27 Dec 2002 15:04:29 +0900 + +evolution (1.2.1-1) unstable; urgency=low + + * New upstream release + + -- Takuo KITAME Tue, 24 Dec 2002 17:28:09 +0900 + +evolution (1.2.0-4) unstable; urgency=low + + * Build against mozilla 1.2.1, update dependency. + + -- Takuo KITAME Wed, 4 Dec 2002 23:02:33 +0900 + +evolution (1.2.0-3) unstable; urgency=low + + * Build against mozilla 1.2 + * Fix build-depends (closes: #169414, #170326) + * Fix postinst, don't call twice ldconfig (closes: #157893) + + -- Takuo KITAME Fri, 29 Nov 2002 10:21:55 +0900 + +evolution (1.2.0-2) unstable; urgency=low + + * fix evolution-mail-upgrade location (closes: #169088) + * recommends gnome-spell (>= 0.5) (closes: #169506) + + -- Takuo KITAME Wed, 20 Nov 2002 08:18:42 +0900 + +evolution (1.2.0-1) unstable; urgency=low + + * New upstream release (closes: #168702) + * Change Maintainer address to @debian.org + + -- Takuo KITAME Wed, 13 Nov 2002 12:46:22 +0900 + +evolution (1.0.8-5) unstable; urgency=low + + * Build against gdk-imlib1 + + -- Takuo KITAME Fri, 30 Aug 2002 17:01:56 +0900 + +evolution (1.0.8-4) unstable; urgency=low + + * Build against libpng2 (closes: #157329) + + -- Takuo KITAME Tue, 20 Aug 2002 16:01:06 +0900 + +evolution (1.0.8-3) unstable; urgency=low + + * UTF8 Fix omf file. (closes: #152000) + * update .desktop file for G2 (closes: #148746) + + -- Takuo KITAME Mon, 19 Aug 2002 05:08:28 +0900 + +evolution (1.0.8-2) unstable; urgency=low + + * Build against libpisock-dev (>= 0.11.3-2) + + -- Takuo KITAME Mon, 12 Aug 2002 15:38:03 +0900 + +evolution (1.0.8-1) unstable; urgency=low + + * New upstream release. + + -- Takuo KITAME Mon, 12 Aug 2002 14:24:43 +0900 + +evolution (1.0.7-3) unstable; urgency=low + + * Build depends libpisock-dev (>= 0.10.99-3) (closes: 152713) + + -- Takuo KITAME Sat, 13 Jul 2002 16:53:09 +0900 + +evolution (1.0.7-2) unstable; urgency=low + + * libcamel0: Depends on libnss3 (>> 1.0.0) + * evolution: Reccomends mozilla-psm (>> 1.0.0). + added README.SSL (closes: #151446) + * Build against libpisock5 (closes: #151677) + + -- Takuo KITAME Wed, 3 Jul 2002 12:39:20 +0900 + +evolution (1.0.7-1) unstable; urgency=low + + * New upstream release. + * build against gtkhtml 1.0.4 + * debian/rules: mozilla include path is /usr/include/mozilla-1.0.0/{nspr,nss} + (closes: #147149) + + -- Takuo KITAME Mon, 17 Jun 2002 12:45:46 +0900 + +evolution (1.0.5-1) unstable; urgency=low + + * New upstream release. + * move some executables into /usr/lib/evolution/ (closes: #126044) + + -- Takuo KITAME Tue, 14 May 2002 10:11:12 +0900 + +evolution (1.0.3-3) unstable; urgency=critical + + * debian/patches/24140.patch + - fix Possible DoS attack through message headers (closes: #145903) + * remove evolution-dev package from control. It is useless. (closes: #144269) + + -- Takuo KITAME Sun, 28 Apr 2002 00:26:42 +0900 + +evolution (1.0.3-2) unstable; urgency=low + + * fix menu entry (closes: #142418) + * fix Description (closes: #141328) + * applied patch to changes a default charset for Japanese (closes: #142365) + + -- Takuo KITAME Sat, 13 Apr 2002 04:05:48 +0900 + +evolution (1.0.3-1) unstable; urgency=low + + * New upstrem release. + * removed upstream merged patches + - debian/patches/fix-mail-crash + - debian/patches/pgpfix + + -- Takuo KITAME Tue, 26 Mar 2002 17:10:49 +0900 + +evolution (1.0.2-3) unstable; urgency=low + + * move to main from non-US + * menu category is Apps/Net (closes: #137976) + + -- Takuo KITAME Sun, 24 Mar 2002 04:19:58 +0900 + +evolution (1.0.2-2) unstable; urgency=low + + * debian/patches/pgpfix: + - added to fix verifying pgp signed message (closes: #137045) + * debian/patches/fix-mail-crash: + - added to fix crashing mail (patch from bugzilla.ximian.com #19564) (closes: #132433) + * fix conduits icon path (closes: #131115) + * debian/control: + - evolution suggests gnome-spell (closes: #119518, #123760) + + -- Takuo KITAME Wed, 6 Mar 2002 18:08:40 +0900 + +evolution (1.0.2-1) unstable; urgency=low + + * New upstream release. + * debian/evolution.menu: + - fix package name (closes: #129436) + * debian/control: + - evolution suggests bugbuddy (closes: #131790) + + -- Takuo KITAME Fri, 1 Feb 2002 16:32:59 +0900 + +evolution (1.0.1-1) unstable; urgency=low + + * New upstream release. + * Build against libgal19 + * debian/patches/{calendar-import-from-korganizer-fix,addressbook-conduit-backport-1.0.1}: + - removed (fixed by upstream) + + -- Takuo KITAME Sun, 13 Jan 2002 23:16:23 +0900 + +evolution (1.0-5) unstable; urgency=high + + * Build fix (krb4 related)for powerpc. (closes: #127457) + + -- Takuo KITAME Fri, 4 Jan 2002 00:31:00 +0900 + +evolution (1.0-4) unstable; urgency=high + + * debian/patches/addressbook-conduit-backport-1.0.1: + - Backport from EVOLUTION_1_0_1. It includes conduit bug fix. (closes: #123892) + * debian/patches/calendar-import-from-korganizer-fix + - added to fix import from korganizer (closes: #122327) + * debian/patches/libical-char-signed-char: + - fix for arch which's char is unsigned char. (closes: #126997) + + -- Takuo KITAME Mon, 31 Dec 2001 05:45:33 +0900 + +evolution (1.0-3) unstable; urgency=low + + * debian/rules,debian/control: + - support SSL/Kerberos45, move to non-us, evolution-ssl is obsolete. (closes: #116665) + - Replaces,Provides with evolution-ssl + * It's time for remove evolution-ssl from ftp archive. + + -- Takuo KITAME Sun, 23 Dec 2001 07:26:42 +0900 + +evolution (1.0-2) unstable; urgency=low + + * Applied fPIC patch of Bug#124141 (closes: #124141) + * Applied correcthelosmtp.diff of Bug#123922 (closes: #123922) + * debian/control: + - remove beta notice from Description. + + -- Takuo KITAME Mon, 17 Dec 2001 07:19:43 +0000 + +evolution (1.0-1) unstable; urgency=low + + * New upstream release. + * Build against libgtkhtml20 + + -- Takuo KITAME Tue, 4 Dec 2001 06:20:56 +0000 + +evolution (0.99.2-1) unstable; urgency=low + + * New upstream release. + * Provides mail-reader and imap-client. + + * some bugs were fixed by upstream + - undefined symbol in pilot conduits (closes: #119153, #119677) + - Crashing while starting the program. (closes: #112519) + - some crashing evolution-mail (closes: #115073, #100120) + + -- Takuo KITAME Tue, 20 Nov 2001 03:49:50 +0000 + +evolution (0.99.0-2) unstable; urgency=low + + * fix build fail with creating KDE_APPLNK_DIR (closes: #118918) + + -- Takuo KITAME Sat, 10 Nov 2001 09:27:27 +0000 + +evolution (0.99.0-1) unstable; urgency=low + + * New upstream release + * Fixed Calendar/Task componet crash (closes: #117208, #117209) + * Build-depends: libgal-dev (>= 0.18), libgtkhtml-dev (>= 0.16.0) + + -- Takuo KITAME Thu, 8 Nov 2001 03:43:00 +0000 + +evolution (0.16-1) unstable; urgency=low + + * New upstream release + * Task/Calendar is still broken!! wait for next upstream. + * build against latest libraries, update Build-Depends. + * fixed splash (closes: #117211) + + -- Takuo KITAME Sun, 4 Nov 2001 06:48:57 +0000 + +evolution (0.15-6) unstable; urgency=low + + * rebuild with libgconf11 1.0.6-3 (closes: #115944) + * fixed build-dep (closes: #116663) + * Suggests: gnupg + + -- Takuo KITAME Tue, 23 Oct 2001 02:24:14 +0900 + +evolution (0.15-5) unstable; urgency=low + + * build against libgtkhtml18 (>= 0.15.0-3) which is without GConf + (closes: #116077, #115944) + * build against libgal15 + + -- Takuo KITAME Sat, 20 Oct 2001 19:43:35 +0900 + +evolution (0.15-4) unstable; urgency=low + + * build-depends libgal-dev (>= 0.14), gtkhtml (>= 0.14) (closes: #114026) + + libgnome-pilot1-dev, gnome-pilot (>= 0.1.62) + * --enable-pilot-conduits (closes: #90290) + * remove --enable-nntp (closes: #115755) + + -- Takuo KITAME Tue, 16 Oct 2001 19:24:02 +0900 + +evolution (0.15-3) unstable; urgency=low + + * build against GAL 0.14 + + -- Takuo KITAME Thu, 11 Oct 2001 15:38:14 +0900 + +evolution (0.15-2) unstable; urgency=low + + * build against libgtkhtml17 + * --disable-gtk-doc + + -- Takuo KITAME Tue, 9 Oct 2001 09:17:46 +0900 + +evolution (0.15-1) unstable; urgency=low + + * New upstream release. + * debian/rules: based on evolution-ssl package. + * remove rdf encoding patch, it was merged into upstream. + http://bugzilla.ximian.com/show_bug.cgi?id=11160 + * build against gtkhtml 0.13.0 but it is wrong. + I'll rebuild after installed 0.14.0 + * fix bug about GPG clear signed mail + http://bugzilla.ximian.com/show_bug.cgi?id=11548 + + -- Takuo KITAME Fri, 5 Oct 2001 16:58:29 +0900 + +evolution (0.14-2) unstable; urgency=low + + * Added DebianPlanet and Slashdot Japan into ExectiveSummary NewsFeed. + * take RDF encoding property in ExectiveSummary NewsFeed. + * close old bug about dependency. (closes: #99963) + * about + #112519 (Configuration database not found. on 0.13), + #107852 (Segfault on startup with evolution-shell-WARNING **: CORBA exception ... on 0.12), + #86405 (another crash with querying "bigfoot" for address data. on 0.8cvs), + #94254 (Mail component crash after sending mail. on 0.9), + #97487 (None of evolution's oaf objects are being embedded. on 0.10), + #99434 (takes for eva to load. on 0.10), + #106412 (doesn't load contact list. on 0.11 with old gtkhtml), + #107911 (evolution crashes when trying to empty trash. on 0.12.1), + #112401, #112656 (Error: Could not create composer window. on 0.13, I think it is gtkhtml problem), + I've checked and checked with evolution 0.14. and couldn't reproduce. + I think they were fixed by upstream. close it. + and feel free to reopen them if it wasn't fixed. + (closes: #112519,#107852,#86405,#94254,#97487,#99434,#106412,#107911,#112401,#112656) + + -- Takuo KITAME Sun, 30 Sep 2001 15:03:51 +0900 + +evolution (0.14-1) unstable; urgency=low + + * New upstream release. + * it fixes gnome-vfs build problem (closes: #113292) + + -- Takuo KITAME Wed, 26 Sep 2001 22:45:45 +0900 + +evolution (0.13-2) unstable; urgency=low + + * fix description. (closes: #111632) + + -- Takuo KITAME Sat, 8 Sep 2001 07:35:25 +0900 + +evolution (0.13-1) unstable; urgency=low + + * New upstream release. + * Fix description (closes: #111363) + * Fix #107626: Cannot read mbox files in /var/mail/ + #107881: evolution: lock problem and permission in /var/spool/mail + (closes: #107626, #107881) + Thanks, Dominik 'Aeneas' Schnitzer + + -- Takuo KITAME Fri, 7 Sep 2001 19:02:45 +0900 + +evolution (0.12+cvs0903-2) unstable; urgency=low + + * Fix build-depends (closes: #111079, #111159) + + -- Takuo KITAME Wed, 5 Sep 2001 19:42:07 +0900 + +evolution (0.12+cvs0903-1) unstable; urgency=low + + * CVS update -r evolution-0-13-branch + * Build with libgtkhtml15 + + -- Takuo KITAME Mon, 3 Sep 2001 19:33:39 +0900 + +evolution (0.12+cvs0831-1) unstable; urgency=low + + * New upstream release. (CVS version for GAL update) + * build with latest gal (closes: Bug#110765, Bug#110749) + + -- Takuo KITAME Fri, 31 Aug 2001 19:02:14 +0900 + +evolution (0.12-1) unstable; urgency=low + + * New upstream release. + * Fix build problem when /bin/sh -> ash (closes: Bug#98205) + + -- Takuo KITAME Fri, 3 Aug 2001 21:55:42 +0900 + +evolution (0.11.0-1) unstable; urgency=low + + * bump upstream version, orig.tar.gz changes. + source includes db3-3.1.17 + * link with db3 3.1.17 staticaly (closes: Bug#106303) + * Fix debian/docs (closes: Bug#106718) + * --with-openldap (closes: Bug#106478) + + -- Takuo KITAME Sat, 28 Jul 2001 10:53:22 +0900 + +evolution (0.11-1) unstable; urgency=low + + * New upstream release. (closes: Bug#98319) + + -- Takuo KITAME Mon, 23 Jul 2001 21:20:38 +0900 + +evolution (0.10-2) unstable; urgency=low + + * Fix camel patch (closes: #97617) + * debian/control: evolution-dev replaces evolution << 0.10 (closes: Bug#97460) + + -- Takuo KITAME Fri, 18 May 2001 13:54:45 +0900 + +evolution (0.10-1) unstable; urgency=low + + * New upstream release (cvs update -r EVOLUTION_0_10) + * use dbs_make for build package. + * closes: Bug#89763 Evolution help documentation is missing. + * closes: Bug#92507 evolution: Evolution's help menus dont work because /usr/share/gnome/help/evolution/C is empty + * build with libgal6 (closes: Bug#95708) + * build with libgtkhtml9 (closes: Bug#97316) + + -- Takuo KITAME Sun, 13 May 2001 23:03:06 +0900 + +evolution (0.9-2) unstable; urgency=low + + * Build-Depends: libgnome-vfs-dev (closes: Bug#90917) + + -- Takuo KITAME Mon, 26 Mar 2001 23:34:30 +0900 + +evolution (0.9-1) unstable; urgency=low + + * New upstream release + * rebuild with gal-0.5 (closes: Bug#89645) + + -- Takuo KITAME Thu, 15 Mar 2001 11:21:59 +0900 + +evolution (0.8.0.cvs20010311-1) unstable; urgency=low + + * New upstream release (CVS snapshot) + * libcamel0: include camel-providers/*/*.so (closes: Bug#87032,Bug#86403,Bug#88927,Bug#88181) + * hopefully fix #87796: could not create composer window (closes: Bug#87796) + * evolution-dev: remove ical development files (closes: Bug#86402) + + -- Takuo KITAME Tue, 13 Mar 2001 11:29:37 +0900 + +evolution (0.8.0.cvs20010214-1) unstable; urgency=low + + * New upstream release + * debian/control: libical install to /usr/lib/libical (closes: Bug#86398) + note that does libical exists in main? I couldn't find the package. + * debian/contorol: fix Build-Depends (closes: Bug#86344) + * versioned depends on bonobo (closes: Bug#86562) + + -- Takuo KITAME Wed, 28 Feb 2001 17:41:19 +0900 + +evolution (0.8.0.cvs20010212-1) unstable; urgency=low + + * New upstream release + * use CVS version because for GAL 0.5, Bonobo 0.36 (latest Debian package) + + -- Takuo KITAME Tue, 13 Feb 2001 23:44:24 +0900 + +evolution (0.8-1) unstable; urgency=low + + * Initial Release, referenced from Akira TAGOH's diff.gz (0.8.cvs20010212-2) + + -- Takuo KITAME Tue, 13 Feb 2001 21:30:43 +0900 + --- evolution-2.30.2.orig/debian/evolution.gconf-defaults +++ evolution-2.30.2/debian/evolution.gconf-defaults @@ -0,0 +1 @@ +/apps/evolution/shell/skip_warning_dialog true --- evolution-2.30.2.orig/debian/evolution.manpages +++ evolution-2.30.2/debian/evolution.manpages @@ -0,0 +1,3 @@ +debian/evolution.1 +debian/evolution-addressbook-export.1 +debian/csv2vcard.1 --- evolution-2.30.2.orig/debian/evolution-addressbook-export.1 +++ evolution-2.30.2/debian/evolution-addressbook-export.1 @@ -0,0 +1,50 @@ +.TH EVOLUTION-ADDRESSBOOK-EXPORT 1 2006\-05\-13 "GNOME" "GNOME" +.SH NAME +evolution-addressbook-export \- export addressbook content from Evoluion +.SH SYNOPSIS +.B evolution-addressbook-export +.RI [ OPTIONS ] " " [ ADDRESSBOOK ] +.SH DESCRIPTION +Export the entire contents of the Evolution address book with ID +.I ADDRESSBOOK +, or the default address book if none is given. Available address book +IDs can be listed with the \-l option. Supported export formats are +vCard and CSV. +.SH OPTIONS +.TP +.BR \-? ", " \-\-help +Show a help message listing all the options and their meanings. +.TP +.B \-\-usage +Show a brief help message listing the names of the options only. +.TP +.BI \-\-output= OUTPUTFILE +.RI "Use " OUTPUTFILE "as output file for exported data. Defaults to standard out." +.TP +.BR \-l ", " \-\-list\-addressbook\-folders +Export a comma-separated list of address book IDs, names and number of +entries instead of address book contents. +.TP +.BI \-\-format= FORMAT +.RI "Specify the output format. " FORMAT " must be either `vcard' or `csv'." +The default format is vCard. +.TP +.BR \-a ", " \-\-async +.RI "Export in asynchronous mode. " OUTPUTFILE " must be set and will be the prefix for the output files." +.TP +.BI \-\-size= NUMBER +.RI "Export " NUMBER " entries to each output file. The default is 100." +This option is only valid in asynchronous mode. +.PP +In addition, the usual Bonobo activation and GNOME command line options apply. +See the output of \-\-help for details. +.SH "SEE ALSO" +.BR evolution (1) +.SH AUTHOR +Gilbert Fang +.PP +This manual page was originally written by Oystein Gisnas for the +Debian system. +.\" Copyright 2006 ystein Gisns +.\" You may copy this manual page under the terms of the version 2 of +.\" the GNU General Public License. --- evolution-2.30.2.orig/debian/libevolution.install +++ evolution-2.30.2/debian/libevolution.install @@ -0,0 +1,8 @@ +debian/tmp/usr/lib/evolution/2.30/*.so.* +debian/tmp/usr/lib/evolution/2.30/csv2vcard +debian/tmp/usr/lib/evolution/2.30/modules/*.so +debian/tmp/usr/lib/evolution/2.30/evolution-addressbook-export +debian/tmp/usr/lib/evolution/2.30/evolution-addressbook-clean +debian/tmp/usr/lib/evolution/2.30/evolution-backup +debian/tmp/usr/lib/evolution/2.30/evolution-alarm-notify +debian/tmp/usr/lib/evolution/2.30/killev --- evolution-2.30.2.orig/debian/csv2vcard.1 +++ evolution-2.30.2/debian/csv2vcard.1 @@ -0,0 +1,19 @@ +.TH CSV2VCARD 1 2006\-05\-13 "GNOME" "GNOME" +.SH NAME +csv2vcard \- Convert a CSV-formatted list of contacts to vCards +.SH SYNOPSIS +.B csv2vcard +.I INFILE OUTFILE +.SH DESCRIPTION +Takes the CSV-formatted list of contacts from Outlook and attempts to +convert it into a list of vCards suitable for import into Evolution. +.SH "SEE ALSO" +.BR evolution (1) +.SH AUTHOR +Michael MacDonald +.PP +This manual page was originally written by Oystein Gisnas for the +Debian system. +.\" Copyright 2006 ystein Gisns +.\" You may copy this manual page under the terms of the version 2 of +.\" the GNU General Public License. --- evolution-2.30.2.orig/debian/evolution.xpm +++ evolution-2.30.2/debian/evolution.xpm @@ -0,0 +1,198 @@ +/* XPM */ +static char * evolution_xpm[] = { +"24 24 171 2", +" c None", +". c #888A85", +"+ c #ABACA9", +"@ c #FFFFFF", +"# c #EDEDED", +"$ c #EBEBEB", +"% c #E9E9E9", +"& c #E8E8E8", +"* c #E6E6E6", +"= c #E4E4E4", +"- c #E2E2E2", +"; c #E1E1E1", +"> c #E0E0E0", +", c #DDDDDD", +"' c #DBDBDB", +") c #DADADA", +"! c #E7E7E7", +"~ c #DEDEDE", +"{ c #DCDCDC", +"] c #D9D9D9", +"^ c #D7D7D7", +"/ c #D5D5D5", +"( c #E5E5E5", +"_ c #E3E3E3", +": c #D8D8D8", +"< c #D3D3D3", +"[ c #B0B1AF", +"} c #A6A7A5", +"| c #D2D2D2", +"1 c #C9CAC9", +"2 c #B8B9B7", +"3 c #B2B2B1", +"4 c #C0C1BF", +"5 c #D0D0CF", +"6 c #FAFAFA", +"7 c #F5F5F5", +"8 c #B0B0AF", +"9 c #ACADAA", +"0 c #CDCECC", +"a c #C5C5C4", +"b c #C0C0BF", +"c c #B4B4B3", +"d c #BBBBBA", +"e c #CBCBCA", +"f c #F7F7F7", +"g c #FDFDFD", +"h c #FBFBFB", +"i c #F8F8F8", +"j c #C8C8C8", +"k c #C7C7C6", +"l c #E2E4E2", +"m c #F4F4F4", +"n c #FCFCFC", +"o c #F6F6F6", +"p c #F0F0F1", +"q c #917E9B", +"r c #7D6086", +"s c #76527C", +"t c #7B5D84", +"u c #9885A1", +"v c #878984", +"w c #D8DAD8", +"x c #D9DAD9", +"y c #F3F3F3", +"z c #F2F2F2", +"A c #C4BDC9", +"B c #7D5F86", +"C c #B090B1", +"D c #D6B9D3", +"E c #DCC0D9", +"F c #75577E", +"G c #F1F1F1", +"H c #B7B9B6", +"I c #E0E0DF", +"J c #F0F0F0", +"K c #EFEFEF", +"L c #EEEEEE", +"M c #E3E3E5", +"N c #7C5F86", +"O c #C7AAC6", +"P c #CFBDD0", +"Q c #D2CFD0", +"R c #D3D2D1", +"S c #E5E5E4", +"T c #DBD8DA", +"U c #CDBACD", +"V c #75557E", +"W c #E8E9E8", +"X c #ABAEAA", +"Y c #D1D2D0", +"Z c #C8C9C7", +"` c #82708E", +" . c #D0BDD0", +".. c #F2F2F0", +"+. c #9E9E9D", +"@. c #F1F1EF", +"#. c #F4F4F2", +"$. c #EFEFED", +"%. c #E7E7E5", +"&. c #CEBBCF", +"*. c #6F567B", +"=. c #DDDEDD", +"-. c #A9AAA7", +";. c #795B82", +">. c #EAE7E8", +",. c #F5F5F3", +"'. c #EDEDEB", +"). c #A9A9A8", +"!. c #F6F6F4", +"~. c #F0F0EE", +"{. c #EAEAE8", +"]. c #DDDADC", +"^. c #75567E", +"/. c #ECECEC", +"(. c #C4C6C3", +"_. c #A9ACA8", +":. c #DCDBDF", +"<. c #75527C", +"[. c #D3D2D2", +"}. c #F3F3F1", +"|. c #F7F7F5", +"1. c #868686", +"2. c #B7B7B6", +"3. c #E2E2E0", +"4. c #C1C1C0", +"5. c #75517B", +"6. c #C0C2BF", +"7. c #CCCECB", +"8. c #D3D2D6", +"9. c #DAD9D8", +"0. c #E6E6E4", +"a. c #787878", +"b. c #C2C2C1", +"c. c #EBEBE9", +"d. c #E4E4E2", +"e. c #CCCBCA", +"f. c #EAEAEA", +"g. c #C5C7C4", +"h. c #785A81", +"i. c #E2DFE0", +"j. c #6D6D6C", +"k. c #D2D2D0", +"l. c #E3E3E1", +"m. c #DDDBDE", +"n. c #74557D", +"o. c #E5E6E5", +"p. c #826F8D", +"q. c #D1BED0", +"r. c #DADAD8", +"s. c #DEDEDC", +"t. c #CFBCD0", +"u. c #6E557A", +"v. c #F4F3F5", +"w. c #D1BED1", +"x. c #DCD9DA", +"y. c #B3B3B1", +"z. c #D1D0CF", +"A. c #DCD9DB", +"B. c #CEBBCE", +"C. c #73547C", +"D. c #838580", +"E. c #858782", +"F. c #746F77", +"G. c #74567D", +"H. c #73547B", +"I. c #604A6B", +"J. c #72537B", +"K. c #74517B", +"L. c #74507B", +"M. c #715279", +"N. c #5E4667", +" ", +" . . . . . ", +" + @ @ @ @ @ . ", +" . @ # # $ % & @ . ", +" . @ # $ % * = - ; @ . ", +" . @ $ % * = - > , ' ) @ . ", +" . @ % ! = - > ~ { ] ^ / / @ . ", +" . @ ! ( _ ; ~ { ) : / < [ } | @ . ", +" . @ 1 _ ; ~ { ) : 2 3 4 5 6 7 8 9 @ . ", +" . @ 0 a { b c d e f g h i i i j k @ . ", +" . @ l b a m n h i o o p q r s s t u v ", +" . @ 7 w x o 7 m y z A B C D E E D C F ", +" . @ y G H I J K L M N O P Q R S T U O V ", +" . @ G G W X Y Z Z ` C ...+.@.#.$.%.&.C *. ", +" . @ K K L =.-.. v ;.D >.,.'.).!.~.{.].D ^. ", +" . @ # # /.(._.o :.<.E [.}.|.1.2.$.3.4.E 5. ", +" . @ $ $ 6.7.y & 8.<.E 9.$.0.a.b.c.d.e.E 5. ", +" . @ f.g.m /.! * ( h.D i.{.j.k.{.%.l.m.D n. ", +" . @ o.m ! * * ( ( p.C q.l.r.s.d.3.s.t.C u. ", +" . @ @ @ @ @ @ @ @ v.h.O w.x.y.z.A.B.O C. ", +" D.. . . . . . . . E.F.G.C D E E D C H. ", +" I.J.K.L.M.N. ", +" ", +" "}; --- evolution-2.30.2.orig/debian/NEWS +++ evolution-2.30.2/debian/NEWS @@ -0,0 +1,28 @@ +evolution (2.29.5-1) experimental; urgency=low + + * Due to gnome-pilot not beeing recent enough in Debian, it is now disabled + in evolution builds. + + -- Yves-Alexis Perez Mon, 11 Jan 2010 15:08:11 +0100 + +evolution (2.24.5-2) unstable; urgency=low + + * Evolution 2.24 now uses an sqlite database to store the messages + summaries, so at first restart it'll generate the database. That could + take some time for large messages folders. + * Evolution 2.24 is a large upgrade, and touches many things, so, just in + case, you should make sure: + - to make a backup of current setup, either by using the integrated + plugin or by backing up your $HOME/.evolution folders. + - to shutdown Evolution completely before upgrading, using: + evolution --force-shutdown + + -- Yves-Alexis Perez Wed, 11 Mar 2009 23:41:01 +0100 + +evolution (2.2.2-2) unstable; urgency=low + + * Plugin package is available now. + Please install 'evolution-plugins' package if you want to use it. + + -- Takuo KITAME Thu, 14 Apr 2005 12:12:38 +0900 + --- evolution-2.30.2.orig/debian/evolution.1 +++ evolution-2.30.2/debian/evolution.1 @@ -0,0 +1,69 @@ +.TH EVOLUTION 1 2004\-11\-06 "GNOME" "GNOME" +.SH NAME +evolution \- groupware suite for GNOME containing e\-mail, calendar, +addressbook, to-do list and memo tools +.SH SYNOPSIS +.B evolution +.RI [ OPTIONS ] " " [ MAILTO ] +.SH DESCRIPTION +This manual page briefly introduces the +.B evolution +command. Evolution is a graphical groupware suite, a single +application for reading and sending e\-mail and for managing +calendars, address books, notes, to-do lists and memos. It is written +for the GNOME graphical desktop. +.PP +.RI "An optional " MAILTO " expression can be specified, typically" +.RI "invoked from another application. An example " MAILTO " expression" +is `mailto:username@example.com`. This will open a new composer window +with an empty e-mail to `username@example.com`. More advanced expressions +are also suppported, but should conform to RFC 2368. +.PP +For a more detailed explanation of Evolution, please see the Help menu. +.SH OPTIONS +.TP +.B \-?, \-\-help +Show a help message listing all the options and their meanings. +.TP +.B \-\-usage +Show a brief help message listing the names of the options only. +.TP +.BI "\-c, \-\-component=" COMPONENT +Start Evolution by activating the desired component. +.I COMPONENT +is one of `mail', `calendar', `contacts', `tasks', `memos'. +.TP +.B \-\-offline +Start in offline mode. +.TP +.BR \-\-online +Start in online mode. +.TP +.B \-\-force\-shutdown +Forcibly shut down all Evolution components. +.TP +.B \-\-force\-migrate +Forcibly re-migrate from Evolution 1.4. +.TP +.BI \-\-debug= FILE +.RI "Send the debugging output of all components to " FILE "." +.TP +.B \-\-disable-eplugin +Disable loading of any plugins. +.PP +In addition, the usual GTK+ and GNOME command line options apply. +See the output of \-\-help for details. +.SH "SEE ALSO" +http://www.novell.com/products/evolution/ +.SH AUTHOR +Evolution was originally developed by the company Ximian, now a part +of Novell. +Evolution is now part of GNOME, and many people have touched the code. +See the "About" item in the "Help" menu for a list. +.PP +This manual page was originally written by Lars Wirzenius for the +Debian system. +.\" Copyright 2004 Lars Wirzenius +.\" You may copy this manual page under the terms of the version 2 of +.\" the GNU General Public License. +.\" Updated by Oystein Gisnas --- evolution-2.30.2.orig/debian/README.Debian +++ evolution-2.30.2/debian/README.Debian @@ -0,0 +1,27 @@ +Evolution for Debian +==================== + +IMAP +---- + +In versions prior to 2.8, two different IMAP providers (backend modules) were installed. "IMAP" was considered more stable and "IMAP4rev1" had a few experimental features. Starting with version 2.8, IMAP4rev1 has been removed. All accounts with IMAP4rev1 set as server type for incoming email must be switched to IMAP. + +Mailbox corruption +------------------ + +Mailbox summary corruption is an issue that is known to appear in exceptional cases as reported in http://bugs.debian.org/295270 and http://bugs.debian.org/347703. A typical symptom is the error message: "Error while Refreshing folder: Summary and folder mismatch, even after a sync." No data is lost, but one or more summary files are corrupted. + +Before fixing the problem, backup your ~/.evolution folder just in case. Delete ~/.evolution/mail/local/MAILBOX.ev-summary where MAILBOX is your mailboxes. For example, the inbox summary file is Inbox.ev-summary. To rebuild the summaries, restart evolution and evolution-data-server. + +Common console error messages +--------------------- +libnm_glib_nm_state_cb: dbus returned an error. + (org.freedesktop.DBus.Error.ServiceUnknown) The name org.freedesktop.NetworkManager was not provided by any .service files + +Evolution cannot contact network-manager, most likely because it is not installed. The error message only indicates that network-manager will not be used, and automatic offline mode is disabled. + + +libnm_glib_nm_state_cb: dbus returned an error. + (org.freedesktop.DBus.Error.AccessDenied) A security policy in place prevents this sender from sending this message to this recipient, see message bus configuration file (rejected message had interface "org.freedesktop.NetworkManager" member "state" error name "(unset)" destination "org.freedesktop.NetworkManager") + +Access is denied to the network-manager service. The required permissions can be configured in /etc/dbus-1/system.d/NetworkManager.conf. A typical way to acquire permission is to add the current user to the 'netdev' group. As with missing network-manager, the default fallback if access is denied is to toggle offline operation manually. --- evolution-2.30.2.orig/debian/evolution-dbg.debhelper.log +++ evolution-2.30.2/debian/evolution-dbg.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- evolution-2.30.2.orig/debian/compat +++ evolution-2.30.2/debian/compat @@ -0,0 +1 @@ +5 --- evolution-2.30.2.orig/debian/evolution-plugins-experimental.debhelper.log +++ evolution-2.30.2/debian/evolution-plugins-experimental.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- evolution-2.30.2.orig/debian/evolution-plugins.install +++ evolution-2.30.2/debian/evolution-plugins.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/evolution/2.30/plugins/*{attachment-reminder,audio-inline,bbdb,email-custom-header,subject-thread,save-calendar,select-one-source,copy-tool,mail-to-task,mailing-list-actions,mail-notification,default-mailer,mail-attachments-import-ics,prefer-plain,backup-restore,email-custom-header,templates,vcard-inline,pst-import,image-inline}*.{so,eplug,xml} --- evolution-2.30.2.orig/debian/evolution-plugins.debhelper.log +++ evolution-2.30.2/debian/evolution-plugins.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- evolution-2.30.2.orig/debian/patches/89_add_une_desktop_file.patch +++ evolution-2.30.2/debian/patches/89_add_une_desktop_file.patch @@ -0,0 +1,119 @@ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//configure.ac evolution-2.30.2.new//configure.ac +--- evolution-2.30.2//configure.ac 2010-07-21 08:50:17.304510001 +0200 ++++ evolution-2.30.2.new//configure.ac 2010-07-21 08:50:42.428510001 +0200 +@@ -1653,6 +1653,9 @@ + data/evolution.desktop.in + data/evolution-alarm-notify.desktop.in + data/evolution-settings.desktop.in ++data/evolution-contacts-une.desktop.in ++data/evolution-calendar-une.desktop.in ++data/evolution-mail-une.desktop.in + data/icons/Makefile + doc/Makefile + doc/reference/Makefile +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//data/evolution-calendar-une.desktop.in.in evolution-2.30.2.new//data/evolution-calendar-une.desktop.in.in +--- evolution-2.30.2//data/evolution-calendar-une.desktop.in.in 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//data/evolution-calendar-une.desktop.in.in 2010-07-21 08:50:42.428510001 +0200 +@@ -0,0 +1,18 @@ ++[Desktop Entry] ++_Name=Evolution Calendar ++_GenericName=Groupware Suite ++_X-GNOME-FullName=Evolution Calendar ++_Comment=Manage your schedule ++Exec=evolution --express -c calendar %U ++Icon=evolution-calendar ++Terminal=false ++Type=Application ++Categories=GNOME;GTK;Office;Calendar;X-Red-Hat-Base; ++StartupNotify=true ++X-GNOME-Bugzilla-Bugzilla=GNOME ++X-GNOME-Bugzilla-Product=Evolution ++X-GNOME-Bugzilla-Component=BugBuddyBugs ++X-GNOME-Bugzilla-Version=@BASE_VERSION@.x ++X-GNOME-Bugzilla-OtherBinaries=e-addressbook-factory;e-calendar-factory ++MimeType=text/calendar;text/x-vcard; ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//data/evolution-contacts-une.desktop.in.in evolution-2.30.2.new//data/evolution-contacts-une.desktop.in.in +--- evolution-2.30.2//data/evolution-contacts-une.desktop.in.in 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//data/evolution-contacts-une.desktop.in.in 2010-07-21 08:56:48.928510002 +0200 +@@ -0,0 +1,18 @@ ++[Desktop Entry] ++_Name=Evolution Contacts ++_GenericName=Groupware Suite ++_X-GNOME-FullName=Evolution Contacts ++_Comment=Manage your contacts ++Exec=evolution --express -c contacts %U ++Icon=office-contact ++Terminal=false ++Type=Application ++Categories=GNOME;GTK;Office;ContactManagement;X-Red-Hat-Base; ++StartupNotify=true ++X-GNOME-Bugzilla-Bugzilla=GNOME ++X-GNOME-Bugzilla-Product=Evolution ++X-GNOME-Bugzilla-Component=BugBuddyBugs ++X-GNOME-Bugzilla-Version=@BASE_VERSION@.x ++X-GNOME-Bugzilla-OtherBinaries=e-addressbook-factory;e-calendar-factory ++MimeType=text/calendar;text/x-vcard;text/directory;application/mbox;message/rfc822; ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//data/evolution-mail-une.desktop.in.in evolution-2.30.2.new//data/evolution-mail-une.desktop.in.in +--- evolution-2.30.2//data/evolution-mail-une.desktop.in.in 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//data/evolution-mail-une.desktop.in.in 2010-07-21 08:50:42.428510001 +0200 +@@ -0,0 +1,29 @@ ++[Desktop Entry] ++_Name=Evolution Mail ++_GenericName=Groupware Suite ++_X-GNOME-FullName=Evolution Mail ++_Comment=Manage your email ++Exec=evolution --express -c mail %U ++Icon=evolution ++Terminal=false ++Type=Application ++Categories=GNOME;GTK;Internet;Email;X-Red-Hat-Base; ++StartupNotify=true ++X-GNOME-Bugzilla-Bugzilla=GNOME ++X-GNOME-Bugzilla-Product=Evolution ++X-GNOME-Bugzilla-Component=BugBuddyBugs ++X-GNOME-Bugzilla-Version=@BASE_VERSION@.x ++X-GNOME-Bugzilla-OtherBinaries=e-addressbook-factory;e-calendar-factory ++MimeType=text/directory;application/mbox;message/rfc822; ++X-Ayatana-Desktop-Shortcuts=Compose;Contacts ++ ++[Compose Shortcut Group] ++_Name=Compose New Message ++Exec=evolution --express mailto: ++OnlyShowIn=Messaging Menu ++ ++[Contacts Shortcut Group] ++_Name=Contacts ++Exec=evolution --express -c contacts ++OnlyShowIn=Messaging Menu ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//data/Makefile.am evolution-2.30.2.new//data/Makefile.am +--- evolution-2.30.2//data/Makefile.am 2010-05-17 22:35:53.000000000 +0200 ++++ evolution-2.30.2.new//data/Makefile.am 2010-07-21 08:50:42.428510001 +0200 +@@ -4,6 +4,10 @@ + desktop_in_files = evolution.desktop.in evolution-settings.desktop.in + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + ++unedesktopdir = $(datadir)/une/applications ++unedesktop_in_files = evolution-mail-une.desktop.in evolution-calendar-une.desktop.in evolution-contacts-une.desktop.in ++unedesktop_DATA = $(unedesktop_in_files:.desktop.in=.desktop) ++ + autostartdir = $(sysconfdir)/xdg/autostart + autostart_in_files = evolution-alarm-notify.desktop.in + autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) +@@ -25,10 +29,12 @@ + + CLEANFILES = \ + $(autostart_DATA) \ +- $(desktop_DATA) ++ $(desktop_DATA) \ ++ $(unedesktop_DATA) + + EXTRA_DIST = \ + $(autostart_in_files) \ +- $(desktop_in_files) ++ $(desktop_in_files) \ ++ $(unedesktop_in_files) + + -include $(top_srcdir)/git.mk --- evolution-2.30.2.orig/debian/patches/12_remove_not_recommended_for_top_posting.patch +++ evolution-2.30.2/debian/patches/12_remove_not_recommended_for_top_posting.patch @@ -0,0 +1,19 @@ +Description: Remove the (Not Recommended) addition from the label of the Top + Posting Option in 'mail/mail-config.ui'. +Origin: Ubuntu +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=620255 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/evolution/+bug/588298 +Author: Sense Hofstede + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//mail/mail-config.ui evolution-2.30.2.new//mail/mail-config.ui +--- evolution-2.30.2//mail/mail-config.ui 2010-05-29 17:21:13.000000000 +0200 ++++ evolution-2.30.2.new//mail/mail-config.ui 2010-08-05 10:04:27.311128001 +0200 +@@ -4492,7 +4492,7 @@ + True + 0 + 0.47999998927116394 +- <b>Top Posting Option</b> (Not Recommended) ++ <b>Top Posting Option</b> + True + + --- evolution-2.30.2.orig/debian/patches/10_desktop_shortcuts.patch +++ evolution-2.30.2/debian/patches/10_desktop_shortcuts.patch @@ -0,0 +1,20 @@ +=== modified file 'data/evolution.desktop.in.in' +diff -Nur -x '*.orig' -x '*~' evolution-2.30.1.2//data/evolution.desktop.in.in evolution-2.30.1.2.new//data/evolution.desktop.in.in +--- evolution-2.30.1.2//data/evolution.desktop.in.in 2010-03-18 15:13:59.000000000 +0100 ++++ evolution-2.30.1.2.new//data/evolution.desktop.in.in 2010-05-17 16:10:48.697947411 +0200 +@@ -15,3 +15,15 @@ + X-GNOME-Bugzilla-Version=@BASE_VERSION@.x + X-GNOME-Bugzilla-OtherBinaries=e-addressbook-factory;e-calendar-factory + MimeType=text/calendar;text/x-vcard;text/directory;application/mbox;message/rfc822; ++X-Ayatana-Desktop-Shortcuts=Compose;Contacts ++ ++[Compose Shortcut Group] ++_Name=Compose New Message ++Exec=evolution mailto: ++OnlyShowIn=Messaging Menu ++ ++[Contacts Shortcut Group] ++_Name=Contacts ++Exec=evolution -c contacts ++OnlyShowIn=Messaging Menu ++ --- evolution-2.30.2.orig/debian/patches/90_disable_deprecation_warning.patch +++ evolution-2.30.2/debian/patches/90_disable_deprecation_warning.patch @@ -0,0 +1,11 @@ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//configure.ac evolution-2.30.2.new//configure.ac +--- evolution-2.30.2//configure.ac 2010-08-02 12:04:46.963896000 +0200 ++++ evolution-2.30.2.new//configure.ac 2010-08-02 12:05:12.535896000 +0200 +@@ -68,7 +68,6 @@ + -DPANGO_DISABLE_DEPRECATED + -DGDK_PIXBUF_DISABLE_DEPRECATED + -DGDK_DISABLE_DEPRECATED +- -DGTK_DISABLE_DEPRECATED + -DEDS_DISABLE_DEPRECATED + -DG_DISABLE_SINGLE_INCLUDES + -DGTK_DISABLE_SINGLE_INCLUDES --- evolution-2.30.2.orig/debian/patches/03_lpi.patch +++ evolution-2.30.2/debian/patches/03_lpi.patch @@ -0,0 +1,45 @@ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.1.2//configure.ac evolution-2.30.1.2.new//configure.ac +--- evolution-2.30.1.2//configure.ac 2010-04-27 14:14:22.000000000 +0200 ++++ evolution-2.30.1.2.new//configure.ac 2010-05-17 18:44:05.946876294 +0200 +@@ -224,6 +224,7 @@ + libxml-2.0 >= libxml_minimum_version + shared-mime-info >= shared_mime_info_minimum_version + gnome-desktop-2.0 >= gnome_desktop_minimum_version ++ launchpad-integration + unique-1.0 >= unique_minimum_version]) + AC_SUBST(GNOME_PLATFORM_CFLAGS) + AC_SUBST(GNOME_PLATFORM_LIBS) +diff -Nur -x '*.orig' -x '*~' evolution-2.30.1.2//shell/e-shell-window-actions.c evolution-2.30.1.2.new//shell/e-shell-window-actions.c +--- evolution-2.30.1.2//shell/e-shell-window-actions.c 2010-04-26 15:13:18.000000000 +0200 ++++ evolution-2.30.1.2.new//shell/e-shell-window-actions.c 2010-05-17 18:41:56.661879314 +0200 +@@ -30,6 +30,8 @@ + + #include + ++#include ++ + #define EVOLUTION_COPYRIGHT \ + "Copyright \xC2\xA9 1999 - 2008 Novell, Inc. and Others" + +@@ -1891,6 +1893,9 @@ + e_ui_manager_add_ui_from_file ( + E_UI_MANAGER (ui_manager), "evolution-shell.ui"); + ++ /* LPI */ ++ launchpad_integration_add_ui (ui_manager, "/main-menu/help-menu/launchpad-items"); ++ + /* Shell Actions */ + action_group = ACTION_GROUP (SHELL); + gtk_action_group_add_actions ( +diff -Nur -x '*.orig' -x '*~' evolution-2.30.1.2//ui/evolution-shell.ui evolution-2.30.1.2.new//ui/evolution-shell.ui +--- evolution-2.30.1.2//ui/evolution-shell.ui 2010-04-26 15:13:18.000000000 +0200 ++++ evolution-2.30.1.2.new//ui/evolution-shell.ui 2010-05-17 18:41:56.661879314 +0200 +@@ -85,6 +85,8 @@ + + + ++ ++ + + + --- evolution-2.30.2.orig/debian/patches/89_remove_quit_button.patch +++ evolution-2.30.2/debian/patches/89_remove_quit_button.patch @@ -0,0 +1,17 @@ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-shell-view-actions.c evolution-2.30.2.new//modules/calendar/e-cal-shell-view-actions.c +--- evolution-2.30.2//modules/calendar/e-cal-shell-view-actions.c 2010-07-13 14:05:55.091172002 +0200 ++++ evolution-2.30.2.new//modules/calendar/e-cal-shell-view-actions.c 2010-07-13 14:09:35.111172001 +0200 +@@ -1447,13 +1447,6 @@ + N_("Converts a meeting to an appointment"), + G_CALLBACK (action_event_schedule_appointment_cb) }, + +- { "quit-calendar", +- GTK_STOCK_CLOSE, +- N_("Quit"), +- NULL, +- NULL, /* XXX Add a tooltip! */ +- G_CALLBACK (quit_calendar_cb) }, +- + /*** Menus ***/ + + { "calendar-actions-menu", --- evolution-2.30.2.orig/debian/patches/62_no_upstream_email_notification_by_default.patch +++ evolution-2.30.2/debian/patches/62_no_upstream_email_notification_by_default.patch @@ -0,0 +1,55 @@ +# Description: not enable the notification icon by default since the message indicator is running +# Ubuntu: https://bugs.launchpad.net/bugs/331571 +# +diff -Nur -x '*.orig' -x '*~' evolution-2.30.1.2//plugins/mail-notification/mail-notification.c evolution-2.30.1.2.new//plugins/mail-notification/mail-notification.c +--- evolution-2.30.1.2//plugins/mail-notification/mail-notification.c 2010-04-26 15:13:17.000000000 +0200 ++++ evolution-2.30.1.2.new//plugins/mail-notification/mail-notification.c 2010-05-17 16:19:41.097866395 +0200 +@@ -86,6 +86,17 @@ + /* Helper functions */ + /* ------------------------------------------------------------------- */ + ++/* check if we are running the stracciatella session */ ++static gboolean ++is_stracciatella(void) { ++ if (g_strcmp0(g_getenv("GDMSESSION"), "gnome-stracciatella") == 0) { ++ g_debug("Running stracciatella GNOME session"); ++ return TRUE; ++ } else { ++ return FALSE; ++ } ++} ++ + static gboolean + is_part_enabled (const gchar *gconf_key) + { +@@ -972,8 +983,10 @@ + bridge, GCONF_KEY_ENABLED_DBUS, + G_OBJECT (widget), "active"); + +- widget = get_config_widget_status (); +- gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); ++ if (is_stracciatella()) { ++ widget = get_config_widget_status (); ++ gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); ++ } + + widget = get_config_widget_sound (); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); +@@ -1000,7 +1013,7 @@ + if (is_part_enabled (GCONF_KEY_ENABLED_DBUS)) + new_notify_dbus (t); + +- if (is_part_enabled (GCONF_KEY_ENABLED_STATUS)) ++ if ((is_stracciatella()) && is_part_enabled (GCONF_KEY_ENABLED_STATUS)) + new_notify_status (t); + + if (is_part_enabled (GCONF_KEY_ENABLED_SOUND)) +@@ -1022,7 +1035,7 @@ + if (is_part_enabled (GCONF_KEY_ENABLED_DBUS)) + read_notify_dbus (t); + +- if (is_part_enabled (GCONF_KEY_ENABLED_STATUS)) ++ if ((is_stracciatella()) && is_part_enabled (GCONF_KEY_ENABLED_STATUS)) + read_notify_status (t); + + if (is_part_enabled (GCONF_KEY_ENABLED_SOUND)) --- evolution-2.30.2.orig/debian/patches/91_git_fix_format_itip.patch +++ evolution-2.30.2/debian/patches/91_git_fix_format_itip.patch @@ -0,0 +1,37 @@ +From 6312708e37d0f0fe6aa416b008948028d2719df1 Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Wed, 23 Jun 2010 15:48:14 +0000 +Subject: Bug #619959 - Crash in format_itip at itip-formatter.c line 2567 + +--- +diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c +index 526af07..e5a4b1d 100644 +--- a/plugins/itip-formatter/itip-formatter.c ++++ b/plugins/itip-formatter/itip-formatter.c +@@ -2536,6 +2536,7 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target) + struct _itip_puri *puri; + CamelDataWrapper *content; + CamelStream *mem; ++ GByteArray *buffer = g_byte_array_new (); + + classid = g_strdup_printf("itip:///%s", ((EMFormat *) target->format)->part_id->str); + +@@ -2561,13 +2562,13 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target) + + /* This is non-gui thread. Download the part for using in the main thread */ + content = camel_medium_get_content_object ((CamelMedium *) target->part); +- mem = camel_stream_mem_new (); ++ mem = camel_stream_mem_new_with_byte_array (buffer); + camel_data_wrapper_decode_to_stream (content, mem); + +- if (((CamelStreamMem *) mem)->buffer->len == 0) ++ if (buffer->len == 0) + puri->vcalendar = NULL; + else +- puri->vcalendar = g_strndup ((gchar *)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len); ++ puri->vcalendar = g_strndup ((gchar *)buffer->data, buffer->len); + camel_object_unref (mem); + + camel_stream_printf (target->stream, ""); +-- +cgit v0.8.3.1 --- evolution-2.30.2.orig/debian/patches/09_add_ubuntuone_email.patch +++ evolution-2.30.2/debian/patches/09_add_ubuntuone_email.patch @@ -0,0 +1,170 @@ +=== modified file 'mail/default/C/Inbox' +--- mail/default/C/Inbox 2010-05-21 18:48:41 +0000 ++++ mail/default/C/Inbox 2010-08-23 12:49:22 +0000 +@@ -311,3 +311,165 @@ + Content-Transfer-Encoding: 8bit + + --=-t4dRE6cqcdSBHOrMdTQ1 ++ ++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010 ++Return-Path: ++X-Original-To: ubuntuone-support@mail.canonical.com ++Delivered-To: ubuntuone-support@mail.canonical.com ++Subject: Bring your digital life together with Ubuntu One! ++From: "The Ubuntu One Team ++To: ubuntuone-support@canonical.com ++Content-Type: multipart/related; type="multipart/alternative"; boundary="=-XU1pjbwfivhq1l/X2rI7" ++Date: Wed, 11 Aug 2010 13:07:23 -0500 ++Message-ID: <1281550043.4672.22.camel@ubuntu> ++Mime-Version: 1.0 ++X-Mailer: Evolution 2.30.2 ++X-Evolution-Source: imap://ubuntuone-support@mail.canonical.com/ ++ ++ ++--=-XU1pjbwfivhq1l/X2rI7 ++Content-Type: multipart/alternative; boundary="=-8ErHXLoZh99uv2mY1ioK" ++ ++ ++--=-8ErHXLoZh99uv2mY1ioK ++Content-Type: text/plain; charset="UTF-8" ++Content-Transfer-Encoding: 8bit ++ ++ ++ ++Evolution is better with Ubuntu One - the personal cloud that brings ++your digital life together. ++ ++ Ubuntu One does more than sync your files - whether you need to ++ access your contacts, notes or bookmarks from any computer or ++ the web, enjoy your favorite music from a cloud integrated store ++ or stream your entire collection to iPhone and Android mobile ++ phones - we've raised the bar on personal clouds. Learn more at ++ http://one.ubuntu.com/. ++ ++ ++Already have an Ubuntu One account? ++ ++ Add your computer to your account by launching the Ubuntu One ++ Preferences. ++ ++ All contacts in the "Ubuntu One" address book are automatically ++ synced with your personal cloud. Conveniently view and modify ++ contact information ++ in Evolution or the Ubuntu One website. Ubuntu One will even ++ keep your Evolution contacts in sync with your mobile phone. ++ ++ For information about copying or moving your contacts into the ++ Ubuntu One address book, review our online tutorials and FAQs. ++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/ ++ https://wiki.ubuntu.com/UbuntuOne/FAQ/ ++ ++ ++Need help or found a bug? Review the Ubuntu One support options. ++ ++ https://one.ubuntu.com/support/ ++ ++ ++Thank you. ++ ++The Ubuntu One Team ++http://one.ubuntu.com/ ++ ++ ++ ++ ++--=-8ErHXLoZh99uv2mY1ioK ++Content-Type: text/html; charset="utf-8" ++Content-Transfer-Encoding: 8bit ++ ++ ++ ++ ++ ++ ++ ++ ++
++
++Evolution is better with Ubuntu One - the personal cloud that brings your digital life together.
++
++
++ Ubuntu One does more than sync your files - whether you need to access your contacts, notes or bookmarks from any computer or the web, enjoy your favorite music from a cloud integrated store or stream your entire collection to iPhone and Android mobile phones - we've raised the bar on personal clouds. Learn more at http://one.ubuntu.com/.
++
++
++Already have an Ubuntu One account?
++
++ Add your computer to your account by launching the Ubuntu One Preferences.
++
++ All contacts in the "Ubuntu One" address book are automatically synced with your personal cloud. Conveniently view and modify contact information
++ in Evolution or the Ubuntu One website. Ubuntu One will even keep your Evolution contacts in sync with your mobile phone.
++
++ For information about copying or moving your contacts into the Ubuntu One address book, review our online tutorials and FAQs.
++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/
++ https://wiki.ubuntu.com/UbuntuOne/FAQ/
++
++
++Need help or found a bug? Review the Ubuntu One support options.
++
++ https://one.ubuntu.com/support/
++
++
++Thank you.
++
++The Ubuntu One Team
++http://one.ubuntu.com/
++
++
++
++ ++ ++ ++--=-8ErHXLoZh99uv2mY1ioK-- ++ ++--=-XU1pjbwfivhq1l/X2rI7 ++Content-ID: <1281549841.4672.17.camel@ubuntu> ++Content-Disposition: attachment; filename="h1-ubuntuone-logo.png" ++Content-Type: image/png; name="h1-ubuntuone-logo.png" ++Content-Transfer-Encoding: base64 ++ ++iVBORw0KGgoAAAANSUhEUgAAAHUAAAA1CAYAAAB/XKTQAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ ++bWFnZVJlYWR5ccllPAAAB/VJREFUeNrsXD1sI0UUnjVpciDFQTqgAJ1DS5GNKCjPlo46tpSDUKDY ++EhISTZLq6OIUIKicXHdIkZ0uOk6KU1EQyXuioQDZV1BQXLJIUFykS3wN6TDvOW9hPJ6ZnbG9ti+7 ++T3qyvTsz+/Z9837mzXqdTqfDEpoc7e3tvQ8fPwK/btgltH0qUevEaZ54ZO1TjuOwKPidt15NA5eB ++G/gZ1XWmmeG+88CHwFXgjKwNR98Ao9t8CvyucOycviM9oM9zrs0533cmwhlYBc7T9+zbb96Y+/PZ ++35txMT+43yx8HHKH8nBsAXTQVnS5IJf6EPge8K/Ad+kYgvwL8DHw54L7xXMfAp9Qm7tRut98yO/r ++TlnhdxrY1bT/loA9JqACN/uQrPGYgBPphM4/mERMzcQM1NuW7e8RiHcIqAs6jpb5ER0TY+kd6ofn ++vwwOzrCEJk0XxPMUG48JoAuy2KfU7jtyyfN0rkPtjrl+32N27EQYU/rWShBPnLggBfffkLjgHOjA ++i/rayZLmGtIMN7NcCuY+zCY/ZBb+F/QHmXmUGQbUhjFaA/RtaTLJoeUUZGQmeqF+mBCuKZKiCpxH ++mXGcfZVMw2Lh0IkKfGwESiY30VIMgglPky6K5EHbnIn7BapRFpwWFQa8C+PshNwALpOKA8pZg7al ++kPFROVuaTB3l3IZxapr+TZtCgjgxYQzEocIdKkCbugbQBjeBUBe5FJ3YEFLvLY0gRQGULN2MCRUl ++gAaZMc7iBsmjAqkoyLluca2iTk44VyRA8iEZfBXaNhVyupZOS7YiEHW/HrJsdIXrZ1MKQdKWwtm2 ++163tqhYK0C2TFk3lJJdZtZDTFQoLAdXJWkxoR+Fl0iHr3bD7dyeVKHnEspiYJyUPSzYTrTLIBCTr ++5rN7zA+WKMuXxUsMFw5xZNW1cYOKMxNLZTmKwwsUZ5mFyxn10qOomPEISgGBwDiqmIDrbApp3MWH ++Ap/NUZJQoniZFawgHZbdRlj5EZM/D+SpS5Igd4xyTqWlepr0fFcRX8dBGRN5KP7VR5AcXStQ/ZAY ++OylluRIA64q2TyJMEl9KUP9QnSD3NSkXlh71pJgGUKclHvgsodGAalOi06z/InGDCeiDrTBSmiKA ++jbtqDzMZKPvVjqlIsmxdX+slAMWX6EcVIuZkektpBsoqBs8qMsOw5EcHQNEQAHHypBVyZhRyTjrU ++pAcBlalLl3kdqDIFVngL4orHprNfFC5DxWoRAFeyiG8rdjA8QzkPDfuOO0dwB/QmFbFuTZsbGYne ++WkHx4UiCOg5yCp097rdsph0phNuXWCAKt0jngjViRTKuakkRhZzjzPaXOTkz5D1qEr1tSCwcNxFa ++5K1U99jVm8Mh3xwgRuEFlE/IKXb/hx3zlNk/74RWsyQb0+YJDWhbZv27KLgVV5a0FbfQVNTXfwi9 ++4T36fKJUslzeBPuZuj6FAZZMpRGPiW0LFvG0PeA5ZuhtRLqtuEfbpG4zSCZTQrKTMxzMZ5oNaiEx ++WTKMZ8EkqYeMGcjpj0hOzyL2eqbgkYJNdmJ2FXrLWeitwLtxlZvBuLVMbi7DKQj5sWrnX0eUpS5L ++XHyb4l3dNjulHZbbw8jJPe3g0oTWegq6ZpDY7YZdg+57jeRzSbbQR1oUekvTOK1h9JZQQgkllFBC ++CZmRk6jgijqPrp7EExb1mMx4zordZkJnlQXlVDEp9JwD+8rWJXtDJlt3vFl25iWg9oOJyqqGFDRQ ++cZsAbssAzC1JRUjM9ncB3LIBmFkaLxsy3jaAu5OAegVokZk/GtpdO6qAJUAbzLwqhxOlAOC2FYDa ++yIZUA2BLPcWHGFuoKXVBg34qiz5kdmXWwApVFlq1vKUi9CvH2lIBHFkNGa0GK0RYjMeNB9nWVg2s ++tSRYaXEAEALKiXEWwJHJ5pNsL9jVPmpeETIWUjG2UlEh3WeSETDgMjDWX5dYf723CP3FhGVZ4a5L ++ABgaDv6nVFVbXxMAzStkWwL3uglcxk+STVaiXI+r+5WBgIlQj9IpfsrqtyavPsB4WeuOA3GTvsvG ++cg1kKwCQPbLRb9lEyccVVFGRPgCoWmrIrGGRc70yF+jLli4EbDtEFjHTbQGA0iUVASteJzOTgKoE ++LrDWNrhbT1A2318KqubaLWb3pycXXLLVG8ziaqliTHwx0Ri/Otpnh5PXA0znJBuGdpK3s1zR3BTL ++1mZmDy48RrcPcbYWV1DFGJm1TawilM0X4mobgMol7tdMcT2gqSpFVEpMS6wiKhKtMkMVpgTUEJI9 ++LnooFhUI6IrC0scpWxWAlU46OL4BfIEZMnCVQEVcb7L/X0r5Aet9Bd4XwD/Q9/vEAf0E/Cl9P6G+ ++fCh4DfgGu3o5118G4yPhUu4r7je+Q7HA/X4GfIu+vwL8D/Bz7nzY+F/DMqVTl1krcBOALBMjmE2J ++ldJWXIFk0xGvH6QnJqDWJWtZBLQJoFWw4oSWi3Ve4AbrfW4avUqsX2OH1Z1DifK2DPpFRrNsoX3J ++TksS2YK36IRt68V3SeOsfIYWsWPZrRS2p6qIi32K18X4WfYzyrY94ESN9zoVANpkZg+Ho9JxL7XW ++N8aB9C0zRxYxs+UcPPf7LfasTLKZZNrYpgBWXou7+w2ABav4rd559F7woqlFcnWoKNyCqzsrN8Hy ++fmea19bjjsk6ue993SMrzkGn1lnt7ngu0zW21a74DGT7uH7JGlladt3iljtBBk6PtGAe8Un3wL8C ++DACPohGRcjh+EgAAAABJRU5ErkJggg== ++ ++ ++--=-XU1pjbwfivhq1l/X2rI7-- + --- evolution-2.30.2.orig/debian/patches/89_express.patch +++ evolution-2.30.2/debian/patches/89_express.patch @@ -0,0 +1,27225 @@ +=== modified file 'addressbook/gui/contact-editor/contact-editor.ui' +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//addressbook/gui/contact-editor/contact-editor.ui evolution-2.30.2.new//addressbook/gui/contact-editor/contact-editor.ui +--- evolution-2.30.2//addressbook/gui/contact-editor/contact-editor.ui 2010-04-26 15:13:16.000000000 +0200 ++++ evolution-2.30.2.new//addressbook/gui/contact-editor/contact-editor.ui 2010-06-22 13:37:26.720114033 +0200 +@@ -78,6 +78,7 @@ + True + False + 0 ++ vertical + + + True +@@ -135,11 +136,24 @@ + False + False + ++ ++ ++ True ++ True ++ never ++ automatic ++ ++ ++ True ++ queue ++ ++ + + 12 + True + False + 1 ++ vertical + + + True +@@ -417,6 +431,7 @@ + True + False + 10 ++ vertical + + + True +@@ -424,7 +439,7 @@ + 0.5 + GTK_SHADOW_NONE + +- ++ + 12 + True + 3 +@@ -620,29 +635,72 @@ + + + +- +- True +- Email +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 +- +- +- +- +- ++ ++ True ++ False ++ 4 ++ ++ ++ True ++ Email ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ 20 ++ 20 ++ True ++ True ++ GTK_RELIEF_NONE ++ True ++ ++ ++ True ++ GTK_ARROW_RIGHT ++ GTK_SHADOW_NONE ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ ++ ++ Telephone ++ ++ ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ + + +- 0 ++ 0 + False + False + +@@ -652,6 +710,7 @@ + True + False + 0 ++ vertical + + + True +@@ -664,6 +723,7 @@ + True + False + 6 ++ vertical + + + True +@@ -1080,7 +1140,7 @@ + + + +- ++ + True + True + True +@@ -1099,7 +1159,7 @@ + + + +- ++ + True + True + True +@@ -1152,7 +1212,7 @@ + + + +- ++ + True + False + True +@@ -1167,7 +1227,7 @@ + + + +- ++ + True + False + True +@@ -1234,6 +1294,12 @@ + + + ++ ++ ++ ++ ++ ++ + + False + True +@@ -1258,12 +1324,24 @@ + 0 + + ++ ++ ++ True ++ True ++ never ++ automatic ++ ++ ++ True ++ queue ++ + +- ++ + 12 + True + False + 12 ++ vertical + + + True +@@ -1508,6 +1586,13 @@ + + + ++ ++ True ++ False ++ 4 ++ ++ ++ + + True + Web Addresses +@@ -1527,7 +1612,40 @@ + + + +- ++ ++ ++ ++ 20 ++ 20 ++ True ++ True ++ GTK_RELIEF_NONE ++ True ++ ++ ++ True ++ GTK_ARROW_RIGHT ++ GTK_SHADOW_NONE ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ ++ ++ Web addresses ++ ++ ++ ++ ++ 0 ++ True ++ True ++ ++ ++ ++ + + + 0 +@@ -1881,10 +1999,9 @@ + + + +- ++ + True +- 0 +- 0.5 ++ True + GTK_SHADOW_NONE + + +@@ -2126,11 +2243,18 @@ + + + ++ ++ ++ ++ ++ ++ + + False + True + + ++ + + + True +@@ -2151,10 +2275,24 @@ + + + ++ ++ ++ True ++ True ++ never ++ automatic ++ ++ ++ True ++ queue ++ ++ ++ + + True + False + 0 ++ vertical + + + 6 +@@ -2910,12 +3048,10 @@ + + + +- ++ + 6 + True +- 0 +- 0.5 +- GTK_SHADOW_NONE ++ True + + + 6 +@@ -3287,6 +3423,13 @@ + + + ++ ++ ++ ++ ++ ++ ++ + + False + True +@@ -3316,6 +3459,7 @@ + True + False + 0 ++ vertical + + + 6 +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//addressbook/gui/contact-editor/e-contact-editor.c evolution-2.30.2.new//addressbook/gui/contact-editor/e-contact-editor.c +--- evolution-2.30.2//addressbook/gui/contact-editor/e-contact-editor.c 2010-06-20 14:14:59.000000000 +0200 ++++ evolution-2.30.2.new//addressbook/gui/contact-editor/e-contact-editor.c 2010-06-22 13:37:26.720114033 +0200 +@@ -742,15 +742,6 @@ + } + + static void +-init_email (EContactEditor *editor) +-{ +- gint i; +- +- for (i = 1; i <= EMAIL_SLOTS; i++) +- init_email_record_location (editor, i); +-} +- +-static void + fill_in_email_record (EContactEditor *editor, gint record, const gchar *address, gint location) + { + GtkWidget *location_combo_box; +@@ -1144,24 +1135,95 @@ + } + + static void +-expand_phone (EContactEditor *editor, gboolean expanded) ++set_arrow_image (EContactEditor *editor, ++ const gchar *arrow_widget, ++ gboolean expanded) ++{ ++ GtkWidget *arrow; ++ ++ arrow = e_builder_get_widget (editor->builder, arrow_widget); ++ if (expanded) ++ gtk_arrow_set (GTK_ARROW (arrow), GTK_ARROW_DOWN, GTK_SHADOW_NONE); ++ else ++ gtk_arrow_set (GTK_ARROW (arrow), GTK_ARROW_RIGHT, GTK_SHADOW_NONE); ++} ++ ++static void ++expand_widget_list (EContactEditor *editor, ++ const gchar **widget_names, ++ gboolean expanded) + { +- GtkWidget *phone_ext_table; +- GtkWidget *phone_ext_arrow; ++ gint i; ++ for (i = 0; widget_names[i]; i++) ++ gtk_widget_set_visible ( ++ e_builder_get_widget (editor->builder, widget_names[i]), ++ expanded); ++} + +- phone_ext_table = e_builder_get_widget (editor->builder, "table-phone-extended"); +- phone_ext_arrow = e_builder_get_widget (editor->builder, "arrow-phone-expand"); ++static void ++expand_web (EContactEditor *editor, gboolean expanded) ++{ ++ const gchar *names[] = { ++ "label-videourl", "label-fburl", ++ "entry-videourl", "entry-fburl", ++ NULL ++ }; ++ set_arrow_image (editor, "arrow-phone-expand", expanded); ++ expand_widget_list (editor, names, expanded); ++} + +- if (expanded) { +- gtk_arrow_set (GTK_ARROW (phone_ext_arrow), GTK_ARROW_DOWN, GTK_SHADOW_NONE); +- gtk_widget_show (phone_ext_table); +- } else { +- gtk_arrow_set (GTK_ARROW (phone_ext_arrow), GTK_ARROW_RIGHT, GTK_SHADOW_NONE); +- gtk_widget_hide (phone_ext_table); ++static void ++expand_phone (EContactEditor *editor, gboolean expanded) ++{ ++ const gchar *names[] = { ++ "entry-phone-2", "combobox-phone-2", ++ "entry-phone-4", "combobox-phone-4", ++ "table-phone-extended", NULL ++ }; ++ set_arrow_image (editor, "arrow-phone-expand", expanded); ++ expand_widget_list (editor, names, expanded); ++} ++ ++static void ++expand_mail (EContactEditor *editor, gboolean expanded) ++{ ++ GtkTable *table; ++ GtkWidget *check; ++ const gchar *names[] = { ++ "entry-email-2", "combobox-email-2", ++ "entry-email-3", "combobox-email-3", ++ "entry-email-4", "combobox-email-4", ++ NULL ++ }; ++ set_arrow_image (editor, "arrow-mail-expand", expanded); ++ expand_widget_list (editor, names, expanded); ++ ++ /* move 'use html mail' into position */ ++ check = e_builder_get_widget (editor->builder, "checkbutton-htmlmail"); ++ table = GTK_TABLE (e_builder_get_widget (editor->builder, "email-table")); ++ if (check != NULL && table != NULL) { ++ g_object_ref (G_OBJECT (check)); ++ gtk_container_remove (GTK_CONTAINER (check->parent), check); ++ if (expanded) ++ gtk_table_attach_defaults (table, check, 0, 4, 2, 3); ++ else ++ gtk_table_attach_defaults (table, check, 2, 4, 0, 1); ++ g_object_unref (G_OBJECT (check)); + } + } + + static void ++init_email (EContactEditor *editor) ++{ ++ gint i; ++ ++ for (i = 1; i <= EMAIL_SLOTS; i++) ++ init_email_record_location (editor, i); ++ ++ expand_mail (editor, !editor->compress_ui); ++} ++ ++static void + fill_in_phone_record (EContactEditor *editor, gint record, const gchar *phone, gint phone_type) + { + GtkWidget *phone_type_combo_box; +@@ -1458,6 +1520,11 @@ + service_combo_box = e_builder_get_widget (editor->builder, widget_name); + g_free (widget_name); + ++ if (editor->compress_ui && record > 2) { ++ gtk_widget_hide (name_entry); ++ gtk_widget_hide (service_combo_box); ++ } ++ + init_item_sensitiveable_combo_box (GTK_COMBO_BOX (service_combo_box)); + + store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (service_combo_box))); +@@ -1739,6 +1806,17 @@ + } + + static void ++init_personal (EContactEditor *editor) ++{ ++ gtk_expander_set_expanded ( ++ GTK_EXPANDER (e_builder_get_widget (editor->builder, ++ "expander-personal-misc")), ++ !editor->compress_ui); ++ ++ expand_web (editor, !editor->compress_ui); ++} ++ ++static void + init_address_textview (EContactEditor *editor, gint record) + { + gchar *textview_name; +@@ -1785,6 +1863,11 @@ + + for (i = 0; i < ADDRESS_SLOTS; i++) + init_address_record (editor, i); ++ ++ gtk_expander_set_expanded ( ++ GTK_EXPANDER (e_builder_get_widget (editor->builder, ++ "expander-address-other")), ++ !editor->compress_ui); + } + + static void +@@ -2586,11 +2669,22 @@ + static void + init_all (EContactEditor *editor) + { +- init_simple (editor); +- init_email (editor); +- init_phone (editor); +- init_im (editor); +- init_address (editor); ++ GtkRequisition tab_req; ++ ++ init_simple (editor); ++ init_email (editor); ++ init_phone (editor); ++ init_im (editor); ++ init_personal (editor); ++ init_address (editor); ++ ++ /* with so many scrolled windows, we need to ++ do some manual sizing */ ++ gtk_widget_size_request ( ++ e_builder_get_widget (editor->builder, "vbox-size-leader"), &tab_req); ++ gtk_widget_set_size_request ( ++ e_builder_get_widget (editor->builder, "scrolledwindow-size-leader"), ++ tab_req.width, tab_req.height + 8); + } + + static void +@@ -3372,15 +3466,41 @@ + } + + static void ++expand_web_toggle (EContactEditor *ce) ++{ ++ GtkWidget *widget; ++ ++ widget = e_builder_get_widget (ce->builder, "label-videourl"); ++#if GTK_CHECK_VERSION(2,19,7) ++ expand_web (ce, !gtk_widget_get_visible (widget)); ++#else ++ expand_web (ce, !GTK_WIDGET_VISIBLE (widget)); ++#endif ++} ++ ++static void + expand_phone_toggle (EContactEditor *ce) + { + GtkWidget *phone_ext_table; + + phone_ext_table = e_builder_get_widget (ce->builder, "table-phone-extended"); + #if GTK_CHECK_VERSION(2,19,7) +- expand_phone (ce, gtk_widget_get_visible (phone_ext_table) ? FALSE : TRUE); ++ expand_phone (ce, !gtk_widget_get_visible (phone_ext_table)); ++#else ++ expand_phone (ce, !GTK_WIDGET_VISIBLE (phone_ext_table)); ++#endif ++} ++ ++static void ++expand_mail_toggle (EContactEditor *ce) ++{ ++ GtkWidget *mail; ++ ++ mail = e_builder_get_widget (ce->builder, "entry-email-4"); ++#if GTK_CHECK_VERSION(2,19,7) ++ expand_mail (ce, !gtk_widget_get_visible (mail)); + #else +- expand_phone (ce, GTK_WIDGET_VISIBLE (phone_ext_table) ? FALSE : TRUE); ++ expand_mail (ce, !GTK_WIDGET_VISIBLE (mail)); + #endif + } + +@@ -3402,6 +3522,7 @@ + e_contact_editor->target_editable = TRUE; + e_contact_editor->fullname_dialog = NULL; + e_contact_editor->categories_dialog = NULL; ++ e_contact_editor->compress_ui = e_shell_get_express_mode (e_shell_get_default ()); + + e_contact_editor->load_source_id = 0; + e_contact_editor->load_book = NULL; +@@ -3441,8 +3562,12 @@ + g_signal_connect (widget, "clicked", G_CALLBACK (file_cancel_cb), e_contact_editor); + widget = e_builder_get_widget (e_contact_editor->builder, "button-help"); + g_signal_connect (widget, "clicked", G_CALLBACK (show_help_cb), e_contact_editor); ++ widget = e_builder_get_widget (e_contact_editor->builder, "button-web-expand"); ++ g_signal_connect_swapped (widget, "clicked", G_CALLBACK (expand_web_toggle), e_contact_editor); + widget = e_builder_get_widget (e_contact_editor->builder, "button-phone-expand"); + g_signal_connect_swapped (widget, "clicked", G_CALLBACK (expand_phone_toggle), e_contact_editor); ++ widget = e_builder_get_widget (e_contact_editor->builder, "button-mail-expand"); ++ g_signal_connect_swapped (widget, "clicked", G_CALLBACK (expand_mail_toggle), e_contact_editor); + + widget = e_builder_get_widget (e_contact_editor->builder, "entry-fullname"); + if (widget) +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//addressbook/gui/contact-editor/e-contact-editor.h evolution-2.30.2.new//addressbook/gui/contact-editor/e-contact-editor.h +--- evolution-2.30.2//addressbook/gui/contact-editor/e-contact-editor.h 2010-06-20 14:14:59.000000000 +0200 ++++ evolution-2.30.2.new//addressbook/gui/contact-editor/e-contact-editor.h 2010-06-22 13:37:26.720114033 +0200 +@@ -84,6 +84,9 @@ + /* Whether an image is changed */ + guint image_changed : 1; + ++ /* Whether to try to reduce space used */ ++ guint compress_ui : 1; ++ + EList *writable_fields; + + EList *required_fields; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/alarm-notify/alarm.c evolution-2.30.2.new//calendar/gui/alarm-notify/alarm.c +--- evolution-2.30.2//calendar/gui/alarm-notify/alarm.c 2010-06-20 14:14:56.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/alarm-notify/alarm.c 2010-06-22 13:37:26.724114033 +0200 +@@ -152,7 +152,8 @@ + now = time (NULL); + + /* Add the time out */ +- d(g_message ("Setting timeout for %d %lu %lu", diff, ar->trigger, now)); ++ d(g_message ("Setting timeout for %d.%2d (from now) %lu %lu", ++ diff / 60, diff % 60, ar->trigger, now)); + d(g_message (" %s", ctime (&ar->trigger))); + d(g_message (" %s", ctime (&now))); + timeout_id = g_timeout_add_seconds (diff, alarm_ready_cb, NULL); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/alarm-notify/alarm-queue.c evolution-2.30.2.new//calendar/gui/alarm-notify/alarm-queue.c +--- evolution-2.30.2//calendar/gui/alarm-notify/alarm-queue.c 2010-06-20 14:14:56.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/alarm-notify/alarm-queue.c 2010-06-22 13:37:26.724114033 +0200 +@@ -183,6 +183,25 @@ + msg->func (msg); + } + ++/* ++ * use a static ring-buffer so we can call this twice ++ * in a printf without getting nonsense results. ++ */ ++static const gchar * ++e_ctime (const time_t *timep) ++{ ++ static gchar *buffer[4] = { 0, }; ++ static gint next = 0; ++ const gchar *ret; ++ ++ g_free (buffer[next]); ++ ret = buffer[next++] = g_strdup (ctime (timep)); ++ if (next >= G_N_ELEMENTS (buffer)) ++ next = 0; ++ ++ return ret; ++} ++ + /* Queues an alarm trigger for midnight so that we can load the next day's worth + * of alarms. + */ +@@ -199,7 +218,7 @@ + zone = config_data_get_timezone (); + midnight = time_day_end_with_zone (time (NULL), zone); + +- d(printf("%s:%d (queue_midnight_refresh) - Refresh at %s \n",__FILE__, __LINE__, ctime(&midnight))); ++ d(printf("%s:%d (queue_midnight_refresh) - Refresh at %s \n",__FILE__, __LINE__, e_ctime(&midnight))); + + midnight_refresh_id = alarm_add (midnight, midnight_refresh_cb, NULL, NULL); + if (!midnight_refresh_id) { +@@ -471,7 +490,7 @@ + + alarm_id = alarm_add (instance->trigger, alarm_trigger_cb, cqa, NULL); + if (!alarm_id) { +- d(printf("%s:%d (add_component_alarms) - Could not schedule a trigger for %s. Discarding \n",__FILE__, __LINE__, ctime(&(instance->trigger)))); ++ d(printf("%s:%d (add_component_alarms) - Could not schedule a trigger for %s. Discarding \n",__FILE__, __LINE__, e_ctime(&(instance->trigger)))); + continue; + } + +@@ -482,7 +501,7 @@ + qa->snooze = FALSE; + + cqa->queued_alarms = g_slist_prepend (cqa->queued_alarms, qa); +- d(printf("%s:%d (add_component_alarms) - Adding alarm %p %p at %s %s\n",__FILE__, __LINE__, qa, alarm_id, ctime (&(instance->trigger)), ctime(&tnow))); ++ d(printf("%s:%d (add_component_alarms) - Adding alarm %p %p at %s %s\n",__FILE__, __LINE__, qa, alarm_id, ctime (&(instance->trigger)), e_ctime(&tnow))); + } + + id = e_cal_component_get_id (alarms->comp); +@@ -571,7 +590,8 @@ + from = MAX (config_data_get_last_notification_time (ca->client) + 1, day_start); + + day_end = time_day_end_with_zone (now, zone); +- d(printf("%s:%d (load_alarms_for_today) - From %s to %s\n",__FILE__, __LINE__, ctime (&from), ctime(&day_end))); ++ d(printf("%s:%d (load_alarms_for_today) - From %s to %s\n",__FILE__, __LINE__, ++ g_strdup (ctime (&from)), g_strdup (e_ctime(&day_end)))); + load_alarms (ca, from, day_end); + } + +@@ -707,7 +727,7 @@ + + day_end = time_day_end_with_zone (time (NULL), zone); + +- d(printf("%s:%d (query_objects_changed_async) - Querying for object between %s to %s\n",__FILE__, __LINE__, ctime(&from), ctime(&day_end))); ++ d(printf("%s:%d (query_objects_changed_async) - Querying for object between %s to %s\n",__FILE__, __LINE__, e_ctime(&from), e_ctime(&day_end))); + + for (l = objects; l != NULL; l = l->next) { + ECalComponentId *id; +@@ -771,7 +791,7 @@ + + alarm_id = alarm_add (instance->trigger, alarm_trigger_cb, cqa, NULL); + if (!alarm_id) { +- d(printf("%s:%d (query_objects_changed_async) -Unable to schedule trigger for %s \n",__FILE__, __LINE__, ctime(&(instance->trigger)))); ++ d(printf("%s:%d (query_objects_changed_async) -Unable to schedule trigger for %s \n",__FILE__, __LINE__, e_ctime(&(instance->trigger)))); + continue; + } + +@@ -869,14 +889,14 @@ + + new_id = alarm_add (t, alarm_trigger_cb, cqa, NULL); + if (!new_id) { +- d(printf("%s:%d (create_snooze) -Unable to schedule trigger for %s \n",__FILE__, __LINE__, ctime(&t))); ++ d(printf("%s:%d (create_snooze) -Unable to schedule trigger for %s \n",__FILE__, __LINE__, e_ctime(&t))); + return; + } + + orig_qa->instance->trigger = t; + orig_qa->alarm_id = new_id; + orig_qa->snooze = TRUE; +- d(printf("%s:%d (create_snooze) - Adding a alarm at %s\n",__FILE__, __LINE__, ctime(&t))); ++ d(printf("%s:%d (create_snooze) - Adding a alarm at %s\n",__FILE__, __LINE__, e_ctime(&t))); + } + + /* Launches a component editor for a component */ +@@ -1189,7 +1209,7 @@ + GtkTreeIter iter; + GtkTreeModel *model = NULL; + +- /* We can` also use tray_data->iter */ ++ /* We can also use tray_data->iter */ + if (gtk_tree_selection_get_selected (selection, &model, &iter)) { + gtk_list_store_remove (GTK_LIST_STORE (model), &iter); + if (!gtk_tree_model_get_iter_first (model, &iter)) { +@@ -1833,7 +1853,7 @@ + + if (config_data_get_last_notification_time (NULL) == -1) { + time_t tmval = time (NULL); +- d(printf("%s:%d (alarm_queue_init) - Setting last notification time to %s\n",__FILE__, __LINE__, ctime(&tmval))); ++ d(printf("%s:%d (alarm_queue_init) - Setting last notification time to %s\n",__FILE__, __LINE__, e_ctime(&tmval))); + config_data_set_last_notification_time (NULL, tmval); + } + +@@ -2139,7 +2159,7 @@ + from = time_day_begin_with_zone (time (NULL), zone); + to = time_day_end_with_zone (time (NULL), zone); + +- d(printf("%s:%d (update_cqa) - Generating alarms between %s and %s\n",__FILE__, __LINE__, ctime(&from), ctime(&to))); ++ d(printf("%s:%d (update_cqa) - Generating alarms between %s and %s\n",__FILE__, __LINE__, e_ctime(&from), e_ctime(&to))); + alarms = e_cal_util_generate_alarms_for_comp (newcomp, from, to, omit, + e_cal_resolve_tzid_cb, cqa->parent_client->client, zone); + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/apps_evolution_calendar.schemas.in evolution-2.30.2.new//calendar/gui/apps_evolution_calendar.schemas.in +--- evolution-2.30.2//calendar/gui/apps_evolution_calendar.schemas.in 2010-04-17 19:49:09.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/apps_evolution_calendar.schemas.in 2010-06-22 13:37:26.724114033 +0200 +@@ -284,7 +284,7 @@ + /apps/evolution/calendar/display/date_navigator_pane_position + evolution-calendar + int +- 150 ++ 200 + + Month view vertical pane position + Position of the vertical pane, between the calendar lists and the date navigator calendar. +@@ -666,14 +666,14 @@ + + + +- /schemas/apps/evolution/calendar/display/day_view_show_week_number +- /apps/evolution/calendar/display/day_view_show_week_number ++ /schemas/apps/evolution/calendar/display/show_week_numbers ++ /apps/evolution/calendar/display/show_week_numbers + evolution-calendar + bool + false + +- Show week number in Day and Work Week View +- Whether to show week number in the Day and Work Week View. ++ Show week numbers in Day View, Work Week View, and Date Navigator ++ Whether to show week numbers in various places in the Calendar. + + + +@@ -682,27 +682,13 @@ + /apps/evolution/calendar/display/month_scroll_by_week + evolution-calendar + bool +- false ++ true + + Scroll Month View by a week + Whether to scroll a Month View by a week, not by a month. + + + +- +- +- +- /schemas/apps/evolution/calendar/date_navigator/show_week_numbers +- /apps/evolution/calendar/date_navigator/show_week_numbers +- evolution-calendar +- bool +- false +- +- Show week numbers in date navigator +- Whether to show week numbers in the date navigator. +- +- +- + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/calendar-config-keys.h evolution-2.30.2.new//calendar/gui/calendar-config-keys.h +--- evolution-2.30.2//calendar/gui/calendar-config-keys.h 2010-06-20 14:14:54.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/calendar-config-keys.h 2010-06-22 13:37:26.724114033 +0200 +@@ -53,14 +53,11 @@ + #define CALENDAR_CONFIG_COMPRESS_WEEKEND CALENDAR_CONFIG_PREFIX "/display/compress_weekend" + #define CALENDAR_CONFIG_SHOW_EVENT_END CALENDAR_CONFIG_PREFIX "/display/show_event_end" + #define CALENDAR_CONFIG_WORKING_DAYS CALENDAR_CONFIG_PREFIX "/display/working_days" +-#define CALENDAR_CONFIG_DV_WEEK_NUMBER CALENDAR_CONFIG_PREFIX "/display/day_view_show_week_number" ++#define CALENDAR_CONFIG_SHOW_WEEK_NUMBERS CALENDAR_CONFIG_PREFIX "/display/show_week_numbers" + #define CALENDAR_CONFIG_DAY_SECOND_ZONE CALENDAR_CONFIG_PREFIX "/display/day_second_zone" + #define CALENDAR_CONFIG_DAY_SECOND_ZONES_LIST CALENDAR_CONFIG_PREFIX "/display/day_second_zones" + #define CALENDAR_CONFIG_DAY_SECOND_ZONES_MAX CALENDAR_CONFIG_PREFIX "/display/day_second_zones_max" + +-/* Date navigator settings */ +-#define CALENDAR_CONFIG_DN_SHOW_WEEK_NUMBERS CALENDAR_CONFIG_PREFIX "/date_navigator/show_week_numbers" +- + /* Task display settings */ + #define CALENDAR_CONFIG_TASKS_SELECTED_TASKS CALENDAR_CONFIG_PREFIX "/tasks/selected_tasks" + #define CALENDAR_CONFIG_PRIMARY_TASKS CALENDAR_CONFIG_PREFIX "/tasks/primary_tasks" +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/dialogs/cal-prefs-dialog.c evolution-2.30.2.new//calendar/gui/dialogs/cal-prefs-dialog.c +--- evolution-2.30.2//calendar/gui/dialogs/cal-prefs-dialog.c 2010-06-20 14:14:58.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/dialogs/cal-prefs-dialog.c 2010-06-22 13:37:26.724114033 +0200 +@@ -36,6 +36,7 @@ + #include "e-util/e-datetime-format.h" + #include "e-util/e-dialog-widgets.h" + #include "e-util/e-util-private.h" ++#include "shell/e-shell-utils.h" + #include + #include + +@@ -746,16 +747,11 @@ + shell_settings, "cal-compress-weekend", + widget, "active"); + +- widget = e_builder_get_widget (prefs->builder, "dnav_show_week_no"); ++ widget = e_builder_get_widget (prefs->builder, "show_week_numbers"); + e_mutual_binding_new ( + shell_settings, "cal-show-week-numbers", + widget, "active"); + +- widget = e_builder_get_widget (prefs->builder, "dview_show_week_no"); +- e_mutual_binding_new ( +- shell_settings, "cal-day-view-show-week-numbers", +- widget, "active"); +- + prefs->month_scroll_by_week = e_builder_get_widget (prefs->builder, "month_scroll_by_week"); + + widget = e_builder_get_widget (prefs->builder, "tasks_due_today_color"); +@@ -787,16 +783,42 @@ + e_mutual_binding_new ( + shell_settings, "cal-free-busy-template", + widget, "text"); +- target = e_cal_config_target_new_prefs (ec, prefs->gconf); +- e_config_set_target ((EConfig *)ec, (EConfigTarget *) target); +- toplevel = e_config_create_widget ((EConfig *)ec); +- gtk_container_add (GTK_CONTAINER (prefs), toplevel); + + /* date/time format */ + table = e_builder_get_widget (prefs->builder, "datetime_format_table"); + e_datetime_format_add_setup_widget (table, 0, "calendar", "table", DTFormatKindDateTime, _("Time and date:")); + e_datetime_format_add_setup_widget (table, 1, "calendar", "table", DTFormatKindDate, _("Date only:")); + ++ /* Hide senseless preferences when running in Express mode */ ++ e_shell_hide_widgets_for_express_mode (shell, prefs->builder, ++ "label_second_zone", ++ "hbox_second_zone", ++ "timezone", ++ "timezone_label", ++ "hbox_use_system_timezone", ++ "hbox_time_divisions", ++ "show_end_times", ++ "month_scroll_by_week", ++ NULL); ++ ++ /* HACK: GTK+ 2.18 and 2.20 has a GtkTable which includes row/column spacing even for empty rows/columns. ++ * When Evo runs in Express mode, we hide all the rows in the Time section of the calendar's General ++ * preferences page. However, due to that behavior in GTK+, we get a lot of extra spacing in that ++ * section. Since we know that in Express mode we only leave a single row visible, we'll make the ++ * table's row spacing equal to 0 in that case. ++ */ ++ if (e_shell_get_express_mode (shell)) { ++ widget = e_builder_get_widget (prefs->builder, "time"); ++ gtk_table_set_row_spacings (GTK_TABLE (widget), 0); ++ } ++ ++ /* Hook up and add the toplevel widget */ ++ ++ target = e_cal_config_target_new_prefs (ec, prefs->gconf); ++ e_config_set_target ((EConfig *)ec, (EConfigTarget *) target); ++ toplevel = e_config_create_widget ((EConfig *)ec); ++ gtk_container_add (GTK_CONTAINER (prefs), toplevel); ++ + show_config (prefs); + /* FIXME: weakref? */ + setup_changes (prefs); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/dialogs/cal-prefs-dialog.h evolution-2.30.2.new//calendar/gui/dialogs/cal-prefs-dialog.h +--- evolution-2.30.2//calendar/gui/dialogs/cal-prefs-dialog.h 2010-06-20 14:14:57.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/dialogs/cal-prefs-dialog.h 2010-06-22 13:37:26.724114033 +0200 +@@ -78,8 +78,6 @@ + GtkWidget *time_divisions; + GtkWidget *show_end_times; + GtkWidget *compress_weekend; +- GtkWidget *dnav_show_week_no; +- GtkWidget *dview_show_week_no; + GtkWidget *month_scroll_by_week; + GtkWidget *tasks_hide_completed; + GtkWidget *tasks_hide_completed_interval; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/dialogs/cal-prefs-dialog.ui evolution-2.30.2.new//calendar/gui/dialogs/cal-prefs-dialog.ui +--- evolution-2.30.2//calendar/gui/dialogs/cal-prefs-dialog.ui 2010-04-26 15:13:16.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/dialogs/cal-prefs-dialog.ui 2010-06-22 13:37:26.728114033 +0200 +@@ -1,31 +1,27 @@ + + ++ ++ ++ + + 9999 +- 0 +- 10 + 1 +- 0 +- 0 ++ 10 + + + 9999 +- 0 +- 10 + 1 +- 0 +- 0 ++ 10 + + ++ 1 + 9999 +- 0 +- 10 + 1 +- 0 +- 1 ++ 10 + + + ++ + + + +@@ -54,6 +50,7 @@ + + + ++ + + + +@@ -70,6 +67,7 @@ + + + ++ + + + +@@ -86,6 +84,7 @@ + + + ++ + + + +@@ -108,6 +107,7 @@ + + + ++ + + + +@@ -122,8 +122,6 @@ + + + +- +- + + True + True +@@ -164,12 +162,12 @@ + + + True +- 5 ++ 4 + 2 + 6 + 6 + +- ++ + True + 0 + Se_cond zone: +@@ -177,14 +175,14 @@ + day_second_zone + + +- 4 +- 5 ++ 3 ++ 4 + GTK_FILL +- ++ + + + +- ++ + True + + +@@ -214,32 +212,48 @@ + + 1 + 2 +- 4 +- 5 ++ 3 ++ 4 + GTK_FILL + GTK_FILL + + + +- ++ ++ True ++ ++ ++ ++ ++ ++ 1 ++ 2 ++ 2 ++ 3 ++ GTK_FILL ++ ++ ++ ++ + True + 0 +- Time format: ++ Time _zone: ++ True ++ timezone + + +- 3 +- 4 ++ 1 ++ 2 + GTK_FILL +- ++ + + + +- ++ + True +- 6 + +- +- _12 hour (AM/PM) ++ ++ Use s_ystem time zone + True + True + False +@@ -248,19 +262,14 @@ + + + False +- False + 0 + + + +- +- _24 hour ++ + True +- True +- False +- True +- True +- use_12_hour ++ 5 ++ (system/tz) + + + False +@@ -272,62 +281,51 @@ + + 1 + 2 +- 3 +- 4 +- GTK_FILL +- GTK_FILL +- +- +- +- +- True +- +- +- +- +- +- 1 +- 2 + 1 + 2 +- GTK_FILL ++ GTK_FILL + + + +- ++ + True + 0 +- Time _zone: +- True +- timezone ++ Time format: + + + GTK_FILL +- ++ + + + +- ++ + True ++ 6 + +- +- Use s_ystem time zone ++ ++ _12 hour (AM/PM) + True + True + False + True ++ True + True + + + False ++ False + 0 + + + +- ++ ++ _24 hour + True +- 5 +- (system/tz) ++ True ++ False ++ True ++ True ++ use_12_hour + + + False +@@ -340,14 +338,12 @@ + 1 + 2 + GTK_FILL ++ GTK_FILL + + + + + +- +- +- + + + 1 +@@ -391,7 +387,7 @@ + + + True +- 4 ++ 3 + 2 + 6 + 6 +@@ -399,13 +395,13 @@ + + True + 0 +- Wee_k starts on: ++ Wee_k starts on: + True + week_start_day + + + GTK_FILL +- ++ + + + +@@ -418,64 +414,21 @@ + 1 + 2 + GTK_FILL +- ++ + + + +- ++ + True + 0 + _Day begins: + True +- start_of_day + + + 2 + 3 + GTK_FILL +- +- +- +- +- +- True +- 0 +- Day _ends: +- True +- end_of_day +- +- +- 3 +- 4 +- GTK_FILL +- +- +- +- +- +- False +- True +- +- +- 1 +- 2 +- 2 +- 3 +- GTK_FILL +- +- +- +- +- False +- True +- +- +- 1 +- 2 +- 3 +- 4 +- GTK_FILL +- GTK_FILL ++ + + + +@@ -484,17 +437,14 @@ + 6 + + +- _Mon ++ _Mon + True + True + False + True + True +- +- +- + +- ++ + Monday + + +@@ -507,17 +457,14 @@ + + + +- _Tue ++ _Tue + True + True + False + True + True +- +- +- + +- ++ + Tuesday + + +@@ -530,17 +477,14 @@ + + + +- _Wed ++ _Wed + True + True + False + True + True +- +- +- + +- ++ + Wednesday + + +@@ -553,17 +497,14 @@ + + + +- T_hu ++ T_hu + True + True + False + True + True +- +- +- + +- ++ + Thursday + + +@@ -576,17 +517,14 @@ + + + +- _Fri ++ _Fri + True + True + False + True + True +- +- +- + +- ++ + Friday + + +@@ -599,17 +537,14 @@ + + + +- _Sat ++ _Sat + True + True + False + True + True +- +- +- + +- ++ + Saturday + + +@@ -622,17 +557,14 @@ + + + +- S_un ++ S_un + True + True + False + True + True +- +- +- + +- ++ + Sunday + + +@@ -671,6 +603,57 @@ + GTK_FILL + + ++ ++ ++ True ++ 12 ++ ++ ++ True ++ False ++ False ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ Day _ends: ++ True ++ ++ ++ False ++ end ++ 2 ++ ++ ++ ++ ++ True ++ False ++ False ++ ++ ++ False ++ False ++ end ++ 1 ++ ++ ++ ++ ++ 1 ++ 2 ++ 2 ++ 3 ++ GTK_FILL ++ ++ + + + 1 +@@ -736,7 +719,7 @@ + 4 + + +- Sh_ow a reminder ++ Sh_ow a reminder + True + True + False +@@ -778,7 +761,7 @@ + + + True +- before every appointment ++ before every appointment + + + False +@@ -797,7 +780,7 @@ + 4 + + +- Show a _reminder ++ Show a _reminder + True + True + False +@@ -839,7 +822,7 @@ + + + True +- before every anniversary/birthday ++ before every anniversary/birthday + + + False +@@ -913,7 +896,7 @@ + True + 6 + +- ++ + True + 6 + +@@ -980,8 +963,8 @@ + + + +- +- Show week _numbers in date navigator ++ ++ Show week _numbers + True + True + False +@@ -995,21 +978,6 @@ + + + +- +- Show week n_umber in Day and Work Week View +- True +- True +- False +- True +- True +- +- +- False +- False +- 4 +- +- +- + + Sc_roll Month View by a week + True +@@ -1021,7 +989,7 @@ + + False + False +- 5 ++ 4 + + + +@@ -1069,12 +1037,9 @@ + True + 6 + +- ++ + True +- 2 +- 2 +- 6 +- 6 ++ 12 + + + True +@@ -1084,57 +1049,59 @@ + tasks_due_today_color + + +- GTK_FILL +- ++ False ++ False ++ 0 + + + +- ++ + True +- 0 +- _Overdue tasks: +- True +- tasks_overdue_color ++ True ++ True ++ Pick a color ++ #000000000000 + + +- 1 +- 2 +- GTK_FILL +- ++ False ++ False ++ 1 + + + +- ++ + True +- True +- False +- Pick a color ++ 0 ++ _Overdue tasks: ++ True ++ tasks_overdue_color + + +- 1 +- 2 +- +- ++ False ++ False ++ end ++ 3 + + + + + True + True +- False ++ True + Pick a color ++ #000000000000 + + +- 1 +- 2 +- 1 +- 2 +- +- ++ False ++ False ++ end ++ 2 + + + + ++ False ++ False + 0 + + +@@ -1202,81 +1169,59 @@ + + + True +- Date/Time Format +- False +- GTK_JUSTIFY_LEFT +- False +- False + 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 ++ Date/Time Format + + + + + +- 0 + False + False ++ 4 + + + + + True +- False + 12 + + + True +- +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 + + +- 0 + False + False ++ 0 + + + + + True +- 1 + 3 +- False +- 0 +- 0 ++ ++ ++ ++ ++ ++ ++ ++ ++ + + +- 0 +- True +- True ++ 1 + + + + +- 0 +- True +- True ++ 5 + + + ++ ++ 1 ++ + + + +@@ -1296,101 +1241,69 @@ + + + True +- Alarms +- False +- GTK_JUSTIFY_LEFT +- False +- False + 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 ++ Alarms + + + + + +- 0 + False + False ++ 0 + + + + + True +- 0.5 +- 0.5 +- 1 +- 1 +- 0 +- 0 + 10 +- 0 + + ++ Display alarms in _notification area only + True + True +- Display alarms in _notification area only ++ False + True +- GTK_RELIEF_NORMAL +- True +- False +- False + True + + + + +- 0 + False +- True ++ 1 + + + + + True +- Select the calendars for alarm notification +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False + 0 +- 0.5 +- 0 +- 0 +- PANGO_ELLIPSIZE_NONE +- -1 +- False +- 0 ++ Select the calendars for alarm notification + + +- 0 + False + False ++ 2 + + + + +- True +- True +- automatic +- automatic +- in +- +- ++ True ++ True ++ automatic ++ automatic ++ in ++ ++ ++ + + +- 0 +- True +- True ++ 3 + + + ++ ++ 2 ++ + + + +@@ -1496,6 +1409,9 @@ + + + ++ ++ 3 ++ + + + +@@ -1508,4 +1424,10 @@ + + + ++ ++ ++ ++ ++ ++ + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/dialogs/comp-editor.c evolution-2.30.2.new//calendar/gui/dialogs/comp-editor.c +--- evolution-2.30.2//calendar/gui/dialogs/comp-editor.c 2010-06-20 14:14:58.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/dialogs/comp-editor.c 2010-06-22 13:37:26.732114033 +0200 +@@ -75,8 +75,6 @@ + + #define d(x) + +-static gboolean comp_lite = FALSE; +- + /* Private part of the CompEditor structure */ + struct _CompEditorPrivate { + +@@ -173,10 +171,16 @@ + " " + " " + " " +-" " +-" " +-" " ++" \n" ++"#if !EXPRESS\n" ++" \n" ++"#endif\n" + " " ++" \n" ++"#if EXPRESS\n" ++" \n" ++" \n" ++"#endif\n" + " " + ""; + +@@ -421,7 +425,7 @@ + clone = e_cal_component_clone (priv->comp); + comp_editor_copy_new_attendees (clone, priv->comp); + for (l = priv->pages; l != NULL; l = l->next) { +- if (!comp_editor_page_fill_component (l->data, clone)) { ++ if (IS_COMP_EDITOR_PAGE(l->data) && !comp_editor_page_fill_component (l->data, clone)) { + g_object_unref (clone); + g_hash_table_destroy (timezones); + comp_editor_show_page (editor, COMP_EDITOR_PAGE (l->data)); +@@ -429,7 +433,8 @@ + } + + /* retrieve all timezones */ +- comp_editor_page_fill_timezones (l->data, timezones); ++ if (IS_COMP_EDITOR_PAGE(l->data)) ++ comp_editor_page_fill_timezones (l->data, timezones); + } + + /* If we are not the organizer, we don't update the sequence number */ +@@ -1598,6 +1603,9 @@ + gint n_targets; + GError *error = NULL; + ++ /* FIXME Shell should be passed in. */ ++ shell = e_shell_get_default (); ++ + editor->priv = priv = COMP_EDITOR_GET_PRIVATE (editor); + + g_object_weak_ref ( +@@ -1621,9 +1629,9 @@ + priv->is_group_item = FALSE; + + priv->ui_manager = e_ui_manager_new (); ++ e_ui_manager_set_express_mode (E_UI_MANAGER (priv->ui_manager), ++ e_shell_get_express_mode (shell)); + +- if (comp_lite) +- gtk_window_set_default_size ((GtkWindow *) editor, 800, 450); + gtk_window_add_accel_group ( + GTK_WINDOW (editor), + gtk_ui_manager_get_accel_group (priv->ui_manager)); +@@ -1705,7 +1713,7 @@ + action = comp_editor_get_action (editor, "save"); + gtk_action_set_sensitive (action, FALSE); + +- gtk_ui_manager_add_ui_from_string (priv->ui_manager, ui, -1, &error); ++ e_ui_manager_add_ui_from_string (E_UI_MANAGER (priv->ui_manager), ui, &error); + if (error != NULL) { + g_warning ("%s: %s", G_STRFUNC, error->message); + g_error_free (error); +@@ -1721,24 +1729,25 @@ + + container = widget; + +- widget = comp_editor_get_managed_widget (editor, "/main-menu"); +- gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); +- gtk_widget_show (widget); +- +- if (!comp_lite) { +- widget = comp_editor_get_managed_widget (editor, "/main-toolbar"); ++ if (!e_shell_get_express_mode (shell)) { ++ widget = comp_editor_get_managed_widget (editor, "/main-menu"); + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); +- gtk_widget_show (widget); ++ gtk_widget_set_visible (widget, !e_shell_get_meego_mode (shell)); + } + ++ widget = comp_editor_get_managed_widget (editor, "/main-toolbar"); ++ gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); ++ gtk_widget_show (widget); ++ + widget = e_attachment_paned_new (); + gtk_container_set_border_width (GTK_CONTAINER (widget), 6); + gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); + priv->attachment_view = g_object_ref (widget); + gtk_widget_show (widget); + +- if (comp_lite) { +- GtkWidget *tmp, *tmp1, *tmp_box, *cont; ++ if (e_shell_get_express_mode (shell)) { ++ /*GtkWidget *tmp, *tmp1, *tmp_box, */ ++ GtkWidget *cont; + GtkWidget *combo; + + e_attachment_paned_set_expanded (E_ATTACHMENT_PANED (widget), TRUE); +@@ -1749,7 +1758,7 @@ + gtk_widget_hide (combo); + cont = e_attachment_paned_get_controls_container ( + E_ATTACHMENT_PANED (widget)); +- ++ /* + tmp_box = gtk_hbox_new (FALSE, 0); + tmp = gtk_hbox_new (FALSE, 0); + tmp1 = gtk_image_new_from_stock (GTK_STOCK_SAVE, GTK_ICON_SIZE_BUTTON); +@@ -1769,12 +1778,12 @@ + + gtk_widget_show(tmp_box); + gtk_box_pack_end (GTK_BOX (cont), tmp_box, FALSE, FALSE, 4); +- ++ */ + } + container = e_attachment_paned_get_content_area ( + E_ATTACHMENT_PANED (priv->attachment_view)); + +- if (comp_lite) { ++ if (e_shell_get_express_mode (shell)) { + scroll = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy ((GtkScrolledWindow *)scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_widget_show(scroll); +@@ -1782,14 +1791,14 @@ + } + + widget = gtk_notebook_new (); +- gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), FALSE); +- if (!comp_lite) ++ gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), e_shell_get_express_mode (shell)); ++ if (!e_shell_get_express_mode (shell)) + gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); + else + gtk_scrolled_window_add_with_viewport ((GtkScrolledWindow *) scroll, widget); + priv->notebook = GTK_NOTEBOOK (widget); + gtk_widget_show (widget); +- if (comp_lite) ++ if (e_shell_get_express_mode (shell)) + gtk_widget_set_size_request (scroll, 300, -1); + comp_editor_setup_recent_menu (editor); + +@@ -1831,9 +1840,8 @@ + + comp_editor_bind_gconf (editor); + +- /* FIXME Shell should be passed in. */ +- shell = e_shell_get_default (); + e_shell_watch_window (shell, GTK_WINDOW (editor)); ++ e_shell_adapt_window_size (shell, GTK_WINDOW (editor)); + } + + static gboolean +@@ -2273,6 +2281,51 @@ + } + + /** ++ * comp_editor_append_widget: ++ * @editor: A component editor ++ * @page: A component editor page ++ * @label: Label of the page. Should be NULL if add is FALSE. ++ * @add: Add's the page into the notebook if TRUE ++ * ++ * Appends a page to the notebook if add is TRUE else ++ * just adds it to the list of pages. ++ **/ ++void ++comp_editor_append_widget (CompEditor *editor, ++ GtkWidget *page, ++ const gchar *label, ++ gboolean add) ++{ ++ CompEditorPrivate *priv; ++ GtkWidget *label_widget = NULL; ++ ++ g_return_if_fail (IS_COMP_EDITOR (editor)); ++ ++ priv = editor->priv; ++ ++ g_object_ref (page); ++ ++ if (label) ++ label_widget = gtk_label_new_with_mnemonic (label); ++ ++ priv->pages = g_list_append (priv->pages, page); ++ ++ if (add) ++ gtk_notebook_append_page (priv->notebook, page, label_widget); ++ ++ /* Listen for when the page is mapped/unmapped so we can ++ install/uninstall the appropriate GtkAccelGroup. ++ g_signal_connect ( ++ page, "map", ++ G_CALLBACK (page_mapped_cb), page); ++ g_signal_connect( ++ page, "unmap", ++ G_CALLBACK (page_unmapped_cb), page); ++ */ ++ ++} ++ ++/** + * comp_editor_append_page: + * @editor: A component editor + * @page: A component editor page +@@ -2563,8 +2616,10 @@ + g_signal_handlers_block_by_func ( + action, G_CALLBACK (action_classification_cb), editor); + +- for (iter = priv->pages; iter != NULL; iter = iter->next) +- comp_editor_page_fill_widgets (iter->data, priv->comp); ++ for (iter = priv->pages; iter != NULL; iter = iter->next) { ++ if (IS_COMP_EDITOR_PAGE(iter->data)) ++ comp_editor_page_fill_widgets (iter->data, priv->comp); ++ } + + g_signal_handlers_unblock_by_func ( + action, G_CALLBACK (action_classification_cb), editor); +@@ -2807,8 +2862,10 @@ + comp = e_cal_component_clone (priv->comp); + comp_editor_copy_new_attendees (comp, priv->comp); + if (priv->changed) { +- for (l = priv->pages; l != NULL; l = l->next) +- all_ok = comp_editor_page_fill_component (l->data, comp) && all_ok; ++ for (l = priv->pages; l != NULL; l = l->next) { ++ if (IS_COMP_EDITOR_PAGE(l->data)) ++ all_ok = comp_editor_page_fill_component (l->data, comp) && all_ok; ++ } + } + + if (correct) +@@ -2973,7 +3030,7 @@ + GList *l; + + for (l = priv->pages; l != NULL; l = l->next) +- if (page != (CompEditorPage *) l->data) ++ if (page != (CompEditorPage *) l->data && IS_COMP_EDITOR_PAGE(l->data)) + comp_editor_page_set_dates (l->data, dates); + + if (!priv->warned && priv->existing_org && !priv->user_org && !(editor->priv->flags & COMP_EDITOR_NEW_ITEM)) { +@@ -3030,14 +3087,3 @@ + close_dialog (editor); + } + +-gboolean +-comp_editor_get_lite () +-{ +- return comp_lite; +-} +- +-void +-comp_editor_set_lite (gboolean status) +-{ +- comp_lite = status; +-} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/dialogs/comp-editor.h evolution-2.30.2.new//calendar/gui/dialogs/comp-editor.h +--- evolution-2.30.2//calendar/gui/dialogs/comp-editor.h 2010-06-20 14:14:57.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/dialogs/comp-editor.h 2010-06-22 13:37:26.732114033 +0200 +@@ -127,6 +127,11 @@ + CompEditorPage *page, + const gchar *label, + gboolean add); ++void comp_editor_append_widget (CompEditor *editor, ++ GtkWidget *page, ++ const gchar *label, ++ gboolean add); ++ + void comp_editor_remove_page (CompEditor *editor, + CompEditorPage *page); + void comp_editor_show_page (CompEditor *editor, +@@ -165,9 +170,6 @@ + const gchar *widget_path); + CompEditor * comp_editor_find_instance (const gchar *uid); + +-void comp_editor_set_lite (gboolean status); +-gboolean comp_editor_get_lite (void); +- + G_END_DECLS + + #endif +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/dialogs/comp-editor-util.c evolution-2.30.2.new//calendar/gui/dialogs/comp-editor-util.c +--- evolution-2.30.2//calendar/gui/dialogs/comp-editor-util.c 2010-06-20 14:14:57.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/dialogs/comp-editor-util.c 2010-06-22 13:37:26.732114033 +0200 +@@ -209,7 +209,6 @@ + + /** + * comp_editor_new_date_edit: +- * @shell_settings: an #EShellSettings + * @show_date: Whether to show a date picker in the widget. + * @show_time: Whether to show a time picker in the widget. + * @make_time_insensitive: Whether the time field is made insensitive rather +@@ -221,15 +220,12 @@ + * Return value: A newly-created #EDateEdit widget. + **/ + GtkWidget * +-comp_editor_new_date_edit (EShellSettings *shell_settings, +- gboolean show_date, ++comp_editor_new_date_edit (gboolean show_date, + gboolean show_time, + gboolean make_time_insensitive) + { + EDateEdit *dedit; + +- g_return_val_if_fail (E_IS_SHELL_SETTINGS (shell_settings), NULL); +- + dedit = E_DATE_EDIT (e_date_edit_new ()); + + e_date_edit_set_show_date (dedit, show_date); +@@ -240,29 +236,9 @@ + e_date_edit_set_make_time_insensitive (dedit, FALSE); + #endif + +- comp_editor_bind_date_edit_settings (GTK_WIDGET (dedit), shell_settings); +- + return GTK_WIDGET (dedit); + } + +-void +-comp_editor_bind_date_edit_settings (GtkWidget *dateedit, EShellSettings *shell_settings) +-{ +- g_return_if_fail (dateedit != NULL); +- g_return_if_fail (E_IS_DATE_EDIT (dateedit)); +- +- if (!shell_settings) +- shell_settings = e_shell_get_shell_settings (e_shell_get_default ()); +- +- e_binding_new ( +- shell_settings, "cal-show-week-numbers", +- dateedit, "show-week-numbers"); +- +- e_binding_new ( +- shell_settings, "cal-week-start-day", +- dateedit, "week-start-day"); +-} +- + /* Returns the current time, for EDateEdit widgets and ECalendar items in the + dialogs. + FIXME: Should probably use the timezone from somewhere in the component +@@ -414,7 +390,9 @@ + * @note The list is just string of emails separated by ';' + **/ + void +-comp_editor_manage_new_attendees (ECalComponent *comp, EMeetingAttendee *ma, gboolean add) ++comp_editor_manage_new_attendees (ECalComponent *comp, ++ EMeetingAttendee *ma, ++ gboolean add) + { + const gchar *eml; + +@@ -426,7 +404,11 @@ + eml = itip_strip_mailto (eml); + g_return_if_fail (eml != NULL); + +- g_object_set_data_full (G_OBJECT (comp), "new-attendees", manage_new_attendees (g_object_get_data (G_OBJECT (comp), "new-attendees"), eml, add), free_slist_strs); ++ g_object_set_data_full ( ++ G_OBJECT (comp), "new-attendees", ++ manage_new_attendees ( ++ g_object_get_data (G_OBJECT (comp), "new-attendees"), ++ eml, add), free_slist_strs); + } + + /** +@@ -469,15 +451,19 @@ + eml = itip_strip_mailto (eml); + g_return_val_if_fail (eml != NULL, FALSE); + +- return comp_editor_have_in_new_attendees_lst (g_object_get_data (G_OBJECT (comp), "new-attendees"), eml); ++ return comp_editor_have_in_new_attendees_lst ( ++ g_object_get_data (G_OBJECT (comp), "new-attendees"), eml); + } + + /** + * comp_editor_have_in_new_attendees_lst: +- * Same as @ref comp_editor_have_in_new_attendees only parameters are direct GSList and string. ++ * ++ * Same as comp_editor_have_in_new_attendees() only parameters are ++ * direct GSList and string. + **/ + gboolean +-comp_editor_have_in_new_attendees_lst (const GSList *new_attendees, const gchar *eml) ++comp_editor_have_in_new_attendees_lst (const GSList *new_attendees, ++ const gchar *eml) + { + const GSList *l; + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/dialogs/comp-editor-util.h evolution-2.30.2.new//calendar/gui/dialogs/comp-editor-util.h +--- evolution-2.30.2//calendar/gui/dialogs/comp-editor-util.h 2010-06-20 14:14:58.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/dialogs/comp-editor-util.h 2010-06-22 13:37:26.732114033 +0200 +@@ -26,7 +26,6 @@ + #define _COMP_EDITOR_UTIL_H_ + + #include +-#include + #include "comp-editor-page.h" + #include "../e-meeting-attendee.h" + +@@ -35,13 +34,10 @@ + + void comp_editor_date_label (CompEditorPageDates *dates, GtkWidget *label); + +-GtkWidget * comp_editor_new_date_edit (EShellSettings *shell_settings, +- gboolean show_date, ++GtkWidget * comp_editor_new_date_edit (gboolean show_date, + gboolean show_time, + gboolean make_time_insensitive); + +-void comp_editor_bind_date_edit_settings (GtkWidget *dateedit, EShellSettings *shell_settings); +- + struct tm comp_editor_get_current_time (GtkObject *object, gpointer data); + + gchar *comp_editor_strip_categories (const gchar *categories); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/dialogs/copy-source-dialog.c evolution-2.30.2.new//calendar/gui/dialogs/copy-source-dialog.c +--- evolution-2.30.2//calendar/gui/dialogs/copy-source-dialog.c 2010-06-20 14:14:57.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/dialogs/copy-source-dialog.c 2010-06-22 13:37:26.732114033 +0200 +@@ -32,18 +32,19 @@ + #include "common/authentication.h" + + typedef struct { ++ GtkWindow *parent; + ESource *orig_source; + ECalSourceType obj_type; + ESource *selected_source; + } CopySourceDialogData; + + static void +-show_error (GtkWindow *parent, const gchar *msg) ++show_error (CopySourceDialogData *csdd, const gchar *msg) + { + GtkWidget *dialog; + + dialog = gtk_message_dialog_new ( +- parent, 0, GTK_MESSAGE_ERROR, ++ csdd->parent, 0, GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, "%s", msg); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); +@@ -88,7 +89,7 @@ + /* open the source */ + source_client = e_auth_new_cal_from_source (csdd->orig_source, csdd->obj_type); + if (!e_cal_open (source_client, TRUE, NULL)) { +- show_error (NULL, _("Could not open source")); ++ show_error (csdd, _("Could not open source")); + g_object_unref (source_client); + return FALSE; + } +@@ -96,7 +97,7 @@ + /* open the destination */ + dest_client = e_auth_new_cal_from_source (csdd->selected_source, csdd->obj_type); + if (!e_cal_open (dest_client, FALSE, NULL)) { +- show_error (NULL, _("Could not open destination")); ++ show_error (csdd, _("Could not open destination")); + g_object_unref (dest_client); + g_object_unref (source_client); + return FALSE; +@@ -105,7 +106,7 @@ + /* check if the destination is read only */ + e_cal_is_read_only (dest_client, &read_only, NULL); + if (read_only) { +- show_error (NULL, _("Destination is read only")); ++ show_error (csdd, _("Destination is read only")); + } else { + if (e_cal_get_object_list (source_client, "#t", &obj_list, NULL)) { + GList *l; +@@ -135,7 +136,7 @@ + g_free (uid); + } else { + if (error) { +- show_error (NULL, error->message); ++ show_error (csdd, error->message); + g_error_free (error); + } + break; +@@ -168,6 +169,7 @@ + + g_return_val_if_fail (E_IS_SOURCE (source), FALSE); + ++ csdd.parent = parent; + csdd.orig_source = source; + csdd.selected_source = NULL; + csdd.obj_type = obj_type; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/dialogs/event-editor.c evolution-2.30.2.new//calendar/gui/dialogs/event-editor.c +--- evolution-2.30.2//calendar/gui/dialogs/event-editor.c 2010-06-20 14:14:58.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/dialogs/event-editor.c 2010-06-22 13:37:26.732114033 +0200 +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + #include "event-page.h" + #include "recurrence-page.h" +@@ -89,11 +90,19 @@ + " " + " " + " " +-" " +-" " +-" " +-" " +-" " ++" \n" ++"#if !EXPRESS\n" ++" \n" ++"#endif\n" ++" \n" ++"#if !EXPRESS\n" ++" \n" ++"#endif\n" ++" \n" ++"#if !EXPRESS\n" ++" \n" ++"#endif\n" ++" " + " " + ""; + +@@ -275,6 +284,8 @@ + GtkActionGroup *action_group; + ECal *client; + gboolean is_meeting; ++ GtkWidget *alarm_page; ++ GtkWidget *attendee_page; + + /* Chain up to parent's constructor() method. */ + object = G_OBJECT_CLASS (event_editor_parent_class)->constructor ( +@@ -308,11 +319,34 @@ + + priv->recur_page = recurrence_page_new (editor); + page = COMP_EDITOR_PAGE (priv->recur_page); +- gtk_container_add ( +- GTK_CONTAINER ((GTK_DIALOG (priv->recur_window)->vbox)), +- comp_editor_page_get_widget (page)); +- gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (priv->recur_window))); +- comp_editor_append_page (editor, page, NULL, FALSE); ++ if (!e_shell_get_express_mode(e_shell_get_default())) { ++ gtk_container_add ( ++ GTK_CONTAINER ((GTK_DIALOG (priv->recur_window)->vbox)), ++ comp_editor_page_get_widget (page)); ++ gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (priv->recur_window))); ++ comp_editor_append_page (editor, page, NULL, FALSE); ++ } else { ++ comp_editor_append_page (editor, page, _("_Recurrence"), TRUE); ++ } ++ ++ if (e_shell_get_express_mode(e_shell_get_default())) { ++ ENameSelector *name_selector; ++ ++ priv->sched_page = schedule_page_new (priv->model, editor); ++ page = COMP_EDITOR_PAGE (priv->sched_page); ++ ++ name_selector = event_page_get_name_selector (priv->event_page); ++ schedule_page_set_name_selector (priv->sched_page, name_selector); ++ ++ comp_editor_append_page (editor, page, _("_Free/Busy"), TRUE); ++ schedule_page_update_free_busy (priv->sched_page); ++ ++ /* Alarm page */ ++ alarm_page = event_page_get_alarm_page (priv->event_page); ++ comp_editor_append_widget (editor, alarm_page, _("_Alarm"), TRUE); ++ g_object_unref(alarm_page); ++ ++ } + + if (is_meeting) { + +@@ -329,6 +363,12 @@ + + event_page_set_meeting (priv->event_page, TRUE); + priv->meeting_shown=TRUE; ++ ++ if (e_shell_get_express_mode(e_shell_get_default())) { ++ attendee_page = event_page_get_attendee_page (priv->event_page); ++ comp_editor_append_widget (editor, attendee_page, _("Attendee_s"), TRUE); ++ g_object_unref(attendee_page); ++ } + } + + return object; +@@ -371,25 +411,12 @@ + event_editor_constructed (GObject *object) + { + EventEditorPrivate *priv; +- EShellSettings *shell_settings; +- EShell *shell; + + priv = EVENT_EDITOR_GET_PRIVATE (object); + +- shell = comp_editor_get_shell (COMP_EDITOR (object)); +- shell_settings = e_shell_get_shell_settings (shell); +- + e_binding_new ( + object, "client", + priv->model, "client"); +- +- e_binding_new ( +- shell_settings, "cal-free-busy-template", +- priv->model, "free-busy-template"); +- +- e_binding_new ( +- shell_settings, "cal-timezone", +- priv->model, "timezone"); + } + + static void +@@ -520,7 +547,7 @@ + G_N_ELEMENTS (meeting_entries), ee); + + ui_manager = comp_editor_get_ui_manager (editor); +- gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error); ++ e_ui_manager_add_ui_from_string (E_UI_MANAGER (ui_manager), ui, &error); + + id = "org.gnome.evolution.event-editor"; + e_plugin_ui_register_manager (ui_manager, id, ee); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/dialogs/event-page.c evolution-2.30.2.new//calendar/gui/dialogs/event-page.c +--- evolution-2.30.2//calendar/gui/dialogs/event-page.c 2010-06-20 14:14:57.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/dialogs/event-page.c 2010-06-22 13:37:26.732114033 +0200 +@@ -828,7 +828,8 @@ + } else { + gtk_widget_show (priv->calendar_label); + gtk_widget_show (priv->list_box); +- gtk_widget_show (priv->attendee_box); ++ if (!e_shell_get_express_mode(e_shell_get_default())) ++ gtk_widget_show (priv->attendee_box); + gtk_widget_show (priv->organizer); + gtk_label_set_text_with_mnemonic ((GtkLabel *) priv->org_cal_label, _("Or_ganizer:")); + } +@@ -2197,7 +2198,7 @@ + + priv->invite = GW ("invite"); + priv->invite_label = GW ("invite-label"); +- if (comp_editor_get_lite ()) ++ if (e_shell_get_express_mode (e_shell_get_default ())) + gtk_widget_hide (priv->invite); + else + gtk_widget_hide (priv->invite_label); +@@ -2222,7 +2223,6 @@ + + /* Glade's visibility flag doesn't seem to work for custom widgets */ + priv->start_time = GW ("start-time"); +- comp_editor_bind_date_edit_settings (priv->start_time, NULL); + gtk_widget_show (priv->start_time); + + priv->time_hour = GW ("time-hour"); +@@ -2231,7 +2231,6 @@ + priv->end_time_combo = GW ("end-time-combobox"); + + priv->end_time = GW ("end-time"); +- comp_editor_bind_date_edit_settings (priv->end_time, NULL); + gtk_widget_show_all (priv->time_hour); + gtk_widget_hide (priv->end_time); + +@@ -2239,8 +2238,6 @@ + + priv->source_selector = GW ("source"); + +-#undef GW +- + e_util_set_source_combo_box_list (priv->source_selector, "/apps/evolution/calendar/sources"); + + completion = e_category_completion_new (); +@@ -3259,3 +3256,42 @@ + e_meeting_list_view_remove_all_attendees_from_name_selector (E_MEETING_LIST_VIEW (priv->list_view)); + } + ++GtkWidget * ++event_page_get_alarm_page (EventPage *epage) ++{ ++ EventPagePrivate *priv; ++ GtkWidget *alarm_page, *tmp; ++ ++ g_return_val_if_fail (epage != NULL, NULL); ++ g_return_val_if_fail (IS_EVENT_PAGE (epage), NULL); ++ ++ priv = epage->priv; ++ ++ tmp = GW("dialog-vbox1"); ++ alarm_page = GW("vbox2"); ++ g_object_ref(alarm_page); ++ gtk_container_remove ((GtkContainer *)tmp, alarm_page); ++ ++ return alarm_page; ++} ++ ++GtkWidget * ++event_page_get_attendee_page (EventPage *epage) ++{ ++ EventPagePrivate *priv; ++ GtkWidget *apage; ++ ++ g_return_val_if_fail (epage != NULL, NULL); ++ g_return_val_if_fail (IS_EVENT_PAGE (epage), NULL); ++ ++ priv = epage->priv; ++ ++ apage = priv->list_box; ++ g_object_ref(apage); ++ gtk_container_remove ((GtkContainer *)gtk_widget_get_parent(apage), apage); ++ gtk_widget_hide (priv->attendee_box); ++ ++ return apage; ++} ++ ++#undef GW +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/dialogs/event-page.h evolution-2.30.2.new//calendar/gui/dialogs/event-page.h +--- evolution-2.30.2//calendar/gui/dialogs/event-page.h 2010-06-20 14:14:58.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/dialogs/event-page.h 2010-06-22 13:37:26.732114033 +0200 +@@ -109,6 +109,8 @@ + void event_page_add_attendee (EventPage *epage, + EMeetingAttendee *attendee); + void event_page_remove_all_attendees (EventPage *epage); ++GtkWidget * event_page_get_alarm_page (EventPage *epage); ++GtkWidget * event_page_get_attendee_page (EventPage *epage); + + G_END_DECLS + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/dialogs/memo-page.c evolution-2.30.2.new//calendar/gui/dialogs/memo-page.c +--- evolution-2.30.2//calendar/gui/dialogs/memo-page.c 2010-06-20 14:14:58.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/dialogs/memo-page.c 2010-06-22 13:37:26.732114033 +0200 +@@ -816,7 +816,6 @@ + #undef GW + + e_util_set_source_combo_box_list (priv->source_selector, "/apps/evolution/memos/sources"); +- comp_editor_bind_date_edit_settings (priv->start_date, NULL); + + completion = e_category_completion_new (); + gtk_entry_set_completion (GTK_ENTRY (priv->categories), completion); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/dialogs/recurrence-page.c evolution-2.30.2.new//calendar/gui/dialogs/recurrence-page.c +--- evolution-2.30.2//calendar/gui/dialogs/recurrence-page.c 2010-06-20 14:14:57.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/dialogs/recurrence-page.c 2010-06-22 13:37:26.736114033 +0200 +@@ -1340,8 +1340,6 @@ + make_ending_until_special (RecurrencePage *rpage) + { + RecurrencePagePrivate *priv = rpage->priv; +- EShell *shell; +- EShellSettings *shell_settings; + CompEditor *editor; + CompEditorFlags flags; + EDateEdit *de; +@@ -1353,13 +1351,9 @@ + editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (rpage)); + flags = comp_editor_get_flags (editor); + +- shell = comp_editor_get_shell (editor); +- shell_settings = e_shell_get_shell_settings (shell); +- + /* Create the widget */ + +- priv->ending_date_edit = comp_editor_new_date_edit ( +- shell_settings, TRUE, FALSE, FALSE); ++ priv->ending_date_edit = comp_editor_new_date_edit (TRUE, FALSE, FALSE); + de = E_DATE_EDIT (priv->ending_date_edit); + + gtk_container_add (GTK_CONTAINER (priv->ending_special), +@@ -2088,14 +2082,10 @@ + RecurrencePagePrivate *priv; + GtkWidget *dialog, *toplevel; + CompEditor *editor; +- EShell *shell; +- EShellSettings *shell_settings; + + priv = rpage->priv; + + editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (rpage)); +- shell = comp_editor_get_shell (editor); +- shell_settings = e_shell_get_shell_settings (shell); + + toplevel = gtk_widget_get_toplevel (priv->main); + dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (toplevel), +@@ -2104,7 +2094,7 @@ + GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + NULL); + +- *date_edit = comp_editor_new_date_edit (shell_settings, TRUE, FALSE, TRUE); ++ *date_edit = comp_editor_new_date_edit (TRUE, FALSE, TRUE); + gtk_widget_show (*date_edit); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), *date_edit, FALSE, TRUE, 6); + +@@ -2260,8 +2250,6 @@ + init_widgets (RecurrencePage *rpage) + { + RecurrencePagePrivate *priv; +- EShell *shell; +- EShellSettings *shell_settings; + CompEditor *editor; + ECalendar *ecal; + GtkAdjustment *adj; +@@ -2271,22 +2259,12 @@ + priv = rpage->priv; + + editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (rpage)); +- shell = comp_editor_get_shell (editor); +- shell_settings = e_shell_get_shell_settings (shell); + + /* Recurrence preview */ + + priv->preview_calendar = e_calendar_new (); + ecal = E_CALENDAR (priv->preview_calendar); + +- e_binding_new ( +- shell_settings, "cal-show-week-numbers", +- ecal->calitem, "show-week-numbers"); +- +- e_binding_new ( +- shell_settings, "cal-week-start-day", +- ecal->calitem, "week-start-day"); +- + g_signal_connect((ecal->calitem), "date_range_changed", + G_CALLBACK (preview_date_range_changed_cb), + rpage); +@@ -2423,12 +2401,6 @@ + GtkWidget * + make_exdate_date_edit (void) + { +- EShell *shell; +- EShellSettings *shell_settings; +- +- shell = e_shell_get_default (); +- shell_settings = e_shell_get_shell_settings (shell); +- +- return comp_editor_new_date_edit (shell_settings, TRUE, TRUE, FALSE); ++ return comp_editor_new_date_edit (TRUE, TRUE, FALSE); + } + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/dialogs/schedule-page.c evolution-2.30.2.new//calendar/gui/dialogs/schedule-page.c +--- evolution-2.30.2//calendar/gui/dialogs/schedule-page.c 2010-06-20 14:14:58.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/dialogs/schedule-page.c 2010-06-22 13:37:26.736114033 +0200 +@@ -380,13 +380,9 @@ + schedule_page_construct (SchedulePage *spage, EMeetingStore *ems) + { + SchedulePagePrivate *priv = spage->priv; +- EShellSettings *shell_settings; +- EShell *shell; + CompEditor *editor; + + editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (spage)); +- shell = comp_editor_get_shell (editor); +- shell_settings = e_shell_get_shell_settings (shell); + + priv->builder = gtk_builder_new (); + e_load_ui_builder_definition (priv->builder, "schedule-page.ui"); +@@ -412,18 +408,6 @@ + gtk_widget_show (GTK_WIDGET (priv->sel)); + gtk_box_pack_start (GTK_BOX (priv->main), GTK_WIDGET (priv->sel), TRUE, TRUE, 6); + +- e_binding_new ( +- shell_settings, "cal-show-week-numbers", +- priv->sel, "show-week-numbers"); +- +- e_binding_new ( +- shell_settings, "cal-use-24-hour-format", +- priv->sel, "use-24-hour-format"); +- +- e_binding_new ( +- shell_settings, "cal-week-start-day", +- priv->sel, "week-start-day"); +- + if (!init_widgets (spage)) { + g_message ("schedule_page_construct(): " + "Could not initialize the widgets!"); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/dialogs/task-details-page.c evolution-2.30.2.new//calendar/gui/dialogs/task-details-page.c +--- evolution-2.30.2//calendar/gui/dialogs/task-details-page.c 2010-06-20 14:14:57.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/dialogs/task-details-page.c 2010-06-22 13:37:26.736114033 +0200 +@@ -474,7 +474,6 @@ + priv->date_completed_label = GW ("date_completed_label"); + + priv->completed_date = GW ("completed-date"); +- comp_editor_bind_date_edit_settings (priv->completed_date, NULL); + gtk_widget_show (priv->completed_date); + + priv->url_label = GW ("url_label"); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/dialogs/task-editor.c evolution-2.30.2.new//calendar/gui/dialogs/task-editor.c +--- evolution-2.30.2//calendar/gui/dialogs/task-editor.c 2010-06-20 14:14:57.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/dialogs/task-editor.c 2010-06-22 13:37:26.736114033 +0200 +@@ -81,8 +81,10 @@ + " " + " " + " " +-" " +-" " ++" " ++" " ++" " ++" " + " " + ""; + +@@ -202,25 +204,12 @@ + task_editor_constructed (GObject *object) + { + TaskEditorPrivate *priv; +- EShellSettings *shell_settings; +- EShell *shell; + + priv = TASK_EDITOR_GET_PRIVATE (object); + +- shell = comp_editor_get_shell (COMP_EDITOR (object)); +- shell_settings = e_shell_get_shell_settings (shell); +- + e_binding_new ( + object, "client", + priv->model, "client"); +- +- e_binding_new ( +- shell_settings, "cal-free-busy-template", +- priv->model, "free-busy-template"); +- +- e_binding_new ( +- shell_settings, "cal-timezone", +- priv->model, "timezone"); + } + + static void +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/dialogs/task-page.c evolution-2.30.2.new//calendar/gui/dialogs/task-page.c +--- evolution-2.30.2//calendar/gui/dialogs/task-page.c 2010-06-20 14:14:57.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/dialogs/task-page.c 2010-06-22 13:37:26.736114033 +0200 +@@ -1363,10 +1363,8 @@ + + /* Glade's visibility flag doesn't seem to work for custom widgets */ + priv->due_date = e_builder_get_widget (priv->builder, "due-date"); +- comp_editor_bind_date_edit_settings (priv->due_date, NULL); + gtk_widget_show (priv->due_date); + priv->start_date = e_builder_get_widget (priv->builder, "start-date"); +- comp_editor_bind_date_edit_settings (priv->start_date, NULL); + gtk_widget_show (priv->start_date); + + priv->timezone = e_builder_get_widget (priv->builder, "timezone"); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/e-calendar-view.c evolution-2.30.2.new//calendar/gui/e-calendar-view.c +--- evolution-2.30.2//calendar/gui/e-calendar-view.c 2010-06-20 14:14:54.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/e-calendar-view.c 2010-06-22 13:37:26.736114033 +0200 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -104,7 +105,9 @@ + + static void calendar_view_selectable_init (ESelectableInterface *interface); + +-G_DEFINE_ABSTRACT_TYPE_WITH_CODE (ECalendarView, e_calendar_view, GTK_TYPE_TABLE, ++G_DEFINE_ABSTRACT_TYPE_WITH_CODE ( ++ ECalendarView, e_calendar_view, GTK_TYPE_TABLE, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL) + G_IMPLEMENT_INTERFACE (E_TYPE_SELECTABLE, calendar_view_selectable_init)); + + static void +@@ -873,6 +876,8 @@ + target_list = gtk_target_list_new (NULL, 0); + e_target_list_add_calendar_targets (target_list, 0); + calendar_view->priv->paste_target_list = target_list; ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (calendar_view)); + } + + static void +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/e-cal-model.c evolution-2.30.2.new//calendar/gui/e-cal-model.c +--- evolution-2.30.2//calendar/gui/e-cal-model.c 2010-06-20 14:14:53.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/e-cal-model.c 2010-06-22 13:37:26.740114033 +0200 +@@ -35,7 +35,7 @@ + #include "e-cal-model.h" + #include "itip-utils.h" + #include "misc.h" +-#include "e-util/e-binding.h" ++#include "e-util/e-extensible.h" + #include "e-util/e-util.h" + + #define E_CAL_MODEL_GET_PRIVATE(obj) \ +@@ -54,8 +54,6 @@ + } ECalModelClient; + + struct _ECalModelPrivate { +- EShellSettings *shell_settings; +- + /* The list of clients we are managing. Each element is of type ECalModelClient */ + GList *clients; + +@@ -128,7 +126,6 @@ + enum { + PROP_0, + PROP_DEFAULT_CLIENT, +- PROP_SHELL_SETTINGS, + PROP_TIMEZONE, + PROP_USE_24_HOUR_FORMAT, + PROP_WEEK_START_DAY +@@ -148,17 +145,9 @@ + static gpointer parent_class; + static guint signals[LAST_SIGNAL]; + +-G_DEFINE_TYPE (ECalModel, e_cal_model, E_TABLE_MODEL_TYPE) +- +-static void +-cal_model_set_shell_settings (ECalModel *cal_model, +- EShellSettings *shell_settings) +-{ +- g_return_if_fail (E_IS_SHELL_SETTINGS (shell_settings)); +- g_return_if_fail (cal_model->priv->shell_settings == NULL); +- +- cal_model->priv->shell_settings = g_object_ref (shell_settings); +-} ++G_DEFINE_TYPE_WITH_CODE ( ++ ECalModel, e_cal_model, E_TABLE_MODEL_TYPE, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) + + static void + cal_model_set_property (GObject *object, +@@ -173,12 +162,6 @@ + g_value_get_object (value)); + return; + +- case PROP_SHELL_SETTINGS: +- cal_model_set_shell_settings ( +- E_CAL_MODEL (object), +- g_value_get_object (value)); +- return; +- + case PROP_TIMEZONE: + e_cal_model_set_timezone ( + E_CAL_MODEL (object), +@@ -215,13 +198,6 @@ + E_CAL_MODEL (object))); + return; + +- case PROP_SHELL_SETTINGS: +- g_value_set_object ( +- value, +- e_cal_model_get_shell_settings ( +- E_CAL_MODEL (object))); +- return; +- + case PROP_TIMEZONE: + g_value_set_pointer ( + value, +@@ -254,11 +230,6 @@ + + priv = E_CAL_MODEL_GET_PRIVATE (object); + +- if (priv->shell_settings != NULL) { +- g_object_unref (priv->shell_settings); +- priv->shell_settings = NULL; +- } +- + if (priv->clients) { + while (priv->clients != NULL) { + ECalModelClient *client_data = (ECalModelClient *) priv->clients->data; +@@ -317,28 +288,6 @@ + } + + static void +-cal_model_constructed (GObject *object) +-{ +- ECalModel *model; +- EShellSettings *shell_settings; +- +- model = E_CAL_MODEL (object); +- shell_settings = e_cal_model_get_shell_settings (model); +- +- e_binding_new ( +- shell_settings, "cal-timezone", +- model, "timezone"); +- +- e_binding_new ( +- shell_settings, "cal-use-24-hour-format", +- model, "use-24-hour-format"); +- +- e_binding_new ( +- shell_settings, "cal-week-start-day", +- model, "week-start-day"); +-} +- +-static void + e_cal_model_class_init (ECalModelClass *class) + { + GObjectClass *object_class; +@@ -352,7 +301,6 @@ + object_class->get_property = cal_model_get_property; + object_class->dispose = cal_model_dispose; + object_class->finalize = cal_model_finalize; +- object_class->constructed = cal_model_constructed; + + etm_class = E_TABLE_MODEL_CLASS (class); + etm_class->column_count = ecm_column_count; +@@ -382,17 +330,6 @@ + + g_object_class_install_property ( + object_class, +- PROP_SHELL_SETTINGS, +- g_param_spec_object ( +- "shell-settings", +- _("Shell Settings"), +- _("Application-wide settings"), +- E_TYPE_SHELL_SETTINGS, +- G_PARAM_READWRITE | +- G_PARAM_CONSTRUCT_ONLY)); +- +- g_object_class_install_property ( +- object_class, + PROP_TIMEZONE, + g_param_spec_pointer ( + "timezone", +@@ -513,6 +450,8 @@ + model->priv->notify_modified = NULL; + model->priv->notify_removed = NULL; + model->priv->notify_lock = g_mutex_new (); ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (model)); + } + + /* ETableModel methods */ +@@ -1387,14 +1326,6 @@ + return assigned_colors[first_empty].color; + } + +-EShellSettings * +-e_cal_model_get_shell_settings (ECalModel *model) +-{ +- g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL); +- +- return model->priv->shell_settings; +-} +- + icalcomponent_kind + e_cal_model_get_component_kind (ECalModel *model) + { +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/e-cal-model-calendar.c evolution-2.30.2.new//calendar/gui/e-cal-model-calendar.c +--- evolution-2.30.2//calendar/gui/e-cal-model-calendar.c 2010-06-20 14:14:52.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/e-cal-model-calendar.c 2010-06-22 13:37:26.740114033 +0200 +@@ -525,11 +525,7 @@ + * e_cal_model_calendar_new + */ + ECalModel * +-e_cal_model_calendar_new (EShellSettings *shell_settings) ++e_cal_model_calendar_new (void) + { +- g_return_val_if_fail (E_IS_SHELL_SETTINGS (shell_settings), NULL); +- +- return g_object_new ( +- E_TYPE_CAL_MODEL_CALENDAR, +- "shell-settings", shell_settings, NULL); ++ return g_object_new (E_TYPE_CAL_MODEL_CALENDAR, NULL); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/e-cal-model-calendar.h evolution-2.30.2.new//calendar/gui/e-cal-model-calendar.h +--- evolution-2.30.2//calendar/gui/e-cal-model-calendar.h 2010-06-20 14:14:55.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/e-cal-model-calendar.h 2010-06-22 13:37:26.740114033 +0200 +@@ -71,8 +71,8 @@ + ECalModelClass parent_class; + }; + +-GType e_cal_model_calendar_get_type (void); +-ECalModel * e_cal_model_calendar_new (EShellSettings *shell_settings); ++GType e_cal_model_calendar_get_type (void); ++ECalModel * e_cal_model_calendar_new (void); + + G_END_DECLS + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/e-cal-model.h evolution-2.30.2.new//calendar/gui/e-cal-model.h +--- evolution-2.30.2//calendar/gui/e-cal-model.h 2010-06-20 14:14:56.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/e-cal-model.h 2010-06-22 13:37:26.740114033 +0200 +@@ -29,7 +29,6 @@ + #include
+ #include + #include "e-cell-date-edit-text.h" +-#include + + /* Standard GObject macros */ + #define E_TYPE_CAL_MODEL \ +@@ -176,7 +175,6 @@ + + GType e_cal_model_get_type (void); + GType e_cal_model_component_get_type (void); +-EShellSettings *e_cal_model_get_shell_settings (ECalModel *model); + icalcomponent_kind + e_cal_model_get_component_kind (ECalModel *model); + void e_cal_model_set_component_kind (ECalModel *model, +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/e-cal-model-memos.c evolution-2.30.2.new//calendar/gui/e-cal-model-memos.c +--- evolution-2.30.2//calendar/gui/e-cal-model-memos.c 2010-06-20 14:14:52.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/e-cal-model-memos.c 2010-06-22 13:37:26.740114033 +0200 +@@ -261,11 +261,7 @@ + * e_cal_model_memos_new + */ + ECalModel * +-e_cal_model_memos_new (EShellSettings *shell_settings) ++e_cal_model_memos_new (void) + { +- g_return_val_if_fail (E_IS_SHELL_SETTINGS (shell_settings), NULL); +- +- return g_object_new ( +- E_TYPE_CAL_MODEL_MEMOS, +- "shell-settings", shell_settings, NULL); ++ return g_object_new (E_TYPE_CAL_MODEL_MEMOS, NULL); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/e-cal-model-memos.h evolution-2.30.2.new//calendar/gui/e-cal-model-memos.h +--- evolution-2.30.2//calendar/gui/e-cal-model-memos.h 2010-06-20 14:14:53.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/e-cal-model-memos.h 2010-06-22 13:37:26.740114033 +0200 +@@ -71,7 +71,7 @@ + }; + + GType e_cal_model_memos_get_type (void); +-ECalModel * e_cal_model_memos_new (EShellSettings *shell_settings); ++ECalModel * e_cal_model_memos_new (void); + + G_END_DECLS + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/e-cal-model-tasks.c evolution-2.30.2.new//calendar/gui/e-cal-model-tasks.c +--- evolution-2.30.2//calendar/gui/e-cal-model-tasks.c 2010-06-20 14:14:55.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/e-cal-model-tasks.c 2010-06-22 13:37:26.740114033 +0200 +@@ -133,27 +133,6 @@ + } + + static void +-cal_model_tasks_constructed (GObject *object) +-{ +- ECalModel *model; +- EShellSettings *shell_settings; +- +- model = E_CAL_MODEL (object); +- shell_settings = e_cal_model_get_shell_settings (model); +- +- e_binding_new ( +- shell_settings, "cal-tasks-color-due-today", +- model, "color-due-today"); +- +- e_binding_new ( +- shell_settings, "cal-tasks-color-overdue", +- model, "color-overdue"); +- +- /* Chain up to parent's constructed() method. */ +- G_OBJECT_CLASS (e_cal_model_tasks_parent_class)->constructed (object); +-} +- +-static void + e_cal_model_tasks_class_init (ECalModelTasksClass *class) + { + GObjectClass *object_class; +@@ -166,7 +145,6 @@ + object_class->set_property = cal_model_tasks_set_property; + object_class->get_property = cal_model_tasks_get_property; + object_class->finalize = cal_model_tasks_finalize; +- object_class->constructed = cal_model_tasks_constructed; + + table_model_class = E_TABLE_MODEL_CLASS (class); + table_model_class->column_count = ecmt_column_count; +@@ -1157,13 +1135,9 @@ + } + + ECalModel * +-e_cal_model_tasks_new (EShellSettings *shell_settings) ++e_cal_model_tasks_new (void) + { +- g_return_val_if_fail (E_IS_SHELL_SETTINGS (shell_settings), NULL); +- +- return g_object_new ( +- E_TYPE_CAL_MODEL_TASKS, +- "shell-settings", shell_settings, NULL); ++ return g_object_new (E_TYPE_CAL_MODEL_TASKS, NULL); + } + + const gchar * +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/e-cal-model-tasks.h evolution-2.30.2.new//calendar/gui/e-cal-model-tasks.h +--- evolution-2.30.2//calendar/gui/e-cal-model-tasks.h 2010-06-20 14:14:52.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/e-cal-model-tasks.h 2010-06-22 13:37:26.740114033 +0200 +@@ -79,7 +79,7 @@ + }; + + GType e_cal_model_tasks_get_type (void); +-ECalModel * e_cal_model_tasks_new (EShellSettings *shell_settings); ++ECalModel * e_cal_model_tasks_new (void); + const gchar * e_cal_model_tasks_get_color_due_today + (ECalModelTasks *model); + void e_cal_model_tasks_set_color_due_today +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/e-day-view.c evolution-2.30.2.new//calendar/gui/e-day-view.c +--- evolution-2.30.2//calendar/gui/e-day-view.c 2010-06-20 14:14:55.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/e-day-view.c 2010-06-22 13:37:26.744114033 +0200 +@@ -590,56 +590,12 @@ + day_view_constructed (GObject *object) + { + ECalModel *model; +- EDayView *day_view; +- EShellSettings *shell_settings; + +- day_view = E_DAY_VIEW (object); +- model = e_calendar_view_get_model (E_CALENDAR_VIEW (day_view)); +- shell_settings = e_cal_model_get_shell_settings (model); +- +- e_binding_new ( +- shell_settings, "cal-day-view-show-week-numbers", +- day_view->week_number_label, "visible"); +- +- e_binding_new ( +- shell_settings, "cal-marcus-bains-show-line", +- day_view, "marcus-bains-show-line"); +- +- e_binding_new ( +- shell_settings, "cal-marcus-bains-day-view-color", +- day_view, "marcus-bains-day-view-color"); +- +- e_binding_new ( +- shell_settings, "cal-marcus-bains-time-bar-color", +- day_view, "marcus-bains-time-bar-color"); +- +- e_binding_new ( +- shell_settings, "cal-time-divisions", +- day_view, "mins-per-row"); +- +- e_binding_new ( +- shell_settings, "cal-work-day-end-hour", +- day_view, "work-day-end-hour"); +- +- e_binding_new ( +- shell_settings, "cal-work-day-end-minute", +- day_view, "work-day-end-minute"); +- +- e_binding_new ( +- shell_settings, "cal-work-day-start-hour", +- day_view, "work-day-start-hour"); +- +- e_binding_new ( +- shell_settings, "cal-work-day-start-minute", +- day_view, "work-day-start-minute"); +- +- e_binding_new ( +- shell_settings, "cal-working-days-bitset", +- day_view, "working-days"); ++ model = e_calendar_view_get_model (E_CALENDAR_VIEW (object)); + + g_signal_connect_swapped ( + model, "notify::week-start-day", +- G_CALLBACK (day_view_notify_week_start_day_cb), day_view); ++ G_CALLBACK (day_view_notify_week_start_day_cb), object); + } + + static void +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/e-meeting-store.c evolution-2.30.2.new//calendar/gui/e-meeting-store.c +--- evolution-2.30.2//calendar/gui/e-meeting-store.c 2010-06-20 14:14:53.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/e-meeting-store.c 2010-06-22 13:37:26.744114033 +0200 +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include "itip-utils.h" + #include "e-meeting-utils.h" + #include "e-meeting-attendee.h" +@@ -87,7 +88,13 @@ + PROP_TIMEZONE + }; + +-static gpointer parent_class; ++/* Forward Declarations */ ++static void ems_tree_model_init (GtkTreeModelIface *iface); ++ ++G_DEFINE_TYPE_WITH_CODE ( ++ EMeetingStore, e_meeting_store, GTK_TYPE_LIST_STORE, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL) ++ G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL, ems_tree_model_init)) + + static icalparameter_cutype + text_to_type (const gchar *type) +@@ -624,15 +631,14 @@ + g_mutex_free (priv->mutex); + + /* Chain up to parent's finalize() method. */ +- G_OBJECT_CLASS (parent_class)->finalize (object); ++ G_OBJECT_CLASS (e_meeting_store_parent_class)->finalize (object); + } + + static void +-meeting_store_class_init (GObjectClass *class) ++e_meeting_store_class_init (EMeetingStoreClass *class) + { + GObjectClass *object_class; + +- parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (class, sizeof (EMeetingStorePrivate)); + + object_class = G_OBJECT_CLASS (class); +@@ -671,7 +677,7 @@ + } + + static void +-meeting_store_init (EMeetingStore *store) ++e_meeting_store_init (EMeetingStore *store) + { + store->priv = E_MEETING_STORE_GET_PRIVATE (store); + +@@ -682,41 +688,8 @@ + store->priv->mutex = g_mutex_new (); + + store->priv->num_queries = 0; +-} +- +-GType +-e_meeting_store_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) { +- static const GTypeInfo type_info = { +- sizeof (EMeetingStoreClass), +- (GBaseInitFunc) NULL, +- (GBaseFinalizeFunc) NULL, +- (GClassInitFunc) meeting_store_class_init, +- (GClassFinalizeFunc) NULL, +- NULL, /* class_data */ +- sizeof (EMeetingStore), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) meeting_store_init, +- NULL /* value_table */ +- }; +- +- static const GInterfaceInfo tree_model_info = { +- (GInterfaceInitFunc) ems_tree_model_init, +- NULL, +- NULL +- }; +- +- type = g_type_register_static ( +- GTK_TYPE_LIST_STORE, "EMeetingStore", &type_info, 0); +- +- g_type_add_interface_static ( +- type, GTK_TYPE_TREE_MODEL, &tree_model_info); +- } + +- return type; ++ e_extensible_load_extensions (E_EXTENSIBLE (store)); + } + + GObject * +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/e-meeting-time-sel.c evolution-2.30.2.new//calendar/gui/e-meeting-time-sel.c +--- evolution-2.30.2//calendar/gui/e-meeting-time-sel.c 2010-06-20 14:14:54.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/e-meeting-time-sel.c 2010-06-22 13:37:26.744114033 +0200 +@@ -40,6 +40,7 @@ + + #include "misc/e-dateedit.h" + #include "e-util/e-binding.h" ++#include "e-util/e-extensible.h" + #include "e-util/e-util.h" + + #include "e-meeting-utils.h" +@@ -203,7 +204,9 @@ + + static void free_busy_template_changed_cb (EMeetingTimeSelector *mts); + +-G_DEFINE_TYPE (EMeetingTimeSelector, e_meeting_time_selector, GTK_TYPE_TABLE) ++G_DEFINE_TYPE_WITH_CODE ( ++ EMeetingTimeSelector, e_meeting_time_selector, GTK_TYPE_TABLE, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) + + static void + meeting_time_selector_set_property (GObject *object, +@@ -391,6 +394,8 @@ + + mts->fb_refresh_not = 0; + mts->style_change_idle_id = 0; ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (mts)); + } + + void +@@ -1415,6 +1420,10 @@ + GdkCursor *cursor; + GdkWindow *window; + ++ /* nothing to refresh, lets not leak a busy cursor */ ++ if (e_meeting_store_count_actual_attendees (mts->model) <= 0) ++ return; ++ + start = mts->meeting_start_time; + g_date_subtract_days (&start.date, E_MEETING_TIME_SELECTOR_FB_DAYS_BEFORE); + start.hour = 0; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/e-week-view.c evolution-2.30.2.new//calendar/gui/e-week-view.c +--- evolution-2.30.2//calendar/gui/e-week-view.c 2010-06-20 14:14:56.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/e-week-view.c 2010-06-22 13:37:26.744114033 +0200 +@@ -523,19 +523,9 @@ + { + ECalModel *model; + ECalendarView *calendar_view; +- EShellSettings *shell_settings; + + calendar_view = E_CALENDAR_VIEW (object); + model = e_calendar_view_get_model (calendar_view); +- shell_settings = e_cal_model_get_shell_settings (model); +- +- e_binding_new ( +- shell_settings, "cal-compress-weekend", +- object, "compress-weekend"); +- +- e_binding_new ( +- shell_settings, "cal-show-event-end-times", +- object, "show-event-end-times"); + + g_signal_connect_swapped ( + model, "notify::week-start-day", +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/gnome-cal.c evolution-2.30.2.new//calendar/gui/gnome-cal.c +--- evolution-2.30.2//calendar/gui/gnome-cal.c 2010-06-20 14:14:53.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/gnome-cal.c 2010-06-22 13:37:26.748114033 +0200 +@@ -76,8 +76,6 @@ + + /* Private part of the GnomeCalendar structure */ + struct _GnomeCalendarPrivate { +- EShellSettings *shell_settings; +- + ECalModel *model; + + /* +@@ -329,16 +327,6 @@ + } + + static void +-gnome_calendar_set_shell_settings (GnomeCalendar *gcal, +- EShellSettings *shell_settings) +-{ +- g_return_if_fail (E_IS_SHELL_SETTINGS (shell_settings)); +- g_return_if_fail (gcal->priv->shell_settings == NULL); +- +- gcal->priv->shell_settings = g_object_ref (shell_settings); +-} +- +-static void + gnome_calendar_set_property (GObject *object, + guint property_id, + const GValue *value, +@@ -351,12 +339,6 @@ + g_value_get_object (value)); + return; + +- case PROP_SHELL_SETTINGS: +- gnome_calendar_set_shell_settings ( +- GNOME_CALENDAR (object), +- g_value_get_object (value)); +- return; +- + case PROP_VIEW: + gnome_calendar_set_view ( + GNOME_CALENDAR (object), +@@ -392,12 +374,6 @@ + GNOME_CALENDAR (object))); + return; + +- case PROP_SHELL_SETTINGS: +- g_value_set_object ( +- value, gnome_calendar_get_shell_settings ( +- GNOME_CALENDAR (object))); +- return; +- + case PROP_VIEW: + g_value_set_int ( + value, gnome_calendar_get_view ( +@@ -424,15 +400,12 @@ + gnome_calendar_constructed (GObject *object) + { + GnomeCalendar *gcal = GNOME_CALENDAR (object); +- EShellSettings *shell_settings; + ECalendarView *calendar_view; + ECalModel *model; + GtkAdjustment *adjustment; + +- shell_settings = gnome_calendar_get_shell_settings (gcal); +- + /* Create the model for the views. */ +- model = e_cal_model_calendar_new (shell_settings); ++ model = e_cal_model_calendar_new (); + e_cal_model_set_flags (model, E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES); + gcal->priv->model = model; + +@@ -545,17 +518,6 @@ + + g_object_class_install_property ( + object_class, +- PROP_SHELL_SETTINGS, +- g_param_spec_object ( +- "shell-settings", +- _("Shell Settings"), +- _("Application-wide settings"), +- E_TYPE_SHELL_SETTINGS, +- G_PARAM_READWRITE | +- G_PARAM_CONSTRUCT_ONLY)); +- +- g_object_class_install_property ( +- object_class, + PROP_VIEW, + g_param_spec_int ( + "view", +@@ -1461,7 +1423,7 @@ + priv->todo_update_lock = g_mutex_new (); + priv->dn_query_lock = g_mutex_new (); + +- priv->current_view_type = GNOME_CAL_DAY_VIEW; ++ priv->current_view_type = GNOME_CAL_WORK_WEEK_VIEW; + priv->range_selected = FALSE; + priv->lview_select_daten_range = TRUE; + +@@ -1490,11 +1452,6 @@ + gcal = GNOME_CALENDAR (object); + priv = gcal->priv; + +- if (priv->shell_settings != NULL) { +- g_object_unref (priv->shell_settings); +- priv->shell_settings = NULL; +- } +- + if (priv->model != NULL) { + g_signal_handlers_disconnect_by_func ( + priv->model, view_progress_cb, gcal); +@@ -1904,21 +1861,9 @@ + } + + GtkWidget * +-gnome_calendar_new (EShellSettings *shell_settings) ++gnome_calendar_new (void) + { +- g_return_val_if_fail (E_IS_SHELL_SETTINGS (shell_settings), NULL); +- +- return g_object_new ( +- GNOME_TYPE_CALENDAR, +- "shell-settings", shell_settings, NULL); +-} +- +-EShellSettings * +-gnome_calendar_get_shell_settings (GnomeCalendar *gcal) +-{ +- g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL); +- +- return gcal->priv->shell_settings; ++ return g_object_new (GNOME_TYPE_CALENDAR, NULL); + } + + ECalendar * +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//calendar/gui/gnome-cal.h evolution-2.30.2.new//calendar/gui/gnome-cal.h +--- evolution-2.30.2//calendar/gui/gnome-cal.h 2010-06-20 14:14:52.000000000 +0200 ++++ evolution-2.30.2.new//calendar/gui/gnome-cal.h 2010-06-22 13:37:26.748114033 +0200 +@@ -31,7 +31,6 @@ + #include + #include + #include +-#include + + #include "e-cal-model.h" + +@@ -113,10 +112,8 @@ + }; + + GType gnome_calendar_get_type (void); +-GtkWidget * gnome_calendar_new (EShellSettings *shell_settings); ++GtkWidget * gnome_calendar_new (void); + void gnome_calendar_dispose (GnomeCalendar *gcal); +-EShellSettings *gnome_calendar_get_shell_settings +- (GnomeCalendar *gcal); + ECalendar * gnome_calendar_get_date_navigator + (GnomeCalendar *gcal); + void gnome_calendar_set_date_navigator +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-account-view.c evolution-2.30.2.new//capplet/settings/mail-account-view.c +--- evolution-2.30.2//capplet/settings/mail-account-view.c 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.2.new//capplet/settings/mail-account-view.c 2010-06-22 13:37:26.748114033 +0200 +@@ -26,14 +26,31 @@ + + #include + #include "mail-account-view.h" ++#include ++#include ++#include + #include + #include "mail-view.h" + #include "e-util/e-config.h" + #include "mail/mail-config.h" ++#include "mail/mail-session.h" + #include "mail-guess-servers.h" + + struct _MailAccountViewPrivate { + GtkWidget *tab_str; ++ ++ GtkWidget *calendar; ++ GtkWidget *gcontacts; ++ GtkWidget *gmail_info_label; ++ ++ gboolean is_gmail; ++ gboolean is_yahoo; ++ gboolean do_gcontacts; ++ gboolean do_calendar; ++ ++ gchar *username; ++ ++ GtkWidget *yahoo_cal_entry; + }; + + G_DEFINE_TYPE (MailAccountView, mail_account_view, GTK_TYPE_VBOX) +@@ -47,6 +64,7 @@ + ERROR_NO_FULLNAME = 1, + ERROR_NO_EMAIL = 2, + ERROR_INVALID_EMAIL = 3, ++ ERROR_NO_PASSWORD = 4, + }; + + struct _dialog_errors { +@@ -56,6 +74,7 @@ + { ERROR_NO_FULLNAME, N_("Please enter your full name.") }, + { ERROR_NO_EMAIL, N_("Please enter your email address.") }, + { ERROR_INVALID_EMAIL, N_("The email address you have entered is invalid.") }, ++ { ERROR_NO_PASSWORD, N_("Please enter your password.") } + }; + static guint signals[LAST_SIGNAL] = { 0 }; + +@@ -64,12 +83,17 @@ + { + shell->priv = g_new0(MailAccountViewPrivate, 1); + ++ shell->priv->is_gmail = FALSE; ++ shell->priv->is_yahoo = FALSE; ++ shell->priv->username = NULL; + } + + static void + mail_account_view_finalize (GObject *object) + { +- /*MailAccountView *shell = (MailAccountView *)object;*/ ++ MailAccountView *shell = (MailAccountView *)object; ++ ++ g_free(shell->priv->username); + + G_OBJECT_CLASS (mail_account_view_parent_class)->finalize (object); + } +@@ -136,11 +160,17 @@ + gchar *user = (gchar *)e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_ID_NAME); + gchar *email = (gchar *)e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_ID_ADDRESS); + gchar *tmp; ++ const gchar *pwd = gtk_entry_get_text ((GtkEntry *)view->password); + + if (!user || !*user) + return ERROR_NO_FULLNAME; + if (!email || !*email) + return ERROR_NO_EMAIL; ++ if (view->original) /* We don't query/store pwd on edit. */ ++ return 0; ++ if (!pwd || !*pwd) ++ return ERROR_NO_PASSWORD; ++ + tmp = strchr(email, '@'); + if (!tmp || tmp[1] == 0) + return ERROR_INVALID_EMAIL; +@@ -162,6 +192,258 @@ + #define PACK_BOX(w) box = gtk_hbox_new(FALSE, 0); gtk_box_pack_start((GtkBox *)box, w, FALSE, FALSE, 12); gtk_widget_show(box); + #define PACK_BOXF(w) box = gtk_hbox_new(FALSE, 0); gtk_box_pack_start((GtkBox *)box, w, FALSE, FALSE, 0); gtk_widget_show(box); + ++#define CALENDAR_CALDAV_URI "caldav://%s@www.google.com/calendar/dav/%s/events" ++#define GMAIL_CALENDAR_LOCATION "://www.google.com/calendar/feeds/" ++#define CALENDAR_DEFAULT_PATH "/private/full" ++#define SELECTED_CALENDARS "/apps/evolution/calendar/display/selected_calendars" ++#define YAHOO_CALENDAR_LOCATION "%s@caldav.calendar.yahoo.com/dav/%s/Calendar/%s" ++static gboolean ++is_email (const gchar *address) ++{ ++ /* This is supposed to check if the address's domain could be ++ an FQDN but alas, it's not worth the pain and suffering. */ ++ const gchar *at; ++ ++ at = strchr (address, '@'); ++ /* make sure we have an '@' and that it's not the first or last gchar */ ++ if (!at || at == address || *(at + 1) == '\0') ++ return FALSE; ++ ++ return TRUE; ++} ++ ++static gchar * ++sanitize_user_mail (const gchar *user) ++{ ++ if (!user) ++ return NULL; ++ ++ if (strstr (user, "%40") != NULL) { ++ return g_strdup (user); ++ } else if (!is_email (user)) { ++ return g_strconcat (user, "%40gmail.com", NULL); ++ } else { ++ gchar *tmp = g_malloc0 (sizeof (gchar) * (1 + strlen (user) + 2)); ++ gchar *at = strchr (user, '@'); ++ ++ strncpy (tmp, user, at - user); ++ strcat (tmp, "%40"); ++ strcat (tmp, at + 1); ++ ++ return tmp; ++ } ++} ++ ++static void ++setup_yahoo_account (MailAccountView *mav) ++{ ++ GConfClient *gconf = gconf_client_get_default (); ++ ++ mav->priv->do_gcontacts = gtk_toggle_button_get_active((GtkToggleButton *)mav->priv->gcontacts); ++ mav->priv->do_calendar = gtk_toggle_button_get_active((GtkToggleButton *)mav->priv->calendar); ++ ++ if (mav->priv->do_calendar) { ++ ESourceList *slist; ++ ESourceGroup *sgrp; ++ ESource *calendar; ++ gchar *sanitize_uname, *abs_uri, *rel_uri; ++ GSList *ids, *temp; ++ const gchar *email = e_account_get_string(em_account_editor_get_modified_account(mav->edit), E_ACCOUNT_ID_ADDRESS); ++ ++ slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources"); ++ sgrp = e_source_list_peek_group_by_base_uri (slist, "caldav://"); ++ if (!sgrp) { ++ sgrp = e_source_list_ensure_group (slist, _("CalDAV"), "caldav://", TRUE); ++ } ++ ++ printf("Setting up Yahoo Calendar: list:%p CalDAVGrp: %p\n", slist, sgrp); ++ ++ /* FIXME: Not sure if we should localize 'Calendar' */ ++ calendar = e_source_new ("Yahoo", ""); ++ e_source_set_property (calendar, "ssl", "1"); ++ e_source_set_property (calendar, "refresh", "30"); ++ e_source_set_property (calendar, "refresh-type", "0"); ++ e_source_set_property (calendar, "auth", "1"); ++ e_source_set_property (calendar, "offline_sync", "1"); ++ e_source_set_property (calendar, "username", email); ++ e_source_set_property (calendar, "default", "true"); ++ e_source_set_property (calendar, "alarm", "true"); ++ ++ e_source_set_readonly (calendar, FALSE); ++ ++ sanitize_uname = sanitize_user_mail (email); ++ ++ abs_uri = g_strdup_printf ("caldav://%s@caldav.calendar.yahoo.com/dav/%s/Calendar/%s/", sanitize_uname, email, gtk_entry_get_text((GtkEntry *)mav->priv->yahoo_cal_entry)); ++ e_passwords_add_password (abs_uri, gtk_entry_get_text((GtkEntry *)mav->password)); ++ e_passwords_remember_password ("Calendar", abs_uri); ++ ++ rel_uri = g_strdup_printf (YAHOO_CALENDAR_LOCATION, sanitize_uname, email, gtk_entry_get_text((GtkEntry *)mav->priv->yahoo_cal_entry)); ++ e_source_set_relative_uri (calendar, rel_uri); ++ ++ e_source_group_add_source (sgrp, calendar, -1); ++ e_source_list_sync (slist, NULL); ++ ++ ids = gconf_client_get_list (gconf, SELECTED_CALENDARS, GCONF_VALUE_STRING, NULL); ++ ids = g_slist_append (ids, g_strdup (e_source_peek_uid (calendar))); ++ gconf_client_set_list (gconf, SELECTED_CALENDARS, GCONF_VALUE_STRING, ids, NULL); ++ temp = ids; ++ ++ for (; temp != NULL; temp = g_slist_next (temp)) ++ g_free (temp->data); ++ g_slist_free (ids); ++ ++ g_free(abs_uri); ++ g_free(rel_uri); ++ g_free(sanitize_uname); ++ g_object_unref(slist); ++ g_object_unref(sgrp); ++ g_object_unref(calendar); ++ } else ++ printf("Not setting up Yahoo Calendar\n"); ++ ++ if (mav->priv->do_gcontacts) { ++ ESourceList *slist; ++ ESourceGroup *sgrp; ++ ESource *abook; ++ gchar *rel_uri;; ++ ++ slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/addressbook/sources" ); ++ ++ sgrp = e_source_list_peek_group_by_base_uri (slist, "google://"); ++ ++ /* FIXME: Not sure if we should localize 'Contacts' */ ++ abook = e_source_new ("Contacts", ""); ++ e_source_set_property (abook, "default", "true"); ++ e_source_set_property (abook, "offline_sync", "1"); ++ e_source_set_property (abook, "auth", "plain/password"); ++ e_source_set_property (abook, "use-ssl", "true"); ++ e_source_set_property (abook, "remember_password", "true"); ++ e_source_set_property (abook, "refresh-interval", "86400"); ++ e_source_set_property (abook, "completion", "true"); ++ e_source_set_property (abook, "username", mav->priv->username); ++ e_source_set_relative_uri (abook, mav->priv->username); ++ ++ rel_uri = g_strdup_printf("google://%s/", mav->priv->username); ++ e_passwords_add_password (rel_uri, gtk_entry_get_text((GtkEntry *)mav->password)); ++ e_passwords_remember_password ("Addressbook", rel_uri); ++ e_source_group_add_source (sgrp, abook, -1); ++ e_source_list_sync (slist, NULL); ++ ++ g_free(rel_uri); ++ g_object_unref(slist); ++ g_object_unref(sgrp); ++ g_object_unref(abook); ++ ++ } ++ ++ g_object_unref (gconf); ++} ++ ++static void ++setup_google_accounts (MailAccountView *mav) ++{ ++ GConfClient *gconf = gconf_client_get_default (); ++ ++ mav->priv->do_gcontacts = gtk_toggle_button_get_active((GtkToggleButton *)mav->priv->gcontacts); ++ mav->priv->do_calendar = gtk_toggle_button_get_active((GtkToggleButton *)mav->priv->calendar); ++ ++ if (mav->priv->do_calendar) { ++ ESourceList *slist; ++ ESourceGroup *sgrp; ++ ESource *calendar; ++ gchar *sanitize_uname, *abs_uri, *rel_uri; ++ GSList *ids, *temp; ++ ++ slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/calendar/sources"); ++ sgrp = e_source_list_peek_group_by_base_uri (slist, "google://"); ++ if (!sgrp) { ++ sgrp = e_source_list_ensure_group (slist, _("Google"), "google://", TRUE); ++ } ++ ++ printf("Setting up Google Calendar: list:%p GoogleGrp: %p\n", slist, sgrp); ++ ++ /* FIXME: Not sure if we should localize 'Calendar' */ ++ calendar = e_source_new ("Calendar", ""); ++ e_source_set_property (calendar, "ssl", "1"); ++ e_source_set_property (calendar, "refresh", "30"); ++ e_source_set_property (calendar, "auth", "1"); ++ e_source_set_property (calendar, "offline_sync", "1"); ++ e_source_set_property (calendar, "username", mav->priv->username); ++ e_source_set_property (calendar, "setup-username", mav->priv->username); ++ e_source_set_property (calendar, "default", "true"); ++ e_source_set_readonly (calendar, FALSE); ++ ++ sanitize_uname = sanitize_user_mail (mav->priv->username); ++ ++ abs_uri = g_strdup_printf (CALENDAR_CALDAV_URI, sanitize_uname, mav->priv->username); ++ e_source_set_absolute_uri (calendar, abs_uri); ++ ++ e_passwords_add_password (abs_uri, gtk_entry_get_text((GtkEntry *)mav->password)); ++ e_passwords_remember_password ("Calendar", abs_uri); ++ rel_uri = g_strconcat ("https", GMAIL_CALENDAR_LOCATION, sanitize_uname, CALENDAR_DEFAULT_PATH, NULL); ++ e_source_set_relative_uri (calendar, rel_uri); ++ ++ e_source_group_add_source (sgrp, calendar, -1); ++ e_source_list_sync (slist, NULL); ++ ++ ids = gconf_client_get_list (gconf, SELECTED_CALENDARS, GCONF_VALUE_STRING, NULL); ++ ids = g_slist_append (ids, g_strdup (e_source_peek_uid (calendar))); ++ gconf_client_set_list (gconf, SELECTED_CALENDARS, GCONF_VALUE_STRING, ids, NULL); ++ temp = ids; ++ ++ for (; temp != NULL; temp = g_slist_next (temp)) ++ g_free (temp->data); ++ g_slist_free (ids); ++ ++ g_free(abs_uri); ++ g_free(rel_uri); ++ g_free(sanitize_uname); ++ g_object_unref(slist); ++ g_object_unref(sgrp); ++ g_object_unref(calendar); ++ } else ++ printf("Not setting up Google Calendar\n"); ++ ++ if (mav->priv->do_gcontacts) { ++ ESourceList *slist; ++ ESourceGroup *sgrp; ++ ESource *abook; ++ gchar *rel_uri;; ++ ++ slist = e_source_list_new_for_gconf (gconf, "/apps/evolution/addressbook/sources" ); ++ ++ sgrp = e_source_list_peek_group_by_base_uri (slist, "google://"); ++ ++ /* FIXME: Not sure if we should localize 'Contacts' */ ++ abook = e_source_new ("Contacts", ""); ++ e_source_set_property (abook, "default", "true"); ++ e_source_set_property (abook, "offline_sync", "1"); ++ e_source_set_property (abook, "auth", "plain/password"); ++ e_source_set_property (abook, "use-ssl", "true"); ++ e_source_set_property (abook, "remember_password", "true"); ++ e_source_set_property (abook, "refresh-interval", "86400"); ++ e_source_set_property (abook, "completion", "true"); ++ e_source_set_property (abook, "username", mav->priv->username); ++ e_source_set_relative_uri (abook, mav->priv->username); ++ ++ rel_uri = g_strdup_printf("google://%s/", mav->priv->username); ++ e_passwords_add_password (rel_uri, gtk_entry_get_text((GtkEntry *)mav->password)); ++ e_passwords_remember_password ("Addressbook", rel_uri); ++ e_source_group_add_source (sgrp, abook, -1); ++ e_source_list_sync (slist, NULL); ++ ++ g_free(rel_uri); ++ g_object_unref(slist); ++ g_object_unref(sgrp); ++ g_object_unref(abook); ++ ++ } ++ ++ g_object_unref (gconf); ++} ++ ++#define INDENTATION 10 ++ + static GtkWidget * + create_review (MailAccountView *view) + { +@@ -181,124 +463,115 @@ + gtk_label_set_markup ((GtkLabel *)label, _("Personal details:")); + gtk_widget_show (label); + PACK_BOXF(label) +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + + label = gtk_label_new (_("Name:")); + gtk_widget_show (label); + PACK_BOX(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + entry = gtk_label_new(e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_ID_NAME)); + gtk_widget_show(entry); + PACK_BOX(entry) +- gtk_table_attach ((GtkTable *)table, box, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + + label = gtk_label_new (_("Email address:")); + gtk_widget_show (label); + PACK_BOX(label) +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + entry = gtk_label_new (e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_ID_ADDRESS)); + gtk_widget_show(entry); + PACK_BOX(entry) +- gtk_table_attach ((GtkTable *)table, box, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); ++ ++ label = gtk_label_new (NULL); ++ gtk_label_set_markup ((GtkLabel *)label, _("Details:")); ++ gtk_widget_show (label); ++ PACK_BOXF(label); ++ gtk_table_attach ((GtkTable *)table, box, 0, 1, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + + label = gtk_label_new (NULL); +- gtk_label_set_markup ((GtkLabel *)label, _("Receiving details:")); ++ gtk_label_set_markup ((GtkLabel *)label, _("Receiving")); + gtk_widget_show (label); + PACK_BOXF(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + + label = gtk_label_new (_("Server type:")); + gtk_widget_show (label); + PACK_BOX(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 0, 1, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + entry = gtk_label_new (url->protocol); + gtk_widget_show(entry); + PACK_BOX(entry) +- gtk_table_attach ((GtkTable *)table, box, 1, 2, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 1, 2, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + + label = gtk_label_new (_("Server address:")); + gtk_widget_show (label); + PACK_BOX(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 0, 1, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + entry = gtk_label_new (url->host); + gtk_widget_show(entry); + PACK_BOX(entry); +- gtk_table_attach ((GtkTable *)table, box, 1, 2, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 1, 2, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + + label = gtk_label_new (_("Username:")); + gtk_widget_show (label); + PACK_BOX(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 0, 1, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + entry = gtk_label_new (url->user); + gtk_widget_show(entry); + PACK_BOX(entry); +- gtk_table_attach ((GtkTable *)table, box, 1, 2, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 1, 2, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + + label = gtk_label_new (_("Use encryption:")); + gtk_widget_show (label); + PACK_BOX(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 0, 1, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + enc = (gchar *)camel_url_get_param(url, "use_ssl"); + entry = gtk_label_new (enc ? enc : _("never")); + gtk_widget_show(entry); + PACK_BOX(entry); +- gtk_table_attach ((GtkTable *)table, box, 1, 2, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 1, 2, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + ++ view->priv->username = g_strdup(url->user); + camel_url_free(url); + uri =(gchar *) e_account_get_string(em_account_editor_get_modified_account(view->edit), E_ACCOUNT_TRANSPORT_URL); + if (!uri || (url = camel_url_new(uri, NULL)) == NULL) + return NULL; + + label = gtk_label_new (NULL); +- gtk_label_set_markup ((GtkLabel *)label, _("Sending details:")); ++ gtk_label_set_markup ((GtkLabel *)label, _("Sending")); + gtk_widget_show (label); + PACK_BOXF(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 8, 9, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 2, 3, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + +- label = gtk_label_new (_("Server type:")); +- gtk_widget_show (label); +- PACK_BOX(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 9, 10, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + entry = gtk_label_new (url->protocol); + gtk_widget_show(entry); + PACK_BOX(entry) +- gtk_table_attach ((GtkTable *)table, box, 1, 2, 9, 10, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 2, 3, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + +- label = gtk_label_new (_("Server address:")); +- gtk_widget_show (label); +- PACK_BOX(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 10, 11, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + entry = gtk_label_new (url->host); + gtk_widget_show(entry); + PACK_BOX(entry); +- gtk_table_attach ((GtkTable *)table, box, 1, 2, 10, 11, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 2, 3, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + +- label = gtk_label_new (_("Username:")); +- gtk_widget_show (label); +- PACK_BOX(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 11, 12, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + entry = gtk_label_new (url->user); + gtk_widget_show(entry); + PACK_BOX(entry); +- gtk_table_attach ((GtkTable *)table, box, 1, 2, 11, 12, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 2, 3, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + +- label = gtk_label_new (_("Use encryption:")); +- gtk_widget_show (label); +- PACK_BOX(label); +- gtk_table_attach ((GtkTable *)table, box, 0, 1, 12, 13, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); + enc = (gchar *)camel_url_get_param(url, "use_ssl"); + entry = gtk_label_new (enc ? enc : _("never")); + gtk_widget_show(entry); + PACK_BOX(entry); +- gtk_table_attach ((GtkTable *)table, box, 1, 2, 12, 13, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach ((GtkTable *)table, box, 2, 3, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + + /* + label = gtk_label_new (_("Organization:")); + gtk_widget_show (label); + entry = gtk_entry_new (); + gtk_widget_show(entry); +- gtk_table_attach (table, label, 0, 1, 3, 4, GTK_SHRINK, GTK_SHRINK, 10, 3); +- gtk_table_attach (table, entry, 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3); ++ gtk_table_attach (table, label, 0, 1, 3, 4, GTK_SHRINK, GTK_SHRINK, INDENTATION, 0); ++ gtk_table_attach (table, entry, 1, 2, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, INDENTATION, 0); + */ + + gtk_widget_show(table); +@@ -378,6 +651,25 @@ + g_free(uri); + camel_url_free(url); + } ++ ++ if (!mav->original) { ++ EAccount *account = em_account_editor_get_modified_account(mav->edit); ++ CamelURL *aurl; ++ gchar *surl; ++ /* Save the password ahead of time */ ++ aurl = camel_url_new (account->source->url, NULL); ++ surl = camel_url_to_string(aurl, CAMEL_URL_HIDE_ALL); ++ e_passwords_add_password (surl, gtk_entry_get_text((GtkEntry *)mav->password)); ++ e_passwords_remember_password ("Mail", surl); ++ camel_url_free(aurl); ++ g_free(surl); ++ } ++ ++ if (mav->priv->is_gmail && !mav->original) ++ setup_google_accounts (mav); ++ else if (mav->priv->is_yahoo && !mav->original) ++ setup_yahoo_account (mav); ++ + em_account_editor_commit (mav->edit); + g_signal_emit (mav, signals[VIEW_CLOSE], 0); + return; +@@ -393,6 +685,7 @@ + if (mav->current_page == MAV_LAST - 1) { + MAVPage *page = mav->pages[mav->current_page]; + GtkWidget *tmp; ++ EAccount *account = em_account_editor_get_modified_account(mav->edit); + + if (page->main) + gtk_widget_destroy (page->main); +@@ -403,6 +696,96 @@ + gtk_box_pack_start((GtkBox *)page->main, tmp, FALSE, FALSE, 0); + gtk_widget_show(tmp); + gtk_box_pack_start((GtkBox *)page->box, page->main, FALSE, FALSE, 3); ++ ++ if (mav->priv->is_gmail) { ++ gtk_widget_destroy (mav->priv->gcontacts); ++ gtk_widget_destroy (mav->priv->calendar); ++ gtk_widget_destroy (mav->priv->gmail_info_label); ++ } else if (mav->priv->is_yahoo) { ++ gtk_widget_destroy (mav->priv->calendar); ++ gtk_widget_destroy (mav->priv->gmail_info_label); ++ gtk_widget_destroy (mav->priv->yahoo_cal_entry); ++ } ++ ++ if (mav->original == NULL && (g_strrstr(account->source->url, "gmail") || ++ g_strrstr(account->source->url, "googlemail"))) { ++ /* Google accounts*/ ++ GtkWidget *tmp; ++ mav->priv->is_gmail = TRUE; ++ ++ mav->priv->gcontacts = gtk_check_button_new_with_label (_("Setup Google contacts with Evolution")); ++ mav->priv->calendar = gtk_check_button_new_with_label (_("Setup Google calendar with Evolution")); ++ ++ gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->gcontacts, TRUE); ++ gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->calendar, TRUE); ++ ++ mav->priv->gmail_info_label = gtk_label_new (_("You may need to enable IMAP access.")); ++ gtk_label_set_selectable ((GtkLabel *)mav->priv->gmail_info_label, TRUE); ++ ++ gtk_widget_show (mav->priv->gcontacts); ++ gtk_widget_show (mav->priv->calendar); ++ gtk_widget_show (mav->priv->gmail_info_label); ++ ++ tmp = gtk_label_new (NULL); ++ gtk_label_set_markup ((GtkLabel *)tmp, _("Google account settings:")); ++ gtk_widget_show(tmp); ++ ++#define PACK_IN_BOX(wid,child,num) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child, FALSE, FALSE, num); gtk_widget_show (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); } ++ ++ PACK_IN_BOX(page->box,tmp,12); ++ PACK_IN_BOX(page->box,mav->priv->gcontacts,24); ++ PACK_IN_BOX(page->box,mav->priv->calendar,24); ++#undef PACK_IN_BOX ++#define PACK_IN_BOX(wid,child1,child2,num1,num2) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child1, FALSE, FALSE, num1); gtk_box_pack_start ((GtkBox *)tbox, child2, FALSE, FALSE, num2); gtk_widget_show_all (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); } ++ ++ PACK_IN_BOX(page->box,mav->priv->gmail_info_label,gtk_link_button_new("https://mail.google.com/mail/?ui=2&shva=1#settings/fwdandpop"), 24, 0); ++#undef PACK_IN_BOX ++ } else if (mav->original == NULL && ++ (g_strrstr(account->source->url, "yahoo.") || ++ g_strrstr(account->source->url, "ymail.") || ++ g_strrstr(account->source->url, "rocketmail."))) { ++ /* Yahoo accounts*/ ++ GtkWidget *tmp; ++ gchar *cal_name; ++ GtkWidget *tmpbox; ++ ++ mav->priv->is_yahoo = TRUE; ++ printf("Google account: %s\n", account->source->url); ++ mav->priv->calendar = gtk_check_button_new_with_label (_("Setup Yahoo calendar with Evolution")); ++ ++ gtk_toggle_button_set_active ((GtkToggleButton *)mav->priv->calendar, TRUE); ++ ++ mav->priv->gmail_info_label = gtk_label_new (_("Yahoo calendars are named as firstname_lastname. We have tried to form the calendar name. So please confirm and re-enter the calendar name if it is not correct.")); ++ gtk_label_set_selectable ((GtkLabel *)mav->priv->gmail_info_label, TRUE); ++ ++ gtk_widget_show (mav->priv->calendar); ++ gtk_widget_show (mav->priv->gmail_info_label); ++ ++ tmp = gtk_label_new (NULL); ++ gtk_label_set_markup ((GtkLabel *)tmp, _("Yahoo account settings:")); ++ gtk_widget_show(tmp); ++ ++#define PACK_IN_BOX(wid,child,num) { GtkWidget *tbox; tbox = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)tbox, child, FALSE, FALSE, num); gtk_widget_show (tbox); gtk_box_pack_start ((GtkBox *)wid, tbox, FALSE, FALSE, 0); } ++#define PACK_IN_BOX_AND_TEXT(txt, child,num) { GtkWidget *txtlbl = gtk_label_new (txt); tmpbox = gtk_hbox_new (FALSE, 12); gtk_box_pack_start ((GtkBox *)tmpbox, txtlbl, FALSE, FALSE, num); gtk_box_pack_start ((GtkBox *)tmpbox, child, FALSE, FALSE, num); gtk_widget_show_all (tmpbox);} ++ ++ PACK_IN_BOX(page->box,tmp,12); ++ PACK_IN_BOX(page->box,mav->priv->calendar,24); ++ ++ mav->priv->yahoo_cal_entry = gtk_entry_new (); ++ gtk_widget_show (mav->priv->yahoo_cal_entry); ++ PACK_IN_BOX(page->box,mav->priv->gmail_info_label, 24); ++ PACK_IN_BOX_AND_TEXT(_("Yahoo Calendar name:"), mav->priv->yahoo_cal_entry, 0); ++ PACK_IN_BOX(page->box, tmpbox, 24); ++ cal_name = g_strdup(e_account_get_string(em_account_editor_get_modified_account(mav->edit), E_ACCOUNT_ID_NAME)); ++ cal_name = g_strdelimit(cal_name, " ", '_'); ++ gtk_entry_set_text ((GtkEntry *)mav->priv->yahoo_cal_entry, cal_name); ++ g_free (cal_name); ++#undef PACK_IN_BOX ++ } else { ++ mav->priv->is_gmail = FALSE; ++ mav->priv->is_yahoo = FALSE; ++ } ++ + } + + gtk_widget_show (mav->pages[mav->current_page]->box); +@@ -509,6 +892,9 @@ + gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 0); + } + page->next = gtk_button_new (); ++ gtk_widget_set_can_default (page->next, TRUE); ++ g_signal_connect (page->next, "hierarchy-changed", ++ G_CALLBACK (gtk_widget_grab_default), NULL); + gtk_container_add ((GtkContainer *)page->next, box); + gtk_widget_show_all(page->next); + g_signal_connect(page->next, "clicked", G_CALLBACK(mav_next_pressed), view); +@@ -586,9 +972,16 @@ + } + + static void ++next_page (GtkWidget *entry, MailAccountView *mav) ++{ ++ mav_next_pressed (NULL, mav); ++} ++ ++static void + mail_account_view_construct (MailAccountView *view) + { + gint i; ++ EShell *shell; + + view->scroll = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy ((GtkScrolledWindow *)view->scroll, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); +@@ -616,8 +1009,29 @@ + em_account_editor_check (view->edit, mail_account_pages[0].path); + view->pages[0]->done = TRUE; + +- if (e_shell_get_express_mode (e_shell_get_default ())) ++ shell = e_shell_get_default (); ++ if (!shell || e_shell_get_express_mode (shell)) { ++ GtkWidget *table = em_account_editor_get_widget (view->edit, "identity_required_table"); ++ GtkWidget *label, *pwd; + gtk_widget_hide (em_account_editor_get_widget (view->edit, "identity_optional_frame")); ++ ++ if (!view->original) { ++ label = gtk_label_new (_("Password:")); ++ pwd = gtk_entry_new (); ++ gtk_entry_set_visibility ((GtkEntry *)pwd, FALSE); ++/* gtk_entry_set_activates_default ((GtkEntry *)pwd, TRUE); */ ++ g_signal_connect (pwd, "activate", G_CALLBACK (next_page), view); ++ gtk_widget_show(label); ++ gtk_widget_show(pwd); ++ gtk_table_attach ((GtkTable *)table, label, 0, 1, 2, 3, GTK_FILL, 0, 0, 0); ++ gtk_table_attach ((GtkTable *)table, pwd, 1, 2, 2, 3, GTK_FILL|GTK_EXPAND, 0, 0, 0); ++ ++ view->password = pwd; ++ } ++ } ++ ++ /* assume the full name is known from the system */ ++ gtk_widget_grab_focus (em_account_editor_get_widget (view->edit, "identity_address")); + } + + MailAccountView * +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-account-view.h evolution-2.30.2.new//capplet/settings/mail-account-view.h +--- evolution-2.30.2//capplet/settings/mail-account-view.h 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.2.new//capplet/settings/mail-account-view.h 2010-06-22 13:37:26.748114033 +0200 +@@ -75,6 +75,7 @@ + GtkWidget *wpages[6]; + gint current_page; + struct _EMAccountEditor *edit; ++ GtkWidget *password; + + MailAccountViewPrivate *priv; + } MailAccountView; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/abc.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/abc.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/abc.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/abc.plala.or.jp 2010-06-22 13:37:26.748114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ abc.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ abc.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ abc.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/agate.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/agate.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/agate.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/agate.plala.or.jp 2010-06-22 13:37:26.748114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ agate.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ agate.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ agate.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/amail.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/amail.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/amail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/amail.plala.or.jp 2010-06-22 13:37:26.748114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ amail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ amail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ amail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/amber.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/amber.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/amber.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/amber.plala.or.jp 2010-06-22 13:37:26.748114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ amber.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ amber.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ amber.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/a.memail.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/a.memail.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/a.memail.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/a.memail.jp 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,1423 @@ ++ ++ ++ ++ 007.biglobe.ne.jp ++ 2001.biglobe.ne.jp ++ 4649.biglobe.ne.jp ++ 777.biglobe.ne.jp ++ a.biglobe.ne.jp ++ a.memail.jp ++ ab.biglobe.ne.jp ++ ab.memail.jp ++ abashiri.eeyo.jp ++ abukuma.eeyo.jp ++ ace.biglobe.ne.jp ++ ace.memail.jp ++ achoo.biglobe.ne.jp ++ achoo.memail.jp ++ adachi.eeyo.jp ++ aizu.eeyo.jp ++ akan.eeyo.jp ++ aki.eeyo.jp ++ akita.eeyo.jp ++ alien.biglobe.ne.jp ++ alien.memail.jp ++ aloha.biglobe.ne.jp ++ aloha.memail.jp ++ amakusa.eeyo.jp ++ amami.eeyo.jp ++ amethyst.biglobe.ne.jp ++ amethyst.memail.jp ++ amigo.biglobe.ne.jp ++ amigo.memail.jp ++ angel.biglobe.ne.jp ++ angel.memail.jp ++ angler.biglobe.ne.jp ++ angler.memail.jp ++ aomori.eeyo.jp ++ appi.eeyo.jp ++ apricot.biglobe.ne.jp ++ apricot.memail.jp ++ aqua.biglobe.ne.jp ++ aqua.memail.jp ++ aquamarine.biglobe.ne.jp ++ aquamarine.memail.jp ++ aquarius.biglobe.ne.jp ++ aquarius.memail.jp ++ arashiyama.eeyo.jp ++ aries.biglobe.ne.jp ++ aries.memail.jp ++ arima.eeyo.jp ++ asahikawa.eeyo.jp ++ asakusa.eeyo.jp ++ asama.eeyo.jp ++ ashizuri.eeyo.jp ++ aso.eeyo.jp ++ asuka.eeyo.jp ++ atami.eeyo.jp ++ atsumi.eeyo.jp ++ autumn.biglobe.ne.jp ++ autumn.memail.jp ++ awa.eeyo.jp ++ awaji.eeyo.jp ++ ayu.biglobe.ne.jp ++ ayu.memail.jp ++ azumino.eeyo.jp ++ b.biglobe.ne.jp ++ b.memail.jp ++ bamboo.biglobe.ne.jp ++ bamboo.memail.jp ++ banana.biglobe.ne.jp ++ banana.memail.jp ++ bandai.eeyo.jp ++ baseball.biglobe.ne.jp ++ baseball.memail.jp ++ basil.biglobe.ne.jp ++ basil.memail.jp ++ basketball.biglobe.ne.jp ++ basketball.memail.jp ++ bass.biglobe.ne.jp ++ bass.memail.jp ++ bat.biglobe.ne.jp ++ bat.memail.jp ++ bazar.de.gozarre.jp ++ bcs.biglobe.ne.jp ++ bear.biglobe.ne.jp ++ bear.memail.jp ++ beat.biglobe.ne.jp ++ beat.memail.jp ++ beautiful.biglobe.ne.jp ++ beautiful.memail.jp ++ beer.biglobe.ne.jp ++ beer.memail.jp ++ believe.biglobe.ne.jp ++ believe.memail.jp ++ bell.biglobe.ne.jp ++ bell.memail.jp ++ beppu.eeyo.jp ++ bike.biglobe.ne.jp ++ bike.memail.jp ++ bingo.eeyo.jp ++ bird.biglobe.ne.jp ++ bird.memail.jp ++ bitchu.eeyo.jp ++ biwako.eeyo.jp ++ bizen.eeyo.jp ++ black.biglobe.ne.jp ++ black.memail.jp ++ blue.biglobe.ne.jp ++ blue.memail.jp ++ blues.biglobe.ne.jp ++ blues.memail.jp ++ bluesky.biglobe.ne.jp ++ bluesky.memail.jp ++ bma.biglobe.ne.jp ++ boar.biglobe.ne.jp ++ boar.memail.jp ++ bohemian.biglobe.ne.jp ++ bohemian.memail.jp ++ boso.eeyo.jp ++ bowwow.biglobe.ne.jp ++ bowwow.memail.jp ++ bqd.biglobe.ne.jp ++ bravo.biglobe.ne.jp ++ bravo.memail.jp ++ breeze.biglobe.ne.jp ++ breeze.memail.jp ++ bridge.biglobe.ne.jp ++ bridge.memail.jp ++ bro.biglobe.ne.jp ++ bro.memail.jp ++ bungo.eeyo.jp ++ butterfly.biglobe.ne.jp ++ butterfly.memail.jp ++ buzen.eeyo.jp ++ c.biglobe.ne.jp ++ c.memail.jp ++ cafe.biglobe.ne.jp ++ cafe.memail.jp ++ cake.biglobe.ne.jp ++ cake.memail.jp ++ cancer.biglobe.ne.jp ++ cancer.memail.jp ++ candy.biglobe.ne.jp ++ candy.memail.jp ++ capricorn.biglobe.ne.jp ++ capricorn.memail.jp ++ cat.biglobe.ne.jp ++ cat.memail.jp ++ catch.biglobe.ne.jp ++ catch.memail.jp ++ center.biglobe.ne.jp ++ center.memail.jp ++ chameleon.biglobe.ne.jp ++ chameleon.memail.jp ++ cheers.biglobe.ne.jp ++ cheers.memail.jp ++ cheetah.biglobe.ne.jp ++ cheetah.memail.jp ++ cherry.biglobe.ne.jp ++ cherry.memail.jp ++ chiba.eeyo.jp ++ chichibu.eeyo.jp ++ chikugo.eeyo.jp ++ chikuho.eeyo.jp ++ chikushi.eeyo.jp ++ chikuzen.eeyo.jp ++ chita.eeyo.jp ++ chocolate.biglobe.ne.jp ++ chocolate.memail.jp ++ chokaisan.eeyo.jp ++ chu.biglobe.ne.jp ++ chu.memail.jp ++ chubu.eeyo.jp ++ chugoku.eeyo.jp ++ ciao.biglobe.ne.jp ++ ciao.memail.jp ++ classical.biglobe.ne.jp ++ classical.memail.jp ++ clever.biglobe.ne.jp ++ clever.memail.jp ++ club.biglobe.ne.jp ++ club.memail.jp ++ cobra.biglobe.ne.jp ++ cobra.memail.jp ++ comet.biglobe.ne.jp ++ comet.memail.jp ++ condor.biglobe.ne.jp ++ condor.memail.jp ++ cool.biglobe.ne.jp ++ cool.memail.jp ++ coral.biglobe.ne.jp ++ coral.memail.jp ++ cow.biglobe.ne.jp ++ cow.memail.jp ++ crow.biglobe.ne.jp ++ crow.memail.jp ++ cute.biglobe.ne.jp ++ cute.memail.jp ++ d.biglobe.ne.jp ++ d.memail.jp ++ dad.biglobe.ne.jp ++ dad.memail.jp ++ daisen.eeyo.jp ++ daisuki.biglobe.ne.jp ++ daisuki.memail.jp ++ dance.biglobe.ne.jp ++ dance.memail.jp ++ darling.biglobe.ne.jp ++ darling.memail.jp ++ dazaifu.eeyo.jp ++ de.gozarre.jp ++ dear.biglobe.ne.jp ++ dear.memail.jp ++ denbe.biglobe.ne.jp ++ denbe.memail.jp ++ dewa.eeyo.jp ++ diamond.biglobe.ne.jp ++ diamond.memail.jp ++ dog.biglobe.ne.jp ++ dog.memail.jp ++ dogo.eeyo.jp ++ dokidoki.biglobe.ne.jp ++ dokidoki.memail.jp ++ doll.biglobe.ne.jp ++ doll.memail.jp ++ dolphin.biglobe.ne.jp ++ dolphin.memail.jp ++ dotonbori.eeyo.jp ++ dr.biglobe.ne.jp ++ dr.memail.jp ++ dragon.biglobe.ne.jp ++ dragon.memail.jp ++ dreamer.biglobe.ne.jp ++ dreamer.memail.jp ++ drum.biglobe.ne.jp ++ drum.memail.jp ++ duck.biglobe.ne.jp ++ duck.memail.jp ++ dunk.biglobe.ne.jp ++ dunk.memail.jp ++ e.biglobe.ne.jp ++ e.memail.jp ++ eagle.biglobe.ne.jp ++ eagle.memail.jp ++ earth.biglobe.ne.jp ++ earth.memail.jp ++ east.biglobe.ne.jp ++ east.memail.jp ++ echigo.eeyo.jp ++ echizen.eeyo.jp ++ edo.eeyo.jp ++ ehime.eeyo.jp ++ eight.biglobe.ne.jp ++ eight.memail.jp ++ elephant.biglobe.ne.jp ++ elephant.memail.jp ++ eleven.biglobe.ne.jp ++ eleven.memail.jp ++ emerald.biglobe.ne.jp ++ emerald.memail.jp ++ energy.biglobe.ne.jp ++ energy.memail.jp ++ enjoy.biglobe.ne.jp ++ enjoy.memail.jp ++ erimo.eeyo.jp ++ etchu.eeyo.jp ++ f.biglobe.ne.jp ++ f.memail.jp ++ fairy.biglobe.ne.jp ++ fairy.memail.jp ++ falcon.biglobe.ne.jp ++ falcon.memail.jp ++ fan.biglobe.ne.jp ++ fan.memail.jp ++ fantasy.biglobe.ne.jp ++ fantasy.memail.jp ++ fawn.biglobe.ne.jp ++ fawn.memail.jp ++ ferret.biglobe.ne.jp ++ ferret.memail.jp ++ fever.biglobe.ne.jp ++ fever.memail.jp ++ fight.biglobe.ne.jp ++ fight.memail.jp ++ fine.biglobe.ne.jp ++ fine.memail.jp ++ fire.biglobe.ne.jp ++ fire.memail.jp ++ first.biglobe.ne.jp ++ first.memail.jp ++ fish.biglobe.ne.jp ++ fish.memail.jp ++ fist.biglobe.ne.jp ++ fist.memail.jp ++ five.biglobe.ne.jp ++ five.memail.jp ++ folk.biglobe.ne.jp ++ folk.memail.jp ++ force.biglobe.ne.jp ++ force.memail.jp ++ forest.biglobe.ne.jp ++ forest.memail.jp ++ four.biglobe.ne.jp ++ four.memail.jp ++ fox.biglobe.ne.jp ++ fox.memail.jp ++ fresh.biglobe.ne.jp ++ fresh.memail.jp ++ fruit.biglobe.ne.jp ++ fruit.memail.jp ++ fuji.eeyo.jp ++ fukui.eeyo.jp ++ fukuoka.eeyo.jp ++ fukushima.eeyo.jp ++ fukuyama.eeyo.jp ++ funky.biglobe.ne.jp ++ funky.memail.jp ++ furano.eeyo.jp ++ future.biglobe.ne.jp ++ future.memail.jp ++ g.biglobe.ne.jp ++ g.memail.jp ++ gaia.biglobe.ne.jp ++ gaia.memail.jp ++ galaxy.biglobe.ne.jp ++ galaxy.memail.jp ++ gambler.biglobe.ne.jp ++ gambler.memail.jp ++ gamer.biglobe.ne.jp ++ gamer.memail.jp ++ garnet.biglobe.ne.jp ++ garnet.memail.jp ++ gassan.eeyo.jp ++ gem.biglobe.ne.jp ++ gem.memail.jp ++ gemini.biglobe.ne.jp ++ gemini.memail.jp ++ genius.biglobe.ne.jp ++ genius.memail.jp ++ genki.biglobe.ne.jp ++ genki.memail.jp ++ george.biglobe.ne.jp ++ gifu.eeyo.jp ++ ginga.biglobe.ne.jp ++ ginga.memail.jp ++ giraffe.biglobe.ne.jp ++ giraffe.memail.jp ++ glasses.biglobe.ne.jp ++ glasses.memail.jp ++ globe.biglobe.ne.jp ++ globe.memail.jp ++ gold.biglobe.ne.jp ++ gold.memail.jp ++ golden.biglobe.ne.jp ++ golden.memail.jp ++ golf.biglobe.ne.jp ++ golf.memail.jp ++ good.biglobe.ne.jp ++ good.memail.jp ++ grace.biglobe.ne.jp ++ grace.memail.jp ++ grandma.biglobe.ne.jp ++ grandma.memail.jp ++ grandpa.biglobe.ne.jp ++ grandpa.memail.jp ++ grazie.biglobe.ne.jp ++ grazie.memail.jp ++ great.biglobe.ne.jp ++ great.memail.jp ++ green.biglobe.ne.jp ++ green.memail.jp ++ groove.biglobe.ne.jp ++ groove.memail.jp ++ guitar.biglobe.ne.jp ++ guitar.memail.jp ++ gunma.eeyo.jp ++ guts.biglobe.ne.jp ++ guts.memail.jp ++ guy.biglobe.ne.jp ++ guy.memail.jp ++ h.biglobe.ne.jp ++ h.memail.jp ++ hachijo.eeyo.jp ++ hachinohe.eeyo.jp ++ hachioji.eeyo.jp ++ hagi.eeyo.jp ++ hakata.eeyo.jp ++ hakkoda.eeyo.jp ++ hakodate.eeyo.jp ++ hakone.eeyo.jp ++ hakuba.eeyo.jp ++ hakusan.eeyo.jp ++ hamamatsu.eeyo.jp ++ hamster.biglobe.ne.jp ++ hamster.memail.jp ++ hanabi.biglobe.ne.jp ++ hanabi.memail.jp ++ handsome.biglobe.ne.jp ++ handsome.memail.jp ++ happo.eeyo.jp ++ happy.biglobe.ne.jp ++ happy.memail.jp ++ harajuku.eeyo.jp ++ harima.eeyo.jp ++ harmony.biglobe.ne.jp ++ harmony.memail.jp ++ hawk.biglobe.ne.jp ++ hawk.memail.jp ++ heart.biglobe.ne.jp ++ heart.memail.jp ++ hello.biglobe.ne.jp ++ hello.memail.jp ++ hey.biglobe.ne.jp ++ hey.memail.jp ++ hi.biglobe.ne.jp ++ hi.memail.jp ++ hida.eeyo.jp ++ hidaka.eeyo.jp ++ hiei.eeyo.jp ++ higo.eeyo.jp ++ himeji.eeyo.jp ++ hiphop.biglobe.ne.jp ++ hiphop.memail.jp ++ hippo.biglobe.ne.jp ++ hippo.memail.jp ++ hirosaki.eeyo.jp ++ hiroshima.eeyo.jp ++ hit.biglobe.ne.jp ++ hit.memail.jp ++ hita.eeyo.jp ++ hitachi.eeyo.jp ++ hizen.eeyo.jp ++ hobby.biglobe.ne.jp ++ hobby.memail.jp ++ hockey.biglobe.ne.jp ++ hockey.memail.jp ++ hodaka.eeyo.jp ++ hokkaido.eeyo.jp ++ hokuriku.eeyo.jp ++ honey.biglobe.ne.jp ++ honey.memail.jp ++ hoop.biglobe.ne.jp ++ hoop.memail.jp ++ horse.biglobe.ne.jp ++ horse.memail.jp ++ hot.biglobe.ne.jp ++ hot.memail.jp ++ houki.eeyo.jp ++ hyoryugai.biglobe.ne.jp ++ hyuga.eeyo.jp ++ i.biglobe.ne.jp ++ i.memail.jp ++ ibusuki.eeyo.jp ++ ice.biglobe.ne.jp ++ ice.memail.jp ++ ichigo.biglobe.ne.jp ++ ichigo.memail.jp ++ ichihara.eeyo.jp ++ iga.eeyo.jp ++ ikaho.eeyo.jp ++ ikaruga.eeyo.jp ++ ikebukuro.eeyo.jp ++ iki.eeyo.jp ++ imari.eeyo.jp ++ inaba.eeyo.jp ++ iriomote.eeyo.jp ++ iron.biglobe.ne.jp ++ iron.memail.jp ++ ise.eeyo.jp ++ ishigaki.eeyo.jp ++ ishikari.eeyo.jp ++ ishikawa.eeyo.jp ++ ishizuchi.eeyo.jp ++ ivory.biglobe.ne.jp ++ ivory.memail.jp ++ ivy.biglobe.ne.jp ++ ivy.memail.jp ++ iwaki.eeyo.jp ++ iwami.eeyo.jp ++ iwashiro.eeyo.jp ++ iwata.eeyo.jp ++ iwate.eeyo.jp ++ iyo.eeyo.jp ++ izu.eeyo.jp ++ izuhara.eeyo.jp ++ izumi.eeyo.jp ++ izumo.eeyo.jp ++ j.biglobe.ne.jp ++ j.memail.jp ++ jambo.biglobe.ne.jp ++ jambo.memail.jp ++ jazz.biglobe.ne.jp ++ jazz.memail.jp ++ jewel.biglobe.ne.jp ++ jewel.memail.jp ++ joetsu.eeyo.jp ++ joke.biglobe.ne.jp ++ joke.memail.jp ++ joy.biglobe.ne.jp ++ joy.memail.jp ++ jr.biglobe.ne.jp ++ jr.memail.jp ++ jumbo.biglobe.ne.jp ++ jumbo.memail.jp ++ jump.biglobe.ne.jp ++ jump.memail.jp ++ jungle.biglobe.ne.jp ++ jungle.memail.jp ++ jupiter.biglobe.ne.jp ++ jupiter.memail.jp ++ k.biglobe.ne.jp ++ k.memail.jp ++ kaga.eeyo.jp ++ kagawa.eeyo.jp ++ kagoshima.eeyo.jp ++ kai.eeyo.jp ++ kamakura.eeyo.jp ++ kamikochi.eeyo.jp ++ kanazawa.eeyo.jp ++ kanto.eeyo.jp ++ karatsu.eeyo.jp ++ karuizawa.eeyo.jp ++ kashima.eeyo.jp ++ kashiwa.eeyo.jp ++ kasukabe.eeyo.jp ++ katsuyama.eeyo.jp ++ kawachi.eeyo.jp ++ kawasaki.eeyo.jp ++ kazusa.eeyo.jp ++ kba.biglobe.ne.jp ++ kbd.biglobe.ne.jp ++ kbe.biglobe.ne.jp ++ kbf.biglobe.ne.jp ++ kbh.biglobe.ne.jp ++ kca.biglobe.ne.jp ++ kcd.biglobe.ne.jp ++ kce.biglobe.ne.jp ++ kcf.biglobe.ne.jp ++ kch.biglobe.ne.jp ++ kde.biglobe.ne.jp ++ kdn.biglobe.ne.jp ++ kdp.biglobe.ne.jp ++ kdr.biglobe.ne.jp ++ kdt.biglobe.ne.jp ++ keb.biglobe.ne.jp ++ ked.biglobe.ne.jp ++ keh.biglobe.ne.jp ++ kej.biglobe.ne.jp ++ kem.biglobe.ne.jp ++ kfa.biglobe.ne.jp ++ kfd.biglobe.ne.jp ++ kfx.biglobe.ne.jp ++ kfy.biglobe.ne.jp ++ kfz.biglobe.ne.jp ++ kha.biglobe.ne.jp ++ khc.biglobe.ne.jp ++ khe.biglobe.ne.jp ++ khf.biglobe.ne.jp ++ khh.biglobe.ne.jp ++ kib.biglobe.ne.jp ++ kichijoji.eeyo.jp ++ kif.biglobe.ne.jp ++ kih.biglobe.ne.jp ++ kii.eeyo.jp ++ king.biglobe.ne.jp ++ king.memail.jp ++ kinki.eeyo.jp ++ kinugawa.eeyo.jp ++ kir.biglobe.ne.jp ++ kirigamine.eeyo.jp ++ kirishima.eeyo.jp ++ kiso.eeyo.jp ++ kiss.biglobe.ne.jp ++ kiss.memail.jp ++ kitakata.eeyo.jp ++ kitakyushu.eeyo.jp ++ kitami.eeyo.jp ++ kiu.biglobe.ne.jp ++ kiyosato.eeyo.jp ++ kjb.biglobe.ne.jp ++ kjc.biglobe.ne.jp ++ kjd.biglobe.ne.jp ++ kje.biglobe.ne.jp ++ kjf.biglobe.ne.jp ++ kkd.biglobe.ne.jp ++ kke.biglobe.ne.jp ++ kkf.biglobe.ne.jp ++ kkh.biglobe.ne.jp ++ kki.biglobe.ne.jp ++ kmd.biglobe.ne.jp ++ kme.biglobe.ne.jp ++ kmf.biglobe.ne.jp ++ kmh.biglobe.ne.jp ++ kmj.biglobe.ne.jp ++ kna.biglobe.ne.jp ++ knd.biglobe.ne.jp ++ kne.biglobe.ne.jp ++ knh.biglobe.ne.jp ++ kni.biglobe.ne.jp ++ knight.biglobe.ne.jp ++ knight.memail.jp ++ koala.biglobe.ne.jp ++ koala.memail.jp ++ kobe.eeyo.jp ++ kochi.eeyo.jp ++ kofu.eeyo.jp ++ koga.eeyo.jp ++ koiwai.eeyo.jp ++ konpira.eeyo.jp ++ kotohira.eeyo.jp ++ kozuke.eeyo.jp ++ kpa.biglobe.ne.jp ++ kpb.biglobe.ne.jp ++ kpd.biglobe.ne.jp ++ kpe.biglobe.ne.jp ++ kph.biglobe.ne.jp ++ kra.biglobe.ne.jp ++ krb.biglobe.ne.jp ++ krc.biglobe.ne.jp ++ krd.biglobe.ne.jp ++ krf.biglobe.ne.jp ++ ksf.biglobe.ne.jp ++ ksh.biglobe.ne.jp ++ ksj.biglobe.ne.jp ++ ksn.biglobe.ne.jp ++ kss.biglobe.ne.jp ++ kta.biglobe.ne.jp ++ ktb.biglobe.ne.jp ++ ktd.biglobe.ne.jp ++ ktf.biglobe.ne.jp ++ ktj.biglobe.ne.jp ++ kub.biglobe.ne.jp ++ kuc.biglobe.ne.jp ++ kud.biglobe.ne.jp ++ kuf.biglobe.ne.jp ++ kuh.biglobe.ne.jp ++ kuju.eeyo.jp ++ kumagaya.eeyo.jp ++ kumamoto.eeyo.jp ++ kumano.eeyo.jp ++ kunisaki.eeyo.jp ++ kurama.eeyo.jp ++ kurashiki.eeyo.jp ++ kurobe.eeyo.jp ++ kurume.eeyo.jp ++ kusatsu.eeyo.jp ++ kushiro.eeyo.jp ++ kvd.biglobe.ne.jp ++ kve.biglobe.ne.jp ++ kvf.biglobe.ne.jp ++ kvj.biglobe.ne.jp ++ kvp.biglobe.ne.jp ++ kxa.biglobe.ne.jp ++ kxb.biglobe.ne.jp ++ kxd.biglobe.ne.jp ++ kxe.biglobe.ne.jp ++ kxf.biglobe.ne.jp ++ kyf.biglobe.ne.jp ++ kyi.biglobe.ne.jp ++ kyj.biglobe.ne.jp ++ kym.biglobe.ne.jp ++ kyoto.eeyo.jp ++ kyp.biglobe.ne.jp ++ kyushu.eeyo.jp ++ kza.biglobe.ne.jp ++ kzc.biglobe.ne.jp ++ kzd.biglobe.ne.jp ++ kzf.biglobe.ne.jp ++ kzh.biglobe.ne.jp ++ l.biglobe.ne.jp ++ l.memail.jp ++ lady.biglobe.ne.jp ++ lady.memail.jp ++ lake.biglobe.ne.jp ++ lake.memail.jp ++ latin.biglobe.ne.jp ++ latin.memail.jp ++ lavender.biglobe.ne.jp ++ lavender.memail.jp ++ lavie.biglobe.ne.jp ++ lavie.memail.jp ++ leaf.biglobe.ne.jp ++ leaf.memail.jp ++ left.biglobe.ne.jp ++ left.memail.jp ++ lefty.biglobe.ne.jp ++ lefty.memail.jp ++ lemon.biglobe.ne.jp ++ lemon.memail.jp ++ leo.biglobe.ne.jp ++ leo.memail.jp ++ libra.biglobe.ne.jp ++ libra.memail.jp ++ lily.biglobe.ne.jp ++ lily.memail.jp ++ lime.biglobe.ne.jp ++ lime.memail.jp ++ lion.biglobe.ne.jp ++ lion.memail.jp ++ lonely.biglobe.ne.jp ++ lonely.memail.jp ++ long.biglobe.ne.jp ++ long.memail.jp ++ love.biglobe.ne.jp ++ love.memail.jp ++ lovelove.biglobe.ne.jp ++ lovelove.memail.jp ++ lovely.biglobe.ne.jp ++ lovely.memail.jp ++ lucky.biglobe.ne.jp ++ lucky.memail.jp ++ luna.biglobe.ne.jp ++ luna.memail.jp ++ m.biglobe.ne.jp ++ m.memail.jp ++ macho.biglobe.ne.jp ++ macho.memail.jp ++ magic.biglobe.ne.jp ++ magic.memail.jp ++ mama.biglobe.ne.jp ++ mama.memail.jp ++ mambo.biglobe.ne.jp ++ mambo.memail.jp ++ marine.biglobe.ne.jp ++ marine.memail.jp ++ maroon.biglobe.ne.jp ++ maroon.memail.jp ++ mars.biglobe.ne.jp ++ mars.memail.jp ++ matsue.eeyo.jp ++ matsumoto.eeyo.jp ++ matsusaka.eeyo.jp ++ matsushima.eeyo.jp ++ melody.biglobe.ne.jp ++ melody.memail.jp ++ melon.biglobe.ne.jp ++ melon.memail.jp ++ memoad.jp ++ meow.biglobe.ne.jp ++ meow.memail.jp ++ mercury.biglobe.ne.jp ++ mercury.memail.jp ++ mermaid.biglobe.ne.jp ++ mermaid.memail.jp ++ mie.eeyo.jp ++ mikawa.eeyo.jp ++ milk.biglobe.ne.jp ++ milk.memail.jp ++ mimasaka.eeyo.jp ++ minakami.eeyo.jp ++ mino.eeyo.jp ++ mint.biglobe.ne.jp ++ mint.memail.jp ++ miracle.biglobe.ne.jp ++ miracle.memail.jp ++ mito.eeyo.jp ++ miura.eeyo.jp ++ miyagi.eeyo.jp ++ miyajima.eeyo.jp ++ miyako.eeyo.jp ++ miyazaki.eeyo.jp ++ mocha.biglobe.ne.jp ++ mocha.memail.jp ++ mogami.eeyo.jp ++ momo.biglobe.ne.jp ++ momo.memail.jp ++ monkey.biglobe.ne.jp ++ monkey.memail.jp ++ moon.biglobe.ne.jp ++ moon.memail.jp ++ moonstone.biglobe.ne.jp ++ moonstone.memail.jp ++ motor.biglobe.ne.jp ++ motor.memail.jp ++ motto.biglobe.ne.jp ++ motto.memail.jp ++ mount.biglobe.ne.jp ++ mount.memail.jp ++ mouse.biglobe.ne.jp ++ mouse.memail.jp ++ mpd.biglobe.ne.jp ++ mqb.biglobe.ne.jp ++ mqc.biglobe.ne.jp ++ mqd.biglobe.ne.jp ++ mqe.biglobe.ne.jp ++ mqf.biglobe.ne.jp ++ mqg.biglobe.ne.jp ++ mqh.biglobe.ne.jp ++ mqi.biglobe.ne.jp ++ mqj.biglobe.ne.jp ++ mra.biglobe.ne.jp ++ mrb.biglobe.ne.jp ++ mrc.biglobe.ne.jp ++ mrd.biglobe.ne.jp ++ mre.biglobe.ne.jp ++ mrf.biglobe.ne.jp ++ mrg.biglobe.ne.jp ++ mrh.biglobe.ne.jp ++ mri.biglobe.ne.jp ++ mrj.biglobe.ne.jp ++ msa.biglobe.ne.jp ++ msb.biglobe.ne.jp ++ msc.biglobe.ne.jp ++ msd.biglobe.ne.jp ++ mse.biglobe.ne.jp ++ msf.biglobe.ne.jp ++ msg.biglobe.ne.jp ++ msh.biglobe.ne.jp ++ msi.biglobe.ne.jp ++ msj.biglobe.ne.jp ++ mta.biglobe.ne.jp ++ mtb.biglobe.ne.jp ++ mtc.biglobe.ne.jp ++ mtd.biglobe.ne.jp ++ mte.biglobe.ne.jp ++ mtf.biglobe.ne.jp ++ mtg.biglobe.ne.jp ++ mth.biglobe.ne.jp ++ mti.biglobe.ne.jp ++ mtj.biglobe.ne.jp ++ mua.biglobe.ne.jp ++ mub.biglobe.ne.jp ++ muc.biglobe.ne.jp ++ mud.biglobe.ne.jp ++ mue.biglobe.ne.jp ++ muf.biglobe.ne.jp ++ mug.biglobe.ne.jp ++ muh.biglobe.ne.jp ++ mui.biglobe.ne.jp ++ muj.biglobe.ne.jp ++ muroran.eeyo.jp ++ muroto.eeyo.jp ++ musashi.eeyo.jp ++ muscle.biglobe.ne.jp ++ muscle.memail.jp ++ mutsu.eeyo.jp ++ mva.biglobe.ne.jp ++ mvb.biglobe.ne.jp ++ mvc.biglobe.ne.jp ++ mvd.biglobe.ne.jp ++ mve.biglobe.ne.jp ++ mvf.biglobe.ne.jp ++ mvg.biglobe.ne.jp ++ mvh.biglobe.ne.jp ++ mvi.biglobe.ne.jp ++ mvj.biglobe.ne.jp ++ mwa.biglobe.ne.jp ++ mwb.biglobe.ne.jp ++ mwc.biglobe.ne.jp ++ mwd.biglobe.ne.jp ++ mwe.biglobe.ne.jp ++ myad.jp ++ myoko.eeyo.jp ++ n.biglobe.ne.jp ++ n.memail.jp ++ nada.eeyo.jp ++ naeba.eeyo.jp ++ nagano.eeyo.jp ++ nagaoka.eeyo.jp ++ nagara.eeyo.jp ++ nagasaki.eeyo.jp ++ nagato.eeyo.jp ++ nagoya.eeyo.jp ++ naniwa.eeyo.jp ++ nara.eeyo.jp ++ narashino.eeyo.jp ++ naruto.eeyo.jp ++ nasu.eeyo.jp ++ neko.biglobe.ne.jp ++ neko.memail.jp ++ nemuro.eeyo.jp ++ neptune.biglobe.ne.jp ++ neptune.memail.jp ++ nerima.eeyo.jp ++ nice.biglobe.ne.jp ++ nice.memail.jp ++ nigata.eeyo.jp ++ nikko.eeyo.jp ++ nine.biglobe.ne.jp ++ nine.memail.jp ++ no1.biglobe.ne.jp ++ no1.memail.jp ++ noboribetsu.eeyo.jp ++ noda.eeyo.jp ++ noodle.biglobe.ne.jp ++ noodle.memail.jp ++ north.biglobe.ne.jp ++ north.memail.jp ++ note.biglobe.ne.jp ++ note.memail.jp ++ noto.eeyo.jp ++ nozawa.eeyo.jp ++ numazu.eeyo.jp ++ o.biglobe.ne.jp ++ o.memail.jp ++ obihiro.eeyo.jp ++ octopus.biglobe.ne.jp ++ octopus.memail.jp ++ oga.eeyo.jp ++ ogasawara.eeyo.jp ++ ohara.eeyo.jp ++ ohu.eeyo.jp ++ oita.eeyo.jp ++ ok.biglobe.ne.jp ++ ok.memail.jp ++ okayama.eeyo.jp ++ oki.eeyo.jp ++ okinawa.eeyo.jp ++ ole.biglobe.ne.jp ++ ole.memail.jp ++ omi.eeyo.jp ++ omiya.eeyo.jp ++ one.biglobe.ne.jp ++ one.memail.jp ++ onomichi.eeyo.jp ++ opal.biglobe.ne.jp ++ opal.memail.jp ++ opera.biglobe.ne.jp ++ opera.memail.jp ++ orange.biglobe.ne.jp ++ orange.memail.jp ++ osaka.eeyo.jp ++ osumi.eeyo.jp ++ otaru.eeyo.jp ++ owari.eeyo.jp ++ owl.biglobe.ne.jp ++ owl.memail.jp ++ oyaji.biglobe.ne.jp ++ oyaji.memail.jp ++ oze.eeyo.jp ++ p.biglobe.ne.jp ++ p.memail.jp ++ pan.biglobe.ne.jp ++ pan.memail.jp ++ panda.biglobe.ne.jp ++ panda.memail.jp ++ pansy.biglobe.ne.jp ++ pansy.memail.jp ++ panther.biglobe.ne.jp ++ panther.memail.jp ++ papa.biglobe.ne.jp ++ papa.memail.jp ++ parapara.biglobe.ne.jp ++ parapara.memail.jp ++ passion.biglobe.ne.jp ++ passion.memail.jp ++ peace.biglobe.ne.jp ++ peace.memail.jp ++ peach.biglobe.ne.jp ++ peach.memail.jp ++ pearl.biglobe.ne.jp ++ pearl.memail.jp ++ pegasus.biglobe.ne.jp ++ pegasus.memail.jp ++ penguin.biglobe.ne.jp ++ penguin.memail.jp ++ peridot.biglobe.ne.jp ++ peridot.memail.jp ++ piano.biglobe.ne.jp ++ piano.memail.jp ++ pig.biglobe.ne.jp ++ pig.memail.jp ++ pine.biglobe.ne.jp ++ pine.memail.jp ++ pink.biglobe.ne.jp ++ pink.memail.jp ++ pisces.biglobe.ne.jp ++ pisces.memail.jp ++ piyo.biglobe.ne.jp ++ piyo.memail.jp ++ plum.biglobe.ne.jp ++ plum.memail.jp ++ pony.biglobe.ne.jp ++ pony.memail.jp ++ pops.biglobe.ne.jp ++ pops.memail.jp ++ potato.biglobe.ne.jp ++ potato.memail.jp ++ power.biglobe.ne.jp ++ power.memail.jp ++ pretty.biglobe.ne.jp ++ pretty.memail.jp ++ pride.biglobe.ne.jp ++ pride.memail.jp ++ private.biglobe.ne.jp ++ private.memail.jp ++ punk.biglobe.ne.jp ++ punk.memail.jp ++ puppy.biglobe.ne.jp ++ puppy.memail.jp ++ pure.biglobe.ne.jp ++ pure.memail.jp ++ purin.biglobe.ne.jp ++ purin.memail.jp ++ puripuri.biglobe.ne.jp ++ puripuri.memail.jp ++ q.biglobe.ne.jp ++ q.memail.jp ++ queen.biglobe.ne.jp ++ queen.memail.jp ++ r.biglobe.ne.jp ++ r.memail.jp ++ rabbit.biglobe.ne.jp ++ rabbit.memail.jp ++ raccoondog.biglobe.ne.jp ++ raccoondog.memail.jp ++ racer.biglobe.ne.jp ++ racer.memail.jp ++ rain.biglobe.ne.jp ++ rain.memail.jp ++ rainbow.biglobe.ne.jp ++ rainbow.memail.jp ++ rap.biglobe.ne.jp ++ rap.memail.jp ++ red.biglobe.ne.jp ++ red.memail.jp ++ rhythm.biglobe.ne.jp ++ rhythm.memail.jp ++ rice.biglobe.ne.jp ++ rice.memail.jp ++ rider.biglobe.ne.jp ++ rider.memail.jp ++ right.biglobe.ne.jp ++ right.memail.jp ++ rikuchu.eeyo.jp ++ rikuzen.eeyo.jp ++ river.biglobe.ne.jp ++ river.memail.jp ++ robin.biglobe.ne.jp ++ robin.memail.jp ++ rock.biglobe.ne.jp ++ rock.memail.jp ++ rokko.eeyo.jp ++ rookie.biglobe.ne.jp ++ rookie.memail.jp ++ rose.biglobe.ne.jp ++ rose.memail.jp ++ ruby.biglobe.ne.jp ++ ruby.memail.jp ++ runrun.biglobe.ne.jp ++ runrun.memail.jp ++ ryukyu.eeyo.jp ++ s.biglobe.ne.jp ++ s.memail.jp ++ sado.eeyo.jp ++ safari.biglobe.ne.jp ++ safari.memail.jp ++ saga.eeyo.jp ++ sagami.eeyo.jp ++ sagittarius.biglobe.ne.jp ++ sagittarius.memail.jp ++ saitama.eeyo.jp ++ sakai.eeyo.jp ++ sakura.biglobe.ne.jp ++ sakura.memail.jp ++ salt.biglobe.ne.jp ++ salt.memail.jp ++ samba.biglobe.ne.jp ++ samba.memail.jp ++ sanin.eeyo.jp ++ sanriku.eeyo.jp ++ sanuki.eeyo.jp ++ sanyo.eeyo.jp ++ sapphire.biglobe.ne.jp ++ sapphire.memail.jp ++ sapporo.eeyo.jp ++ sasebo.eeyo.jp ++ sata.eeyo.jp ++ satsuma.eeyo.jp ++ saturn.biglobe.ne.jp ++ saturn.memail.jp ++ scorpio.biglobe.ne.jp ++ scorpio.memail.jp ++ sea.biglobe.ne.jp ++ sea.memail.jp ++ seabass.biglobe.ne.jp ++ seabass.memail.jp ++ second.biglobe.ne.jp ++ second.memail.jp ++ seeya.biglobe.ne.jp ++ seeya.memail.jp ++ sendai.eeyo.jp ++ sepia.biglobe.ne.jp ++ sepia.memail.jp ++ setagaya.eeyo.jp ++ setouchi.eeyo.jp ++ settu.eeyo.jp ++ seven.biglobe.ne.jp ++ seven.memail.jp ++ sf.biglobe.ne.jp ++ sf.memail.jp ++ shake.biglobe.ne.jp ++ shake.memail.jp ++ shakotan.eeyo.jp ++ sheep.biglobe.ne.jp ++ sheep.memail.jp ++ shibuya.eeyo.jp ++ shiga.eeyo.jp ++ shikoku.eeyo.jp ++ shikotsu.eeyo.jp ++ shima.eeyo.jp ++ shimane.eeyo.jp ++ shimanto.eeyo.jp ++ shimizu.eeyo.jp ++ shimokita.eeyo.jp ++ shimotsuke.eeyo.jp ++ shimousa.eeyo.jp ++ shinagawa.eeyo.jp ++ shinano.eeyo.jp ++ shine.biglobe.ne.jp ++ shine.memail.jp ++ shinjuku.eeyo.jp ++ shiobara.eeyo.jp ++ shirahama.eeyo.jp ++ shirakami.eeyo.jp ++ shiretoko.eeyo.jp ++ shizuoka.eeyo.jp ++ shonai.eeyo.jp ++ shonan.eeyo.jp ++ shoot.biglobe.ne.jp ++ shoot.memail.jp ++ short.biglobe.ne.jp ++ short.memail.jp ++ shout.biglobe.ne.jp ++ shout.memail.jp ++ shrimp.biglobe.ne.jp ++ shrimp.memail.jp ++ silver.biglobe.ne.jp ++ silver.memail.jp ++ simplem.biglobe.ne.jp ++ simplem.memail.jp ++ six.biglobe.ne.jp ++ six.memail.jp ++ ski.biglobe.ne.jp ++ ski.memail.jp ++ sky.biglobe.ne.jp ++ sky.memail.jp ++ smart.biglobe.ne.jp ++ smart.memail.jp ++ smash.biglobe.ne.jp ++ smash.memail.jp ++ smile.biglobe.ne.jp ++ smile.memail.jp ++ snake.biglobe.ne.jp ++ snake.memail.jp ++ snowboard.biglobe.ne.jp ++ snowboard.memail.jp ++ snowy.biglobe.ne.jp ++ snowy.memail.jp ++ soccer.biglobe.ne.jp ++ soccer.memail.jp ++ sodegaura.eeyo.jp ++ soul.biglobe.ne.jp ++ soul.memail.jp ++ south.biglobe.ne.jp ++ south.memail.jp ++ soya.eeyo.jp ++ space.biglobe.ne.jp ++ space.memail.jp ++ spice.biglobe.ne.jp ++ spice.memail.jp ++ spider.biglobe.ne.jp ++ spider.memail.jp ++ spring.biglobe.ne.jp ++ spring.memail.jp ++ star.biglobe.ne.jp ++ star.memail.jp ++ step.biglobe.ne.jp ++ step.memail.jp ++ stone.biglobe.ne.jp ++ stone.memail.jp ++ storm.biglobe.ne.jp ++ storm.memail.jp ++ strawberry.biglobe.ne.jp ++ strawberry.memail.jp ++ string.biglobe.ne.jp ++ string.memail.jp ++ sugar.biglobe.ne.jp ++ sugar.memail.jp ++ summer.biglobe.ne.jp ++ summer.memail.jp ++ sunflower.biglobe.ne.jp ++ sunflower.memail.jp ++ sunshine.biglobe.ne.jp ++ sunshine.memail.jp ++ suo.eeyo.jp ++ super.biglobe.ne.jp ++ super.memail.jp ++ surfing.biglobe.ne.jp ++ surfing.memail.jp ++ suruga.eeyo.jp ++ suzuka.eeyo.jp ++ swallow.biglobe.ne.jp ++ swallow.memail.jp ++ swan.biglobe.ne.jp ++ swan.memail.jp ++ sweet.biglobe.ne.jp ++ sweet.memail.jp ++ swing.biglobe.ne.jp ++ swing.memail.jp ++ symphony.biglobe.ne.jp ++ symphony.memail.jp ++ t.biglobe.ne.jp ++ t.memail.jp ++ tai.biglobe.ne.jp ++ tai.memail.jp ++ tajima.eeyo.jp ++ takachiho.eeyo.jp ++ takamatsu.eeyo.jp ++ takayama.eeyo.jp ++ tama.eeyo.jp ++ tanba.eeyo.jp ++ tango.biglobe.ne.jp ++ tango.eeyo.jp ++ tango.memail.jp ++ tanzawa.eeyo.jp ++ tateshina.eeyo.jp ++ tateyama.eeyo.jp ++ taurus.biglobe.ne.jp ++ taurus.memail.jp ++ tazawako.eeyo.jp ++ tea.biglobe.ne.jp ++ tea.memail.jp ++ techno.biglobe.ne.jp ++ techno.memail.jp ++ ten.biglobe.ne.jp ++ ten.memail.jp ++ tender.biglobe.ne.jp ++ tender.memail.jp ++ tennis.biglobe.ne.jp ++ tennis.memail.jp ++ terra.biglobe.ne.jp ++ terra.memail.jp ++ test.test.biglobe.ne.jp ++ thanks.biglobe.ne.jp ++ thanks.memail.jp ++ third.biglobe.ne.jp ++ third.memail.jp ++ three.biglobe.ne.jp ++ three.memail.jp ++ thunder.biglobe.ne.jp ++ thunder.memail.jp ++ tiger.biglobe.ne.jp ++ tiger.memail.jp ++ tiny.biglobe.ne.jp ++ tiny.memail.jp ++ tochigi.eeyo.jp ++ togakushi.eeyo.jp ++ tohoku.eeyo.jp ++ toi.eeyo.jp ++ tokachi.eeyo.jp ++ tokai.eeyo.jp ++ tokoro.biglobe.ne.jp ++ tokorozawa.eeyo.jp ++ tokushima.eeyo.jp ++ tokyo.eeyo.jp ++ tone.eeyo.jp ++ tono.eeyo.jp ++ topaz.biglobe.ne.jp ++ topaz.memail.jp ++ tornado.biglobe.ne.jp ++ tornado.memail.jp ++ tosa.eeyo.jp ++ tosu.eeyo.jp ++ totoumi.eeyo.jp ++ tottori.eeyo.jp ++ tough.biglobe.ne.jp ++ tough.memail.jp ++ tourmaline.biglobe.ne.jp ++ tourmaline.memail.jp ++ towada.eeyo.jp ++ toya.eeyo.jp ++ toyama.eeyo.jp ++ toyohashi.eeyo.jp ++ traveler.biglobe.ne.jp ++ traveler.memail.jp ++ tree.biglobe.ne.jp ++ tree.memail.jp ++ tropical.biglobe.ne.jp ++ tropical.memail.jp ++ tsuchiura.eeyo.jp ++ tsugaike.eeyo.jp ++ tsugaru.eeyo.jp ++ tsukuba.eeyo.jp ++ tsumagoi.eeyo.jp ++ tsushima.eeyo.jp ++ tsuwano.eeyo.jp ++ tsuyama.eeyo.jp ++ tulip.biglobe.ne.jp ++ tulip.memail.jp ++ turbo.biglobe.ne.jp ++ turbo.memail.jp ++ turquoise.biglobe.ne.jp ++ turquoise.memail.jp ++ twelve.biglobe.ne.jp ++ twelve.memail.jp ++ twist.biglobe.ne.jp ++ twist.memail.jp ++ two.biglobe.ne.jp ++ two.memail.jp ++ typhoon.biglobe.ne.jp ++ typhoon.memail.jp ++ u.biglobe.ne.jp ++ u.memail.jp ++ ueno.eeyo.jp ++ ugo.eeyo.jp ++ uji.eeyo.jp ++ ultra.biglobe.ne.jp ++ ultra.memail.jp ++ ume.biglobe.ne.jp ++ ume.memail.jp ++ umeda.eeyo.jp ++ unicorn.biglobe.ne.jp ++ unicorn.memail.jp ++ unzen.eeyo.jp ++ uonuma.eeyo.jp ++ urawa.eeyo.jp ++ uwa.eeyo.jp ++ uzen.eeyo.jp ++ v.biglobe.ne.jp ++ v.memail.jp ++ valuestar.biglobe.ne.jp ++ valuestar.memail.jp ++ venus.biglobe.ne.jp ++ venus.memail.jp ++ violet.biglobe.ne.jp ++ violet.memail.jp ++ virgo.biglobe.ne.jp ++ virgo.memail.jp ++ viva.biglobe.ne.jp ++ viva.memail.jp ++ volleyball.biglobe.ne.jp ++ volleyball.memail.jp ++ w.biglobe.ne.jp ++ w.memail.jp ++ wakasa.eeyo.jp ++ wakayama.eeyo.jp ++ wakkanai.eeyo.jp ++ west.biglobe.ne.jp ++ west.memail.jp ++ whale.biglobe.ne.jp ++ whale.memail.jp ++ white.biglobe.ne.jp ++ white.memail.jp ++ wild.biglobe.ne.jp ++ wild.memail.jp ++ winter.biglobe.ne.jp ++ winter.memail.jp ++ with.biglobe.ne.jp ++ with.memail.jp ++ wolf.biglobe.ne.jp ++ wolf.memail.jp ++ wonder.biglobe.ne.jp ++ wonder.memail.jp ++ wood.biglobe.ne.jp ++ wood.memail.jp ++ x.biglobe.ne.jp ++ x.memail.jp ++ xqb.biglobe.ne.jp ++ xqd.biglobe.ne.jp ++ xqe.biglobe.ne.jp ++ xqg.biglobe.ne.jp ++ xqh.biglobe.ne.jp ++ xqj.biglobe.ne.jp ++ xrh.biglobe.ne.jp ++ xrj.biglobe.ne.jp ++ xsj.biglobe.ne.jp ++ xug.biglobe.ne.jp ++ xui.biglobe.ne.jp ++ xvb.biglobe.ne.jp ++ xvf.biglobe.ne.jp ++ xvg.biglobe.ne.jp ++ xvh.biglobe.ne.jp ++ y.biglobe.ne.jp ++ y.memail.jp ++ yaeyama.eeyo.jp ++ yakushima.eeyo.jp ++ yamagata.eeyo.jp ++ yamaguchi.eeyo.jp ++ yamame.biglobe.ne.jp ++ yamame.memail.jp ++ yamanashi.eeyo.jp ++ yamashiro.eeyo.jp ++ yamato.eeyo.jp ++ yeah.biglobe.ne.jp ++ yeah.memail.jp ++ yes.biglobe.ne.jp ++ yes.memail.jp ++ yodogawa.eeyo.jp ++ yokohama.eeyo.jp ++ yoron.eeyo.jp ++ yoshino.eeyo.jp ++ yours.biglobe.ne.jp ++ yours.memail.jp ++ yufuin.eeyo.jp ++ yuzawa.eeyo.jp ++ z.biglobe.ne.jp ++ z.memail.jp ++ zao.eeyo.jp ++ zoo.biglobe.ne.jp ++ zoo.memail.jp ++ zzz.biglobe.ne.jp ++ zzz.memail.jp ++ BIGLOBE ++ BIGLOBE ++ ++ mail.biglobe.ne.jp ++ 110 ++ plain ++ %EMAILADDRESS% ++ secure ++ ++ ++ mail.biglobe.ne.jp ++ 587 ++ plain ++ %EMAILADDRESS% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/amethyst.broba.cc evolution-2.30.2.new//capplet/settings/mail-autoconfig/amethyst.broba.cc +--- evolution-2.30.2//capplet/settings/mail-autoconfig/amethyst.broba.cc 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/amethyst.broba.cc 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,27 @@ ++ ++ ++ ++ garnet.broba.cc ++ amethyst.broba.cc ++ coral.broba.ccv ++ diamond.broba.cc ++ ぷらら ++ ぷらら ++ ++ mail.broba.cc ++ 110 ++ plain ++ %EMAILADDRESS% ++ plain ++ ++ ++ mail.broba.cc ++ 587 ++ plain ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/aol.com evolution-2.30.2.new//capplet/settings/mail-autoconfig/aol.com +--- evolution-2.30.2//capplet/settings/mail-autoconfig/aol.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/aol.com 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,30 @@ ++ ++ ++ ++ ++ aol.com ++ aim.com ++ ++ AOL ++ AOL ++ ++ ++ imap.aol.com ++ 143 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.aol.com ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/apost.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/apost.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/apost.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/apost.plala.or.jp 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ apost.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ apost.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ apost.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/aqua.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/aqua.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/aqua.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/aqua.plala.or.jp 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ aqua.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ aqua.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ aqua.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/arcor.de evolution-2.30.2.new//capplet/settings/mail-autoconfig/arcor.de +--- evolution-2.30.2//capplet/settings/mail-autoconfig/arcor.de 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/arcor.de 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,38 @@ ++ ++ ++ ++ ++ arcor.de ++ ++ Arcor ++ Arcor ++ ++ ++ imap.arcor.de ++ 993 ++ SSL ++ ++ plain ++ %EMAILLOCALPART% ++ ++ ++ ++ mail.arcor.de ++ 465 ++ SSL ++ ++ plain ++ %EMAILLOCALPART% ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/ballade.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/ballade.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/ballade.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/ballade.plala.or.jp 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ballade.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ ballade.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ballade.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/bay.gunmanet.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/bay.gunmanet.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/bay.gunmanet.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/bay.gunmanet.ne.jp 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,28 @@ ++ ++ ++ ++ bay.wind.ne.jp ++ bay.wind.jp ++ bay.wind.co.jp ++ bay.gunmanet.or.jp ++ bay.gunmanet.ne.jp ++ 群馬インターネット ++ wind ++ ++ bay.wind.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ bay.wind.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/bb-niigata.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/bb-niigata.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/bb-niigata.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/bb-niigata.jp 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ bb-niigata.jp ++ ＢＢにいがた ++ BB-NIIGATA ++ ++ pop.bb-niigata.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ pop.bb-niigata.jp ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/bc.iij4u.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/bc.iij4u.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/bc.iij4u.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/bc.iij4u.or.jp 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,35 @@ ++ ++ ++ ++ dd.iij4u.or.jp ++ ff.iij4u.or.jp ++ hh.iij4u.or.jp ++ kk.iij4u.or.jp ++ nn.iij4u.or.jp ++ pp.iij4u.or.jp ++ rr.iij4u.or.jp ++ ss.iij4u.or.jp ++ bc.iij4u.or.jp ++ bk.iij4u.or.jp ++ bp.iij4u.or.jp ++ bu.iij4u.or.jp ++ IIJ4U ++ IIJ4U ++ ++ mbox.iij4u.or.jp ++ 110 ++ STARTTLS ++ %EMAILLOCALPART%.%EMAILDOMAIN% ++ secure ++ ++ ++ mbox.iij4u.or.jp ++ 587 ++ STARTTLS ++ %EMAILLOCALPART%.%EMAILDOMAIN% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/beige.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/beige.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/beige.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/beige.plala.or.jp 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ beige.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ beige.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ beige.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/blue.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/blue.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/blue.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/blue.plala.or.jp 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ blue.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ blue.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ blue.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/bmail.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/bmail.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/bmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/bmail.plala.or.jp 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ bmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ bmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ bmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/bolero.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/bolero.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/bolero.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/bolero.plala.or.jp 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ bolero.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ bolero.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ bolero.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/bpost.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/bpost.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/bpost.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/bpost.plala.or.jp 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ bpost.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ bpost.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ bpost.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/brown.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/brown.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/brown.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/brown.plala.or.jp 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ brown.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ brown.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ brown.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/camel.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/camel.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/camel.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/camel.plala.or.jp 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ camel.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ camel.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ camel.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/cameo.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/cameo.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/cameo.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/cameo.plala.or.jp 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ cameo.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ cameo.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ cameo.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/cc9.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/cc9.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/cc9.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/cc9.ne.jp 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,23 @@ ++ ++ ++ ++ cc9.ne.jp ++ CC9インターネットサービス ++ CC9 ++ ++ pop.cc9.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.cc9.ne.jp ++ 25 ++ plain ++ none ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/cek.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/cek.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/cek.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/cek.ne.jp 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,23 @@ ++ ++ ++ ++ cek.ne.jp ++ エコーシティー・駒ケ岳 ++ CEK-Net ++ ++ mail.cek.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.cek.ne.jp ++ 25 ++ plain ++ none ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/clio.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/clio.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/clio.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/clio.ne.jp 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ clio.ne.jp ++ CLIO-Net移管サービス ++ CLIO-Net ++ ++ mail.clio.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ mail.clio.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/cmail.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/cmail.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/cmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/cmail.plala.or.jp 2010-06-22 13:37:26.752114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ cmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ cmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ cmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/co1.wind.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/co1.wind.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/co1.wind.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/co1.wind.jp 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,25 @@ ++ ++ ++ ++ co1.wind.ne.jp ++ co1.wind.jp ++ 群馬インターネット ++ wind ++ ++ co1.wind.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ co1.wind.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/co2.wind.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/co2.wind.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/co2.wind.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/co2.wind.jp 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,25 @@ ++ ++ ++ ++ co2.wind.ne.jp ++ co2.wind.jp ++ 群馬インターネット ++ wind ++ ++ co2.wind.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ co2.wind.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/co3.wind.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/co3.wind.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/co3.wind.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/co3.wind.jp 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,25 @@ ++ ++ ++ ++ co3.wind.ne.jp ++ co3.wind.jp ++ 群馬インターネット ++ wind ++ ++ co3.wind.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ co3.wind.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/cocoa.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/cocoa.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/cocoa.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/cocoa.plala.or.jp 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ cocoa.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ cocoa.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ cocoa.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/coda.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/coda.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/coda.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/coda.plala.or.jp 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ coda.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ coda.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ coda.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/comcast.net evolution-2.30.2.new//capplet/settings/mail-autoconfig/comcast.net +--- evolution-2.30.2//capplet/settings/mail-autoconfig/comcast.net 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/comcast.net 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,29 @@ ++ ++ ++ ++ ++ comcast.net ++ ++ Comcast ++ Comcast ++ ++ ++ mail.comcast.net ++ 110 ++ STARTTLS ++ %EMAILLOCALPART% ++ secure ++ ++ ++ ++ smtp.comcast.net ++ 587 ++ STARTTLS ++ %EMAILLOCALPART% ++ secure ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/concerto.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/concerto.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/concerto.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/concerto.plala.or.jp 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ concerto.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ concerto.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ concerto.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/coral.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/coral.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/coral.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/coral.plala.or.jp 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ coral.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ coral.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ coral.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/courante.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/courante.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/courante.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/courante.plala.or.jp 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ courante.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ courante.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ courante.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/cpost.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/cpost.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/cpost.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/cpost.plala.or.jp 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ cpost.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ cpost.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ cpost.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/cream.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/cream.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/cream.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/cream.plala.or.jp 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ cream.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ cream.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ cream.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/dance.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/dance.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/dance.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/dance.plala.or.jp 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ dance.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ dance.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ dance.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/dan.gunmanet.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/dan.gunmanet.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/dan.gunmanet.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/dan.gunmanet.ne.jp 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,28 @@ ++ ++ ++ ++ dan.wind.ne.jp ++ dan.wind.jp ++ dan.wind.co.jp ++ dan.gunmanet.or.jp ++ dan.gunmanet.ne.jp ++ 群馬インターネット ++ wind ++ ++ dan.wind.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ dan.wind.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/dmail.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/dmail.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/dmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/dmail.plala.or.jp 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ dmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ dmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ dmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/e23.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/e23.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/e23.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/e23.jp 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,28 @@ ++ ++ ++ ++ iijmio-mail.jp ++ miomio.jp ++ miobox.jp ++ e23.jp ++ x-il.jp ++ IIJmio セーフティメール ++ IIJmio ++ ++ mbox.iijmio-mail.jp ++ 110 ++ STARTTLS ++ %EMAILLOCALPART%.%EMAILDOMAIN% ++ secure ++ ++ ++ mbox.iijmio-mail.jp ++ 587 ++ STARTTLS ++ %EMAILLOCALPART%.%EMAILDOMAIN% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/earthlink.net evolution-2.30.2.new//capplet/settings/mail-autoconfig/earthlink.net +--- evolution-2.30.2//capplet/settings/mail-autoconfig/earthlink.net 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/earthlink.net 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,29 @@ ++ ++ ++ ++ ++ earthlink.net ++ ++ EarthLink ++ EarthLink ++ ++ ++ imap.earthlink.net ++ 143 ++ plain ++ %EMAILADDRESS% ++ secure ++ ++ ++ ++ smtpauth.earthlink.net ++ 587 ++ plain ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/ebony.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/ebony.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/ebony.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/ebony.plala.or.jp 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ebony.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ ebony.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ebony.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/email.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/email.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/email.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/email.plala.or.jp 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ email.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ email.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ email.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/fantasy.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/fantasy.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/fantasy.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/fantasy.plala.or.jp 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ fantasy.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ fantasy.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ fantasy.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/flamenco.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/flamenco.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/flamenco.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/flamenco.plala.or.jp 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ flamenco.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ flamenco.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ flamenco.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/fmail.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/fmail.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/fmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/fmail.plala.or.jp 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ fmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ fmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ fmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/free.fr evolution-2.30.2.new//capplet/settings/mail-autoconfig/free.fr +--- evolution-2.30.2//capplet/settings/mail-autoconfig/free.fr 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/free.fr 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,30 @@ ++ ++ ++ ++ ++ free.fr ++ ++ Free Telecom ++ free.fr ++ ++ ++ imap.free.fr ++ 143 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.free.fr ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ ++ true ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/freenet.de evolution-2.30.2.new//capplet/settings/mail-autoconfig/freenet.de +--- evolution-2.30.2//capplet/settings/mail-autoconfig/freenet.de 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/freenet.de 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,39 @@ ++ ++ ++ ++ ++ freenet.de ++ ++ Freenet Mail ++ Freenet ++ ++ ++ mx.freenet.de ++ ++ 993 ++ SSL ++ secure ++ %EMAILADDRESS% ++ ++ ++ ++ mx.freenet.de ++ ++ 465 ++ SSL ++ secure ++ %EMAILADDRESS% ++ true ++ false ++ ++ ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/fuga.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/fuga.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/fuga.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/fuga.plala.or.jp 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ fuga.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ fuga.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ fuga.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/gmail.com evolution-2.30.2.new//capplet/settings/mail-autoconfig/gmail.com +--- evolution-2.30.2//capplet/settings/mail-autoconfig/gmail.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/gmail.com 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,32 @@ ++ ++ ++ ++ ++ gmail.com ++ googlemail.com ++ ++ Google Mail ++ GMail ++ ++ ++ imap.googlemail.com ++ 993 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.googlemail.com ++ 465 ++ SSL ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ You need to enable IMAP access ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/gmail.com imap evolution-2.30.2.new//capplet/settings/mail-autoconfig/gmail.com imap +--- evolution-2.30.2//capplet/settings/mail-autoconfig/gmail.com imap 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/gmail.com imap 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,32 @@ ++ ++ ++ ++ ++ gmail.com ++ googlemail.com ++ ++ Google Mail ++ GMail ++ ++ ++ imap.googlemail.com ++ 993 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.googlemail.com ++ 465 ++ SSL ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ You need to enable IMAP access ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/gmail.com pop evolution-2.30.2.new//capplet/settings/mail-autoconfig/gmail.com pop +--- evolution-2.30.2//capplet/settings/mail-autoconfig/gmail.com pop 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/gmail.com pop 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,35 @@ ++ ++ ++ ++ ++ gmail.com ++ googlemail.com ++ ++ Google Mail ++ GMail ++ ++ ++ pop.googlemail.com ++ 995 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ ++ true ++ ++ ++ ++ ++ smtp.googlemail.com ++ 465 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ You need to enable POP access ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/gmail.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/gmail.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/gmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/gmail.plala.or.jp 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ gmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ gmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ gmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/gmx.com evolution-2.30.2.new//capplet/settings/mail-autoconfig/gmx.com +--- evolution-2.30.2//capplet/settings/mail-autoconfig/gmx.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/gmx.com 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ gmx.com ++ GMX Freemail ++ GMX ++ ++ imap.gmx.com ++ 993 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ mail.gmx.com ++ 465 ++ SSL ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/gmx.net evolution-2.30.2.new//capplet/settings/mail-autoconfig/gmx.net +--- evolution-2.30.2//capplet/settings/mail-autoconfig/gmx.net 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/gmx.net 2010-06-22 13:37:26.756114033 +0200 +@@ -0,0 +1,39 @@ ++ ++ ++ ++ ++ gmx.de ++ gmx.net ++ gmx.ch ++ gmx.at ++ gmx.li ++ gmx.fr ++ gmx.it ++ gmx.co.uk ++ ++ ++ GMX Freemail ++ GMX ++ ++ ++ pop.gmx.net ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ mail.gmx.net ++ 465 ++ SSL ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/googlemail.com evolution-2.30.2.new//capplet/settings/mail-autoconfig/googlemail.com +--- evolution-2.30.2//capplet/settings/mail-autoconfig/googlemail.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/googlemail.com 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,32 @@ ++ ++ ++ ++ ++ gmail.com ++ googlemail.com ++ ++ Google Mail ++ GMail ++ ++ ++ imap.googlemail.com ++ 993 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.googlemail.com ++ 465 ++ SSL ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ You need to enable IMAP access ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/goo.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/goo.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/goo.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/goo.jp 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ goo.jp ++ goo メールアドバンス ++ goo ++ ++ pop.mail.goo.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.mail.goo.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/go.tvm.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/go.tvm.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/go.tvm.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/go.tvm.ne.jp 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ go.tvm.ne.jp ++ テレビ松本ケーブルインターネットサービス ++ TVM-Net ++ ++ go.tvm.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ go.tvm.ne.jp ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/grape.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/grape.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/grape.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/grape.plala.or.jp 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ grape.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ grape.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ grape.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/gray.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/gray.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/gray.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/gray.plala.or.jp 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ gray.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ gray.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ gray.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/hal.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/hal.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/hal.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/hal.ne.jp 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ hal.ne.jp ++ ハルインターネット ++ HAL ++ ++ mail.hal.ne.jp ++ 110 ++ plain ++ %EMAILADDRESS% ++ plain ++ ++ ++ mail.hal.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/hana.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/hana.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/hana.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/hana.or.jp 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ hana.or.jp ++ きたうら花ねっと ++ 花ねっと ++ ++ mail.hana.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ mail.hana.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/hotmail.co.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/hotmail.co.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/hotmail.co.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/hotmail.co.jp 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,40 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/hotmail.com evolution-2.30.2.new//capplet/settings/mail-autoconfig/hotmail.com +--- evolution-2.30.2//capplet/settings/mail-autoconfig/hotmail.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/hotmail.com 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/hotmail.co.uk evolution-2.30.2.new//capplet/settings/mail-autoconfig/hotmail.co.uk +--- evolution-2.30.2//capplet/settings/mail-autoconfig/hotmail.co.uk 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/hotmail.co.uk 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/hotmail.de evolution-2.30.2.new//capplet/settings/mail-autoconfig/hotmail.de +--- evolution-2.30.2//capplet/settings/mail-autoconfig/hotmail.de 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/hotmail.de 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/hotmail.fr evolution-2.30.2.new//capplet/settings/mail-autoconfig/hotmail.fr +--- evolution-2.30.2//capplet/settings/mail-autoconfig/hotmail.fr 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/hotmail.fr 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/hotmail.it evolution-2.30.2.new//capplet/settings/mail-autoconfig/hotmail.it +--- evolution-2.30.2//capplet/settings/mail-autoconfig/hotmail.it 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/hotmail.it 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/ic-net.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/ic-net.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/ic-net.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/ic-net.or.jp 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ic-net.or.jp ++ IC-NET ++ IC-NET ++ ++ mail.ic-net.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.ic-net.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/iiyama-catv.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/iiyama-catv.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/iiyama-catv.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/iiyama-catv.ne.jp 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,23 @@ ++ ++ ++ ++ iiyama-catv.ne.jp ++ ケーブルテレビiネット飯山 ++ iネット飯山 ++ ++ mail.iiyama-catv.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.iiyama-catv.ne.jp ++ 25 ++ plain ++ none ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/imail.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/imail.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/imail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/imail.plala.or.jp 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ imail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ imail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ imail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/inbox.lt evolution-2.30.2.new//capplet/settings/mail-autoconfig/inbox.lt +--- evolution-2.30.2//capplet/settings/mail-autoconfig/inbox.lt 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/inbox.lt 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,28 @@ ++ ++ ++ ++ inbox.lt ++ Inbox.lt ++ Inbox.lt ++ ++ mail.inbox.lt ++ 995 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ ++ true ++ 999 ++ ++ ++ ++ mail.inbox.lt ++ 587 ++ STARTTLS ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/inbox.lv evolution-2.30.2.new//capplet/settings/mail-autoconfig/inbox.lv +--- evolution-2.30.2//capplet/settings/mail-autoconfig/inbox.lv 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/inbox.lv 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,28 @@ ++ ++ ++ ++ inbox.lv ++ Inbox.lv ++ Inbox.lv ++ ++ mail.inbox.lv ++ 995 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ ++ true ++ 999 ++ ++ ++ ++ mail.inbox.lv ++ 587 ++ STARTTLS ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/indigo.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/indigo.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/indigo.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/indigo.plala.or.jp 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ indigo.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ indigo.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ indigo.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/inet-shibata.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/inet-shibata.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/inet-shibata.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/inet-shibata.or.jp 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ inet-shibata.or.jp ++ インターネット新発田 ++ INET-SHIBATA ++ ++ po.inet-shibata.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ po.inet-shibata.or.jp ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/ivory.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/ivory.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/ivory.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/ivory.plala.or.jp 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ivory.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ ivory.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ivory.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/iwafune.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/iwafune.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/iwafune.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/iwafune.ne.jp 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ iwafune.ne.jp ++ インターネットいわふね ++ IWAFUNE ++ ++ po.iwafune.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ po.iwafune.ne.jp ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/jade.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/jade.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/jade.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/jade.plala.or.jp 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ jade.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ jade.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ jade.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/janis.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/janis.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/janis.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/janis.or.jp 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,44 @@ ++ ++ ++ ++ janis.or.jp ++ azm.janis.or.jp ++ ckm.janis.or.jp ++ dhk.janis.or.jp ++ dia.janis.or.jp ++ grn.janis.or.jp ++ ina.janis.or.jp ++ kis.janis.or.jp ++ mhl.janis.or.jp ++ mid.janis.or.jp ++ mis.janis.or.jp ++ miy.janis.or.jp ++ ngn.janis.or.jp ++ nkn.janis.or.jp ++ osk.janis.or.jp ++ sas.janis.or.jp ++ sko.janis.or.jp ++ swk.janis.or.jp ++ tgk.janis.or.jp ++ tyt.janis.or.jp ++ ued.janis.or.jp ++ ytg.janis.or.jp ++ JANIS ++ JANIS ++ ++ mail.%EMAILDOMAIN% ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.%EMAILDOMAIN% ++ 25 ++ plain ++ none ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/jet.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/jet.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/jet.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/jet.ne.jp 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ jet.ne.jp ++ JETINTERNET ++ JET ++ ++ pop.jet.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ secure ++ ++ ++ smtp.jet.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/jet.ne.jp imap evolution-2.30.2.new//capplet/settings/mail-autoconfig/jet.ne.jp imap +--- evolution-2.30.2//capplet/settings/mail-autoconfig/jet.ne.jp imap 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/jet.ne.jp imap 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ jet.ne.jp ++ JETINTERNET ++ JET ++ ++ imap.jet.ne.jp ++ 993 ++ SSL ++ %EMAILLOCALPART% ++ secure ++ ++ ++ smtp.jet.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/jet.ne.jp pop evolution-2.30.2.new//capplet/settings/mail-autoconfig/jet.ne.jp pop +--- evolution-2.30.2//capplet/settings/mail-autoconfig/jet.ne.jp pop 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/jet.ne.jp pop 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ jet.ne.jp ++ JETINTERNET ++ JET ++ ++ pop.jet.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ secure ++ ++ ++ smtp.jet.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/ji.jet.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/ji.jet.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/ji.jet.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/ji.jet.ne.jp 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ jet.ne.jp ++ JETINTERNET ++ JET ++ ++ pop02.jet.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ secure ++ ++ ++ smtp02.jet.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/jmail.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/jmail.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/jmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/jmail.plala.or.jp 2010-06-22 13:37:26.760114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ jmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ jmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ jmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/k1.wind.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/k1.wind.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/k1.wind.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/k1.wind.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,32 @@ ++ ++ ++ ++ kl.wind.ne.jp ++ kl.wind.jp ++ kl.wind.co.jp ++ kl.gunmanet.or.jp ++ kl.gunmanet.ne.jp ++ k1.wind.ne.jp ++ k1.wind.jp ++ k1.gunmanet.or.jp ++ k1.gunmanet.ne.jp ++ 群馬インターネット ++ wind ++ ++ kl.wind.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ kl.wind.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/khaki.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/khaki.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/khaki.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/khaki.plala.or.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ khaki.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ khaki.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ khaki.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/kmail.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/kmail.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/kmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/kmail.plala.or.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ kmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ kmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ kmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/kokuyou.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/kokuyou.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/kokuyou.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/kokuyou.ne.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,23 @@ ++ ++ ++ ++ kokuyou.ne.jp ++ 長和町黒耀の里ゆいねっと ++ ゆいねっと ++ ++ mail.kokuyou.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.kokuyou.ne.jp ++ 25 ++ plain ++ none ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/lapis.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/lapis.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/lapis.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/lapis.plala.or.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ lapis.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ lapis.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ lapis.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/laposte.net evolution-2.30.2.new//capplet/settings/mail-autoconfig/laposte.net +--- evolution-2.30.2//capplet/settings/mail-autoconfig/laposte.net 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/laposte.net 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,29 @@ ++ ++ ++ ++ ++ laposte.net ++ ++ LaPoste.net ++ LaPoste ++ ++ ++ imap.laposte.net ++ 143 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.laposte.net ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/lemon.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/lemon.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/lemon.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/lemon.plala.or.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ lemon.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ lemon.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ lemon.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/lilac.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/lilac.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/lilac.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/lilac.plala.or.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ lilac.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ lilac.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ lilac.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/lime.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/lime.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/lime.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/lime.plala.or.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ lime.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ lime.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ lime.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/live.co.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/live.co.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/live.co.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/live.co.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,40 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/live.com evolution-2.30.2.new//capplet/settings/mail-autoconfig/live.com +--- evolution-2.30.2//capplet/settings/mail-autoconfig/live.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/live.com 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/live.co.uk evolution-2.30.2.new//capplet/settings/mail-autoconfig/live.co.uk +--- evolution-2.30.2//capplet/settings/mail-autoconfig/live.co.uk 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/live.co.uk 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/live.de evolution-2.30.2.new//capplet/settings/mail-autoconfig/live.de +--- evolution-2.30.2//capplet/settings/mail-autoconfig/live.de 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/live.de 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/live.fr evolution-2.30.2.new//capplet/settings/mail-autoconfig/live.fr +--- evolution-2.30.2//capplet/settings/mail-autoconfig/live.fr 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/live.fr 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/live.it evolution-2.30.2.new//capplet/settings/mail-autoconfig/live.it +--- evolution-2.30.2//capplet/settings/mail-autoconfig/live.it 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/live.it 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/ma100.tiki.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/ma100.tiki.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/ma100.tiki.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/ma100.tiki.ne.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,54 @@ ++ ++ ++ ++ mx1.tiki.ne.jp ++ mx2.et.tiki.ne.jp ++ mx2.tiki.ne.jp ++ mx2.wt.tiki.ne.jp ++ mx3.et.tiki.ne.jp ++ mx3.tiki.ne.jp ++ mx4.et.tiki.ne.jp ++ mx4.tiki.ne.jp ++ mx5.et.tiki.ne.jp ++ mx5.tiki.ne.jp ++ mx6.et.tiki.ne.jp ++ mx6.tiki.ne.jp ++ mx7.tiki.ne.jp ++ mx8.tiki.ne.jp ++ mx9.tiki.ne.jp ++ mx21.tiki.ne.jp ++ mx22.tiki.ne.jp ++ mx31.tiki.ne.jp ++ mx32.tiki.ne.jp ++ mx35.tiki.ne.jp ++ mx36.tiki.ne.jp ++ mx41.tiki.ne.jp ++ mx51.et.tiki.ne.jp ++ mx51.tiki.ne.jp ++ mx52.tiki.ne.jp ++ mx61.tiki.ne.jp ++ mx71.tiki.ne.jp ++ mx81.tiki.ne.jp ++ mx82.tiki.ne.jp ++ mx91.tiki.ne.jp ++ ma100.tiki.ne.jp ++ TikiTikiインターネット ++ TikiTiki ++ ++ %EMAILDOMAIN% ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp-auth.tiki.ne.jp ++ 587 ++ plain ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/mac.com evolution-2.30.2.new//capplet/settings/mail-autoconfig/mac.com +--- evolution-2.30.2//capplet/settings/mail-autoconfig/mac.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/mac.com 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,30 @@ ++ ++ ++ ++ ++ mac.com ++ me.com ++ ++ Apple MobileMe ++ Apple ++ ++ ++ mail.me.com ++ 993 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.me.com ++ 465 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/mahoroba.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/mahoroba.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/mahoroba.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/mahoroba.ne.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ mahoroba.ne.jp ++ インターネットまほろば ++ まほろば ++ ++ mail.mahoroba.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ mail.mahoroba.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/mail.gunmanet.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/mail.gunmanet.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/mail.gunmanet.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/mail.gunmanet.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,29 @@ ++ ++ ++ ++ mail.wind.ne.jp ++ mail.wind.jp ++ mail.wind.co.jp ++ mail.gunmanet.or.jp ++ mail.gunmanet.ne.jp ++ mail.gunmanet.jp ++ 群馬インターネット ++ wind ++ ++ mail.wind.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ mail.wind.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/mail.iwafune.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/mail.iwafune.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/mail.iwafune.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/mail.iwafune.ne.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ mail.iwafune.ne.jp ++ インターネットいわふね ++ IWAFUNE ++ ++ mail.iwafune.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ mail.iwafune.ne.jp ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/Makefile.am evolution-2.30.2.new//capplet/settings/mail-autoconfig/Makefile.am +--- evolution-2.30.2//capplet/settings/mail-autoconfig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/Makefile.am 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,186 @@ ++autoconfig_DATA = \ ++ abc.plala.or.jp \ ++ agate.plala.or.jp \ ++ amail.plala.or.jp \ ++ amber.plala.or.jp \ ++ a.memail.jp \ ++ amethyst.broba.cc \ ++ aol.com \ ++ apost.plala.or.jp \ ++ aqua.plala.or.jp \ ++ arcor.de \ ++ ballade.plala.or.jp \ ++ bay.gunmanet.ne.jp \ ++ bb-niigata.jp \ ++ bc.iij4u.or.jp \ ++ beige.plala.or.jp \ ++ blue.plala.or.jp \ ++ bmail.plala.or.jp \ ++ bolero.plala.or.jp \ ++ bpost.plala.or.jp \ ++ brown.plala.or.jp \ ++ camel.plala.or.jp \ ++ cameo.plala.or.jp \ ++ cc9.ne.jp \ ++ cek.ne.jp \ ++ clio.ne.jp \ ++ cmail.plala.or.jp \ ++ co1.wind.jp \ ++ co2.wind.jp \ ++ co3.wind.jp \ ++ cocoa.plala.or.jp \ ++ coda.plala.or.jp \ ++ comcast.net \ ++ concerto.plala.or.jp \ ++ coral.plala.or.jp \ ++ courante.plala.or.jp \ ++ cpost.plala.or.jp \ ++ cream.plala.or.jp \ ++ dance.plala.or.jp \ ++ dan.gunmanet.ne.jp \ ++ dmail.plala.or.jp \ ++ e23.jp \ ++ earthlink.net \ ++ ebony.plala.or.jp \ ++ email.plala.or.jp \ ++ fantasy.plala.or.jp \ ++ flamenco.plala.or.jp \ ++ fmail.plala.or.jp \ ++ free.fr \ ++ freenet.de \ ++ fuga.plala.or.jp \ ++ gmail.com \ ++ gmail.plala.or.jp \ ++ gmx.com \ ++ gmx.net \ ++ googlemail.com \ ++ goo.jp \ ++ go.tvm.ne.jp \ ++ grape.plala.or.jp \ ++ gray.plala.or.jp \ ++ hal.ne.jp \ ++ hana.or.jp \ ++ hotmail.co.jp \ ++ hotmail.com \ ++ hotmail.co.uk \ ++ hotmail.de \ ++ hotmail.fr \ ++ hotmail.it \ ++ ic-net.or.jp \ ++ iiyama-catv.ne.jp \ ++ imail.plala.or.jp \ ++ inbox.lt \ ++ inbox.lv \ ++ indigo.plala.or.jp \ ++ inet-shibata.or.jp \ ++ ivory.plala.or.jp \ ++ iwafune.ne.jp \ ++ jade.plala.or.jp \ ++ janis.or.jp \ ++ jet.ne.jp \ ++ ji.jet.ne.jp \ ++ jmail.plala.or.jp \ ++ k1.wind.jp \ ++ khaki.plala.or.jp \ ++ kmail.plala.or.jp \ ++ kokuyou.ne.jp \ ++ lapis.plala.or.jp \ ++ laposte.net \ ++ lemon.plala.or.jp \ ++ lilac.plala.or.jp \ ++ lime.plala.or.jp \ ++ live.co.jp \ ++ live.com \ ++ live.co.uk \ ++ live.de \ ++ live.fr \ ++ live.it \ ++ ma100.tiki.ne.jp \ ++ mac.com \ ++ mahoroba.ne.jp \ ++ mail.gunmanet.jp \ ++ mail.iwafune.ne.jp \ ++ maroon.plala.or.jp \ ++ me.com \ ++ minuet.plala.or.jp \ ++ ml.murakami.ne.jp \ ++ ml.shibata.ne.jp \ ++ mnet.ne.jp \ ++ mopera.net \ ++ msn.com \ ++ navy.plala.or.jp \ ++ nifty.com \ ++ nsat.jp \ ++ olive.plala.or.jp \ ++ online.de \ ++ opal.plala.or.jp \ ++ orange.fr \ ++ orange.plala.or.jp \ ++ orchid.plala.or.jp \ ++ palette.plala.or.jp \ ++ pal.kijimadaira.jp \ ++ parabox.or.jp \ ++ peach.plala.or.jp \ ++ peoplepc.com \ ++ plum.plala.or.jp \ ++ po.dcn.ne.jp \ ++ polka.plala.or.jp \ ++ pop.shibata.ne.jp \ ++ po.wind.jp \ ++ purple.plala.or.jp \ ++ rainbow.plala.or.jp \ ++ red.plala.or.jp \ ++ rmail.plala.or.jp \ ++ rondo.plala.or.jp \ ++ rose.plala.or.jp \ ++ rouge.plala.or.jp \ ++ ruby.plala.or.jp \ ++ sakunet.ne.jp \ ++ sea.plala.or.jp \ ++ sepia.plala.or.jp \ ++ serenade.plala.or.jp \ ++ silk.plala.or.jp \ ++ silver.plala.or.jp \ ++ sky.plala.or.jp \ ++ smail.plala.or.jp \ ++ snow.plala.or.jp \ ++ sonata.plala.or.jp \ ++ so.wind.ne.jp \ ++ suite.plala.or.jp \ ++ symphony.plala.or.jp \ ++ taupe.plala.or.jp \ ++ tiki.ne.jp \ ++ tmail.plala.or.jp \ ++ toccata.plala.or.jp \ ++ t-online.de \ ++ topaz.plala.or.jp \ ++ trio.plala.or.jp \ ++ umail.plala.or.jp \ ++ verizon.net \ ++ violet.plala.or.jp \ ++ vm.aikis.or.jp \ ++ vmail.plala.or.jp \ ++ vp.tiki.ne.jp \ ++ waltz.plala.or.jp \ ++ wanadoo.fr \ ++ wave.plala.or.jp \ ++ web.de \ ++ white.plala.or.jp \ ++ wine.plala.or.jp \ ++ wmail.plala.or.jp \ ++ xmail.plala.or.jp \ ++ xpost.plala.or.jp \ ++ xp.wind.jp \ ++ xs4all.nl \ ++ yahoo.com \ ++ ybb.ne.jp \ ++ yellow.plala.or.jp \ ++ ymail.plala.or.jp \ ++ ypost.plala.or.jp \ ++ zmail.plala.or.jp ++ ++autoconfigdir = $(privdatadir)/mail-autoconfig ++ ++EXTRA_DIST = \ ++ $(autoconfig_DATA) \ ++ README +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/maroon.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/maroon.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/maroon.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/maroon.plala.or.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ maroon.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ maroon.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ maroon.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/me.com evolution-2.30.2.new//capplet/settings/mail-autoconfig/me.com +--- evolution-2.30.2//capplet/settings/mail-autoconfig/me.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/me.com 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,30 @@ ++ ++ ++ ++ ++ mac.com ++ me.com ++ ++ Apple MobileMe ++ Apple ++ ++ ++ mail.me.com ++ 993 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.me.com ++ 465 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/minuet.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/minuet.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/minuet.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/minuet.plala.or.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ minuet.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ minuet.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ minuet.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/ml.murakami.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/ml.murakami.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/ml.murakami.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/ml.murakami.ne.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,29 @@ ++ ++ ++ ++ ++ ml.murakami.ne.jp ++ ++ インターネットいわふね ++ IWAFUNE ++ ++ ++ ml.murakami.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ ml.murakami.ne.jp ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/ml.shibata.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/ml.shibata.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/ml.shibata.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/ml.shibata.ne.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,25 @@ ++ ++ ++ ++ pop.shibata.ne.jp ++ ml.shibata.ne.jp ++ インターネット新発田 ++ INET-SHIBATA ++ ++ %EMAILDOMAIN% ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ %EMAILDOMAIN% ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/mnet.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/mnet.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/mnet.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/mnet.ne.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ mnet.ne.jp ++ Mnet メール サービス ++ Mnetメール ++ ++ mail.mnet.ne.jp ++ 110 ++ plain ++ %EMAILADDRESS% ++ secure ++ ++ ++ mail.mnet.ne.jp ++ 587 ++ plain ++ %EMAILADDRESS% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/mopera.net evolution-2.30.2.new//capplet/settings/mail-autoconfig/mopera.net +--- evolution-2.30.2//capplet/settings/mail-autoconfig/mopera.net 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/mopera.net 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ mopera.net ++ mopera U ++ mopera U ++ ++ mail.mopera.net ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ mail.mopera.net ++ 587 ++ plain ++ %EMAILLOCALPART% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/msn.com evolution-2.30.2.new//capplet/settings/mail-autoconfig/msn.com +--- evolution-2.30.2//capplet/settings/mail-autoconfig/msn.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/msn.com 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,41 @@ ++ ++ ++ ++ ++ hotmail.com ++ hotmail.co.uk ++ hotmail.co.jp ++ hotmail.de ++ hotmail.fr ++ hotmail.it ++ live.com ++ live.co.uk ++ live.co.jp ++ live.de ++ live.fr ++ live.it ++ msn.com ++ ++ Microsoft Live Hotmail ++ Hotmail ++ ++ ++ pop3.live.com ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ smtp.live.com ++ 587 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/navy.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/navy.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/navy.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/navy.plala.or.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ navy.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ navy.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ navy.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/nifty.com evolution-2.30.2.new//capplet/settings/mail-autoconfig/nifty.com +--- evolution-2.30.2//capplet/settings/mail-autoconfig/nifty.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/nifty.com 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ nifty.com ++ @nifty ++ @nifty ++ ++ pop.nifty.com ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.nifty.com ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/nsat.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/nsat.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/nsat.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/nsat.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ nsat.jp ++ ＢＢにいがた ++ NSAT ++ ++ mail.nsat.jp ++ 110 ++ plain ++ %EMAILADDRESS% ++ secure ++ ++ ++ mail.nsat.jp ++ 587 ++ plain ++ %EMAILADDRESS% ++ secure ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/olive.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/olive.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/olive.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/olive.plala.or.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ olive.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ olive.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ olive.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/online.de evolution-2.30.2.new//capplet/settings/mail-autoconfig/online.de +--- evolution-2.30.2//capplet/settings/mail-autoconfig/online.de 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/online.de 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,43 @@ ++ ++ ++ ++ ++ online.de ++ onlinehome.de ++ sofortstart.de ++ sofort-start.de ++ sofortsurf.de ++ sofort-surf.de ++ go4more.de ++ ++ 1&1 ++ 1&1 ++ ++ ++ imap.1und1.de ++ 993 ++ SSL ++ ++ plain ++ %EMAILADDRESS% ++ ++ ++ ++ smtp.1und1.de ++ 587 ++ STARTTLS ++ plain ++ %EMAILADDRESS% ++ true ++ false ++ ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/opal.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/opal.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/opal.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/opal.plala.or.jp 2010-06-22 13:37:26.764114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ opal.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ opal.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ opal.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/orange.fr evolution-2.30.2.new//capplet/settings/mail-autoconfig/orange.fr +--- evolution-2.30.2//capplet/settings/mail-autoconfig/orange.fr 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/orange.fr 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,30 @@ ++ ++ ++ ++ ++ wanadoo.fr ++ orange.fr ++ ++ France Telecom / Orange ++ Orange ++ ++ ++ pop.orange.fr ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.orange.fr ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/orange.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/orange.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/orange.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/orange.plala.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ orange.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ orange.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ orange.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/orchid.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/orchid.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/orchid.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/orchid.plala.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ orchid.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ orchid.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ orchid.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/palette.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/palette.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/palette.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/palette.plala.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ palette.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ palette.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ palette.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/pal.kijimadaira.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/pal.kijimadaira.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/pal.kijimadaira.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/pal.kijimadaira.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,23 @@ ++ ++ ++ ++ pal.kijimadaira.jp ++ 木島平村FTTH ++ 木島平村FTTH ++ ++ mail.pal.kijimadaira.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.pal.kijimadaira.jp ++ 25 ++ plain ++ none ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/parabox.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/parabox.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/parabox.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/parabox.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ parabox.or.jp ++ パラボックス ++ PARABOX ++ ++ pop3.parabox.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.parabox.or.jp ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/peach.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/peach.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/peach.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/peach.plala.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ peach.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ peach.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ peach.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/peoplepc.com evolution-2.30.2.new//capplet/settings/mail-autoconfig/peoplepc.com +--- evolution-2.30.2//capplet/settings/mail-autoconfig/peoplepc.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/peoplepc.com 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,29 @@ ++ ++ ++ ++ ++ peoplepc.com ++ ++ PeoplePC ++ PeoplePC ++ ++ ++ imap.peoplepc.com ++ 143 ++ plain ++ %EMAILADDRESS% ++ secure ++ ++ ++ ++ smtpauth.peoplepc.com ++ 587 ++ plain ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/plum.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/plum.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/plum.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/plum.plala.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ plum.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ plum.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ plum.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/po.dcn.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/po.dcn.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/po.dcn.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/po.dcn.ne.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,23 @@ ++ ++ ++ ++ po.dcn.ne.jp ++ DCNインターネットサービス ++ DCN ++ ++ po.dcn.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ po.dcn.ne.jp ++ 25 ++ plain ++ none ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/polka.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/polka.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/polka.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/polka.plala.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ polka.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ polka.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ polka.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/pop.shibata.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/pop.shibata.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/pop.shibata.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/pop.shibata.ne.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,25 @@ ++ ++ ++ ++ pop.shibata.ne.jp ++ ml.shibata.ne.jp ++ インターネット新発田 ++ INET-SHIBATA ++ ++ %EMAILDOMAIN% ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ %EMAILDOMAIN% ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/po.wind.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/po.wind.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/po.wind.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/po.wind.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,28 @@ ++ ++ ++ ++ po.wind.ne.jp ++ po.wind.jp ++ po.wind.co.jp ++ po.gunmanet.or.jp ++ po.gunmanet.ne.jp ++ 群馬インターネット ++ wind ++ ++ po.wind.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ po.wind.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/purple.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/purple.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/purple.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/purple.plala.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ purple.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ purple.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ purple.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/rainbow.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/rainbow.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/rainbow.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/rainbow.plala.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ rainbow.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ rainbow.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ rainbow.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/README evolution-2.30.2.new//capplet/settings/mail-autoconfig/README +--- evolution-2.30.2//capplet/settings/mail-autoconfig/README 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/README 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,12 @@ ++The files in this directory are used by Evolution's control center ++capplet to automatically configure email accounts. This so that you ++can tell it, "My mail is example@gmail.com" and it will automatically ++figure out that it must use imap.googlemail.com and smtp.googlemail.com. ++ ++These files are copied from ++http://live.mozillamessaging.com/autoconfig/ ++ ++We should update these files periodically, maybe. ++ ++ Federico Mena Quintero ++ March 2010 +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/red.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/red.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/red.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/red.plala.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ red.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ red.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ red.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/rmail.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/rmail.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/rmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/rmail.plala.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ rmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ rmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ rmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/rondo.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/rondo.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/rondo.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/rondo.plala.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ rondo.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ rondo.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ rondo.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/rose.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/rose.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/rose.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/rose.plala.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ rose.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ rose.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ rose.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/rouge.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/rouge.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/rouge.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/rouge.plala.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ rouge.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ rouge.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ rouge.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/ruby.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/ruby.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/ruby.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/ruby.plala.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ruby.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ ruby.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ruby.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/sakunet.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/sakunet.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/sakunet.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/sakunet.ne.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,23 @@ ++ ++ ++ ++ sakunet.ne.jp ++ 佐久ケーブルテレビ ++ Saku-Net ++ ++ mail.sakunet.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp.sakunet.ne.jp ++ 25 ++ plain ++ none ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/sea.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/sea.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/sea.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/sea.plala.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ sea.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ sea.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ sea.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/sepia.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/sepia.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/sepia.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/sepia.plala.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ sepia.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ sepia.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ sepia.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/serenade.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/serenade.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/serenade.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/serenade.plala.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ serenade.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ serenade.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ serenade.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/silk.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/silk.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/silk.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/silk.plala.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ silk.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ silk.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ silk.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/silver.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/silver.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/silver.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/silver.plala.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ silver.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ silver.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ silver.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/sky.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/sky.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/sky.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/sky.plala.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ sky.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ sky.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ sky.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/smail.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/smail.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/smail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/smail.plala.or.jp 2010-06-22 13:37:26.768114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ smail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ smail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/snow.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/snow.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/snow.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/snow.plala.or.jp 2010-06-22 13:37:26.772114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ snow.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ snow.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ snow.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/sonata.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/sonata.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/sonata.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/sonata.plala.or.jp 2010-06-22 13:37:26.772114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ sonata.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ sonata.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ sonata.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/so.wind.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/so.wind.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/so.wind.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/so.wind.ne.jp 2010-06-22 13:37:26.772114033 +0200 +@@ -0,0 +1,25 @@ ++ ++ ++ ++ so.wind.ne.jp ++ so.wind.jp ++ 群馬インターネット ++ wind ++ ++ so.wind.ne.jp ++ 143 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ so.wind.ne.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/suite.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/suite.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/suite.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/suite.plala.or.jp 2010-06-22 13:37:26.772114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ suite.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ suite.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ suite.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/symphony.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/symphony.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/symphony.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/symphony.plala.or.jp 2010-06-22 13:37:26.772114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ symphony.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ symphony.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ symphony.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/taupe.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/taupe.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/taupe.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/taupe.plala.or.jp 2010-06-22 13:37:26.772114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ taupe.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ taupe.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ taupe.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/tiki.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/tiki.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/tiki.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/tiki.ne.jp 2010-06-22 13:37:26.772114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ tiki.ne.jp ++ TikiTikiインターネット ++ TikiTiki ++ ++ mx.tiki.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ smtp-auth.tiki.ne.jp ++ 587 ++ plain ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/tmail.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/tmail.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/tmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/tmail.plala.or.jp 2010-06-22 13:37:26.772114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ tmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ tmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ tmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/toccata.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/toccata.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/toccata.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/toccata.plala.or.jp 2010-06-22 13:37:26.772114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ toccata.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ toccata.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ toccata.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/t-online.de evolution-2.30.2.new//capplet/settings/mail-autoconfig/t-online.de +--- evolution-2.30.2//capplet/settings/mail-autoconfig/t-online.de 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/t-online.de 2010-06-22 13:37:26.772114033 +0200 +@@ -0,0 +1,32 @@ ++ ++ ++ ++ ++ t-online.de ++ ++ T-Online email Paket ++ T-Online ++ ++ ++ popmail.t-online.de ++ 110 ++ plain ++ %EMAILADDRESS% ++ secure ++ ++ ++ ++ smtpmail.t-online.de ++ 25 ++ plain ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/t-online.de free evolution-2.30.2.new//capplet/settings/mail-autoconfig/t-online.de free +--- evolution-2.30.2//capplet/settings/mail-autoconfig/t-online.de free 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/t-online.de free 2010-06-22 13:37:26.772114033 +0200 +@@ -0,0 +1,32 @@ ++ ++ ++ ++ ++ t-online.de ++ ++ T-Online email Paket ++ T-Online ++ ++ ++ popmail.t-online.de ++ 110 ++ plain ++ %EMAILADDRESS% ++ secure ++ ++ ++ ++ smtpmail.t-online.de ++ 25 ++ plain ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/t-online.de imap ssl evolution-2.30.2.new//capplet/settings/mail-autoconfig/t-online.de imap ssl +--- evolution-2.30.2//capplet/settings/mail-autoconfig/t-online.de imap ssl 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/t-online.de imap ssl 2010-06-22 13:37:26.772114033 +0200 +@@ -0,0 +1,32 @@ ++ ++ ++ ++ ++ t-online.de ++ ++ T-Online email Paket ++ T-Online ++ ++ ++ secure-imap.t-online.de ++ 993 ++ SSL ++ %EMAILADDRESS% ++ secure ++ ++ ++ ++ securesmtp.googlemail.com ++ 25 ++ STARTTLS ++ %EMAILADDRESS% ++ secure ++ true ++ false ++ ++ ++ You need to enable POP access ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/t-online.de pop ssl evolution-2.30.2.new//capplet/settings/mail-autoconfig/t-online.de pop ssl +--- evolution-2.30.2//capplet/settings/mail-autoconfig/t-online.de pop ssl 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/t-online.de pop ssl 2010-06-22 13:37:26.772114033 +0200 +@@ -0,0 +1,32 @@ ++ ++ ++ ++ ++ t-online.de ++ ++ T-Online email Paket ++ T-Online ++ ++ ++ securepop.t-online.de ++ 995 ++ SSL ++ %EMAILADDRESS% ++ plain ++ ++ ++ ++ securesmtp.t-online.de ++ 25 ++ STARTTLS ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/topaz.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/topaz.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/topaz.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/topaz.plala.or.jp 2010-06-22 13:37:26.772114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ topaz.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ topaz.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ topaz.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/trio.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/trio.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/trio.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/trio.plala.or.jp 2010-06-22 13:37:26.772114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ trio.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ trio.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ trio.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/umail.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/umail.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/umail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/umail.plala.or.jp 2010-06-22 13:37:26.772114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ umail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ umail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ umail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/verizon.net evolution-2.30.2.new//capplet/settings/mail-autoconfig/verizon.net +--- evolution-2.30.2//capplet/settings/mail-autoconfig/verizon.net 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/verizon.net 2010-06-22 13:37:26.772114033 +0200 +@@ -0,0 +1,29 @@ ++ ++ ++ ++ ++ verizon.net ++ ++ Verizon Online ++ Verizon ++ ++ ++ incoming.verizon.com ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ outgoing.verizon.net ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/violet.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/violet.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/violet.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/violet.plala.or.jp 2010-06-22 13:37:26.772114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ violet.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ violet.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ violet.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/vm.aikis.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/vm.aikis.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/vm.aikis.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/vm.aikis.or.jp 2010-06-22 13:37:26.772114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ vm.aikis.or.jp ++ aikis ++ aikis ++ ++ mail.aikis.or.jp ++ 995 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ ++ ++ mail.aikis.or.jp ++ 587 ++ STARTTLS ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/vmail.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/vmail.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/vmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/vmail.plala.or.jp 2010-06-22 13:37:26.772114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ vmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ vmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ vmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/vp.tiki.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/vp.tiki.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/vp.tiki.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/vp.tiki.ne.jp 2010-06-22 13:37:26.772114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ vp.tiki.ne.jp ++ TikiTikiインターネット ++ TikiTiki ++ ++ vp.tiki.ne.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ vs.tiki.ne.jp ++ 587 ++ plain ++ %EMAILADDRESS% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/waltz.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/waltz.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/waltz.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/waltz.plala.or.jp 2010-06-22 13:37:26.776114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ waltz.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ waltz.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ waltz.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/wanadoo.fr evolution-2.30.2.new//capplet/settings/mail-autoconfig/wanadoo.fr +--- evolution-2.30.2//capplet/settings/mail-autoconfig/wanadoo.fr 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/wanadoo.fr 2010-06-22 13:37:26.776114033 +0200 +@@ -0,0 +1,30 @@ ++ ++ ++ ++ ++ wanadoo.fr ++ orange.fr ++ ++ France Telecom / Orange ++ Orange ++ ++ ++ pop.orange.fr ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.orange.fr ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/wanadoo.fr imap evolution-2.30.2.new//capplet/settings/mail-autoconfig/wanadoo.fr imap +--- evolution-2.30.2//capplet/settings/mail-autoconfig/wanadoo.fr imap 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/wanadoo.fr imap 2010-06-22 13:37:26.776114033 +0200 +@@ -0,0 +1,30 @@ ++ ++ ++ ++ ++ wanadoo.fr ++ orange.fr ++ ++ France Telecom / Orange ++ Orange ++ ++ ++ imap.orange.fr ++ 143 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.orange.fr ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/wanadoo.fr pop evolution-2.30.2.new//capplet/settings/mail-autoconfig/wanadoo.fr pop +--- evolution-2.30.2//capplet/settings/mail-autoconfig/wanadoo.fr pop 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/wanadoo.fr pop 2010-06-22 13:37:26.776114033 +0200 +@@ -0,0 +1,30 @@ ++ ++ ++ ++ ++ wanadoo.fr ++ orange.fr ++ ++ France Telecom / Orange ++ Orange ++ ++ ++ pop.orange.fr ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.orange.fr ++ 25 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/wave.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/wave.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/wave.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/wave.plala.or.jp 2010-06-22 13:37:26.776114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ wave.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ wave.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ wave.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/web.de evolution-2.30.2.new//capplet/settings/mail-autoconfig/web.de +--- evolution-2.30.2//capplet/settings/mail-autoconfig/web.de 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/web.de 2010-06-22 13:37:26.776114033 +0200 +@@ -0,0 +1,29 @@ ++ ++ ++ ++ ++ web.de ++ ++ WEB.DE Freemail ++ Web.de ++ ++ ++ imap.web.de ++ 993 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.web.de ++ 587 ++ STARTTLS ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/white.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/white.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/white.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/white.plala.or.jp 2010-06-22 13:37:26.776114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ white.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ white.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ white.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/wine.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/wine.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/wine.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/wine.plala.or.jp 2010-06-22 13:37:26.776114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ wine.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ wine.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ wine.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/wmail.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/wmail.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/wmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/wmail.plala.or.jp 2010-06-22 13:37:26.776114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ wmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ wmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ wmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/xmail.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/xmail.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/xmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/xmail.plala.or.jp 2010-06-22 13:37:26.776114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ xmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ xmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ xmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/xpost.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/xpost.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/xpost.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/xpost.plala.or.jp 2010-06-22 13:37:26.776114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ xpost.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ xpost.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ xpost.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/xp.wind.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/xp.wind.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/xp.wind.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/xp.wind.jp 2010-06-22 13:37:26.776114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ xp.wind.jp ++ 群馬インターネット ++ wind ++ ++ xp.wind.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ xp.wind.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/xs4all.nl evolution-2.30.2.new//capplet/settings/mail-autoconfig/xs4all.nl +--- evolution-2.30.2//capplet/settings/mail-autoconfig/xs4all.nl 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/xs4all.nl 2010-06-22 13:37:26.776114033 +0200 +@@ -0,0 +1,29 @@ ++ ++ ++ ++ ++ xs4all.nl ++ ++ XS4All ++ XS4All ++ ++ ++ pops.xs4all.nl ++ 995 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtps.xs4all.nl ++ 465 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/yahoo.com evolution-2.30.2.new//capplet/settings/mail-autoconfig/yahoo.com +--- evolution-2.30.2//capplet/settings/mail-autoconfig/yahoo.com 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/yahoo.com 2010-06-22 13:37:26.776114033 +0200 +@@ -0,0 +1,36 @@ ++ ++ ++ ++ ++ yahoo.com ++ yahoo.de ++ yahoo.it ++ yahoo.fr ++ yahoo.co.uk ++ yahoo.com.br ++ ymail.com ++ rocketmail.com ++ ++ Yahoo! Mail ++ Yahoo ++ ++ ++ pop.mail.yahoo.com ++ 995 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ++ smtp.mail.yahoo.com ++ 465 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/ybb.ne.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/ybb.ne.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/ybb.ne.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/ybb.ne.jp 2010-06-22 13:37:26.776114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ybb.ne.jp ++ Yahoo! BB ++ Yahoo! BB ++ ++ ybbpop.mail.yahoo.co.jp ++ 995 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ybbsmtp.mail.yahoo.co.jp ++ 465 ++ SSL ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/yellow.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/yellow.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/yellow.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/yellow.plala.or.jp 2010-06-22 13:37:26.776114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ yellow.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ yellow.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ yellow.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/ymail.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/ymail.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/ymail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/ymail.plala.or.jp 2010-06-22 13:37:26.776114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ymail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ ymail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ymail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/ypost.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/ypost.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/ypost.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/ypost.plala.or.jp 2010-06-22 13:37:26.776114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ypost.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ ypost.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ ypost.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-autoconfig/zmail.plala.or.jp evolution-2.30.2.new//capplet/settings/mail-autoconfig/zmail.plala.or.jp +--- evolution-2.30.2//capplet/settings/mail-autoconfig/zmail.plala.or.jp 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//capplet/settings/mail-autoconfig/zmail.plala.or.jp 2010-06-22 13:37:26.776114033 +0200 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ zmail.plala.or.jp ++ ぷらら ++ ぷらら ++ ++ zmail.mail.plala.or.jp ++ 110 ++ plain ++ %EMAILLOCALPART% ++ plain ++ ++ ++ zmail.mail.plala.or.jp ++ 587 ++ plain ++ %EMAILLOCALPART% ++ plain ++ true ++ false ++ ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/mail-guess-servers.c evolution-2.30.2.new//capplet/settings/mail-guess-servers.c +--- evolution-2.30.2//capplet/settings/mail-guess-servers.c 2010-06-20 14:16:51.000000000 +0200 ++++ evolution-2.30.2.new//capplet/settings/mail-guess-servers.c 2010-06-22 13:37:26.776114033 +0200 +@@ -42,6 +42,10 @@ + #include + #include + ++#include ++ ++#include ++ + #include "mail-guess-servers.h" + + static gchar * +@@ -158,13 +162,13 @@ + } + } + +-static void +-parse_msg (SoupMessage *msg, EmailProvider *provider) ++static gboolean ++parse_message (const gchar *msg, gint length, EmailProvider *provider) + { + xmlDocPtr doc; + xmlNodePtr node, top; + +- doc = xmlReadMemory (msg->response_body->data, msg->response_body->length, "file.xml", NULL, 0); ++ doc = xmlReadMemory (msg, length, "file.xml", NULL, 0); + + node = doc->children; + while (node) { +@@ -176,7 +180,7 @@ + + if (!node) { + g_warning ("Incorrect data: ClientConfig not found ... Quitting\n"); +- return; ++ return FALSE; + } + + node = node->children; +@@ -189,7 +193,7 @@ + + if (!node) { + g_warning ("Incorrect data: ClientConfig not found ... Quitting\n"); +- return; ++ return FALSE; + } + + top = node; +@@ -207,18 +211,48 @@ + } + + xmlFreeDoc(doc); ++ ++ return TRUE; + } + +-gboolean +-mail_guess_servers(EmailProvider *provider) ++static gboolean ++parse_soup_message (SoupMessage *msg, EmailProvider *provider) ++{ ++ return parse_message (msg->response_body->data, msg->response_body->length, provider); ++} ++ ++static gboolean ++is_online (void) ++{ ++ EShell *shell; ++ ++ shell = e_shell_get_default (); ++ if (!shell) { ++ /* FIXME: do we always have a shell? What do we do if one ++ * hasn't been created yet? e_shell_get_default() won't create ++ * a shell; it will just return one that has been created ++ * before. ++ */ ++ return FALSE; ++ } ++ ++ return e_shell_get_online (shell); ++} ++ ++static gboolean ++guess_when_online (EmailProvider *provider) + { + const gchar *cafile = NULL; + gchar *url; +- SoupURI *proxy = NULL, *parsed; ++ EProxy *proxy; ++ SoupURI *parsed; + SoupMessage *msg; + SoupSession *session; + +- url = g_strdup_printf("%s/%s", "https://live.mozillamessaging.com/autoconfig", provider->domain); ++ proxy = e_proxy_new (); ++ e_proxy_setup_proxy (proxy); ++ ++ url = g_strdup_printf("%s/%s", "http://api.gnome.org/evolution/autoconfig", provider->domain); + parsed = soup_uri_new (url); + soup_uri_free (parsed); + +@@ -227,18 +261,20 @@ + SOUP_SESSION_USER_AGENT, "get ", + NULL); + +- if (proxy) { +- g_object_set (G_OBJECT (session), +- SOUP_SESSION_PROXY_URI, proxy, +- NULL); ++ if (e_proxy_require_proxy_for_uri (proxy, url)) { ++ SoupURI *proxy_uri = e_proxy_peek_uri_for (proxy, url); ++/* fprintf (stderr, "URL '%s' requires a proxy: '%s'\n", ++ url, soup_uri_to_string (proxy_uri, FALSE)); */ ++ g_object_set (session, SOUP_SESSION_PROXY_URI, proxy_uri, NULL); + } + + msg = get_url (session, url); + if (!msg) + return FALSE; + +- parse_msg(msg, provider); ++ parse_soup_message (msg, provider); + ++ g_object_unref (proxy); + g_object_unref (msg); + g_object_unref(session); + g_free(url); +@@ -247,6 +283,47 @@ + + } + ++static gchar * ++get_filename_for_offline_autoconfig (const gchar *domain) ++{ ++ return g_build_filename (EVOLUTION_PRIVDATADIR, "mail-autoconfig", domain, NULL); ++} ++ ++static gboolean ++guess_when_offline (EmailProvider *provider) ++{ ++ gchar *filename; ++ gchar *contents; ++ gsize length; ++ gboolean success; ++ ++ if (!provider->domain || provider->domain[0] == 0) ++ return FALSE; ++ ++ success = FALSE; ++ ++ filename = get_filename_for_offline_autoconfig (provider->domain); ++ if (!g_file_get_contents (filename, &contents, &length, NULL)) /* NULL-GError */ ++ goto out; ++ ++ success = parse_message (contents, (gint) length, provider); ++ ++out: ++ g_free (filename); ++ g_free (contents); ++ ++ return success; ++} ++ ++gboolean ++mail_guess_servers(EmailProvider *provider) ++{ ++ if (is_online () && guess_when_online (provider)) ++ return TRUE; ++ else ++ return guess_when_offline (provider); ++} ++ + #ifdef TEST + gint + main (gint argc, gchar **argv) +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//capplet/settings/Makefile.am evolution-2.30.2.new//capplet/settings/Makefile.am +--- evolution-2.30.2//capplet/settings/Makefile.am 2010-04-26 15:13:16.000000000 +0200 ++++ evolution-2.30.2.new//capplet/settings/Makefile.am 2010-06-22 13:37:26.776114033 +0200 +@@ -1,3 +1,4 @@ ++SUBDIRS = mail-autoconfig + + privsolib_LTLIBRARIES = libevolution-mail-settings.la + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//composer/e-composer-actions.c evolution-2.30.2.new//composer/e-composer-actions.c +--- evolution-2.30.2//composer/e-composer-actions.c 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.2.new//composer/e-composer-actions.c 2010-06-22 13:37:26.776114033 +0200 +@@ -381,14 +381,6 @@ + NULL, /* Handled by property bindings */ + FALSE }, + +- { "view-from", +- NULL, +- N_("_From Field"), +- NULL, +- N_("Toggles whether the From chooser is displayed"), +- NULL, /* Handled by property bindings */ +- FALSE }, +- + { "view-reply-to", + NULL, + N_("_Reply-To Field"), +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//composer/e-composer-actions.h evolution-2.30.2.new//composer/e-composer-actions.h +--- evolution-2.30.2//composer/e-composer-actions.h 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.2.new//composer/e-composer-actions.h 2010-06-22 13:37:26.776114033 +0200 +@@ -57,8 +57,6 @@ + E_COMPOSER_ACTION ((composer), "view-bcc") + #define E_COMPOSER_ACTION_VIEW_CC(composer) \ + E_COMPOSER_ACTION ((composer), "view-cc") +-#define E_COMPOSER_ACTION_VIEW_FROM(composer) \ +- E_COMPOSER_ACTION ((composer), "view-from") + #define E_COMPOSER_ACTION_VIEW_REPLY_TO(composer) \ + E_COMPOSER_ACTION ((composer), "view-reply-to") + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//composer/e-composer-from-header.c evolution-2.30.2.new//composer/e-composer-from-header.c +--- evolution-2.30.2//composer/e-composer-from-header.c 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.2.new//composer/e-composer-from-header.c 2010-06-22 13:37:26.776114033 +0200 +@@ -110,16 +110,6 @@ + "button", FALSE, NULL); + } + +-EComposerHeader * +-e_composer_from_header_new_with_action (const gchar *label, +- const gchar *action) +-{ +- return g_object_new ( +- E_TYPE_COMPOSER_FROM_HEADER, "label", label, +- "button", FALSE, "addaction_text", action, +- "addaction", action != NULL, NULL); +-} +- + EAccountList * + e_composer_from_header_get_account_list (EComposerFromHeader *header) + { +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//composer/e-composer-from-header.h evolution-2.30.2.new//composer/e-composer-from-header.h +--- evolution-2.30.2//composer/e-composer-from-header.h 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.2.new//composer/e-composer-from-header.h 2010-06-22 13:37:26.780114033 +0200 +@@ -63,9 +63,6 @@ + + GType e_composer_from_header_get_type (void); + EComposerHeader * e_composer_from_header_new (const gchar *label); +-EComposerHeader * e_composer_from_header_new_with_action +- (const gchar *label, +- const gchar *action); + EAccountList * e_composer_from_header_get_account_list + (EComposerFromHeader *header); + void e_composer_from_header_set_account_list +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//composer/e-composer-header.c evolution-2.30.2.new//composer/e-composer-header.c +--- evolution-2.30.2//composer/e-composer-header.c 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.2.new//composer/e-composer-header.c 2010-06-22 13:37:26.780114033 +0200 +@@ -32,8 +32,6 @@ + PROP_0, + PROP_BUTTON, + PROP_LABEL, +- PROP_ADDACTION, +- PROP_ADDACTION_TEXT, + PROP_SENSITIVE, + PROP_VISIBLE + }; +@@ -47,8 +45,6 @@ + struct _EComposerHeaderPrivate { + gchar *label; + gboolean button; +- gchar *addaction_text; +- gboolean addaction; /*For Add button.*/ + GtkWidget *action_label; + + GtkWidget *add_icon; +@@ -71,15 +67,6 @@ + g_signal_emit (header, signal_ids[CLICKED], 0); + } + +-static void +-composer_header_addaction_clicked_cb (GtkButton *button, +- EComposerHeader *header) +-{ +- gboolean show = !e_composer_header_get_visible(header); +- +- e_composer_header_set_visible (header, show); +-} +- + static GObject * + composer_header_constructor (GType type, + guint n_construct_properties, +@@ -88,6 +75,7 @@ + GObject *object; + GtkWidget *widget; + EComposerHeader *header; ++ GtkWidget *label; + + /* Chain up to parent's constructor() method. */ + object = G_OBJECT_CLASS (parent_class)->constructor ( +@@ -102,51 +90,16 @@ + widget, "clicked", + G_CALLBACK (composer_header_button_clicked_cb), + header); ++ label = gtk_bin_get_child (GTK_BIN (widget)); + } else { + widget = gtk_label_new_with_mnemonic (header->priv->label); +- gtk_label_set_mnemonic_widget ( +- GTK_LABEL (widget), header->input_widget); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (widget), header->input_widget); ++ label = widget; + } + +- header->priv->action_label = NULL; +- if (header->priv->addaction) { +- GtkWidget *box, *tmp; +- gchar *str; +- +- header->priv->action_label = gtk_label_new (NULL); +- header->action_widget = gtk_button_new (); +- box = gtk_hbox_new (FALSE, 0); +- tmp = gtk_image_new_from_stock ( +- GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); +- header->priv->add_icon = tmp; +- gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 3); +- tmp = gtk_image_new_from_stock ( +- GTK_STOCK_REMOVE, GTK_ICON_SIZE_BUTTON); +- header->priv->remove_icon = tmp; +- gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 3); +- tmp = gtk_label_new (NULL); +- str = g_strdup_printf ( +- "%s %s", _("Show"), +- header->priv->addaction_text); +- gtk_label_set_markup((GtkLabel *)tmp, str); +- g_free (str); +- header->priv->show_label = tmp; +- gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 3); +- tmp = gtk_label_new (NULL); +- str = g_strdup_printf ( +- "%s %s", _("Hide"), +- header->priv->addaction_text); +- gtk_label_set_markup((GtkLabel *)tmp, str); +- header->priv->hide_label = tmp; +- gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 3); ++ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); + +- gtk_container_add((GtkContainer *)header->action_widget, box); +- gtk_widget_show_all(header->action_widget); +- g_signal_connect ( +- header->action_widget, "clicked", +- G_CALLBACK (composer_header_addaction_clicked_cb), +- header); +- } ++ header->priv->action_label = NULL; + + header->title_widget = g_object_ref_sink (widget); + +@@ -171,14 +124,6 @@ + priv->button = g_value_get_boolean (value); + return; + +- case PROP_ADDACTION: /* construct only */ +- priv->addaction = g_value_get_boolean (value); +- return; +- +- case PROP_ADDACTION_TEXT:/* construct only */ +- priv->addaction_text = g_value_dup_string (value); +- return; +- + case PROP_LABEL: /* construct only */ + priv->label = g_value_dup_string (value); + return; +@@ -199,15 +144,6 @@ + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + } + +-void +-e_composer_header_set_property (GObject *object, +- guint property_id, +- const GValue *value, +- GParamSpec *pspec) +-{ +- composer_header_set_property (object, property_id, value, pspec); +-} +- + static void + composer_header_get_property (GObject *object, + guint property_id, +@@ -223,15 +159,6 @@ + g_value_set_boolean (value, priv->button); + return; + +- case PROP_ADDACTION: /* construct only */ +- g_value_set_boolean (value, priv->button); +- return; +- +- case PROP_ADDACTION_TEXT: /* construct only */ +- g_value_take_string ( +- value, priv->addaction_text); +- return; +- + case PROP_LABEL: /* construct only */ + g_value_take_string ( + value, e_composer_header_get_label ( +@@ -298,28 +225,6 @@ + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT_ONLY)); + +- g_object_class_install_property ( +- object_class, +- PROP_ADDACTION, +- g_param_spec_boolean ( +- "addaction", +- NULL, +- NULL, +- FALSE, +- G_PARAM_READWRITE | +- G_PARAM_CONSTRUCT_ONLY)); +- +- g_object_class_install_property ( +- object_class, +- PROP_ADDACTION_TEXT, +- g_param_spec_string ( +- "addaction_text", +- NULL, +- NULL, +- NULL, +- G_PARAM_READWRITE | +- G_PARAM_CONSTRUCT_ONLY)); +- + g_object_class_install_property ( + object_class, + PROP_LABEL, +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//composer/e-composer-header.h evolution-2.30.2.new//composer/e-composer-header.h +--- evolution-2.30.2//composer/e-composer-header.h 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.2.new//composer/e-composer-header.h 2010-06-22 13:37:26.780114033 +0200 +@@ -49,7 +49,6 @@ + GObject parent; + GtkWidget *title_widget; + GtkWidget *input_widget; +- GtkWidget *action_widget; + EComposerHeaderPrivate *priv; + }; + +@@ -69,8 +68,6 @@ + gboolean e_composer_header_get_visible (EComposerHeader *header); + void e_composer_header_set_visible (EComposerHeader *header, + gboolean visible); +-void e_composer_header_set_property (GObject *object, guint property_id, +- const GValue *value, GParamSpec *pspec); + void e_composer_header_set_title_tooltip + (EComposerHeader *header, + const gchar *tooltip); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//composer/e-composer-header-table.c evolution-2.30.2.new//composer/e-composer-header-table.c +--- evolution-2.30.2//composer/e-composer-header-table.c 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.2.new//composer/e-composer-header-table.c 2010-06-22 13:37:26.780114033 +0200 +@@ -26,14 +26,13 @@ + #include "e-util/gconf-bridge.h" + #include "widgets/misc/e-signature-combo-box.h" + ++#include "e-msg-composer.h" + #include "e-composer-private.h" + #include "e-composer-from-header.h" + #include "e-composer-name-header.h" + #include "e-composer-post-header.h" + #include "e-composer-text-header.h" + +-extern gboolean composer_lite; +- + #define E_COMPOSER_HEADER_TABLE_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_COMPOSER_HEADER_TABLE, EComposerHeaderTablePrivate)) +@@ -69,7 +68,6 @@ + GtkWidget *signature_label; + GtkWidget *signature_combo_box; + ENameSelector *name_selector; +- GtkHBox *actions_container; + }; + + static gpointer parent_class; +@@ -159,11 +157,7 @@ + { + GtkWidget *parent; + +- if (composer_lite && strcmp (property_name, "destinations-to") == 0) +- parent = g_object_get_data ( +- G_OBJECT (header->input_widget), "parent"); +- else +- parent = gtk_widget_get_parent (header->input_widget); ++ parent = gtk_widget_get_parent (header->input_widget); + g_return_if_fail (E_IS_COMPOSER_HEADER_TABLE (parent)); + g_object_notify (G_OBJECT (parent), property_name); + } +@@ -174,7 +168,7 @@ + { + GtkWidget *parent; + +- if (composer_lite) { ++ if (e_msg_composer_get_lite ()) { + parent = gtk_widget_get_parent (widget); + parent = g_object_get_data (G_OBJECT (parent), "pdata"); + } else +@@ -282,6 +276,27 @@ + return new_destinations; + } + ++static gint ++count_from_accounts (EComposerHeaderTable *table) ++{ ++ EComposerHeader *header; ++ EAccountComboBox *combo_box; ++ ++ header = e_composer_header_table_get_header (table, E_COMPOSER_HEADER_FROM); ++ combo_box = E_ACCOUNT_COMBO_BOX (header->input_widget); ++ ++ return e_account_combo_box_count_displayed_accounts (combo_box); ++} ++ ++static gboolean ++from_header_should_be_visible (EComposerHeaderTable *table) ++{ ++ gint num_accounts; ++ ++ num_accounts = count_from_accounts (table); ++ return (num_accounts > 1); ++} ++ + static void + composer_header_table_setup_mail_headers (EComposerHeaderTable *table) + { +@@ -294,6 +309,8 @@ + EComposerHeader *header; + const gchar *key; + guint binding_id; ++ gboolean sensitive; ++ gboolean visible; + + binding_id = table->priv->gconf_bindings[ii]; + header = e_composer_header_table_get_header (table, ii); +@@ -310,10 +327,6 @@ + key = COMPOSER_GCONF_PREFIX "/show_mail_cc"; + break; + +- case E_COMPOSER_HEADER_FROM: +- key = COMPOSER_GCONF_PREFIX "/show_mail_from"; +- break; +- + case E_COMPOSER_HEADER_REPLY_TO: + key = COMPOSER_GCONF_PREFIX "/show_mail_reply_to"; + break; +@@ -324,22 +337,29 @@ + } + + switch (ii) { ++ case E_COMPOSER_HEADER_FROM: ++ sensitive = TRUE; ++ visible = from_header_should_be_visible (table); ++ break; ++ + case E_COMPOSER_HEADER_BCC: + case E_COMPOSER_HEADER_CC: +- case E_COMPOSER_HEADER_FROM: + case E_COMPOSER_HEADER_REPLY_TO: + case E_COMPOSER_HEADER_SUBJECT: + case E_COMPOSER_HEADER_TO: +- e_composer_header_set_sensitive (header, TRUE); +- e_composer_header_set_visible (header, TRUE); ++ sensitive = TRUE; ++ visible = TRUE; + break; + + default: +- e_composer_header_set_sensitive (header, FALSE); +- e_composer_header_set_visible (header, FALSE); ++ sensitive = FALSE; ++ visible = FALSE; + break; + } + ++ e_composer_header_set_sensitive (header, sensitive); ++ e_composer_header_set_visible (header, visible); ++ + if (key != NULL) + binding_id = gconf_bridge_bind_property ( + bridge, key, G_OBJECT (header), "visible"); +@@ -482,6 +502,17 @@ + composer_header_table_setup_mail_headers (table); + } + ++static gint ++get_row_padding (void) ++{ ++ /* For small screens, make the header-table's rows be packed closely together */ ++ ++ if (e_msg_composer_get_lite ()) ++ return 0; ++ else ++ return 3; ++} ++ + static GObject * + composer_header_table_constructor (GType type, + guint n_construct_properties, +@@ -490,6 +521,7 @@ + GObject *object; + EComposerHeaderTablePrivate *priv; + guint rows, ii; ++ gint row_padding; + + /* Chain up to parent's constructor() method. */ + object = G_OBJECT_CLASS (parent_class)->constructor ( +@@ -505,45 +537,18 @@ + /* Use "ypadding" instead of "row-spacing" because some rows may + * be invisible and we don't want spacing around them. */ + ++ row_padding = get_row_padding (); ++ + for (ii = 0; ii < rows; ii++) { + gtk_table_attach ( + GTK_TABLE (object), priv->headers[ii]->title_widget, +- 0, 1, ii, ii + 1, GTK_FILL, GTK_FILL, 0, 3); +- if (composer_lite && ii == E_COMPOSER_HEADER_TO) { +- GtkWidget *box = gtk_hbox_new (FALSE, 0); +- g_object_set_data ( +- G_OBJECT (priv->headers[ii]->input_widget), +- "parent", object); +- gtk_box_pack_start ( +- GTK_BOX (box), priv->headers[ii]->input_widget, +- TRUE, TRUE, 3); +- gtk_box_pack_start ( +- GTK_BOX (box), +- GTK_WIDGET (priv->actions_container), +- FALSE, FALSE, 0); +- gtk_widget_show (box); +- gtk_table_attach ( +- GTK_TABLE (object), box, 1, 4, ii, ii + 1, +- GTK_FILL | GTK_EXPAND, 0, 0, 3); +- +- } else { +- gtk_table_attach ( +- GTK_TABLE (object), +- priv->headers[ii]->input_widget, 1, 4, +- ii, ii + 1, GTK_FILL | GTK_EXPAND, 0, 0, 3); +- } +- if (composer_lite && priv->headers[ii]->action_widget) { +- /* Pack the widgets to the end. Helps formatting +- * when hiding the From field. */ +- gtk_box_pack_end ( +- GTK_BOX (priv->actions_container), +- priv->headers[ii]->action_widget, +- FALSE, FALSE, 6); +- } ++ 0, 1, ii, ii + 1, GTK_FILL, GTK_FILL, 0, row_padding); ++ gtk_table_attach ( ++ GTK_TABLE (object), ++ priv->headers[ii]->input_widget, 1, 4, ++ ii, ii + 1, GTK_FILL | GTK_EXPAND, 0, 0, row_padding); + } + +- if (composer_lite) +- gtk_widget_show_all ((GtkWidget *)priv->actions_container); + ii = E_COMPOSER_HEADER_FROM; + + /* Leave room in the "From" row for signature stuff. */ +@@ -561,13 +566,13 @@ + priv->signature_combo_box, "visible"); + + /* Now add the signature stuff. */ +- if (!composer_lite) { ++ if (!e_msg_composer_get_lite ()) { + gtk_table_attach ( + GTK_TABLE (object), priv->signature_label, +- 2, 3, ii, ii + 1, 0, 0, 0, 3); ++ 2, 3, ii, ii + 1, 0, 0, 0, row_padding); + gtk_table_attach ( + GTK_TABLE (object), priv->signature_combo_box, +- 3, 4, ii, ii + 1, composer_lite ? GTK_FILL: 0, 0, 0, 3); ++ 3, 4, ii, ii + 1, e_msg_composer_get_lite () ? GTK_FILL: 0, 0, 0, row_padding); + } else { + GtkWidget *box = gtk_hbox_new (FALSE, 0); + +@@ -580,7 +585,7 @@ + g_object_set_data (G_OBJECT (box), "pdata", object); + gtk_table_attach ( + GTK_TABLE (object), box, +- 3, 4, ii, ii + 1, GTK_FILL, 0, 0, 3); ++ 3, 4, ii, ii + 1, GTK_FILL, 0, 0, row_padding); + gtk_widget_hide (box); + } + +@@ -954,9 +959,7 @@ + name_selector = e_name_selector_new (); + table->priv->name_selector = name_selector; + +- table->priv->actions_container = (GtkHBox *)gtk_hbox_new (FALSE, 6); +- +- header = e_composer_from_header_new_with_action (_("Fr_om:"), _("From")); ++ header = e_composer_from_header_new (_("Fr_om:")); + composer_header_table_bind_header ("account", "changed", header); + composer_header_table_bind_header ("account-list", "refreshed", header); + composer_header_table_bind_header ("account-name", "changed", header); +@@ -965,24 +968,21 @@ + composer_header_table_from_changed_cb), table); + table->priv->headers[E_COMPOSER_HEADER_FROM] = header; + +- header = e_composer_text_header_new_label (_("_Reply-To:"), ""); ++ header = e_composer_text_header_new_label (_("_Reply-To:")); + composer_header_table_bind_header ("reply-to", "changed", header); + table->priv->headers[E_COMPOSER_HEADER_REPLY_TO] = header; + +- header = e_composer_name_header_new_with_label ( +- _("_To:"), name_selector); ++ header = e_composer_name_header_new (_("_To:"), name_selector); + e_composer_header_set_input_tooltip (header, HEADER_TOOLTIP_TO); + composer_header_table_bind_header ("destinations-to", "changed", header); + table->priv->headers[E_COMPOSER_HEADER_TO] = header; + +- header = e_composer_name_header_new_with_action ( +- _("_Cc:"), _("CC"), name_selector); ++ header = e_composer_name_header_new (_("_Cc:"), name_selector); + e_composer_header_set_input_tooltip (header, HEADER_TOOLTIP_CC); + composer_header_table_bind_header ("destinations-cc", "changed", header); + table->priv->headers[E_COMPOSER_HEADER_CC] = header; + +- header = e_composer_name_header_new_with_action ( +- _("_Bcc:"), _("BCC"), name_selector); ++ header = e_composer_name_header_new (_("_Bcc:"), name_selector); + e_composer_header_set_input_tooltip (header, HEADER_TOOLTIP_BCC); + composer_header_table_bind_header ("destinations-bcc", "changed", header); + table->priv->headers[E_COMPOSER_HEADER_BCC] = header; +@@ -991,7 +991,7 @@ + composer_header_table_bind_header ("post-to", "changed", header); + table->priv->headers[E_COMPOSER_HEADER_POST_TO] = header; + +- header = e_composer_text_header_new_label (_("S_ubject:"), NULL); ++ header = e_composer_text_header_new_label (_("S_ubject:")); + composer_header_table_bind_header ("subject", "changed", header); + table->priv->headers[E_COMPOSER_HEADER_SUBJECT] = header; + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//composer/e-composer-name-header.c evolution-2.30.2.new//composer/e-composer-name-header.c +--- evolution-2.30.2//composer/e-composer-name-header.c 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.2.new//composer/e-composer-name-header.c 2010-06-22 13:37:26.780114033 +0200 +@@ -292,33 +292,11 @@ + { + g_return_val_if_fail (E_IS_NAME_SELECTOR (name_selector), NULL); + +- return g_object_new ( +- E_TYPE_COMPOSER_NAME_HEADER, "label", label, +- "button", !e_msg_composer_get_lite(), "name-selector", name_selector, NULL); +-} +- +-EComposerHeader * +-e_composer_name_header_new_with_label (const gchar *label, +- ENameSelector *name_selector) +-{ +- return g_object_new ( +- E_TYPE_COMPOSER_NAME_HEADER, "label", label, +- "button", !e_msg_composer_get_lite(), "name-selector", name_selector, +- "addaction", FALSE, "visible", TRUE, NULL); +-} +- +-EComposerHeader * +-e_composer_name_header_new_with_action (const gchar *label, +- const gchar *action_label, +- ENameSelector *name_selector) +-{ +- g_return_val_if_fail (E_IS_NAME_SELECTOR (name_selector), NULL); +- +- return g_object_new ( +- E_TYPE_COMPOSER_NAME_HEADER, "label", label, +- "button", !e_msg_composer_get_lite(), "name-selector", name_selector, +- "addaction_text", action_label, +- "addaction", action_label != NULL, NULL); ++ return g_object_new (E_TYPE_COMPOSER_NAME_HEADER, ++ "label", label, ++ "button", TRUE, ++ "name-selector", name_selector, ++ NULL); + } + + ENameSelector * +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//composer/e-composer-name-header.h evolution-2.30.2.new//composer/e-composer-name-header.h +--- evolution-2.30.2//composer/e-composer-name-header.h 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.2.new//composer/e-composer-name-header.h 2010-06-22 13:37:26.780114033 +0200 +@@ -62,14 +62,6 @@ + GType e_composer_name_header_get_type (void); + EComposerHeader * e_composer_name_header_new (const gchar *label, + ENameSelector *name_selector); +-/*No button. Just a label.*/ +-EComposerHeader * e_composer_name_header_new_with_label (const gchar *label, +- ENameSelector *name_selector); +- +-/*No button. Label with a Link button for show/hide.*/ +-EComposerHeader * e_composer_name_header_new_with_action (const gchar *label, +- const gchar *action, +- ENameSelector *name_selector); + + ENameSelector * e_composer_name_header_get_name_selector + (EComposerNameHeader *header); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//composer/e-composer-private.c evolution-2.30.2.new//composer/e-composer-private.c +--- evolution-2.30.2//composer/e-composer-private.c 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.2.new//composer/e-composer-private.c 2010-06-22 13:37:26.780114033 +0200 +@@ -145,9 +145,18 @@ + html = gtkhtml_editor_get_html (editor); + ui_manager = gtkhtml_editor_get_ui_manager (editor); + +- if (composer->lite) { ++ if (e_msg_composer_get_lite ()) { ++#if 0 ++ /* In the lite composer, for small screens, we are not ready yet ++ * to hide the menubar. It still has useful items like the ones ++ * to show/hide the various header fields, plus the security options. ++ * ++ * When we move those options out of the menu and into the composer's ++ * toplevel, we can probably get rid of the menu. ++ */ + widget = gtkhtml_editor_get_managed_widget (editor, "/main-menu"); + gtk_widget_hide (widget); ++#endif + widget = gtkhtml_editor_get_managed_widget (editor, "/main-toolbar"); + gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_BOTH_HORIZ); + gtk_widget_hide (widget); +@@ -243,8 +252,8 @@ + widget = e_composer_header_table_new (); + gtk_container_set_border_width (GTK_CONTAINER (widget), 6); + gtk_box_pack_start (GTK_BOX (editor->vbox), widget, FALSE, FALSE, 0); +- if (composer->lite) +- gtk_box_reorder_child (GTK_BOX (editor->vbox), widget, 0); ++ if (e_msg_composer_get_lite ()) ++ gtk_box_reorder_child (GTK_BOX (editor->vbox), widget, 1); + else + gtk_box_reorder_child (GTK_BOX (editor->vbox), widget, 2); + +@@ -253,7 +262,7 @@ + + /* Construct the attachment paned. */ + +- if (composer->lite) { ++ if (e_msg_composer_get_lite ()) { + e_attachment_paned_set_default_height (75); /* short attachment bar for Anjal */ + e_attachment_icon_view_set_default_icon_size (GTK_ICON_SIZE_BUTTON); + } +@@ -262,7 +271,7 @@ + priv->attachment_paned = g_object_ref (widget); + gtk_widget_show (widget); + +- if (composer->lite) { ++ if (e_msg_composer_get_lite ()) { + GtkWidget *tmp, *tmp1, *tmp_box, *container; + GtkWidget *combo; + +@@ -351,10 +360,6 @@ + action = ACTION (VIEW_CC); + break; + +- case E_COMPOSER_HEADER_FROM: +- action = ACTION (VIEW_FROM); +- break; +- + case E_COMPOSER_HEADER_REPLY_TO: + action = ACTION (VIEW_REPLY_TO); + break; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//composer/e-composer-text-header.c evolution-2.30.2.new//composer/e-composer-text-header.c +--- evolution-2.30.2//composer/e-composer-text-header.c 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.2.new//composer/e-composer-text-header.c 2010-06-22 13:37:26.780114033 +0200 +@@ -108,23 +108,21 @@ + } + + EComposerHeader * +-e_composer_text_header_new_label (const gchar *label, const gchar *action_label) ++e_composer_text_header_new_label (const gchar *label) + { +- return g_object_new ( +- E_TYPE_COMPOSER_TEXT_HEADER, "label", label, +- "button", FALSE, "addaction", action_label && *action_label, +- "addaction_text", action_label, +- "visible", action_label == NULL, NULL); ++ return g_object_new (E_TYPE_COMPOSER_TEXT_HEADER, ++ "label", label, ++ "button", FALSE, ++ NULL); + } + + EComposerHeader * +-e_composer_text_header_new_button (const gchar *label, const gchar *action_label) ++e_composer_text_header_new_button (const gchar *label) + { +- return g_object_new ( +- E_TYPE_COMPOSER_TEXT_HEADER, "label", label, +- "button", TRUE, "addaction", action_label != NULL, +- "addaction_text", action_label, +- "visible", action_label == NULL, NULL); ++ return g_object_new (E_TYPE_COMPOSER_TEXT_HEADER, ++ "label", label, ++ "button", TRUE, ++ NULL); + } + + const gchar * +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//composer/e-composer-text-header.h evolution-2.30.2.new//composer/e-composer-text-header.h +--- evolution-2.30.2//composer/e-composer-text-header.h 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.2.new//composer/e-composer-text-header.h 2010-06-22 13:37:26.780114033 +0200 +@@ -59,10 +59,10 @@ + GType e_composer_text_header_get_type (void); + + EComposerHeader * +-e_composer_text_header_new_label (const gchar *label, const gchar *action_label); ++e_composer_text_header_new_label (const gchar *label); + + EComposerHeader * +-e_composer_text_header_new_button (const gchar *label, const gchar *action_label); ++e_composer_text_header_new_button (const gchar *label); + + const gchar * e_composer_text_header_get_text (EComposerTextHeader *header); + void e_composer_text_header_set_text (EComposerTextHeader *header, +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//composer/e-msg-composer.c evolution-2.30.2.new//composer/e-msg-composer.c +--- evolution-2.30.2//composer/e-msg-composer.c 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.2.new//composer/e-msg-composer.c 2010-06-22 13:37:26.784114033 +0200 +@@ -85,8 +85,6 @@ + LAST_SIGNAL + }; + +-gboolean composer_lite = FALSE; +- + static gpointer parent_class; + static guint signals[LAST_SIGNAL]; + +@@ -381,7 +379,7 @@ + } + + /* These functions builds a CamelMimeMessage for the message that the user has +- * composed in `composer'. ++ * composed in 'composer'. + */ + + static void +@@ -1695,6 +1693,7 @@ + g_signal_connect (object, "delete-event", + G_CALLBACK (msg_composer_delete_event_cb), NULL); + ++ e_shell_adapt_window_size (shell, GTK_WINDOW (composer)); + e_shell_watch_window (shell, GTK_WINDOW (object)); + + g_signal_connect (shell, "quit-requested", +@@ -1721,10 +1720,6 @@ + + /* Honor User Preferences */ + +- active = e_shell_settings_get_boolean ( +- shell_settings, "composer-format-html"); +- gtkhtml_editor_set_html_mode (GTKHTML_EDITOR (composer), active); +- + action = GTK_TOGGLE_ACTION (ACTION (REQUEST_READ_RECEIPT)); + active = e_shell_settings_get_boolean ( + shell_settings, "composer-request-receipt"); +@@ -2200,8 +2195,14 @@ + static void + msg_composer_init (EMsgComposer *composer) + { +- composer->lite = composer_lite; ++ EShell *shell = e_shell_get_default (); ++ + composer->priv = E_MSG_COMPOSER_GET_PRIVATE (composer); ++ ++ if (e_shell_get_express_mode (shell)) { ++ GtkWindow *window = e_shell_get_active_window(shell); ++ gtk_window_set_transient_for (GTK_WINDOW(composer), window); ++ } + } + + GType +@@ -2247,29 +2248,21 @@ + "html", e_web_view_new (), NULL); + } + +-void +-e_msg_composer_set_lite (void) +-{ +- composer_lite = TRUE; +-} +- ++/** ++ * e_msg_composer_get_lite: ++ * ++ * Used within the composer to see if it should be made suitable for small ++ * screens. ++ * ++ * Return value: whether the surrounding #EShell is in small screen mode. ++ */ + gboolean + e_msg_composer_get_lite (void) + { +- return composer_lite; +-} +- +-EMsgComposer * +-e_msg_composer_lite_new (void) +-{ +- EMsgComposer *composer; +- +- /* Init lite-composer for ever for the session */ +- composer_lite = TRUE; +- +- composer = e_msg_composer_new (); ++ EShell *shell; + +- return composer; ++ shell = e_shell_get_default (); ++ return e_shell_get_small_screen_mode (shell); + } + + EFocusTracker * +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//composer/e-msg-composer.h evolution-2.30.2.new//composer/e-msg-composer.h +--- evolution-2.30.2//composer/e-msg-composer.h 2010-06-20 14:14:45.000000000 +0200 ++++ evolution-2.30.2.new//composer/e-msg-composer.h 2010-06-22 13:37:26.784114033 +0200 +@@ -63,7 +63,6 @@ + struct _EMsgComposer { + GtkhtmlEditor parent; + EMsgComposerPrivate *priv; +- gboolean lite; + }; + + struct _EMsgComposerClass { +@@ -72,9 +71,7 @@ + + GType e_msg_composer_get_type (void); + EMsgComposer * e_msg_composer_new (void); +-void e_msg_composer_set_lite (void); + gboolean e_msg_composer_get_lite (void); +-EMsgComposer * e_msg_composer_lite_new (void); + EMsgComposer * e_msg_composer_new_with_message (CamelMimeMessage *msg); + EMsgComposer * e_msg_composer_new_from_url (const gchar *url); + EMsgComposer * e_msg_composer_new_redirect (CamelMimeMessage *message, +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//composer/evolution-composer.ui evolution-2.30.2.new//composer/evolution-composer.ui +--- evolution-2.30.2//composer/evolution-composer.ui 2010-03-18 15:13:59.000000000 +0100 ++++ evolution-2.30.2.new//composer/evolution-composer.ui 2010-06-22 13:37:26.784114033 +0200 +@@ -22,7 +22,6 @@ + + + +- + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//composer/mail-composer.error.xml evolution-2.30.2.new//composer/mail-composer.error.xml +--- evolution-2.30.2//composer/mail-composer.error.xml 2010-04-26 15:13:16.000000000 +0200 ++++ evolution-2.30.2.new//composer/mail-composer.error.xml 2010-06-22 13:37:26.784114033 +0200 +@@ -2,13 +2,13 @@ + + + +- <_primary>You cannot attach the file `{0}' to this message. ++ <_primary>You cannot attach the file n{0}' to this message. + + {1} + + + +- <_primary>The file `{0}' is not a regular file and cannot be sent in a message. ++ <_primary>The file '{0}' is not a regular file and cannot be sent in a message. + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//configure.ac evolution-2.30.2.new//configure.ac +--- evolution-2.30.2//configure.ac 2010-06-22 13:37:17.536114034 +0200 ++++ evolution-2.30.2.new//configure.ac 2010-06-22 13:37:26.784114033 +0200 +@@ -69,6 +69,7 @@ + -DGDK_PIXBUF_DISABLE_DEPRECATED + -DGDK_DISABLE_DEPRECATED + -DGTK_DISABLE_DEPRECATED ++ -DEDS_DISABLE_DEPRECATED + -DG_DISABLE_SINGLE_INCLUDES + -DGTK_DISABLE_SINGLE_INCLUDES + -Wall -Wextra +@@ -1176,10 +1177,21 @@ + AC_SUBST(HAVE_SENS) + AC_SUBST(SENS_LIBS) + fi +- + AM_CONDITIONAL([ENABLE_WINDOWS_SENS], [test "$enable_sens" = yes]) + + dnl ****************************** ++dnl Enable ConnMan support ? ++dnl ****************************** ++AC_ARG_ENABLE([connman], ++ [AS_HELP_STRING([--enable-connman], ++ [enable ConnMan support (default=no)])], ++ [enable_connman=$enableval],[enable_connman=no]) ++if test "x$enable_nm$enable_connman" = "xyesyes"; then ++ AC_MSG_ERROR([It is not possible to enable both ConnMan and NetworkManager]) ++fi ++AM_CONDITIONAL([ENABLE_CONNMAN], [test "$enable_connman" = yes]) ++ ++dnl ****************************** + dnl Camel Flags + dnl ****************************** + EVO_SET_COMPILE_FLAGS(CAMEL, camel-provider-1.2, $MANUAL_NSS_CFLAGS, $MOXILLA_NSS_CFLAGS) +@@ -1733,6 +1745,7 @@ + modules/calendar/Makefile + modules/mail/Makefile + modules/network-manager/Makefile ++modules/connman/Makefile + modules/plugin-lib/Makefile + modules/plugin-mono/Makefile + modules/plugin-python/Makefile +@@ -1784,6 +1797,7 @@ + sounds/Makefile + capplet/Makefile + capplet/settings/Makefile ++capplet/settings/mail-autoconfig/Makefile + evolution-zip + evolution-calendar.pc + evolution-mail.pc +@@ -1805,6 +1819,7 @@ + LDAP support: $msg_ldap + NetworkManager: $enable_nm + Windows SENS: $enable_sens ++ ConnMan: $enable_connman + Pilot conduits: $msg_pilot + Libnotify: $HAVE_LIBNOTIFY + Kerberos 5: $msg_krb5 +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//data/evolution-alarm-notify.desktop.in.in evolution-2.30.2.new//data/evolution-alarm-notify.desktop.in.in +--- evolution-2.30.2//data/evolution-alarm-notify.desktop.in.in 2010-05-17 22:35:53.000000000 +0200 ++++ evolution-2.30.2.new//data/evolution-alarm-notify.desktop.in.in 2010-06-22 13:37:26.784114033 +0200 +@@ -7,7 +7,8 @@ + Terminal=false + Type=Application + Categories= +-OnlyShowIn=GNOME;XFCE; ++OnlyShowIn=GNOME;XFCE;MOBLIN; ++X-Moblin-Priority=Low + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=evolution + X-GNOME-Bugzilla-Component=calendar +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/eshell-docs.sgml evolution-2.30.2.new//doc/reference/shell/eshell-docs.sgml +--- evolution-2.30.2//doc/reference/shell/eshell-docs.sgml 2010-04-26 15:13:16.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/eshell-docs.sgml 2010-06-22 13:37:26.784114033 +0200 +@@ -37,7 +37,6 @@ + + + +- + + + +@@ -49,6 +48,13 @@ + + + ++ Extending Evolution ++ ++ ++ ++ ++ ++ + Actions + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/eshell-sections.txt evolution-2.30.2.new//doc/reference/shell/eshell-sections.txt +--- evolution-2.30.2//doc/reference/shell/eshell-sections.txt 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/eshell-sections.txt 2010-06-22 13:37:26.784114033 +0200 +@@ -70,12 +70,11 @@ + EShellContent + EShellContent + e_shell_content_new +-e_shell_content_get_searchbar ++e_shell_content_set_searchbar + e_shell_content_check_state + e_shell_content_get_shell_view + e_shell_content_get_view_id + e_shell_content_set_view_id +-e_shell_content_get_search_name + e_shell_content_run_advanced_search_dialog + e_shell_content_run_edit_searches_dialog + e_shell_content_run_save_search_dialog +@@ -98,11 +97,13 @@ + EShellSearchbar + e_shell_searchbar_new + e_shell_searchbar_get_shell_view ++e_shell_searchbar_get_express_mode ++e_shell_searchbar_set_express_mode + e_shell_searchbar_get_filter_combo_box + e_shell_searchbar_get_filter_visible + e_shell_searchbar_set_filter_visible +-e_shell_searchbar_get_label_visible +-e_shell_searchbar_set_label_visible ++e_shell_searchbar_get_labels_visible ++e_shell_searchbar_set_labels_visible + e_shell_searchbar_get_search_hint + e_shell_searchbar_set_search_hint + e_shell_searchbar_get_search_option +@@ -260,6 +261,8 @@ + e_shell_view_is_active + e_shell_view_get_page_num + e_shell_view_set_page_num ++e_shell_view_get_searchbar ++e_shell_view_get_search_name + e_shell_view_get_search_rule + e_shell_view_set_search_rule + e_shell_view_get_search_query +@@ -441,6 +444,41 @@ + + +
++e-extensible ++EExtensible ++EExtensible ++e_extensible_load_extensions ++e_extensible_list_extensions ++ ++E_EXTENSIBLE ++E_IS_EXTENSIBLE ++E_TYPE_EXTENSIBLE ++E_EXTENSIBLE_INTERFACE ++E_IS_EXTENSIBLE_INTERFACE ++E_EXTENSIBLE_GET_INTERFACE ++EExtensibleInterface ++e_extensible_get_type ++
++ ++
++e-extension ++EExtension ++EExtension ++e_extension_get_extensible ++ ++E_EXTENSION ++E_IS_EXTENSION ++E_TYPE_EXTENSION ++E_EXTENSION_CLASS ++E_IS_EXTENSION_CLASS ++E_EXTENSION_GET_CLASS ++EExtensionClass ++e_extension_get_type ++ ++EExtensionPrivate ++
++ ++
+ e-html-utils + Text to HTML Conversion + E_TEXT_TO_HTML_PRE +@@ -489,7 +527,7 @@ + +
+ e-module +-Generic Module Loader ++EModule + EModule + e_module_new + e_module_get_filename +@@ -610,6 +648,7 @@ + e-util + Miscellaneous Utilities + e_get_user_data_dir ++e_get_gnome2_user_dir + e_get_accels_filename + e_show_uri + e_display_help +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/eshell.types evolution-2.30.2.new//doc/reference/shell/eshell.types +--- evolution-2.30.2//doc/reference/shell/eshell.types 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/eshell.types 2010-06-22 13:37:26.784114033 +0200 +@@ -1,4 +1,6 @@ + e_bit_array_get_type ++e_extensible_get_type ++e_extension_get_type + e_logger_get_type + e_module_get_type + e_signature_get_type +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-account-utils.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-account-utils.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-account-utils.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-account-utils.sgml 2010-06-22 13:37:26.784114033 +0200 +@@ -1,5 +1,5 @@ + +-Mail Account Functions ++Mail Accounts + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-activity-handler.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-activity-handler.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-activity-handler.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-activity-handler.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,19 +0,0 @@ +- +-EActivityHandler +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-categories-config.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-categories-config.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-categories-config.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-categories-config.sgml 2010-06-22 13:37:26.784114033 +0200 +@@ -1,5 +1,5 @@ + +-Category Functions ++Categories + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-config-upgrade.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-config-upgrade.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-config-upgrade.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-config-upgrade.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,32 +0,0 @@ +- +-e-config-upgrade +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@major: +-@minor: +-@revision: +-@Returns: +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-datetime-format.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-datetime-format.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-datetime-format.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-datetime-format.sgml 2010-06-22 13:37:26.784114033 +0200 +@@ -1,5 +1,5 @@ + +-Date and Time Formatting Functions ++Date and Time Formatting + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-dialog-utils.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-dialog-utils.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-dialog-utils.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-dialog-utils.sgml 2010-06-22 13:37:26.784114033 +0200 +@@ -1,5 +1,5 @@ + +-Dialog Window Functions (Legacy) ++Dialog Utilities (Legacy) + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-extensible.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-extensible.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-extensible.sgml 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-extensible.sgml 2010-06-22 13:37:26.788114033 +0200 +@@ -0,0 +1,46 @@ ++ ++EExtensible ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++@extensible: ++ ++ ++ ++ ++ ++ ++ ++@extensible: ++@extension_type: ++@Returns: ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-extension.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-extension.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-extension.sgml 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-extension.sgml 2010-06-22 13:37:26.788114033 +0200 +@@ -0,0 +1,42 @@ ++ ++EExtension ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++@extension: ++@Returns: ++ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-icon-factory.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-icon-factory.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-icon-factory.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-icon-factory.sgml 2010-06-22 13:37:26.788114033 +0200 +@@ -1,5 +1,5 @@ + +-Icon Functions (Legacy) ++Icon Utilities (Legacy) + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-module.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-module.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-module.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-module.sgml 2010-06-22 13:37:26.788114033 +0200 +@@ -1,5 +1,5 @@ + +-Generic Module Loader ++EModule + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-print.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-print.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-print.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-print.sgml 2010-06-22 13:37:26.788114033 +0200 +@@ -1,5 +1,5 @@ + +-Printing Functions ++Printing + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/es-event.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/es-event.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/es-event.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/es-event.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,147 +0,0 @@ +- +-ESEventHook +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@ES_EVENT_TARGET_STATE: +-@ES_EVENT_TARGET_UPGRADE: +-@ES_EVENT_TARGET_SHELL: +-@ES_EVENT_TARGET_COMPONENT: +- +- +- +- +- +- +-@target: +-@state: +- +- +- +- +- +- +-@target: +-@major: +-@minor: +-@revision: +- +- +- +- +- +- +-@target: +- +- +- +- +- +- +-@target: +-@id: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@Returns: +- +- +- +- +- +- +- +-@Returns: +- +- +- +- +- +- +- +-@eme: +-@Returns: +- +- +- +- +- +- +- +-@emp: +-@state: +-@Returns: +- +- +- +- +- +- +- +-@emp: +-@major: +-@minor: +-@revision: +-@Returns: +- +- +- +- +- +- +- +-@eme: +-@id: +-@Returns: +- +- +- +- +- +- +- +- +- +- +- +- +- +-@Returns: +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-shell-backend.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell-backend.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-shell-backend.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell-backend.sgml 2010-06-22 13:37:26.788114033 +0200 +@@ -34,11 +34,6 @@ + @eshellbackend: the object which received the signal. + @arg1: + +- +- +- +- +- + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-shell-common.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell-common.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-shell-common.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell-common.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,21 +0,0 @@ +- +-e-shell-common +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-shell-constants.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell-constants.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-shell-constants.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell-constants.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,140 +0,0 @@ +- +-e-shell-constants +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-shell-content.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell-content.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-shell-content.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell-content.sgml 2010-06-22 13:37:26.788114033 +0200 +@@ -40,13 +40,13 @@ + @Returns: + + +- ++ + + + + + @shell_content: +-@Returns: ++@searchbar: + + + +@@ -85,15 +85,6 @@ + @view_id: + + +- +- +- +- +- +-@shell_content: +-@Returns: +- +- + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-shell-marshal.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell-marshal.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-shell-marshal.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell-marshal.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,41 +0,0 @@ +- +-e-shell-marshal +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@closure: +-@return_value: +-@n_param_values: +-@param_values: +-@invocation_hint: +-@marshal_data: +- +- +- +- +- +- +- +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-shell-module.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell-module.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-shell-module.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell-module.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,180 +0,0 @@ +- +-EShellModule +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@eshellmodule: the object which received the signal. +-@arg1: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@name: +-@aliases: +-@schemes: +-@sort_order: +-@start: +-@is_busy: +-@shutdown: +-@migrate: +- +- +- +- +- +- +-@shell: +-@filename: +-@Returns: +- +- +- +- +- +- +- +-@shell_module_a: +-@shell_module_b: +-@Returns: +- +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +- +-@shell_module: +-@activity: +- +- +- +- +- +- +- +-@shell_module: +- +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +- +-@shell_module: +-@major: +-@minor: +-@micro: +-@error: +-@Returns: +- +- +- +- +- +- +- +-@shell_module: +-@info: +-@shell_view_type: +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-shell-searchbar.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell-searchbar.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-shell-searchbar.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell-searchbar.sgml 2010-06-22 13:37:26.788114033 +0200 +@@ -26,6 +26,11 @@ + + + ++ ++ ++ ++ ++ + + + +@@ -36,7 +41,7 @@ + + + +- ++ + + + +@@ -99,6 +104,24 @@ + @Returns: + + ++ ++ ++ ++ ++ ++@searchbar: ++@Returns: ++ ++ ++ ++ ++ ++ ++ ++@searchbar: ++@express_mode: ++ ++ + + + +@@ -126,7 +149,7 @@ + @filter_visible: + + +- ++ + + + +@@ -135,13 +158,13 @@ + @Returns: + + +- ++ + + + + + @searchbar: +-@label_visible: ++@labels_visible: + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-shell.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-shell.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell.sgml 2010-06-22 13:37:26.788114033 +0200 +@@ -32,7 +32,7 @@ + + + @eshell: the object which received the signal. +-@Param2: ++@arg1: + + + +@@ -107,6 +107,11 @@ + + + ++ ++ ++ ++ ++ + + + +@@ -126,6 +131,11 @@ + + + ++ ++ ++ ++ ++ + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/eshell-unused.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/eshell-unused.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/eshell-unused.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/eshell-unused.sgml 2010-06-22 13:37:26.792114033 +0200 +@@ -1,2909 +1,46 @@ +- ++ + + + + + +- ++ + + + + +- +- +- +- +- +- +- +- +- +- +-Evolution-DataServer +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-EActivityHandler +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-e-config-upgrade +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-Error Dialog Functions +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-e-shell-common +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-e-shell-constants +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-e-shell-marshal +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-Migration +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-EShellModule +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-Global Actions +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-e-shell-window-private +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-ETestShellView +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-ESEventHook +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-EvolutionImporterClient +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-EvolutionImporterListener +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-EvolutionImporter +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-EvolutionIntelligentImporter +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-intelligent +- +- +- +- +- +- +- +-@E_CURSOR_NORMAL: +-@E_CURSOR_BUSY: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@target: +-@id: +- +- +- +- +- +- +-@target: +- +- +- +- +- +- +-@target: +-@state: +- +- +- +- +- +- +-@target: +-@major: +-@minor: +-@revision: +- +- +- +- +- +- +-@eshell: the object which received the signal. +-@arg1: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@E_SHELL_LINE_STATUS_ONLINE: +-@E_SHELL_LINE_STATUS_GOING_OFFLINE: +-@E_SHELL_LINE_STATUS_OFFLINE: +-@E_SHELL_LINE_STATUS_FORCED_OFFLINE: +- +- +- +- +- +- +- +- +- +- +- +- +-@eshellmodule: the object which received the signal. +-@arg1: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@name: +-@aliases: +-@schemes: +-@sort_order: +-@start: +-@is_busy: +-@shutdown: +-@migrate: +- +- +- +- +- +- +-@eshellview: the object which received the signal. +-@arg1: +- +- +- +- +- +- +-@eshellview: the object which received the signal. +-@arg1: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@parent: +-@priv: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@window: +-@name: +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +-@window: +-@name: +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@parent: +-@priv: +- +- +- +- +- +- +-@parent_type: +-@objref: +- +- +- +- +- +- +-@importer: +-@control: +-@closure: +- +- +- +- +- +- +-@importer: +-@closure: +-@Returns: +- +- +- +- +- +- +-@parent: +-@priv: +- +- +- +- +- +- +-@listener: +-@result: +-@more_items: +-@closure: +- +- +- +- +- +- +- +- +- +- +- +- +-@importer: +-@filename: +-@closure: +-@Returns: +- +- +- +- +- +- +- +- +- +- +- +- +-@importer: +-@listener: +-@closure: +-@ev: +- +- +- +- +- +- +-@EVOLUTION_IMPORTER_OK: +-@EVOLUTION_IMPORTER_UNSUPPORTED_OPERATION: +-@EVOLUTION_IMPORTER_INTERRUPTED: +-@EVOLUTION_IMPORTER_BUSY: +-@EVOLUTION_IMPORTER_NOT_READY: +-@EVOLUTION_IMPORTER_UNKNOWN_DATA: +-@EVOLUTION_IMPORTER_BAD_DATA: +-@EVOLUTION_IMPORTER_BAD_FILE: +-@EVOLUTION_IMPORTER_UNKNOWN_ERROR: +- +- +- +- +- +- +-@importer: +-@filename: +-@closure: +-@Returns: +- +- +- +- +- +- +-@parent: +-@priv: +- +- +- +- +- +- +-@ii: +-@closure: +-@Returns: +- +- +- +- +- +- +-@ii: +-@closure: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@_obj: +-@ev: +-@Returns: +- +- +- +- +- +- +-@GNOME_Evolution_DataServer_InterfaceCheck__get_interfaceVersion__imethods_index: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@GNOME_Evolution_DataServer_Logging_Error: +-@GNOME_Evolution_DataServer_Logging_Critical: +-@GNOME_Evolution_DataServer_Logging_Warning: +-@GNOME_Evolution_DataServer_Logging_Message: +-@GNOME_Evolution_DataServer_Logging_Info: +-@GNOME_Evolution_DataServer_Logging_Debug: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@m: +-@d: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@m: +- +- +- +- +- +- +-@_private: +-@vepv: +- +- +- +- +- +- +-@_private: +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +-@_base_epv: +-@GNOME_Evolution_DataServer_Config_epv: +- +- +- +- +- +- +-@_private: +-@vepv: +- +- +- +- +- +- +-@_private: +-@_get_interfaceVersion: +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +-@_base_epv: +-@Bonobo_Unknown_epv: +-@GNOME_Evolution_DataServer_InterfaceCheck_epv: +- +- +- +- +- +- +-@_private: +-@vepv: +- +- +- +- +- +- +-@_private: +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +-@_base_epv: +-@Bonobo_Unknown_epv: +-@Bonobo_EventSource_epv: +-@GNOME_Evolution_DataServer_Logging_epv: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@alert: +- +- +- +- +- +- +-@parent: +-@alert: +-@Returns: +- +- +- +- +- +- +-@parent: +-@tag: +-@arg0: +-@Varargs: +-@Returns: +- +- +- +- +- +- +-@tag: +-@arg0: +-@ap: +-@Returns: +- +- +- +- +- +- +-@major: +-@minor: +-@revision: +-@Returns: +- +- +- +- +- +- +-@dialog: +-@Returns: +- +- +- +- +- +- +-@parent: +-@tag: +-@arg0: +-@Varargs: +-@Returns: +- +- +- +- +- +- +-@parent: +-@tag: +-@arg0: +-@ap: +-@Returns: +- +- +- +- +- +- +-@parent: +-@tag: +-@arg0: +-@Varargs: +-@Returns: +- +- +- +- +- +- +-@parent: +-@tag: +-@arg0: +-@ap: +-@Returns: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@shell_backend: +-@Returns: +- +- +- +- +- +- +-@shell_backend: +-@Returns: +- +- +- +- +- +- +-@shell_backend: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@action_value: +- +- +- +- +- +- +-@shell_content: +-@action_value: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@Returns: +- +- +- +- +- +- +-@shell_content: +-@group_name: +- +- +- +- +- +- +-@shell_content: +-@context: +- +- +- +- +- +- +-@shell_content: +-@filter_action: +- +- +- +- +- +- +-@shell_content: +-@filter_value: +- +- +- +- +- +- +-@shell_content: +-@filter_visible: +- +- +- +- +- +- +-@shell_content: +-@scope_action: +- +- +- +- +- +- +-@shell_content: +-@scope_value: +- +- +- +- +- +- +-@shell_content: +-@scope_visible: +- +- +- +- +- +- +-@shell_content: +-@search_hint: +- +- +- +- +- +- +-@shell_content: +-@search_rule: +- +- +- +- +- +- +-@shell_content: +-@search_text: +- +- +- +- +- +- +-@shell_content: +-@search_value: +- +- +- +- +- +- +-@shell_content: +-@search_visible: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@name: +-@Returns: +- +- +- +- +- +- +-@shell: +-@scheme: +-@Returns: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@uri: +-@Returns: +- +- +- +- +- +- +-@shell_window: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@closure: +-@return_value: +-@n_param_values: +-@param_values: +-@invocation_hint: +-@marshal_data: +- +- +- +- +- +- +- +- +- +- +- +- +-@Returns: +- +- +- +- +- +- +-@shell_module: +-@activity: +- +- +- +- +- +- +-@shell_module_a: +-@shell_module_b: +-@Returns: +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +-@shell_module: ++@void: + @Returns: + +- ++ + + + + +-@shell_module: +-@major: +-@minor: +-@micro: +-@error: +-@Returns: +- +- +- +- +- +- +-@shell: +-@filename: +-@Returns: +- +- +- +- +- +- +-@shell_module: +-@info: +-@shell_view_type: +- +- +- +- +- +- +-@shell_module: +-@Returns: +- +- +- +- +- +- +-@shell_module: +- +- +- +- +- +- +-@shell_module: +-@major: +-@minor: +-@micro: +-@error: ++@shell_content: + @Returns: + +- ++ + + + + +-@online: ++@shell_content: + @Returns: + +- ++ + + + + + @searchbar: +-@group_name: +- +- +- +- +- +- +-@shell: +-@status: +- +- +- +- +- +- +-@shell: +-@online_mode: +- +- +- +- +- +- +-@shell_settings: +-@property_name: +-@gconf_key: +- +- +- +- +- +- +-@shell: +-@Returns: +- +- +- +- +- +- +-@shell_view: +-@Returns: +- +- +- +- +- +- +- +- +- +- +- +- +-@filename: +-@Returns: +- +- +- +- +- +- +-@filename: +-@filename_is_uri: +-@buffer: +-@read: +-@error: +-@Returns: +- +- +- +- +- +- +-@uri: +-@Returns: +- +- +- +- +- +- +-@filename: +-@data: +-@Returns: +- +- +- +- +- +- +-@Returns: +- +- +- +- +- +- +-@Returns: +- +- +- +- +- +- +-@Returns: +- +- +- +- +- +- +-@eme: +-@Returns: +- +- +- +- +- +- +-@eme: +-@id: +-@Returns: +- +- +- +- +- +- +-@emp: +-@state: +-@Returns: +- +- +- +- +- +- +-@emp: +-@major: +-@minor: +-@revision: +-@Returns: +- +- +- +- +- +- +-@ES_EVENT_TARGET_STATE: +-@ES_EVENT_TARGET_UPGRADE: +-@ES_EVENT_TARGET_SHELL: +-@ES_EVENT_TARGET_COMPONENT: +- +- +- +- +- +- +-@client: +-@Returns: +- +- +- +- +- +- +-@client: +-@Returns: +- +- +- +- +- +- +-@client: +-@filename: +-@Returns: +- +- +- +- +- +- +-@objref: +-@Returns: +- +- +- +- +- +- +-@id: +-@Returns: +- +- +- +- +- +- +-@client: +-@listener: +- +- +- +- +- +- +-@client: +-@filename: +-@Returns: +- +- +- +- +- +- +-@callback: +-@closure: +-@Returns: +- +- +- +- +- +- +-@create_control_fn: +-@support_format_fn: +-@load_file_fn: +-@process_item_fn: +-@get_error_fn: +-@closure: +-@Returns: +- +- +- +- +- +- +-@can_import_fn: +-@import_data_fn: +-@importername: +-@message: +-@closure: + @Returns: + +- ++ + + + + ++@searchbar: ++@label_visible: + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-shell-view.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell-view.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-shell-view.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell-view.sgml 2010-06-22 13:37:26.792114033 +0200 +@@ -136,6 +136,8 @@ + @new_shell_content: + @new_shell_sidebar: + @new_shell_taskbar: ++@construct_searchbar: ++@get_search_name: + @toggled: + @clear_search: + @custom_search: +@@ -223,6 +225,24 @@ + @page_num: + + ++ ++ ++ ++ ++ ++@shell_view: ++@Returns: ++ ++ ++ ++ ++ ++ ++ ++@shell_view: ++@Returns: ++ ++ + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-shell-window-actions.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell-window-actions.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-shell-window-actions.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell-window-actions.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,309 +0,0 @@ +- +-Global Actions +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@window: +-@name: +- +- +- +- +- +- +- +-@window: +-@name: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +- +- +- +- +- +-@window: +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-shell-window-private.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell-window-private.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-shell-window-private.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-shell-window-private.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,25 +0,0 @@ +- +-e-shell-window-private +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-signature-utils.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-signature-utils.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-signature-utils.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-signature-utils.sgml 2010-06-22 13:37:26.792114033 +0200 +@@ -1,5 +1,5 @@ + +-More Signature Functions ++More Signature Utilities + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/e-test-shell-view.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/e-test-shell-view.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/e-test-shell-view.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/e-test-shell-view.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,41 +0,0 @@ +- +-ETestShellView +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@parent: +-@priv: +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/Evolution-DataServer.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/Evolution-DataServer.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/Evolution-DataServer.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/Evolution-DataServer.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,1139 +0,0 @@ +- +-Evolution-DataServer +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@GNOME_Evolution_DataServer_Logging_Error: +-@GNOME_Evolution_DataServer_Logging_Critical: +-@GNOME_Evolution_DataServer_Logging_Warning: +-@GNOME_Evolution_DataServer_Logging_Message: +-@GNOME_Evolution_DataServer_Logging_Info: +-@GNOME_Evolution_DataServer_Logging_Debug: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@m: +-@d: +- +- +- +- +- +- +- +-@_private: +- +- +- +- +- +- +-@_base_epv: +-@GNOME_Evolution_DataServer_Config_epv: +- +- +- +- +- +- +-@_private: +-@vepv: +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +- +-@_private: +-@_get_interfaceVersion: +- +- +- +- +- +- +-@_base_epv: +-@Bonobo_Unknown_epv: +-@GNOME_Evolution_DataServer_InterfaceCheck_epv: +- +- +- +- +- +- +-@_private: +-@vepv: +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +- +-@_private: +- +- +- +- +- +- +-@_base_epv: +-@Bonobo_Unknown_epv: +-@Bonobo_EventSource_epv: +-@GNOME_Evolution_DataServer_Logging_epv: +- +- +- +- +- +- +-@_private: +-@vepv: +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +- +-@servant: +-@ev: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@_obj: +-@ev: +-@Returns: +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@GNOME_Evolution_DataServer_InterfaceCheck__get_interfaceVersion__imethods_index: +- +- +- +- +- +- +-@m: +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/evolution-importer-client.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/evolution-importer-client.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/evolution-importer-client.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/evolution-importer-client.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,94 +0,0 @@ +- +-EvolutionImporterClient +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@parent_type: +-@objref: +- +- +- +- +- +- +-@objref: +-@Returns: +- +- +- +- +- +- +- +-@id: +-@Returns: +- +- +- +- +- +- +- +-@client: +-@Returns: +- +- +- +- +- +- +- +-@client: +-@filename: +-@Returns: +- +- +- +- +- +- +- +-@client: +-@filename: +-@Returns: +- +- +- +- +- +- +- +-@client: +-@listener: +- +- +- +- +- +- +- +-@client: +-@Returns: +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/evolution-importer-listener.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/evolution-importer-listener.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/evolution-importer-listener.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/evolution-importer-listener.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,56 +0,0 @@ +- +-EvolutionImporterListener +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@listener: +-@result: +-@more_items: +-@closure: +- +- +- +- +- +- +- +-@parent: +-@priv: +- +- +- +- +- +- +-@callback: +-@closure: +-@Returns: +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/evolution-importer.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/evolution-importer.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/evolution-importer.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/evolution-importer.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,117 +0,0 @@ +- +-EvolutionImporter +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@importer: +-@control: +-@closure: +- +- +- +- +- +- +- +-@importer: +-@filename: +-@closure: +-@Returns: +- +- +- +- +- +- +- +-@importer: +-@filename: +-@closure: +-@Returns: +- +- +- +- +- +- +- +-@importer: +-@listener: +-@closure: +-@ev: +- +- +- +- +- +- +- +-@importer: +-@closure: +-@Returns: +- +- +- +- +- +- +- +-@EVOLUTION_IMPORTER_OK: +-@EVOLUTION_IMPORTER_UNSUPPORTED_OPERATION: +-@EVOLUTION_IMPORTER_INTERRUPTED: +-@EVOLUTION_IMPORTER_BUSY: +-@EVOLUTION_IMPORTER_NOT_READY: +-@EVOLUTION_IMPORTER_UNKNOWN_DATA: +-@EVOLUTION_IMPORTER_BAD_DATA: +-@EVOLUTION_IMPORTER_BAD_FILE: +-@EVOLUTION_IMPORTER_UNKNOWN_ERROR: +- +- +- +- +- +- +-@parent: +-@priv: +- +- +- +- +- +- +-@create_control_fn: +-@support_format_fn: +-@load_file_fn: +-@process_item_fn: +-@get_error_fn: +-@closure: +-@Returns: +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/evolution-intelligent-importer.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/evolution-intelligent-importer.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/evolution-intelligent-importer.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/evolution-intelligent-importer.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,67 +0,0 @@ +- +-EvolutionIntelligentImporter +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-@ii: +-@closure: +-@Returns: +- +- +- +- +- +- +- +-@ii: +-@closure: +- +- +- +- +- +- +- +-@parent: +-@priv: +- +- +- +- +- +- +-@can_import_fn: +-@import_data_fn: +-@importername: +-@message: +-@closure: +-@Returns: +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//doc/reference/shell/tmpl/intelligent.sgml evolution-2.30.2.new//doc/reference/shell/tmpl/intelligent.sgml +--- evolution-2.30.2//doc/reference/shell/tmpl/intelligent.sgml 2010-06-20 19:12:37.000000000 +0200 ++++ evolution-2.30.2.new//doc/reference/shell/tmpl/intelligent.sgml 1970-01-01 01:00:00.000000000 +0100 +@@ -1,26 +0,0 @@ +- +-intelligent +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//e-util/e-account-utils.c evolution-2.30.2.new//e-util/e-account-utils.c +--- evolution-2.30.2//e-util/e-account-utils.c 2010-06-20 14:14:50.000000000 +0200 ++++ evolution-2.30.2.new//e-util/e-account-utils.c 2010-06-22 13:37:26.792114033 +0200 +@@ -15,6 +15,11 @@ + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + */ + ++/** ++ * SECTION: e-account-utils ++ * @include: e-util/e-account-utils.h ++ **/ ++ + #include "e-account-utils.h" + + #include +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//e-util/e-account-utils.h evolution-2.30.2.new//e-util/e-account-utils.h +--- evolution-2.30.2//e-util/e-account-utils.h 2010-06-20 14:14:51.000000000 +0200 ++++ evolution-2.30.2.new//e-util/e-account-utils.h 2010-06-22 13:37:26.792114033 +0200 +@@ -15,11 +15,6 @@ + * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) + */ + +-/** +- * SECTION: e-account-utils +- * @include: e-util/e-account-utils.h +- **/ +- + #ifndef E_ACCOUNT_UTILS_H + #define E_ACCOUNT_UTILS_H + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//e-util/e-alert-dialog.c evolution-2.30.2.new//e-util/e-alert-dialog.c +--- evolution-2.30.2//e-util/e-alert-dialog.c 2010-06-20 14:14:50.000000000 +0200 ++++ evolution-2.30.2.new//e-util/e-alert-dialog.c 2010-06-22 13:37:26.796114033 +0200 +@@ -215,7 +215,9 @@ + + if (e_alert_get_scroll (alert)) { + scroll = gtk_scrolled_window_new (NULL, NULL); +- gtk_scrolled_window_set_policy ((GtkScrolledWindow *)scroll, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); ++ gtk_scrolled_window_set_policy ( ++ GTK_SCROLLED_WINDOW (scroll), ++ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + } + w = gtk_label_new(NULL); + gtk_label_set_selectable((GtkLabel *)w, TRUE); +@@ -268,9 +270,12 @@ + } + + GtkWidget* +-e_alert_dialog_new (GtkWindow *parent, EAlert *alert) ++e_alert_dialog_new (GtkWindow *parent, ++ EAlert *alert) + { +- return (GtkWidget*) g_object_new (E_TYPE_ALERT_DIALOG, "parent", parent, "alert", alert, NULL); ++ return g_object_new ( ++ E_TYPE_ALERT_DIALOG, ++ "parent", parent, "alert", alert, NULL); + } + + GtkWidget* +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//e-util/e-binding.c evolution-2.30.2.new//e-util/e-binding.c +--- evolution-2.30.2//e-util/e-binding.c 2010-06-20 14:14:49.000000000 +0200 ++++ evolution-2.30.2.new//e-util/e-binding.c 2010-06-22 13:37:26.796114033 +0200 +@@ -30,7 +30,7 @@ + const gchar *property_name) + { + g_warning ( +- "%s instances have no `%s' property to bind to", ++ "%s instances have no '%s' property to bind to", + G_OBJECT_TYPE_NAME (object), property_name); + + return NULL; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//e-util/e-config.c evolution-2.30.2.new//e-util/e-config.c +--- evolution-2.30.2//e-util/e-config.c 2010-06-20 14:14:49.000000000 +0200 ++++ evolution-2.30.2.new//e-util/e-config.c 2010-06-22 13:37:26.796114033 +0200 +@@ -41,6 +41,8 @@ + + #define d(x) + ++typedef GtkWidget * (*EConfigItemSectionFactoryFunc)(EConfig *ec, EConfigItem *, GtkWidget *parent, GtkWidget *old, gpointer data, GtkWidget **real_frame); ++ + struct _EConfigFactory { + gchar *id; + EConfigFactoryFunc func; +@@ -62,6 +64,7 @@ + EConfigItem *item; + GtkWidget *widget; /* widget created by the factory, if any */ + GtkWidget *frame; /* if created by us */ ++ GtkWidget *real_frame; /* used for sections and section tables, this is the real GtkFrame (whereas "frame" above is the internal vbox/table) */ + + guint empty:1; /* set if empty (i.e. hidden) */ + }; +@@ -87,6 +90,8 @@ + + static gpointer parent_class; + ++static GtkWidget *ech_config_section_factory (EConfig *config, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data, GtkWidget **real_frame); ++ + static void + config_finalize (GObject *object) + { +@@ -94,7 +99,7 @@ + EConfigPrivate *p = emp->priv; + GList *link; + +- d(printf("finalising EConfig %p\n", o)); ++ d(printf("finalising EConfig %p\n", object)); + + g_free(emp->id); + +@@ -519,6 +524,7 @@ + struct _widget_node *sectionnode = NULL, *pagenode = NULL; + GtkWidget *book = NULL, *page = NULL, *section = NULL, *root = NULL, *assistant = NULL; + gint pageno = 0, sectionno = 0, itemno = 0; ++ gint n_visible_widgets = 0; + struct _widget_node *last_active_page = NULL; + gboolean is_assistant; + GList *link; +@@ -550,7 +556,7 @@ + if (item->label != NULL) + translated_label = gettext (item->label); + +- /* If the last section doesn't contain anything, hide it */ ++ /* If the last section doesn't contain any visible widgets, hide it */ + if (sectionnode != NULL + && sectionnode->frame != NULL + && (item->type == E_CONFIG_PAGE_START +@@ -558,11 +564,22 @@ + || item->type == E_CONFIG_PAGE + || item->type == E_CONFIG_SECTION + || item->type == E_CONFIG_SECTION_TABLE)) { +- if ((sectionnode->empty = itemno == 0)) { +- gtk_widget_hide(sectionnode->frame); ++ if ((sectionnode->empty = (itemno == 0 || n_visible_widgets == 0))) { ++ if (sectionnode->real_frame) ++ gtk_widget_hide(sectionnode->real_frame); ++ ++ if (sectionnode->frame) ++ gtk_widget_hide(sectionnode->frame); ++ + sectionno--; +- } else +- gtk_widget_show(sectionnode->frame); ++ } else { ++ if (sectionnode->real_frame) ++ gtk_widget_show(sectionnode->real_frame); ++ ++ if (sectionnode->frame) ++ gtk_widget_show(sectionnode->frame); ++ } ++ + d(printf("%s section '%s' [sections=%d]\n", sectionnode->empty?"hiding":"showing", sectionnode->item->path, sectionno)); + } + +@@ -791,12 +808,35 @@ + } + + itemno = 0; ++ n_visible_widgets = 0; ++ ++ d(printf("Building section %s - '%s' - %s factory\n", item->path, item->label, item->factory ? "with" : "without")); ++ + if (item->factory) { +- section = item->factory(emp, item, page, wn->widget, wn->context->data); ++ /* For sections, we pass an extra argument to the usual EConfigItemFactoryFunc. ++ * If this is an automatically-generated section, that extra argument (real_frame from ++ * EConfigItemSectionFactoryFunc) will contain the actual GtkFrame upon returning. ++ */ ++ EConfigItemSectionFactoryFunc factory = (EConfigItemSectionFactoryFunc) item->factory; ++ ++ section = factory(emp, item, page, wn->widget, wn->context->data, &wn->real_frame); + wn->frame = section; + if (section) + itemno = 1; + ++ if (factory != ech_config_section_factory) { ++ /* This means there is a section that came from a user-specified factory, ++ * so we don't know what is inside the section. In that case, we increment ++ * n_visible_widgets so that the section will not get hidden later (we don't know ++ * if the section is empty or not, so we cannot decide to hide it). ++ * ++ * For automatically-generated sections, we use a special ech_config_section_factory() - ++ * see emph_construct_item(). ++ */ ++ n_visible_widgets++; ++ d(printf (" n_visible_widgets++ because there is a section factory -> frame=%p\n", section)); ++ } ++ + if (section + && ((item->type == E_CONFIG_SECTION && !GTK_IS_BOX(section)) + || (item->type == E_CONFIG_SECTION_TABLE && !GTK_IS_TABLE(section)))) +@@ -878,6 +918,11 @@ + + d(printf("item %d:%s widget %p\n", itemno, item->path, w)); + ++ d(printf (" item %s: (%s - %s)\n", ++ item->path, ++ g_type_name_from_instance ((GTypeInstance *) w), ++ gtk_widget_get_visible (w) ? "visible" : "invisible")); ++ + if (wn->widget && wn->widget != w) { + d(printf("destroy old widget for item '%s'\n", item->path)); + gtk_widget_destroy(wn->widget); +@@ -887,18 +932,32 @@ + if (w) { + g_signal_connect(w, "destroy", G_CALLBACK(gtk_widget_destroyed), &wn->widget); + itemno++; ++ ++ if (gtk_widget_get_visible (w)) ++ n_visible_widgets++; + } + break; + } + } + +- /* If the last section doesn't contain anything, hide it */ ++ /* If the last section doesn't contain any visible widgets, hide it */ + if (sectionnode != NULL && sectionnode->frame != NULL) { +- if ((sectionnode->empty = itemno == 0)) { +- gtk_widget_hide(sectionnode->frame); ++ d(printf ("Section %s - %d visible widgets (frame=%p)\n", sectionnode->item->path, n_visible_widgets, sectionnode->frame)); ++ if ((sectionnode->empty = (itemno == 0 || n_visible_widgets == 0))) { ++ if (sectionnode->real_frame) ++ gtk_widget_hide(sectionnode->real_frame); ++ ++ if (sectionnode->frame) ++ gtk_widget_hide(sectionnode->frame); ++ + sectionno--; +- } else +- gtk_widget_show(sectionnode->frame); ++ } else { ++ if (sectionnode->real_frame) ++ gtk_widget_show(sectionnode->real_frame); ++ ++ if (sectionnode->frame) ++ gtk_widget_show(sectionnode->frame); ++ } + d(printf("%s section '%s' [sections=%d]\n", sectionnode->empty?"hiding":"showing", sectionnode->item->path, sectionno)); + } + +@@ -1585,7 +1644,8 @@ + EConfigItem *item, + GtkWidget *parent, + GtkWidget *old, +- gpointer data) ++ gpointer data, ++ GtkWidget **real_frame) + { + struct _EConfigHookGroup *group = data; + GtkWidget *label = NULL; +@@ -1612,6 +1672,8 @@ + gtk_frame_set_shadow_type (GTK_FRAME (widget), GTK_SHADOW_NONE); + gtk_box_pack_start (GTK_BOX (parent), widget, FALSE, FALSE, 0); + ++ *real_frame = widget; ++ + /* This is why we have a custom factory for sections. + * When the plugin is disabled the frame is invisible. */ + plugin = group->hook->hook.plugin; +@@ -1667,9 +1729,9 @@ + if (item->user_data) + item->factory = ech_config_widget_factory; + else if (item->type == E_CONFIG_SECTION) +- item->factory = ech_config_section_factory; ++ item->factory = (EConfigItemFactoryFunc) ech_config_section_factory; + else if (item->type == E_CONFIG_SECTION_TABLE) +- item->factory = ech_config_section_factory; ++ item->factory = (EConfigItemFactoryFunc) ech_config_section_factory; + + d(printf(" path=%s label=%s factory=%s\n", item->path, item->label, (gchar *)item->user_data)); + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//e-util/e-dialog-utils.c evolution-2.30.2.new//e-util/e-dialog-utils.c +--- evolution-2.30.2//e-util/e-dialog-utils.c 2010-06-20 14:14:49.000000000 +0200 ++++ evolution-2.30.2.new//e-util/e-dialog-utils.c 2010-06-22 13:37:26.796114033 +0200 +@@ -46,6 +46,7 @@ + + va_start (args, format); + str = g_strdup_vprintf (format, args); ++ + dialog = gtk_message_dialog_new (NULL, + GTK_DIALOG_DESTROY_WITH_PARENT, + type, +@@ -55,8 +56,11 @@ + va_end (args); + g_free (str); + ++ if (parent && !gtk_widget_is_toplevel (parent)) ++ parent = gtk_widget_get_toplevel (parent); + if (parent) + gtk_window_set_transient_for (GTK_WINDOW (dialog), parent); ++ + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//e-util/e-extensible.c evolution-2.30.2.new//e-util/e-extensible.c +--- evolution-2.30.2//e-util/e-extensible.c 2010-06-20 14:14:50.000000000 +0200 ++++ evolution-2.30.2.new//e-util/e-extensible.c 2010-06-22 13:37:26.796114033 +0200 +@@ -16,11 +16,54 @@ + * + */ + ++/** ++ * SECTION: e-extensible ++ * @short_description: an interface for extending objects ++ * @include: e-util/e-extensible.h ++ * ++ * #EExtension objects can be tacked on to any #GObject instance that ++ * implements the #EExtensible interface. A #GObject type can be made ++ * extensible in two steps: ++ * ++ * 1. Add the #EExtensible interface when registering the #GType. ++ * There are no methods to implement. ++ * ++ * ++ * ++ * #include ++ * ++ * G_DEFINE_TYPE_WITH_CODE ( ++ * ECustomWidget, e_custom_widget, GTK_TYPE_WIDGET, ++ * G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) ++ * ++ * ++ * ++ * 2. Load extensions for the class at some point during #GObject ++ * initialization. Generally this should be done toward the end of ++ * the initialization code, so extensions get a fully initialized ++ * object to work with. ++ * ++ * ++ * ++ * static void ++ * e_custom_widget_init (ECustomWidget *widget) ++ * { ++ * Initialization code goes here... ++ * ++ * e_extensible_load_extensions (E_EXTENSIBLE (widget)); ++ * } ++ * ++ * ++ **/ ++ + #include "e-extensible.h" + + #include + #include + ++#define IS_AN_EXTENSION_TYPE(type) \ ++ (g_type_is_a ((type), E_TYPE_EXTENSION)) ++ + static GQuark extensible_quark; + + static GPtrArray * +@@ -89,6 +132,15 @@ + return type; + } + ++/** ++ * e_extensible_load_extensions: ++ * @extensible: an #EExtensible ++ * ++ * Creates an instance of all instantiable subtypes of #EExtension which ++ * target the class of @extensible. The lifetimes of these newly created ++ * #EExtension objects are bound to @extensible such that they are finalized ++ * when @extensible is finalized. ++ **/ + void + e_extensible_load_extensions (EExtensible *extensible) + { +@@ -110,3 +162,44 @@ + E_TYPE_EXTENSION, (ETypeFunc) + extensible_load_extension, extensible); + } ++ ++/** ++ * e_extensible_list_extensions: ++ * @extensible: an #EExtensible ++ * @extension_type: the type of extensions to list ++ * ++ * Returns a list of #EExtension objects bound to @extensible whose ++ * types are ancestors of @extension_type. For a complete list of ++ * extension objects bound to @extensible, pass %E_TYPE_EXTENSION. ++ * ++ * The list itself should be freed with g_list_free(). The extension ++ * objects are owned by @extensible and should not be unreferenced. ++ * ++ * Returns: a list of extension objects derived from @extension_type ++ **/ ++GList * ++e_extensible_list_extensions (EExtensible *extensible, ++ GType extension_type) ++{ ++ GPtrArray *extensions; ++ GList *list = NULL; ++ guint ii; ++ ++ g_return_val_if_fail (E_IS_EXTENSIBLE (extensible), NULL); ++ g_return_val_if_fail (IS_AN_EXTENSION_TYPE (extension_type), NULL); ++ ++ e_extensible_load_extensions (extensible); ++ ++ extensions = extensible_get_extensions (extensible); ++ g_return_val_if_fail (extensions != NULL, NULL); ++ ++ for (ii = 0; ii < extensions->len; ii++) { ++ GObject *object; ++ ++ object = g_ptr_array_index (extensions, ii); ++ if (g_type_is_a (G_OBJECT_TYPE (object), extension_type)) ++ list = g_list_prepend (list, object); ++ } ++ ++ return g_list_reverse (list); ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//e-util/e-extensible.h evolution-2.30.2.new//e-util/e-extensible.h +--- evolution-2.30.2//e-util/e-extensible.h 2010-06-20 14:14:50.000000000 +0200 ++++ evolution-2.30.2.new//e-util/e-extensible.h 2010-06-22 13:37:26.796114033 +0200 +@@ -51,6 +51,8 @@ + + GType e_extensible_get_type (void); + void e_extensible_load_extensions (EExtensible *extensible); ++GList * e_extensible_list_extensions (EExtensible *extensible, ++ GType extension_type); + + G_END_DECLS + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//e-util/e-extension.c evolution-2.30.2.new//e-util/e-extension.c +--- evolution-2.30.2//e-util/e-extension.c 2010-06-20 14:14:51.000000000 +0200 ++++ evolution-2.30.2.new//e-util/e-extension.c 2010-06-22 13:37:26.796114033 +0200 +@@ -16,6 +16,29 @@ + * + */ + ++/** ++ * SECTION: e-extension ++ * @short_description: abstract base class for extensions ++ * @include: e-util/e-extension.h ++ * ++ * #EExtension provides a way to extend the functionality of objects ++ * that implement the #EExtensible interface. #EExtension subclasses ++ * can target a particular extensible object type. New instances of ++ * an extensible object type get paired with a new instance of each ++ * #EExtension subclass that targets the extensible object type. ++ * ++ * The first steps of writing a new extension are as follows: ++ * ++ * 1. Subclass #EExtension. ++ * ++ * 2. In the class initialization function, specify the #GType being ++ * extended. The #GType must implement the #EExtensible interface. ++ * ++ * 3. Register the extension's own #GType. If the extension is to ++ * be loaded dynamically using #GTypeModule, the type should be ++ * registered in the library module's e_module_load() function. ++ **/ ++ + #include "e-extension.h" + + #define E_EXTENSION_GET_PRIVATE(obj) \ +@@ -151,6 +174,14 @@ + extension->priv = E_EXTENSION_GET_PRIVATE (extension); + } + ++/** ++ * e_extension_get_extensible: ++ * @extension: an #EExtension ++ * ++ * Returns the object that @extension extends. ++ * ++ * Returns: the object being extended ++ **/ + EExtensible * + e_extension_get_extensible (EExtension *extension) + { +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//e-util/e-extension.h evolution-2.30.2.new//e-util/e-extension.h +--- evolution-2.30.2//e-util/e-extension.h 2010-06-20 14:14:51.000000000 +0200 ++++ evolution-2.30.2.new//e-util/e-extension.h 2010-06-22 13:37:26.796114033 +0200 +@@ -47,6 +47,12 @@ + typedef struct _EExtensionClass EExtensionClass; + typedef struct _EExtensionPrivate EExtensionPrivate; + ++/** ++ * EExtension: ++ * ++ * Contains only private data that should be read and manipulated using the ++ * functions below. ++ **/ + struct _EExtension { + GObject parent; + EExtensionPrivate *priv; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//e-util/e-folder-map.c evolution-2.30.2.new//e-util/e-folder-map.c +--- evolution-2.30.2//e-util/e-folder-map.c 2010-06-20 14:14:50.000000000 +0200 ++++ evolution-2.30.2.new//e-util/e-folder-map.c 2010-06-22 13:37:26.796114033 +0200 +@@ -49,18 +49,18 @@ + + doc = e_xml_parse_file (metadata); + if (!doc) { +- g_warning ("Cannot parse `%s'", metadata); ++ g_warning ("Cannot parse '%s'", metadata); + return FALSE; + } + + if (!(node = xmlDocGetRootElement (doc))) { +- g_warning ("`%s' corrupt: document contains no root node", metadata); ++ g_warning ("'%s' corrupt: document contains no root node", metadata); + xmlFreeDoc (doc); + return FALSE; + } + + if (!node->name || strcmp ((gchar *)node->name, "efolder") != 0) { +- g_warning ("`%s' corrupt: root node is not 'efolder'", metadata); ++ g_warning ("'%s' corrupt: root node is not 'efolder'", metadata); + xmlFreeDoc (doc); + return FALSE; + } +@@ -122,7 +122,7 @@ + } + + if (!(dir = g_dir_open (path, 0, &error))) { +- g_warning ("cannot open `%s': %s", path, error->message); ++ g_warning ("cannot open '%s': %s", path, error->message); + g_error_free (error); + g_free (path); + return; +@@ -158,7 +158,7 @@ + GError *error = NULL; + + if (!(dir = g_dir_open (local_dir, 0, &error))) { +- g_warning ("cannot open `%s': %s", local_dir, error->message); ++ g_warning ("cannot open '%s': %s", local_dir, error->message); + g_error_free (error); + return NULL; + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//e-util/e-module.c evolution-2.30.2.new//e-util/e-module.c +--- evolution-2.30.2//e-util/e-module.c 2010-06-20 14:14:50.000000000 +0200 ++++ evolution-2.30.2.new//e-util/e-module.c 2010-06-22 13:37:26.796114033 +0200 +@@ -19,6 +19,12 @@ + * + */ + ++/** ++ * SECTION: e-module ++ * @short_description: a module loader ++ * @include: e-util/e-module.h ++ **/ ++ + #include "e-module.h" + + #include +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//e-util/e-module.h evolution-2.30.2.new//e-util/e-module.h +--- evolution-2.30.2//e-util/e-module.h 2010-06-20 14:14:51.000000000 +0200 ++++ evolution-2.30.2.new//e-util/e-module.h 2010-06-22 13:37:26.796114033 +0200 +@@ -19,11 +19,6 @@ + * + */ + +-/** +- * SECTION: e-module +- * @include: e-util/e-module.h +- **/ +- + #ifndef E_MODULE_H + #define E_MODULE_H + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//e-util/e-selection.c evolution-2.30.2.new//e-util/e-selection.c +--- evolution-2.30.2//e-util/e-selection.c 2010-06-20 14:14:51.000000000 +0200 ++++ evolution-2.30.2.new//e-util/e-selection.c 2010-06-22 13:37:26.796114033 +0200 +@@ -19,6 +19,12 @@ + * + */ + ++/** ++ * SECTION: e-selection ++ * @short_description: selection and clipboard utilities ++ * @include: e-util/e-selection.h ++ **/ ++ + #include "e-selection.h" + + #include +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//e-util/e-selection.h evolution-2.30.2.new//e-util/e-selection.h +--- evolution-2.30.2//e-util/e-selection.h 2010-06-20 14:14:49.000000000 +0200 ++++ evolution-2.30.2.new//e-util/e-selection.h 2010-06-22 13:37:26.796114033 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-selection +- * @short_description: selection and clipboard utilities +- * @include: e-util/e-selection.h +- **/ +- + #ifndef E_SELECTION_H + #define E_SELECTION_H + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//e-util/e-ui-manager.c evolution-2.30.2.new//e-util/e-ui-manager.c +--- evolution-2.30.2//e-util/e-ui-manager.c 2010-06-20 14:14:49.000000000 +0200 ++++ evolution-2.30.2.new//e-util/e-ui-manager.c 2010-06-22 13:37:26.796114033 +0200 +@@ -16,6 +16,15 @@ + * + */ + ++/** ++ * SECTION: e-ui-manager ++ * @short_description: construct menus and toolbars from a UI definition ++ * @include: e-util/e-ui-manager.h ++ * ++ * This is a #GtkUIManager with support for Evolution's "express" mode, ++ * which influences the parsing of UI definitions. ++ **/ ++ + #include "e-ui-manager.h" + #include "e-util-private.h" + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//e-util/e-ui-manager.h evolution-2.30.2.new//e-util/e-ui-manager.h +--- evolution-2.30.2//e-util/e-ui-manager.h 2010-06-20 14:14:50.000000000 +0200 ++++ evolution-2.30.2.new//e-util/e-ui-manager.h 2010-06-22 13:37:26.800114033 +0200 +@@ -16,15 +16,6 @@ + * + */ + +-/** +- * SECTION: e-ui-manager +- * @short_description: construct menus and toolbars from a UI definition +- * @include: e-util/e-ui-manager.h +- * +- * This is a #GtkUIManager with support for Evolution's "express" mode, +- * which influences the parsing of UI definitions. +- **/ +- + #ifndef E_UI_MANAGER_H + #define E_UI_MANAGER_H + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//e-util/e-util.c evolution-2.30.2.new//e-util/e-util.c +--- evolution-2.30.2//e-util/e-util.c 2010-06-20 14:14:51.000000000 +0200 ++++ evolution-2.30.2.new//e-util/e-util.c 2010-06-22 13:37:26.800114033 +0200 +@@ -20,6 +20,11 @@ + * + */ + ++/** ++ * SECTION: e-util ++ * @include: e-util/e-util.h ++ **/ ++ + #include + + #include +@@ -237,7 +242,7 @@ + iter = g_list_next (iter); + } + +- g_critical ("%s: action `%s' not found", G_STRFUNC, action_name); ++ g_critical ("%s: action '%s' not found", G_STRFUNC, action_name); + + return NULL; + } +@@ -276,7 +281,7 @@ + iter = g_list_next (iter); + } + +- g_critical ("%s: action group `%s' not found", G_STRFUNC, group_name); ++ g_critical ("%s: action group '%s' not found", G_STRFUNC, group_name); + + return NULL; + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//e-util/e-util.h evolution-2.30.2.new//e-util/e-util.h +--- evolution-2.30.2//e-util/e-util.h 2010-06-20 14:14:50.000000000 +0200 ++++ evolution-2.30.2.new//e-util/e-util.h 2010-06-22 13:37:26.800114033 +0200 +@@ -20,11 +20,6 @@ + * + */ + +-/** +- * SECTION: e-util +- * @include: e-util/e-util.h +- **/ +- + #ifndef E_UTIL_H + #define E_UTIL_H + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//help/C/evolution.xml evolution-2.30.2.new//help/C/evolution.xml +--- evolution-2.30.2//help/C/evolution.xml 2010-06-20 19:12:38.000000000 +0200 ++++ evolution-2.30.2.new//help/C/evolution.xml 2010-06-22 13:37:26.804114033 +0200 +@@ -7036,7 +7036,7 @@ + Select this option to display weekends in one box instead of two in the month view. + + +- Show week numbers in date navigator: ++ Show week numbers: + Shows the week numbers next to the respective weeks in the calendar. + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//mail/em-account-editor.c evolution-2.30.2.new//mail/em-account-editor.c +--- evolution-2.30.2//mail/em-account-editor.c 2010-06-20 14:15:02.000000000 +0200 ++++ evolution-2.30.2.new//mail/em-account-editor.c 2010-06-22 13:37:26.804114033 +0200 +@@ -835,7 +835,6 @@ + EShell *shell; + EShellSettings *shell_settings; + GtkWidget *editor; +- gboolean html_mode; + gpointer parent; + + shell = e_shell_get_default (); +@@ -844,11 +843,7 @@ + parent = gtk_widget_get_toplevel (widget); + parent = gtk_widget_is_toplevel (parent) ? parent : NULL; + +- html_mode = e_shell_settings_get_boolean ( +- shell_settings, "composer-format-html"); +- + editor = e_signature_editor_new (); +- gtkhtml_editor_set_html_mode (GTKHTML_EDITOR (editor), html_mode); + gtk_window_set_transient_for (GTK_WINDOW (editor), parent); + gtk_widget_show (editor); + } +@@ -2195,7 +2190,9 @@ + gtk_notebook_append_page ((GtkNotebook *)parent, w, gtk_label_new (_("Identity"))); + } + +- emae_queue_widgets (emae, builder, "account_vbox", "identity_required_table", "identity_optional_table", "identity_optional_frame", NULL); ++ emae_queue_widgets (emae, builder, "account_vbox", "identity_required_table", ++ "identity_optional_table", "identity_optional_frame", ++ "identity_address", NULL); + + g_object_unref (builder); + +@@ -3152,8 +3149,8 @@ + camel_url_set_protocol (url, "smtp"); + camel_url_set_param (url, "use_ssl", sdata->ssl); + camel_url_set_host (url, sdata->send); +- if (sdata->recv_port && *sdata->recv_port) +- camel_url_set_port (url, atoi(sdata->recv_port)); ++ if (sdata->send_port && *sdata->send_port) ++ camel_url_set_port (url, atoi(sdata->send_port)); + + if (sdata->send_user && *sdata->send_user) + camel_url_set_user (url, sdata->send_user); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//mail/e-mail-backend.c evolution-2.30.2.new//mail/e-mail-backend.c +--- evolution-2.30.2//mail/e-mail-backend.c 2010-06-20 14:15:03.000000000 +0200 ++++ evolution-2.30.2.new//mail/e-mail-backend.c 2010-06-22 13:37:26.804114033 +0200 +@@ -22,6 +22,7 @@ + * + */ + ++#include + #include "e-mail-backend.h" + + #include +@@ -284,6 +285,11 @@ + if (!e_shell_get_online (shell)) + return; + ++ /* In express mode, don't raise mail request in non mail window. */ ++ if (e_shell_get_express_mode(shell) && ++ strcmp(e_shell_window_get_active_view((EShellWindow *)window), "mail") != 0) ++ return; ++ + /* Check Outbox for any unsent messages. */ + + folder = e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//mail/e-mail-display.c evolution-2.30.2.new//mail/e-mail-display.c +--- evolution-2.30.2//mail/e-mail-display.c 2010-06-20 14:15:02.000000000 +0200 ++++ evolution-2.30.2.new//mail/e-mail-display.c 2010-06-22 13:37:26.804114033 +0200 +@@ -208,6 +208,22 @@ + } + + static void ++mail_display_load_string (EWebView *web_view, ++ const gchar *string) ++{ ++ EMailDisplayPrivate *priv; ++ ++ priv = E_MAIL_DISPLAY_GET_PRIVATE (web_view); ++ g_return_if_fail (priv->formatter != NULL); ++ ++ if (em_format_busy (EM_FORMAT (priv->formatter))) ++ return; ++ ++ /* Chain up to parent's load_string() method. */ ++ E_WEB_VIEW_CLASS (parent_class)->load_string (web_view, string); ++} ++ ++static void + mail_display_url_requested (GtkHTML *html, + const gchar *uri, + GtkHTMLStream *stream) +@@ -270,6 +286,7 @@ + { + GObjectClass *object_class; + GtkWidgetClass *widget_class; ++ EWebViewClass *web_view_class; + GtkHTMLClass *html_class; + + parent_class = g_type_class_peek_parent (class); +@@ -284,6 +301,9 @@ + widget_class->realize = mail_display_realize; + widget_class->style_set = mail_display_style_set; + ++ web_view_class = E_WEB_VIEW_CLASS (class); ++ web_view_class->load_string = mail_display_load_string; ++ + html_class = GTK_HTML_CLASS (class); + html_class->url_requested = mail_display_url_requested; + html_class->link_clicked = mail_display_link_clicked; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//mail/e-mail-migrate.c evolution-2.30.2.new//mail/e-mail-migrate.c +--- evolution-2.30.2//mail/e-mail-migrate.c 2010-06-20 14:15:02.000000000 +0200 ++++ evolution-2.30.2.new//mail/e-mail-migrate.c 2010-06-22 13:37:26.804114033 +0200 +@@ -1209,18 +1209,18 @@ + gchar *type; + + if (!(doc = xmlParseFile (metadata))) { +- g_warning ("Cannot parse `%s'", metadata); ++ g_warning ("Cannot parse '%s'", metadata); + return FALSE; + } + + if (!(node = xmlDocGetRootElement (doc))) { +- g_warning ("`%s' corrupt: document contains no root node", metadata); ++ g_warning ("'%s' corrupt: document contains no root node", metadata); + xmlFreeDoc (doc); + return FALSE; + } + + if (!node->name || strcmp ((gchar *)node->name, "efolder") != 0) { +- g_warning ("`%s' corrupt: root node is not 'efolder'", metadata); ++ g_warning ("'%s' corrupt: root node is not 'efolder'", metadata); + xmlFreeDoc (doc); + return FALSE; + } +@@ -1591,7 +1591,7 @@ + g_set_error ( + error, E_SHELL_MIGRATE_ERROR, + E_SHELL_MIGRATE_ERROR_FAILED, +- _("Unable to create new folder `%s': %s"), ++ _("Unable to create new folder '%s': %s"), + dest->str, g_strerror (errno)); + goto fatal; + } +@@ -1619,7 +1619,7 @@ + g_set_error ( + error, E_SHELL_MIGRATE_ERROR, + E_SHELL_MIGRATE_ERROR_FAILED, +- _("Unable to copy folder `%s' to `%s': %s"), ++ _("Unable to copy folder '%s' to '%s': %s"), + src->str, dest->str, g_strerror (errno)); + goto fatal; + } +@@ -1815,7 +1815,7 @@ + error, E_SHELL_MIGRATE_ERROR, + E_SHELL_MIGRATE_ERROR_FAILED, + _("Unable to scan for existing mailboxes at " +- "`%s': %s"), session->srcdir, g_strerror (errno)); ++ "'%s': %s"), session->srcdir, g_strerror (errno)); + return FALSE; + } + +@@ -2025,7 +2025,7 @@ + error, E_SHELL_MIGRATE_ERROR, + E_SHELL_MIGRATE_ERROR_FAILED, + _("Unable to open old POP keep-on-server data " +- "`%s': %s"), cache_dir, g_strerror (errno)); ++ "'%s': %s"), cache_dir, g_strerror (errno)); + g_free (cache_dir); + return FALSE; + } +@@ -2041,7 +2041,7 @@ + error, E_SHELL_MIGRATE_ERROR, + E_SHELL_MIGRATE_ERROR_FAILED, + _("Unable to create POP3 keep-on-server data " +- "directory `%s': %s"), cache_dir, ++ "directory '%s': %s"), cache_dir, + g_strerror (errno)); + g_string_free (oldpath, TRUE); + g_free (cache_dir); +@@ -2073,7 +2073,7 @@ + error, E_SHELL_MIGRATE_ERROR, + E_SHELL_MIGRATE_ERROR_FAILED, + _("Unable to copy POP3 keep-on-server data " +- "`%s': %s"), oldpath->str, ++ "'%s': %s"), oldpath->str, + g_strerror (errno)); + success = FALSE; + } +@@ -2357,7 +2357,7 @@ + ppath_len++; /* For the separating slash. */ + + /* Take account of the fact that we need to translate every +- * separator into `subfolders/'. ++ * separator into 'subfolders/'. + */ + p = vpath; + while (1) { +@@ -2391,7 +2391,7 @@ + break; + } + +- memcpy (dp, p, newp - p + 1); /* `+ 1' to copy the slash too. */ ++ memcpy (dp, p, newp - p + 1); /* '+ 1' to copy the slash too. */ + dp += newp - p + 1; + + memcpy (dp, SUBFOLDER_DIR_NAME, SUBFOLDER_DIR_NAME_LEN); +@@ -2544,7 +2544,7 @@ + error, E_SHELL_MIGRATE_ERROR, + E_SHELL_MIGRATE_ERROR_FAILED, + _("Failed to create local mail storage " +- "`%s': %s"), path + 5, g_strerror (errno)); ++ "'%s': %s"), path + 5, g_strerror (errno)); + g_free (session->srcdir); + camel_object_unref (session); + g_free (path); +@@ -2557,7 +2557,7 @@ + g_set_error ( + error, E_SHELL_MIGRATE_ERROR, + E_SHELL_MIGRATE_ERROR_FAILED, +- _("Failed to create local mail storage `%s': %s"), ++ _("Failed to create local mail storage '%s': %s"), + path, lex.desc); + g_free (session->srcdir); + camel_object_unref (session); +@@ -3028,7 +3028,7 @@ + error, E_SHELL_MIGRATE_ERROR, + E_SHELL_MIGRATE_ERROR_FAILED, + _("Unable to create local mail folders at " +- "`%s': %s"), data_dir, g_strerror (errno)); ++ "'%s': %s"), data_dir, g_strerror (errno)); + return FALSE; + } + } +@@ -3046,7 +3046,7 @@ + error, E_SHELL_MIGRATE_ERROR, + E_SHELL_MIGRATE_ERROR_FAILED, + _("Unable to read settings from previous " +- "Evolution install, `evolution/config.xmldb' " ++ "Evolution install, 'evolution/config.xmldb' " + "does not exist or is corrupt.")); + return FALSE; + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//mail/e-mail-reader.c evolution-2.30.2.new//mail/e-mail-reader.c +--- evolution-2.30.2//mail/e-mail-reader.c 2010-06-20 14:15:05.000000000 +0200 ++++ evolution-2.30.2.new//mail/e-mail-reader.c 2010-06-22 13:37:26.808114033 +0200 +@@ -1781,28 +1781,6 @@ + } + + static void +-update_webview_content (EMailReader *reader, const gchar *content) +-{ +- EMFormatHTMLDisplay *html_display; +- EWebView *web_view; +- +- g_return_if_fail (reader != NULL); +- g_return_if_fail (content != NULL); +- +- html_display = e_mail_reader_get_html_display (reader); +- g_return_if_fail (html_display != NULL); +- +- /* skip the progress message when it's formatting something */ +- if (em_format_busy (EM_FORMAT (html_display))) +- return; +- +- web_view = E_WEB_VIEW (EM_FORMAT_HTML (html_display)->html); +- g_return_if_fail (web_view != NULL); +- +- e_web_view_load_string (web_view, content); +-} +- +-static void + mail_reader_message_loaded_cb (CamelFolder *folder, + const gchar *message_uid, + CamelMimeMessage *message, +@@ -1816,6 +1794,7 @@ + EShellBackend *shell_backend; + EShellSettings *shell_settings; + EShell *shell; ++ EWebView *web_view; + EMEvent *event; + EMEventTargetMessage *target; + const gchar *cursor_uid; +@@ -1841,6 +1820,8 @@ + + cursor_uid = MESSAGE_LIST (message_list)->cursor_uid; + ++ web_view = E_WEB_VIEW (EM_FORMAT_HTML (html_display)->html); ++ + /* If the user picked a different message in the time it took + * to fetch this message, then don't bother rendering it. */ + if (g_strcmp0 (cursor_uid, message_uid) != 0) +@@ -1899,10 +1880,11 @@ + _("Unable to retrieve message"), + ex->desc); + } else { +- string = g_strdup_printf (_("Retrieving message '%s'"), cursor_uid); ++ string = g_strdup_printf ( ++ _("Retrieving message '%s'"), cursor_uid); + } + +- update_webview_content (reader, string); ++ e_web_view_load_string (web_view, string); + g_free (string); + + camel_exception_clear (ex); +@@ -1921,6 +1903,7 @@ + EMailReaderPrivate *priv; + EMFormatHTMLDisplay *html_display; + GtkWidget *message_list; ++ EWebView *web_view; + CamelFolder *folder; + const gchar *cursor_uid; + const gchar *format_uid; +@@ -1934,6 +1917,8 @@ + cursor_uid = MESSAGE_LIST (message_list)->cursor_uid; + format_uid = EM_FORMAT (html_display)->uid; + ++ web_view = E_WEB_VIEW (EM_FORMAT_HTML (html_display)->html); ++ + if (MESSAGE_LIST (message_list)->last_sel_single) { + GtkWidget *widget; + gboolean html_display_visible; +@@ -1956,8 +1941,9 @@ + gboolean store_async; + MailMsgDispatchFunc disp_func; + +- string = g_strdup_printf (_("Retrieving message '%s'"), cursor_uid); +- update_webview_content (reader, string); ++ string = g_strdup_printf ( ++ _("Retrieving message '%s'"), cursor_uid); ++ e_web_view_load_string (web_view, string); + g_free (string); + + store_async = folder->parent_store->flags & CAMEL_STORE_ASYNC; +@@ -2314,9 +2300,11 @@ + gtk_action_set_sensitive (action, sensitive); + + action_name = "mail-mark-junk"; +- sensitive = selection_has_not_junk_messages; ++ sensitive = ++ selection_has_not_junk_messages && ++ !(state & E_MAIL_READER_FOLDER_IS_JUNK); + action = e_mail_reader_get_action (reader, action_name); +- gtk_action_set_sensitive (action, sensitive && !(state & E_MAIL_READER_FOLDER_IS_JUNK)); ++ gtk_action_set_sensitive (action, sensitive); + + action_name = "mail-mark-notjunk"; + sensitive = selection_has_junk_messages; +@@ -2671,32 +2659,6 @@ + + /* Bind properties. */ + +- e_binding_new_full ( +- shell_settings, "mail-citation-color", +- html_display, "citation-color", +- e_binding_transform_string_to_color, +- NULL, NULL); +- +- e_binding_new ( +- shell_settings, "mail-image-loading-policy", +- html_display, "image-loading-policy"); +- +- e_binding_new ( +- shell_settings, "mail-only-local-photos", +- html_display, "only-local-photos"); +- +- e_binding_new ( +- shell_settings, "mail-show-animated-images", +- web_view, "animate"); +- +- e_binding_new ( +- shell_settings, "mail-show-sender-photo", +- html_display, "show-sender-photo"); +- +- e_binding_new ( +- shell_settings, "mail-show-real-date", +- html_display, "show-real-date"); +- + action_name = "mail-caret-mode"; + action = e_mail_reader_get_action (reader, action_name); + +@@ -2935,7 +2897,7 @@ + + if (action == NULL) + g_critical ( +- "%s: action `%s' not found", G_STRFUNC, action_name); ++ "%s: action '%s' not found", G_STRFUNC, action_name); + + return action; + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//mail/e-mail-reader-utils.c evolution-2.30.2.new//mail/e-mail-reader-utils.c +--- evolution-2.30.2//mail/e-mail-reader-utils.c 2010-06-20 14:15:04.000000000 +0200 ++++ evolution-2.30.2.new//mail/e-mail-reader-utils.c 2010-06-22 13:37:26.808114033 +0200 +@@ -669,7 +669,10 @@ + } + + static void +-headers_changed_cb (GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMailReader *reader) ++headers_changed_cb (GConfClient *gconf, ++ guint cnxn_id, ++ GConfEntry *entry, ++ EMailReader *reader) + { + EMFormat *emf; + EMFormatHTMLDisplay *emfhd; +@@ -685,16 +688,18 @@ + emf = EM_FORMAT (emfhd); + g_return_if_fail (emf != NULL); + +- header_config_list = gconf_client_get_list (gconf, "/apps/evolution/mail/display/headers", GCONF_VALUE_STRING, NULL); ++ header_config_list = gconf_client_get_list ( ++ gconf, "/apps/evolution/mail/display/headers", ++ GCONF_VALUE_STRING, NULL); + em_format_clear_headers (emf); + for (p = header_config_list; p; p = g_slist_next(p)) { + EMailReaderHeader *h; + gchar *xml = (gchar *)p->data; + + h = e_mail_reader_header_from_xml (xml); +- if (h && h->enabled) { +- em_format_add_header (emf, h->name, EM_FORMAT_HEADER_BOLD); +- } ++ if (h && h->enabled) ++ em_format_add_header ( ++ emf, h->name, EM_FORMAT_HEADER_BOLD); + + e_mail_reader_header_free (h); + } +@@ -738,10 +743,16 @@ + GConfClient *gconf = mail_config_get_gconf_client (); + guint notify_id; + +- gconf_client_add_dir (gconf, "/apps/evolution/mail/display", GCONF_CLIENT_PRELOAD_NONE, NULL); +- notify_id = gconf_client_notify_add (gconf, "/apps/evolution/mail/display/headers", (GConfClientNotifyFunc) headers_changed_cb, reader, NULL, NULL); +- +- g_object_set_data_full (G_OBJECT (reader), "reader-header-notify-id", GINT_TO_POINTER (notify_id), remove_header_notify_cb); ++ gconf_client_add_dir ( ++ gconf, "/apps/evolution/mail/display", ++ GCONF_CLIENT_PRELOAD_NONE, NULL); ++ notify_id = gconf_client_notify_add ( ++ gconf, "/apps/evolution/mail/display/headers", ++ (GConfClientNotifyFunc) headers_changed_cb, ++ reader, NULL, NULL); ++ g_object_set_data_full ( ++ G_OBJECT (reader), "reader-header-notify-id", ++ GINT_TO_POINTER (notify_id), remove_header_notify_cb); + + headers_changed_cb (gconf, 0, NULL, reader); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//mail/em-composer-utils.c evolution-2.30.2.new//mail/em-composer-utils.c +--- evolution-2.30.2//mail/em-composer-utils.c 2010-06-20 14:15:01.000000000 +0200 ++++ evolution-2.30.2.new//mail/em-composer-utils.c 2010-06-22 13:37:26.808114033 +0200 +@@ -718,16 +718,14 @@ + /* Composing messages... */ + + static EMsgComposer * +-create_new_composer (const gchar *subject, const gchar *fromuri, gboolean lite) ++create_new_composer (const gchar *subject, const gchar *fromuri) + { + EMsgComposer *composer; + EComposerHeaderTable *table; + EAccount *account = NULL; + +- if (lite) +- composer = e_msg_composer_lite_new (); +- else +- composer = e_msg_composer_new (); ++ composer = e_msg_composer_new (); ++ + table = e_msg_composer_get_header_table (composer); + + if (fromuri != NULL) { +@@ -757,7 +755,7 @@ + { + GtkWidget *composer; + +- composer = (GtkWidget *) create_new_composer ("", fromuri, FALSE); ++ composer = (GtkWidget *) create_new_composer ("", fromuri); + if (composer == NULL) + return; + +@@ -767,26 +765,6 @@ + } + + /** +- * em_utils_compose_lite_new_message: +- * +- * Opens a new composer window as a child window of @parent's toplevel +- * window. +- **/ +-EMsgComposer * +-em_utils_compose_lite_new_message (const gchar *fromuri) +-{ +- GtkWidget *composer; +- +- composer = (GtkWidget *) create_new_composer ("", fromuri, TRUE); +- if (composer == NULL) +- return NULL; +- +- composer_set_no_change (E_MSG_COMPOSER (composer), TRUE, TRUE); +- +- return E_MSG_COMPOSER (composer); +-} +- +-/** + * em_utils_compose_new_message_with_mailto: + * @url: mailto url + * +@@ -814,10 +792,8 @@ + + composer_set_no_change (composer, TRUE, url == NULL); + +- if (!e_msg_composer_get_lite ()) { +- gtk_widget_show ((GtkWidget *) composer); +- gdk_window_raise (((GtkWidget *) composer)->window); +- } ++ gtk_widget_show ((GtkWidget *) composer); ++ gdk_window_raise (((GtkWidget *) composer)->window); + + return composer; + } +@@ -994,8 +970,7 @@ + + composer_set_no_change (composer, TRUE, TRUE); + +- if (!e_msg_composer_get_lite()) +- gtk_widget_show (GTK_WIDGET (composer)); ++ gtk_widget_show (GTK_WIDGET (composer)); + + return (GtkWidget *)composer; + } +@@ -1144,7 +1119,7 @@ + { + EMsgComposer *composer; + +- composer = create_new_composer (subject, fromuri, FALSE); ++ composer = create_new_composer (subject, fromuri); + if (composer == NULL) + return NULL; + +@@ -1155,8 +1130,7 @@ + + composer_set_no_change (composer, TRUE, TRUE); + +- if (!e_msg_composer_get_lite()) +- gtk_widget_show (GTK_WIDGET (composer)); ++ gtk_widget_show (GTK_WIDGET (composer)); + + return composer; + } +@@ -1226,7 +1200,7 @@ + text = em_utils_message_to_html (message, _("-------- Forwarded Message --------"), flags, &len, NULL, NULL, &validity_found); + + if (text) { +- composer = create_new_composer (subject, fromuri, FALSE); ++ composer = create_new_composer (subject, fromuri); + + if (composer) { + if (CAMEL_IS_MULTIPART(camel_medium_get_content_object((CamelMedium *)message))) +@@ -1243,8 +1217,7 @@ + + emu_update_composers_security (composer, validity_found); + composer_set_no_change (composer, TRUE, TRUE); +- if (!e_msg_composer_get_lite()) +- gtk_widget_show (GTK_WIDGET (composer)); ++ gtk_widget_show (GTK_WIDGET (composer)); + } + g_free (text); + } +@@ -2286,8 +2259,7 @@ + + composer_set_no_change (composer, TRUE, TRUE); + +- if (!e_msg_composer_get_lite()) +- gtk_widget_show (GTK_WIDGET (composer)); ++ gtk_widget_show (GTK_WIDGET (composer)); + + return composer; + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//mail/em-composer-utils.h evolution-2.30.2.new//mail/em-composer-utils.h +--- evolution-2.30.2//mail/em-composer-utils.h 2010-06-20 14:15:01.000000000 +0200 ++++ evolution-2.30.2.new//mail/em-composer-utils.h 2010-06-22 13:37:26.808114033 +0200 +@@ -33,7 +33,6 @@ + G_BEGIN_DECLS + + void em_utils_compose_new_message (const gchar *fromuri); +-EMsgComposer * em_utils_compose_lite_new_message (const gchar *fromuri); + + /* FIXME: mailto? url? should make up its mind what its called. imho use 'uri' */ + EMsgComposer * em_utils_compose_new_message_with_mailto (const gchar *url, const gchar *fromuri); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//mail/em-folder-tree-model.c evolution-2.30.2.new//mail/em-folder-tree-model.c +--- evolution-2.30.2//mail/em-folder-tree-model.c 2010-06-20 14:15:03.000000000 +0200 ++++ evolution-2.30.2.new//mail/em-folder-tree-model.c 2010-06-22 13:37:26.808114033 +0200 +@@ -37,10 +37,13 @@ + + #include + ++#include "e-mail-store.h" ++ + #include "mail-config.h" + #include "mail-session.h" + #include "mail-tools.h" + #include "mail-mt.h" ++#include "mail-ops.h" + + /* sigh, these 2 only needed for outbox total count checking - a mess */ + #include "mail-folder-cache.h" +@@ -80,6 +83,7 @@ + + gulong account_changed_id; + gulong account_removed_id; ++ gulong account_added_id; + }; + + enum { +@@ -256,6 +260,29 @@ + em_folder_tree_model_remove_store (model, si->store); + } + ++/* HACK: FIXME: the component should listen to the account object directly */ ++static void ++add_new_store (gchar *uri, CamelStore *store, gpointer user_data) ++{ ++ EAccount *account = user_data; ++ ++ if (store == NULL) ++ return; ++ ++ e_mail_store_add (store, account->name); ++} ++ ++static void ++account_added_cb (EAccountList *accounts, ++ EAccount *account, ++ EMFolderTreeModel *model) ++{ ++ const gchar *uri; ++ ++ uri = e_account_get_string (account, E_ACCOUNT_SOURCE_URL); ++ mail_get_store (uri, NULL, add_new_store, account); ++} ++ + static void + folder_tree_model_selection_finalized_cb (EMFolderTreeModel *model) + { +@@ -332,6 +359,8 @@ + priv->accounts, priv->account_changed_id); + g_signal_handler_disconnect ( + priv->accounts, priv->account_removed_id); ++ g_signal_handler_disconnect ( ++ priv->accounts, priv->account_added_id); + + /* Chain up to parent's finalize() method. */ + G_OBJECT_CLASS (parent_class)->finalize (object); +@@ -512,6 +541,9 @@ + model->priv->account_removed_id = g_signal_connect ( + model->priv->accounts, "account-removed", + G_CALLBACK (account_removed_cb), model); ++ model->priv->account_added_id = g_signal_connect ( ++ model->priv->accounts, "account-added", ++ G_CALLBACK (account_added_cb), model); + + g_signal_connect (mail_folder_cache_get_default (), + "folder-unread-updated", +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//mail/em-folder-utils.c evolution-2.30.2.new//mail/em-folder-utils.c +--- evolution-2.30.2//mail/em-folder-utils.c 2010-06-20 14:15:04.000000000 +0200 ++++ evolution-2.30.2.new//mail/em-folder-utils.c 2010-06-22 13:37:26.808114033 +0200 +@@ -504,7 +504,7 @@ + static gchar * + emfu_create_folder__desc (struct _EMCreateFolder *m) + { +- return g_strdup_printf (_("Creating folder `%s'"), m->full_name); ++ return g_strdup_printf (_("Creating folder '%s'"), m->full_name); + } + + static void +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//mail/em-format-html.c evolution-2.30.2.new//mail/em-format-html.c +--- evolution-2.30.2//mail/em-format-html.c 2010-06-20 14:15:05.000000000 +0200 ++++ evolution-2.30.2.new//mail/em-format-html.c 2010-06-22 13:37:26.812114033 +0200 +@@ -47,6 +47,7 @@ + #include "e-util/e-icon-factory.h" + #include "e-util/e-util-private.h" + #include "e-util/e-util.h" ++#include "e-util/e-extensible.h" + + #include + #include +@@ -965,6 +966,8 @@ + g_signal_connect_swapped ( + efh, "notify::mark-citations", + G_CALLBACK (em_format_redraw), NULL); ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (efh)); + } + + GType +@@ -986,9 +989,18 @@ + NULL /* value_table */ + }; + ++ static const GInterfaceInfo extensible_info = { ++ (GInterfaceInitFunc) NULL, ++ (GInterfaceFinalizeFunc) NULL, ++ NULL /* interface_data */ ++ }; ++ + type = g_type_register_static ( + em_format_get_type(), "EMFormatHTML", + &type_info, G_TYPE_FLAG_ABSTRACT); ++ ++ g_type_add_interface_static ( ++ type, E_TYPE_EXTENSIBLE, &extensible_info); + } + + return type; +@@ -1383,7 +1395,7 @@ + camel_http_stream_set_proxy ((CamelHttpStream *)instream, proxy); + g_free (proxy); + } +- camel_operation_start(NULL, _("Retrieving `%s'"), job->u.uri); ++ camel_operation_start(NULL, _("Retrieving '%s'"), job->u.uri); + tmp_stream = (CamelHttpStream *)instream; + content_type = camel_http_stream_get_content_type(tmp_stream); + length = camel_header_raw_find(&tmp_stream->headers, "Content-Length", NULL); +@@ -1392,7 +1404,7 @@ + total = atoi(length); + camel_content_type_unref(content_type); + } else +- camel_operation_start_transient(NULL, _("Retrieving `%s'"), job->u.uri); ++ camel_operation_start_transient(NULL, _("Retrieving '%s'"), job->u.uri); + + camel_url_free(url); + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//mail/evolution-mail.schemas.in evolution-2.30.2.new//mail/evolution-mail.schemas.in +--- evolution-2.30.2//mail/evolution-mail.schemas.in 2010-04-26 15:13:17.000000000 +0200 ++++ evolution-2.30.2.new//mail/evolution-mail.schemas.in 2010-06-22 13:37:26.812114033 +0200 +@@ -160,21 +160,6 @@ + + + +- /schemas/apps/evolution/mail/composer/show_mail_from +- /apps/evolution/mail/composer/show_mail_from +- evolution-mail +- bool +- true +- +- Show "From" field when sending a mail message +- +- Show the "From" field when sending a mail message. This is +- controlled from the View menu when a mail account is chosen. +- +- +- +- +- + /schemas/apps/evolution/mail/composer/show_mail_reply_to + /apps/evolution/mail/composer/show_mail_reply_to + evolution-mail +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//mail/importers/mail-importer.c evolution-2.30.2.new//mail/importers/mail-importer.c +--- evolution-2.30.2//mail/importers/mail-importer.c 2010-06-20 14:15:03.000000000 +0200 ++++ evolution-2.30.2.new//mail/importers/mail-importer.c 2010-06-22 13:37:26.812114033 +0200 +@@ -152,7 +152,7 @@ + if (m->cancel) + oldcancel = camel_operation_register(m->cancel); + +- camel_operation_start(NULL, _("Importing `%s'"), folder->full_name); ++ camel_operation_start(NULL, _("Importing '%s'"), folder->full_name); + camel_folder_freeze(folder); + while (camel_mime_parser_step(mp, NULL, NULL) == CAMEL_MIME_PARSER_STATE_FROM) { + CamelMimeMessage *msg; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//mail/mail-config.ui evolution-2.30.2.new//mail/mail-config.ui +--- evolution-2.30.2//mail/mail-config.ui 2010-05-29 17:21:13.000000000 +0200 ++++ evolution-2.30.2.new//mail/mail-config.ui 2010-06-22 13:37:26.812114033 +0200 +@@ -2923,7 +2923,7 @@ + + + +- ++ + True + 4 + +@@ -2972,7 +2972,7 @@ + + + +- ++ + True + + +@@ -4483,7 +4483,7 @@ + True + 2 + +- ++ + True + vertical + 8 +@@ -4542,7 +4542,7 @@ + + + +- ++ + True + 0 + Alerts +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//mail/mail-folder-cache.c evolution-2.30.2.new//mail/mail-folder-cache.c +--- evolution-2.30.2//mail/mail-folder-cache.c 2010-06-20 14:15:04.000000000 +0200 ++++ evolution-2.30.2.new//mail/mail-folder-cache.c 2010-06-22 13:37:26.812114033 +0200 +@@ -23,6 +23,11 @@ + * + */ + ++/** ++ * SECTION: mail-folder-cache ++ * @short_description: Stores information about open folders ++ **/ ++ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//mail/mail-folder-cache.h evolution-2.30.2.new//mail/mail-folder-cache.h +--- evolution-2.30.2//mail/mail-folder-cache.h 2010-06-20 14:15:05.000000000 +0200 ++++ evolution-2.30.2.new//mail/mail-folder-cache.h 2010-06-22 13:37:26.816114033 +0200 +@@ -31,11 +31,6 @@ + + G_BEGIN_DECLS + +-/** +- * SECTION: mail-folder-cache +- * @short_description: Stores information about open folders +- **/ +- + #define MAIL_TYPE_FOLDER_CACHE mail_folder_cache_get_type() + #define MAIL_FOLDER_CACHE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MAIL_TYPE_FOLDER_CACHE, MailFolderCache)) + #define MAIL_FOLDER_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MAIL_TYPE_FOLDER_CACHE, MailFolderCacheClass)) +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//mail/mail-ops.c evolution-2.30.2.new//mail/mail-ops.c +--- evolution-2.30.2//mail/mail-ops.c 2010-06-20 14:15:03.000000000 +0200 ++++ evolution-2.30.2.new//mail/mail-ops.c 2010-06-22 13:37:26.816114033 +0200 +@@ -594,7 +594,7 @@ + folder = mail_tool_uri_to_folder (sent_folder_uri, 0, ex); + if (camel_exception_is_set(ex)) { + g_string_append_printf (err, _("Failed to append to %s: %s\n" +- "Appending to local `Sent' folder instead."), ++ "Appending to local 'Sent' folder instead."), + sent_folder_uri, camel_exception_get_description (ex)); + camel_exception_clear (ex); + } +@@ -621,7 +621,7 @@ + if (err->len) + g_string_append(err, "\n\n"); + g_string_append_printf (err, _("Failed to append to %s: %s\n" +- "Appending to local `Sent' folder instead."), ++ "Appending to local 'Sent' folder instead."), + name, camel_exception_get_description (ex)); + camel_object_ref (sent_folder); + camel_object_unref (folder); +@@ -637,7 +637,7 @@ + + if (err->len) + g_string_append(err, "\n\n"); +- g_string_append_printf (err, _("Failed to append to local `Sent' folder: %s"), ++ g_string_append_printf (err, _("Failed to append to local 'Sent' folder: %s"), + camel_exception_get_description (ex)); + } + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//mail/mail-tools.c evolution-2.30.2.new//mail/mail-tools.c +--- evolution-2.30.2//mail/mail-tools.c 2010-06-20 14:15:04.000000000 +0200 ++++ evolution-2.30.2.new//mail/mail-tools.c 2010-06-22 13:37:26.816114033 +0200 +@@ -120,7 +120,7 @@ + path = g_build_filename (data_dir, "spool", NULL); + + if (g_stat(path, &st) == -1 && g_mkdir_with_parents(path, 0700) == -1) { +- camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Could not create spool directory `%s': %s"), ++ camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Could not create spool directory '%s': %s"), + path, g_strerror(errno)); + g_free(path); + return NULL; +@@ -150,7 +150,7 @@ + if (strcmp(uri->protocol, "mbox") != 0) { + /* This is really only an internal error anyway */ + camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID, +- _("Trying to movemail a non-mbox source `%s'"), ++ _("Trying to movemail a non-mbox source '%s'"), + source_url); + camel_url_free(uri); + return NULL; +@@ -298,7 +298,7 @@ + /* FIXME?: the filter:get_folder callback should do this itself? */ + curi = em_uri_to_camel(uri); + if (uri == NULL) { +- camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Invalid folder: `%s'"), uri); ++ camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Invalid folder: '%s'"), uri); + return NULL; + } + uri = curi; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/addressbook/e-book-shell-content.c evolution-2.30.2.new//modules/addressbook/e-book-shell-content.c +--- evolution-2.30.2//modules/addressbook/e-book-shell-content.c 2010-06-20 14:14:48.000000000 +0200 ++++ evolution-2.30.2.new//modules/addressbook/e-book-shell-content.c 2010-06-22 13:37:26.816114033 +0200 +@@ -629,6 +629,7 @@ + EShellSearchbar * + e_book_shell_content_get_searchbar (EBookShellContent *book_shell_content) + { ++ EShellView *shell_view; + EShellContent *shell_content; + GtkWidget *widget; + +@@ -636,7 +637,8 @@ + E_IS_BOOK_SHELL_CONTENT (book_shell_content), NULL); + + shell_content = E_SHELL_CONTENT (book_shell_content); +- widget = e_shell_content_get_searchbar (shell_content); ++ shell_view = e_shell_content_get_shell_view (shell_content); ++ widget = e_shell_view_get_searchbar (shell_view); + + return E_SHELL_SEARCHBAR (widget); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/addressbook/e-book-shell-migrate.c evolution-2.30.2.new//modules/addressbook/e-book-shell-migrate.c +--- evolution-2.30.2//modules/addressbook/e-book-shell-migrate.c 2010-06-20 14:14:47.000000000 +0200 ++++ evolution-2.30.2.new//modules/addressbook/e-book-shell-migrate.c 2010-06-22 13:37:26.816114033 +0200 +@@ -370,7 +370,7 @@ + if (!e_book_add_contact (new_book, + contact, + &e)) +- g_warning ("contact add failed: `%s'", e->message); ++ g_warning ("contact add failed: '%s'", e->message); + + num_added ++; + +@@ -400,14 +400,14 @@ + old_book = e_book_new (old_source, &e); + if (!old_book + || !e_book_open (old_book, TRUE, &e)) { +- g_warning ("failed to load source book for migration: `%s'", e->message); ++ g_warning ("failed to load source book for migration: '%s'", e->message); + goto finish; + } + + new_book = e_book_new (new_source, &e); + if (!new_book + || !e_book_open (new_book, FALSE, &e)) { +- g_warning ("failed to load destination book for migration: `%s'", e->message); ++ g_warning ("failed to load destination book for migration: '%s'", e->message); + goto finish; + } + +@@ -809,7 +809,7 @@ + e_source_set_property (source, "completion", "true"); + } + else { +- g_warning ("found completion folder with uri `%s' that " ++ g_warning ("found completion folder with uri '%s' that " + "doesn't correspond to anything we migrated.", physical_uri); + } + +@@ -886,7 +886,7 @@ + if (!e_book_commit_contact (book, + contact, + &e)) +- g_warning ("contact commit failed: `%s'", e->message); ++ g_warning ("contact commit failed: '%s'", e->message); + } + + num_converted ++; +@@ -989,7 +989,7 @@ + if (!e_book_commit_contact (book, + contact, + &e)) +- g_warning ("contact commit failed: `%s'", e->message); ++ g_warning ("contact commit failed: '%s'", e->message); + } + + num_converted ++; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-config-calendar-item.c evolution-2.30.2.new//modules/calendar/e-cal-config-calendar-item.c +--- evolution-2.30.2//modules/calendar/e-cal-config-calendar-item.c 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//modules/calendar/e-cal-config-calendar-item.c 2010-06-22 13:37:26.816114033 +0200 +@@ -0,0 +1,79 @@ ++/* ++ * e-cal-config-calendar-item.c ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#include "e-cal-config-calendar-item.h" ++ ++#include ++#include ++#include ++#include ++ ++static void ++cal_config_calendar_item_constructed (GObject *object) ++{ ++ EExtension *extension; ++ EExtensible *extensible; ++ EShellSettings *shell_settings; ++ EShell *shell; ++ ++ extension = E_EXTENSION (object); ++ extensible = e_extension_get_extensible (extension); ++ ++ shell = e_shell_get_default (); ++ shell_settings = e_shell_get_shell_settings (shell); ++ ++ e_binding_new ( ++ shell_settings, "cal-show-week-numbers", ++ extensible, "show-week-numbers"); ++ ++ e_binding_new ( ++ shell_settings, "cal-week-start-day", ++ extensible, "week-start-day"); ++} ++ ++static void ++cal_config_calendar_item_class_init (EExtensionClass *class) ++{ ++ GObjectClass *object_class; ++ ++ object_class = G_OBJECT_CLASS (class); ++ object_class->constructed = cal_config_calendar_item_constructed; ++ ++ class->extensible_type = E_TYPE_CALENDAR_ITEM; ++} ++ ++void ++e_cal_config_calendar_item_register_type (GTypeModule *type_module) ++{ ++ static const GTypeInfo type_info = { ++ sizeof (EExtensionClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) cal_config_calendar_item_class_init, ++ (GClassFinalizeFunc) NULL, ++ NULL, /* class_data */ ++ sizeof (EExtension), ++ 0, /* n_preallocs */ ++ (GInstanceInitFunc) NULL, ++ NULL /* value_table */ ++ }; ++ ++ g_type_module_register_type ( ++ type_module, E_TYPE_EXTENSION, ++ "ECalConfigCalendarItem", &type_info, 0); ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-config-calendar-item.h evolution-2.30.2.new//modules/calendar/e-cal-config-calendar-item.h +--- evolution-2.30.2//modules/calendar/e-cal-config-calendar-item.h 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//modules/calendar/e-cal-config-calendar-item.h 2010-06-22 13:37:26.816114033 +0200 +@@ -0,0 +1,30 @@ ++/* ++ * e-cal-config-calendar-item.h ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#ifndef E_CAL_CONFIG_CALENDAR_ITEM_H ++#define E_CAL_CONFIG_CALENDAR_ITEM_H ++ ++#include ++ ++G_BEGIN_DECLS ++ ++void e_cal_config_calendar_item_register_type (GTypeModule *type_module); ++ ++G_END_DECLS ++ ++#endif /* E_CAL_CONFIG_CALENDAR_ITEM_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-config-date-edit.c evolution-2.30.2.new//modules/calendar/e-cal-config-date-edit.c +--- evolution-2.30.2//modules/calendar/e-cal-config-date-edit.c 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//modules/calendar/e-cal-config-date-edit.c 2010-06-22 13:37:26.816114033 +0200 +@@ -0,0 +1,79 @@ ++/* ++ * e-cal-config-date-edit.c ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#include "e-cal-config-date-edit.h" ++ ++#include ++#include ++#include ++#include ++ ++static void ++cal_config_date_edit_constructed (GObject *object) ++{ ++ EExtension *extension; ++ EExtensible *extensible; ++ EShellSettings *shell_settings; ++ EShell *shell; ++ ++ extension = E_EXTENSION (object); ++ extensible = e_extension_get_extensible (extension); ++ ++ shell = e_shell_get_default (); ++ shell_settings = e_shell_get_shell_settings (shell); ++ ++ e_binding_new ( ++ shell_settings, "cal-show-week-numbers", ++ extensible, "show-week-numbers"); ++ ++ e_binding_new ( ++ shell_settings, "cal-week-start-day", ++ extensible, "week-start-day"); ++} ++ ++static void ++cal_config_date_edit_class_init (EExtensionClass *class) ++{ ++ GObjectClass *object_class; ++ ++ object_class = G_OBJECT_CLASS (class); ++ object_class->constructed = cal_config_date_edit_constructed; ++ ++ class->extensible_type = E_TYPE_DATE_EDIT; ++} ++ ++void ++e_cal_config_date_edit_register_type (GTypeModule *type_module) ++{ ++ static const GTypeInfo type_info = { ++ sizeof (EExtensionClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) cal_config_date_edit_class_init, ++ (GClassFinalizeFunc) NULL, ++ NULL, /* class_data */ ++ sizeof (EExtension), ++ 0, /* n_preallocs */ ++ (GInstanceInitFunc) NULL, ++ NULL /* value_table */ ++ }; ++ ++ g_type_module_register_type ( ++ type_module, E_TYPE_EXTENSION, ++ "ECalConfigDateEdit", &type_info, 0); ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-config-date-edit.h evolution-2.30.2.new//modules/calendar/e-cal-config-date-edit.h +--- evolution-2.30.2//modules/calendar/e-cal-config-date-edit.h 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//modules/calendar/e-cal-config-date-edit.h 2010-06-22 13:37:26.816114033 +0200 +@@ -0,0 +1,30 @@ ++/* ++ * e-cal-config-date-edit.h ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#ifndef E_CAL_CONFIG_DATE_EDIT_H ++#define E_CAL_CONFIG_DATE_EDIT_H ++ ++#include ++ ++G_BEGIN_DECLS ++ ++void e_cal_config_date_edit_register_type (GTypeModule *type_module); ++ ++G_END_DECLS ++ ++#endif /* E_CAL_CONFIG_DATE_EDIT_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-config-meeting-store.c evolution-2.30.2.new//modules/calendar/e-cal-config-meeting-store.c +--- evolution-2.30.2//modules/calendar/e-cal-config-meeting-store.c 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//modules/calendar/e-cal-config-meeting-store.c 2010-06-22 13:37:26.816114033 +0200 +@@ -0,0 +1,79 @@ ++/* ++ * e-cal-config-meeting-store.c ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#include "e-cal-config-meeting-store.h" ++ ++#include ++#include ++#include ++#include ++ ++static void ++cal_config_meeting_store_constructed (GObject *object) ++{ ++ EExtension *extension; ++ EExtensible *extensible; ++ EShellSettings *shell_settings; ++ EShell *shell; ++ ++ extension = E_EXTENSION (object); ++ extensible = e_extension_get_extensible (extension); ++ ++ shell = e_shell_get_default (); ++ shell_settings = e_shell_get_shell_settings (shell); ++ ++ e_binding_new ( ++ shell_settings, "cal-free-busy-template", ++ extensible, "free-busy-template"); ++ ++ e_binding_new ( ++ shell_settings, "cal-timezone", ++ extensible, "timezone"); ++} ++ ++static void ++cal_config_meeting_store_class_init (EExtensionClass *class) ++{ ++ GObjectClass *object_class; ++ ++ object_class = G_OBJECT_CLASS (class); ++ object_class->constructed = cal_config_meeting_store_constructed; ++ ++ class->extensible_type = E_TYPE_MEETING_STORE; ++} ++ ++void ++e_cal_config_meeting_store_register_type (GTypeModule *type_module) ++{ ++ static const GTypeInfo type_info = { ++ sizeof (EExtensionClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) cal_config_meeting_store_class_init, ++ (GClassFinalizeFunc) NULL, ++ NULL, /* class_data */ ++ sizeof (EExtension), ++ 0, /* n_preallocs */ ++ (GInstanceInitFunc) NULL, ++ NULL /* value_table */ ++ }; ++ ++ g_type_module_register_type ( ++ type_module, E_TYPE_EXTENSION, ++ "ECalConfigMeetingStore", &type_info, 0); ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-config-meeting-store.h evolution-2.30.2.new//modules/calendar/e-cal-config-meeting-store.h +--- evolution-2.30.2//modules/calendar/e-cal-config-meeting-store.h 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//modules/calendar/e-cal-config-meeting-store.h 2010-06-22 13:37:26.816114033 +0200 +@@ -0,0 +1,30 @@ ++/* ++ * e-cal-config-meeting-store.h ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#ifndef E_CAL_CONFIG_MEETING_STORE_H ++#define E_CAL_CONFIG_MEETING_STORE_H ++ ++#include ++ ++G_BEGIN_DECLS ++ ++void e_cal_config_meeting_store_register_type (GTypeModule *type_module); ++ ++G_END_DECLS ++ ++#endif /* E_CAL_CONFIG_MEETING_STORE_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-config-meeting-time-selector.c evolution-2.30.2.new//modules/calendar/e-cal-config-meeting-time-selector.c +--- evolution-2.30.2//modules/calendar/e-cal-config-meeting-time-selector.c 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//modules/calendar/e-cal-config-meeting-time-selector.c 2010-06-22 13:37:26.816114033 +0200 +@@ -0,0 +1,83 @@ ++/* ++ * e-cal-config-meeting-time-selector.c ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#include "e-cal-config-meeting-time-selector.h" ++ ++#include ++#include ++#include ++#include ++ ++static void ++cal_config_meeting_time_selector_constructed (GObject *object) ++{ ++ EExtension *extension; ++ EExtensible *extensible; ++ EShellSettings *shell_settings; ++ EShell *shell; ++ ++ extension = E_EXTENSION (object); ++ extensible = e_extension_get_extensible (extension); ++ ++ shell = e_shell_get_default (); ++ shell_settings = e_shell_get_shell_settings (shell); ++ ++ e_binding_new ( ++ shell_settings, "cal-show-week-numbers", ++ extensible, "show-week-numbers"); ++ ++ e_binding_new ( ++ shell_settings, "cal-use-24-hour-format", ++ extensible, "use-24-hour-format"); ++ ++ e_binding_new ( ++ shell_settings, "cal-week-start-day", ++ extensible, "week-start-day"); ++} ++ ++static void ++cal_config_meeting_time_selector_class_init (EExtensionClass *class) ++{ ++ GObjectClass *object_class; ++ ++ object_class = G_OBJECT_CLASS (class); ++ object_class->constructed = cal_config_meeting_time_selector_constructed; ++ ++ class->extensible_type = E_TYPE_MEETING_TIME_SELECTOR; ++} ++ ++void ++e_cal_config_meeting_time_selector_register_type (GTypeModule *type_module) ++{ ++ static const GTypeInfo type_info = { ++ sizeof (EExtensionClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) cal_config_meeting_time_selector_class_init, ++ (GClassFinalizeFunc) NULL, ++ NULL, /* class_data */ ++ sizeof (EExtension), ++ 0, /* n_preallocs */ ++ (GInstanceInitFunc) NULL, ++ NULL /* value_table */ ++ }; ++ ++ g_type_module_register_type ( ++ type_module, E_TYPE_EXTENSION, ++ "ECalConfigMeetingTimeSelector", &type_info, 0); ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-config-meeting-time-selector.h evolution-2.30.2.new//modules/calendar/e-cal-config-meeting-time-selector.h +--- evolution-2.30.2//modules/calendar/e-cal-config-meeting-time-selector.h 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//modules/calendar/e-cal-config-meeting-time-selector.h 2010-06-22 13:37:26.816114033 +0200 +@@ -0,0 +1,30 @@ ++/* ++ * e-cal-config-meeting-time-selector.h ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#ifndef E_CAL_CONFIG_MEETING_TIME_SELECTOR_H ++#define E_CAL_CONFIG_MEETING_TIME_SELECTOR_H ++ ++#include ++ ++G_BEGIN_DECLS ++ ++void e_cal_config_meeting_time_selector_register_type (GTypeModule *type_module); ++ ++G_END_DECLS ++ ++#endif /* E_CAL_CONFIG_MEETING_TIME_SELECTOR_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-config-model.c evolution-2.30.2.new//modules/calendar/e-cal-config-model.c +--- evolution-2.30.2//modules/calendar/e-cal-config-model.c 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//modules/calendar/e-cal-config-model.c 2010-06-22 13:37:26.816114033 +0200 +@@ -0,0 +1,99 @@ ++/* ++ * e-cal-config-model.c ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#include "e-cal-config-model.h" ++ ++#include ++#include ++#include ++#include ++#include ++ ++static void ++cal_config_model_constructed (GObject *object) ++{ ++ EExtension *extension; ++ EExtensible *extensible; ++ EShellSettings *shell_settings; ++ EShell *shell; ++ ++ extension = E_EXTENSION (object); ++ extensible = e_extension_get_extensible (extension); ++ ++ shell = e_shell_get_default (); ++ shell_settings = e_shell_get_shell_settings (shell); ++ ++ /*** ECalModel ***/ ++ ++ e_binding_new ( ++ shell_settings, "cal-timezone", ++ extensible, "timezone"); ++ ++ e_binding_new ( ++ shell_settings, "cal-use-24-hour-format", ++ extensible, "use-24-hour-format"); ++ ++ e_binding_new ( ++ shell_settings, "cal-week-start-day", ++ extensible, "week-start-day"); ++ ++ /*** ECalModelTasks ***/ ++ ++ if (E_IS_CAL_MODEL_TASKS (extensible)) { ++ ++ e_binding_new ( ++ shell_settings, "cal-tasks-color-due-today", ++ extensible, "color-due-today"); ++ ++ e_binding_new ( ++ shell_settings, "cal-tasks-color-overdue", ++ extensible, "color-overdue"); ++ } ++} ++ ++static void ++cal_config_model_class_init (EExtensionClass *class) ++{ ++ GObjectClass *object_class; ++ ++ object_class = G_OBJECT_CLASS (class); ++ object_class->constructed = cal_config_model_constructed; ++ ++ class->extensible_type = E_TYPE_CAL_MODEL; ++} ++ ++void ++e_cal_config_model_register_type (GTypeModule *type_module) ++{ ++ static const GTypeInfo type_info = { ++ sizeof (EExtensionClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) cal_config_model_class_init, ++ (GClassFinalizeFunc) NULL, ++ NULL, /* class_data */ ++ sizeof (EExtension), ++ 0, /* n_preallocs */ ++ (GInstanceInitFunc) NULL, ++ NULL /* value_table */ ++ }; ++ ++ g_type_module_register_type ( ++ type_module, E_TYPE_EXTENSION, ++ "ECalConfigModel", &type_info, 0); ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-config-model.h evolution-2.30.2.new//modules/calendar/e-cal-config-model.h +--- evolution-2.30.2//modules/calendar/e-cal-config-model.h 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//modules/calendar/e-cal-config-model.h 2010-06-22 13:37:26.816114033 +0200 +@@ -0,0 +1,30 @@ ++/* ++ * e-cal-config-model.h ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#ifndef E_CAL_CONFIG_MODEL_H ++#define E_CAL_CONFIG_MODEL_H ++ ++#include ++ ++G_BEGIN_DECLS ++ ++void e_cal_config_model_register_type (GTypeModule *type_module); ++ ++G_END_DECLS ++ ++#endif /* E_CAL_CONFIG_MODEL_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-config-view.c evolution-2.30.2.new//modules/calendar/e-cal-config-view.c +--- evolution-2.30.2//modules/calendar/e-cal-config-view.c 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//modules/calendar/e-cal-config-view.c 2010-06-22 13:37:26.816114033 +0200 +@@ -0,0 +1,130 @@ ++/* ++ * e-cal-config-view.c ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#include "e-cal-config-view.h" ++ ++#include ++#include ++#include ++#include ++#include ++ ++static void ++cal_config_view_constructed (GObject *object) ++{ ++ EExtension *extension; ++ EExtensible *extensible; ++ EShellSettings *shell_settings; ++ EShell *shell; ++ ++ extension = E_EXTENSION (object); ++ extensible = e_extension_get_extensible (extension); ++ ++ shell = e_shell_get_default (); ++ shell_settings = e_shell_get_shell_settings (shell); ++ ++ /*** EDayView ***/ ++ ++ if (E_IS_DAY_VIEW (extensible)) { ++ ++ e_binding_new ( ++ shell_settings, "cal-show-week-numbers", ++ E_DAY_VIEW (extensible)->week_number_label, "visible"); ++ ++ e_binding_new ( ++ shell_settings, "cal-marcus-bains-show-line", ++ extensible, "marcus-bains-show-line"); ++ ++ e_binding_new ( ++ shell_settings, "cal-marcus-bains-day-view-color", ++ extensible, "marcus-bains-day-view-color"); ++ ++ e_binding_new ( ++ shell_settings, "cal-marcus-bains-time-bar-color", ++ extensible, "marcus-bains-time-bar-color"); ++ ++ e_binding_new ( ++ shell_settings, "cal-time-divisions", ++ extensible, "mins-per-row"); ++ ++ e_binding_new ( ++ shell_settings, "cal-work-day-end-hour", ++ extensible, "work-day-end-hour"); ++ ++ e_binding_new ( ++ shell_settings, "cal-work-day-end-minute", ++ extensible, "work-day-end-minute"); ++ ++ e_binding_new ( ++ shell_settings, "cal-work-day-start-hour", ++ extensible, "work-day-start-hour"); ++ ++ e_binding_new ( ++ shell_settings, "cal-work-day-start-minute", ++ extensible, "work-day-start-minute"); ++ ++ e_binding_new ( ++ shell_settings, "cal-working-days-bitset", ++ extensible, "working-days"); ++ } ++ ++ /*** EWeekView ***/ ++ ++ if (E_IS_WEEK_VIEW (extensible)) { ++ ++ e_binding_new ( ++ shell_settings, "cal-compress-weekend", ++ extensible, "compress-weekend"); ++ ++ e_binding_new ( ++ shell_settings, "cal-show-event-end-times", ++ extensible, "show-event-end-times"); ++ } ++} ++ ++static void ++cal_config_view_class_init (EExtensionClass *class) ++{ ++ GObjectClass *object_class; ++ ++ object_class = G_OBJECT_CLASS (class); ++ object_class->constructed = cal_config_view_constructed; ++ ++ class->extensible_type = E_TYPE_CALENDAR_VIEW; ++} ++ ++void ++e_cal_config_view_register_type (GTypeModule *type_module) ++{ ++ static const GTypeInfo type_info = { ++ sizeof (EExtensionClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) cal_config_view_class_init, ++ (GClassFinalizeFunc) NULL, ++ NULL, /* class_data */ ++ sizeof (EExtension), ++ 0, /* n_preallocs */ ++ (GInstanceInitFunc) NULL, ++ NULL /* value_table */ ++ }; ++ ++ g_type_module_register_type ( ++ type_module, E_TYPE_EXTENSION, ++ "ECalConfigView", &type_info, 0); ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-config-view.h evolution-2.30.2.new//modules/calendar/e-cal-config-view.h +--- evolution-2.30.2//modules/calendar/e-cal-config-view.h 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//modules/calendar/e-cal-config-view.h 2010-06-22 13:37:26.820114033 +0200 +@@ -0,0 +1,31 @@ ++/* ++ * e-cal-config-view.h ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#ifndef E_CAL_CONFIG_VIEW_H ++#define E_CAL_CONFIG_VIEW_H ++ ++#include ++ ++G_BEGIN_DECLS ++ ++void e_cal_config_view_register_type (GTypeModule *type_module); ++ ++G_END_DECLS ++ ++#endif /* E_CAL_CONFIG_VIEW_H */ ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-shell-backend.c evolution-2.30.2.new//modules/calendar/e-cal-shell-backend.c +--- evolution-2.30.2//modules/calendar/e-cal-shell-backend.c 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.2.new//modules/calendar/e-cal-shell-backend.c 2010-06-22 13:37:26.820114033 +0200 +@@ -602,7 +602,7 @@ + + source = e_source_list_peek_source_by_uid (source_list, source_uid); + if (source == NULL) { +- g_printerr ("No source for UID `%s'\n", source_uid); ++ g_printerr ("No source for UID '%s'\n", source_uid); + g_object_unref (source_list); + goto exit; + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-shell-content.c evolution-2.30.2.new//modules/calendar/e-cal-shell-content.c +--- evolution-2.30.2//modules/calendar/e-cal-shell-content.c 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.2.new//modules/calendar/e-cal-shell-content.c 2010-06-22 13:37:26.820114033 +0200 +@@ -314,11 +314,10 @@ + { + ECalShellContentPrivate *priv; + ECalendarView *calendar_view; +- ECalModel *memo_model; +- ECalModel *task_model; ++ ECalModel *memo_model=NULL; ++ ECalModel *task_model=NULL; + EShell *shell; + EShellContent *shell_content; +- EShellSettings *shell_settings; + EShellView *shell_view; + EShellWindow *shell_window; + EShellContent *foreign_content; +@@ -342,51 +341,57 @@ + shell_window = e_shell_view_get_shell_window (shell_view); + + shell = e_shell_window_get_shell (shell_window); +- shell_settings = e_shell_get_shell_settings (shell); + + /* We borrow the memopad and taskpad models from the memo + * and task views, loading the views if necessary. */ +- +- foreign_view = e_shell_window_get_shell_view (shell_window, "memos"); +- foreign_content = e_shell_view_get_shell_content (foreign_view); +- g_object_get (foreign_content, "model", &memo_model, NULL); +- +- foreign_view = e_shell_window_get_shell_view (shell_window, "tasks"); +- foreign_content = e_shell_view_get_shell_content (foreign_view); +- g_object_get (foreign_content, "model", &task_model, NULL); +- ++ if (!e_shell_get_express_mode (shell)) { ++ foreign_view = e_shell_window_get_shell_view (shell_window, "memos"); ++ foreign_content = e_shell_view_get_shell_content (foreign_view); ++ g_object_get (foreign_content, "model", &memo_model, NULL); ++ ++ foreign_view = e_shell_window_get_shell_view (shell_window, "tasks"); ++ foreign_content = e_shell_view_get_shell_content (foreign_view); ++ g_object_get (foreign_content, "model", &task_model, NULL); ++ } + /* Build content widgets. */ + + container = GTK_WIDGET (object); + +- widget = e_paned_new (GTK_ORIENTATION_HORIZONTAL); +- gtk_container_add (GTK_CONTAINER (container), widget); +- priv->hpaned = g_object_ref (widget); +- gtk_widget_show (widget); ++ if (!e_shell_get_express_mode (shell)) { ++ widget = e_paned_new (GTK_ORIENTATION_HORIZONTAL); ++ gtk_container_add (GTK_CONTAINER (container), widget); ++ priv->hpaned = g_object_ref (widget); ++ gtk_widget_show (widget); + +- container = priv->hpaned; ++ container = priv->hpaned; ++ } + + widget = gtk_notebook_new (); + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), FALSE); + gtk_notebook_set_show_border (GTK_NOTEBOOK (widget), FALSE); +- gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, FALSE); ++ if (!e_shell_get_express_mode (shell)) ++ gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, FALSE); ++ else ++ gtk_container_add (GTK_CONTAINER (container), widget); + priv->notebook = g_object_ref (widget); + gtk_widget_show (widget); + +- /* FIXME Need to deal with saving and restoring the position. +- * Month view has its own position. */ +- widget = e_paned_new (GTK_ORIENTATION_VERTICAL); +- e_paned_set_fixed_resize (E_PANED (widget), FALSE); +- gtk_paned_pack2 (GTK_PANED (container), widget, FALSE, TRUE); +- priv->vpaned = g_object_ref (widget); +- gtk_widget_show (widget); ++ if (!e_shell_get_express_mode (shell)) { ++ /* FIXME Need to deal with saving and restoring the position. ++ * Month view has its own position. */ ++ widget = e_paned_new (GTK_ORIENTATION_VERTICAL); ++ e_paned_set_fixed_resize (E_PANED (widget), FALSE); ++ gtk_paned_pack2 (GTK_PANED (container), widget, FALSE, TRUE); ++ priv->vpaned = g_object_ref (widget); ++ gtk_widget_show (widget); ++ } + + container = priv->notebook; + + /* Add views in the order defined by GnomeCalendarViewType, such + * that the notebook page number corresponds to the view type. */ + +- priv->calendar = gnome_calendar_new (shell_settings); ++ priv->calendar = gnome_calendar_new (); + calendar = GNOME_CALENDAR (priv->calendar); + + for (ii = 0; ii < GNOME_CAL_LAST_VIEW; ii++) { +@@ -404,86 +409,90 @@ + + container = priv->vpaned; + +- widget = gtk_vbox_new (FALSE, 0); +- gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, TRUE); +- gtk_widget_show (widget); +- +- container = widget; +- +- widget = gtk_hseparator_new (); +- gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0); +- gtk_widget_show (widget); +- +- widget = gtk_label_new (NULL); +- markup = g_strdup_printf ("%s", _("Tasks")); +- gtk_label_set_markup (GTK_LABEL (widget), markup); +- gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0); +- gtk_widget_show (widget); +- g_free (markup); +- +- widget = gtk_scrolled_window_new (NULL, NULL); +- gtk_scrolled_window_set_policy ( +- GTK_SCROLLED_WINDOW (widget), +- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); +- gtk_scrolled_window_set_shadow_type ( +- GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN); +- gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); +- gtk_widget_show (widget); +- +- container = widget; +- +- widget = e_task_table_new (shell_view, task_model); +- gtk_container_add (GTK_CONTAINER (container), widget); +- priv->task_table = g_object_ref (widget); +- gtk_widget_show (widget); +- +- cal_shell_content_load_table_state (shell_content, E_TABLE (widget)); +- +- g_signal_connect_swapped ( +- widget, "open-component", +- G_CALLBACK (e_cal_shell_view_taskpad_open_task), +- shell_view); +- +- container = priv->vpaned; +- +- widget = gtk_vbox_new (FALSE, 0); +- gtk_paned_pack2 (GTK_PANED (container), widget, TRUE, TRUE); +- gtk_widget_show (widget); +- +- container = widget; +- +- widget = gtk_label_new (NULL); +- markup = g_strdup_printf ("%s", _("Memos")); +- gtk_label_set_markup (GTK_LABEL (widget), markup); +- gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0); +- gtk_widget_show (widget); +- g_free (markup); +- +- widget = gtk_scrolled_window_new (NULL, NULL); +- gtk_scrolled_window_set_policy ( +- GTK_SCROLLED_WINDOW (widget), +- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); +- gtk_scrolled_window_set_shadow_type ( +- GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN); +- gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); +- gtk_widget_show (widget); +- +- container = widget; +- +- widget = e_memo_table_new (shell_view, memo_model); +- gtk_container_add (GTK_CONTAINER (container), widget); +- priv->memo_table = g_object_ref (widget); +- gtk_widget_show (widget); +- +- cal_shell_content_load_table_state (shell_content, E_TABLE (widget)); +- +- e_cal_model_set_default_time_func ( +- memo_model, gc_get_default_time, calendar); +- +- g_signal_connect_swapped ( +- widget, "open-component", +- G_CALLBACK (e_cal_shell_view_memopad_open_memo), +- shell_view); ++ if (!e_shell_get_express_mode (shell)) { ++ widget = gtk_vbox_new (FALSE, 0); ++ gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, TRUE); ++ gtk_widget_show (widget); ++ ++ container = widget; ++ ++ widget = gtk_hseparator_new (); ++ gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0); ++ gtk_widget_show (widget); ++ ++ widget = gtk_label_new (NULL); ++ markup = g_strdup_printf ("%s", _("Tasks")); ++ gtk_label_set_markup (GTK_LABEL (widget), markup); ++ gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0); ++ gtk_widget_show (widget); ++ g_free (markup); ++ ++ widget = gtk_scrolled_window_new (NULL, NULL); ++ gtk_scrolled_window_set_policy ( ++ GTK_SCROLLED_WINDOW (widget), ++ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); ++ gtk_scrolled_window_set_shadow_type ( ++ GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN); ++ gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); ++ gtk_widget_show (widget); ++ ++ container = widget; ++ ++ widget = e_task_table_new (shell_view, task_model); ++ gtk_container_add (GTK_CONTAINER (container), widget); ++ priv->task_table = g_object_ref (widget); ++ gtk_widget_show (widget); ++ ++ cal_shell_content_load_table_state ( ++ shell_content, E_TABLE (widget)); ++ ++ g_signal_connect_swapped ( ++ widget, "open-component", ++ G_CALLBACK (e_cal_shell_view_taskpad_open_task), ++ shell_view); ++ ++ container = priv->vpaned; ++ ++ widget = gtk_vbox_new (FALSE, 0); ++ gtk_paned_pack2 (GTK_PANED (container), widget, TRUE, TRUE); ++ gtk_widget_show (widget); ++ ++ container = widget; ++ ++ widget = gtk_label_new (NULL); ++ markup = g_strdup_printf ("%s", _("Memos")); ++ gtk_label_set_markup (GTK_LABEL (widget), markup); ++ gtk_box_pack_start (GTK_BOX (container), widget, FALSE, TRUE, 0); ++ gtk_widget_show (widget); ++ g_free (markup); ++ ++ widget = gtk_scrolled_window_new (NULL, NULL); ++ gtk_scrolled_window_set_policy ( ++ GTK_SCROLLED_WINDOW (widget), ++ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); ++ gtk_scrolled_window_set_shadow_type ( ++ GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN); ++ gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); ++ gtk_widget_show (widget); ++ ++ container = widget; ++ ++ widget = e_memo_table_new (shell_view, memo_model); ++ gtk_container_add (GTK_CONTAINER (container), widget); ++ priv->memo_table = g_object_ref (widget); ++ gtk_widget_show (widget); ++ ++ cal_shell_content_load_table_state ( ++ shell_content, E_TABLE (widget)); ++ ++ e_cal_model_set_default_time_func ( ++ memo_model, gc_get_default_time, calendar); ++ ++ g_signal_connect_swapped ( ++ widget, "open-component", ++ G_CALLBACK (e_cal_shell_view_memopad_open_memo), ++ shell_view); ++ } + + /* Load the view instance. */ + +@@ -496,21 +505,23 @@ + * The GtkWidget::map() callback below explains why. */ + priv->view_instance = view_instance; + +- g_signal_connect_swapped ( +- shell_view, "notify::view-id", +- G_CALLBACK (cal_shell_content_notify_view_id_cb), +- object); +- +- /* Bind GObject properties to GConf keys. */ +- +- bridge = gconf_bridge_get (); +- +- object = G_OBJECT (priv->vpaned); +- key = "/apps/evolution/calendar/display/tag_vpane_position"; +- gconf_bridge_bind_property_delayed (bridge, key, object, "proportion"); ++ if (!e_shell_get_express_mode (shell)) { ++ g_signal_connect_swapped ( ++ shell_view, "notify::view-id", ++ G_CALLBACK (cal_shell_content_notify_view_id_cb), ++ object); ++ ++ bridge = gconf_bridge_get (); ++ ++ object = G_OBJECT (priv->vpaned); ++ key = "/apps/evolution/calendar/display/tag_vpane_position"; ++ gconf_bridge_bind_property_delayed (bridge, key, object, "proportion"); ++ } + +- g_object_unref (memo_model); +- g_object_unref (task_model); ++ if (memo_model) ++ g_object_unref (memo_model); ++ if (task_model) ++ g_object_unref (task_model); + } + + static void +@@ -669,6 +680,7 @@ + EShellSearchbar * + e_cal_shell_content_get_searchbar (ECalShellContent *cal_shell_content) + { ++ EShellView *shell_view; + EShellContent *shell_content; + GtkWidget *widget; + +@@ -676,7 +688,8 @@ + E_IS_CAL_SHELL_CONTENT (cal_shell_content), NULL); + + shell_content = E_SHELL_CONTENT (cal_shell_content); +- widget = e_shell_content_get_searchbar (shell_content); ++ shell_view = e_shell_content_get_shell_view (shell_content); ++ widget = e_shell_view_get_searchbar (shell_view); + + return E_SHELL_SEARCHBAR (widget); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-shell-migrate.c evolution-2.30.2.new//modules/calendar/e-cal-shell-migrate.c +--- evolution-2.30.2//modules/calendar/e-cal-shell-migrate.c 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.2.new//modules/calendar/e-cal-shell-migrate.c 2010-06-22 13:37:26.820114033 +0200 +@@ -82,7 +82,7 @@ + + static e_gconf_map_t calendar_datenavigator_map[] = { + /* /Calendar/DateNavigator */ +- { "ShowWeekNumbers", "calendar/date_navigator/show_week_numbers", E_GCONF_MAP_BOOL }, ++ { "ShowWeekNumbers", "calendar/display/show_week_numbers", E_GCONF_MAP_BOOL }, + { NULL }, + }; + +@@ -690,7 +690,7 @@ + + if (!migrate_ical_folder (l->data, on_this_computer, source_name, E_CAL_SOURCE_TYPE_EVENT)) { + /* FIXME: domain/code */ +- g_set_error(error, 0, 0, _("Unable to migrate calendar `%s'"), source_name); ++ g_set_error(error, 0, 0, _("Unable to migrate calendar '%s'"), source_name); + g_free(source_name); + goto fail; + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-shell-settings.c evolution-2.30.2.new//modules/calendar/e-cal-shell-settings.c +--- evolution-2.30.2//modules/calendar/e-cal-shell-settings.c 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.2.new//modules/calendar/e-cal-shell-settings.c 2010-06-22 13:37:26.820114033 +0200 +@@ -491,8 +491,8 @@ + "/apps/evolution/calendar/prompts/confirm_purge"); + + e_shell_settings_install_property_for_key ( +- "cal-day-view-show-week-numbers", +- "/apps/evolution/calendar/display/day_view_show_week_number"); ++ "cal-show-week-numbers", ++ "/apps/evolution/calendar/display/show_week_numbers"); + + e_shell_settings_install_property_for_key ( + "cal-free-busy-template", +@@ -539,10 +539,6 @@ + "/apps/evolution/calendar/display/show_event_end"); + + e_shell_settings_install_property_for_key ( +- "cal-show-week-numbers", +- "/apps/evolution/calendar/date_navigator/show_week_numbers"); +- +- e_shell_settings_install_property_for_key ( + "cal-tasks-color-due-today", + "/apps/evolution/calendar/tasks/colors/due_today"); + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-shell-sidebar.c evolution-2.30.2.new//modules/calendar/e-cal-shell-sidebar.c +--- evolution-2.30.2//modules/calendar/e-cal-shell-sidebar.c 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.2.new//modules/calendar/e-cal-shell-sidebar.c 2010-06-22 13:37:26.820114033 +0200 +@@ -33,6 +33,7 @@ + #include "calendar/gui/calendar-config.h" + #include "calendar/gui/e-calendar-selector.h" + #include "calendar/gui/misc.h" ++#include "calendar/gui/dialogs/calendar-setup.h" + + #include "e-cal-shell-view.h" + #include "e-cal-shell-backend.h" +@@ -476,7 +477,7 @@ + bridge = gconf_bridge_get (); + + object = G_OBJECT (priv->paned); +- key = "/apps/evolution/calendar/display/date_navigator_vpane_position"; ++ key = "/apps/evolution/calendar/display/date_navigator_pane_position"; + gconf_bridge_bind_property_delayed (bridge, key, object, "vposition"); + } + +@@ -559,6 +560,21 @@ + } + + static void ++new_calendar_clicked (GtkButton *button, ++ EShellSidebar *shell_sidebar) ++{ ++ EShellView *shell_view; ++ EShellWindow *shell_window; ++ EShellBackend *shell_backend; ++ ++ shell_view = e_shell_sidebar_get_shell_view (shell_sidebar); ++ shell_backend = e_shell_view_get_shell_backend (shell_view); ++ shell_window = e_shell_view_get_shell_window (shell_view); ++ ++ calendar_setup_new_calendar (GTK_WINDOW (shell_window)); ++} ++ ++static void + cal_shell_sidebar_constructed (GObject *object) + { + ECalShellSidebarPrivate *priv; +@@ -605,7 +621,21 @@ + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type ( + GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN); +- gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, TRUE); ++ if (!e_shell_get_express_mode(e_shell_get_default())) { ++ gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, TRUE); ++ } else { ++ GtkWidget *button; ++ ++ container = gtk_vbox_new (FALSE, 6); ++ gtk_box_pack_start (GTK_BOX(container), widget, TRUE, TRUE, 0); ++ ++ button = gtk_button_new_with_label (_("New Calendar...")); ++ gtk_box_pack_start (GTK_BOX(container), button, FALSE, FALSE, 0); ++ g_signal_connect (button, "clicked", G_CALLBACK(new_calendar_clicked), shell_sidebar); ++ ++ gtk_paned_pack1 (GTK_PANED (priv->paned), container, TRUE, TRUE); ++ gtk_widget_show_all (container); ++ } + gtk_widget_show (widget); + + container = widget; +@@ -624,7 +654,8 @@ + calitem = E_CALENDAR (widget)->calitem; + e_calendar_item_set_days_start_week_sel (calitem, 9); + e_calendar_item_set_max_days_sel (calitem, 42); +- gtk_paned_pack2 (GTK_PANED (container), widget, FALSE, TRUE); ++ gtk_paned_pack2 (GTK_PANED (container), widget, FALSE, FALSE); ++ gtk_widget_set_size_request (widget, -1, 200); + priv->date_navigator = g_object_ref (widget); + gtk_widget_show (widget); + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-shell-view-actions.c evolution-2.30.2.new//modules/calendar/e-cal-shell-view-actions.c +--- evolution-2.30.2//modules/calendar/e-cal-shell-view-actions.c 2010-06-20 14:14:47.000000000 +0200 ++++ evolution-2.30.2.new//modules/calendar/e-cal-shell-view-actions.c 2010-06-22 13:37:26.820114033 +0200 +@@ -1196,6 +1196,25 @@ + edit_event_as (cal_shell_view, TRUE); + } + ++ static void ++quit_calendar_cb (GtkAction *action, ++ ECalShellView *cal_shell_view) ++{ ++ EShellView *shell_view; ++ EShellWindow *shell_window; ++ GdkEvent *event; ++ ++ shell_view = E_SHELL_VIEW (cal_shell_view); ++ shell_window = e_shell_view_get_shell_window (shell_view); ++ ++ /* Synthesize a delete_event on this window. */ ++ event = gdk_event_new (GDK_DELETE); ++ event->any.window = g_object_ref (((GtkWidget *) shell_window)->window); ++ event->any.send_event = TRUE; ++ gtk_main_do_event (event); ++ gdk_event_free (event); ++} ++ + static void + action_event_schedule_appointment_cb (GtkAction *action, + ECalShellView *cal_shell_view) +@@ -1428,6 +1447,13 @@ + N_("Converts a meeting to an appointment"), + G_CALLBACK (action_event_schedule_appointment_cb) }, + ++ { "quit-calendar", ++ GTK_STOCK_CLOSE, ++ N_("Quit"), ++ NULL, ++ NULL, /* XXX Add a tooltip! */ ++ G_CALLBACK (quit_calendar_cb) }, ++ + /*** Menus ***/ + + { "calendar-actions-menu", +@@ -1710,8 +1736,9 @@ + /* Advanced Search Action */ + action = ACTION (CALENDAR_SEARCH_ADVANCED_HIDDEN); + gtk_action_set_visible (action, FALSE); +- e_shell_searchbar_set_search_option ( +- searchbar, GTK_RADIO_ACTION (action)); ++ if (searchbar) ++ e_shell_searchbar_set_search_option ( ++ searchbar, GTK_RADIO_ACTION (action)); + + /* Lockdown Printing Actions */ + action_group = ACTION_GROUP (LOCKDOWN_PRINTING); +@@ -1833,18 +1860,20 @@ + + cal_shell_content = cal_shell_view->priv->cal_shell_content; + searchbar = e_cal_shell_content_get_searchbar (cal_shell_content); +- combo_box = e_shell_searchbar_get_filter_combo_box (searchbar); ++ if (searchbar) { ++ combo_box = e_shell_searchbar_get_filter_combo_box (searchbar); + +- e_shell_view_block_execute_search (shell_view); ++ e_shell_view_block_execute_search (shell_view); + +- /* Use any action in the group; doesn't matter which. */ +- e_action_combo_box_set_action (combo_box, radio_action); ++ /* Use any action in the group; doesn't matter which. */ ++ e_action_combo_box_set_action (combo_box, radio_action); + +- ii = CALENDAR_FILTER_UNMATCHED; +- e_action_combo_box_add_separator_after (combo_box, ii); ++ ii = CALENDAR_FILTER_UNMATCHED; ++ e_action_combo_box_add_separator_after (combo_box, ii); + +- ii = CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS; +- e_action_combo_box_add_separator_after (combo_box, ii); ++ ii = CALENDAR_FILTER_NEXT_7_DAYS_APPOINTMENTS; ++ e_action_combo_box_add_separator_after (combo_box, ii); + +- e_shell_view_unblock_execute_search (shell_view); ++ e_shell_view_unblock_execute_search (shell_view); ++ } + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-shell-view-actions.h evolution-2.30.2.new//modules/calendar/e-cal-shell-view-actions.h +--- evolution-2.30.2//modules/calendar/e-cal-shell-view-actions.h 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.2.new//modules/calendar/e-cal-shell-view-actions.h 2010-06-22 13:37:26.820114033 +0200 +@@ -89,6 +89,8 @@ + E_SHELL_WINDOW_ACTION ((window), "event-reply-all") + #define E_SHELL_WINDOW_ACTION_EVENT_OCCURRENCE_MOVABLE(window) \ + E_SHELL_WINDOW_ACTION ((window), "event-occurrence-movable") ++#define E_SHELL_WINDOW_ACTION_EVENT_MEETING_NEW(window) \ ++ E_SHELL_WINDOW_ACTION ((window), "event-meeting-new") + + /* Memo Pad Actions */ + #define E_SHELL_WINDOW_ACTION_CALENDAR_MEMOPAD_FORWARD(window) \ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-shell-view.c evolution-2.30.2.new//modules/calendar/e-cal-shell-view.c +--- evolution-2.30.2//modules/calendar/e-cal-shell-view.c 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.2.new//modules/calendar/e-cal-shell-view.c 2010-06-22 13:37:26.820114033 +0200 +@@ -283,6 +283,7 @@ + GtkAction *action; + GList *list, *iter; + gboolean sensitive; ++ gboolean visible; + guint32 state; + gint n_selected; + +@@ -303,6 +304,26 @@ + + shell_window = e_shell_view_get_shell_window (shell_view); + ++ if (e_shell_get_express_mode(e_shell_get_default())) { ++ GtkWidget *widget, *item; ++ ++ /* Hack: Get rid of New and Send/Receive in toolbar ++ * while in express mode */ ++ widget = e_shell_window_get_managed_widget ( ++ shell_window, "/main-toolbar"); ++ ++ item = (GtkWidget *)gtk_toolbar_get_nth_item ((GtkToolbar *)widget, 0); ++ gtk_widget_hide(item); ++ ++ widget = e_shell_window_get_managed_widget ( ++ shell_window, "/main-menu"); ++ gtk_widget_hide(widget); ++ ++ item = e_shell_window_get_managed_widget ( ++ shell_window, "/main-toolbar/send-receive"); ++ if (item) ++ gtk_widget_hide(item); ++ } + cal_shell_content = priv->cal_shell_content; + calendar = e_cal_shell_content_get_calendar (cal_shell_content); + view_type = gnome_calendar_get_view (calendar); +@@ -444,6 +465,10 @@ + action = ACTION (EVENT_REPLY_ALL); + sensitive = (n_selected == 1) && is_meeting; + gtk_action_set_sensitive (action, sensitive); ++ ++ action = ACTION (EVENT_MEETING_NEW); ++ visible = itip_addresses_get_default() != NULL; ++ gtk_action_set_visible (action, visible); + } + + static void +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-cal-shell-view-private.c evolution-2.30.2.new//modules/calendar/e-cal-shell-view-private.c +--- evolution-2.30.2//modules/calendar/e-cal-shell-view-private.c 2010-06-20 14:17:50.000000000 +0200 ++++ evolution-2.30.2.new//modules/calendar/e-cal-shell-view-private.c 2010-06-22 13:37:26.824114033 +0200 +@@ -28,6 +28,16 @@ + + #define CHECK_NB 5 + ++/* be compatible with older e-d-s for MeeGo */ ++#ifndef ETC_TIMEZONE ++# define ETC_TIMEZONE "/etc/timezone" ++# define ETC_TIMEZONE_MAJ "/etc/TIMEZONE" ++# define ETC_RC_CONF "/etc/rc.conf" ++# define ETC_SYSCONFIG_CLOCK "/etc/sysconfig/clock" ++# define ETC_CONF_D_CLOCK "/etc/conf.d/clock" ++# define ETC_LOCALTIME "/etc/localtime" ++#endif ++ + static const gchar * files_to_check [CHECK_NB] = { + ETC_TIMEZONE, + ETC_TIMEZONE_MAJ, +@@ -610,35 +620,41 @@ + G_CALLBACK (cal_shell_view_selector_client_removed_cb), + cal_shell_view); + +- g_signal_connect_swapped ( +- memo_table, "popup-event", +- G_CALLBACK (cal_shell_view_memopad_popup_event_cb), +- cal_shell_view); ++ if (memo_table) ++ g_signal_connect_swapped ( ++ memo_table, "popup-event", ++ G_CALLBACK (cal_shell_view_memopad_popup_event_cb), ++ cal_shell_view); + +- g_signal_connect_swapped ( +- memo_table, "selection-change", +- G_CALLBACK (e_cal_shell_view_memopad_actions_update), +- cal_shell_view); ++ if (memo_table) ++ g_signal_connect_swapped ( ++ memo_table, "selection-change", ++ G_CALLBACK (e_cal_shell_view_memopad_actions_update), ++ cal_shell_view); + +- g_signal_connect_swapped ( +- memo_table, "status-message", +- G_CALLBACK (e_cal_shell_view_memopad_set_status_message), +- cal_shell_view); ++ if (memo_table) ++ g_signal_connect_swapped ( ++ memo_table, "status-message", ++ G_CALLBACK (e_cal_shell_view_memopad_set_status_message), ++ cal_shell_view); + +- g_signal_connect_swapped ( +- task_table, "popup-event", +- G_CALLBACK (cal_shell_view_taskpad_popup_event_cb), +- cal_shell_view); ++ if (task_table) ++ g_signal_connect_swapped ( ++ task_table, "popup-event", ++ G_CALLBACK (cal_shell_view_taskpad_popup_event_cb), ++ cal_shell_view); + +- g_signal_connect_swapped ( +- task_table, "status-message", +- G_CALLBACK (e_cal_shell_view_taskpad_set_status_message), +- cal_shell_view); ++ if (task_table) ++ g_signal_connect_swapped ( ++ task_table, "status-message", ++ G_CALLBACK (e_cal_shell_view_taskpad_set_status_message), ++ cal_shell_view); + +- g_signal_connect_swapped ( +- task_table, "selection-change", +- G_CALLBACK (e_cal_shell_view_taskpad_actions_update), +- cal_shell_view); ++ if (task_table) ++ g_signal_connect_swapped ( ++ task_table, "selection-change", ++ G_CALLBACK (e_cal_shell_view_taskpad_actions_update), ++ cal_shell_view); + + e_categories_add_change_hook ( + (GHookFunc) e_cal_shell_view_update_search_filter, +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-memo-shell-backend.c evolution-2.30.2.new//modules/calendar/e-memo-shell-backend.c +--- evolution-2.30.2//modules/calendar/e-memo-shell-backend.c 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.2.new//modules/calendar/e-memo-shell-backend.c 2010-06-22 13:37:26.824114033 +0200 +@@ -419,7 +419,7 @@ + + source = e_source_list_peek_source_by_uid (source_list, source_uid); + if (source == NULL) { +- g_printerr ("No source for UID `%s'\n", source_uid); ++ g_printerr ("No source for UID '%s'\n", source_uid); + g_object_unref (source_list); + goto exit; + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-memo-shell-content.c evolution-2.30.2.new//modules/calendar/e-memo-shell-content.c +--- evolution-2.30.2//modules/calendar/e-memo-shell-content.c 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.2.new//modules/calendar/e-memo-shell-content.c 2010-06-22 13:37:26.824114033 +0200 +@@ -418,7 +418,7 @@ + shell = e_shell_backend_get_shell (shell_backend); + shell_settings = e_shell_get_shell_settings (shell); + +- priv->memo_model = e_cal_model_memos_new (shell_settings); ++ priv->memo_model = e_cal_model_memos_new (); + + timezone = e_shell_settings_get_pointer ( + shell_settings, "cal-timezone"); +@@ -730,6 +730,7 @@ + EShellSearchbar * + e_memo_shell_content_get_searchbar (EMemoShellContent *memo_shell_content) + { ++ EShellView *shell_view; + EShellContent *shell_content; + GtkWidget *widget; + +@@ -737,7 +738,8 @@ + E_IS_MEMO_SHELL_CONTENT (memo_shell_content), NULL); + + shell_content = E_SHELL_CONTENT (memo_shell_content); +- widget = e_shell_content_get_searchbar (shell_content); ++ shell_view = e_shell_content_get_shell_view (shell_content); ++ widget = e_shell_view_get_searchbar (shell_view); + + return E_SHELL_SEARCHBAR (widget); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-task-shell-backend.c evolution-2.30.2.new//modules/calendar/e-task-shell-backend.c +--- evolution-2.30.2//modules/calendar/e-task-shell-backend.c 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.2.new//modules/calendar/e-task-shell-backend.c 2010-06-22 13:37:26.824114033 +0200 +@@ -424,7 +424,7 @@ + + source = e_source_list_peek_source_by_uid (source_list, source_uid); + if (source == NULL) { +- g_printerr ("No source for UID `%s'\n", source_uid); ++ g_printerr ("No source for UID '%s'\n", source_uid); + g_object_unref (source_list); + goto exit; + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-task-shell-content.c evolution-2.30.2.new//modules/calendar/e-task-shell-content.c +--- evolution-2.30.2//modules/calendar/e-task-shell-content.c 2010-06-20 14:14:47.000000000 +0200 ++++ evolution-2.30.2.new//modules/calendar/e-task-shell-content.c 2010-06-22 13:37:26.824114033 +0200 +@@ -415,7 +415,7 @@ + shell = e_shell_window_get_shell (shell_window); + shell_settings = e_shell_get_shell_settings (shell); + +- priv->task_model = e_cal_model_tasks_new (shell_settings); ++ priv->task_model = e_cal_model_tasks_new (); + + timezone = e_shell_settings_get_pointer ( + shell_settings, "cal-timezone"); +@@ -752,6 +752,7 @@ + EShellSearchbar * + e_task_shell_content_get_searchbar (ETaskShellContent *task_shell_content) + { ++ EShellView *shell_view; + EShellContent *shell_content; + GtkWidget *widget; + +@@ -759,7 +760,8 @@ + E_IS_TASK_SHELL_CONTENT (task_shell_content), NULL); + + shell_content = E_SHELL_CONTENT (task_shell_content); +- widget = e_shell_content_get_searchbar (shell_content); ++ shell_view = e_shell_content_get_shell_view (shell_content); ++ widget = e_shell_view_get_searchbar (shell_view); + + return E_SHELL_SEARCHBAR (widget); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/e-task-shell-migrate.c evolution-2.30.2.new//modules/calendar/e-task-shell-migrate.c +--- evolution-2.30.2//modules/calendar/e-task-shell-migrate.c 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.2.new//modules/calendar/e-task-shell-migrate.c 2010-06-22 13:37:26.824114033 +0200 +@@ -617,7 +617,7 @@ + + if (!migrate_ical_folder (l->data, on_this_computer, source_name, E_CAL_SOURCE_TYPE_TODO)) { + /* FIXME: domain/code */ +- g_set_error(error, 0, 0, _("Unable to migrate tasks `%s'"), source_name); ++ g_set_error(error, 0, 0, _("Unable to migrate tasks '%s'"), source_name); + g_free(source_name); + goto fail; + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/evolution-module-calendar.c evolution-2.30.2.new//modules/calendar/evolution-module-calendar.c +--- evolution-2.30.2//modules/calendar/evolution-module-calendar.c 2010-06-20 14:14:46.000000000 +0200 ++++ evolution-2.30.2.new//modules/calendar/evolution-module-calendar.c 2010-06-22 13:37:26.824114033 +0200 +@@ -39,6 +39,13 @@ + #include "e-task-shell-sidebar.h" + #include "e-task-shell-view.h" + ++#include "e-cal-config-calendar-item.h" ++#include "e-cal-config-date-edit.h" ++#include "e-cal-config-meeting-store.h" ++#include "e-cal-config-meeting-time-selector.h" ++#include "e-cal-config-model.h" ++#include "e-cal-config-view.h" ++ + /* Module Entry Points */ + void e_module_load (GTypeModule *type_module); + void e_module_unload (GTypeModule *type_module); +@@ -67,6 +74,13 @@ + e_task_shell_content_register_type (type_module); + e_task_shell_sidebar_register_type (type_module); + e_task_shell_view_register_type (type_module); ++ ++ e_cal_config_calendar_item_register_type (type_module); ++ e_cal_config_date_edit_register_type (type_module); ++ e_cal_config_meeting_store_register_type (type_module); ++ e_cal_config_meeting_time_selector_register_type (type_module); ++ e_cal_config_model_register_type (type_module); ++ e_cal_config_view_register_type (type_module); + } + + G_MODULE_EXPORT void +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/calendar/Makefile.am evolution-2.30.2.new//modules/calendar/Makefile.am +--- evolution-2.30.2//modules/calendar/Makefile.am 2010-04-26 15:13:17.000000000 +0200 ++++ evolution-2.30.2.new//modules/calendar/Makefile.am 2010-06-22 13:37:26.824114033 +0200 +@@ -14,8 +14,20 @@ + evolution-module-calendar.c \ + e-cal-attachment-handler.c \ + e-cal-attachment-handler.h \ ++ e-cal-config-calendar-item.c \ ++ e-cal-config-calendar-item.h \ ++ e-cal-config-date-edit.c \ ++ e-cal-config-date-edit.h \ + e-cal-config-hook.c \ + e-cal-config-hook.h \ ++ e-cal-config-meeting-store.c \ ++ e-cal-config-meeting-store.h \ ++ e-cal-config-meeting-time-selector.c \ ++ e-cal-config-meeting-time-selector.h \ ++ e-cal-config-model.c \ ++ e-cal-config-model.h \ ++ e-cal-config-view.c \ ++ e-cal-config-view.h \ + e-cal-event-hook.c \ + e-cal-event-hook.h \ + e-cal-shell-backend.c \ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/connman/evolution-connman.c evolution-2.30.2.new//modules/connman/evolution-connman.c +--- evolution-2.30.2//modules/connman/evolution-connman.c 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//modules/connman/evolution-connman.c 2010-06-22 13:37:26.824114033 +0200 +@@ -0,0 +1,209 @@ ++/* ++ * evolution-connman.c ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#include ++#include ++#include ++ ++#include ++#include ++ ++#define CM_DBUS_SERVICE "org.moblin.connman" ++#define CM_DBUS_INTERFACE "org.moblin.connman.Manager" ++#define CM_DBUS_PATH "/" ++ ++/* Standard GObject macros */ ++#define E_TYPE_CONNMAN \ ++ (e_connman_get_type ()) ++#define E_CONNMAN(obj) \ ++ (G_TYPE_CHECK_INSTANCE_CAST \ ++ ((obj), E_TYPE_CONNMAN, EConnMan)) ++ ++typedef struct { ++ EExtension parent; ++ DBusConnection *connection; ++} EConnMan; ++typedef EExtensionClass EConnManClass; ++ ++/* Module Entry Points */ ++void e_module_load (GTypeModule *type_module); ++void e_module_unload (GTypeModule *type_module); ++ ++/* Forward Declarations */ ++GType e_connman_get_type (void); ++static gboolean network_manager_connect (EConnMan *extension); ++ ++G_DEFINE_DYNAMIC_TYPE (EConnMan, e_connman, E_TYPE_EXTENSION) ++ ++static void ++extension_set_state (EConnMan *extension, const gchar *state) ++{ ++ EExtensible *extensible; ++ ++ extensible = e_extension_get_extensible (E_EXTENSION (extension)); ++ g_return_if_fail (E_IS_SHELL (extensible)); ++ ++ e_shell_set_network_available (E_SHELL (extensible), !g_strcmp0 (state, "online")); ++} ++ ++static DBusHandlerResult ++connman_monitor (DBusConnection *connection G_GNUC_UNUSED, ++ DBusMessage *message, ++ gpointer user_data) ++{ ++ gchar *value; ++ EConnMan *extension = user_data; ++ DBusError error = DBUS_ERROR_INIT; ++ DBusHandlerResult ret = DBUS_HANDLER_RESULT_NOT_YET_HANDLED; ++ ++ if (!dbus_message_has_path (message, CM_DBUS_PATH) || ++ !dbus_message_has_interface (message, CM_DBUS_INTERFACE) || ++ !dbus_message_has_member (message, "StateChanged")) ++ goto err_exit; ++ ++ if (!dbus_message_get_args (message, &error, ++ DBUS_TYPE_STRING, &value, ++ DBUS_TYPE_INVALID)) ++ goto err_exit; ++ ++ extension_set_state (extension, value); ++ ret = DBUS_HANDLER_RESULT_HANDLED; ++ ++ err_exit: ++ return ret; ++} ++ ++static void ++connman_check_initial_state (EConnMan *extension) ++{ ++ DBusMessage *message = NULL; ++ DBusMessage *response = NULL; ++ DBusError error = DBUS_ERROR_INIT; ++ ++ message = dbus_message_new_method_call ( ++ CM_DBUS_SERVICE, CM_DBUS_PATH, CM_DBUS_INTERFACE, "GetState"); ++ ++ /* XXX Assuming this should be safe to call synchronously. */ ++ response = dbus_connection_send_with_reply_and_block ( ++ extension->connection, message, 100, &error); ++ ++ if (response != NULL) { ++ const gchar *value; ++ if (dbus_message_get_args (message, &error, ++ DBUS_TYPE_STRING, &value, ++ DBUS_TYPE_INVALID)) ++ extension_set_state (extension, value); ++ } else { ++ g_warning ("%s", error.message); ++ dbus_error_free (&error); ++ return; ++ } ++ ++ dbus_message_unref (message); ++ dbus_message_unref (response); ++} ++ ++static gboolean ++network_manager_connect (EConnMan *extension) ++{ ++ DBusError error = DBUS_ERROR_INIT; ++ ++ /* This is a timeout callback, so the return value denotes ++ * whether to reschedule, not whether we're successful. */ ++ ++ if (extension->connection != NULL) ++ return FALSE; ++ ++ extension->connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error); ++ if (extension->connection == NULL) { ++ g_warning ("%s", error.message); ++ dbus_error_free (&error); ++ return TRUE; ++ } ++ ++ dbus_connection_setup_with_g_main (extension->connection, NULL); ++ dbus_connection_set_exit_on_disconnect (extension->connection, FALSE); ++ ++ if (!dbus_connection_add_filter ( ++ extension->connection, connman_monitor, extension, NULL)) ++ goto fail; ++ ++ dbus_bus_add_match ( ++ extension->connection, ++ "type='signal'," ++ "interface='" CM_DBUS_INTERFACE "'," ++ "sender='" CM_DBUS_SERVICE "'," ++ "member='StateChanged'," ++ "path='" CM_DBUS_PATH "'", ++ &error); ++ if (dbus_error_is_set (&error)) { ++ g_warning ("%s", error.message); ++ dbus_error_free (&error); ++ goto fail; ++ } ++ ++ connman_check_initial_state (extension); ++ ++ return FALSE; ++ ++fail: ++ dbus_connection_unref (extension->connection); ++ extension->connection = NULL; ++ ++ return TRUE; ++} ++ ++static void ++network_manager_constructed (GObject *object) ++{ ++ network_manager_connect (E_CONNMAN (object)); ++} ++ ++static void ++e_connman_class_init (EConnManClass *class) ++{ ++ GObjectClass *object_class; ++ EExtensionClass *extension_class; ++ ++ object_class = G_OBJECT_CLASS (class); ++ object_class->constructed = network_manager_constructed; ++ ++ extension_class = E_EXTENSION_CLASS (class); ++ extension_class->extensible_type = E_TYPE_SHELL; ++} ++ ++static void ++e_connman_class_finalize (EConnManClass *class) ++{ ++} ++ ++static void ++e_connman_init (EConnMan *extension) ++{ ++} ++ ++G_MODULE_EXPORT void ++e_module_load (GTypeModule *type_module) ++{ ++ e_connman_register_type (type_module); ++} ++ ++G_MODULE_EXPORT void ++e_module_unload (GTypeModule *type_module) ++{ ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/connman/Makefile.am evolution-2.30.2.new//modules/connman/Makefile.am +--- evolution-2.30.2//modules/connman/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//modules/connman/Makefile.am 2010-06-22 13:37:26.936114032 +0200 +@@ -0,0 +1,22 @@ ++module_LTLIBRARIES = libevolution-module-connman.la ++ ++libevolution_module_connman_la_CPPFLAGS = \ ++ $(AM_CPPFLAGS) \ ++ -I$(top_srcdir) \ ++ -DG_LOG_DOMAIN=\"evolution-connman\" \ ++ $(GNOME_PLATFORM_CFLAGS) \ ++ $(DBUS_GLIB_CFLAGS) ++ ++libevolution_module_connman_la_SOURCES = \ ++ evolution-connman.c ++ ++libevolution_module_connman_la_LIBADD = \ ++ $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/shell/libeshell.la \ ++ $(GNOME_PLATFORM_LIBS) \ ++ $(DBUS_GLIB_LIBS) ++ ++libevolution_module_connman_la_LDFLAGS = \ ++ -module -avoid-version $(NO_UNDEFINED) ++ ++-include $(top_srcdir)/git.mk +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/mail/e-mail-config-format-html.c evolution-2.30.2.new//modules/mail/e-mail-config-format-html.c +--- evolution-2.30.2//modules/mail/e-mail-config-format-html.c 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//modules/mail/e-mail-config-format-html.c 2010-06-22 13:37:26.936114032 +0200 +@@ -0,0 +1,93 @@ ++/* ++ * e-mail-config-format-html.c ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#include "e-mail-config-format-html.h" ++ ++#include ++#include ++#include ++#include ++ ++static void ++mail_config_format_html_constructed (GObject *object) ++{ ++ EExtension *extension; ++ EExtensible *extensible; ++ EShellSettings *shell_settings; ++ EShell *shell; ++ ++ extension = E_EXTENSION (object); ++ extensible = e_extension_get_extensible (extension); ++ ++ shell = e_shell_get_default (); ++ shell_settings = e_shell_get_shell_settings (shell); ++ ++ e_binding_new_full ( ++ shell_settings, "mail-citation-color", ++ extensible, "citation-color", ++ e_binding_transform_string_to_color, ++ NULL, NULL); ++ ++ e_binding_new ( ++ shell_settings, "mail-image-loading-policy", ++ extensible, "image-loading-policy"); ++ ++ e_binding_new ( ++ shell_settings, "mail-only-local-photos", ++ extensible, "only-local-photos"); ++ ++ e_binding_new ( ++ shell_settings, "mail-show-sender-photo", ++ extensible, "show-sender-photo"); ++ ++ e_binding_new ( ++ shell_settings, "mail-show-real-date", ++ extensible, "show-real-date"); ++} ++ ++static void ++mail_config_format_html_class_init (EExtensionClass *class) ++{ ++ GObjectClass *object_class; ++ ++ object_class = G_OBJECT_CLASS (class); ++ object_class->constructed = mail_config_format_html_constructed; ++ ++ class->extensible_type = EM_TYPE_FORMAT_HTML; ++} ++ ++void ++e_mail_config_format_html_register_type (GTypeModule *type_module) ++{ ++ static const GTypeInfo type_info = { ++ sizeof (EExtensionClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) mail_config_format_html_class_init, ++ (GClassFinalizeFunc) NULL, ++ NULL, /* class_data */ ++ sizeof (EExtension), ++ 0, /* n_preallocs */ ++ (GInstanceInitFunc) NULL, ++ NULL /* value_table */ ++ }; ++ ++ g_type_module_register_type ( ++ type_module, E_TYPE_EXTENSION, ++ "EMailConfigFormatHTML", &type_info, 0); ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/mail/e-mail-config-format-html.h evolution-2.30.2.new//modules/mail/e-mail-config-format-html.h +--- evolution-2.30.2//modules/mail/e-mail-config-format-html.h 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//modules/mail/e-mail-config-format-html.h 2010-06-22 13:37:26.936114032 +0200 +@@ -0,0 +1,30 @@ ++/* ++ * e-mail-config-format-html.h ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#ifndef E_MAIL_CONFIG_FORMAT_HTML_H ++#define E_MAIL_CONFIG_FORMAT_HTML_H ++ ++#include ++ ++G_BEGIN_DECLS ++ ++void e_mail_config_format_html_register_type (GTypeModule *type_module); ++ ++G_END_DECLS ++ ++#endif /* E_MAIL_CONFIG_FORMAT_HTML_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/mail/e-mail-config-web-view.c evolution-2.30.2.new//modules/mail/e-mail-config-web-view.c +--- evolution-2.30.2//modules/mail/e-mail-config-web-view.c 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//modules/mail/e-mail-config-web-view.c 2010-06-22 13:37:26.936114032 +0200 +@@ -0,0 +1,100 @@ ++/* ++ * e-mail-config-web-view.c ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#include "e-mail-config-web-view.h" ++ ++#include ++#include ++#include ++#include ++ ++static void ++mail_config_web_view_realize (GtkWidget *widget) ++{ ++ EShell *shell; ++ EShellSettings *shell_settings; ++ ++ shell = e_shell_get_default (); ++ shell_settings = e_shell_get_shell_settings (shell); ++ ++ e_binding_new ( ++ shell_settings, "mail-show-animated-images", ++ widget, "animate"); ++ ++ e_binding_new ( ++ shell_settings, "composer-inline-spelling", ++ widget, "inline-spelling"); ++ ++ e_binding_new ( ++ shell_settings, "composer-magic-links", ++ widget, "magic-links"); ++ ++ e_binding_new ( ++ shell_settings, "composer-magic-smileys", ++ widget, "magic-smileys"); ++} ++ ++static void ++mail_config_web_view_constructed (GObject *object) ++{ ++ EExtension *extension; ++ EExtensible *extensible; ++ ++ extension = E_EXTENSION (object); ++ extensible = e_extension_get_extensible (extension); ++ ++ /* Wait to bind shell settings until the EWebView is realized ++ * so GtkhtmlEditor has a chance to install a GtkHTMLEditorAPI. ++ * Otherwise our settings will have no effect. */ ++ ++ g_signal_connect ( ++ extensible, "realize", ++ G_CALLBACK (mail_config_web_view_realize), NULL); ++} ++ ++static void ++mail_config_web_view_class_init (EExtensionClass *class) ++{ ++ GObjectClass *object_class; ++ ++ object_class = G_OBJECT_CLASS (class); ++ object_class->constructed = mail_config_web_view_constructed; ++ ++ class->extensible_type = E_TYPE_WEB_VIEW; ++} ++ ++void ++e_mail_config_web_view_register_type (GTypeModule *type_module) ++{ ++ static const GTypeInfo type_info = { ++ sizeof (EExtensionClass), ++ (GBaseInitFunc) NULL, ++ (GBaseFinalizeFunc) NULL, ++ (GClassInitFunc) mail_config_web_view_class_init, ++ (GClassFinalizeFunc) NULL, ++ NULL, /* class_data */ ++ sizeof (EExtension), ++ 0, /* n_preallocs */ ++ (GInstanceInitFunc) NULL, ++ NULL /* value_table */ ++ }; ++ ++ g_type_module_register_type ( ++ type_module, E_TYPE_EXTENSION, ++ "EMailConfigWebView", &type_info, 0); ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/mail/e-mail-config-web-view.h evolution-2.30.2.new//modules/mail/e-mail-config-web-view.h +--- evolution-2.30.2//modules/mail/e-mail-config-web-view.h 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//modules/mail/e-mail-config-web-view.h 2010-06-22 13:37:26.936114032 +0200 +@@ -0,0 +1,30 @@ ++/* ++ * e-mail-config-web-view.h ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ */ ++ ++#ifndef E_MAIL_CONFIG_WEB_VIEW_H ++#define E_MAIL_CONFIG_WEB_VIEW_H ++ ++#include ++ ++G_BEGIN_DECLS ++ ++void e_mail_config_web_view_register_type (GTypeModule *type_module); ++ ++G_END_DECLS ++ ++#endif /* E_MAIL_CONFIG_WEB_VIEW_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/mail/e-mail-shell-backend.c evolution-2.30.2.new//modules/mail/e-mail-shell-backend.c +--- evolution-2.30.2//modules/mail/e-mail-shell-backend.c 2010-06-20 14:14:48.000000000 +0200 ++++ evolution-2.30.2.new//modules/mail/e-mail-shell-backend.c 2010-06-22 13:37:26.936114032 +0200 +@@ -409,32 +409,28 @@ + GtkWindow *window, + EShellBackend *shell_backend) + { +- EShellSettings *shell_settings; + static gboolean first_time = TRUE; + const gchar *backend_name; + +- shell_settings = e_shell_get_shell_settings (shell); +- + /* This applies to both the composer and signature editor. */ + if (GTKHTML_IS_EDITOR (window)) { ++ EShellSettings *shell_settings; + GList *spell_languages; +- +- e_binding_new ( +- shell_settings, "composer-inline-spelling", +- window, "inline-spelling"); +- +- e_binding_new ( +- shell_settings, "composer-magic-links", +- window, "magic-links"); +- +- e_binding_new ( +- shell_settings, "composer-magic-smileys", +- window, "magic-smileys"); ++ gboolean active = TRUE; + + spell_languages = e_load_spell_languages (); + gtkhtml_editor_set_spell_languages ( + GTKHTML_EDITOR (window), spell_languages); + g_list_free (spell_languages); ++ ++ shell_settings = e_shell_get_shell_settings (shell); ++ ++ /* Express mode does not honor this setting. */ ++ if (!e_shell_get_express_mode (shell)) ++ active = e_shell_settings_get_boolean ( ++ shell_settings, "composer-format-html"); ++ ++ gtkhtml_editor_set_html_mode (GTKHTML_EDITOR (window), active); + } + + if (E_IS_MSG_COMPOSER (window)) { +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/mail/e-mail-shell-content.c evolution-2.30.2.new//modules/mail/e-mail-shell-content.c +--- evolution-2.30.2//modules/mail/e-mail-shell-content.c 2010-06-20 14:14:48.000000000 +0200 ++++ evolution-2.30.2.new//modules/mail/e-mail-shell-content.c 2010-06-22 13:37:26.936114032 +0200 +@@ -608,7 +608,7 @@ + key = STATE_KEY_GROUP_BY_THREADS; + value = g_key_file_get_boolean (key_file, group_name, key, &error); + if (error != NULL) { +- value = FALSE; ++ value = TRUE; + g_clear_error (&error); + } + +@@ -868,6 +868,7 @@ + EShellSearchbar * + e_mail_shell_content_get_searchbar (EMailShellContent *mail_shell_content) + { ++ EShellView *shell_view; + EShellContent *shell_content; + GtkWidget *widget; + +@@ -875,7 +876,8 @@ + E_IS_MAIL_SHELL_CONTENT (mail_shell_content), NULL); + + shell_content = E_SHELL_CONTENT (mail_shell_content); +- widget = e_shell_content_get_searchbar (shell_content); ++ shell_view = e_shell_content_get_shell_view (shell_content); ++ widget = e_shell_view_get_searchbar (shell_view); + + return E_SHELL_SEARCHBAR (widget); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/mail/e-mail-shell-sidebar.c evolution-2.30.2.new//modules/mail/e-mail-shell-sidebar.c +--- evolution-2.30.2//modules/mail/e-mail-shell-sidebar.c 2010-06-20 14:14:49.000000000 +0200 ++++ evolution-2.30.2.new//modules/mail/e-mail-shell-sidebar.c 2010-06-22 13:37:26.936114032 +0200 +@@ -201,11 +201,12 @@ + #else + if (toplevel && GTK_WIDGET_REALIZED (toplevel)) + #endif +- monitor = gdk_screen_get_monitor_at_window (screen, gtk_widget_get_window (toplevel)); ++ monitor = gdk_screen_get_monitor_at_window ( ++ screen, gtk_widget_get_window (toplevel)); + else { + /* We don't know in which monitor the window manager +- * will put us. So we will just use the geometry of the +- * first monitor. ++ * will put us. So we will just use the geometry of ++ * the first monitor. + */ + monitor = 0; + } +@@ -221,18 +222,21 @@ + } + + static void +-mail_shell_sidebar_size_request (GtkWidget *widget, GtkRequisition *requisition) ++mail_shell_sidebar_size_request (GtkWidget *widget, ++ GtkRequisition *requisition) + { + /* We override the normal size-request handler so that we can +- * spit out a treeview with a suitable width. We measure the length +- * of a typical string and use that as the requisition's width. ++ * spit out a treeview with a suitable width. We measure the ++ * length of a typical string and use that as the requisition's ++ * width. + * +- * EMFolderTreeClass, our parent class, is based on GtkTreeView, which +- * doesn't really have a good way of figuring out a minimum width for +- * the tree. This is really GTK+'s fault at large, as it only has +- * "minimum size / allocated size", instead of "minimum size / preferred +- * size / allocated size". Hopefully the extended-layout branch of GTK+ +- * will get merged soon and then we can remove this crap. ++ * EMFolderTreeClass, our parent class, is based on GtkTreeView, ++ * which doesn't really have a good way of figuring out a minimum ++ * width for the tree. This is really GTK+'s fault at large, as ++ * it only has "minimum size / allocated size", instead of ++ * "minimum size / preferred size / allocated size". Hopefully ++ * the extended-layout branch of GTK+ will get merged soon and ++ * then we can remove this crap. + */ + + EMailShellSidebar *sidebar; +@@ -248,7 +252,8 @@ + GTK_WIDGET_CLASS (parent_class)->size_request (widget, requisition); + + /* This string is a mockup only; it doesn't need to be translated */ +- layout = gtk_widget_create_pango_layout (widget, "typical.account@mailservice.com"); ++ layout = gtk_widget_create_pango_layout ( ++ widget, "typical.account@mailservice.com"); + pango_layout_get_pixel_extents (layout, &ink_rect, NULL); + g_object_unref (layout); + +@@ -256,7 +261,8 @@ + + screen_width = guess_screen_width (sidebar); + +- border = 2 * style->xthickness + 4; /* Thickness of frame shadow plus some slack for padding */ ++ /* Thickness of frame shadow plus some slack for padding. */ ++ border = 2 * style->xthickness + 4; + sidebar_width = ink_rect.width + border; + sidebar_width = MIN (sidebar_width, screen_width / 4); + requisition->width = MAX (requisition->width, sidebar_width); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/mail/em-composer-prefs.c evolution-2.30.2.new//modules/mail/em-composer-prefs.c +--- evolution-2.30.2//modules/mail/em-composer-prefs.c 2010-06-20 14:14:48.000000000 +0200 ++++ evolution-2.30.2.new//modules/mail/em-composer-prefs.c 2010-06-22 13:37:26.936114032 +0200 +@@ -36,6 +36,7 @@ + + #include "em-composer-prefs.h" + #include "composer/e-msg-composer.h" ++#include "shell/e-shell-utils.h" + + #include + +@@ -398,10 +399,15 @@ + /* General tab */ + + /* Default Behavior */ ++ ++ /* Express mode does not honor this setting. */ + widget = e_builder_get_widget (prefs->builder, "chkSendHTML"); +- e_mutual_binding_new ( +- shell_settings, "composer-format-html", +- widget, "active"); ++ if (e_shell_get_express_mode (shell)) ++ gtk_widget_hide (widget); ++ else ++ e_mutual_binding_new ( ++ shell_settings, "composer-format-html", ++ widget, "active"); + + widget = e_builder_get_widget (prefs->builder, "chkPromptEmptySubject"); + e_mutual_binding_new ( +@@ -517,9 +523,11 @@ + widget, "editor-created", + G_CALLBACK (e_shell_watch_window), shell); + +- e_binding_new ( +- shell_settings, "composer-format-html", +- widget, "prefer-html"); ++ /* Express mode does not honor this setting. */ ++ if (!e_shell_get_express_mode (shell)) ++ e_binding_new ( ++ shell_settings, "composer-format-html", ++ widget, "prefer-html"); + + #ifndef G_OS_WIN32 + e_binding_new_with_negation ( +@@ -545,6 +553,14 @@ + signature_tree_view, "selected", + widget, "signature"); + ++ /* Sanitize the dialog for Express mode */ ++ e_shell_hide_widgets_for_express_mode (shell, prefs->builder, ++ "chkOutlookFilenames", ++ "vboxTopPosting", ++ "labelAlerts", ++ "chkPromptEmptySubject", ++ NULL); ++ + /* get our toplevel widget */ + target = em_config_target_new_prefs (ec, client); + e_config_set_target ((EConfig *)ec, (EConfigTarget *)target); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/mail/em-mailer-prefs.c evolution-2.30.2.new//modules/mail/em-mailer-prefs.c +--- evolution-2.30.2//modules/mail/em-mailer-prefs.c 2010-06-20 14:14:48.000000000 +0200 ++++ evolution-2.30.2.new//modules/mail/em-mailer-prefs.c 2010-06-22 13:37:26.936114032 +0200 +@@ -43,6 +43,7 @@ + #include "e-util/e-datetime-format.h" + #include "e-util/e-util-private.h" + #include "widgets/misc/e-charset-combo-box.h" ++#include "shell/e-shell-utils.h" + + #include "e-mail-label-manager.h" + #include "e-mail-reader-utils.h" +@@ -1207,6 +1208,15 @@ + g_signal_connect (G_OBJECT (prefs->junk_header_add), "clicked", G_CALLBACK (jh_add_cb), prefs); + g_signal_connect (G_OBJECT (prefs->junk_header_remove), "clicked", G_CALLBACK (jh_remove_cb), prefs); + ++ /* Sanitize the dialog for Express mode */ ++ e_shell_hide_widgets_for_express_mode (shell, prefs->builder, ++ "hboxReadTimeout", ++ "hboxMailSizeLimit", ++ "hboxShrinkAddresses", ++ "magic_spacebar_checkbox", ++ "hboxEnableSearchFolders", ++ NULL); ++ + /* get our toplevel widget */ + target = em_config_target_new_prefs(ec, prefs->gconf); + e_config_set_target((EConfig *)ec, (EConfigTarget *)target); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/mail/evolution-module-mail.c evolution-2.30.2.new//modules/mail/evolution-module-mail.c +--- evolution-2.30.2//modules/mail/evolution-module-mail.c 2010-06-20 14:14:49.000000000 +0200 ++++ evolution-2.30.2.new//modules/mail/evolution-module-mail.c 2010-06-22 13:37:26.940114032 +0200 +@@ -30,6 +30,9 @@ + #include "e-mail-shell-sidebar.h" + #include "e-mail-shell-view.h" + ++#include "e-mail-config-format-html.h" ++#include "e-mail-config-web-view.h" ++ + /* Module Entry Points */ + void e_module_load (GTypeModule *type_module); + void e_module_unload (GTypeModule *type_module); +@@ -50,6 +53,9 @@ + e_mail_shell_content_register_type (type_module); + e_mail_shell_sidebar_register_type (type_module); + e_mail_shell_view_register_type (type_module); ++ ++ e_mail_config_format_html_register_type (type_module); ++ e_mail_config_web_view_register_type (type_module); + } + + G_MODULE_EXPORT void +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/mail/Makefile.am evolution-2.30.2.new//modules/mail/Makefile.am +--- evolution-2.30.2//modules/mail/Makefile.am 2010-04-26 15:13:17.000000000 +0200 ++++ evolution-2.30.2.new//modules/mail/Makefile.am 2010-06-22 13:37:26.940114032 +0200 +@@ -17,8 +17,12 @@ + evolution-module-mail.c \ + e-mail-attachment-handler.c \ + e-mail-attachment-handler.h \ ++ e-mail-config-format-html.c \ ++ e-mail-config-format-html.h \ + e-mail-config-hook.c \ + e-mail-config-hook.h \ ++ e-mail-config-web-view.c \ ++ e-mail-config-web-view.h \ + e-mail-event-hook.c \ + e-mail-event-hook.h \ + e-mail-junk-hook.c \ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/Makefile.am evolution-2.30.2.new//modules/Makefile.am +--- evolution-2.30.2//modules/Makefile.am 2010-04-26 15:13:17.000000000 +0200 ++++ evolution-2.30.2.new//modules/Makefile.am 2010-06-22 13:37:26.940114032 +0200 +@@ -10,6 +10,10 @@ + NETWORK_MANAGER_DIR = network-manager + endif + ++if ENABLE_CONNMAN ++CONNMAN_DIR = connman ++endif ++ + if ENABLE_WINDOWS_SENS + WINDOWS_SENS_DIR = windows-sens + endif +@@ -22,6 +26,7 @@ + $(MONO_DIR) \ + $(PYTHON_DIR) \ + $(NETWORK_MANAGER_DIR) \ +- $(WINDOWS_SENS_DIR) ++ $(WINDOWS_SENS_DIR) \ ++ $(CONNMAN_DIR) + + -include $(top_srcdir)/git.mk +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//modules/network-manager/Makefile.am evolution-2.30.2.new//modules/network-manager/Makefile.am +--- evolution-2.30.2//modules/network-manager/Makefile.am 2010-04-26 15:13:17.000000000 +0200 ++++ evolution-2.30.2.new//modules/network-manager/Makefile.am 2010-06-22 13:37:26.940114032 +0200 +@@ -12,8 +12,8 @@ + evolution-network-manager.c + + libevolution_module_network_manager_la_LIBADD = \ +- $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/shell/libeshell.la \ + $(GNOME_PLATFORM_LIBS) \ + $(DBUS_GLIB_LIBS) + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//plugins/bbdb/gaimbuddies.c evolution-2.30.2.new//plugins/bbdb/gaimbuddies.c +--- evolution-2.30.2//plugins/bbdb/gaimbuddies.c 2010-06-20 14:14:43.000000000 +0200 ++++ evolution-2.30.2.new//plugins/bbdb/gaimbuddies.c 2010-06-22 13:37:26.940114032 +0200 +@@ -40,7 +40,6 @@ + #include + + #include +-#include + #include + + #include +@@ -75,15 +74,29 @@ + static gchar * + get_md5_as_string (const gchar *filename) + { +- guchar d[16]; ++ GMappedFile *mapped_file; ++ const gchar *contents; ++ gchar *digest; ++ gsize length; ++ GError *error = NULL; + + g_return_val_if_fail (filename != NULL, NULL); + +- md5_get_digest_from_file (filename, d); ++ mapped_file = g_mapped_file_new (filename, FALSE, &error); ++ if (mapped_file == NULL) { ++ g_warning ("%s", error->message); ++ return NULL; ++ } + +- return g_strdup_printf ("%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x", +- d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], +- d[8], d[9], d[10], d[11], d[12], d[13], d[14], d[15]); ++ contents = g_mapped_file_get_contents (mapped_file); ++ length = g_mapped_file_get_length (mapped_file); ++ ++ digest = g_compute_checksum_for_data ( ++ G_CHECKSUM_MD5, (guchar *) contents, length); ++ ++ g_mapped_file_unref (mapped_file); ++ ++ return digest; + } + + void +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//plugins/bogo-junk-plugin/bf-junk-filter.c evolution-2.30.2.new//plugins/bogo-junk-plugin/bf-junk-filter.c +--- evolution-2.30.2//plugins/bogo-junk-plugin/bf-junk-filter.c 2010-06-20 14:14:44.000000000 +0200 ++++ evolution-2.30.2.new//plugins/bogo-junk-plugin/bf-junk-filter.c 2010-06-22 13:37:26.940114032 +0200 +@@ -51,6 +51,7 @@ + #include + #include + #include ++#include "shell/e-shell.h" + + #ifndef BOGOFILTER_BINARY + #define BOGOFILTER_BINARY "/usr/bin/bogofilter" +@@ -388,6 +389,7 @@ + GtkWidget * + org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data) + { ++ EShell *shell; + GtkWidget *check; + guint i = ((GtkTable *)data->parent)->nrows; + +@@ -399,7 +401,13 @@ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), em_junk_bf_unicode); + g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (convert_unicode_cb), (gpointer) "/apps/evolution/mail/junk/bogofilter/unicode"); + gtk_table_attach((GtkTable *)data->parent, check, 0, 1, i, i+1, 0, 0, 0, 0); +- gtk_widget_show (check); +- return (GtkWidget *)check; ++ ++ shell = e_shell_get_default (); ++ if (e_shell_get_express_mode (shell)) ++ gtk_widget_hide (check); ++ else ++ gtk_widget_show (check); ++ ++ return check; + } + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//plugins/bogo-junk-plugin/Makefile.am evolution-2.30.2.new//plugins/bogo-junk-plugin/Makefile.am +--- evolution-2.30.2//plugins/bogo-junk-plugin/Makefile.am 2010-03-18 15:14:02.000000000 +0100 ++++ evolution-2.30.2.new//plugins/bogo-junk-plugin/Makefile.am 2010-06-22 13:38:32.444114032 +0200 +@@ -18,6 +18,7 @@ + liborg_gnome_bogo_junk_plugin_la_LIBADD = \ + $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/shell/libeshell.la \ + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_LIBS) + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//plugins/groupwise-features/share-folder-common.c evolution-2.30.2.new//plugins/groupwise-features/share-folder-common.c +--- evolution-2.30.2//plugins/groupwise-features/share-folder-common.c 2010-06-20 14:14:43.000000000 +0200 ++++ evolution-2.30.2.new//plugins/groupwise-features/share-folder-common.c 2010-06-22 13:37:26.940114032 +0200 +@@ -138,7 +138,7 @@ + static gchar * + create_folder_desc (struct _EMCreateFolder *m) + { +- return g_strdup_printf (_("Creating folder `%s'"), m->full_name); ++ return g_strdup_printf (_("Creating folder '%s'"), m->full_name); + } + + static void +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//plugins/profiler/profiler.c evolution-2.30.2.new//plugins/profiler/profiler.c +--- evolution-2.30.2//plugins/profiler/profiler.c 2010-06-20 14:14:42.000000000 +0200 ++++ evolution-2.30.2.new//plugins/profiler/profiler.c 2010-06-22 13:37:26.940114032 +0200 +@@ -45,7 +45,7 @@ + name = g_strdup_printf("eprofile.%ld", (glong) getpid()); + fp = fopen(name, "w"); + if (fp) +- fprintf(stderr, "Generating profiling data in `%s'\n", name); ++ fprintf(stderr, "Generating profiling data in '%s'\n", name); + g_free(name); + } + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//plugins/pst-import/pst-importer.c evolution-2.30.2.new//plugins/pst-import/pst-importer.c +--- evolution-2.30.2//plugins/pst-import/pst-importer.c 2010-06-20 14:14:41.000000000 +0200 ++++ evolution-2.30.2.new//plugins/pst-import/pst-importer.c 2010-06-22 13:37:26.940114032 +0200 +@@ -453,7 +453,7 @@ + filename = g_filename_from_uri (((EImportTargetURI *)m->target)->uri_src, NULL, NULL); + m->parent_uri = g_strdup (((EImportTargetURI *)m->target)->uri_dest); /* Destination folder, was set in our widget */ + +- camel_operation_start (NULL, _("Importing `%s'"), filename); ++ camel_operation_start (NULL, _("Importing '%s'"), filename); + + if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-mail"))) { + mail_tool_uri_to_folder (m->parent_uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex); +@@ -559,7 +559,7 @@ + + if (item->folder != NULL) { + pst_process_folder (m, item); +- camel_operation_start (NULL, _("Importing `%s'"), item->file_as.str); ++ camel_operation_start (NULL, _("Importing '%s'"), item->file_as.str); + } else { + if (m->folder_count && (m->current_item < m->folder_count)) { + camel_operation_progress (NULL, (m->current_item * 100) / m->folder_count); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//plugins/sa-junk-plugin/em-junk-filter.c evolution-2.30.2.new//plugins/sa-junk-plugin/em-junk-filter.c +--- evolution-2.30.2//plugins/sa-junk-plugin/em-junk-filter.c 2010-06-20 14:14:41.000000000 +0200 ++++ evolution-2.30.2.new//plugins/sa-junk-plugin/em-junk-filter.c 2010-06-22 13:37:26.940114032 +0200 +@@ -47,6 +47,7 @@ + + #include + #include "mail/em-config.h" ++#include "shell/e-shell.h" + + #include + +@@ -926,6 +927,7 @@ + GtkWidget * + org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data) + { ++ EShell *shell; + GtkWidget *check, *vbox, *label; + gchar *text = g_strdup_printf (" %s", _("This will make SpamAssassin more reliable, but slower")); + guint i = ((GtkTable *)data->parent)->nrows; +@@ -944,7 +946,13 @@ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), !em_junk_sa_local_only); + g_signal_connect (GTK_TOGGLE_BUTTON (check), "toggled", G_CALLBACK (use_remote_tests_cb), (gpointer) "/apps/evolution/mail/junk/sa/local_only"); + gtk_table_attach((GtkTable *)data->parent, vbox, 0, 1, i, i+1, 0, 0, 0, 0); +- gtk_widget_show_all (vbox); +- return (GtkWidget *)vbox; ++ ++ shell = e_shell_get_default (); ++ if (e_shell_get_express_mode (shell)) ++ gtk_widget_hide (vbox); ++ else ++ gtk_widget_show_all (vbox); ++ ++ return vbox; + } + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//plugins/sa-junk-plugin/Makefile.am evolution-2.30.2.new//plugins/sa-junk-plugin/Makefile.am +--- evolution-2.30.2//plugins/sa-junk-plugin/Makefile.am 2010-03-18 15:14:03.000000000 +0100 ++++ evolution-2.30.2.new//plugins/sa-junk-plugin/Makefile.am 2010-06-22 13:37:26.940114032 +0200 +@@ -18,6 +18,7 @@ + liborg_gnome_sa_junk_plugin_la_LIBADD = \ + $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/e-util/libeutil.la \ ++ $(top_builddir)/shell/libeshell.la \ + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_LIBS) + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//plugins/startup-wizard/startup-wizard.c evolution-2.30.2.new//plugins/startup-wizard/startup-wizard.c +--- evolution-2.30.2//plugins/startup-wizard/startup-wizard.c 2010-06-20 14:14:41.000000000 +0200 ++++ evolution-2.30.2.new//plugins/startup-wizard/startup-wizard.c 2010-06-22 13:37:26.940114032 +0200 +@@ -60,12 +60,21 @@ + void + startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target) + { ++ EShell *shell; + GtkWidget *start_page; + GtkLabel *start_page_label; + GConfClient *client; + GSList *accounts; + EConfig *config; + EMAccountEditor *emae; ++ const gchar *req_view; ++ ++ shell = e_shell_get_default (); ++ req_view = e_shell_get_startup_view (shell); ++ ++ if (req_view && strcmp (req_view, "mail") && e_shell_get_express_mode (shell)) { ++ return; ++ } + + client = gconf_client_get_default (); + accounts = gconf_client_get_list (client, "/apps/evolution/mail/accounts", GCONF_VALUE_STRING, NULL); +@@ -78,7 +87,7 @@ + return; + } + +- if (e_shell_get_express_mode (e_shell_get_default ())) { ++ if (e_shell_get_express_mode (shell)) { + start_page = (GtkWidget *)mail_capplet_shell_new (0, TRUE, TRUE); + gtk_widget_show (start_page); + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-backend.c evolution-2.30.2.new//shell/e-shell-backend.c +--- evolution-2.30.2//shell/e-shell-backend.c 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-backend.c 2010-06-22 13:37:26.944114032 +0200 +@@ -21,6 +21,12 @@ + * Copyright (C) 2009 Intel Corporation + */ + ++/** ++ * SECTION: e-shell-backend ++ * @short_description: dynamically loaded capabilities ++ * @include: shell/e-shell-backend.h ++ **/ ++ + #include "e-shell-backend.h" + + #include +@@ -37,8 +43,6 @@ + + struct _EShellBackendPrivate { + +- gpointer shell; /* weak pointer */ +- + /* We keep a reference to corresponding EShellView subclass + * since it keeps a reference back to us. This ensures the + * subclass is not finalized before we are, otherwise it +@@ -52,63 +56,38 @@ + }; + + enum { +- PROP_0, +- PROP_SHELL +-}; +- +-enum { + ACTIVITY_ADDED, + LAST_SIGNAL + }; + +-static gpointer parent_class; + static guint signals[LAST_SIGNAL]; + +-static void +-shell_backend_set_shell (EShellBackend *shell_backend, +- EShell *shell) +-{ +- g_return_if_fail (shell_backend->priv->shell == NULL); ++G_DEFINE_ABSTRACT_TYPE (EShellBackend, e_shell_backend, E_TYPE_EXTENSION) + +- shell_backend->priv->shell = shell; +- +- g_object_add_weak_pointer ( +- G_OBJECT (shell_backend), +- &shell_backend->priv->shell); +-} ++static GObject * ++shell_backend_constructor (GType type, ++ guint n_construct_properties, ++ GObjectConstructParam *construct_properties) ++{ ++ EShellBackendPrivate *priv; ++ EShellBackendClass *class; ++ EShellViewClass *shell_view_class; ++ GObject *object; + +-static void +-shell_backend_set_property (GObject *object, +- guint property_id, +- const GValue *value, +- GParamSpec *pspec) +-{ +- switch (property_id) { +- case PROP_SHELL: +- shell_backend_set_shell ( +- E_SHELL_BACKEND (object), +- g_value_get_object (value)); +- return; +- } ++ /* Chain up to parent's construct() method. */ ++ object = G_OBJECT_CLASS (e_shell_backend_parent_class)->constructor ( ++ type, n_construct_properties, construct_properties); + +- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +-} ++ class = E_SHELL_BACKEND_GET_CLASS (object); ++ priv = E_SHELL_BACKEND_GET_PRIVATE (object); + +-static void +-shell_backend_get_property (GObject *object, +- guint property_id, +- GValue *value, +- GParamSpec *pspec) +-{ +- switch (property_id) { +- case PROP_SHELL: +- g_value_set_object ( +- value, e_shell_backend_get_shell ( +- E_SHELL_BACKEND (object))); +- return; +- } ++ /* Install a reference to ourselves in the ++ * corresponding EShellViewClass structure. */ ++ shell_view_class = g_type_class_ref (class->shell_view_type); ++ shell_view_class->shell_backend = g_object_ref (object); ++ priv->shell_view_class = shell_view_class; + +- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); ++ return object; + } + + static void +@@ -118,19 +97,13 @@ + + priv = E_SHELL_BACKEND_GET_PRIVATE (object); + +- if (priv->shell != NULL) { +- g_object_remove_weak_pointer ( +- G_OBJECT (priv->shell), &priv->shell); +- priv->shell = NULL; +- } +- + if (priv->shell_view_class != NULL) { + g_type_class_unref (priv->shell_view_class); + priv->shell_view_class = NULL; + } + + /* Chain up to parent's dispose() method. */ +- G_OBJECT_CLASS (parent_class)->dispose (object); ++ G_OBJECT_CLASS (e_shell_backend_parent_class)->dispose (object); + } + + static void +@@ -144,7 +117,7 @@ + g_free (priv->data_dir); + + /* Chain up to parent's finalize() method. */ +- G_OBJECT_CLASS (parent_class)->finalize (object); ++ G_OBJECT_CLASS (e_shell_backend_parent_class)->finalize (object); + } + + static const gchar * +@@ -189,39 +162,25 @@ + } + + static void +-shell_backend_class_init (EShellBackendClass *class) ++e_shell_backend_class_init (EShellBackendClass *class) + { + GObjectClass *object_class; ++ EExtensionClass *extension_class; + +- parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (class, sizeof (EShellBackendPrivate)); + + object_class = G_OBJECT_CLASS (class); +- object_class->set_property = shell_backend_set_property; +- object_class->get_property = shell_backend_get_property; ++ object_class->constructor = shell_backend_constructor; + object_class->dispose = shell_backend_dispose; + object_class->finalize = shell_backend_finalize; + ++ extension_class = E_EXTENSION_CLASS (class); ++ extension_class->extensible_type = E_TYPE_SHELL; ++ + class->get_config_dir = shell_backend_get_config_dir; + class->get_data_dir = shell_backend_get_data_dir; + + /** +- * EShellBackend:shell +- * +- * The #EShell singleton. +- **/ +- g_object_class_install_property ( +- object_class, +- PROP_SHELL, +- g_param_spec_object ( +- "shell", +- _("Shell"), +- _("The EShell singleton"), +- E_TYPE_SHELL, +- G_PARAM_READWRITE | +- G_PARAM_CONSTRUCT_ONLY)); +- +- /** + * EShellBackend::activity-added + * @shell_backend: the #EShellBackend that emitted the signal + * @activity: an #EActivity +@@ -239,44 +198,9 @@ + } + + static void +-shell_backend_init (EShellBackend *shell_backend, +- EShellBackendClass *class) ++e_shell_backend_init (EShellBackend *shell_backend) + { +- EShellViewClass *shell_view_class; +- + shell_backend->priv = E_SHELL_BACKEND_GET_PRIVATE (shell_backend); +- +- /* Install a reference to ourselves in the corresponding +- * EShellViewClass structure, */ +- shell_view_class = g_type_class_ref (class->shell_view_type); +- shell_view_class->shell_backend = g_object_ref (shell_backend); +- shell_backend->priv->shell_view_class = shell_view_class; +-} +- +-GType +-e_shell_backend_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) { +- const GTypeInfo type_info = { +- sizeof (EShellBackendClass), +- (GBaseInitFunc) NULL, +- (GBaseFinalizeFunc) NULL, +- (GClassInitFunc) shell_backend_class_init, +- (GClassFinalizeFunc) NULL, +- NULL, /* class_data */ +- sizeof (EShellBackend), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) shell_backend_init, +- NULL /* value_table */ +- }; +- +- type = g_type_register_static ( +- G_TYPE_OBJECT, "EShellBackend", &type_info, 0); +- } +- +- return type; + } + + /** +@@ -358,9 +282,13 @@ + EShell * + e_shell_backend_get_shell (EShellBackend *shell_backend) + { ++ EExtensible *extensible; ++ + g_return_val_if_fail (E_IS_SHELL_BACKEND (shell_backend), NULL); + +- return E_SHELL (shell_backend->priv->shell); ++ extensible = e_extension_get_extensible (E_EXTENSION (shell_backend)); ++ ++ return E_SHELL (extensible); + } + + /** +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-backend.h evolution-2.30.2.new//shell/e-shell-backend.h +--- evolution-2.30.2//shell/e-shell-backend.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-backend.h 2010-06-22 13:37:26.944114032 +0200 +@@ -19,17 +19,12 @@ + * + */ + +-/** +- * SECTION: e-shell-backend +- * @short_description: dynamically loaded capabilities +- * @include: shell/e-shell-backend.h +- **/ +- + #ifndef E_SHELL_BACKEND_H + #define E_SHELL_BACKEND_H + + #include + #include ++#include + + /* Standard GObject macros */ + #define E_TYPE_SHELL_BACKEND \ +@@ -66,7 +61,7 @@ + * functions below. + **/ + struct _EShellBackend { +- GObject parent; ++ EExtension parent; + EShellBackendPrivate *priv; + }; + +@@ -100,7 +95,7 @@ + * #EShellBackendClass contains a number of important settings for subclasses. + **/ + struct _EShellBackendClass { +- GObjectClass parent_class; ++ EExtensionClass parent_class; + + GType shell_view_type; + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell.c evolution-2.30.2.new//shell/e-shell.c +--- evolution-2.30.2//shell/e-shell.c 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell.c 2010-06-22 13:37:26.944114032 +0200 +@@ -19,6 +19,12 @@ + * + */ + ++/** ++ * SECTION: e-shell ++ * @short_description: the backbone of Evolution ++ * @include: shell/e-shell.h ++ **/ ++ + #include "e-shell.h" + + #include +@@ -46,7 +52,7 @@ + GtkWidget *preferences_window; + + /* Shell Backends */ +- GList *loaded_backends; ++ GList *loaded_backends; /* not referenced */ + GHashTable *backends_by_name; + GHashTable *backends_by_scheme; + +@@ -56,17 +62,23 @@ + gchar *geometry; + gchar *module_directory; + ++ gchar *startup_view; ++ + guint auto_reconnect : 1; + guint network_available : 1; + guint online : 1; + guint quit_cancelled : 1; + guint safe_mode : 1; + guint express_mode : 1; ++ guint meego_mode : 1; ++ guint small_screen_mode : 1; + }; + + enum { + PROP_0, + PROP_EXPRESS_MODE, ++ PROP_MEEGO_MODE, ++ PROP_SMALL_SCREEN_MODE, + PROP_GEOMETRY, + PROP_MODULE_DIRECTORY, + PROP_NETWORK_AVAILABLE, +@@ -401,23 +413,14 @@ + } + + static void +-shell_add_backend (GType type, +- EShell *shell) ++shell_process_backend (EShellBackend *shell_backend, ++ EShell *shell) + { + EShellBackendClass *class; +- EShellBackend *shell_backend; + GHashTable *backends_by_name; + GHashTable *backends_by_scheme; + const gchar *string; + +- shell_backend = g_object_new (type, "shell", shell, NULL); +- +- shell->priv->loaded_backends = g_list_insert_sorted ( +- shell->priv->loaded_backends, shell_backend, +- (GCompareFunc) e_shell_backend_compare); +- +- /* Bookkeeping */ +- + class = E_SHELL_BACKEND_GET_CLASS (shell_backend); + backends_by_name = shell->priv->backends_by_name; + backends_by_scheme = shell->priv->backends_by_scheme; +@@ -474,6 +477,18 @@ + } + + static void ++shell_set_meego_mode (EShell *shell, gboolean is_meego) ++{ ++ shell->priv->meego_mode = is_meego; ++} ++ ++static void ++shell_set_small_screen_mode (EShell *shell, gboolean small_screen) ++{ ++ shell->priv->small_screen_mode = small_screen; ++} ++ ++static void + shell_set_geometry (EShell *shell, + const gchar *geometry) + { +@@ -504,6 +519,18 @@ + g_value_get_boolean (value)); + return; + ++ case PROP_MEEGO_MODE: ++ shell_set_meego_mode ( ++ E_SHELL (object), ++ g_value_get_boolean (value)); ++ return; ++ ++ case PROP_SMALL_SCREEN_MODE: ++ shell_set_small_screen_mode ( ++ E_SHELL (object), ++ g_value_get_boolean (value)); ++ return; ++ + case PROP_GEOMETRY: + shell_set_geometry ( + E_SHELL (object), +@@ -545,6 +572,18 @@ + E_SHELL (object))); + return; + ++ case PROP_MEEGO_MODE: ++ g_value_set_boolean ( ++ value, e_shell_get_meego_mode ( ++ E_SHELL (object))); ++ return; ++ ++ case PROP_SMALL_SCREEN_MODE: ++ g_value_set_boolean ( ++ value, e_shell_get_small_screen_mode ( ++ E_SHELL (object))); ++ return; ++ + case PROP_MODULE_DIRECTORY: + g_value_set_string ( + value, e_shell_get_module_directory ( +@@ -580,6 +619,11 @@ + + priv = E_SHELL_GET_PRIVATE (object); + ++ if (priv->startup_view != NULL) { ++ g_free (priv->startup_view); ++ priv->startup_view = NULL; ++ } ++ + if (priv->settings != NULL) { + g_object_unref (priv->settings); + priv->settings = NULL; +@@ -595,10 +639,6 @@ + priv->preferences_window = NULL; + } + +- g_list_foreach (priv->loaded_backends, (GFunc) g_object_unref, NULL); +- g_list_free (priv->loaded_backends); +- priv->loaded_backends = NULL; +- + if (priv->preparing_for_line_change != NULL) { + g_object_remove_weak_pointer ( + G_OBJECT (priv->preparing_for_line_change), +@@ -623,6 +663,8 @@ + if (!unique_app_is_running (UNIQUE_APP (object))) + e_file_lock_destroy (); + ++ g_list_free (priv->loaded_backends); ++ + g_free (priv->geometry); + g_free (priv->module_directory); + +@@ -634,6 +676,7 @@ + shell_constructed (GObject *object) + { + EShellPrivate *priv; ++ GList *list; + + priv = E_SHELL_GET_PRIVATE (object); + +@@ -653,11 +696,13 @@ + + shell_load_modules (E_SHELL (object)); + +- e_type_traverse ( +- E_TYPE_SHELL_BACKEND, (ETypeFunc) +- shell_add_backend, object); +- +- e_extensible_load_extensions (E_EXTENSIBLE (object)); ++ /* Process shell backends. */ ++ list = g_list_sort ( ++ e_extensible_list_extensions ( ++ E_EXTENSIBLE (object), E_TYPE_SHELL_BACKEND), ++ (GCompareFunc) e_shell_backend_compare); ++ g_list_foreach (list, (GFunc) shell_process_backend, object); ++ priv->loaded_backends = list; + } + + static UniqueResponse +@@ -791,6 +836,40 @@ + G_PARAM_CONSTRUCT_ONLY)); + + /** ++ * EShell:meego ++ * ++ * Are we running under meego - if so, adapt ourselves ++ * to fit in well with their theming. ++ **/ ++ g_object_class_install_property ( ++ object_class, ++ PROP_MEEGO_MODE, ++ g_param_spec_boolean ( ++ "meego-mode", ++ "Meego Mode", ++ "Whether meego mode is enabled", ++ FALSE, ++ G_PARAM_READWRITE | ++ G_PARAM_CONSTRUCT_ONLY)); ++ ++ /** ++ * EShell:small-screen ++ * ++ * Are we running with a small (1024x600) screen - if so, start ++ * throwing the babies overboard to fit onto that screen size. ++ **/ ++ g_object_class_install_property ( ++ object_class, ++ PROP_SMALL_SCREEN_MODE, ++ g_param_spec_boolean ( ++ "small-screen-mode", ++ "Small Screen Mode", ++ "Whether we run on a rather small screen", ++ FALSE, ++ G_PARAM_READWRITE | ++ G_PARAM_CONSTRUCT_ONLY)); ++ ++ /** + * EShell:geometry + * + * User-specified initial window geometry string to apply +@@ -1081,6 +1160,8 @@ + shell->priv->backends_by_scheme = backends_by_scheme; + shell->priv->safe_mode = e_file_lock_exists (); + ++ shell->priv->startup_view = NULL; ++ + g_object_ref_sink (shell->priv->preferences_window); + + /* Add our icon directory to the theme's search path +@@ -1582,6 +1663,38 @@ + } + + /** ++ * e_shell_get_meego_mode: ++ * @shell: an #EShell ++ * ++ * Returns %TRUE if Evolution is in MeeGo mode. ++ * ++ * Returns: %TRUE if Evolution is in MeeGo mode ++ **/ ++gboolean ++e_shell_get_meego_mode (EShell *shell) ++{ ++ g_return_val_if_fail (E_IS_SHELL (shell), FALSE); ++ ++ return shell->priv->meego_mode; ++} ++ ++/** ++ * e_shell_get_small_screen_mode: ++ * @shell: an #EShell ++ * ++ * Returns %TRUE if Evolution is in small (netbook) screen mode. ++ * ++ * Returns: %TRUE if Evolution is in small screen mode ++ **/ ++gboolean ++e_shell_get_small_screen_mode (EShell *shell) ++{ ++ g_return_val_if_fail (E_IS_SHELL (shell), FALSE); ++ ++ return shell->priv->small_screen_mode; ++} ++ ++/** + * e_shell_get_module_directory: + * @shell: an #EShell + * +@@ -1799,3 +1912,49 @@ + + g_signal_stop_emission (shell, signals[QUIT_REQUESTED], 0); + } ++ ++/** ++ * e_shell_adapt_window_size: ++ * @shell: an #EShell ++ * @window: a #GtkWindow to adapt to full-screen ++ * ++ * This is used to adapt to window's size to be optimal for ++ * the platform. The shell settings are used to determine if ++ * a window should be set to full screen etc. ++ * ++ * This method is best called when the widget is realized on ++ * a given screen. ++ **/ ++void ++e_shell_adapt_window_size (EShell *shell, ++ GtkWindow *window) ++{ ++ gint monitor; ++ GdkScreen *scr; ++ GdkRectangle rect; ++ ++ if (!e_shell_get_meego_mode (shell) || ++ !e_shell_get_small_screen_mode (shell)) ++ return; ++ ++ scr = gdk_screen_get_default (); ++ monitor = gdk_screen_get_monitor_at_window (scr, GTK_WIDGET (window)->window); ++ gdk_screen_get_monitor_geometry (scr, monitor, &rect); ++ ++ gtk_window_set_default_size (window, rect.width, rect.height); ++ gtk_window_set_decorated (window, FALSE); ++ gtk_window_maximize (window); ++} ++ ++void ++e_shell_set_startup_view (EShell *shell, ++ const gchar *view) ++{ ++ shell->priv->startup_view = g_strdup(view); ++} ++ ++const gchar * ++e_shell_get_startup_view (EShell *shell) ++{ ++ return shell->priv->startup_view; ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-content.c evolution-2.30.2.new//shell/e-shell-content.c +--- evolution-2.30.2//shell/e-shell-content.c 2010-06-20 14:14:29.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-content.c 2010-06-22 13:37:26.944114032 +0200 +@@ -19,11 +19,18 @@ + * + */ + ++/** ++ * SECTION: e-shell-content ++ * @short_description: the right side of the main window ++ * @include: shell/e-shell-content.h ++ **/ ++ + #include "e-shell-content.h" + + #include + + #include "e-util/e-binding.h" ++#include "e-util/e-extensible.h" + #include "e-util/e-util.h" + #include "e-util/e-alert-dialog.h" + #include "filter/e-rule-editor.h" +@@ -41,9 +48,9 @@ + + struct _EShellContentPrivate { + +- gpointer shell_view; /* weak pointer */ ++ gpointer shell_view; /* weak pointer */ + +- GtkWidget *searchbar; ++ GtkWidget *searchbar; /* not referenced */ + + /* Custom search rules. */ + gchar *user_filename; +@@ -54,7 +61,9 @@ + PROP_SHELL_VIEW + }; + +-static gpointer parent_class; ++G_DEFINE_TYPE_WITH_CODE ( ++ EShellContent, e_shell_content, GTK_TYPE_BIN, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)); + + static void + shell_content_dialog_rule_changed (GtkWidget *dialog, +@@ -131,17 +140,15 @@ + } + + /* Chain up to parent's dispose() method. */ +- G_OBJECT_CLASS (parent_class)->dispose (object); ++ G_OBJECT_CLASS (e_shell_content_parent_class)->dispose (object); + } + + static void + shell_content_constructed (GObject *object) + { +- EShellContentClass *class; + EShellContent *shell_content; + EShellBackend *shell_backend; + EShellView *shell_view; +- GtkWidget *widget; + const gchar *data_dir; + + shell_content = E_SHELL_CONTENT (object); +@@ -156,37 +163,7 @@ + shell_content->priv->user_filename = + g_build_filename (data_dir, "searches.xml", NULL); + +- class = E_SHELL_CONTENT_GET_CLASS (shell_content); +- if (class->construct_searchbar != NULL) +- widget = class->construct_searchbar (shell_content); +- else +- widget = NULL; +- if (widget != NULL) { +- gtk_widget_set_parent (widget, GTK_WIDGET (shell_content)); +- shell_content->priv->searchbar = g_object_ref (widget); +- gtk_widget_show (widget); +- } +-} +- +-static void +-shell_content_destroy (GtkObject *gtk_object) +-{ +- EShellContentPrivate *priv; +- +- priv = E_SHELL_CONTENT_GET_PRIVATE (gtk_object); +- +- /* Unparent the widget before destroying it to avoid +- * writing a custom GtkContainer::remove() method. */ +- +- if (priv->searchbar != NULL) { +- gtk_widget_unparent (priv->searchbar); +- gtk_widget_destroy (priv->searchbar); +- g_object_unref (priv->searchbar); +- priv->searchbar = NULL; +- } +- +- /* Chain up to parent's destroy() method. */ +- GTK_OBJECT_CLASS (parent_class)->destroy (gtk_object); ++ e_extensible_load_extensions (E_EXTENSIBLE (object)); + } + + static void +@@ -251,6 +228,26 @@ + } + + static void ++shell_content_remove (GtkContainer *container, ++ GtkWidget *widget) ++{ ++ GtkContainerClass *container_class; ++ EShellContentPrivate *priv; ++ ++ priv = E_SHELL_CONTENT_GET_PRIVATE (container); ++ ++ if (widget == priv->searchbar) { ++ gtk_widget_unparent (priv->searchbar); ++ priv->searchbar = NULL; ++ return; ++ } ++ ++ /* Chain up to parent's remove() method. */ ++ container_class = GTK_CONTAINER_CLASS (e_shell_content_parent_class); ++ container_class->remove (container, widget); ++} ++ ++static void + shell_content_forall (GtkContainer *container, + gboolean include_internals, + GtkCallback callback, +@@ -265,51 +262,17 @@ + callback (priv->searchbar, callback_data); + + /* Chain up to parent's forall() method. */ +- GTK_CONTAINER_CLASS (parent_class)->forall ( ++ GTK_CONTAINER_CLASS (e_shell_content_parent_class)->forall ( + container, include_internals, callback, callback_data); + } + +-static gchar * +-shell_content_get_search_name (EShellContent *shell_content) +-{ +- EShellSearchbar *searchbar; +- EShellView *shell_view; +- EFilterRule *rule; +- const gchar *search_text; +- +- shell_view = e_shell_content_get_shell_view (shell_content); +- +- rule = e_shell_view_get_search_rule (shell_view); +- g_return_val_if_fail (E_IS_FILTER_RULE (rule), NULL); +- +- searchbar = E_SHELL_SEARCHBAR (shell_content->priv->searchbar); +- search_text = e_shell_searchbar_get_search_text (searchbar); +- +- if (search_text == NULL || *search_text == '\0') +- search_text = "''"; +- +- return g_strdup_printf ("%s %s", rule->name, search_text); +-} +- +-static GtkWidget * +-shell_content_construct_searchbar (EShellContent *shell_content) +-{ +- EShellView *shell_view; +- +- shell_view = e_shell_content_get_shell_view (shell_content); +- +- return e_shell_searchbar_new (shell_view); +-} +- + static void +-shell_content_class_init (EShellContentClass *class) ++e_shell_content_class_init (EShellContentClass *class) + { + GObjectClass *object_class; +- GtkObjectClass *gtk_object_class; + GtkWidgetClass *widget_class; + GtkContainerClass *container_class; + +- parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (class, sizeof (EShellContentPrivate)); + + object_class = G_OBJECT_CLASS (class); +@@ -318,19 +281,14 @@ + object_class->dispose = shell_content_dispose; + object_class->constructed = shell_content_constructed; + +- gtk_object_class = GTK_OBJECT_CLASS (class); +- gtk_object_class->destroy = shell_content_destroy; +- + widget_class = GTK_WIDGET_CLASS (class); + widget_class->size_request = shell_content_size_request; + widget_class->size_allocate = shell_content_size_allocate; + + container_class = GTK_CONTAINER_CLASS (class); ++ container_class->remove = shell_content_remove; + container_class->forall = shell_content_forall; + +- class->get_search_name = shell_content_get_search_name; +- class->construct_searchbar = shell_content_construct_searchbar; +- + /** + * EShellContent:shell-view + * +@@ -349,39 +307,13 @@ + } + + static void +-shell_content_init (EShellContent *shell_content) ++e_shell_content_init (EShellContent *shell_content) + { + shell_content->priv = E_SHELL_CONTENT_GET_PRIVATE (shell_content); + + GTK_WIDGET_SET_FLAGS (shell_content, GTK_NO_WINDOW); + } + +-GType +-e_shell_content_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) { +- static const GTypeInfo type_info = { +- sizeof (EShellContentClass), +- (GBaseInitFunc) NULL, +- (GBaseFinalizeFunc) NULL, +- (GClassInitFunc) shell_content_class_init, +- (GClassFinalizeFunc) NULL, +- NULL, /* class_data */ +- sizeof (EShellContent), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) shell_content_init, +- NULL /* value_table */ +- }; +- +- type = g_type_register_static ( +- GTK_TYPE_BIN, "EShellContent", &type_info, 0); +- } +- +- return type; +-} +- + /** + * e_shell_content_new: + * @shell_view: an #EShellView +@@ -400,21 +332,34 @@ + } + + /** +- * e_shell_content_get_searchbar: ++ * e_shell_content_set_searchbar: + * @shell_content: an #EShellContent ++ * @searchbar: a #GtkWidget, or %NULL + * +- * Returns the search bar widget returned by the +- * construct_searchbar method in +- * #EShellContentClass. +- * +- * Returns: the search bar widget ++ * Packs @searchbar at the top of @shell_content. + **/ +-GtkWidget * +-e_shell_content_get_searchbar (EShellContent *shell_content) ++void ++e_shell_content_set_searchbar (EShellContent *shell_content, ++ GtkWidget *searchbar) + { +- g_return_val_if_fail (E_IS_SHELL_CONTENT (shell_content), NULL); ++ g_return_if_fail (E_IS_SHELL_CONTENT (shell_content)); ++ ++ if (searchbar != NULL) { ++ g_return_if_fail (GTK_IS_WIDGET (searchbar)); ++ g_object_ref_sink (searchbar); ++ } + +- return shell_content->priv->searchbar; ++ if (shell_content->priv->searchbar != NULL) ++ gtk_container_remove ( ++ GTK_CONTAINER (shell_content), ++ shell_content->priv->searchbar); ++ ++ shell_content->priv->searchbar = searchbar; ++ ++ if (searchbar != NULL) ++ gtk_widget_set_parent (searchbar, GTK_WIDGET (shell_content)); ++ ++ gtk_widget_queue_resize (GTK_WIDGET (shell_content)); + } + + /** +@@ -459,29 +404,6 @@ + return E_SHELL_VIEW (shell_content->priv->shell_view); + } + +-/** +- * e_shell_content_get_search_name: +- * @shell_content: an #EShellContent +- * +- * Returns a newly-allocated string containing a suitable name for the +- * current search criteria. This is used as the suggested name in the +- * Save Search dialog. Free the returned string with g_free(). +- * +- * Returns: a name for the current search criteria +- **/ +-gchar * +-e_shell_content_get_search_name (EShellContent *shell_content) +-{ +- EShellContentClass *class; +- +- g_return_val_if_fail (E_IS_SHELL_CONTENT (shell_content), NULL); +- +- class = E_SHELL_CONTENT_GET_CLASS (shell_content); +- g_return_val_if_fail (class->get_search_name != NULL, NULL); +- +- return class->get_search_name (shell_content); +-} +- + void + e_shell_content_run_advanced_search_dialog (EShellContent *shell_content) + { +@@ -607,7 +529,7 @@ + g_return_if_fail (E_IS_FILTER_RULE (rule)); + rule = e_filter_rule_clone (rule); + +- search_name = e_shell_content_get_search_name (shell_content); ++ search_name = e_shell_view_get_search_name (shell_view); + e_filter_rule_set_name (rule, search_name); + g_free (search_name); + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-content.h evolution-2.30.2.new//shell/e-shell-content.h +--- evolution-2.30.2//shell/e-shell-content.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-content.h 2010-06-22 13:37:26.944114032 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-shell-content +- * @short_description: the right side of the main window +- * @include: shell/e-shell-content.h +- **/ +- + #ifndef E_SHELL_CONTENT_H + #define E_SHELL_CONTENT_H + +@@ -74,22 +68,18 @@ + + /* Methods */ + guint32 (*check_state) (EShellContent *shell_content); +- gchar * (*get_search_name) (EShellContent *shell_content); +- +- /* This is a protected method. Not for public use. */ +- GtkWidget * (*construct_searchbar) (EShellContent *shell_content); + }; + + GType e_shell_content_get_type (void); + GtkWidget * e_shell_content_new (struct _EShellView *shell_view); +-GtkWidget * e_shell_content_get_searchbar (EShellContent *shell_content); ++void e_shell_content_set_searchbar (EShellContent *shell_content, ++ GtkWidget *searchbar); + guint32 e_shell_content_check_state (EShellContent *shell_content); + struct _EShellView * + e_shell_content_get_shell_view (EShellContent *shell_content); + const gchar * e_shell_content_get_view_id (EShellContent *shell_content); + void e_shell_content_set_view_id (EShellContent *shell_content, + const gchar *view_id); +-gchar * e_shell_content_get_search_name (EShellContent *shell_content); + void e_shell_content_run_advanced_search_dialog + (EShellContent *shell_content); + void e_shell_content_run_edit_searches_dialog +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell.h evolution-2.30.2.new//shell/e-shell.h +--- evolution-2.30.2//shell/e-shell.h 2010-06-20 14:14:29.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell.h 2010-06-22 13:37:26.944114032 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-shell +- * @short_description: the backbone of Evolution +- * @include: shell/e-shell.h +- **/ +- + #ifndef E_SHELL_H + #define E_SHELL_H + +@@ -114,7 +108,9 @@ + GtkWindow * e_shell_get_active_window (EShell *shell); + void e_shell_send_receive (EShell *shell, + GtkWindow *parent); ++gboolean e_shell_get_meego_mode (EShell *shell); + gboolean e_shell_get_express_mode (EShell *shell); ++gboolean e_shell_get_small_screen_mode (EShell *shell); + const gchar * e_shell_get_module_directory (EShell *shell); + gboolean e_shell_get_network_available (EShell *shell); + void e_shell_set_network_available (EShell *shell, +@@ -129,6 +125,12 @@ + gboolean e_shell_quit (EShell *shell); + void e_shell_cancel_quit (EShell *shell); + ++void e_shell_adapt_window_size (EShell *shell, ++ GtkWindow *window); ++void e_shell_set_startup_view (EShell *shell, ++ const gchar *view); ++const gchar * e_shell_get_startup_view (EShell *shell); ++ + G_END_DECLS + + #endif /* E_SHELL_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-meego.c evolution-2.30.2.new//shell/e-shell-meego.c +--- evolution-2.30.2//shell/e-shell-meego.c 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//shell/e-shell-meego.c 2010-06-22 13:37:26.944114032 +0200 +@@ -0,0 +1,157 @@ ++/* ++ * e-shell-meego.c ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) ++ * ++ * Inspired by mx's mx-application.c by ++ * Thomas Wood , ++ * Chris Lord ++ */ ++ ++#include ++#include ++ ++#ifndef G_OS_WIN32 ++#include ++#include ++#endif ++ ++#ifdef G_OS_WIN32 ++void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen) ++{ ++ *is_meego = *small_screen = FALSE; ++} ++#else ++void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen) ++{ ++ Window *wm_window_v = NULL; ++ guchar *moblin_string = NULL; ++ GModule *module = NULL; ++ /* ++ * Wow - this is unpleasant, but it is hard to link directly ++ * to the X libraries, and we have to use XGetWindowProperty ++ * to get to the (mind-mashed) 'supporting' window. ++ */ ++ struct { ++ gint (*XFree) (gpointer); ++ gint (*XGetWindowProperty) (Display*, XID, Atom, long, long, Bool, ++ Atom, Atom *, gint *, unsigned long*, ++ unsigned long*, guchar **); ++ } fns = { 0, 0 }; ++ ++ *is_meego = *small_screen = FALSE; ++ ++ moblin_string = (guchar *)g_getenv ("EVO_MEEGO"); ++ if (!moblin_string) { ++ GdkScreen *screen; ++ GdkDisplay *display; ++ GdkAtom wm_win, mob_atom; ++ Atom dummy_t; ++ unsigned long dummy_l; ++ gint dummy_i; ++ ++ if (!gdk_display_get_default ()) ++ return; ++ ++ wm_win = gdk_atom_intern ("_NET_SUPPORTING_WM_CHECK", TRUE); ++ mob_atom = gdk_atom_intern ("_MOBLIN", TRUE); ++ if (!wm_win || !mob_atom) ++ return; ++ ++ module = g_module_open (NULL, 0); ++ if (!module) ++ return; ++ g_module_symbol (module, "XFree", (gpointer) &fns.XFree); ++ g_module_symbol (module, "XGetWindowProperty", ++ (gpointer) &fns.XGetWindowProperty); ++ if (!fns.XFree || !fns.XGetWindowProperty) { ++ fprintf (stderr, "defective X server\n"); ++ goto exit; ++ } ++ ++ display = gdk_display_get_default (); ++ screen = gdk_display_get_default_screen (gdk_display_get_default()); ++ ++ gdk_error_trap_push (); ++ ++ /* get the window manager's supporting window */ ++ fns.XGetWindowProperty (gdk_x11_display_get_xdisplay (display), ++ GDK_WINDOW_XID (gdk_screen_get_root_window (screen)), ++ gdk_x11_atom_to_xatom_for_display (display, wm_win), ++ 0, 1, False, XA_WINDOW, &dummy_t, &dummy_i, ++ &dummy_l, &dummy_l, (guchar **)(&wm_window_v)); ++ ++ /* get the '_Moblin' setting */ ++ if (wm_window_v && (*wm_window_v != None)) ++ fns.XGetWindowProperty (gdk_x11_display_get_xdisplay (display), *wm_window_v, ++ gdk_x11_atom_to_xatom_for_display (display, mob_atom), ++ 0, 8192, False, XA_STRING, ++ &dummy_t, &dummy_i, &dummy_l, &dummy_l, ++ &moblin_string); ++ ++ gdk_error_trap_pop (); ++ } ++ ++ if (moblin_string) { ++ gint i; ++ gchar **props; ++ ++ g_warning ("prop '%s'", moblin_string); ++ ++ /* use meego theming tweaks */ ++ *is_meego = TRUE; ++ ++ props = g_strsplit ((gchar *)moblin_string, ":", -1); ++ for (i = 0; props && props[i]; i++) { ++ gchar **pair = g_strsplit (props[i], "=", 2); ++ ++ g_warning ("pair '%s'='%s'", pair ? pair[0] : "", ++ pair && pair[0] ? pair[1] : ""); ++ ++ /* Hunt for session-type=small-screen */ ++ if (pair && pair[0] && !g_ascii_strcasecmp (pair[0], "session-type")) ++ *small_screen = !g_ascii_strcasecmp (pair[1], "small-screen"); ++ g_strfreev (pair); ++ } ++ g_strfreev (props); ++ if (fns.XFree) ++ fns.XFree (moblin_string); ++ } ++ ++ exit: ++ if (wm_window_v) ++ fns.XFree (wm_window_v); ++ if (module) ++ g_module_close (module); ++} ++#endif ++ ++#ifdef TEST_APP ++/* gcc -g -O0 -Wall -I. -DTEST_APP `pkg-config --cflags --libs gtk+-2.0` e-shell-meego.c && ./a.out */ ++#include ++ ++gint main (gint argc, gchar **argv) ++{ ++ gboolean is_meego, small_screen; ++ ++ gtk_init (&argc, &argv); ++ ++ e_shell_detect_meego (&is_meego, &small_screen); ++ fprintf (stderr, "Meego ? %d small ? %d\n", is_meego, small_screen); ++ ++ return 0; ++} ++#endif +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-meego.h evolution-2.30.2.new//shell/e-shell-meego.h +--- evolution-2.30.2//shell/e-shell-meego.h 1970-01-01 01:00:00.000000000 +0100 ++++ evolution-2.30.2.new//shell/e-shell-meego.h 2010-06-22 13:37:26.944114032 +0200 +@@ -0,0 +1,24 @@ ++/* ++ * e-shell-meego.h ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) version 3. ++ * ++ * 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 ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with the program; if not, see ++ * ++ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) ++ */ ++#ifndef E_SHELL_MEEGO_H ++#define E_SHELL_MEEGO_H ++ ++extern void e_shell_detect_meego (gboolean *is_meego, gboolean *small_screen); ++ ++#endif /* E_SHELL_MEEGO_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-searchbar.c evolution-2.30.2.new//shell/e-shell-searchbar.c +--- evolution-2.30.2//shell/e-shell-searchbar.c 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-searchbar.c 2010-06-22 13:37:26.948114032 +0200 +@@ -19,6 +19,12 @@ + * + */ + ++/** ++ * SECTION: e-shell-searchbar ++ * @short_description: quick search interface ++ * @include: shell/e-shell-searchbar.h ++ **/ ++ + #include "e-shell-searchbar.h" + + #include +@@ -26,6 +32,7 @@ + + #include "e-util/e-util.h" + #include "e-util/e-binding.h" ++#include "e-util/e-extensible.h" + #include "widgets/misc/e-action-combo-box.h" + #include "widgets/misc/e-hinted-entry.h" + +@@ -60,8 +67,9 @@ + /* State Key File */ + gchar *state_group; + ++ guint express_mode : 1; + guint filter_visible : 1; +- guint label_visible : 1; ++ guint labels_visible : 1; + guint search_visible : 1; + guint scope_visible : 1; + guint state_dirty : 1; +@@ -69,9 +77,10 @@ + + enum { + PROP_0, ++ PROP_EXPRESS_MODE, + PROP_FILTER_COMBO_BOX, + PROP_FILTER_VISIBLE, +- PROP_LABEL_VISIBLE, ++ PROP_LABELS_VISIBLE, + PROP_SEARCH_HINT, + PROP_SEARCH_OPTION, + PROP_SEARCH_TEXT, +@@ -82,7 +91,9 @@ + PROP_STATE_GROUP + }; + +-static gpointer parent_class; ++G_DEFINE_TYPE_WITH_CODE ( ++ EShellSearchbar, e_shell_searchbar, GTK_TYPE_BOX, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) + + static void + shell_searchbar_save_search_filter (EShellSearchbar *searchbar) +@@ -463,14 +474,20 @@ + GParamSpec *pspec) + { + switch (property_id) { ++ case PROP_EXPRESS_MODE: ++ e_shell_searchbar_set_express_mode ( ++ E_SHELL_SEARCHBAR (object), ++ g_value_get_boolean (value)); ++ return; ++ + case PROP_FILTER_VISIBLE: + e_shell_searchbar_set_filter_visible ( + E_SHELL_SEARCHBAR (object), + g_value_get_boolean (value)); + return; + +- case PROP_LABEL_VISIBLE: +- e_shell_searchbar_set_label_visible ( ++ case PROP_LABELS_VISIBLE: ++ e_shell_searchbar_set_labels_visible ( + E_SHELL_SEARCHBAR (object), + g_value_get_boolean (value)); + return; +@@ -528,15 +545,21 @@ + GParamSpec *pspec) + { + switch (property_id) { ++ case PROP_EXPRESS_MODE: ++ g_value_set_boolean ( ++ value, e_shell_searchbar_get_express_mode ( ++ E_SHELL_SEARCHBAR (object))); ++ return; ++ + case PROP_FILTER_COMBO_BOX: + g_value_set_object ( + value, e_shell_searchbar_get_filter_combo_box ( + E_SHELL_SEARCHBAR (object))); + return; + +- case PROP_LABEL_VISIBLE: ++ case PROP_LABELS_VISIBLE: + g_value_set_boolean ( +- value, e_shell_searchbar_get_label_visible ( ++ value, e_shell_searchbar_get_labels_visible ( + E_SHELL_SEARCHBAR (object))); + return; + +@@ -620,7 +643,7 @@ + } + + /* Chain up to parent's dispose() method. */ +- G_OBJECT_CLASS (parent_class)->dispose (object); ++ G_OBJECT_CLASS (e_shell_searchbar_parent_class)->dispose (object); + } + + static void +@@ -693,13 +716,15 @@ + + widget = GTK_WIDGET (searchbar); + gtk_size_group_add_widget (size_group, widget); ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (object)); + } + + static void + shell_searchbar_map (GtkWidget *widget) + { + /* Chain up to parent's map() method. */ +- GTK_WIDGET_CLASS (parent_class)->map (widget); ++ GTK_WIDGET_CLASS (e_shell_searchbar_parent_class)->map (widget); + + /* Load state after constructed() so we don't derail + * subclass initialization. We wait until map() so we +@@ -708,12 +733,11 @@ + } + + static void +-shell_searchbar_class_init (EShellSearchbarClass *class) ++e_shell_searchbar_class_init (EShellSearchbarClass *class) + { + GObjectClass *object_class; + GtkWidgetClass *widget_class; + +- parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (class, sizeof (EShellSearchbarPrivate)); + + object_class = G_OBJECT_CLASS (class); +@@ -727,6 +751,17 @@ + + g_object_class_install_property ( + object_class, ++ PROP_EXPRESS_MODE, ++ g_param_spec_boolean ( ++ "express-mode", ++ NULL, ++ NULL, ++ FALSE, ++ G_PARAM_READWRITE | ++ G_PARAM_CONSTRUCT)); ++ ++ g_object_class_install_property ( ++ object_class, + PROP_FILTER_COMBO_BOX, + g_param_spec_object ( + "filter-combo-box", +@@ -737,9 +772,9 @@ + + g_object_class_install_property ( + object_class, +- PROP_LABEL_VISIBLE, ++ PROP_LABELS_VISIBLE, + g_param_spec_boolean ( +- "label-visible", ++ "labels-visible", + NULL, + NULL, + TRUE, +@@ -853,7 +888,7 @@ + } + + static void +-shell_searchbar_init (EShellSearchbar *searchbar) ++e_shell_searchbar_init (EShellSearchbar *searchbar) + { + GtkBox *box; + GtkLabel *label; +@@ -884,6 +919,10 @@ + gtk_box_pack_start (box, widget, FALSE, FALSE, 0); + gtk_widget_show (widget); + ++ e_binding_new ( ++ searchbar, "labels-visible", ++ widget, "visible"); ++ + label = GTK_LABEL (widget); + + widget = e_action_combo_box_new (); +@@ -911,11 +950,12 @@ + gtk_box_pack_start (box, widget, FALSE, FALSE, 0); + gtk_widget_show (widget); + +- label = GTK_LABEL (widget); + e_binding_new ( +- searchbar, "label-visible", ++ searchbar, "labels-visible", + widget, "visible"); + ++ label = GTK_LABEL (widget); ++ + widget = e_hinted_entry_new (); + gtk_label_set_mnemonic_widget (label, widget); + gtk_box_pack_start (box, widget, TRUE, TRUE, 0); +@@ -989,32 +1029,6 @@ + G_CONNECT_AFTER | G_CONNECT_SWAPPED); + } + +-GType +-e_shell_searchbar_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) { +- static const GTypeInfo type_info = { +- sizeof (EShellSearchbarClass), +- (GBaseInitFunc) NULL, +- (GBaseFinalizeFunc) NULL, +- (GClassInitFunc) shell_searchbar_class_init, +- (GClassFinalizeFunc) NULL, +- NULL, /* class_data */ +- sizeof (EShellSearchbar), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) shell_searchbar_init, +- NULL /* value_table */ +- }; +- +- type = g_type_register_static ( +- GTK_TYPE_BOX, "EShellSearchbar", &type_info, 0); +- } +- +- return type; +-} +- + /** + * e_shell_searchbar_new: + * @shell_view: an #EShellView +@@ -1048,6 +1062,31 @@ + return E_SHELL_VIEW (searchbar->priv->shell_view); + } + ++gboolean ++e_shell_searchbar_get_express_mode (EShellSearchbar *searchbar) ++{ ++ g_return_val_if_fail (E_IS_SHELL_SEARCHBAR (searchbar), FALSE); ++ ++ return searchbar->priv->express_mode; ++} ++ ++void ++e_shell_searchbar_set_express_mode (EShellSearchbar *searchbar, ++ gboolean express_mode) ++{ ++ g_return_if_fail (E_IS_SHELL_SEARCHBAR (searchbar)); ++ ++ searchbar->priv->express_mode = express_mode; ++ ++ /* Emit "notify" on all the properties we override. */ ++ g_object_freeze_notify (G_OBJECT (searchbar)); ++ g_object_notify (G_OBJECT (searchbar), "express-mode"); ++ g_object_notify (G_OBJECT (searchbar), "labels-visible"); ++ g_object_notify (G_OBJECT (searchbar), "filter-visible"); ++ g_object_notify (G_OBJECT (searchbar), "scope-visible"); ++ g_object_thaw_notify (G_OBJECT (searchbar)); ++} ++ + EActionComboBox * + e_shell_searchbar_get_filter_combo_box (EShellSearchbar *searchbar) + { +@@ -1057,22 +1096,26 @@ + } + + gboolean +-e_shell_searchbar_get_label_visible (EShellSearchbar *searchbar) ++e_shell_searchbar_get_labels_visible (EShellSearchbar *searchbar) + { + g_return_val_if_fail (E_IS_SHELL_SEARCHBAR (searchbar), FALSE); + +- return searchbar->priv->label_visible; ++ /* Express mode overrides this. */ ++ if (e_shell_searchbar_get_express_mode (searchbar)) ++ return FALSE; ++ ++ return searchbar->priv->labels_visible; + } + + void +-e_shell_searchbar_set_label_visible (EShellSearchbar *searchbar, +- gboolean label_visible) ++e_shell_searchbar_set_labels_visible (EShellSearchbar *searchbar, ++ gboolean labels_visible) + { + g_return_if_fail (E_IS_SHELL_SEARCHBAR (searchbar)); + +- searchbar->priv->label_visible = label_visible; ++ searchbar->priv->labels_visible = labels_visible; + +- g_object_notify (G_OBJECT (searchbar), "label-visible"); ++ g_object_notify (G_OBJECT (searchbar), "labels-visible"); + } + + gboolean +@@ -1080,6 +1123,10 @@ + { + g_return_val_if_fail (E_IS_SHELL_SEARCHBAR (searchbar), FALSE); + ++ /* Express mode overrides this. */ ++ if (e_shell_searchbar_get_express_mode (searchbar)) ++ return FALSE; ++ + return searchbar->priv->filter_visible; + } + +@@ -1220,6 +1267,10 @@ + { + g_return_val_if_fail (E_IS_SHELL_SEARCHBAR (searchbar), FALSE); + ++ /* Express mode overrides this. */ ++ if (e_shell_searchbar_get_express_mode (searchbar)) ++ return FALSE; ++ + return searchbar->priv->scope_visible; + } + +@@ -1273,6 +1324,7 @@ + GKeyFile *key_file; + GtkAction *action; + GtkWidget *widget; ++ gboolean express_mode; + const gchar *search_text; + const gchar *state_group; + const gchar *key; +@@ -1288,6 +1340,8 @@ + key_file = e_shell_view_get_state_key_file (shell_view); + shell_window = e_shell_view_get_shell_window (shell_view); + ++ express_mode = e_shell_searchbar_get_express_mode (searchbar); ++ + /* Changing the combo boxes triggers searches, so block + * the search action until the state is fully restored. */ + action = E_SHELL_WINDOW_ACTION_SEARCH_QUICK (shell_window); +@@ -1299,7 +1353,7 @@ + + key = STATE_KEY_SEARCH_FILTER; + string = g_key_file_get_string (key_file, state_group, key, NULL); +- if (string != NULL && *string != '\0') ++ if (string != NULL && *string != '\0' && !express_mode) + action = e_shell_window_get_action (shell_window, string); + else + action = NULL; +@@ -1344,7 +1398,7 @@ + + key = STATE_KEY_SEARCH_SCOPE; + string = g_key_file_get_string (key_file, state_group, key, NULL); +- if (string != NULL && *string != '\0') ++ if (string != NULL && *string != '\0' && !express_mode) + action = e_shell_window_get_action (shell_window, string); + else + action = NULL; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-searchbar.h evolution-2.30.2.new//shell/e-shell-searchbar.h +--- evolution-2.30.2//shell/e-shell-searchbar.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-searchbar.h 2010-06-22 13:37:26.948114032 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-shell-searchbar +- * @short_description: quick search interface +- * @include: shell/e-shell-searchbar.h +- **/ +- + #ifndef E_SHELL_SEARCHBAR_H + #define E_SHELL_SEARCHBAR_H + +@@ -75,6 +69,11 @@ + GType e_shell_searchbar_get_type (void); + GtkWidget * e_shell_searchbar_new (EShellView *shell_view); + EShellView * e_shell_searchbar_get_shell_view(EShellSearchbar *searchbar); ++gboolean e_shell_searchbar_get_express_mode ++ (EShellSearchbar *searchbar); ++void e_shell_searchbar_set_express_mode ++ (EShellSearchbar *searchbar, ++ gboolean express_mode); + EActionComboBox * + e_shell_searchbar_get_filter_combo_box + (EShellSearchbar *searchbar); +@@ -83,11 +82,11 @@ + void e_shell_searchbar_set_filter_visible + (EShellSearchbar *searchbar, + gboolean filter_visible); +-gboolean e_shell_searchbar_get_label_visible ++gboolean e_shell_searchbar_get_labels_visible + (EShellSearchbar *searchbar); +-void e_shell_searchbar_set_label_visible ++void e_shell_searchbar_set_labels_visible + (EShellSearchbar *searchbar, +- gboolean label_visible); ++ gboolean labels_visible); + const gchar * e_shell_searchbar_get_search_hint + (EShellSearchbar *searchbar); + void e_shell_searchbar_set_search_hint +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-settings.c evolution-2.30.2.new//shell/e-shell-settings.c +--- evolution-2.30.2//shell/e-shell-settings.c 2010-06-20 14:14:29.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-settings.c 2010-06-22 13:37:26.948114032 +0200 +@@ -19,6 +19,12 @@ + * + */ + ++/** ++ * SECTION: e-shell-settings ++ * @short_description: settings management ++ * @include: shell/e-shell-settings.h ++ **/ ++ + #include "e-shell-settings.h" + + #include "e-util/gconf-bridge.h" +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-settings.h evolution-2.30.2.new//shell/e-shell-settings.h +--- evolution-2.30.2//shell/e-shell-settings.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-settings.h 2010-06-22 13:37:26.948114032 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-shell-settings +- * @short_description: settings management +- * @include: shell/e-shell-settings.h +- **/ +- + #ifndef E_SHELL_SETTINGS_H + #define E_SHELL_SETTINGS_H + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-sidebar.c evolution-2.30.2.new//shell/e-shell-sidebar.c +--- evolution-2.30.2//shell/e-shell-sidebar.c 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-sidebar.c 2010-06-22 13:37:26.948114032 +0200 +@@ -19,9 +19,16 @@ + * + */ + ++/** ++ * SECTION: e-shell-sidebar ++ * @short_description: the left side of the main window ++ * @include: shell/e-shell-sidebar.h ++ **/ ++ + #include "e-shell-sidebar.h" + + #include ++#include + #include + #include + +@@ -48,7 +55,9 @@ + PROP_SHELL_VIEW + }; + +-static gpointer parent_class; ++G_DEFINE_TYPE_WITH_CODE ( ++ EShellSidebar, e_shell_sidebar, GTK_TYPE_BIN, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) + + static void + shell_sidebar_set_shell_view (EShellSidebar *shell_sidebar, +@@ -147,7 +156,7 @@ + } + + /* Chain up to parent's dispose() method. */ +- G_OBJECT_CLASS (parent_class)->dispose (object); ++ G_OBJECT_CLASS (e_shell_sidebar_parent_class)->dispose (object); + } + + static void +@@ -162,7 +171,7 @@ + g_free (priv->secondary_text); + + /* Chain up to parent's finalize() method. */ +- G_OBJECT_CLASS (parent_class)->finalize (object); ++ G_OBJECT_CLASS (e_shell_sidebar_parent_class)->finalize (object); + } + + static void +@@ -191,6 +200,8 @@ + g_object_get (action, "label", &label, NULL); + e_shell_sidebar_set_primary_text (shell_sidebar, label); + g_free (label); ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (object)); + } + + static void +@@ -211,7 +222,7 @@ + } + + /* Chain up to parent's destroy() method. */ +- GTK_OBJECT_CLASS (parent_class)->destroy (gtk_object); ++ GTK_OBJECT_CLASS (e_shell_sidebar_parent_class)->destroy (gtk_object); + } + + static void +@@ -282,19 +293,18 @@ + callback (priv->event_box, callback_data); + + /* Chain up to parent's forall() method. */ +- GTK_CONTAINER_CLASS (parent_class)->forall ( ++ GTK_CONTAINER_CLASS (e_shell_sidebar_parent_class)->forall ( + container, include_internals, callback, callback_data); + } + + static void +-shell_sidebar_class_init (EShellSidebarClass *class) ++e_shell_sidebar_class_init (EShellSidebarClass *class) + { + GObjectClass *object_class; + GtkObjectClass *gtk_object_class; + GtkWidgetClass *widget_class; + GtkContainerClass *container_class; + +- parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (class, sizeof (EShellSidebarPrivate)); + + object_class = G_OBJECT_CLASS (class); +@@ -378,7 +388,7 @@ + } + + static void +-shell_sidebar_init (EShellSidebar *shell_sidebar) ++e_shell_sidebar_init (EShellSidebar *shell_sidebar) + { + GtkStyle *style; + GtkWidget *widget; +@@ -446,32 +456,6 @@ + e_binding_new (shell_sidebar, "secondary-text", widget, "label"); + } + +-GType +-e_shell_sidebar_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) { +- static const GTypeInfo type_info = { +- sizeof (EShellSidebarClass), +- (GBaseInitFunc) NULL, +- (GBaseFinalizeFunc) NULL, +- (GClassInitFunc) shell_sidebar_class_init, +- (GClassFinalizeFunc) NULL, +- NULL, /* class_data */ +- sizeof (EShellSidebar), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) shell_sidebar_init, +- NULL /* value_table */ +- }; +- +- type = g_type_register_static ( +- GTK_TYPE_BIN, "EShellSidebar", &type_info, 0); +- } +- +- return type; +-} +- + /** + * e_shell_sidebar_new: + * @shell_view: an #EShellView +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-sidebar.h evolution-2.30.2.new//shell/e-shell-sidebar.h +--- evolution-2.30.2//shell/e-shell-sidebar.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-sidebar.h 2010-06-22 13:37:26.948114032 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-shell-sidebar +- * @short_description: the left side of the main window +- * @include: shell/e-shell-sidebar.h +- **/ +- + #ifndef E_SHELL_SIDEBAR_H + #define E_SHELL_SIDEBAR_H + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-switcher.c evolution-2.30.2.new//shell/e-shell-switcher.c +--- evolution-2.30.2//shell/e-shell-switcher.c 2010-06-20 14:14:29.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-switcher.c 2010-06-22 13:37:26.948114032 +0200 +@@ -19,9 +19,16 @@ + * + */ + ++/** ++ * SECTION: e-shell-switcher ++ * @short_description: buttons for switching views ++ * @include: shell/e-shell-switcher.h ++ **/ ++ + #include "e-shell-switcher.h" + + #include ++#include + + #define E_SHELL_SWITCHER_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ +@@ -50,9 +57,17 @@ + LAST_SIGNAL + }; + +-static gpointer parent_class; + static guint signals[LAST_SIGNAL]; + ++/* Forward Declarations */ ++static void shell_switcher_tool_shell_iface_init (GtkToolShellIface *iface); ++ ++G_DEFINE_TYPE_WITH_CODE ( ++ EShellSwitcher, e_shell_switcher, GTK_TYPE_BIN, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL) ++ G_IMPLEMENT_INTERFACE (GTK_TYPE_TOOL_SHELL, ++ shell_switcher_tool_shell_iface_init)) ++ + static gint + shell_switcher_layout_actions (EShellSwitcher *switcher) + { +@@ -223,7 +238,7 @@ + } + + /* Chain up to parent's dispose() method. */ +- G_OBJECT_CLASS (parent_class)->dispose (object); ++ G_OBJECT_CLASS (e_shell_switcher_parent_class)->dispose (object); + } + + static void +@@ -346,7 +361,8 @@ + } + + /* Chain up to parent's remove() method. */ +- GTK_CONTAINER_CLASS (parent_class)->remove (container, widget); ++ GTK_CONTAINER_CLASS (e_shell_switcher_parent_class)->remove ( ++ container, widget); + } + + static void +@@ -364,7 +380,7 @@ + priv->proxies, (GFunc) callback, callback_data); + + /* Chain up to parent's forall() method. */ +- GTK_CONTAINER_CLASS (parent_class)->forall ( ++ GTK_CONTAINER_CLASS (e_shell_switcher_parent_class)->forall ( + container, include_internals, callback, callback_data); + } + +@@ -410,13 +426,12 @@ + } + + static void +-shell_switcher_class_init (EShellSwitcherClass *class) ++e_shell_switcher_class_init (EShellSwitcherClass *class) + { + GObjectClass *object_class; + GtkWidgetClass *widget_class; + GtkContainerClass *container_class; + +- parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (class, sizeof (EShellSwitcherPrivate)); + + object_class = G_OBJECT_CLASS (class); +@@ -487,11 +502,13 @@ + } + + static void +-shell_switcher_init (EShellSwitcher *switcher) ++e_shell_switcher_init (EShellSwitcher *switcher) + { + switcher->priv = E_SHELL_SWITCHER_GET_PRIVATE (switcher); + + GTK_WIDGET_SET_FLAGS (switcher, GTK_NO_WINDOW); ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (switcher)); + } + + static void +@@ -503,41 +520,6 @@ + iface->get_relief_style = shell_switcher_get_relief_style; + } + +-GType +-e_shell_switcher_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) { +- static const GTypeInfo type_info = { +- sizeof (EShellSwitcherClass), +- (GBaseInitFunc) NULL, +- (GBaseFinalizeFunc) NULL, +- (GClassInitFunc) shell_switcher_class_init, +- (GClassFinalizeFunc) NULL, +- NULL, /* class_data */ +- sizeof (EShellSwitcher), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) shell_switcher_init, +- NULL /* value_table */ +- }; +- +- static const GInterfaceInfo tool_shell_info = { +- (GInterfaceInitFunc) shell_switcher_tool_shell_iface_init, +- (GInterfaceFinalizeFunc) NULL, +- NULL /* interface_data */ +- }; +- +- type = g_type_register_static ( +- GTK_TYPE_BIN, "EShellSwitcher", &type_info, 0); +- +- g_type_add_interface_static ( +- type, GTK_TYPE_TOOL_SHELL, &tool_shell_info); +- } +- +- return type; +-} +- + /** + * e_shell_switcher_new: + * +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-switcher.h evolution-2.30.2.new//shell/e-shell-switcher.h +--- evolution-2.30.2//shell/e-shell-switcher.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-switcher.h 2010-06-22 13:37:26.948114032 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-shell-switcher +- * @short_description: buttons for switching views +- * @include: shell/e-shell-switcher.h +- **/ +- + #ifndef E_SHELL_SWITCHER_H + #define E_SHELL_SWITCHER_H + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-taskbar.c evolution-2.30.2.new//shell/e-shell-taskbar.c +--- evolution-2.30.2//shell/e-shell-taskbar.c 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-taskbar.c 2010-06-22 13:37:26.948114032 +0200 +@@ -19,11 +19,18 @@ + * + */ + ++/** ++ * SECTION: e-shell-taskbar ++ * @short_description: the bottom of the main window ++ * @include: shell/e-shell-taskbar.h ++ **/ ++ + #include "e-shell-taskbar.h" + + #include + +-#include ++#include ++#include + + #define E_SHELL_TASKBAR_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ +@@ -49,7 +56,9 @@ + PROP_SHELL_VIEW + }; + +-static gpointer parent_class; ++G_DEFINE_TYPE_WITH_CODE ( ++ EShellTaskbar, e_shell_taskbar, GTK_TYPE_HBOX, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) + + static void + shell_taskbar_activity_remove (EShellTaskbar *shell_taskbar, +@@ -204,7 +213,7 @@ + object); + + /* Chain up to parent's dispose() method. */ +- G_OBJECT_CLASS (parent_class)->dispose (object); ++ G_OBJECT_CLASS (e_shell_taskbar_parent_class)->dispose (object); + } + + static void +@@ -217,7 +226,7 @@ + g_hash_table_destroy (priv->proxy_table); + + /* Chain up to parent's finalize() method. */ +- G_OBJECT_CLASS (parent_class)->finalize (object); ++ G_OBJECT_CLASS (e_shell_taskbar_parent_class)->finalize (object); + } + + static void +@@ -239,16 +248,17 @@ + shell_backend, "activity-added", + G_CALLBACK (shell_taskbar_activity_add), shell_taskbar); + +- /* to not enlarge window width on new activities */ ++ /* Do not enlarge window width on new activities. */ + gtk_widget_set_size_request (GTK_WIDGET (shell_taskbar), 0, -1); ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (object)); + } + + static void +-shell_taskbar_class_init (EShellTaskbarClass *class) ++e_shell_taskbar_class_init (EShellTaskbarClass *class) + { + GObjectClass *object_class; + +- parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (class, sizeof (EShellTaskbarPrivate)); + + object_class = G_OBJECT_CLASS (class); +@@ -292,7 +302,7 @@ + } + + static void +-shell_taskbar_init (EShellTaskbar *shell_taskbar) ++e_shell_taskbar_init (EShellTaskbar *shell_taskbar) + { + GtkWidget *widget; + GHashTable *proxy_table; +@@ -328,32 +338,6 @@ + GTK_WIDGET (shell_taskbar), -1, (height * 2)); + } + +-GType +-e_shell_taskbar_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) { +- static const GTypeInfo type_info = { +- sizeof (EShellTaskbarClass), +- (GBaseInitFunc) NULL, +- (GBaseFinalizeFunc) NULL, +- (GClassInitFunc) shell_taskbar_class_init, +- (GClassFinalizeFunc) NULL, +- NULL, /* class_data */ +- sizeof (EShellTaskbar), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) shell_taskbar_init, +- NULL /* value_table */ +- }; +- +- type = g_type_register_static ( +- GTK_TYPE_HBOX, "EShellTaskbar", &type_info, 0); +- } +- +- return type; +-} +- + /** + * e_shell_taskbar_new: + * @shell_view: an #EShellView +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-taskbar.h evolution-2.30.2.new//shell/e-shell-taskbar.h +--- evolution-2.30.2//shell/e-shell-taskbar.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-taskbar.h 2010-06-22 13:37:26.948114032 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-shell-taskbar +- * @short_description: the bottom of the main window +- * @include: shell/e-shell-taskbar.h +- **/ +- + #ifndef E_SHELL_TASKBAR_H + #define E_SHELL_TASKBAR_H + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-utils.c evolution-2.30.2.new//shell/e-shell-utils.c +--- evolution-2.30.2//shell/e-shell-utils.c 2010-06-20 14:14:29.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-utils.c 2010-06-22 13:37:26.948114032 +0200 +@@ -19,6 +19,12 @@ + * + */ + ++/** ++ * SECTION: e-shell-utils ++ * @short_description: high-level utilities with shell integration ++ * @include: shell/e-shell-utils.h ++ **/ ++ + #include "e-shell-utils.h" + + #include +@@ -342,3 +348,59 @@ + + return g_strv_length (uris); + } ++ ++/** ++ * e_shell_hide_widgets_for_express_mode: ++ * @shell: an #EShell ++ * @builder: a #GtkBuilder ++ * @widget_name: NULL-terminated list of strings ++ * ++ * If Evolution is running in Express mode (i.e. if the specified @shell is ++ * in Express mode), then this function will hide a list of widgets, based ++ * on their specified names. The list of names must be NULL-terminated, ++ * and each element of that list must be the name of a widget present in ++ * @builder. Those widgets will then get hidden. ++ * ++ * This can be used to simplify preference dialogs and such in an easy ++ * fashion, for use in Express mode. ++ * ++ * If Evolution is not running in Express mode, this function does nothing. ++ */ ++void ++e_shell_hide_widgets_for_express_mode (EShell *shell, ++ GtkBuilder *builder, ++ const gchar *widget_name, ++ ...) ++{ ++ va_list args; ++ const gchar *name; ++ ++ g_return_if_fail (E_IS_SHELL (shell)); ++ g_return_if_fail (GTK_IS_BUILDER (builder)); ++ g_return_if_fail (widget_name != NULL); ++ ++ if (!e_shell_get_express_mode (shell)) ++ return; ++ ++ va_start (args, widget_name); ++ ++ name = va_arg (args, const gchar *); ++ while (name) { ++ GObject *object; ++ ++ object = gtk_builder_get_object (builder, name); ++ if (!GTK_IS_WIDGET (object)) { ++ g_error ( ++ "Object '%s' was not found in the builder " ++ "file, or it is not a GtkWidget", name); ++ g_assert_not_reached (); ++ } ++ ++ gtk_widget_hide (GTK_WIDGET (object)); ++ ++ name = va_arg (args, const gchar *); ++ } ++ ++ va_end (args); ++} ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-utils.h evolution-2.30.2.new//shell/e-shell-utils.h +--- evolution-2.30.2//shell/e-shell-utils.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-utils.h 2010-06-22 13:37:26.948114032 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-shell-utils +- * @short_description: high-level utilities with shell integration +- * @include: shell/e-shell-utils.h +- **/ +- + #ifndef E_SHELL_UTILS_H + #define E_SHELL_UTILS_H + +@@ -56,6 +50,11 @@ + gchar **uris, + gboolean preview); + ++void e_shell_hide_widgets_for_express_mode (EShell *shell, ++ GtkBuilder *builder, ++ const gchar *widget_name, ++ ...) G_GNUC_NULL_TERMINATED; ++ + G_END_DECLS + + #endif /* E_SHELL_UTILS_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-view.c evolution-2.30.2.new//shell/e-shell-view.c +--- evolution-2.30.2//shell/e-shell-view.c 2010-06-20 14:14:29.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-view.c 2010-06-22 13:37:26.952114032 +0200 +@@ -19,24 +19,34 @@ + * + */ + ++/** ++ * SECTION: e-shell-view ++ * @short_description: views within the main window ++ * @include: shell/e-shell-view.h ++ **/ ++ + #include "e-shell-view.h" + + #include + #include + +-#include "e-util/e-util-private.h" +-#include "e-util/e-util.h" ++#include "e-util/e-binding.h" ++#include "e-util/e-extensible.h" + #include "e-util/e-file-utils.h" + #include "e-util/e-plugin-ui.h" + #include "e-util/e-ui-manager.h" ++#include "e-util/e-util-private.h" ++#include "e-util/e-util.h" + #include "filter/e-rule-context.h" + ++#include "e-shell-searchbar.h" + #include "e-shell-window-actions.h" + + #define E_SHELL_VIEW_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_SHELL_VIEW, EShellViewPrivate)) + ++#define SIMPLE_SEARCHBAR_WIDTH 300 + #define STATE_SAVE_TIMEOUT_SECONDS 3 + + struct _EShellViewPrivate { +@@ -57,6 +67,7 @@ + GtkWidget *shell_content; + GtkWidget *shell_sidebar; + GtkWidget *shell_taskbar; ++ GtkWidget *searchbar; + + EFilterRule *search_rule; + guint execute_search_blocked; +@@ -69,6 +80,7 @@ + PROP_0, + PROP_ACTION, + PROP_PAGE_NUM, ++ PROP_SEARCHBAR, + PROP_SEARCH_RULE, + PROP_SHELL_BACKEND, + PROP_SHELL_CONTENT, +@@ -345,8 +357,9 @@ + + static void + shell_view_set_shell_window (EShellView *shell_view, +- GtkWidget *shell_window) ++ EShellWindow *shell_window) + { ++ g_return_if_fail (E_IS_SHELL_WINDOW (shell_window)); + g_return_if_fail (shell_view->priv->shell_window == NULL); + + shell_view->priv->shell_window = shell_window; +@@ -422,6 +435,12 @@ + E_SHELL_VIEW (object))); + return; + ++ case PROP_SEARCHBAR: ++ g_value_set_object ( ++ value, e_shell_view_get_searchbar ( ++ E_SHELL_VIEW (object))); ++ return; ++ + case PROP_SEARCH_RULE: + g_value_set_object ( + value, e_shell_view_get_search_rule ( +@@ -522,6 +541,11 @@ + priv->shell_taskbar = NULL; + } + ++ if (priv->searchbar != NULL) { ++ g_object_unref (priv->searchbar); ++ priv->searchbar = NULL; ++ } ++ + if (priv->search_rule != NULL) { + g_object_unref (priv->search_rule); + priv->search_rule = NULL; +@@ -575,9 +599,108 @@ + shell_view->priv->shell_sidebar = g_object_ref_sink (widget); + gtk_widget_show (widget); + ++ if (shell_view_class->construct_searchbar != NULL) { ++ widget = shell_view_class->construct_searchbar (shell_view); ++ shell_view->priv->searchbar = g_object_ref_sink (widget); ++ } ++ + /* Size group should be safe to unreference now. */ + g_object_unref (shell_view->priv->size_group); + shell_view->priv->size_group = NULL; ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (object)); ++} ++ ++static GtkWidget * ++shell_view_construct_searchbar (EShellView *shell_view) ++{ ++ EShell *shell; ++ EShellWindow *shell_window; ++ EShellContent *shell_content; ++ EShellSearchbar *shell_searchbar; ++ GtkToolItem *item; ++ GtkAction *action; ++ GtkWidget *main_toolbar; ++ GtkWidget *widget; ++ ++ shell_content = e_shell_view_get_shell_content (shell_view); ++ shell_window = e_shell_view_get_shell_window (shell_view); ++ shell = e_shell_window_get_shell (shell_window); ++ ++ widget = e_shell_searchbar_new (shell_view); ++ ++ /* In normal mode, we hand the searchbar off to EShellContent. */ ++ if (!e_shell_get_express_mode (shell)) { ++ e_shell_content_set_searchbar (shell_content, widget); ++ gtk_widget_show (widget); ++ return widget; ++ } ++ ++ /* Express mode is more complicated. We append a heavily simplified ++ * version of it to the main toolbar, but only show it when this shell ++ * view is active. So each view still gets its own searchbar. */ ++ ++ shell_searchbar = E_SHELL_SEARCHBAR (widget); ++ e_shell_searchbar_set_express_mode (shell_searchbar, TRUE); ++ ++ /* XXX Hardcoded sizes are evil, but what should the width be ++ * relative to. Window width? The other toolbar width? */ ++ gtk_widget_set_size_request (widget, SIMPLE_SEARCHBAR_WIDTH, -1); ++ ++ main_toolbar = e_shell_window_get_managed_widget ( ++ shell_window, "/search-toolbar"); ++ ++ item = gtk_tool_item_new (); ++ gtk_container_add (GTK_CONTAINER (item), widget); ++ gtk_widget_show (GTK_WIDGET (item)); ++ ++ action = e_shell_view_get_action (shell_view); ++ e_binding_new (action, "active", widget, "visible"); ++ ++ gtk_toolbar_insert (GTK_TOOLBAR (main_toolbar), item, -1); ++ ++ if (e_shell_get_small_screen_mode (shell)) { ++ GtkWidget *image; ++ GtkWidget *container; ++ GtkAction *action; ++ GtkToolItem *item; ++ ++ action = e_shell_window_get_action ( ++ shell_window, "close-window"); ++ image = gtk_image_new_from_icon_name ( ++ "window-close-hover", GTK_ICON_SIZE_DIALOG); ++ item = gtk_tool_button_new ( ++ image, gtk_action_get_label (action)); ++ gtk_widget_set_name (GTK_WIDGET (item), "MeeGoCloseButton"); ++ gtk_activatable_set_related_action ( ++ GTK_ACTIVATABLE (item), action); ++ container = e_shell_window_get_menu_bar_box (shell_window); ++ gtk_box_pack_start ( ++ GTK_BOX (container), ++ GTK_WIDGET (item), FALSE, FALSE, 0); ++ gtk_widget_show_all (GTK_WIDGET (item)); ++ } ++ ++ return widget; ++} ++ ++static gchar * ++shell_view_get_search_name (EShellView *shell_view) ++{ ++ EShellSearchbar *searchbar; ++ EFilterRule *rule; ++ const gchar *search_text; ++ ++ rule = e_shell_view_get_search_rule (shell_view); ++ g_return_val_if_fail (E_IS_FILTER_RULE (rule), NULL); ++ ++ searchbar = E_SHELL_SEARCHBAR (shell_view->priv->searchbar); ++ search_text = e_shell_searchbar_get_search_text (searchbar); ++ ++ if (search_text == NULL || *search_text == '\0') ++ search_text = "''"; ++ ++ return g_strdup_printf ("%s %s", rule->name, search_text); + } + + static void +@@ -663,6 +786,9 @@ + class->new_shell_sidebar = e_shell_sidebar_new; + class->new_shell_taskbar = e_shell_taskbar_new; + ++ class->construct_searchbar = shell_view_construct_searchbar; ++ class->get_search_name = shell_view_get_search_name; ++ + class->toggled = shell_view_toggled; + class->clear_search = shell_view_clear_search; + class->custom_search = shell_view_custom_search; +@@ -976,9 +1102,18 @@ + NULL /* value_table */ + }; + ++ const GInterfaceInfo extensible_info = { ++ (GInterfaceInitFunc) NULL, ++ (GInterfaceFinalizeFunc) NULL, ++ NULL /* interface_data */ ++ }; ++ + type = g_type_register_static ( + G_TYPE_OBJECT, "EShellView", + &type_info, G_TYPE_FLAG_ABSTRACT); ++ ++ g_type_add_interface_static ( ++ type, E_TYPE_EXTENSIBLE, &extensible_info); + } + + return type; +@@ -1201,6 +1336,29 @@ + } + + /** ++ * e_shell_view_get_search_name: ++ * @shell_view: an #EShellView ++ * ++ * Returns a newly-allocated string containing a suitable name for the ++ * current search criteria. This is used as the suggested name in the ++ * Save Search dialog. Free the returned string with g_free(). ++ * ++ * Returns: a name for the current search criteria ++ **/ ++gchar * ++e_shell_view_get_search_name (EShellView *shell_view) ++{ ++ EShellViewClass *class; ++ ++ g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), NULL); ++ ++ class = E_SHELL_VIEW_GET_CLASS (shell_view); ++ g_return_val_if_fail (class->get_search_name != NULL, NULL); ++ ++ return class->get_search_name (shell_view); ++} ++ ++/** + * e_shell_view_get_search_rule: + * @shell_view: an #EShellView + * +@@ -1217,6 +1375,20 @@ + } + + /** ++ * e_shell_view_get_searchbar: ++ * @shell_view: an #EShellView ++ * ++ * Returns the searchbar widget for @shell_view. ++ **/ ++GtkWidget * ++e_shell_view_get_searchbar (EShellView *shell_view) ++{ ++ g_return_val_if_fail (E_IS_SHELL_VIEW (shell_view), NULL); ++ ++ return shell_view->priv->searchbar; ++} ++ ++/** + * e_shell_view_set_search_rule: + * @shell_view: an #EShellView + * @search_rule: an #EFilterRule +@@ -1574,7 +1746,8 @@ + g_return_if_fail (shell_view->priv->update_actions_blocked > 0); + + shell_view->priv->update_actions_blocked--; +- if (!shell_view->priv->update_actions_blocked && shell_view->priv->update_actions_called) { ++ if (!shell_view->priv->update_actions_blocked && ++ shell_view->priv->update_actions_called) { + shell_view->priv->update_actions_called = FALSE; + e_shell_view_update_actions (shell_view); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-view.h evolution-2.30.2.new//shell/e-shell-view.h +--- evolution-2.30.2//shell/e-shell-view.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-view.h 2010-06-22 13:37:26.952114032 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-shell-view +- * @short_description: views within the main window +- * @include: shell/e-shell-view.h +- **/ +- + #ifndef E_SHELL_VIEW_H + #define E_SHELL_VIEW_H + +@@ -172,6 +166,10 @@ + GtkWidget * (*new_shell_sidebar) (EShellView *shell_view); + GtkWidget * (*new_shell_taskbar) (EShellView *shell_view); + ++ /* Create, configure and pack a search bar widget. */ ++ GtkWidget * (*construct_searchbar) (EShellView *shell_view); ++ gchar * (*get_search_name) (EShellView *shell_view); ++ + /* Signals */ + void (*toggled) (EShellView *shell_view); + void (*clear_search) (EShellView *shell_view); +@@ -194,6 +192,8 @@ + gint e_shell_view_get_page_num (EShellView *shell_view); + void e_shell_view_set_page_num (EShellView *shell_view, + gint page_num); ++GtkWidget * e_shell_view_get_searchbar (EShellView *shell_view); ++gchar * e_shell_view_get_search_name (EShellView *shell_view); + EFilterRule * e_shell_view_get_search_rule (EShellView *shell_view); + void e_shell_view_set_search_rule (EShellView *shell_view, + EFilterRule *search_rule); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-window-actions.c evolution-2.30.2.new//shell/e-shell-window-actions.c +--- evolution-2.30.2//shell/e-shell-window-actions.c 2010-06-22 13:37:17.536114034 +0200 ++++ evolution-2.30.2.new//shell/e-shell-window-actions.c 2010-06-22 13:37:26.952114032 +0200 +@@ -928,10 +928,17 @@ + shell_backend = e_shell_view_get_shell_backend (shell_view); + shell_backend_class = E_SHELL_BACKEND_GET_CLASS (shell_backend); + +- if (shell_backend_class->preferences_page != NULL) +- e_preferences_window_show_page ( +- E_PREFERENCES_WINDOW (preferences_window), +- shell_backend_class->preferences_page); ++ if (shell_backend_class->preferences_page != NULL) { ++ if (e_shell_get_express_mode (shell)) { ++ e_preferences_window_filter_page ( ++ E_PREFERENCES_WINDOW (preferences_window), ++ shell_backend_class->preferences_page); ++ } else { ++ e_preferences_window_show_page ( ++ E_PREFERENCES_WINDOW (preferences_window), ++ shell_backend_class->preferences_page); ++ } ++ } + } + + /** +@@ -1448,6 +1455,20 @@ + N_("Close this window"), + G_CALLBACK (action_close_cb) }, + ++ { "close-window-menu", ++ GTK_STOCK_CLOSE, ++ NULL, ++ "w", ++ N_("Close this window"), ++ G_CALLBACK (action_close_cb) }, ++ ++ { "close-window", ++ GTK_STOCK_CLOSE, ++ N_("_Close Window"), ++ "w", ++ N_("Close this window"), ++ G_CALLBACK (action_close_cb) }, ++ + { "contents", + GTK_STOCK_HELP, + N_("_Contents"), +@@ -2082,9 +2103,11 @@ + + /* Add menu separators. */ + +- separator = gtk_separator_menu_item_new (); +- new_item_actions = g_list_prepend (new_item_actions, separator); +- gtk_widget_show (GTK_WIDGET (separator)); ++ if (new_item_actions != NULL) { ++ separator = gtk_separator_menu_item_new (); ++ new_item_actions = g_list_prepend (new_item_actions, separator); ++ gtk_widget_show (GTK_WIDGET (separator)); ++ } + + if (new_source_actions != NULL) { + separator = gtk_separator_menu_item_new (); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-window.c evolution-2.30.2.new//shell/e-shell-window.c +--- evolution-2.30.2//shell/e-shell-window.c 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-window.c 2010-06-22 13:37:26.952114032 +0200 +@@ -19,10 +19,17 @@ + * + */ + ++/** ++ * SECTION: e-shell-window ++ * @short_description: the main window ++ * @include: shell/e-shell-window.h ++ **/ ++ + #include "e-shell-window-private.h" + + #include + ++#include + #include + #include + +@@ -45,9 +52,12 @@ + LAST_SIGNAL + }; + +-static gpointer parent_class; + static gulong signals[LAST_SIGNAL]; + ++G_DEFINE_TYPE_WITH_CODE ( ++ EShellWindow, e_shell_window, GTK_TYPE_WINDOW, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) ++ + static void + shell_window_menubar_update_new_menu (EShellWindow *shell_window) + { +@@ -299,7 +309,7 @@ + e_shell_window_private_dispose (E_SHELL_WINDOW (object)); + + /* Chain up to parent's dispose() method. */ +- G_OBJECT_CLASS (parent_class)->dispose (object); ++ G_OBJECT_CLASS (e_shell_window_parent_class)->dispose (object); + } + + static void +@@ -308,13 +318,21 @@ + e_shell_window_private_finalize (E_SHELL_WINDOW (object)); + + /* Chain up to parent's finalize() method. */ +- G_OBJECT_CLASS (parent_class)->finalize (object); ++ G_OBJECT_CLASS (e_shell_window_parent_class)->finalize (object); + } + + static void + shell_window_constructed (GObject *object) + { +- e_shell_window_private_constructed (E_SHELL_WINDOW (object)); ++ EShellWindow *shell_window = E_SHELL_WINDOW (object); ++ ++ e_shell_window_private_constructed (shell_window); ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (object)); ++ ++ if (e_shell_get_meego_mode (shell_window->priv->shell) && ++ e_shell_get_small_screen_mode (shell_window->priv->shell)) ++ gtk_window_set_decorated (GTK_WINDOW (object), FALSE); + } + + static GtkWidget * +@@ -326,6 +344,23 @@ + shell_window, "/main-menu"); + gtk_widget_show (main_menu); + ++ if (e_shell_get_small_screen_mode (shell_window->priv->shell)) { ++ GtkWidget *parent, *child; ++ ++ parent = gtk_widget_get_parent (main_menu); ++ g_object_ref (parent); ++ gtk_container_remove ((GtkContainer *)parent, main_menu); ++ child = gtk_hbox_new (FALSE, 0); ++ gtk_box_pack_start ((GtkBox *)child, main_menu, TRUE, TRUE, 0); ++ gtk_widget_show (child); ++ gtk_container_add ((GtkContainer *)parent, child); ++ shell_window->priv->menubar_box = child; ++ ++ e_mutual_binding_new (main_menu, "visible", ++ child, "visible"); ++ main_menu = child; ++ } ++ + g_signal_connect ( + shell_window, "notify::active-view", + G_CALLBACK (shell_window_menubar_update_new_menu), NULL); +@@ -333,21 +368,34 @@ + return main_menu; + } + ++GtkWidget * ++e_shell_window_get_menu_bar_box (EShellWindow *shell_window) ++{ ++ return shell_window->priv->menubar_box; ++} ++ + static GtkWidget * + shell_window_construct_toolbar (EShellWindow *shell_window) + { + GtkUIManager *ui_manager; +- GtkWidget *main_toolbar; ++ GtkWidget *toolbar; ++ GtkWidget *box; + GtkToolItem *item; + + ui_manager = e_shell_window_get_ui_manager (shell_window); + +- main_toolbar = e_shell_window_get_managed_widget ( +- shell_window, "/main-toolbar"); ++ box = gtk_hbox_new (FALSE, 0); ++ gtk_widget_show (box); + + e_binding_new ( + shell_window, "toolbar-visible", +- main_toolbar, "visible"); ++ box, "visible"); ++ ++ toolbar = e_shell_window_get_managed_widget ( ++ shell_window, "/main-toolbar"); ++ ++ if (e_shell_get_meego_mode (shell_window->priv->shell)) ++ gtk_widget_set_name (GTK_WIDGET (toolbar), "MeeGoToolbar"); + + /* XXX Having this separator in the UI definition doesn't work + * because GtkUIManager is unaware of the "New" button, so +@@ -360,7 +408,7 @@ + * convinced having it proxy some new type of GtkAction + * is worth the extra effort. */ + item = gtk_separator_tool_item_new (); +- gtk_toolbar_insert (GTK_TOOLBAR (main_toolbar), item, 0); ++ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 0); + gtk_widget_show (GTK_WIDGET (item)); + + item = e_menu_tool_button_new (_("New")); +@@ -369,7 +417,7 @@ + GTK_WIDGET (item), "clicked", + gtk_ui_manager_get_accel_group (ui_manager), + GDK_N, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); +- gtk_toolbar_insert (GTK_TOOLBAR (main_toolbar), item, 0); ++ gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 0); + gtk_widget_show (GTK_WIDGET (item)); + + g_signal_connect ( +@@ -377,7 +425,23 @@ + G_CALLBACK (shell_window_toolbar_update_new_menu), + GTK_MENU_TOOL_BUTTON (item)); + +- return main_toolbar; ++ gtk_box_pack_start (GTK_BOX (box), toolbar, TRUE, TRUE, 0); ++ ++ toolbar = e_shell_window_get_managed_widget ( ++ shell_window, "/search-toolbar"); ++ gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE); ++ gtk_box_pack_start (GTK_BOX (box), toolbar, FALSE, FALSE, 0); ++ if (e_shell_get_meego_mode (shell_window->priv->shell)) ++ gtk_widget_set_name (GTK_WIDGET (toolbar), "MeeGoToolbar"); ++ ++ toolbar = e_shell_window_get_managed_widget ( ++ shell_window, "/close-toolbar"); ++ gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE); ++ gtk_box_pack_start (GTK_BOX (box), toolbar, FALSE, FALSE, 0); ++ if (e_shell_get_meego_mode (shell_window->priv->shell)) ++ gtk_widget_set_name (GTK_WIDGET (toolbar), "MeeGoToolbar"); ++ ++ return box; + } + + static GtkWidget * +@@ -582,11 +646,24 @@ + } + + static void +-shell_window_class_init (EShellWindowClass *class) ++shell_window_realize (GtkWidget *widget) ++{ ++ EShellWindow *shell_window; ++ ++ shell_window = E_SHELL_WINDOW (widget); ++ e_shell_adapt_window_size (shell_window->priv->shell, ++ GTK_WINDOW (widget)); ++ ++ /* Chain up to parent's dispose() method. */ ++ GTK_WIDGET_CLASS (e_shell_window_parent_class)->realize (widget); ++} ++ ++static void ++e_shell_window_class_init (EShellWindowClass *class) + { + GObjectClass *object_class; ++ GtkWidgetClass *widget_class; + +- parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (class, sizeof (EShellWindowPrivate)); + + object_class = G_OBJECT_CLASS (class); +@@ -596,6 +673,9 @@ + object_class->finalize = shell_window_finalize; + object_class->constructed = shell_window_constructed; + ++ widget_class = GTK_WIDGET_CLASS (class); ++ widget_class->realize = shell_window_realize; ++ + class->construct_menubar = shell_window_construct_menubar; + class->construct_toolbar = shell_window_construct_toolbar; + class->construct_sidebar = shell_window_construct_sidebar; +@@ -779,39 +859,13 @@ + } + + static void +-shell_window_init (EShellWindow *shell_window) ++e_shell_window_init (EShellWindow *shell_window) + { + shell_window->priv = E_SHELL_WINDOW_GET_PRIVATE (shell_window); + + e_shell_window_private_init (shell_window); + } + +-GType +-e_shell_window_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) { +- const GTypeInfo type_info = { +- sizeof (EShellWindowClass), +- (GBaseInitFunc) NULL, +- (GBaseFinalizeFunc) NULL, +- (GClassInitFunc) shell_window_class_init, +- (GClassFinalizeFunc) NULL, +- NULL, /* class_data */ +- sizeof (EShellWindow), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) shell_window_init, +- NULL /* value_table */ +- }; +- +- type = g_type_register_static ( +- GTK_TYPE_WINDOW, "EShellWindow", &type_info, 0); +- } +- +- return type; +-} +- + /** + * e_shell_window_new: + * @shell: an #EShell +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-window.h evolution-2.30.2.new//shell/e-shell-window.h +--- evolution-2.30.2//shell/e-shell-window.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-window.h 2010-06-22 13:37:26.952114032 +0200 +@@ -19,12 +19,6 @@ + * + */ + +-/** +- * SECTION: e-shell-window +- * @short_description: the main window +- * @include: shell/e-shell-window.h +- **/ +- + #ifndef E_SHELL_WINDOW_H + #define E_SHELL_WINDOW_H + +@@ -152,6 +146,7 @@ + const gchar *backend_name, + GtkActionEntry *entries, + guint n_entries); ++GtkWidget * e_shell_window_get_menu_bar_box (EShellWindow *shell_window); + + G_END_DECLS + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-window-private.c evolution-2.30.2.new//shell/e-shell-window-private.c +--- evolution-2.30.2//shell/e-shell-window-private.c 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-window-private.c 2010-06-22 13:37:26.952114032 +0200 +@@ -432,7 +432,9 @@ + + object = G_OBJECT (shell_window); + key = "/apps/evolution/shell/view_defaults/component_id"; +- gconf_bridge_bind_property (bridge, key, object, "active-view"); ++ g_object_set (object, "active-view", ++ gconf_client_get_string (e_shell_get_gconf_client (shell), key, NULL), ++ NULL); + + object = G_OBJECT (priv->content_pane); + key = "/apps/evolution/shell/view_defaults/folder_bar/width"; +@@ -442,14 +444,17 @@ + key = "/apps/evolution/shell/view_defaults/sidebar_visible"; + gconf_bridge_bind_property (bridge, key, object, "sidebar-visible"); + +- object = G_OBJECT (shell_window); +- key = "/apps/evolution/shell/view_defaults/statusbar_visible"; +- gconf_bridge_bind_property (bridge, key, object, "taskbar-visible"); +- + if (e_shell_get_express_mode (shell)) { ++ const gchar *active_view = e_shell_window_get_active_view (shell_window); + e_shell_window_set_switcher_visible (shell_window, FALSE); ++ e_shell_window_set_taskbar_visible (shell_window, active_view && ++ !strcmp (active_view, "mail")); + } else { + object = G_OBJECT (shell_window); ++ key = "/apps/evolution/shell/view_defaults/statusbar_visible"; ++ gconf_bridge_bind_property (bridge, key, object, "taskbar-visible"); ++ ++ object = G_OBJECT (shell_window); + key = "/apps/evolution/shell/view_defaults/buttons_visible"; + gconf_bridge_bind_property (bridge, key, object, "switcher-visible"); + } +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/e-shell-window-private.h evolution-2.30.2.new//shell/e-shell-window-private.h +--- evolution-2.30.2//shell/e-shell-window-private.h 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.2.new//shell/e-shell-window-private.h 2010-06-22 13:37:26.952114032 +0200 +@@ -93,6 +93,7 @@ + GtkWidget *status_notebook; + + /* Miscellaneous */ ++ GtkWidget *menubar_box; + + /* Shell signal handlers. */ + GArray *signal_handler_ids; +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/main.c evolution-2.30.2.new//shell/main.c +--- evolution-2.30.2//shell/main.c 2010-06-20 14:14:28.000000000 +0200 ++++ evolution-2.30.2.new//shell/main.c 2010-06-22 13:37:26.952114032 +0200 +@@ -49,6 +49,7 @@ + + #include "e-shell.h" + #include "e-shell-migrate.h" ++#include "e-shell-meego.h" + #include "e-config-upgrade.h" + #include "es-event.h" + +@@ -393,6 +394,7 @@ + gboolean online = TRUE; + const gchar *key; + GError *error = NULL; ++ gboolean is_meego = FALSE, small_screen = FALSE; + + client = gconf_client_get_default (); + +@@ -427,6 +429,9 @@ + if (!express_mode) + express_mode = gconf_client_get_bool (client, key, &error); + ++ if (express_mode) ++ e_shell_detect_meego (&is_meego, &small_screen); ++ + if (error != NULL) { + g_warning ("%s", error->message); + g_clear_error (&error); +@@ -437,7 +442,9 @@ + "name", "org.gnome.Evolution", + "geometry", geometry, + "module-directory", EVOLUTION_MODULEDIR, ++ "meego-mode", is_meego, + "express-mode", express_mode, ++ "small-screen-mode", small_screen, + "online", online, + NULL); + +@@ -507,12 +514,7 @@ + + g_free (path); + +- if (register_handlers || reinstall || show_icons) { +- _e_win32_register_mailer (); +- } +- +- if (register_handlers) +- exit (0); ++ _e_win32_register_mailer (); + + if (reinstall) { + _e_win32_set_default_mailer (); +@@ -630,6 +632,11 @@ + e_plugin_load_plugins (); + } + ++ if (requested_view) ++ e_shell_set_startup_view(shell, requested_view); ++ else if (express_mode) ++ e_shell_set_startup_view(shell, "mail"); ++ + /* Attempt migration -after- loading all modules and plugins, + * as both shell backends and certain plugins hook into this. */ + e_shell_migrate_attempt (shell); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//shell/Makefile.am evolution-2.30.2.new//shell/Makefile.am +--- evolution-2.30.2//shell/Makefile.am 2010-04-26 15:13:18.000000000 +0200 ++++ evolution-2.30.2.new//shell/Makefile.am 2010-06-22 13:37:26.956114032 +0200 +@@ -58,6 +58,8 @@ + e-shell.c \ + e-shell-backend.c \ + e-shell-content.c \ ++ e-shell-meego.c \ ++ e-shell-meego.h \ + e-shell-searchbar.c \ + e-shell-settings.c \ + e-shell-sidebar.c \ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//smime/gui/component.c evolution-2.30.2.new//smime/gui/component.c +--- evolution-2.30.2//smime/gui/component.c 2010-06-20 14:14:40.000000000 +0200 ++++ evolution-2.30.2.new//smime/gui/component.c 2010-06-22 13:37:26.956114032 +0200 +@@ -43,7 +43,7 @@ + + g_strchomp (slot_name); + +- prompt = g_strdup_printf (_("Enter the password for `%s'"), slot_name); ++ prompt = g_strdup_printf (_("Enter the password for '%s'"), slot_name); + g_free (slot_name); + + *passwd = e_passwords_ask_password (_("Enter password"), "SMIME-PKCS11", "", +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//smime/lib/e-cert-db.c evolution-2.30.2.new//smime/lib/e-cert-db.c +--- evolution-2.30.2//smime/lib/e-cert-db.c 2010-06-20 14:14:41.000000000 +0200 ++++ evolution-2.30.2.new//smime/lib/e-cert-db.c 2010-06-22 13:37:26.956114032 +0200 +@@ -1164,7 +1164,7 @@ + rv = FALSE; + } + else { +- printf ("importing %d bytes from `%s'\n", bytes_read, file_path); ++ printf ("importing %d bytes from '%s'\n", bytes_read, file_path); + + switch (cert_type) { + case E_CERT_CA: +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//smime/lib/e-pkcs12.c evolution-2.30.2.new//smime/lib/e-pkcs12.c +--- evolution-2.30.2//smime/lib/e-pkcs12.c 2010-06-20 14:14:41.000000000 +0200 ++++ evolution-2.30.2.new//smime/lib/e-pkcs12.c 2010-06-22 13:37:26.956114032 +0200 +@@ -167,7 +167,7 @@ + fp = g_fopen (path, "rb"); + if (!fp) { + /* XXX gerror */ +- printf ("couldn't open `%s'\n", path); ++ printf ("couldn't open '%s'\n", path); + return FALSE; + } + +@@ -319,7 +319,7 @@ + gboolean wantRetry; + PK11SlotInfo *slot; + +- printf ("importing pkcs12 from `%s'\n", path); ++ printf ("importing pkcs12 from '%s'\n", path); + + slot = PK11_GetInternalKeySlot(); + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//ui/evolution-calendars.ui evolution-2.30.2.new//ui/evolution-calendars.ui +--- evolution-2.30.2//ui/evolution-calendars.ui 2010-04-26 15:13:18.000000000 +0200 ++++ evolution-2.30.2.new//ui/evolution-calendars.ui 2010-06-22 13:37:26.956114032 +0200 +@@ -5,8 +5,10 @@ + + + ++#if !EXPRESS + + ++#endif + + + +@@ -28,20 +30,41 @@ + + + ++#if !EXPRESS ++ ++ + + + ++#endif + + + ++#if !EXPRESS + + ++#endif + + + ++#if !EXPRESS + ++#endif ++ + ++#if !EXPRESS + ++#endif ++#if EXPRESS ++ ++ ++#endif ++ ++ ++#if EXPRESS ++ ++ ++#endif + + + +@@ -59,12 +82,15 @@ + + + ++#if !EXPRESS + + + + ++#endif + + ++#if !EXPRESS + + + +@@ -76,24 +102,31 @@ + + + ++#endif + + + + ++#if !EXPRESS + ++#endif + + + + ++#if !EXPRESS + + + ++#endif + + + ++#if !EXPRESS + + + ++#endif + + + +@@ -108,7 +141,9 @@ + + + ++#if !EXPRESS + ++#endif + + + +@@ -124,7 +159,9 @@ + + + ++#if !EXPRESS + ++#endif + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//ui/evolution-contacts.ui evolution-2.30.2.new//ui/evolution-contacts.ui +--- evolution-2.30.2//ui/evolution-contacts.ui 2010-04-26 15:13:18.000000000 +0200 ++++ evolution-2.30.2.new//ui/evolution-contacts.ui 2010-06-22 13:37:26.956114032 +0200 +@@ -7,8 +7,10 @@ + + + ++#if !EXPRESS + + ++#endif + + + +@@ -46,7 +48,11 @@ + + + ++#if !EXPRESS ++ ++ + ++#endif + + + +@@ -66,7 +72,9 @@ + + + ++#if !EXPRESS + ++#endif + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//ui/evolution-mail.ui evolution-2.30.2.new//ui/evolution-mail.ui +--- evolution-2.30.2//ui/evolution-mail.ui 2010-04-30 03:11:08.000000000 +0200 ++++ evolution-2.30.2.new//ui/evolution-mail.ui 2010-06-22 13:37:26.956114032 +0200 +@@ -61,11 +61,13 @@ + + + +-#if EXPRESS + ++ ++ ++#if EXPRESS + +- + #endif ++ + + #if !EXPRESS + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//ui/evolution-memos.ui evolution-2.30.2.new//ui/evolution-memos.ui +--- evolution-2.30.2//ui/evolution-memos.ui 2010-04-26 15:13:18.000000000 +0200 ++++ evolution-2.30.2.new//ui/evolution-memos.ui 2010-06-22 13:37:26.956114032 +0200 +@@ -29,14 +29,16 @@ + + + +- +- +- +- +- +- +- +- ++#if !EXPRESS ++ ++ ++#endif ++ ++ ++ ++ ++ ++ + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//ui/evolution-shell.ui evolution-2.30.2.new//ui/evolution-shell.ui +--- evolution-2.30.2//ui/evolution-shell.ui 2010-06-22 13:37:17.536114034 +0200 ++++ evolution-2.30.2.new//ui/evolution-shell.ui 2010-06-22 13:37:26.956114032 +0200 +@@ -10,8 +10,10 @@ + + + ++#if !EXPRESS + + ++#endif + + + +@@ -91,8 +93,9 @@ + + + +- +- + + ++ ++ ++ + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//ui/evolution-tasks.ui evolution-2.30.2.new//ui/evolution-tasks.ui +--- evolution-2.30.2//ui/evolution-tasks.ui 2010-04-26 15:13:18.000000000 +0200 ++++ evolution-2.30.2.new//ui/evolution-tasks.ui 2010-06-22 13:37:26.956114032 +0200 +@@ -39,6 +39,10 @@ + + + ++#if !EXPRESS ++ ++ ++#endif + + + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//widgets/misc/e-account-combo-box.c evolution-2.30.2.new//widgets/misc/e-account-combo-box.c +--- evolution-2.30.2//widgets/misc/e-account-combo-box.c 2010-06-20 14:14:33.000000000 +0200 ++++ evolution-2.30.2.new//widgets/misc/e-account-combo-box.c 2010-06-22 13:37:26.956114032 +0200 +@@ -41,6 +41,7 @@ + struct _EAccountComboBoxPrivate { + EAccountList *account_list; + GHashTable *index; ++ gint num_displayed_accounts; + }; + + static gpointer parent_class; +@@ -150,6 +151,8 @@ + GList *list = NULL; + GList *iter; + ++ combo_box->priv->num_displayed_accounts = 0; ++ + store = gtk_list_store_new (2, G_TYPE_STRING, E_TYPE_ACCOUNT); + model = GTK_TREE_MODEL (store); + index = combo_box->priv->index; +@@ -182,6 +185,7 @@ + gchar *string; + + account = iter->data; ++ combo_box->priv->num_displayed_accounts++; + + /* Show the account name for duplicate email addresses. */ + if (account_combo_box_has_dupes (list, account->id->address)) +@@ -514,3 +518,21 @@ + + return e_account_combo_box_set_active (combo_box, account); + } ++ ++/** ++ * e_account_combo_box_count_displayed_accounts: ++ * @combo_box: an #EAccountComboBox ++ * ++ * Counts the number of accounts that are displayed in the @combo_box. This may not ++ * be the actual number of accounts that are configured, as some of those accounts ++ * may be disabled by the user. ++ * ++ * Return value: number of active and valid accounts as shown in the @combo_box. ++ */ ++gint ++e_account_combo_box_count_displayed_accounts (EAccountComboBox *combo_box) ++{ ++ g_return_val_if_fail (E_IS_ACCOUNT_COMBO_BOX (combo_box), -1); ++ ++ return combo_box->priv->num_displayed_accounts; ++} +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//widgets/misc/e-account-combo-box.h evolution-2.30.2.new//widgets/misc/e-account-combo-box.h +--- evolution-2.30.2//widgets/misc/e-account-combo-box.h 2010-06-20 14:14:34.000000000 +0200 ++++ evolution-2.30.2.new//widgets/misc/e-account-combo-box.h 2010-06-22 13:37:26.956114032 +0200 +@@ -78,6 +78,8 @@ + (EAccountComboBox *combo_box, + const gchar *account_name); + ++gint e_account_combo_box_count_displayed_accounts (EAccountComboBox *combo_box); ++ + G_END_DECLS + + #endif /* E_ACCOUNT_COMBO_BOX_H */ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//widgets/misc/e-calendar-item.c evolution-2.30.2.new//widgets/misc/e-calendar-item.c +--- evolution-2.30.2//widgets/misc/e-calendar-item.c 2010-06-20 14:14:29.000000000 +0200 ++++ evolution-2.30.2.new//widgets/misc/e-calendar-item.c 2010-06-22 13:37:26.960114032 +0200 +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + + static const gint e_calendar_item_days_in_month[12] = { + 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 +@@ -228,7 +229,9 @@ + + static guint e_calendar_item_signals[LAST_SIGNAL] = { 0 }; + +-G_DEFINE_TYPE (ECalendarItem, e_calendar_item, GNOME_TYPE_CANVAS_ITEM) ++G_DEFINE_TYPE_WITH_CODE ( ++ ECalendarItem, e_calendar_item, GNOME_TYPE_CANVAS_ITEM, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) + + static void + e_calendar_item_class_init (ECalendarItemClass *class) +@@ -844,6 +847,8 @@ + calitem = E_CALENDAR_ITEM (item); + + e_calendar_item_style_set (GTK_WIDGET(item->canvas), calitem); ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (calitem)); + } + + static void +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//widgets/misc/e-calendar-item.h evolution-2.30.2.new//widgets/misc/e-calendar-item.h +--- evolution-2.30.2//widgets/misc/e-calendar-item.h 2010-06-20 14:14:33.000000000 +0200 ++++ evolution-2.30.2.new//widgets/misc/e-calendar-item.h 2010-06-22 13:37:26.960114032 +0200 +@@ -109,12 +109,24 @@ + typedef struct tm (*ECalendarItemGetTimeCallback) (ECalendarItem *calitem, + gpointer data); + +-#define E_CALENDAR_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ +- e_calendar_item_get_type (), ECalendarItem)) +-#define E_CALENDAR_ITEM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k),\ +- e_calendar_item_get_type ())) +-#define E_IS_CALENDAR_ITEM(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), \ +- e_calendar_item_get_type ())) ++/* Standard GObject macros */ ++#define E_TYPE_CALENDAR_ITEM \ ++ (e_calendar_item_get_type ()) ++#define E_CALENDAR_ITEM(obj) \ ++ (G_TYPE_CHECK_INSTANCE_CAST \ ++ ((obj), E_TYPE_CALENDAR_ITEM, ECalendarItem)) ++#define E_CALENDAR_ITEM_CLASS(cls) \ ++ (G_TYPE_CHECK_CLASS_CAST \ ++ ((cls), E_TYPE_CALENDAR_ITEM, ECalendarItemClass)) ++#define E_IS_CALENDAR_ITEM(obj) \ ++ (G_TYPE_CHECK_INSTANCE_TYPE \ ++ ((obj), E_TYPE_CALENDAR_ITEM)) ++#define E_IS_CALENDAR_ITEM_CLASS(cls) \ ++ (G_TYPE_CHECK_CLASS_TYPE \ ++ ((cls), E_TYPE_CALENDAR_ITEM)) ++#define E_CALENDAR_ITEM_GET_CLASS(obj) \ ++ (G_TYPE_INSTANCE_GET_CLASS \ ++ ((obj), E_TYPE_CALENDAR_ITEM, ECalendarItemClass)) + + struct _ECalendarItem + { +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//widgets/misc/e-dateedit.c evolution-2.30.2.new//widgets/misc/e-dateedit.c +--- evolution-2.30.2//widgets/misc/e-dateedit.c 2010-06-20 14:14:33.000000000 +0200 ++++ evolution-2.30.2.new//widgets/misc/e-dateedit.c 2010-06-22 13:37:26.960114032 +0200 +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + #include "e-calendar.h" + + #define E_DATE_EDIT_GET_PRIVATE(obj) \ +@@ -205,9 +206,12 @@ + gint hour, + gint minute); + +-static gpointer parent_class; + static gint signals[LAST_SIGNAL]; + ++G_DEFINE_TYPE_WITH_CODE ( ++ EDateEdit, e_date_edit, GTK_TYPE_HBOX, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL)) ++ + static void + date_edit_set_property (GObject *object, + guint property_id, +@@ -334,16 +338,15 @@ + } + + /* Chain up to parent's dispose() method. */ +- G_OBJECT_CLASS (parent_class)->dispose (object); ++ G_OBJECT_CLASS (e_date_edit_parent_class)->dispose (object); + } + + static void +-date_edit_class_init (EDateEditClass *class) ++e_date_edit_class_init (EDateEditClass *class) + { + GObjectClass *object_class; + GtkWidgetClass *widget_class; + +- parent_class = g_type_class_peek_parent (class); + g_type_class_add_private (class, sizeof (EDateEditPrivate)); + + object_class = G_OBJECT_CLASS (class); +@@ -448,7 +451,7 @@ + } + + static void +-date_edit_init (EDateEdit *dedit) ++e_date_edit_init (EDateEdit *dedit) + { + dedit->priv = E_DATE_EDIT_GET_PRIVATE (dedit); + +@@ -476,32 +479,8 @@ + + /* Set it to the current time. */ + e_date_edit_set_time (dedit, 0); +-} +- +-GType +-e_date_edit_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) { +- static const GTypeInfo type_info = { +- sizeof (EDateEditClass), +- (GBaseInitFunc) NULL, +- (GBaseFinalizeFunc) NULL, +- (GClassInitFunc) date_edit_class_init, +- (GClassFinalizeFunc) NULL, +- NULL, /* class_data */ +- sizeof (EDateEdit), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) date_edit_init, +- NULL /* value_table */ +- }; +- +- type = g_type_register_static ( +- GTK_TYPE_HBOX, "EDateEdit", &type_info, 0); +- } + +- return type; ++ e_extensible_load_extensions (E_EXTENSIBLE (dedit)); + } + + /** +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//widgets/misc/e-preferences-window.c evolution-2.30.2.new//widgets/misc/e-preferences-window.c +--- evolution-2.30.2//widgets/misc/e-preferences-window.c 2010-06-20 14:14:32.000000000 +0200 ++++ evolution-2.30.2.new//widgets/misc/e-preferences-window.c 2010-06-22 13:37:26.960114032 +0200 +@@ -33,11 +33,17 @@ + + struct _EPreferencesWindowPrivate { + GtkWidget *icon_view; ++ GtkWidget *scroll; + GtkWidget *notebook; + GHashTable *index; ++ ++ GtkListStore *store; ++ GtkTreeModelFilter *filter; ++ const gchar *filter_view; + }; + + enum { ++ COLUMN_ID, /* G_TYPE_STRING */ + COLUMN_TEXT, /* G_TYPE_STRING */ + COLUMN_PIXBUF, /* GDK_TYPE_PIXBUF */ + COLUMN_PAGE, /* G_TYPE_INT */ +@@ -102,7 +108,7 @@ + if (list == NULL) + return; + +- model = gtk_icon_view_get_model (icon_view); ++ model = GTK_TREE_MODEL (window->priv->store); + gtk_tree_model_get_iter (model, &iter, list->data); + gtk_tree_model_get (model, &iter, COLUMN_PAGE, &page, -1); + +@@ -190,6 +196,40 @@ + widget_class->show = preferences_window_show; + } + ++static gboolean ++filter_view (GtkTreeModel *model, ++ GtkTreeIter *iter, ++ gpointer data) ++{ ++ EPreferencesWindow *window = (EPreferencesWindow *)data; ++ gchar *str; ++ gboolean visible = FALSE; ++ ++ if (!window->priv->filter_view) ++ return TRUE; ++ ++ gtk_tree_model_get (model, iter, COLUMN_ID, &str, -1); ++ if (strncmp(window->priv->filter_view, "mail", 4) == 0) { ++ /* Show everything except calendar */ ++ if (str && (strncmp (str, "cal", 3) == 0)) ++ visible = FALSE; ++ else ++ visible = TRUE; ++ } else if (strncmp(window->priv->filter_view, "cal", 3) == 0) { ++ /* Show only calendar and nothing else */ ++ if (str && (strncmp (str, "cal", 3) != 0)) ++ visible = FALSE; ++ else ++ visible = TRUE; ++ ++ } else /* In any other case, show everything */ ++ visible = TRUE; ++ ++ g_free (str); ++ ++ return visible; ++} ++ + static void + preferences_window_init (EPreferencesWindow *window) + { +@@ -209,11 +249,19 @@ + + window->priv = E_PREFERENCES_WINDOW_GET_PRIVATE (window); + window->priv->index = index; ++ window->priv->filter_view = NULL; + + store = gtk_list_store_new ( +- 4, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_INT, G_TYPE_INT); ++ 5, G_TYPE_STRING, G_TYPE_STRING, ++ GDK_TYPE_PIXBUF, G_TYPE_INT, G_TYPE_INT); + gtk_tree_sortable_set_sort_column_id ( + GTK_TREE_SORTABLE (store), COLUMN_SORT, GTK_SORT_ASCENDING); ++ window->priv->store = store; ++ ++ window->priv->filter = (GtkTreeModelFilter *) ++ gtk_tree_model_filter_new (GTK_TREE_MODEL (store), NULL); ++ gtk_tree_model_filter_set_visible_func ( ++ window->priv->filter, filter_view, window, NULL); + + title = _("Evolution Preferences"); + gtk_window_set_title (GTK_WINDOW (window), title); +@@ -243,11 +291,12 @@ + gtk_scrolled_window_set_shadow_type ( + GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN); + gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, TRUE, 0); ++ window->priv->scroll = widget; + gtk_widget_show (widget); + + container = widget; + +- widget = gtk_icon_view_new_with_model (GTK_TREE_MODEL (store)); ++ widget = gtk_icon_view_new_with_model (GTK_TREE_MODEL (window->priv->filter)); + gtk_icon_view_set_columns (GTK_ICON_VIEW (widget), 1); + gtk_icon_view_set_text_column (GTK_ICON_VIEW (widget), COLUMN_TEXT); + gtk_icon_view_set_pixbuf_column (GTK_ICON_VIEW (widget), COLUMN_PIXBUF); +@@ -359,13 +408,14 @@ + notebook = GTK_NOTEBOOK (window->priv->notebook); + + page = gtk_notebook_get_n_pages (notebook); +- model = gtk_icon_view_get_model (icon_view); ++ model = GTK_TREE_MODEL (window->priv->store); + pixbuf = preferences_window_load_pixbuf (icon_name); + + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + + gtk_list_store_set ( + GTK_LIST_STORE (model), &iter, ++ COLUMN_ID, page_name, + COLUMN_TEXT, caption, COLUMN_PIXBUF, pixbuf, + COLUMN_PAGE, page, COLUMN_SORT, sort_order, -1); + +@@ -405,3 +455,35 @@ + gtk_icon_view_scroll_to_path (icon_view, path, FALSE, 0.0, 0.0); + gtk_tree_path_free (path); + } ++ ++void ++e_preferences_window_filter_page (EPreferencesWindow *window, ++ const gchar *page_name) ++{ ++ GtkTreeRowReference *reference; ++ GtkIconView *icon_view; ++ GtkTreePath *path; ++ ++ g_return_if_fail (E_IS_PREFERENCES_WINDOW (window)); ++ g_return_if_fail (page_name != NULL); ++ ++ icon_view = GTK_ICON_VIEW (window->priv->icon_view); ++ reference = g_hash_table_lookup (window->priv->index, page_name); ++ g_return_if_fail (reference != NULL); ++ ++ path = gtk_tree_row_reference_get_path (reference); ++ gtk_icon_view_select_path (icon_view, path); ++ gtk_icon_view_scroll_to_path (icon_view, path, FALSE, 0.0, 0.0); ++ gtk_tree_path_free (path); ++ ++ window->priv->filter_view = page_name; ++ gtk_tree_model_filter_refilter (window->priv->filter); ++ ++ /* XXX: We need a better solution to hide the icon view when ++ * there is just one entry */ ++ if (strncmp(page_name, "cal", 3) == 0) { ++ gtk_widget_hide (window->priv->scroll); ++ } else ++ gtk_widget_show (window->priv->scroll); ++} ++ +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//widgets/misc/e-preferences-window.h evolution-2.30.2.new//widgets/misc/e-preferences-window.h +--- evolution-2.30.2//widgets/misc/e-preferences-window.h 2010-06-20 14:14:31.000000000 +0200 ++++ evolution-2.30.2.new//widgets/misc/e-preferences-window.h 2010-06-22 13:37:26.960114032 +0200 +@@ -68,6 +68,8 @@ + gint sort_order); + void e_preferences_window_show_page (EPreferencesWindow *window, + const gchar *page_name); ++void e_preferences_window_filter_page(EPreferencesWindow *window, ++ const gchar *page_name); + + G_END_DECLS + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//widgets/misc/e-web-view.c evolution-2.30.2.new//widgets/misc/e-web-view.c +--- evolution-2.30.2//widgets/misc/e-web-view.c 2010-06-20 14:14:34.000000000 +0200 ++++ evolution-2.30.2.new//widgets/misc/e-web-view.c 2010-06-22 13:37:26.960114032 +0200 +@@ -28,9 +28,10 @@ + #include + #include + +-#include "e-util/e-util.h" +-#include "e-util/e-binding.h" +-#include "e-util/e-plugin-ui.h" ++#include ++#include ++#include ++#include + + #include "e-popup-action.h" + #include "e-selectable.h" +@@ -75,6 +76,9 @@ + PROP_DISABLE_PRINTING, + PROP_DISABLE_SAVE_TO_DISK, + PROP_EDITABLE, ++ PROP_INLINE_SPELLING, ++ PROP_MAGIC_LINKS, ++ PROP_MAGIC_SMILEYS, + PROP_OPEN_PROXY, + PROP_PASTE_TARGET_LIST, + PROP_PRINT_PROXY, +@@ -118,6 +122,14 @@ + " " + ""; + ++/* Forward Declarations */ ++static void e_web_view_selectable_init (ESelectableInterface *interface); ++ ++G_DEFINE_TYPE_WITH_CODE ( ++ EWebView, e_web_view, GTK_TYPE_HTML, ++ G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL) ++ G_IMPLEMENT_INTERFACE (E_TYPE_SELECTABLE, e_web_view_selectable_init)) ++ + static EWebViewRequest * + web_view_request_new (EWebView *web_view, + const gchar *uri, +@@ -503,6 +515,24 @@ + g_value_get_boolean (value)); + return; + ++ case PROP_INLINE_SPELLING: ++ e_web_view_set_inline_spelling ( ++ E_WEB_VIEW (object), ++ g_value_get_boolean (value)); ++ return; ++ ++ case PROP_MAGIC_LINKS: ++ e_web_view_set_magic_links ( ++ E_WEB_VIEW (object), ++ g_value_get_boolean (value)); ++ return; ++ ++ case PROP_MAGIC_SMILEYS: ++ e_web_view_set_magic_smileys ( ++ E_WEB_VIEW (object), ++ g_value_get_boolean (value)); ++ return; ++ + case PROP_OPEN_PROXY: + e_web_view_set_open_proxy ( + E_WEB_VIEW (object), +@@ -574,6 +604,24 @@ + E_WEB_VIEW (object))); + return; + ++ case PROP_INLINE_SPELLING: ++ g_value_set_boolean ( ++ value, e_web_view_get_inline_spelling ( ++ E_WEB_VIEW (object))); ++ return; ++ ++ case PROP_MAGIC_LINKS: ++ g_value_set_boolean ( ++ value, e_web_view_get_magic_links ( ++ E_WEB_VIEW (object))); ++ return; ++ ++ case PROP_MAGIC_SMILEYS: ++ g_value_set_boolean ( ++ value, e_web_view_get_magic_smileys ( ++ E_WEB_VIEW (object))); ++ return; ++ + case PROP_OPEN_PROXY: + g_value_set_object ( + value, e_web_view_get_open_proxy ( +@@ -809,6 +857,16 @@ + } + + static void ++web_view_load_string (EWebView *web_view, ++ const gchar *string) ++{ ++ if (string != NULL && *string != '\0') ++ gtk_html_load_from_string (GTK_HTML (web_view), string, -1); ++ else ++ e_web_view_clear (web_view); ++} ++ ++static void + web_view_copy_clipboard (EWebView *web_view) + { + gtk_html_command (GTK_HTML (web_view), "copy"); +@@ -1004,7 +1062,7 @@ + } + + static void +-web_view_class_init (EWebViewClass *class) ++e_web_view_class_init (EWebViewClass *class) + { + GObjectClass *object_class; + GtkWidgetClass *widget_class; +@@ -1030,6 +1088,7 @@ + html_class->iframe_created = web_view_iframe_created; + + class->extract_uri = web_view_extract_uri; ++ class->load_string = web_view_load_string; + class->copy_clipboard = web_view_copy_clipboard; + class->cut_clipboard = web_view_cut_clipboard; + class->paste_clipboard = web_view_paste_clipboard; +@@ -1072,7 +1131,8 @@ + "Disable Printing", + NULL, + FALSE, +- G_PARAM_READWRITE)); ++ G_PARAM_READWRITE | ++ G_PARAM_CONSTRUCT)); + + g_object_class_install_property ( + object_class, +@@ -1082,7 +1142,8 @@ + "Disable Save-to-Disk", + NULL, + FALSE, +- G_PARAM_READWRITE)); ++ G_PARAM_READWRITE | ++ G_PARAM_CONSTRUCT)); + #endif + + g_object_class_install_property ( +@@ -1097,6 +1158,36 @@ + + g_object_class_install_property ( + object_class, ++ PROP_INLINE_SPELLING, ++ g_param_spec_boolean ( ++ "inline-spelling", ++ "Inline Spelling", ++ NULL, ++ FALSE, ++ G_PARAM_READWRITE)); ++ ++ g_object_class_install_property ( ++ object_class, ++ PROP_MAGIC_LINKS, ++ g_param_spec_boolean ( ++ "magic-links", ++ "Magic Links", ++ NULL, ++ FALSE, ++ G_PARAM_READWRITE)); ++ ++ g_object_class_install_property ( ++ object_class, ++ PROP_MAGIC_SMILEYS, ++ g_param_spec_boolean ( ++ "magic-smileys", ++ "Magic Smileys", ++ NULL, ++ FALSE, ++ G_PARAM_READWRITE)); ++ ++ g_object_class_install_property ( ++ object_class, + PROP_OPEN_PROXY, + g_param_spec_object ( + "open-proxy", +@@ -1209,7 +1300,7 @@ + } + + static void +-web_view_selectable_init (ESelectableInterface *interface) ++e_web_view_selectable_init (ESelectableInterface *interface) + { + interface->update_actions = web_view_selectable_update_actions; + interface->cut_clipboard = web_view_selectable_cut_clipboard; +@@ -1219,7 +1310,7 @@ + } + + static void +-web_view_init (EWebView *web_view) ++e_web_view_init (EWebView *web_view) + { + GtkUIManager *ui_manager; + GtkActionGroup *action_group; +@@ -1335,41 +1426,8 @@ + id = "org.gnome.evolution.webview"; + e_plugin_ui_register_manager (ui_manager, id, web_view); + e_plugin_ui_enable_manager (ui_manager, id); +-} +- +-GType +-e_web_view_get_type (void) +-{ +- static GType type = 0; +- +- if (G_UNLIKELY (type == 0)) { +- static const GTypeInfo type_info = { +- sizeof (EWebViewClass), +- (GBaseInitFunc) NULL, +- (GBaseFinalizeFunc) NULL, +- (GClassInitFunc) web_view_class_init, +- (GClassFinalizeFunc) NULL, +- NULL, /* class_data */ +- sizeof (EWebView), +- 0, /* n_preallocs */ +- (GInstanceInitFunc) web_view_init, +- NULL /* value_table */ +- }; +- +- static const GInterfaceInfo selectable_info = { +- (GInterfaceInitFunc) web_view_selectable_init, +- (GInterfaceFinalizeFunc) NULL, +- NULL /* interface_data */ +- }; + +- type = g_type_register_static ( +- GTK_TYPE_HTML, "EWebView", &type_info, 0); +- +- g_type_add_interface_static ( +- type, E_TYPE_SELECTABLE, &selectable_info); +- } +- +- return type; ++ e_extensible_load_extensions (E_EXTENSIBLE (web_view)); + } + + GtkWidget * +@@ -1390,12 +1448,14 @@ + e_web_view_load_string (EWebView *web_view, + const gchar *string) + { ++ EWebViewClass *class; ++ + g_return_if_fail (E_IS_WEB_VIEW (web_view)); + +- if (string != NULL && *string != '\0') +- gtk_html_load_from_string (GTK_HTML (web_view), string, -1); +- else +- e_web_view_clear (web_view); ++ class = E_WEB_VIEW_GET_CLASS (web_view); ++ g_return_if_fail (class->load_string != NULL); ++ ++ class->load_string (web_view, string); + } + + gboolean +@@ -1522,6 +1582,84 @@ + g_object_notify (G_OBJECT (web_view), "editable"); + } + ++gboolean ++e_web_view_get_inline_spelling (EWebView *web_view) ++{ ++ /* XXX This is just here to maintain symmetry ++ * with e_web_view_set_inline_spelling(). */ ++ ++ g_return_val_if_fail (E_IS_WEB_VIEW (web_view), FALSE); ++ ++ return gtk_html_get_inline_spelling (GTK_HTML (web_view)); ++} ++ ++void ++e_web_view_set_inline_spelling (EWebView *web_view, ++ gboolean inline_spelling) ++{ ++ /* XXX GtkHTML does not utilize GObject properties as well ++ * as it could. This just wraps gtk_html_set_inline_spelling() ++ * so we get a "notify::inline-spelling" signal. */ ++ ++ g_return_if_fail (E_IS_WEB_VIEW (web_view)); ++ ++ gtk_html_set_inline_spelling (GTK_HTML (web_view), inline_spelling); ++ ++ g_object_notify (G_OBJECT (web_view), "inline-spelling"); ++} ++ ++gboolean ++e_web_view_get_magic_links (EWebView *web_view) ++{ ++ /* XXX This is just here to maintain symmetry ++ * with e_web_view_set_magic_links(). */ ++ ++ g_return_val_if_fail (E_IS_WEB_VIEW (web_view), FALSE); ++ ++ return gtk_html_get_magic_links (GTK_HTML (web_view)); ++} ++ ++void ++e_web_view_set_magic_links (EWebView *web_view, ++ gboolean magic_links) ++{ ++ /* XXX GtkHTML does not utilize GObject properties as well ++ * as it could. This just wraps gtk_html_set_magic_links() ++ * so we can get a "notify::magic-links" signal. */ ++ ++ g_return_if_fail (E_IS_WEB_VIEW (web_view)); ++ ++ gtk_html_set_magic_links (GTK_HTML (web_view), magic_links); ++ ++ g_object_notify (G_OBJECT (web_view), "magic-links"); ++} ++ ++gboolean ++e_web_view_get_magic_smileys (EWebView *web_view) ++{ ++ /* XXX This is just here to maintain symmetry ++ * with e_web_view_set_magic_smileys(). */ ++ ++ g_return_val_if_fail (E_IS_WEB_VIEW (web_view), FALSE); ++ ++ return gtk_html_get_magic_smileys (GTK_HTML (web_view)); ++} ++ ++void ++e_web_view_set_magic_smileys (EWebView *web_view, ++ gboolean magic_smileys) ++{ ++ /* XXX GtkHTML does not utilize GObject properties as well ++ * as it could. This just wraps gtk_html_set_magic_smileys() ++ * so we can get a "notify::magic-smileys" signal. */ ++ ++ g_return_if_fail (E_IS_WEB_VIEW (web_view)); ++ ++ gtk_html_set_magic_smileys (GTK_HTML (web_view), magic_smileys); ++ ++ g_object_notify (G_OBJECT (web_view), "magic-smileys"); ++} ++ + const gchar * + e_web_view_get_selected_uri (EWebView *web_view) + { +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//widgets/misc/e-web-view.h evolution-2.30.2.new//widgets/misc/e-web-view.h +--- evolution-2.30.2//widgets/misc/e-web-view.h 2010-06-20 14:14:33.000000000 +0200 ++++ evolution-2.30.2.new//widgets/misc/e-web-view.h 2010-06-22 13:37:26.964114032 +0200 +@@ -69,6 +69,8 @@ + gchar * (*extract_uri) (EWebView *web_view, + GdkEventButton *event, + GtkHTML *frame); ++ void (*load_string) (EWebView *web_view, ++ const gchar *load_string); + + /* Signals */ + void (*copy_clipboard) (EWebView *web_view); +@@ -106,6 +108,15 @@ + gboolean e_web_view_get_editable (EWebView *web_view); + void e_web_view_set_editable (EWebView *web_view, + gboolean editable); ++gboolean e_web_view_get_inline_spelling (EWebView *web_view); ++void e_web_view_set_inline_spelling (EWebView *web_view, ++ gboolean inline_spelling); ++gboolean e_web_view_get_magic_links (EWebView *web_view); ++void e_web_view_set_magic_links (EWebView *web_view, ++ gboolean magic_links); ++gboolean e_web_view_get_magic_smileys (EWebView *web_view); ++void e_web_view_set_magic_smileys (EWebView *web_view, ++ gboolean magic_smileys); + const gchar * e_web_view_get_selected_uri (EWebView *web_view); + void e_web_view_set_selected_uri (EWebView *web_view, + const gchar *selected_uri); +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2//widgets/table/e-cell-text.c evolution-2.30.2.new//widgets/table/e-cell-text.c +--- evolution-2.30.2//widgets/table/e-cell-text.c 2010-06-20 14:14:37.000000000 +0200 ++++ evolution-2.30.2.new//widgets/table/e-cell-text.c 2010-06-22 13:37:26.964114032 +0200 +@@ -1421,7 +1421,7 @@ + * should be 16 + 4. + * Height of some special font is much higher than others, + * such as Arabic. So leave some more margin for cell. +-` */ ++ */ + return 16 + 8; + } + --- evolution-2.30.2.orig/debian/patches/11_remove_upstream_submit_bugreport.patch +++ evolution-2.30.2/debian/patches/11_remove_upstream_submit_bugreport.patch @@ -0,0 +1,17 @@ +Description: Don't show upstream report a bug as we already have the launchpad + one +Origin: Ubuntu +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/evolution/+bug/105093 +Author: Bilal Akhtar + +diff -Nur -x '*.orig' -x '*~' evolution-2.30.2/ui/evolution-shell.ui evolution-2.30.2.new/ui/evolution-shell.ui +--- evolution-2.30.2/ui/evolution-shell.ui 2010-08-04 22:59:32.124414573 +0530 ++++ evolution-2.30.2.new/ui/evolution-shell.ui 2010-08-04 22:59:34.055415853 +0530 +@@ -85,7 +85,6 @@ + + + +- + + + --- evolution-2.30.2.orig/debian/lintian/evolution-common +++ evolution-2.30.2/debian/lintian/evolution-common @@ -0,0 +1,2 @@ +evolution-common: desktop-command-not-in-package /usr/share/applications/evolution.desktop evolution +evolution-common: desktop-command-not-in-package /usr/share/applications/evolution-settings.desktop evolution-settings