nonprism/claws-mail: updated to 3.15.1

4 files changed, 2044 insertions, 822 deletions

diff --git a/nonprism/claws-mail/PKGBUILD b/nonprism/claws-mail/PKGBUILD
index f4932ddfe..5ac31f985 100644
--- a/nonprism/claws-mail/PKGBUILD
+++ b/nonprism/claws-mail/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 288058 2017-02-05 09:28:56Z andyrtr $
+# Maintainer: Andreas Grapentin <andreas@grapentin.org>
 # Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
-# Maintainer: Márcio Silva <coadde@hyperbola.info>
+# Contributor: Márcio Silva <coadde@hyperbola.info>
 
 pkgname=claws-mail
-pkgver=3.14.1
+
+pkgver=3.15.1
 pkgrel=3.nonprism1
+arch=(i686 x86_64 armv7h)
+
 pkgdesc="A GTK+ based e-mail client, without libgdata support"
-arch=('i686' 'x86_64' 'armv7h')
-license=('GPL3')
 url="http://www.claws-mail.org"
-depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan' 'compface'
-         'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('spamassassin' 'bogofilter' 'valgrind'
+license=(GPL3)
+
+depends=(gtk2 gnutls startup-notification enchant gpgme libetpan compface
+         libsm dbus-glib hicolor-icon-theme desktop-file-utils)
+makedepends=(spamassassin bogofilter valgrind
              # dependencies for plugins
-             'libnotify' 'libcanberra' 'poppler-glib' 'pygtk' 'dillo'
+             libnotify libcanberra poppler-glib pygtk libytnef libical dillo
              # deps to build the docs
-             'docbook-utils')
+             docbook-utils)
              #'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases
 optdepends=('python2:           needed for some tools and python plugin'
             'perl:              needed for some tools and perl plugin'
@@ -30,31 +33,39 @@ optdepends=('python2:           needed for some tools and python plugin'
             'libytnef:          for tnef_parse plugin'
             'poppler-glib:      for pdf viewer plugin'
             'ghostscript:       for pdf viewer plugin'
+            'libical:           for vcalendar plugin'
             'dillo:             for html viewer plugin')
-replaces=('sylpheed-claws' 'claws-mail-extra-plugins' 'claws-mail-libre' 'claws-mail-libre-nonprism' 'claws-mail-nonprism')
-conflicts=('claws-mail-extra-plugins' 'claws-mail-libre' 'claws-mail-libre-nonprism' 'claws-mail-nonprism')
-provides=('claws')
+replaces=(sylpheed-claws claws-mail-extra-plugins claws-mail-libre claws-mail-libre-nonprism claws-mail-nonprism)
+conflicts=(claws-mail-extra-plugins claws-mail-libre claws-mail-libre-nonprism claws-mail-nonprism)
+provides=(claws)
+
 source=(http://www.claws-mail.org/download.php?file=releases/claws-mail-$pkgver.tar.xz{,.asc}
-        dillo-plugin.diff)
-sha256sums=('b79a1dc04f0b3d1f693e84d7fa7282f140fb5280179281445a8b954ce423c335'
+        dillo-plugin.diff
+        enchant-2.patch
+        claws-mail-3.15.1-libical3.patch)
+sha256sums=('8d093c2f32db863c1141d56e35424c04ee48fe5d6adf4c7f349f647fa3149542'
             'SKIP'
-            'e58fde187b53ce12d4cb711a11ad2c6f5c3d152253e07999710decfd414b14ce')
+            '4913d101aa32a69afda7ffb17eb23dce8580bfb619e28cc271f4ea10ce39cc5d'
+            'fafd9713b265b55a84b01e5071d930965b98d34cde57be4aaa46c5eb6c2635ce'
+            '160cb7a3ac057c5a8f65427adc152f53abd372eeaf1b371e9a99bfcb741a793f')
 validpgpkeys=('8B3B297A03468356692F8D592CD716D654D6BBD4') # Paul <paul@claws-mail.org>
 
 prepare() {
-  cd ${pkgname}-${pkgver}
+  cd $pkgname-$pkgver
   # upstream reintroduction of dillo plugin - after fancy plugin dropped
   patch -Np1 -i ../dillo-plugin.diff
+  patch -Np1 -i ../enchant-2.patch
+  patch -Np1 -i ../claws-mail-3.15.1-libical3.patch
   autoreconf -vfi
+  sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
+  sed -i 's:python -c:python2 -c:g' configure
 }
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd $pkgname-$pkgver
 
   # fixes for python2
   export PYTHON="/usr/bin/python2"
-  sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
-  sed -i 's:python -c:python2 -c:g' configure
 
   ./configure --prefix=/usr --disable-static \
     --enable-enchant \
@@ -65,19 +76,18 @@ build() {
     --enable-spamassassin-plugin \
     --enable-bogofilter-plugin \
     --disable-gdata-plugin    #--help
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 
-  # build and install extra tools
+  # install extra tools
   cd tools
-  make
-   # all executables and .conf files ; only top directory
-  find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do
-      install -D -m755 ${i} \
-        ${pkgdir}/usr/lib/claws-mail/tools/${i}
+  install -m755 -d $pkgdir/usr/lib/claws-mail/tools
+  for files in *.pl *.py *.sh kdeservicemenu multiwebsearch.conf tb2claws-mail update-po uudec uuooffice README; do
+    cp -arv $files $pkgdir/usr/lib/claws-mail/tools/$i
   done
 }
diff --git a/nonprism/claws-mail/claws-mail-3.15.1-libical3.patch b/nonprism/claws-mail/claws-mail-3.15.1-libical3.patch
new file mode 100644
index 000000000..85cb8e92d
--- /dev/null
+++ b/nonprism/claws-mail/claws-mail-3.15.1-libical3.patch
@@ -0,0 +1,83 @@
+diff -Nur claws-mail-3.15.1-orig/src/plugins/vcalendar/vcalendar.c claws-mail-3.15.1/src/plugins/vcalendar/vcalendar.c
+--- claws-mail-3.15.1-orig/src/plugins/vcalendar/vcalendar.c	2017-08-28 19:48:24.000000000 +0200
++++ claws-mail-3.15.1/src/plugins/vcalendar/vcalendar.c	2017-11-16 17:51:01.139709415 +0100
+@@ -157,8 +157,8 @@
+ 			gchar *orgname = NULL;
+ 			gchar *summary = g_strdup(msginfo->subject ? msginfo->subject:_("no subject"));
+ 			gchar *description = file_read_stream_to_str(fp);
+-			gchar *dtstart = g_strdup(icaltime_as_ical_string(icaltime_from_timet(t, FALSE)));
+-			gchar *dtend = g_strdup(icaltime_as_ical_string(icaltime_from_timet(t2, FALSE)));
++			gchar *dtstart = g_strdup(icaltime_as_ical_string(icaltime_from_timet_with_zone(t, FALSE,NULL)));
++			gchar *dtend = g_strdup(icaltime_as_ical_string(icaltime_from_timet_with_zone(t2, FALSE,NULL)));
+ 			gchar *recur = NULL;
+ 			gchar *tzid = g_strdup("UTC");
+ 			gchar *url = NULL;
+diff -Nur claws-mail-3.15.1-orig/src/plugins/vcalendar/vcal_manager.c claws-mail-3.15.1/src/plugins/vcalendar/vcal_manager.c
+--- claws-mail-3.15.1-orig/src/plugins/vcalendar/vcal_manager.c	2017-08-28 19:48:24.000000000 +0200
++++ claws-mail-3.15.1/src/plugins/vcalendar/vcal_manager.c	2017-11-16 17:43:34.911106211 +0100
+@@ -395,7 +395,7 @@
+ 	icalcomponent_add_property(ievent,
+                 icalproperty_new_uid(event->uid));
+ 	icalcomponent_add_property(ievent,
+-		icalproperty_vanew_dtstamp(icaltime_from_timet(time(NULL), TRUE), (void*)0));
++                               icalproperty_vanew_dtstamp(icaltime_from_timet_with_zone(time(NULL), TRUE, NULL), (void*)0));
+ 	icalcomponent_add_property(ievent,
+ 		icalproperty_vanew_dtstart((icaltime_from_string(event->dtstart)), (void*)0));
+ 	icalcomponent_add_property(ievent,
+@@ -423,9 +423,9 @@
+ 	icalcomponent_add_property(ievent,
+ 		icalproperty_new_status(ICAL_STATUS_CONFIRMED));
+ 	icalcomponent_add_property(ievent,
+-		icalproperty_vanew_created(icaltime_from_timet(time(NULL), TRUE), (void*)0));
++                               icalproperty_vanew_created(icaltime_from_timet_with_zone(time(NULL), TRUE, NULL), (void*)0));
+ 	icalcomponent_add_property(ievent,
+-		icalproperty_vanew_lastmodified(icaltime_from_timet(time(NULL), TRUE), (void*)0));
++                               icalproperty_vanew_lastmodified(icaltime_from_timet_with_zone(time(NULL), TRUE, NULL), (void*)0));
+ 	icalcomponent_add_property(ievent,		
+                 orgprop);
+ 
+diff -Nur claws-mail-3.15.1-orig/src/plugins/vcalendar/vcal_meeting_gtk.c claws-mail-3.15.1/src/plugins/vcalendar/vcal_meeting_gtk.c
+--- claws-mail-3.15.1-orig/src/plugins/vcalendar/vcal_meeting_gtk.c	2017-08-28 19:48:24.000000000 +0200
++++ claws-mail-3.15.1/src/plugins/vcalendar/vcal_meeting_gtk.c	2017-11-16 17:54:45.798495950 +0100
+@@ -477,7 +477,7 @@
+ 	debug_print("DST change offset to apply to time %d\n", dst_offset);
+ 	t += dst_offset;
+ 	debug_print("%s\n", ctime(&t));
+-	return g_strdup(icaltime_as_ical_string(icaltime_from_timet(t, FALSE)));
++	return g_strdup(icaltime_as_ical_string(icaltime_from_timet_with_zone(t, FALSE,NULL)));
+ }
+ 
+ static gchar *get_location(VCalMeeting *meet)
+@@ -893,8 +893,8 @@
+ 	found = FALSE;
+ 	while (!found && offset >= -3600*6) {
+ 		gboolean ok = TRUE;
+-		struct icaltimetype new_start = icaltime_from_timet(icaltime_as_timet(start)+offset, FALSE);
+-		struct icaltimetype new_end   = icaltime_from_timet(icaltime_as_timet(end)+offset, FALSE);
++		struct icaltimetype new_start = icaltime_from_timet_with_zone(icaltime_as_timet(start)+offset, FALSE, NULL);
++		struct icaltimetype new_end   = icaltime_from_timet_with_zone(icaltime_as_timet(end)+offset, FALSE, NULL);
+ 		for (cur = attendees; cur; cur = cur->next) {
+ 			VCalAttendee *attendee = (VCalAttendee *)cur->data;
+ 			debug_print("trying %s - %s (offset %d)\n", 
+@@ -919,8 +919,8 @@
+ 	offset = 1800;
+ 	while (!found && offset <= 3600*6) {
+ 		gboolean ok = TRUE;
+-		struct icaltimetype new_start = icaltime_from_timet(icaltime_as_timet(start)+offset, FALSE);
+-		struct icaltimetype new_end   = icaltime_from_timet(icaltime_as_timet(end)+offset, FALSE);
++		struct icaltimetype new_start = icaltime_from_timet_with_zone(icaltime_as_timet(start)+offset, FALSE, NULL);
++		struct icaltimetype new_end   = icaltime_from_timet_with_zone(icaltime_as_timet(end)+offset, FALSE, NULL);
+ 		for (cur = attendees; cur; cur = cur->next) {
+ 			VCalAttendee *attendee = (VCalAttendee *)cur->data;
+ 			debug_print("trying %s - %s (offset %d)\n", 
+@@ -2172,8 +2172,8 @@
+ 
+ 	icalcomponent_add_component(calendar, timezone);
+ 
+-	itt_start = icaltime_from_timet(whole_start, FALSE);
+-	itt_end = icaltime_from_timet(whole_end, FALSE);
++	itt_start = icaltime_from_timet_with_zone(whole_start, FALSE, NULL);
++	itt_end = icaltime_from_timet_with_zone(whole_end, FALSE, NULL);
+ 	itt_start.second = itt_start.minute = itt_start.hour = 0;
+ 	itt_end.second = 59; itt_end.minute = 59; itt_end.hour = 23;
+ 
diff --git a/nonprism/claws-mail/dillo-plugin.diff b/nonprism/claws-mail/dillo-plugin.diff
index 86cafae4d..1762e3d70 100644
--- a/nonprism/claws-mail/dillo-plugin.diff
+++ b/nonprism/claws-mail/dillo-plugin.diff
@@ -1,10 +1,1016 @@
-From 1e068dbfc2837809030dcbf0173d2841a411d95a Mon Sep 17 00:00:00 2001
-From: wwp <wwp@free.fr>
+<!DOCTYPE html>
+<html lang='en'>
+<head>
+<title>dillo-plugin.diff\trunk - svntogit/packages.git - Git clone of the 'packages' repository
+</title>
+<meta name='generator' content='cgit v0.12'/>
+<meta name='robots' content='index, nofollow'/>
+<link rel='stylesheet' type='text/css' href='/cgit.css'/>
+<link rel='shortcut icon' href='/favicon.ico'/>
+<link rel='alternate' title='Atom feed' href='https://git.archlinux.org/svntogit/packages.git/atom/trunk/dillo-plugin.diff?h=packages/claws-mail' type='application/atom+xml'/>
+<link rel='vcs-git' href='https://git.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/>
+<link rel='vcs-git' href='git://git.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/>
+<link rel='vcs-git' href='ssh://git.archlinux.org/srv/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>
+</head>
+<body>
+	<div id="archnavbar"><!-- Arch Linux global navigation bar -->
+		<div id="archnavbarlogo">
+			<p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p>
+		</div>
+		<div id="archnavbarmenu">
+			<ul id="archnavbarlist">
+				<li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li>
+				<li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li>
+				<li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>
+				<li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>
+				<li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li>
+				<li id="anb-sec"><a href="https://security.archlinux.org/" title="Security Tracker">Security</a></li>
+				<li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li>
+				<li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li>
+			</ul>
+		</div>
+	</div><!-- #archnavbar -->
+<div id='cgit'><table id='header'>
+<tr>
+<td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td></tr>
+<tr><td class='sub'>Git clone of the 'packages' repository
+</td><td class='sub right'></td></tr></table>
+<table class='tabs'><tr><td>
+<a href='/svntogit/packages.git/?h=packages/claws-mail'>summary</a><a href='/svntogit/packages.git/refs/?h=packages/claws-mail'>refs</a><a href='/svntogit/packages.git/log/trunk/dillo-plugin.diff?h=packages/claws-mail'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/dillo-plugin.diff?h=packages/claws-mail'>tree</a><a href='/svntogit/packages.git/commit/trunk/dillo-plugin.diff?h=packages/claws-mail'>commit</a><a href='/svntogit/packages.git/diff/trunk/dillo-plugin.diff?h=packages/claws-mail'>diff</a><a href='/svntogit/packages.git/stats/trunk/dillo-plugin.diff?h=packages/claws-mail'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/dillo-plugin.diff'>
+<input type='hidden' name='h' value='packages/claws-mail'/><select name='qt'>
+<option value='grep'>log msg</option>
+<option value='author'>author</option>
+<option value='committer'>committer</option>
+<option value='range'>range</option>
+</select>
+<input class='txt' type='text' size='10' name='q' value=''/>
+<input type='submit' value='search'/>
+</form>
+</td></tr></table>
+<div class='path'>path: <a href='/svntogit/packages.git/tree/?h=packages/claws-mail'>root</a>/<a href='/svntogit/packages.git/tree/trunk?h=packages/claws-mail'>trunk</a>/<a href='/svntogit/packages.git/tree/trunk/dillo-plugin.diff?h=packages/claws-mail'>dillo-plugin.diff</a></div><div class='content'>blob: 15090454a56af9e084991bc843fab07172ef812d (<a href='/svntogit/packages.git/plain/trunk/dillo-plugin.diff?h=packages/claws-mail'>plain</a>)
+<table summary='blob content' class='blob'>
+<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
+<a id='n2' href='#n2'>2</a>
+<a id='n3' href='#n3'>3</a>
+<a id='n4' href='#n4'>4</a>
+<a id='n5' href='#n5'>5</a>
+<a id='n6' href='#n6'>6</a>
+<a id='n7' href='#n7'>7</a>
+<a id='n8' href='#n8'>8</a>
+<a id='n9' href='#n9'>9</a>
+<a id='n10' href='#n10'>10</a>
+<a id='n11' href='#n11'>11</a>
+<a id='n12' href='#n12'>12</a>
+<a id='n13' href='#n13'>13</a>
+<a id='n14' href='#n14'>14</a>
+<a id='n15' href='#n15'>15</a>
+<a id='n16' href='#n16'>16</a>
+<a id='n17' href='#n17'>17</a>
+<a id='n18' href='#n18'>18</a>
+<a id='n19' href='#n19'>19</a>
+<a id='n20' href='#n20'>20</a>
+<a id='n21' href='#n21'>21</a>
+<a id='n22' href='#n22'>22</a>
+<a id='n23' href='#n23'>23</a>
+<a id='n24' href='#n24'>24</a>
+<a id='n25' href='#n25'>25</a>
+<a id='n26' href='#n26'>26</a>
+<a id='n27' href='#n27'>27</a>
+<a id='n28' href='#n28'>28</a>
+<a id='n29' href='#n29'>29</a>
+<a id='n30' href='#n30'>30</a>
+<a id='n31' href='#n31'>31</a>
+<a id='n32' href='#n32'>32</a>
+<a id='n33' href='#n33'>33</a>
+<a id='n34' href='#n34'>34</a>
+<a id='n35' href='#n35'>35</a>
+<a id='n36' href='#n36'>36</a>
+<a id='n37' href='#n37'>37</a>
+<a id='n38' href='#n38'>38</a>
+<a id='n39' href='#n39'>39</a>
+<a id='n40' href='#n40'>40</a>
+<a id='n41' href='#n41'>41</a>
+<a id='n42' href='#n42'>42</a>
+<a id='n43' href='#n43'>43</a>
+<a id='n44' href='#n44'>44</a>
+<a id='n45' href='#n45'>45</a>
+<a id='n46' href='#n46'>46</a>
+<a id='n47' href='#n47'>47</a>
+<a id='n48' href='#n48'>48</a>
+<a id='n49' href='#n49'>49</a>
+<a id='n50' href='#n50'>50</a>
+<a id='n51' href='#n51'>51</a>
+<a id='n52' href='#n52'>52</a>
+<a id='n53' href='#n53'>53</a>
+<a id='n54' href='#n54'>54</a>
+<a id='n55' href='#n55'>55</a>
+<a id='n56' href='#n56'>56</a>
+<a id='n57' href='#n57'>57</a>
+<a id='n58' href='#n58'>58</a>
+<a id='n59' href='#n59'>59</a>
+<a id='n60' href='#n60'>60</a>
+<a id='n61' href='#n61'>61</a>
+<a id='n62' href='#n62'>62</a>
+<a id='n63' href='#n63'>63</a>
+<a id='n64' href='#n64'>64</a>
+<a id='n65' href='#n65'>65</a>
+<a id='n66' href='#n66'>66</a>
+<a id='n67' href='#n67'>67</a>
+<a id='n68' href='#n68'>68</a>
+<a id='n69' href='#n69'>69</a>
+<a id='n70' href='#n70'>70</a>
+<a id='n71' href='#n71'>71</a>
+<a id='n72' href='#n72'>72</a>
+<a id='n73' href='#n73'>73</a>
+<a id='n74' href='#n74'>74</a>
+<a id='n75' href='#n75'>75</a>
+<a id='n76' href='#n76'>76</a>
+<a id='n77' href='#n77'>77</a>
+<a id='n78' href='#n78'>78</a>
+<a id='n79' href='#n79'>79</a>
+<a id='n80' href='#n80'>80</a>
+<a id='n81' href='#n81'>81</a>
+<a id='n82' href='#n82'>82</a>
+<a id='n83' href='#n83'>83</a>
+<a id='n84' href='#n84'>84</a>
+<a id='n85' href='#n85'>85</a>
+<a id='n86' href='#n86'>86</a>
+<a id='n87' href='#n87'>87</a>
+<a id='n88' href='#n88'>88</a>
+<a id='n89' href='#n89'>89</a>
+<a id='n90' href='#n90'>90</a>
+<a id='n91' href='#n91'>91</a>
+<a id='n92' href='#n92'>92</a>
+<a id='n93' href='#n93'>93</a>
+<a id='n94' href='#n94'>94</a>
+<a id='n95' href='#n95'>95</a>
+<a id='n96' href='#n96'>96</a>
+<a id='n97' href='#n97'>97</a>
+<a id='n98' href='#n98'>98</a>
+<a id='n99' href='#n99'>99</a>
+<a id='n100' href='#n100'>100</a>
+<a id='n101' href='#n101'>101</a>
+<a id='n102' href='#n102'>102</a>
+<a id='n103' href='#n103'>103</a>
+<a id='n104' href='#n104'>104</a>
+<a id='n105' href='#n105'>105</a>
+<a id='n106' href='#n106'>106</a>
+<a id='n107' href='#n107'>107</a>
+<a id='n108' href='#n108'>108</a>
+<a id='n109' href='#n109'>109</a>
+<a id='n110' href='#n110'>110</a>
+<a id='n111' href='#n111'>111</a>
+<a id='n112' href='#n112'>112</a>
+<a id='n113' href='#n113'>113</a>
+<a id='n114' href='#n114'>114</a>
+<a id='n115' href='#n115'>115</a>
+<a id='n116' href='#n116'>116</a>
+<a id='n117' href='#n117'>117</a>
+<a id='n118' href='#n118'>118</a>
+<a id='n119' href='#n119'>119</a>
+<a id='n120' href='#n120'>120</a>
+<a id='n121' href='#n121'>121</a>
+<a id='n122' href='#n122'>122</a>
+<a id='n123' href='#n123'>123</a>
+<a id='n124' href='#n124'>124</a>
+<a id='n125' href='#n125'>125</a>
+<a id='n126' href='#n126'>126</a>
+<a id='n127' href='#n127'>127</a>
+<a id='n128' href='#n128'>128</a>
+<a id='n129' href='#n129'>129</a>
+<a id='n130' href='#n130'>130</a>
+<a id='n131' href='#n131'>131</a>
+<a id='n132' href='#n132'>132</a>
+<a id='n133' href='#n133'>133</a>
+<a id='n134' href='#n134'>134</a>
+<a id='n135' href='#n135'>135</a>
+<a id='n136' href='#n136'>136</a>
+<a id='n137' href='#n137'>137</a>
+<a id='n138' href='#n138'>138</a>
+<a id='n139' href='#n139'>139</a>
+<a id='n140' href='#n140'>140</a>
+<a id='n141' href='#n141'>141</a>
+<a id='n142' href='#n142'>142</a>
+<a id='n143' href='#n143'>143</a>
+<a id='n144' href='#n144'>144</a>
+<a id='n145' href='#n145'>145</a>
+<a id='n146' href='#n146'>146</a>
+<a id='n147' href='#n147'>147</a>
+<a id='n148' href='#n148'>148</a>
+<a id='n149' href='#n149'>149</a>
+<a id='n150' href='#n150'>150</a>
+<a id='n151' href='#n151'>151</a>
+<a id='n152' href='#n152'>152</a>
+<a id='n153' href='#n153'>153</a>
+<a id='n154' href='#n154'>154</a>
+<a id='n155' href='#n155'>155</a>
+<a id='n156' href='#n156'>156</a>
+<a id='n157' href='#n157'>157</a>
+<a id='n158' href='#n158'>158</a>
+<a id='n159' href='#n159'>159</a>
+<a id='n160' href='#n160'>160</a>
+<a id='n161' href='#n161'>161</a>
+<a id='n162' href='#n162'>162</a>
+<a id='n163' href='#n163'>163</a>
+<a id='n164' href='#n164'>164</a>
+<a id='n165' href='#n165'>165</a>
+<a id='n166' href='#n166'>166</a>
+<a id='n167' href='#n167'>167</a>
+<a id='n168' href='#n168'>168</a>
+<a id='n169' href='#n169'>169</a>
+<a id='n170' href='#n170'>170</a>
+<a id='n171' href='#n171'>171</a>
+<a id='n172' href='#n172'>172</a>
+<a id='n173' href='#n173'>173</a>
+<a id='n174' href='#n174'>174</a>
+<a id='n175' href='#n175'>175</a>
+<a id='n176' href='#n176'>176</a>
+<a id='n177' href='#n177'>177</a>
+<a id='n178' href='#n178'>178</a>
+<a id='n179' href='#n179'>179</a>
+<a id='n180' href='#n180'>180</a>
+<a id='n181' href='#n181'>181</a>
+<a id='n182' href='#n182'>182</a>
+<a id='n183' href='#n183'>183</a>
+<a id='n184' href='#n184'>184</a>
+<a id='n185' href='#n185'>185</a>
+<a id='n186' href='#n186'>186</a>
+<a id='n187' href='#n187'>187</a>
+<a id='n188' href='#n188'>188</a>
+<a id='n189' href='#n189'>189</a>
+<a id='n190' href='#n190'>190</a>
+<a id='n191' href='#n191'>191</a>
+<a id='n192' href='#n192'>192</a>
+<a id='n193' href='#n193'>193</a>
+<a id='n194' href='#n194'>194</a>
+<a id='n195' href='#n195'>195</a>
+<a id='n196' href='#n196'>196</a>
+<a id='n197' href='#n197'>197</a>
+<a id='n198' href='#n198'>198</a>
+<a id='n199' href='#n199'>199</a>
+<a id='n200' href='#n200'>200</a>
+<a id='n201' href='#n201'>201</a>
+<a id='n202' href='#n202'>202</a>
+<a id='n203' href='#n203'>203</a>
+<a id='n204' href='#n204'>204</a>
+<a id='n205' href='#n205'>205</a>
+<a id='n206' href='#n206'>206</a>
+<a id='n207' href='#n207'>207</a>
+<a id='n208' href='#n208'>208</a>
+<a id='n209' href='#n209'>209</a>
+<a id='n210' href='#n210'>210</a>
+<a id='n211' href='#n211'>211</a>
+<a id='n212' href='#n212'>212</a>
+<a id='n213' href='#n213'>213</a>
+<a id='n214' href='#n214'>214</a>
+<a id='n215' href='#n215'>215</a>
+<a id='n216' href='#n216'>216</a>
+<a id='n217' href='#n217'>217</a>
+<a id='n218' href='#n218'>218</a>
+<a id='n219' href='#n219'>219</a>
+<a id='n220' href='#n220'>220</a>
+<a id='n221' href='#n221'>221</a>
+<a id='n222' href='#n222'>222</a>
+<a id='n223' href='#n223'>223</a>
+<a id='n224' href='#n224'>224</a>
+<a id='n225' href='#n225'>225</a>
+<a id='n226' href='#n226'>226</a>
+<a id='n227' href='#n227'>227</a>
+<a id='n228' href='#n228'>228</a>
+<a id='n229' href='#n229'>229</a>
+<a id='n230' href='#n230'>230</a>
+<a id='n231' href='#n231'>231</a>
+<a id='n232' href='#n232'>232</a>
+<a id='n233' href='#n233'>233</a>
+<a id='n234' href='#n234'>234</a>
+<a id='n235' href='#n235'>235</a>
+<a id='n236' href='#n236'>236</a>
+<a id='n237' href='#n237'>237</a>
+<a id='n238' href='#n238'>238</a>
+<a id='n239' href='#n239'>239</a>
+<a id='n240' href='#n240'>240</a>
+<a id='n241' href='#n241'>241</a>
+<a id='n242' href='#n242'>242</a>
+<a id='n243' href='#n243'>243</a>
+<a id='n244' href='#n244'>244</a>
+<a id='n245' href='#n245'>245</a>
+<a id='n246' href='#n246'>246</a>
+<a id='n247' href='#n247'>247</a>
+<a id='n248' href='#n248'>248</a>
+<a id='n249' href='#n249'>249</a>
+<a id='n250' href='#n250'>250</a>
+<a id='n251' href='#n251'>251</a>
+<a id='n252' href='#n252'>252</a>
+<a id='n253' href='#n253'>253</a>
+<a id='n254' href='#n254'>254</a>
+<a id='n255' href='#n255'>255</a>
+<a id='n256' href='#n256'>256</a>
+<a id='n257' href='#n257'>257</a>
+<a id='n258' href='#n258'>258</a>
+<a id='n259' href='#n259'>259</a>
+<a id='n260' href='#n260'>260</a>
+<a id='n261' href='#n261'>261</a>
+<a id='n262' href='#n262'>262</a>
+<a id='n263' href='#n263'>263</a>
+<a id='n264' href='#n264'>264</a>
+<a id='n265' href='#n265'>265</a>
+<a id='n266' href='#n266'>266</a>
+<a id='n267' href='#n267'>267</a>
+<a id='n268' href='#n268'>268</a>
+<a id='n269' href='#n269'>269</a>
+<a id='n270' href='#n270'>270</a>
+<a id='n271' href='#n271'>271</a>
+<a id='n272' href='#n272'>272</a>
+<a id='n273' href='#n273'>273</a>
+<a id='n274' href='#n274'>274</a>
+<a id='n275' href='#n275'>275</a>
+<a id='n276' href='#n276'>276</a>
+<a id='n277' href='#n277'>277</a>
+<a id='n278' href='#n278'>278</a>
+<a id='n279' href='#n279'>279</a>
+<a id='n280' href='#n280'>280</a>
+<a id='n281' href='#n281'>281</a>
+<a id='n282' href='#n282'>282</a>
+<a id='n283' href='#n283'>283</a>
+<a id='n284' href='#n284'>284</a>
+<a id='n285' href='#n285'>285</a>
+<a id='n286' href='#n286'>286</a>
+<a id='n287' href='#n287'>287</a>
+<a id='n288' href='#n288'>288</a>
+<a id='n289' href='#n289'>289</a>
+<a id='n290' href='#n290'>290</a>
+<a id='n291' href='#n291'>291</a>
+<a id='n292' href='#n292'>292</a>
+<a id='n293' href='#n293'>293</a>
+<a id='n294' href='#n294'>294</a>
+<a id='n295' href='#n295'>295</a>
+<a id='n296' href='#n296'>296</a>
+<a id='n297' href='#n297'>297</a>
+<a id='n298' href='#n298'>298</a>
+<a id='n299' href='#n299'>299</a>
+<a id='n300' href='#n300'>300</a>
+<a id='n301' href='#n301'>301</a>
+<a id='n302' href='#n302'>302</a>
+<a id='n303' href='#n303'>303</a>
+<a id='n304' href='#n304'>304</a>
+<a id='n305' href='#n305'>305</a>
+<a id='n306' href='#n306'>306</a>
+<a id='n307' href='#n307'>307</a>
+<a id='n308' href='#n308'>308</a>
+<a id='n309' href='#n309'>309</a>
+<a id='n310' href='#n310'>310</a>
+<a id='n311' href='#n311'>311</a>
+<a id='n312' href='#n312'>312</a>
+<a id='n313' href='#n313'>313</a>
+<a id='n314' href='#n314'>314</a>
+<a id='n315' href='#n315'>315</a>
+<a id='n316' href='#n316'>316</a>
+<a id='n317' href='#n317'>317</a>
+<a id='n318' href='#n318'>318</a>
+<a id='n319' href='#n319'>319</a>
+<a id='n320' href='#n320'>320</a>
+<a id='n321' href='#n321'>321</a>
+<a id='n322' href='#n322'>322</a>
+<a id='n323' href='#n323'>323</a>
+<a id='n324' href='#n324'>324</a>
+<a id='n325' href='#n325'>325</a>
+<a id='n326' href='#n326'>326</a>
+<a id='n327' href='#n327'>327</a>
+<a id='n328' href='#n328'>328</a>
+<a id='n329' href='#n329'>329</a>
+<a id='n330' href='#n330'>330</a>
+<a id='n331' href='#n331'>331</a>
+<a id='n332' href='#n332'>332</a>
+<a id='n333' href='#n333'>333</a>
+<a id='n334' href='#n334'>334</a>
+<a id='n335' href='#n335'>335</a>
+<a id='n336' href='#n336'>336</a>
+<a id='n337' href='#n337'>337</a>
+<a id='n338' href='#n338'>338</a>
+<a id='n339' href='#n339'>339</a>
+<a id='n340' href='#n340'>340</a>
+<a id='n341' href='#n341'>341</a>
+<a id='n342' href='#n342'>342</a>
+<a id='n343' href='#n343'>343</a>
+<a id='n344' href='#n344'>344</a>
+<a id='n345' href='#n345'>345</a>
+<a id='n346' href='#n346'>346</a>
+<a id='n347' href='#n347'>347</a>
+<a id='n348' href='#n348'>348</a>
+<a id='n349' href='#n349'>349</a>
+<a id='n350' href='#n350'>350</a>
+<a id='n351' href='#n351'>351</a>
+<a id='n352' href='#n352'>352</a>
+<a id='n353' href='#n353'>353</a>
+<a id='n354' href='#n354'>354</a>
+<a id='n355' href='#n355'>355</a>
+<a id='n356' href='#n356'>356</a>
+<a id='n357' href='#n357'>357</a>
+<a id='n358' href='#n358'>358</a>
+<a id='n359' href='#n359'>359</a>
+<a id='n360' href='#n360'>360</a>
+<a id='n361' href='#n361'>361</a>
+<a id='n362' href='#n362'>362</a>
+<a id='n363' href='#n363'>363</a>
+<a id='n364' href='#n364'>364</a>
+<a id='n365' href='#n365'>365</a>
+<a id='n366' href='#n366'>366</a>
+<a id='n367' href='#n367'>367</a>
+<a id='n368' href='#n368'>368</a>
+<a id='n369' href='#n369'>369</a>
+<a id='n370' href='#n370'>370</a>
+<a id='n371' href='#n371'>371</a>
+<a id='n372' href='#n372'>372</a>
+<a id='n373' href='#n373'>373</a>
+<a id='n374' href='#n374'>374</a>
+<a id='n375' href='#n375'>375</a>
+<a id='n376' href='#n376'>376</a>
+<a id='n377' href='#n377'>377</a>
+<a id='n378' href='#n378'>378</a>
+<a id='n379' href='#n379'>379</a>
+<a id='n380' href='#n380'>380</a>
+<a id='n381' href='#n381'>381</a>
+<a id='n382' href='#n382'>382</a>
+<a id='n383' href='#n383'>383</a>
+<a id='n384' href='#n384'>384</a>
+<a id='n385' href='#n385'>385</a>
+<a id='n386' href='#n386'>386</a>
+<a id='n387' href='#n387'>387</a>
+<a id='n388' href='#n388'>388</a>
+<a id='n389' href='#n389'>389</a>
+<a id='n390' href='#n390'>390</a>
+<a id='n391' href='#n391'>391</a>
+<a id='n392' href='#n392'>392</a>
+<a id='n393' href='#n393'>393</a>
+<a id='n394' href='#n394'>394</a>
+<a id='n395' href='#n395'>395</a>
+<a id='n396' href='#n396'>396</a>
+<a id='n397' href='#n397'>397</a>
+<a id='n398' href='#n398'>398</a>
+<a id='n399' href='#n399'>399</a>
+<a id='n400' href='#n400'>400</a>
+<a id='n401' href='#n401'>401</a>
+<a id='n402' href='#n402'>402</a>
+<a id='n403' href='#n403'>403</a>
+<a id='n404' href='#n404'>404</a>
+<a id='n405' href='#n405'>405</a>
+<a id='n406' href='#n406'>406</a>
+<a id='n407' href='#n407'>407</a>
+<a id='n408' href='#n408'>408</a>
+<a id='n409' href='#n409'>409</a>
+<a id='n410' href='#n410'>410</a>
+<a id='n411' href='#n411'>411</a>
+<a id='n412' href='#n412'>412</a>
+<a id='n413' href='#n413'>413</a>
+<a id='n414' href='#n414'>414</a>
+<a id='n415' href='#n415'>415</a>
+<a id='n416' href='#n416'>416</a>
+<a id='n417' href='#n417'>417</a>
+<a id='n418' href='#n418'>418</a>
+<a id='n419' href='#n419'>419</a>
+<a id='n420' href='#n420'>420</a>
+<a id='n421' href='#n421'>421</a>
+<a id='n422' href='#n422'>422</a>
+<a id='n423' href='#n423'>423</a>
+<a id='n424' href='#n424'>424</a>
+<a id='n425' href='#n425'>425</a>
+<a id='n426' href='#n426'>426</a>
+<a id='n427' href='#n427'>427</a>
+<a id='n428' href='#n428'>428</a>
+<a id='n429' href='#n429'>429</a>
+<a id='n430' href='#n430'>430</a>
+<a id='n431' href='#n431'>431</a>
+<a id='n432' href='#n432'>432</a>
+<a id='n433' href='#n433'>433</a>
+<a id='n434' href='#n434'>434</a>
+<a id='n435' href='#n435'>435</a>
+<a id='n436' href='#n436'>436</a>
+<a id='n437' href='#n437'>437</a>
+<a id='n438' href='#n438'>438</a>
+<a id='n439' href='#n439'>439</a>
+<a id='n440' href='#n440'>440</a>
+<a id='n441' href='#n441'>441</a>
+<a id='n442' href='#n442'>442</a>
+<a id='n443' href='#n443'>443</a>
+<a id='n444' href='#n444'>444</a>
+<a id='n445' href='#n445'>445</a>
+<a id='n446' href='#n446'>446</a>
+<a id='n447' href='#n447'>447</a>
+<a id='n448' href='#n448'>448</a>
+<a id='n449' href='#n449'>449</a>
+<a id='n450' href='#n450'>450</a>
+<a id='n451' href='#n451'>451</a>
+<a id='n452' href='#n452'>452</a>
+<a id='n453' href='#n453'>453</a>
+<a id='n454' href='#n454'>454</a>
+<a id='n455' href='#n455'>455</a>
+<a id='n456' href='#n456'>456</a>
+<a id='n457' href='#n457'>457</a>
+<a id='n458' href='#n458'>458</a>
+<a id='n459' href='#n459'>459</a>
+<a id='n460' href='#n460'>460</a>
+<a id='n461' href='#n461'>461</a>
+<a id='n462' href='#n462'>462</a>
+<a id='n463' href='#n463'>463</a>
+<a id='n464' href='#n464'>464</a>
+<a id='n465' href='#n465'>465</a>
+<a id='n466' href='#n466'>466</a>
+<a id='n467' href='#n467'>467</a>
+<a id='n468' href='#n468'>468</a>
+<a id='n469' href='#n469'>469</a>
+<a id='n470' href='#n470'>470</a>
+<a id='n471' href='#n471'>471</a>
+<a id='n472' href='#n472'>472</a>
+<a id='n473' href='#n473'>473</a>
+<a id='n474' href='#n474'>474</a>
+<a id='n475' href='#n475'>475</a>
+<a id='n476' href='#n476'>476</a>
+<a id='n477' href='#n477'>477</a>
+<a id='n478' href='#n478'>478</a>
+<a id='n479' href='#n479'>479</a>
+<a id='n480' href='#n480'>480</a>
+<a id='n481' href='#n481'>481</a>
+<a id='n482' href='#n482'>482</a>
+<a id='n483' href='#n483'>483</a>
+<a id='n484' href='#n484'>484</a>
+<a id='n485' href='#n485'>485</a>
+<a id='n486' href='#n486'>486</a>
+<a id='n487' href='#n487'>487</a>
+<a id='n488' href='#n488'>488</a>
+<a id='n489' href='#n489'>489</a>
+<a id='n490' href='#n490'>490</a>
+<a id='n491' href='#n491'>491</a>
+<a id='n492' href='#n492'>492</a>
+<a id='n493' href='#n493'>493</a>
+<a id='n494' href='#n494'>494</a>
+<a id='n495' href='#n495'>495</a>
+<a id='n496' href='#n496'>496</a>
+<a id='n497' href='#n497'>497</a>
+<a id='n498' href='#n498'>498</a>
+<a id='n499' href='#n499'>499</a>
+<a id='n500' href='#n500'>500</a>
+<a id='n501' href='#n501'>501</a>
+<a id='n502' href='#n502'>502</a>
+<a id='n503' href='#n503'>503</a>
+<a id='n504' href='#n504'>504</a>
+<a id='n505' href='#n505'>505</a>
+<a id='n506' href='#n506'>506</a>
+<a id='n507' href='#n507'>507</a>
+<a id='n508' href='#n508'>508</a>
+<a id='n509' href='#n509'>509</a>
+<a id='n510' href='#n510'>510</a>
+<a id='n511' href='#n511'>511</a>
+<a id='n512' href='#n512'>512</a>
+<a id='n513' href='#n513'>513</a>
+<a id='n514' href='#n514'>514</a>
+<a id='n515' href='#n515'>515</a>
+<a id='n516' href='#n516'>516</a>
+<a id='n517' href='#n517'>517</a>
+<a id='n518' href='#n518'>518</a>
+<a id='n519' href='#n519'>519</a>
+<a id='n520' href='#n520'>520</a>
+<a id='n521' href='#n521'>521</a>
+<a id='n522' href='#n522'>522</a>
+<a id='n523' href='#n523'>523</a>
+<a id='n524' href='#n524'>524</a>
+<a id='n525' href='#n525'>525</a>
+<a id='n526' href='#n526'>526</a>
+<a id='n527' href='#n527'>527</a>
+<a id='n528' href='#n528'>528</a>
+<a id='n529' href='#n529'>529</a>
+<a id='n530' href='#n530'>530</a>
+<a id='n531' href='#n531'>531</a>
+<a id='n532' href='#n532'>532</a>
+<a id='n533' href='#n533'>533</a>
+<a id='n534' href='#n534'>534</a>
+<a id='n535' href='#n535'>535</a>
+<a id='n536' href='#n536'>536</a>
+<a id='n537' href='#n537'>537</a>
+<a id='n538' href='#n538'>538</a>
+<a id='n539' href='#n539'>539</a>
+<a id='n540' href='#n540'>540</a>
+<a id='n541' href='#n541'>541</a>
+<a id='n542' href='#n542'>542</a>
+<a id='n543' href='#n543'>543</a>
+<a id='n544' href='#n544'>544</a>
+<a id='n545' href='#n545'>545</a>
+<a id='n546' href='#n546'>546</a>
+<a id='n547' href='#n547'>547</a>
+<a id='n548' href='#n548'>548</a>
+<a id='n549' href='#n549'>549</a>
+<a id='n550' href='#n550'>550</a>
+<a id='n551' href='#n551'>551</a>
+<a id='n552' href='#n552'>552</a>
+<a id='n553' href='#n553'>553</a>
+<a id='n554' href='#n554'>554</a>
+<a id='n555' href='#n555'>555</a>
+<a id='n556' href='#n556'>556</a>
+<a id='n557' href='#n557'>557</a>
+<a id='n558' href='#n558'>558</a>
+<a id='n559' href='#n559'>559</a>
+<a id='n560' href='#n560'>560</a>
+<a id='n561' href='#n561'>561</a>
+<a id='n562' href='#n562'>562</a>
+<a id='n563' href='#n563'>563</a>
+<a id='n564' href='#n564'>564</a>
+<a id='n565' href='#n565'>565</a>
+<a id='n566' href='#n566'>566</a>
+<a id='n567' href='#n567'>567</a>
+<a id='n568' href='#n568'>568</a>
+<a id='n569' href='#n569'>569</a>
+<a id='n570' href='#n570'>570</a>
+<a id='n571' href='#n571'>571</a>
+<a id='n572' href='#n572'>572</a>
+<a id='n573' href='#n573'>573</a>
+<a id='n574' href='#n574'>574</a>
+<a id='n575' href='#n575'>575</a>
+<a id='n576' href='#n576'>576</a>
+<a id='n577' href='#n577'>577</a>
+<a id='n578' href='#n578'>578</a>
+<a id='n579' href='#n579'>579</a>
+<a id='n580' href='#n580'>580</a>
+<a id='n581' href='#n581'>581</a>
+<a id='n582' href='#n582'>582</a>
+<a id='n583' href='#n583'>583</a>
+<a id='n584' href='#n584'>584</a>
+<a id='n585' href='#n585'>585</a>
+<a id='n586' href='#n586'>586</a>
+<a id='n587' href='#n587'>587</a>
+<a id='n588' href='#n588'>588</a>
+<a id='n589' href='#n589'>589</a>
+<a id='n590' href='#n590'>590</a>
+<a id='n591' href='#n591'>591</a>
+<a id='n592' href='#n592'>592</a>
+<a id='n593' href='#n593'>593</a>
+<a id='n594' href='#n594'>594</a>
+<a id='n595' href='#n595'>595</a>
+<a id='n596' href='#n596'>596</a>
+<a id='n597' href='#n597'>597</a>
+<a id='n598' href='#n598'>598</a>
+<a id='n599' href='#n599'>599</a>
+<a id='n600' href='#n600'>600</a>
+<a id='n601' href='#n601'>601</a>
+<a id='n602' href='#n602'>602</a>
+<a id='n603' href='#n603'>603</a>
+<a id='n604' href='#n604'>604</a>
+<a id='n605' href='#n605'>605</a>
+<a id='n606' href='#n606'>606</a>
+<a id='n607' href='#n607'>607</a>
+<a id='n608' href='#n608'>608</a>
+<a id='n609' href='#n609'>609</a>
+<a id='n610' href='#n610'>610</a>
+<a id='n611' href='#n611'>611</a>
+<a id='n612' href='#n612'>612</a>
+<a id='n613' href='#n613'>613</a>
+<a id='n614' href='#n614'>614</a>
+<a id='n615' href='#n615'>615</a>
+<a id='n616' href='#n616'>616</a>
+<a id='n617' href='#n617'>617</a>
+<a id='n618' href='#n618'>618</a>
+<a id='n619' href='#n619'>619</a>
+<a id='n620' href='#n620'>620</a>
+<a id='n621' href='#n621'>621</a>
+<a id='n622' href='#n622'>622</a>
+<a id='n623' href='#n623'>623</a>
+<a id='n624' href='#n624'>624</a>
+<a id='n625' href='#n625'>625</a>
+<a id='n626' href='#n626'>626</a>
+<a id='n627' href='#n627'>627</a>
+<a id='n628' href='#n628'>628</a>
+<a id='n629' href='#n629'>629</a>
+<a id='n630' href='#n630'>630</a>
+<a id='n631' href='#n631'>631</a>
+<a id='n632' href='#n632'>632</a>
+<a id='n633' href='#n633'>633</a>
+<a id='n634' href='#n634'>634</a>
+<a id='n635' href='#n635'>635</a>
+<a id='n636' href='#n636'>636</a>
+<a id='n637' href='#n637'>637</a>
+<a id='n638' href='#n638'>638</a>
+<a id='n639' href='#n639'>639</a>
+<a id='n640' href='#n640'>640</a>
+<a id='n641' href='#n641'>641</a>
+<a id='n642' href='#n642'>642</a>
+<a id='n643' href='#n643'>643</a>
+<a id='n644' href='#n644'>644</a>
+<a id='n645' href='#n645'>645</a>
+<a id='n646' href='#n646'>646</a>
+<a id='n647' href='#n647'>647</a>
+<a id='n648' href='#n648'>648</a>
+<a id='n649' href='#n649'>649</a>
+<a id='n650' href='#n650'>650</a>
+<a id='n651' href='#n651'>651</a>
+<a id='n652' href='#n652'>652</a>
+<a id='n653' href='#n653'>653</a>
+<a id='n654' href='#n654'>654</a>
+<a id='n655' href='#n655'>655</a>
+<a id='n656' href='#n656'>656</a>
+<a id='n657' href='#n657'>657</a>
+<a id='n658' href='#n658'>658</a>
+<a id='n659' href='#n659'>659</a>
+<a id='n660' href='#n660'>660</a>
+<a id='n661' href='#n661'>661</a>
+<a id='n662' href='#n662'>662</a>
+<a id='n663' href='#n663'>663</a>
+<a id='n664' href='#n664'>664</a>
+<a id='n665' href='#n665'>665</a>
+<a id='n666' href='#n666'>666</a>
+<a id='n667' href='#n667'>667</a>
+<a id='n668' href='#n668'>668</a>
+<a id='n669' href='#n669'>669</a>
+<a id='n670' href='#n670'>670</a>
+<a id='n671' href='#n671'>671</a>
+<a id='n672' href='#n672'>672</a>
+<a id='n673' href='#n673'>673</a>
+<a id='n674' href='#n674'>674</a>
+<a id='n675' href='#n675'>675</a>
+<a id='n676' href='#n676'>676</a>
+<a id='n677' href='#n677'>677</a>
+<a id='n678' href='#n678'>678</a>
+<a id='n679' href='#n679'>679</a>
+<a id='n680' href='#n680'>680</a>
+<a id='n681' href='#n681'>681</a>
+<a id='n682' href='#n682'>682</a>
+<a id='n683' href='#n683'>683</a>
+<a id='n684' href='#n684'>684</a>
+<a id='n685' href='#n685'>685</a>
+<a id='n686' href='#n686'>686</a>
+<a id='n687' href='#n687'>687</a>
+<a id='n688' href='#n688'>688</a>
+<a id='n689' href='#n689'>689</a>
+<a id='n690' href='#n690'>690</a>
+<a id='n691' href='#n691'>691</a>
+<a id='n692' href='#n692'>692</a>
+<a id='n693' href='#n693'>693</a>
+<a id='n694' href='#n694'>694</a>
+<a id='n695' href='#n695'>695</a>
+<a id='n696' href='#n696'>696</a>
+<a id='n697' href='#n697'>697</a>
+<a id='n698' href='#n698'>698</a>
+<a id='n699' href='#n699'>699</a>
+<a id='n700' href='#n700'>700</a>
+<a id='n701' href='#n701'>701</a>
+<a id='n702' href='#n702'>702</a>
+<a id='n703' href='#n703'>703</a>
+<a id='n704' href='#n704'>704</a>
+<a id='n705' href='#n705'>705</a>
+<a id='n706' href='#n706'>706</a>
+<a id='n707' href='#n707'>707</a>
+<a id='n708' href='#n708'>708</a>
+<a id='n709' href='#n709'>709</a>
+<a id='n710' href='#n710'>710</a>
+<a id='n711' href='#n711'>711</a>
+<a id='n712' href='#n712'>712</a>
+<a id='n713' href='#n713'>713</a>
+<a id='n714' href='#n714'>714</a>
+<a id='n715' href='#n715'>715</a>
+<a id='n716' href='#n716'>716</a>
+<a id='n717' href='#n717'>717</a>
+<a id='n718' href='#n718'>718</a>
+<a id='n719' href='#n719'>719</a>
+<a id='n720' href='#n720'>720</a>
+<a id='n721' href='#n721'>721</a>
+<a id='n722' href='#n722'>722</a>
+<a id='n723' href='#n723'>723</a>
+<a id='n724' href='#n724'>724</a>
+<a id='n725' href='#n725'>725</a>
+<a id='n726' href='#n726'>726</a>
+<a id='n727' href='#n727'>727</a>
+<a id='n728' href='#n728'>728</a>
+<a id='n729' href='#n729'>729</a>
+<a id='n730' href='#n730'>730</a>
+<a id='n731' href='#n731'>731</a>
+<a id='n732' href='#n732'>732</a>
+<a id='n733' href='#n733'>733</a>
+<a id='n734' href='#n734'>734</a>
+<a id='n735' href='#n735'>735</a>
+<a id='n736' href='#n736'>736</a>
+<a id='n737' href='#n737'>737</a>
+<a id='n738' href='#n738'>738</a>
+<a id='n739' href='#n739'>739</a>
+<a id='n740' href='#n740'>740</a>
+<a id='n741' href='#n741'>741</a>
+<a id='n742' href='#n742'>742</a>
+<a id='n743' href='#n743'>743</a>
+<a id='n744' href='#n744'>744</a>
+<a id='n745' href='#n745'>745</a>
+<a id='n746' href='#n746'>746</a>
+<a id='n747' href='#n747'>747</a>
+<a id='n748' href='#n748'>748</a>
+<a id='n749' href='#n749'>749</a>
+<a id='n750' href='#n750'>750</a>
+<a id='n751' href='#n751'>751</a>
+<a id='n752' href='#n752'>752</a>
+<a id='n753' href='#n753'>753</a>
+<a id='n754' href='#n754'>754</a>
+<a id='n755' href='#n755'>755</a>
+<a id='n756' href='#n756'>756</a>
+<a id='n757' href='#n757'>757</a>
+<a id='n758' href='#n758'>758</a>
+<a id='n759' href='#n759'>759</a>
+<a id='n760' href='#n760'>760</a>
+<a id='n761' href='#n761'>761</a>
+<a id='n762' href='#n762'>762</a>
+<a id='n763' href='#n763'>763</a>
+<a id='n764' href='#n764'>764</a>
+<a id='n765' href='#n765'>765</a>
+<a id='n766' href='#n766'>766</a>
+<a id='n767' href='#n767'>767</a>
+<a id='n768' href='#n768'>768</a>
+<a id='n769' href='#n769'>769</a>
+<a id='n770' href='#n770'>770</a>
+<a id='n771' href='#n771'>771</a>
+<a id='n772' href='#n772'>772</a>
+<a id='n773' href='#n773'>773</a>
+<a id='n774' href='#n774'>774</a>
+<a id='n775' href='#n775'>775</a>
+<a id='n776' href='#n776'>776</a>
+<a id='n777' href='#n777'>777</a>
+<a id='n778' href='#n778'>778</a>
+<a id='n779' href='#n779'>779</a>
+<a id='n780' href='#n780'>780</a>
+<a id='n781' href='#n781'>781</a>
+<a id='n782' href='#n782'>782</a>
+<a id='n783' href='#n783'>783</a>
+<a id='n784' href='#n784'>784</a>
+<a id='n785' href='#n785'>785</a>
+<a id='n786' href='#n786'>786</a>
+<a id='n787' href='#n787'>787</a>
+<a id='n788' href='#n788'>788</a>
+<a id='n789' href='#n789'>789</a>
+<a id='n790' href='#n790'>790</a>
+<a id='n791' href='#n791'>791</a>
+<a id='n792' href='#n792'>792</a>
+<a id='n793' href='#n793'>793</a>
+<a id='n794' href='#n794'>794</a>
+<a id='n795' href='#n795'>795</a>
+<a id='n796' href='#n796'>796</a>
+<a id='n797' href='#n797'>797</a>
+<a id='n798' href='#n798'>798</a>
+<a id='n799' href='#n799'>799</a>
+<a id='n800' href='#n800'>800</a>
+<a id='n801' href='#n801'>801</a>
+<a id='n802' href='#n802'>802</a>
+<a id='n803' href='#n803'>803</a>
+<a id='n804' href='#n804'>804</a>
+<a id='n805' href='#n805'>805</a>
+<a id='n806' href='#n806'>806</a>
+<a id='n807' href='#n807'>807</a>
+<a id='n808' href='#n808'>808</a>
+<a id='n809' href='#n809'>809</a>
+<a id='n810' href='#n810'>810</a>
+<a id='n811' href='#n811'>811</a>
+<a id='n812' href='#n812'>812</a>
+<a id='n813' href='#n813'>813</a>
+<a id='n814' href='#n814'>814</a>
+<a id='n815' href='#n815'>815</a>
+<a id='n816' href='#n816'>816</a>
+<a id='n817' href='#n817'>817</a>
+<a id='n818' href='#n818'>818</a>
+<a id='n819' href='#n819'>819</a>
+<a id='n820' href='#n820'>820</a>
+<a id='n821' href='#n821'>821</a>
+<a id='n822' href='#n822'>822</a>
+<a id='n823' href='#n823'>823</a>
+<a id='n824' href='#n824'>824</a>
+<a id='n825' href='#n825'>825</a>
+<a id='n826' href='#n826'>826</a>
+<a id='n827' href='#n827'>827</a>
+<a id='n828' href='#n828'>828</a>
+<a id='n829' href='#n829'>829</a>
+<a id='n830' href='#n830'>830</a>
+<a id='n831' href='#n831'>831</a>
+<a id='n832' href='#n832'>832</a>
+<a id='n833' href='#n833'>833</a>
+<a id='n834' href='#n834'>834</a>
+<a id='n835' href='#n835'>835</a>
+<a id='n836' href='#n836'>836</a>
+<a id='n837' href='#n837'>837</a>
+<a id='n838' href='#n838'>838</a>
+<a id='n839' href='#n839'>839</a>
+<a id='n840' href='#n840'>840</a>
+<a id='n841' href='#n841'>841</a>
+<a id='n842' href='#n842'>842</a>
+<a id='n843' href='#n843'>843</a>
+<a id='n844' href='#n844'>844</a>
+<a id='n845' href='#n845'>845</a>
+<a id='n846' href='#n846'>846</a>
+<a id='n847' href='#n847'>847</a>
+<a id='n848' href='#n848'>848</a>
+<a id='n849' href='#n849'>849</a>
+<a id='n850' href='#n850'>850</a>
+<a id='n851' href='#n851'>851</a>
+<a id='n852' href='#n852'>852</a>
+<a id='n853' href='#n853'>853</a>
+<a id='n854' href='#n854'>854</a>
+<a id='n855' href='#n855'>855</a>
+<a id='n856' href='#n856'>856</a>
+<a id='n857' href='#n857'>857</a>
+<a id='n858' href='#n858'>858</a>
+<a id='n859' href='#n859'>859</a>
+<a id='n860' href='#n860'>860</a>
+<a id='n861' href='#n861'>861</a>
+<a id='n862' href='#n862'>862</a>
+<a id='n863' href='#n863'>863</a>
+<a id='n864' href='#n864'>864</a>
+<a id='n865' href='#n865'>865</a>
+<a id='n866' href='#n866'>866</a>
+<a id='n867' href='#n867'>867</a>
+<a id='n868' href='#n868'>868</a>
+<a id='n869' href='#n869'>869</a>
+<a id='n870' href='#n870'>870</a>
+<a id='n871' href='#n871'>871</a>
+<a id='n872' href='#n872'>872</a>
+<a id='n873' href='#n873'>873</a>
+<a id='n874' href='#n874'>874</a>
+<a id='n875' href='#n875'>875</a>
+<a id='n876' href='#n876'>876</a>
+<a id='n877' href='#n877'>877</a>
+<a id='n878' href='#n878'>878</a>
+<a id='n879' href='#n879'>879</a>
+<a id='n880' href='#n880'>880</a>
+<a id='n881' href='#n881'>881</a>
+<a id='n882' href='#n882'>882</a>
+<a id='n883' href='#n883'>883</a>
+<a id='n884' href='#n884'>884</a>
+<a id='n885' href='#n885'>885</a>
+<a id='n886' href='#n886'>886</a>
+<a id='n887' href='#n887'>887</a>
+<a id='n888' href='#n888'>888</a>
+<a id='n889' href='#n889'>889</a>
+<a id='n890' href='#n890'>890</a>
+<a id='n891' href='#n891'>891</a>
+<a id='n892' href='#n892'>892</a>
+<a id='n893' href='#n893'>893</a>
+<a id='n894' href='#n894'>894</a>
+<a id='n895' href='#n895'>895</a>
+<a id='n896' href='#n896'>896</a>
+<a id='n897' href='#n897'>897</a>
+<a id='n898' href='#n898'>898</a>
+<a id='n899' href='#n899'>899</a>
+<a id='n900' href='#n900'>900</a>
+<a id='n901' href='#n901'>901</a>
+<a id='n902' href='#n902'>902</a>
+<a id='n903' href='#n903'>903</a>
+<a id='n904' href='#n904'>904</a>
+<a id='n905' href='#n905'>905</a>
+<a id='n906' href='#n906'>906</a>
+<a id='n907' href='#n907'>907</a>
+<a id='n908' href='#n908'>908</a>
+<a id='n909' href='#n909'>909</a>
+<a id='n910' href='#n910'>910</a>
+<a id='n911' href='#n911'>911</a>
+<a id='n912' href='#n912'>912</a>
+<a id='n913' href='#n913'>913</a>
+<a id='n914' href='#n914'>914</a>
+<a id='n915' href='#n915'>915</a>
+<a id='n916' href='#n916'>916</a>
+<a id='n917' href='#n917'>917</a>
+<a id='n918' href='#n918'>918</a>
+<a id='n919' href='#n919'>919</a>
+<a id='n920' href='#n920'>920</a>
+<a id='n921' href='#n921'>921</a>
+<a id='n922' href='#n922'>922</a>
+<a id='n923' href='#n923'>923</a>
+<a id='n924' href='#n924'>924</a>
+<a id='n925' href='#n925'>925</a>
+<a id='n926' href='#n926'>926</a>
+<a id='n927' href='#n927'>927</a>
+<a id='n928' href='#n928'>928</a>
+<a id='n929' href='#n929'>929</a>
+<a id='n930' href='#n930'>930</a>
+<a id='n931' href='#n931'>931</a>
+<a id='n932' href='#n932'>932</a>
+<a id='n933' href='#n933'>933</a>
+<a id='n934' href='#n934'>934</a>
+<a id='n935' href='#n935'>935</a>
+<a id='n936' href='#n936'>936</a>
+<a id='n937' href='#n937'>937</a>
+<a id='n938' href='#n938'>938</a>
+<a id='n939' href='#n939'>939</a>
+<a id='n940' href='#n940'>940</a>
+<a id='n941' href='#n941'>941</a>
+<a id='n942' href='#n942'>942</a>
+<a id='n943' href='#n943'>943</a>
+<a id='n944' href='#n944'>944</a>
+<a id='n945' href='#n945'>945</a>
+<a id='n946' href='#n946'>946</a>
+<a id='n947' href='#n947'>947</a>
+<a id='n948' href='#n948'>948</a>
+<a id='n949' href='#n949'>949</a>
+<a id='n950' href='#n950'>950</a>
+<a id='n951' href='#n951'>951</a>
+<a id='n952' href='#n952'>952</a>
+<a id='n953' href='#n953'>953</a>
+<a id='n954' href='#n954'>954</a>
+</pre></td>
+<td class='lines'><pre><code>From 1e068dbfc2837809030dcbf0173d2841a411d95a Mon Sep 17 00:00:00 2001
+From: wwp &lt;wwp&#64;free.fr&gt;
 Date: Thu, 2 Feb 2017 18:06:27 +0100
 Subject: [PATCH] Re-introducing the Dillo plugin. Tested against Dillo
  3.0.4.1/3.0.5.
 
----
+<span class="hl kwb">---</span>
  configure.ac                     |   15 ++
  src/plugins/Makefile.am          |    1 +
  src/plugins/dillo/Makefile.am    |   33 ++++
@@ -21,835 +1027,947 @@ Subject: [PATCH] Re-introducing the Dillo plugin. Tested against Dillo
 
 diff --git a/configure.ac b/configure.ac
 index b0683cf..e8e4ae4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -988,6 +988,10 @@ AC_ARG_ENABLE(clamd-plugin,
+<span class="hl kwb">--- a/configure.ac</span>
+<span class="hl kwa">+++ b/configure.ac</span>
+&#64;&#64; -988,6 +988,10 &#64;&#64; AC_ARG_ENABLE(clamd-plugin,
  		[  --disable-clamd-plugin          Do not build clamd plugin],
  		[enable_clamd_plugin=$enableval], [enable_clamd_plugin=auto])
  
-+AC_ARG_ENABLE(dillo-plugin,
-+		[  --disable-dillo-plugin          Do not build dillo plugin],
-+		[enable_dillo_plugin=$enableval], [enable_dillo_plugin=auto])
-+
+<span class="hl kwa">+AC_ARG_ENABLE(dillo-plugin,</span>
+<span class="hl kwa">+		[  --disable-dillo-plugin          Do not build dillo plugin],</span>
+<span class="hl kwa">+		[enable_dillo_plugin=$enableval], [enable_dillo_plugin=auto])</span>
+<span class="hl kwa">+</span>
  AC_ARG_ENABLE(fancy-plugin,
  		[  --disable-fancy-plugin          Do not build fancy plugin],
  		[enable_fancy_plugin=$enableval], [enable_fancy_plugin=auto])
-@@ -1416,6 +1420,15 @@ else
+&#64;&#64; -1416,6 +1420,15 &#64;&#64; else
  	AC_MSG_RESULT(no)
  fi
  
-+AC_MSG_CHECKING([whether to build Dillo plugin])
-+if test x"$enable_dillo_plugin" != xno; then
-+	PLUGINS="$PLUGINS dillo"
-+	AC_MSG_RESULT(yes)
-+else
-+	DISABLED_PLUGINS="$DISABLED_PLUGINS dillo"
-+	AC_MSG_RESULT(no)
-+fi
-+
+<span class="hl kwa">+AC_MSG_CHECKING([whether to build Dillo plugin])</span>
+<span class="hl kwa">+if test x&quot;$enable_dillo_plugin&quot; != xno; then</span>
+<span class="hl kwa">+	PLUGINS=&quot;$PLUGINS dillo&quot;</span>
+<span class="hl kwa">+	AC_MSG_RESULT(yes)</span>
+<span class="hl kwa">+else</span>
+<span class="hl kwa">+	DISABLED_PLUGINS=&quot;$DISABLED_PLUGINS dillo&quot;</span>
+<span class="hl kwa">+	AC_MSG_RESULT(no)</span>
+<span class="hl kwa">+fi</span>
+<span class="hl kwa">+</span>
  AC_MSG_CHECKING([whether to build fancy plugin])
- if test x"$enable_fancy_plugin" != xno; then
- 	dependencies_missing=""
-@@ -1872,6 +1885,7 @@ AM_CONDITIONAL(BUILD_BOGOFILTER_PLUGIN,		test x"$enable_bogofilter_plugin" != xn
- AM_CONDITIONAL(BUILD_BSFILTER_PLUGIN,		test x"$enable_bsfilter_plugin" != xno)
- AM_CONDITIONAL(BUILD_CLAMD_PLUGIN,		test x"$enable_clamd_plugin" != xno)
- AM_CONDITIONAL(BUILD_DEMO_PLUGIN,		test x"$enable_demo_plugin" != xno)
-+AM_CONDITIONAL(BUILD_DILLO_PLUGIN,		test x"$enable_dillo_plugin" != xno)
- AM_CONDITIONAL(BUILD_FANCY_PLUGIN,		test x"$enable_fancy_plugin" != xno)
- AM_CONDITIONAL(BUILD_FETCHINFO_PLUGIN,		test x"$enable_fetchinfo_plugin" != xno)
- AM_CONDITIONAL(BUILD_GDATA_PLUGIN,		test x"$enable_gdata_plugin" != xno)
-@@ -1920,6 +1934,7 @@ src/plugins/bsfilter/Makefile
+ if test x&quot;$enable_fancy_plugin&quot; != xno; then
+ 	dependencies_missing=&quot;&quot;
+<span class="hl kwd">&#64;&#64; -1970,7 +1970,7 &#64;&#64;</span>
+ AM_CONDITIONAL(BUILD_BSFILTER_PLUGIN,		test x&quot;$enable_bsfilter_plugin&quot; != xno)
+ AM_CONDITIONAL(BUILD_CLAMD_PLUGIN,		test x&quot;$enable_clamd_plugin&quot; != xno)
+ AM_CONDITIONAL(BUILD_DEMO_PLUGIN,		test x&quot;$enable_demo_plugin&quot; != xno)
+<span class="hl kwb">-dnl AM_CONDITIONAL(BUILD_DILLO_PLUGIN,		test x&quot;$enable_dillo_plugin&quot; != xno)</span>
+<span class="hl kwa">+AM_CONDITIONAL(BUILD_DILLO_PLUGIN,		test x&quot;$enable_dillo_plugin&quot; != xno)</span>
+ AM_CONDITIONAL(BUILD_FANCY_PLUGIN,		test x&quot;$enable_fancy_plugin&quot; != xno)
+ AM_CONDITIONAL(BUILD_FETCHINFO_PLUGIN,		test x&quot;$enable_fetchinfo_plugin&quot; != xno)
+ AM_CONDITIONAL(BUILD_GDATA_PLUGIN,		test x&quot;$enable_gdata_plugin&quot; != xno)
+&#64;&#64; -1920,6 +1934,7 &#64;&#64; src/plugins/bsfilter/Makefile
  src/plugins/clamd/Makefile
  src/plugins/clamd/libclamd/Makefile
  src/plugins/demo/Makefile
-+src/plugins/dillo/Makefile
+<span class="hl kwa">+src/plugins/dillo/Makefile</span>
  src/plugins/fancy/Makefile
  src/plugins/fetchinfo/Makefile
  src/plugins/gdata/Makefile
 diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
 index 6acc1fb..28abfdb 100644
---- a/src/plugins/Makefile.am
-+++ b/src/plugins/Makefile.am
-@@ -13,6 +13,7 @@ SUBDIRS = \
+<span class="hl kwb">--- a/src/plugins/Makefile.am</span>
+<span class="hl kwa">+++ b/src/plugins/Makefile.am</span>
+&#64;&#64; -13,6 +13,7 &#64;&#64; SUBDIRS = \
  	bsfilter \
  	clamd \
  	demo \
-+	dillo \
+<span class="hl kwa">+	dillo \</span>
  	fancy \
  	fetchinfo \
  	gdata \
 diff --git a/src/plugins/dillo/Makefile.am b/src/plugins/dillo/Makefile.am
 new file mode 100644
 index 0000000..2dd9349
---- /dev/null
-+++ b/src/plugins/dillo/Makefile.am
-@@ -0,0 +1,33 @@
-+# Copyright 1999-2014 the Claws Mail team.
-+# This file is part of Claws Mail package, and distributed under the
-+# terms of the General Public License version 3 (or later).
-+# See COPYING file for license details.
-+
-+plugindir = $(pkglibdir)/plugins
-+
-+plugin_LTLIBRARIES = dillo.la
-+
-+dillo_la_SOURCES = \
-+     dillo_viewer.c \
-+     dillo_prefs.c \
-+	 dillo_prefs.h
-+
-+dillo_la_LDFLAGS = \
-+	-avoid-version -module
-+
-+if CYGWIN
-+cygwin_export_lib = -L$(top_builddir)/src -lclaws-mail
-+else
-+cygwin_export_lib =
-+endif
-+
-+dillo_la_LIBADD = $(cygwin_export_lib) \
-+	$(GTK_LIBS) 
-+
-+dillo_la_CPPFLAGS = \
-+	-I$(top_srcdir)/src \
-+	-I$(top_builddir)/src/common \
-+	-I$(top_srcdir)/src/common \
-+	-I$(top_srcdir)/src/gtk \
-+	$(GLIB_CFLAGS) \
-+	$(GTK_CFLAGS)
+<span class="hl kwb">--- /dev/null</span>
+<span class="hl kwa">+++ b/src/plugins/dillo/Makefile.am</span>
+<span class="hl kwd">&#64;&#64; -0,0 +1,33 &#64;&#64;</span>
+<span class="hl kwa">+# Copyright 1999-2014 the Claws Mail team.</span>
+<span class="hl kwa">+# This file is part of Claws Mail package, and distributed under the</span>
+<span class="hl kwa">+# terms of the General Public License version 3 (or later).</span>
+<span class="hl kwa">+# See COPYING file for license details.</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+plugindir = $(pkglibdir)/plugins</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+plugin_LTLIBRARIES = dillo.la</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+dillo_la_SOURCES = \</span>
+<span class="hl kwa">+     dillo_viewer.c \</span>
+<span class="hl kwa">+     dillo_prefs.c \</span>
+<span class="hl kwa">+	 dillo_prefs.h</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+dillo_la_LDFLAGS = \</span>
+<span class="hl kwa">+	-avoid-version -module</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+if CYGWIN</span>
+<span class="hl kwa">+cygwin_export_lib = -L$(top_builddir)/src -lclaws-mail</span>
+<span class="hl kwa">+else</span>
+<span class="hl kwa">+cygwin_export_lib =</span>
+<span class="hl kwa">+endif</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+dillo_la_LIBADD = $(cygwin_export_lib) \</span>
+<span class="hl kwa">+	$(GTK_LIBS) </span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+dillo_la_CPPFLAGS = \</span>
+<span class="hl kwa">+	-I$(top_srcdir)/src \</span>
+<span class="hl kwa">+	-I$(top_builddir)/src/common \</span>
+<span class="hl kwa">+	-I$(top_srcdir)/src/common \</span>
+<span class="hl kwa">+	-I$(top_srcdir)/src/gtk \</span>
+<span class="hl kwa">+	$(GLIB_CFLAGS) \</span>
+<span class="hl kwa">+	$(GTK_CFLAGS)</span>
 diff --git a/src/plugins/dillo/README b/src/plugins/dillo/README
 new file mode 100644
 index 0000000..a61f4e0
---- /dev/null
-+++ b/src/plugins/dillo/README
-@@ -0,0 +1,48 @@
-+Dillo Viewer: HTML mail viewing in Claws Mail
-+-------------------------------------------------
-+
-+This plugin uses the Dillo (http://www.dillo.org) browser to
-+view text/html MIME parts inside Claws Mail.
-+
-+When the plugin is loaded, if the MIME part to be viewed is of
-+text/html type, then the MIME part is saved in a temporary file and
-+Dillo is started with special options to embed it inside
-+Claws Mail' message view and to "safely" view the part.  Dillo is
-+also run in the fullwindow mode, where the toolbar, menubar and the
-+statusbar are hidden so the message is viewed in a larger area.  The
-+fullwindow mode is toggled on and off by double clicking on an empty
-+part of the page or by clicking on the icon in the lower right corner.
-+
-+The "safe" viewing of text/html message parts is achieved by using the
-+-l (or --local) option of Dillo.  This option prevents Dillo from
-+retrieving remote web resources, like images.  Thus, no connection
-+to the Internet is done.  If the user wants to view the message
-+without this restriction, s/he just reloads the page by clicking on
-+the "Reload" button in Dillo's toolbar.
-+
-+WARNING: This plugin is provided as is.  The author does not guarantee
-+safe viewing of text/html messages although he tried hard to achieve
-+this goal.
-+
-+What Dillo version should be used?
-+----------------------------------
-+
-+Dillo 0.7.0 was the first version that included the features needed by
-+Claws, but it had a small bug where remote resources could be
-+accessed even with the --local option (when a BASE element is present
-+in the message).
-+
-+Since 2002-03-16, the CVS tree of Dillo fixed that bug.
-+
-+Dillo 0.7.2 and newer (up to 3.0.5) do not have that bug, and are the
-+recommended versions to be used.
-+
-+Acknowledgment:
-+---------------
-+
-+The author of this plugin thanks the author of Dillo, Jorge Arellano
-+Cid, who accepted to integrate and improve the different patches
-+needed for this functionality.
-+
-+-- 
-+Melvin Hadasht
+<span class="hl kwb">--- /dev/null</span>
+<span class="hl kwa">+++ b/src/plugins/dillo/README</span>
+<span class="hl kwd">&#64;&#64; -0,0 +1,48 &#64;&#64;</span>
+<span class="hl kwa">+Dillo Viewer: HTML mail viewing in Claws Mail</span>
+<span class="hl kwa">+-------------------------------------------------</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+This plugin uses the Dillo (http://www.dillo.org) browser to</span>
+<span class="hl kwa">+view text/html MIME parts inside Claws Mail.</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+When the plugin is loaded, if the MIME part to be viewed is of</span>
+<span class="hl kwa">+text/html type, then the MIME part is saved in a temporary file and</span>
+<span class="hl kwa">+Dillo is started with special options to embed it inside</span>
+<span class="hl kwa">+Claws Mail&apos; message view and to &quot;safely&quot; view the part.  Dillo is</span>
+<span class="hl kwa">+also run in the fullwindow mode, where the toolbar, menubar and the</span>
+<span class="hl kwa">+statusbar are hidden so the message is viewed in a larger area.  The</span>
+<span class="hl kwa">+fullwindow mode is toggled on and off by double clicking on an empty</span>
+<span class="hl kwa">+part of the page or by clicking on the icon in the lower right corner.</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+The &quot;safe&quot; viewing of text/html message parts is achieved by using the</span>
+<span class="hl kwa">+-l (or --local) option of Dillo.  This option prevents Dillo from</span>
+<span class="hl kwa">+retrieving remote web resources, like images.  Thus, no connection</span>
+<span class="hl kwa">+to the Internet is done.  If the user wants to view the message</span>
+<span class="hl kwa">+without this restriction, s/he just reloads the page by clicking on</span>
+<span class="hl kwa">+the &quot;Reload&quot; button in Dillo&apos;s toolbar.</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+WARNING: This plugin is provided as is.  The author does not guarantee</span>
+<span class="hl kwa">+safe viewing of text/html messages although he tried hard to achieve</span>
+<span class="hl kwa">+this goal.</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+What Dillo version should be used?</span>
+<span class="hl kwa">+----------------------------------</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+Dillo 0.7.0 was the first version that included the features needed by</span>
+<span class="hl kwa">+Claws, but it had a small bug where remote resources could be</span>
+<span class="hl kwa">+accessed even with the --local option (when a BASE element is present</span>
+<span class="hl kwa">+in the message).</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+Since 2002-03-16, the CVS tree of Dillo fixed that bug.</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+Dillo 0.7.2 and newer (up to 3.0.5) do not have that bug, and are the</span>
+<span class="hl kwa">+recommended versions to be used.</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+Acknowledgment:</span>
+<span class="hl kwa">+---------------</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+The author of this plugin thanks the author of Dillo, Jorge Arellano</span>
+<span class="hl kwa">+Cid, who accepted to integrate and improve the different patches</span>
+<span class="hl kwa">+needed for this functionality.</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+-- </span>
+<span class="hl kwa">+Melvin Hadasht</span>
 diff --git a/src/plugins/dillo/dillo_prefs.c b/src/plugins/dillo/dillo_prefs.c
 new file mode 100644
 index 0000000..8d9529b
---- /dev/null
-+++ b/src/plugins/dillo/dillo_prefs.c
-@@ -0,0 +1,305 @@
-+/*
-+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
-+ * Copyright (C) 1999-2012 the Claws Mail Team
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
-+ * 
-+ */
-+
-+/*
-+ * The structure of this file has been borrowed from the structure of
-+ * the image_viewer plugin file. I also used it as an example of how to
-+ * build the preferences for the dillo plugin.
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#  include "config.h"
-+#include "claws-features.h"
-+#endif
-+
-+#include "defs.h"
-+
-+#include <glib.h>
-+#include <glib/gi18n.h>
-+#include <gtk/gtk.h>
-+
-+#include "gtkutils.h"
-+#include "utils.h"
-+#include "prefs.h"
-+#include "prefs_gtk.h"
-+#include "prefswindow.h"
-+#include "combobox.h"
-+#include "addressbook.h"
-+
-+#include "dillo_prefs.h"
-+
-+#define PREFS_BLOCK_NAME "Dillo"
-+
-+DilloBrowserPrefs dillo_prefs;
-+
-+typedef struct _DilloBrowserPage DilloBrowserPage;
-+
-+struct _DilloBrowserPage {
-+        PrefsPage page;
-+        GtkWidget *local;
-+	GtkWidget *whitelist_ab;
-+	GtkWidget *whitelist_ab_folder_combo;
-+	GtkWidget *whitelist_ab_select_btn;
-+        GtkWidget *full;
-+};
-+
-+static PrefParam param[] = {
-+        {"local_browse", "TRUE", &dillo_prefs.local, P_BOOL, NULL, NULL, NULL},
-+        {"full_window", "TRUE", &dillo_prefs.full, P_BOOL, NULL, NULL, NULL},
-+	{"whitelist_ab", "FALSE", &dillo_prefs.whitelist_ab, P_BOOL,
-+	 NULL, NULL, NULL},
-+	{"whitelist_ab_folder", N_("Any"), &dillo_prefs.whitelist_ab_folder, P_STRING,
-+	 NULL, NULL, NULL},
-+
-+        {0,0,0,0,0,0,0}
-+};
-+
-+static DilloBrowserPage prefs_page;
-+
-+static void create_dillo_prefs_page	(PrefsPage *page,
-+					 GtkWindow *window,
-+					 gpointer   data);
-+static void destroy_dillo_prefs_page	(PrefsPage *page);
-+static void save_dillo_prefs		(PrefsPage *page);
-+
-+#ifndef USE_NEW_ADDRBOOK
-+static void dillo_whitelist_ab_select_cb(GtkWidget *widget, gpointer data)
-+{
-+	DilloBrowserPage *page = (DilloBrowserPage *) data;
-+	const gchar *folderpath = NULL;
-+	gchar *new_path = NULL;
-+
-+	folderpath = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((page->whitelist_ab_folder_combo)))));
-+	new_path = addressbook_folder_selection(folderpath);
-+	if (new_path) {
-+		gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((page->whitelist_ab_folder_combo)))), new_path);
-+		g_free(new_path);
-+	} 
-+}
-+#endif
-+
-+static void local_checkbox_toggled(GtkToggleButton *button,
-+					  gpointer user_data)
-+{
-+	gboolean active = gtk_toggle_button_get_active(button);
-+        DilloBrowserPage *prefs_page = (DilloBrowserPage *) user_data;
-+
-+	gtk_widget_set_sensitive(prefs_page->whitelist_ab, active);
-+	gtk_widget_set_sensitive(prefs_page->whitelist_ab_folder_combo, active && 
-+			gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_page->whitelist_ab)));
-+#ifndef USE_NEW_ADDRBOOK
-+	gtk_widget_set_sensitive(prefs_page->whitelist_ab_select_btn, active && 
-+			gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_page->whitelist_ab)));
-+#endif
-+}
-+
-+static void whitelist_checkbox_toggled(GtkToggleButton *button,
-+					  gpointer user_data)
-+{
-+	gboolean active = gtk_toggle_button_get_active(button);
-+        DilloBrowserPage *prefs_page = (DilloBrowserPage *) user_data;
-+
-+	active &= gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_page->local));
-+
-+	gtk_widget_set_sensitive(prefs_page->whitelist_ab_folder_combo, active);
-+	gtk_widget_set_sensitive(prefs_page->whitelist_ab_select_btn, active);
-+}
-+
-+void dillo_prefs_init(void)
-+{
-+	static gchar *path[3];
-+	gchar *rcpath;
-+
-+	path[0] = _("Plugins");
-+	path[1] = _("Dillo Browser");
-+	path[2] = NULL;
-+
-+        prefs_set_default(param);
-+	rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMON_RC, NULL);
-+        prefs_read_config(param, PREFS_BLOCK_NAME, rcpath, NULL);
-+	g_free(rcpath);
-+        
-+        prefs_page.page.path = path;
-+        prefs_page.page.create_widget = create_dillo_prefs_page;
-+        prefs_page.page.destroy_widget = destroy_dillo_prefs_page;
-+        prefs_page.page.save_page = save_dillo_prefs;
-+		prefs_page.page.weight = 35.0;
-+        prefs_gtk_register_page((PrefsPage *) &prefs_page);
-+}
-+
-+void dillo_prefs_done(void)
-+{
-+        prefs_gtk_unregister_page((PrefsPage *) &prefs_page);
-+}
-+
-+static void create_dillo_prefs_page(PrefsPage *page,
-+				    GtkWindow *window,
-+                                    gpointer data)
-+{
-+        DilloBrowserPage *prefs_page = (DilloBrowserPage *) page;
-+
-+        GtkWidget *vbox;
-+        GtkWidget *local_checkbox;
-+        GtkWidget *full_checkbox;
-+        GtkWidget *label;
-+	GtkWidget *whitelist_ab_checkbtn;
-+	GtkWidget *whitelist_ab_folder_combo;
-+	GtkWidget *whitelist_ab_select_btn;
-+	GtkWidget *hbox_whitelist, *spacer;
-+
-+        vbox = gtk_vbox_new(FALSE, 3);
-+        gtk_container_set_border_width(GTK_CONTAINER(vbox), VBOX_BORDER);
-+        gtk_widget_show(vbox);
-+        
-+        local_checkbox = gtk_check_button_new_with_label
-+				(_("Load remote links in mails"));
-+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(local_checkbox),
-+                                     !dillo_prefs.local);
-+        gtk_box_pack_start(GTK_BOX(vbox), local_checkbox, FALSE, FALSE, 0);
-+        gtk_widget_show(local_checkbox);
-+	CLAWS_SET_TIP(local_checkbox,
-+			     _("Equivalent to Dillo's '--local' option"));
-+        
-+	label = gtk_label_new(_("You can still load remote links "
-+			      "by reloading the page"));
-+        gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
-+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-+	gtkut_widget_set_small_font_size (label);
-+        gtk_widget_show(label);
-+
-+	
-+	hbox_whitelist = gtk_hbox_new(FALSE, 8);
-+	gtk_widget_show(hbox_whitelist);
-+	gtk_box_pack_start (GTK_BOX (vbox), hbox_whitelist, FALSE, FALSE, 0);
-+	
-+	spacer = gtk_hbox_new(FALSE, 0);
-+	gtk_widget_set_size_request(spacer, 12, -1);
-+	gtk_widget_show(spacer);
-+	gtk_box_pack_start(GTK_BOX(hbox_whitelist), spacer, FALSE, FALSE, 0);
-+
-+	whitelist_ab_checkbtn = gtk_check_button_new_with_label(_("Only for senders found in address book/folder"));
-+	gtk_widget_show(whitelist_ab_checkbtn);
-+	gtk_box_pack_start(GTK_BOX(hbox_whitelist), whitelist_ab_checkbtn, FALSE, FALSE, 0);
-+
-+	whitelist_ab_folder_combo = combobox_text_new(TRUE, _("Any"), NULL);
-+	gtk_widget_set_size_request(whitelist_ab_folder_combo, 100, -1);
-+	gtk_box_pack_start (GTK_BOX (hbox_whitelist), whitelist_ab_folder_combo, TRUE, TRUE, 0);
-+
-+	whitelist_ab_select_btn = gtk_button_new_with_label(_("Select ..."));
-+	gtk_widget_show (whitelist_ab_select_btn);
-+	gtk_box_pack_start (GTK_BOX (hbox_whitelist), whitelist_ab_select_btn, FALSE, FALSE, 0);
-+
-+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(whitelist_ab_checkbtn), dillo_prefs.whitelist_ab);
-+	if (dillo_prefs.whitelist_ab_folder != NULL) {
-+		/* translate "Any" (stored UNtranslated) */
-+		if (strcasecmp(dillo_prefs.whitelist_ab_folder, "Any") == 0)
-+			gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((whitelist_ab_folder_combo)))),
-+					_("Any"));
-+		else
-+		/* backward compatibility (when translated "Any" was stored) */
-+		if (g_utf8_collate(dillo_prefs.whitelist_ab_folder, _("Any")) == 0)
-+			gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((whitelist_ab_folder_combo)))),
-+					dillo_prefs.whitelist_ab_folder);
-+		else
-+			gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((whitelist_ab_folder_combo)))),
-+					dillo_prefs.whitelist_ab_folder);
-+	}
-+
-+        full_checkbox = gtk_check_button_new_with_label
-+				(_("Full window mode (hide controls)"));
-+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(full_checkbox),
-+                                      dillo_prefs.full);
-+        gtk_box_pack_start(GTK_BOX(vbox), full_checkbox, FALSE, FALSE, 0);
-+        gtk_widget_show(full_checkbox);
-+	CLAWS_SET_TIP(full_checkbox,
-+			     _("Equivalent to Dillo's '--fullwindow' option"));
-+
-+	g_signal_connect(G_OBJECT(local_checkbox), "toggled",
-+			 G_CALLBACK(local_checkbox_toggled),
-+			 prefs_page);
-+
-+	g_signal_connect(G_OBJECT(whitelist_ab_checkbtn), "toggled",
-+			 G_CALLBACK(whitelist_checkbox_toggled),
-+			 prefs_page);
-+
-+#ifndef USE_NEW_ADDRBOOK
-+	g_signal_connect(G_OBJECT (whitelist_ab_select_btn), "clicked",
-+			 G_CALLBACK(dillo_whitelist_ab_select_cb), prefs_page);
-+#else
-+	gtk_widget_set_sensitive(GTK_WIDGET(whitelist_ab_select_btn), FALSE);
-+#endif
-+	gtk_widget_set_sensitive(whitelist_ab_checkbtn, !dillo_prefs.local);
-+	gtk_widget_set_sensitive(whitelist_ab_folder_combo, !dillo_prefs.local && dillo_prefs.whitelist_ab);
-+	gtk_widget_set_sensitive(whitelist_ab_select_btn, !dillo_prefs.local && dillo_prefs.whitelist_ab);
-+
-+        
-+        prefs_page->local = local_checkbox;
-+        prefs_page->full = full_checkbox;
-+	prefs_page->whitelist_ab = whitelist_ab_checkbtn;
-+	prefs_page->whitelist_ab_folder_combo = whitelist_ab_folder_combo;
-+	prefs_page->whitelist_ab_select_btn = whitelist_ab_select_btn;
-+        prefs_page->page.widget = vbox;
-+}
-+
-+static void destroy_dillo_prefs_page(PrefsPage *page)
-+{
-+	/* Do nothing! */
-+}
-+
-+static void save_dillo_prefs(PrefsPage *page)
-+{
-+        DilloBrowserPage *prefs_page = (DilloBrowserPage *) page;
-+        PrefFile *pref_file;
-+        gchar *rc_file_path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
-+                                          COMMON_RC, NULL);
-+        
-+        dillo_prefs.local = !gtk_toggle_button_get_active
-+				(GTK_TOGGLE_BUTTON(prefs_page->local));
-+        dillo_prefs.full = gtk_toggle_button_get_active
-+				(GTK_TOGGLE_BUTTON(prefs_page->full));
-+
-+	dillo_prefs.whitelist_ab = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_page->whitelist_ab));
-+	g_free(dillo_prefs.whitelist_ab_folder);
-+	dillo_prefs.whitelist_ab_folder = gtk_editable_get_chars(
-+				GTK_EDITABLE(gtk_bin_get_child(GTK_BIN((prefs_page->whitelist_ab_folder_combo)))), 0, -1);
-+	/* store UNtranslated "Any" */
-+	if (g_utf8_collate(dillo_prefs.whitelist_ab_folder, _("Any")) == 0) {
-+		g_free(dillo_prefs.whitelist_ab_folder);
-+		dillo_prefs.whitelist_ab_folder = g_strdup("Any");
-+	}
-+    
-+        pref_file = prefs_write_open(rc_file_path);
-+        g_free(rc_file_path);
-+        
-+        if (!(pref_file) ||
-+	    (prefs_set_block_label(pref_file, PREFS_BLOCK_NAME) < 0))
-+          return;
-+        
-+        if (prefs_write_param(param, pref_file->fp) < 0) {
-+          g_warning("failed to write Dillo Plugin configuration\n");
-+          prefs_file_close_revert(pref_file);
-+          return;
-+        }
-+
-+        if (fprintf(pref_file->fp, "\n") < 0) {
-+		FILE_OP_ERROR(rc_file_path, "fprintf");
-+		prefs_file_close_revert(pref_file);
-+	} else
-+	        prefs_file_close(pref_file);
-+}
+<span class="hl kwb">--- /dev/null</span>
+<span class="hl kwa">+++ b/src/plugins/dillo/dillo_prefs.c</span>
+<span class="hl kwd">&#64;&#64; -0,0 +1,305 &#64;&#64;</span>
+<span class="hl kwa">+/*</span>
+<span class="hl kwa">+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client</span>
+<span class="hl kwa">+ * Copyright (C) 1999-2012 the Claws Mail Team</span>
+<span class="hl kwa">+ *</span>
+<span class="hl kwa">+ * This program is free software; you can redistribute it and/or modify</span>
+<span class="hl kwa">+ * it under the terms of the GNU General Public License as published by</span>
+<span class="hl kwa">+ * the Free Software Foundation; either version 3 of the License, or</span>
+<span class="hl kwa">+ * (at your option) any later version.</span>
+<span class="hl kwa">+ *</span>
+<span class="hl kwa">+ * This program is distributed in the hope that it will be useful,</span>
+<span class="hl kwa">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span>
+<span class="hl kwa">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</span>
+<span class="hl kwa">+ * GNU General Public License for more details.</span>
+<span class="hl kwa">+ *</span>
+<span class="hl kwa">+ * You should have received a copy of the GNU General Public License</span>
+<span class="hl kwa">+ * along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.</span>
+<span class="hl kwa">+ * </span>
+<span class="hl kwa">+ */</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+/*</span>
+<span class="hl kwa">+ * The structure of this file has been borrowed from the structure of</span>
+<span class="hl kwa">+ * the image_viewer plugin file. I also used it as an example of how to</span>
+<span class="hl kwa">+ * build the preferences for the dillo plugin.</span>
+<span class="hl kwa">+ */</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+#ifdef HAVE_CONFIG_H</span>
+<span class="hl kwa">+#  include &quot;config.h&quot;</span>
+<span class="hl kwa">+#include &quot;claws-features.h&quot;</span>
+<span class="hl kwa">+#endif</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+#include &quot;defs.h&quot;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+#include &lt;glib.h&gt;</span>
+<span class="hl kwa">+#include &lt;glib/gi18n.h&gt;</span>
+<span class="hl kwa">+#include &lt;gtk/gtk.h&gt;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+#include &quot;gtkutils.h&quot;</span>
+<span class="hl kwa">+#include &quot;utils.h&quot;</span>
+<span class="hl kwa">+#include &quot;prefs.h&quot;</span>
+<span class="hl kwa">+#include &quot;prefs_gtk.h&quot;</span>
+<span class="hl kwa">+#include &quot;prefswindow.h&quot;</span>
+<span class="hl kwa">+#include &quot;combobox.h&quot;</span>
+<span class="hl kwa">+#include &quot;addressbook.h&quot;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+#include &quot;dillo_prefs.h&quot;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+#define PREFS_BLOCK_NAME &quot;Dillo&quot;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+DilloBrowserPrefs dillo_prefs;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+typedef struct _DilloBrowserPage DilloBrowserPage;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+struct _DilloBrowserPage {</span>
+<span class="hl kwa">+        PrefsPage page;</span>
+<span class="hl kwa">+        GtkWidget *local;</span>
+<span class="hl kwa">+	GtkWidget *whitelist_ab;</span>
+<span class="hl kwa">+	GtkWidget *whitelist_ab_folder_combo;</span>
+<span class="hl kwa">+	GtkWidget *whitelist_ab_select_btn;</span>
+<span class="hl kwa">+        GtkWidget *full;</span>
+<span class="hl kwa">+};</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+static PrefParam param[] = {</span>
+<span class="hl kwa">+        {&quot;local_browse&quot;, &quot;TRUE&quot;, &amp;dillo_prefs.local, P_BOOL, NULL, NULL, NULL},</span>
+<span class="hl kwa">+        {&quot;full_window&quot;, &quot;TRUE&quot;, &amp;dillo_prefs.full, P_BOOL, NULL, NULL, NULL},</span>
+<span class="hl kwa">+	{&quot;whitelist_ab&quot;, &quot;FALSE&quot;, &amp;dillo_prefs.whitelist_ab, P_BOOL,</span>
+<span class="hl kwa">+	 NULL, NULL, NULL},</span>
+<span class="hl kwa">+	{&quot;whitelist_ab_folder&quot;, N_(&quot;Any&quot;), &amp;dillo_prefs.whitelist_ab_folder, P_STRING,</span>
+<span class="hl kwa">+	 NULL, NULL, NULL},</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+        {0,0,0,0,0,0,0}</span>
+<span class="hl kwa">+};</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+static DilloBrowserPage prefs_page;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+static void create_dillo_prefs_page	(PrefsPage *page,</span>
+<span class="hl kwa">+					 GtkWindow *window,</span>
+<span class="hl kwa">+					 gpointer   data);</span>
+<span class="hl kwa">+static void destroy_dillo_prefs_page	(PrefsPage *page);</span>
+<span class="hl kwa">+static void save_dillo_prefs		(PrefsPage *page);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+#ifndef USE_NEW_ADDRBOOK</span>
+<span class="hl kwa">+static void dillo_whitelist_ab_select_cb(GtkWidget *widget, gpointer data)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	DilloBrowserPage *page = (DilloBrowserPage *) data;</span>
+<span class="hl kwa">+	const gchar *folderpath = NULL;</span>
+<span class="hl kwa">+	gchar *new_path = NULL;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	folderpath = gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((page-&gt;whitelist_ab_folder_combo)))));</span>
+<span class="hl kwa">+	new_path = addressbook_folder_selection(folderpath);</span>
+<span class="hl kwa">+	if (new_path) {</span>
+<span class="hl kwa">+		gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((page-&gt;whitelist_ab_folder_combo)))), new_path);</span>
+<span class="hl kwa">+		g_free(new_path);</span>
+<span class="hl kwa">+	} </span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+#endif</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+static void local_checkbox_toggled(GtkToggleButton *button,</span>
+<span class="hl kwa">+					  gpointer user_data)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	gboolean active = gtk_toggle_button_get_active(button);</span>
+<span class="hl kwa">+        DilloBrowserPage *prefs_page = (DilloBrowserPage *) user_data;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	gtk_widget_set_sensitive(prefs_page-&gt;whitelist_ab, active);</span>
+<span class="hl kwa">+	gtk_widget_set_sensitive(prefs_page-&gt;whitelist_ab_folder_combo, active &amp;&amp; </span>
+<span class="hl kwa">+			gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_page-&gt;whitelist_ab)));</span>
+<span class="hl kwa">+#ifndef USE_NEW_ADDRBOOK</span>
+<span class="hl kwa">+	gtk_widget_set_sensitive(prefs_page-&gt;whitelist_ab_select_btn, active &amp;&amp; </span>
+<span class="hl kwa">+			gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_page-&gt;whitelist_ab)));</span>
+<span class="hl kwa">+#endif</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+static void whitelist_checkbox_toggled(GtkToggleButton *button,</span>
+<span class="hl kwa">+					  gpointer user_data)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	gboolean active = gtk_toggle_button_get_active(button);</span>
+<span class="hl kwa">+        DilloBrowserPage *prefs_page = (DilloBrowserPage *) user_data;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	active &amp;= gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_page-&gt;local));</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	gtk_widget_set_sensitive(prefs_page-&gt;whitelist_ab_folder_combo, active);</span>
+<span class="hl kwa">+	gtk_widget_set_sensitive(prefs_page-&gt;whitelist_ab_select_btn, active);</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+void dillo_prefs_init(void)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	static gchar *path[3];</span>
+<span class="hl kwa">+	gchar *rcpath;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	path[0] = _(&quot;Plugins&quot;);</span>
+<span class="hl kwa">+	path[1] = _(&quot;Dillo Browser&quot;);</span>
+<span class="hl kwa">+	path[2] = NULL;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+        prefs_set_default(param);</span>
+<span class="hl kwa">+	rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, COMMON_RC, NULL);</span>
+<span class="hl kwa">+        prefs_read_config(param, PREFS_BLOCK_NAME, rcpath, NULL);</span>
+<span class="hl kwa">+	g_free(rcpath);</span>
+<span class="hl kwa">+        </span>
+<span class="hl kwa">+        prefs_page.page.path = path;</span>
+<span class="hl kwa">+        prefs_page.page.create_widget = create_dillo_prefs_page;</span>
+<span class="hl kwa">+        prefs_page.page.destroy_widget = destroy_dillo_prefs_page;</span>
+<span class="hl kwa">+        prefs_page.page.save_page = save_dillo_prefs;</span>
+<span class="hl kwa">+		prefs_page.page.weight = 35.0;</span>
+<span class="hl kwa">+        prefs_gtk_register_page((PrefsPage *) &amp;prefs_page);</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+void dillo_prefs_done(void)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+        prefs_gtk_unregister_page((PrefsPage *) &amp;prefs_page);</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+static void create_dillo_prefs_page(PrefsPage *page,</span>
+<span class="hl kwa">+				    GtkWindow *window,</span>
+<span class="hl kwa">+                                    gpointer data)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+        DilloBrowserPage *prefs_page = (DilloBrowserPage *) page;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+        GtkWidget *vbox;</span>
+<span class="hl kwa">+        GtkWidget *local_checkbox;</span>
+<span class="hl kwa">+        GtkWidget *full_checkbox;</span>
+<span class="hl kwa">+        GtkWidget *label;</span>
+<span class="hl kwa">+	GtkWidget *whitelist_ab_checkbtn;</span>
+<span class="hl kwa">+	GtkWidget *whitelist_ab_folder_combo;</span>
+<span class="hl kwa">+	GtkWidget *whitelist_ab_select_btn;</span>
+<span class="hl kwa">+	GtkWidget *hbox_whitelist, *spacer;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+        vbox = gtk_vbox_new(FALSE, 3);</span>
+<span class="hl kwa">+        gtk_container_set_border_width(GTK_CONTAINER(vbox), VBOX_BORDER);</span>
+<span class="hl kwa">+        gtk_widget_show(vbox);</span>
+<span class="hl kwa">+        </span>
+<span class="hl kwa">+        local_checkbox = gtk_check_button_new_with_label</span>
+<span class="hl kwa">+				(_(&quot;Load remote links in mails&quot;));</span>
+<span class="hl kwa">+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(local_checkbox),</span>
+<span class="hl kwa">+                                     !dillo_prefs.local);</span>
+<span class="hl kwa">+        gtk_box_pack_start(GTK_BOX(vbox), local_checkbox, FALSE, FALSE, 0);</span>
+<span class="hl kwa">+        gtk_widget_show(local_checkbox);</span>
+<span class="hl kwa">+	CLAWS_SET_TIP(local_checkbox,</span>
+<span class="hl kwa">+			     _(&quot;Equivalent to Dillo&apos;s &apos;--local&apos; option&quot;));</span>
+<span class="hl kwa">+        </span>
+<span class="hl kwa">+	label = gtk_label_new(_(&quot;You can still load remote links &quot;</span>
+<span class="hl kwa">+			      &quot;by reloading the page&quot;));</span>
+<span class="hl kwa">+        gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);</span>
+<span class="hl kwa">+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);</span>
+<span class="hl kwa">+	gtkut_widget_set_small_font_size (label);</span>
+<span class="hl kwa">+        gtk_widget_show(label);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	</span>
+<span class="hl kwa">+	hbox_whitelist = gtk_hbox_new(FALSE, 8);</span>
+<span class="hl kwa">+	gtk_widget_show(hbox_whitelist);</span>
+<span class="hl kwa">+	gtk_box_pack_start (GTK_BOX (vbox), hbox_whitelist, FALSE, FALSE, 0);</span>
+<span class="hl kwa">+	</span>
+<span class="hl kwa">+	spacer = gtk_hbox_new(FALSE, 0);</span>
+<span class="hl kwa">+	gtk_widget_set_size_request(spacer, 12, -1);</span>
+<span class="hl kwa">+	gtk_widget_show(spacer);</span>
+<span class="hl kwa">+	gtk_box_pack_start(GTK_BOX(hbox_whitelist), spacer, FALSE, FALSE, 0);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	whitelist_ab_checkbtn = gtk_check_button_new_with_label(_(&quot;Only for senders found in address book/folder&quot;));</span>
+<span class="hl kwa">+	gtk_widget_show(whitelist_ab_checkbtn);</span>
+<span class="hl kwa">+	gtk_box_pack_start(GTK_BOX(hbox_whitelist), whitelist_ab_checkbtn, FALSE, FALSE, 0);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	whitelist_ab_folder_combo = combobox_text_new(TRUE, _(&quot;Any&quot;), NULL);</span>
+<span class="hl kwa">+	gtk_widget_set_size_request(whitelist_ab_folder_combo, 100, -1);</span>
+<span class="hl kwa">+	gtk_box_pack_start (GTK_BOX (hbox_whitelist), whitelist_ab_folder_combo, TRUE, TRUE, 0);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	whitelist_ab_select_btn = gtk_button_new_with_label(_(&quot;Select ...&quot;));</span>
+<span class="hl kwa">+	gtk_widget_show (whitelist_ab_select_btn);</span>
+<span class="hl kwa">+	gtk_box_pack_start (GTK_BOX (hbox_whitelist), whitelist_ab_select_btn, FALSE, FALSE, 0);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(whitelist_ab_checkbtn), dillo_prefs.whitelist_ab);</span>
+<span class="hl kwa">+	if (dillo_prefs.whitelist_ab_folder != NULL) {</span>
+<span class="hl kwa">+		/* translate &quot;Any&quot; (stored UNtranslated) */</span>
+<span class="hl kwa">+		if (strcasecmp(dillo_prefs.whitelist_ab_folder, &quot;Any&quot;) == 0)</span>
+<span class="hl kwa">+			gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((whitelist_ab_folder_combo)))),</span>
+<span class="hl kwa">+					_(&quot;Any&quot;));</span>
+<span class="hl kwa">+		else</span>
+<span class="hl kwa">+		/* backward compatibility (when translated &quot;Any&quot; was stored) */</span>
+<span class="hl kwa">+		if (g_utf8_collate(dillo_prefs.whitelist_ab_folder, _(&quot;Any&quot;)) == 0)</span>
+<span class="hl kwa">+			gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((whitelist_ab_folder_combo)))),</span>
+<span class="hl kwa">+					dillo_prefs.whitelist_ab_folder);</span>
+<span class="hl kwa">+		else</span>
+<span class="hl kwa">+			gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN((whitelist_ab_folder_combo)))),</span>
+<span class="hl kwa">+					dillo_prefs.whitelist_ab_folder);</span>
+<span class="hl kwa">+	}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+        full_checkbox = gtk_check_button_new_with_label</span>
+<span class="hl kwa">+				(_(&quot;Full window mode (hide controls)&quot;));</span>
+<span class="hl kwa">+        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(full_checkbox),</span>
+<span class="hl kwa">+                                      dillo_prefs.full);</span>
+<span class="hl kwa">+        gtk_box_pack_start(GTK_BOX(vbox), full_checkbox, FALSE, FALSE, 0);</span>
+<span class="hl kwa">+        gtk_widget_show(full_checkbox);</span>
+<span class="hl kwa">+	CLAWS_SET_TIP(full_checkbox,</span>
+<span class="hl kwa">+			     _(&quot;Equivalent to Dillo&apos;s &apos;--fullwindow&apos; option&quot;));</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	g_signal_connect(G_OBJECT(local_checkbox), &quot;toggled&quot;,</span>
+<span class="hl kwa">+			 G_CALLBACK(local_checkbox_toggled),</span>
+<span class="hl kwa">+			 prefs_page);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	g_signal_connect(G_OBJECT(whitelist_ab_checkbtn), &quot;toggled&quot;,</span>
+<span class="hl kwa">+			 G_CALLBACK(whitelist_checkbox_toggled),</span>
+<span class="hl kwa">+			 prefs_page);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+#ifndef USE_NEW_ADDRBOOK</span>
+<span class="hl kwa">+	g_signal_connect(G_OBJECT (whitelist_ab_select_btn), &quot;clicked&quot;,</span>
+<span class="hl kwa">+			 G_CALLBACK(dillo_whitelist_ab_select_cb), prefs_page);</span>
+<span class="hl kwa">+#else</span>
+<span class="hl kwa">+	gtk_widget_set_sensitive(GTK_WIDGET(whitelist_ab_select_btn), FALSE);</span>
+<span class="hl kwa">+#endif</span>
+<span class="hl kwa">+	gtk_widget_set_sensitive(whitelist_ab_checkbtn, !dillo_prefs.local);</span>
+<span class="hl kwa">+	gtk_widget_set_sensitive(whitelist_ab_folder_combo, !dillo_prefs.local &amp;&amp; dillo_prefs.whitelist_ab);</span>
+<span class="hl kwa">+	gtk_widget_set_sensitive(whitelist_ab_select_btn, !dillo_prefs.local &amp;&amp; dillo_prefs.whitelist_ab);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+        </span>
+<span class="hl kwa">+        prefs_page-&gt;local = local_checkbox;</span>
+<span class="hl kwa">+        prefs_page-&gt;full = full_checkbox;</span>
+<span class="hl kwa">+	prefs_page-&gt;whitelist_ab = whitelist_ab_checkbtn;</span>
+<span class="hl kwa">+	prefs_page-&gt;whitelist_ab_folder_combo = whitelist_ab_folder_combo;</span>
+<span class="hl kwa">+	prefs_page-&gt;whitelist_ab_select_btn = whitelist_ab_select_btn;</span>
+<span class="hl kwa">+        prefs_page-&gt;page.widget = vbox;</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+static void destroy_dillo_prefs_page(PrefsPage *page)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	/* Do nothing! */</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+static void save_dillo_prefs(PrefsPage *page)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+        DilloBrowserPage *prefs_page = (DilloBrowserPage *) page;</span>
+<span class="hl kwa">+        PrefFile *pref_file;</span>
+<span class="hl kwa">+        gchar *rc_file_path = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,</span>
+<span class="hl kwa">+                                          COMMON_RC, NULL);</span>
+<span class="hl kwa">+        </span>
+<span class="hl kwa">+        dillo_prefs.local = !gtk_toggle_button_get_active</span>
+<span class="hl kwa">+				(GTK_TOGGLE_BUTTON(prefs_page-&gt;local));</span>
+<span class="hl kwa">+        dillo_prefs.full = gtk_toggle_button_get_active</span>
+<span class="hl kwa">+				(GTK_TOGGLE_BUTTON(prefs_page-&gt;full));</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	dillo_prefs.whitelist_ab = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prefs_page-&gt;whitelist_ab));</span>
+<span class="hl kwa">+	g_free(dillo_prefs.whitelist_ab_folder);</span>
+<span class="hl kwa">+	dillo_prefs.whitelist_ab_folder = gtk_editable_get_chars(</span>
+<span class="hl kwa">+				GTK_EDITABLE(gtk_bin_get_child(GTK_BIN((prefs_page-&gt;whitelist_ab_folder_combo)))), 0, -1);</span>
+<span class="hl kwa">+	/* store UNtranslated &quot;Any&quot; */</span>
+<span class="hl kwa">+	if (g_utf8_collate(dillo_prefs.whitelist_ab_folder, _(&quot;Any&quot;)) == 0) {</span>
+<span class="hl kwa">+		g_free(dillo_prefs.whitelist_ab_folder);</span>
+<span class="hl kwa">+		dillo_prefs.whitelist_ab_folder = g_strdup(&quot;Any&quot;);</span>
+<span class="hl kwa">+	}</span>
+<span class="hl kwa">+    </span>
+<span class="hl kwa">+        pref_file = prefs_write_open(rc_file_path);</span>
+<span class="hl kwa">+        g_free(rc_file_path);</span>
+<span class="hl kwa">+        </span>
+<span class="hl kwa">+        if (!(pref_file) ||</span>
+<span class="hl kwa">+	    (prefs_set_block_label(pref_file, PREFS_BLOCK_NAME) &lt; 0))</span>
+<span class="hl kwa">+          return;</span>
+<span class="hl kwa">+        </span>
+<span class="hl kwa">+        if (prefs_write_param(param, pref_file-&gt;fp) &lt; 0) {</span>
+<span class="hl kwa">+          g_warning(&quot;failed to write Dillo Plugin configuration\n&quot;);</span>
+<span class="hl kwa">+          prefs_file_close_revert(pref_file);</span>
+<span class="hl kwa">+          return;</span>
+<span class="hl kwa">+        }</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+        if (fprintf(pref_file-&gt;fp, &quot;\n&quot;) &lt; 0) {</span>
+<span class="hl kwa">+		FILE_OP_ERROR(rc_file_path, &quot;fprintf&quot;);</span>
+<span class="hl kwa">+		prefs_file_close_revert(pref_file);</span>
+<span class="hl kwa">+	} else</span>
+<span class="hl kwa">+	        prefs_file_close(pref_file);</span>
+<span class="hl kwa">+}</span>
 diff --git a/src/plugins/dillo/dillo_prefs.h b/src/plugins/dillo/dillo_prefs.h
 new file mode 100644
 index 0000000..d4b5b4d
---- /dev/null
-+++ b/src/plugins/dillo/dillo_prefs.h
-@@ -0,0 +1,46 @@
-+/*
-+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
-+ * Copyright (C) 1999-2012 the Claws Mail Team
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
-+ * 
-+ */
-+
-+/*
-+ * The structure of this file has been borrowed from the structure of
-+ * the image_viewer plugin file. I also used it as an example of how to
-+ * build the preferences for the dillo plugin.
-+ */
-+
-+#ifndef DILLOPREFS_H
-+#define DILLOPREFS_H
-+
-+#include <glib.h>
-+
-+typedef struct _DilloBrowserPrefs	DilloBrowserPrefs;
-+
-+struct _DilloBrowserPrefs
-+{
-+	gboolean local;   /**< local browsing */
-+	gboolean whitelist_ab;
-+	gchar *whitelist_ab_folder;
-+	gboolean full;    /**< use full window */
-+};
-+
-+extern DilloBrowserPrefs dillo_prefs;
-+
-+void dillo_prefs_init(void);
-+void dillo_prefs_done(void);
-+
-+#endif
+<span class="hl kwb">--- /dev/null</span>
+<span class="hl kwa">+++ b/src/plugins/dillo/dillo_prefs.h</span>
+<span class="hl kwd">&#64;&#64; -0,0 +1,46 &#64;&#64;</span>
+<span class="hl kwa">+/*</span>
+<span class="hl kwa">+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client</span>
+<span class="hl kwa">+ * Copyright (C) 1999-2012 the Claws Mail Team</span>
+<span class="hl kwa">+ *</span>
+<span class="hl kwa">+ * This program is free software; you can redistribute it and/or modify</span>
+<span class="hl kwa">+ * it under the terms of the GNU General Public License as published by</span>
+<span class="hl kwa">+ * the Free Software Foundation; either version 3 of the License, or</span>
+<span class="hl kwa">+ * (at your option) any later version.</span>
+<span class="hl kwa">+ *</span>
+<span class="hl kwa">+ * This program is distributed in the hope that it will be useful,</span>
+<span class="hl kwa">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span>
+<span class="hl kwa">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</span>
+<span class="hl kwa">+ * GNU General Public License for more details.</span>
+<span class="hl kwa">+ *</span>
+<span class="hl kwa">+ * You should have received a copy of the GNU General Public License</span>
+<span class="hl kwa">+ * along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.</span>
+<span class="hl kwa">+ * </span>
+<span class="hl kwa">+ */</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+/*</span>
+<span class="hl kwa">+ * The structure of this file has been borrowed from the structure of</span>
+<span class="hl kwa">+ * the image_viewer plugin file. I also used it as an example of how to</span>
+<span class="hl kwa">+ * build the preferences for the dillo plugin.</span>
+<span class="hl kwa">+ */</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+#ifndef DILLOPREFS_H</span>
+<span class="hl kwa">+#define DILLOPREFS_H</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+#include &lt;glib.h&gt;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+typedef struct _DilloBrowserPrefs	DilloBrowserPrefs;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+struct _DilloBrowserPrefs</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	gboolean local;   /**&lt; local browsing */</span>
+<span class="hl kwa">+	gboolean whitelist_ab;</span>
+<span class="hl kwa">+	gchar *whitelist_ab_folder;</span>
+<span class="hl kwa">+	gboolean full;    /**&lt; use full window */</span>
+<span class="hl kwa">+};</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+extern DilloBrowserPrefs dillo_prefs;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+void dillo_prefs_init(void);</span>
+<span class="hl kwa">+void dillo_prefs_done(void);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+#endif</span>
 diff --git a/src/plugins/dillo/dillo_viewer.c b/src/plugins/dillo/dillo_viewer.c
 new file mode 100644
 index 0000000..1c63fa3
---- /dev/null
-+++ b/src/plugins/dillo/dillo_viewer.c
-@@ -0,0 +1,310 @@
-+/*
-+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
-+ * Copyright (C) 1999-2012 the Claws Mail Team
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 3 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
-+ * 
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#  include "config.h"
-+#include "claws-features.h"
-+#endif
-+
-+#include <unistd.h>
-+
-+#include <glib.h>
-+#include <glib/gi18n.h>
-+#include <gtk/gtk.h>
-+#if GTK_CHECK_VERSION(3, 0, 0)
-+#include <gtk/gtkx.h>
-+#endif
-+#include <gdk/gdkx.h>
-+
-+#include "common/claws.h"
-+#include "common/version.h"
-+#include "plugin.h"
-+#include "utils.h"
-+#include "mimeview.h"
-+#include "addr_compl.h"
-+
-+#include "dillo_prefs.h"
-+
-+#define PLUGIN_NAME (_("Dillo HTML Viewer"))
-+
-+typedef struct _DilloViewer DilloViewer;
-+
-+struct _DilloViewer
-+{
-+	MimeViewer	 mimeviewer;
-+	GtkWidget	*widget;	
-+	GtkWidget	*socket;
-+	gchar		*filename;
-+};
-+
-+static MimeViewerFactory dillo_viewer_factory;
-+
-+static GtkWidget *dillo_get_widget(MimeViewer *_viewer)
-+{
-+	DilloViewer *viewer = (DilloViewer *) _viewer;
-+
-+	debug_print("dillo_get_widget\n");
-+
-+	return GTK_WIDGET(viewer->widget);
-+}
-+
-+#if !GTK_CHECK_VERSION(3, 0, 0)
-+static gboolean socket_destroy_cb(GtkObject *object, gpointer data)
-+#else
-+static gboolean socket_destroy_cb(GtkObject *object, gpointer data)
-+#endif
-+{
-+	DilloViewer *viewer = (DilloViewer *) data;
-+	debug_print("Destroyed dillo socket %p\n", viewer->socket);
-+	viewer->socket = NULL;
-+	return FALSE;
-+}
-+
-+static gboolean found_in_addressbook(const gchar *address)
-+{
-+	gchar *addr = NULL;
-+	gboolean found = FALSE;
-+	gint num_addr = 0;
-+	
-+	if (!address)
-+		return FALSE;
-+	
-+	addr = g_strdup(address);
-+	extract_address(addr);
-+	num_addr = complete_address(addr);
-+	if (num_addr > 1) {
-+		/* skip first item (this is the search string itself) */
-+		int i = 1;
-+		for (; i < num_addr && !found; i++) {
-+			gchar *caddr = get_complete_address(i);
-+			extract_address(caddr);
-+			if (strcasecmp(caddr, addr) == 0)
-+				found = TRUE;
-+			g_free(caddr);
-+		}
-+	}
-+	g_free(addr);
-+	return found;
-+}
-+
-+static gboolean load_images(DilloViewer *viewer)
-+{
-+	MessageView *messageview = ((MimeViewer *)viewer)->mimeview 
-+					? ((MimeViewer *)viewer)->mimeview->messageview 
-+					: NULL;
-+	MsgInfo *msginfo = NULL;
-+	gchar *ab_folderpath = NULL;
-+
-+	if (messageview == NULL)
-+		return FALSE;
-+	
-+	msginfo = messageview->msginfo;
-+	
-+	if (msginfo == NULL)
-+		return FALSE;
-+
-+	/* don't load remote images, period. */
-+	if (dillo_prefs.local)
-+		return FALSE;
-+	
-+	/* don't do whitelisting -> load images */
-+	if (!dillo_prefs.whitelist_ab)
-+		return TRUE;
-+
-+	if (*dillo_prefs.whitelist_ab_folder != '\0' &&
-+	    strcasecmp(dillo_prefs.whitelist_ab_folder, _("Any")) != 0)
-+		ab_folderpath = dillo_prefs.whitelist_ab_folder;
-+
-+	start_address_completion(ab_folderpath);
-+
-+	/* do whitelisting -> check sender */
-+	if (found_in_addressbook(msginfo->from)) {
-+		end_address_completion();
-+		return TRUE;
-+	}
-+	
-+	end_address_completion();
-+	return FALSE;
-+}
-+
-+static void dillo_show_mimepart(MimeViewer *_viewer,
-+				const gchar *infile,
-+				MimeInfo *partinfo)
-+{
-+	DilloViewer *viewer = (DilloViewer *) _viewer;
-+
-+	debug_print("dillo_show_mimepart\n");
-+
-+	if (viewer->filename != NULL) {
-+		claws_unlink(viewer->filename);
-+		g_free(viewer->filename);
-+	}
-+
-+	viewer->filename = procmime_get_tmp_file_name(partinfo);
-+	
-+	if (!(procmime_get_part(viewer->filename, partinfo) < 0)) {
-+		gchar *cmd;
-+
-+		if (viewer->socket)
-+			gtk_widget_destroy(viewer->socket);
-+		viewer->socket = gtk_socket_new();
-+		debug_print("Adding dillo socket %p", viewer->socket);
-+		gtk_container_add(GTK_CONTAINER(viewer->widget),
-+				  viewer->socket);
-+		gtk_widget_realize(viewer->socket);
-+		gtk_widget_show(viewer->socket);
-+		g_signal_connect(G_OBJECT(viewer->socket), "destroy", 
-+				 G_CALLBACK(socket_destroy_cb), viewer);
-+
-+		cmd = g_strdup_printf("dillo %s%s-x %d \"%s\"",
-+				      (!load_images(viewer) ? "-l " : ""),
-+				      (dillo_prefs.full ? "-f " : ""),
-+				      (gint) GDK_WINDOW_XWINDOW(viewer->socket->window),
-+				      viewer->filename);
-+
-+		execute_command_line(cmd, TRUE, NULL);
-+		g_free(cmd);
-+	}
-+}
-+
-+static void dillo_clear_viewer(MimeViewer *_viewer)
-+{
-+	DilloViewer *viewer = (DilloViewer *) _viewer;
-+
-+	debug_print("dillo_clear_viewer\n");
-+	debug_print("Removing dillo socket %p\n", viewer->socket);
-+
-+	if (viewer->socket) {
-+		gtk_widget_destroy(viewer->socket);
-+	}
-+}
-+
-+static void dillo_destroy_viewer(MimeViewer *_viewer)
-+{
-+	DilloViewer *viewer = (DilloViewer *) _viewer;
-+
-+	debug_print("dillo_destroy_viewer\n");
-+
-+	if (viewer->socket) {
-+		gtk_widget_destroy(viewer->socket);
-+	}
-+
-+	g_object_unref(GTK_WIDGET(viewer->widget));
-+	claws_unlink(viewer->filename);
-+	g_free(viewer->filename);
-+    	g_free(viewer);
-+}
-+
-+static MimeViewer *dillo_viewer_create(void)
-+{
-+	DilloViewer *viewer;
-+
-+	debug_print("dillo_viewer_create\n");
-+	
-+	viewer = g_new0(DilloViewer, 1);
-+	viewer->mimeviewer.factory = &dillo_viewer_factory;
-+	viewer->mimeviewer.get_widget = dillo_get_widget;
-+	viewer->mimeviewer.show_mimepart = dillo_show_mimepart;
-+	viewer->mimeviewer.clear_viewer = dillo_clear_viewer;
-+	viewer->mimeviewer.destroy_viewer = dillo_destroy_viewer;	
-+	viewer->mimeviewer.get_selection = NULL;
-+	viewer->widget = gtk_event_box_new();
-+
-+	gtk_widget_show(viewer->widget);
-+	g_object_ref(viewer->widget);
-+
-+	viewer->filename = NULL;
-+
-+	return (MimeViewer *) viewer;
-+}
-+
-+static gchar *content_types[] = 
-+	{"text/html", NULL};
-+
-+static MimeViewerFactory dillo_viewer_factory =
-+{
-+	content_types,	
-+	0,
-+
-+	dillo_viewer_create,
-+};
-+
-+gint plugin_init(gchar **error)
-+{
-+	gchar *dillo_path = NULL;
-+	if (!check_plugin_version(MAKE_NUMERIC_VERSION(2,9,2,72),
-+				VERSION_NUMERIC, PLUGIN_NAME, error))
-+  		return -1;
-+
-+	if ((dillo_path = g_find_program_in_path("dillo")) == NULL) {
-+		*error = g_strdup(_("Can't find the dillo executable in PATH. Is it installed?"));
-+		return -1;
-+	}
-+	g_free(dillo_path);
-+
-+        dillo_prefs_init();
-+
-+	mimeview_register_viewer_factory(&dillo_viewer_factory);
-+
-+	return 0;	
-+}
-+
-+gboolean plugin_done(void)
-+{
-+	mimeview_unregister_viewer_factory(&dillo_viewer_factory);
-+
-+        dillo_prefs_done();
-+	return TRUE;
-+}
-+
-+const gchar *plugin_name(void)
-+{
-+	return PLUGIN_NAME;
-+}
-+
-+const gchar *plugin_desc(void)
-+{
-+	return _("This plugin renders HTML mail using the Dillo "
-+		"web browser.\n"
-+	        "\n"
-+	        "Options can be found in /Configuration/Preferences/Plugins/Dillo Browser");
-+}
-+
-+const gchar *plugin_type(void)
-+{
-+	return "GTK2";
-+}
-+
-+const gchar *plugin_licence(void)
-+{
-+	return "GPL3+";
-+}
-+
-+const gchar *plugin_version(void)
-+{
-+	return VERSION;
-+}
-+
-+struct PluginFeature *plugin_provides(void)
-+{
-+	static struct PluginFeature features[] = 
-+		{ {PLUGIN_MIMEVIEWER, "text/html"},
-+		  {PLUGIN_NOTHING, NULL}};
-+	return features;
-+}
--- 
+<span class="hl kwb">--- /dev/null</span>
+<span class="hl kwa">+++ b/src/plugins/dillo/dillo_viewer.c</span>
+<span class="hl kwd">&#64;&#64; -0,0 +1,310 &#64;&#64;</span>
+<span class="hl kwa">+/*</span>
+<span class="hl kwa">+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client</span>
+<span class="hl kwa">+ * Copyright (C) 1999-2012 the Claws Mail Team</span>
+<span class="hl kwa">+ *</span>
+<span class="hl kwa">+ * This program is free software; you can redistribute it and/or modify</span>
+<span class="hl kwa">+ * it under the terms of the GNU General Public License as published by</span>
+<span class="hl kwa">+ * the Free Software Foundation; either version 3 of the License, or</span>
+<span class="hl kwa">+ * (at your option) any later version.</span>
+<span class="hl kwa">+ *</span>
+<span class="hl kwa">+ * This program is distributed in the hope that it will be useful,</span>
+<span class="hl kwa">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span>
+<span class="hl kwa">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</span>
+<span class="hl kwa">+ * GNU General Public License for more details.</span>
+<span class="hl kwa">+ *</span>
+<span class="hl kwa">+ * You should have received a copy of the GNU General Public License</span>
+<span class="hl kwa">+ * along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.</span>
+<span class="hl kwa">+ * </span>
+<span class="hl kwa">+ */</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+#ifdef HAVE_CONFIG_H</span>
+<span class="hl kwa">+#  include &quot;config.h&quot;</span>
+<span class="hl kwa">+#include &quot;claws-features.h&quot;</span>
+<span class="hl kwa">+#endif</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+#include &lt;unistd.h&gt;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+#include &lt;glib.h&gt;</span>
+<span class="hl kwa">+#include &lt;glib/gi18n.h&gt;</span>
+<span class="hl kwa">+#include &lt;gtk/gtk.h&gt;</span>
+<span class="hl kwa">+#if GTK_CHECK_VERSION(3, 0, 0)</span>
+<span class="hl kwa">+#include &lt;gtk/gtkx.h&gt;</span>
+<span class="hl kwa">+#endif</span>
+<span class="hl kwa">+#include &lt;gdk/gdkx.h&gt;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+#include &quot;common/claws.h&quot;</span>
+<span class="hl kwa">+#include &quot;common/version.h&quot;</span>
+<span class="hl kwa">+#include &quot;plugin.h&quot;</span>
+<span class="hl kwa">+#include &quot;utils.h&quot;</span>
+<span class="hl kwa">+#include &quot;mimeview.h&quot;</span>
+<span class="hl kwa">+#include &quot;addr_compl.h&quot;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+#include &quot;dillo_prefs.h&quot;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+#define PLUGIN_NAME (_(&quot;Dillo HTML Viewer&quot;))</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+typedef struct _DilloViewer DilloViewer;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+struct _DilloViewer</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	MimeViewer	 mimeviewer;</span>
+<span class="hl kwa">+	GtkWidget	*widget;	</span>
+<span class="hl kwa">+	GtkWidget	*socket;</span>
+<span class="hl kwa">+	gchar		*filename;</span>
+<span class="hl kwa">+};</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+static MimeViewerFactory dillo_viewer_factory;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+static GtkWidget *dillo_get_widget(MimeViewer *_viewer)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	DilloViewer *viewer = (DilloViewer *) _viewer;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	debug_print(&quot;dillo_get_widget\n&quot;);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	return GTK_WIDGET(viewer-&gt;widget);</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+#if !GTK_CHECK_VERSION(3, 0, 0)</span>
+<span class="hl kwa">+static gboolean socket_destroy_cb(GtkObject *object, gpointer data)</span>
+<span class="hl kwa">+#else</span>
+<span class="hl kwa">+static gboolean socket_destroy_cb(GtkObject *object, gpointer data)</span>
+<span class="hl kwa">+#endif</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	DilloViewer *viewer = (DilloViewer *) data;</span>
+<span class="hl kwa">+	debug_print(&quot;Destroyed dillo socket %p\n&quot;, viewer-&gt;socket);</span>
+<span class="hl kwa">+	viewer-&gt;socket = NULL;</span>
+<span class="hl kwa">+	return FALSE;</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+static gboolean found_in_addressbook(const gchar *address)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	gchar *addr = NULL;</span>
+<span class="hl kwa">+	gboolean found = FALSE;</span>
+<span class="hl kwa">+	gint num_addr = 0;</span>
+<span class="hl kwa">+	</span>
+<span class="hl kwa">+	if (!address)</span>
+<span class="hl kwa">+		return FALSE;</span>
+<span class="hl kwa">+	</span>
+<span class="hl kwa">+	addr = g_strdup(address);</span>
+<span class="hl kwa">+	extract_address(addr);</span>
+<span class="hl kwa">+	num_addr = complete_address(addr);</span>
+<span class="hl kwa">+	if (num_addr &gt; 1) {</span>
+<span class="hl kwa">+		/* skip first item (this is the search string itself) */</span>
+<span class="hl kwa">+		int i = 1;</span>
+<span class="hl kwa">+		for (; i &lt; num_addr &amp;&amp; !found; i++) {</span>
+<span class="hl kwa">+			gchar *caddr = get_complete_address(i);</span>
+<span class="hl kwa">+			extract_address(caddr);</span>
+<span class="hl kwa">+			if (strcasecmp(caddr, addr) == 0)</span>
+<span class="hl kwa">+				found = TRUE;</span>
+<span class="hl kwa">+			g_free(caddr);</span>
+<span class="hl kwa">+		}</span>
+<span class="hl kwa">+	}</span>
+<span class="hl kwa">+	g_free(addr);</span>
+<span class="hl kwa">+	return found;</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+static gboolean load_images(DilloViewer *viewer)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	MessageView *messageview = ((MimeViewer *)viewer)-&gt;mimeview </span>
+<span class="hl kwa">+					? ((MimeViewer *)viewer)-&gt;mimeview-&gt;messageview </span>
+<span class="hl kwa">+					: NULL;</span>
+<span class="hl kwa">+	MsgInfo *msginfo = NULL;</span>
+<span class="hl kwa">+	gchar *ab_folderpath = NULL;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	if (messageview == NULL)</span>
+<span class="hl kwa">+		return FALSE;</span>
+<span class="hl kwa">+	</span>
+<span class="hl kwa">+	msginfo = messageview-&gt;msginfo;</span>
+<span class="hl kwa">+	</span>
+<span class="hl kwa">+	if (msginfo == NULL)</span>
+<span class="hl kwa">+		return FALSE;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	/* don&apos;t load remote images, period. */</span>
+<span class="hl kwa">+	if (dillo_prefs.local)</span>
+<span class="hl kwa">+		return FALSE;</span>
+<span class="hl kwa">+	</span>
+<span class="hl kwa">+	/* don&apos;t do whitelisting -&gt; load images */</span>
+<span class="hl kwa">+	if (!dillo_prefs.whitelist_ab)</span>
+<span class="hl kwa">+		return TRUE;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	if (*dillo_prefs.whitelist_ab_folder != &apos;\0&apos; &amp;&amp;</span>
+<span class="hl kwa">+	    strcasecmp(dillo_prefs.whitelist_ab_folder, _(&quot;Any&quot;)) != 0)</span>
+<span class="hl kwa">+		ab_folderpath = dillo_prefs.whitelist_ab_folder;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	start_address_completion(ab_folderpath);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	/* do whitelisting -&gt; check sender */</span>
+<span class="hl kwa">+	if (found_in_addressbook(msginfo-&gt;from)) {</span>
+<span class="hl kwa">+		end_address_completion();</span>
+<span class="hl kwa">+		return TRUE;</span>
+<span class="hl kwa">+	}</span>
+<span class="hl kwa">+	</span>
+<span class="hl kwa">+	end_address_completion();</span>
+<span class="hl kwa">+	return FALSE;</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+static void dillo_show_mimepart(MimeViewer *_viewer,</span>
+<span class="hl kwa">+				const gchar *infile,</span>
+<span class="hl kwa">+				MimeInfo *partinfo)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	DilloViewer *viewer = (DilloViewer *) _viewer;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	debug_print(&quot;dillo_show_mimepart\n&quot;);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	if (viewer-&gt;filename != NULL) {</span>
+<span class="hl kwa">+		claws_unlink(viewer-&gt;filename);</span>
+<span class="hl kwa">+		g_free(viewer-&gt;filename);</span>
+<span class="hl kwa">+	}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	viewer-&gt;filename = procmime_get_tmp_file_name(partinfo);</span>
+<span class="hl kwa">+	</span>
+<span class="hl kwa">+	if (!(procmime_get_part(viewer-&gt;filename, partinfo) &lt; 0)) {</span>
+<span class="hl kwa">+		gchar *cmd;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+		if (viewer-&gt;socket)</span>
+<span class="hl kwa">+			gtk_widget_destroy(viewer-&gt;socket);</span>
+<span class="hl kwa">+		viewer-&gt;socket = gtk_socket_new();</span>
+<span class="hl kwa">+		debug_print(&quot;Adding dillo socket %p&quot;, viewer-&gt;socket);</span>
+<span class="hl kwa">+		gtk_container_add(GTK_CONTAINER(viewer-&gt;widget),</span>
+<span class="hl kwa">+				  viewer-&gt;socket);</span>
+<span class="hl kwa">+		gtk_widget_realize(viewer-&gt;socket);</span>
+<span class="hl kwa">+		gtk_widget_show(viewer-&gt;socket);</span>
+<span class="hl kwa">+		g_signal_connect(G_OBJECT(viewer-&gt;socket), &quot;destroy&quot;, </span>
+<span class="hl kwa">+				 G_CALLBACK(socket_destroy_cb), viewer);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+		cmd = g_strdup_printf(&quot;dillo %s%s-x %d \&quot;%s\&quot;&quot;,</span>
+<span class="hl kwa">+				      (!load_images(viewer) ? &quot;-l &quot; : &quot;&quot;),</span>
+<span class="hl kwa">+				      (dillo_prefs.full ? &quot;-f &quot; : &quot;&quot;),</span>
+<span class="hl kwa">+				      (gint) GDK_WINDOW_XWINDOW(viewer-&gt;socket-&gt;window),</span>
+<span class="hl kwa">+				      viewer-&gt;filename);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+		execute_command_line(cmd, TRUE, NULL);</span>
+<span class="hl kwa">+		g_free(cmd);</span>
+<span class="hl kwa">+	}</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+static void dillo_clear_viewer(MimeViewer *_viewer)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	DilloViewer *viewer = (DilloViewer *) _viewer;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	debug_print(&quot;dillo_clear_viewer\n&quot;);</span>
+<span class="hl kwa">+	debug_print(&quot;Removing dillo socket %p\n&quot;, viewer-&gt;socket);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	if (viewer-&gt;socket) {</span>
+<span class="hl kwa">+		gtk_widget_destroy(viewer-&gt;socket);</span>
+<span class="hl kwa">+	}</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+static void dillo_destroy_viewer(MimeViewer *_viewer)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	DilloViewer *viewer = (DilloViewer *) _viewer;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	debug_print(&quot;dillo_destroy_viewer\n&quot;);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	if (viewer-&gt;socket) {</span>
+<span class="hl kwa">+		gtk_widget_destroy(viewer-&gt;socket);</span>
+<span class="hl kwa">+	}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	g_object_unref(GTK_WIDGET(viewer-&gt;widget));</span>
+<span class="hl kwa">+	claws_unlink(viewer-&gt;filename);</span>
+<span class="hl kwa">+	g_free(viewer-&gt;filename);</span>
+<span class="hl kwa">+    	g_free(viewer);</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+static MimeViewer *dillo_viewer_create(void)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	DilloViewer *viewer;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	debug_print(&quot;dillo_viewer_create\n&quot;);</span>
+<span class="hl kwa">+	</span>
+<span class="hl kwa">+	viewer = g_new0(DilloViewer, 1);</span>
+<span class="hl kwa">+	viewer-&gt;mimeviewer.factory = &amp;dillo_viewer_factory;</span>
+<span class="hl kwa">+	viewer-&gt;mimeviewer.get_widget = dillo_get_widget;</span>
+<span class="hl kwa">+	viewer-&gt;mimeviewer.show_mimepart = dillo_show_mimepart;</span>
+<span class="hl kwa">+	viewer-&gt;mimeviewer.clear_viewer = dillo_clear_viewer;</span>
+<span class="hl kwa">+	viewer-&gt;mimeviewer.destroy_viewer = dillo_destroy_viewer;	</span>
+<span class="hl kwa">+	viewer-&gt;mimeviewer.get_selection = NULL;</span>
+<span class="hl kwa">+	viewer-&gt;widget = gtk_event_box_new();</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	gtk_widget_show(viewer-&gt;widget);</span>
+<span class="hl kwa">+	g_object_ref(viewer-&gt;widget);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	viewer-&gt;filename = NULL;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	return (MimeViewer *) viewer;</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+static gchar *content_types[] = </span>
+<span class="hl kwa">+	{&quot;text/html&quot;, NULL};</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+static MimeViewerFactory dillo_viewer_factory =</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	content_types,	</span>
+<span class="hl kwa">+	0,</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	dillo_viewer_create,</span>
+<span class="hl kwa">+};</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+gint plugin_init(gchar **error)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	gchar *dillo_path = NULL;</span>
+<span class="hl kwa">+	if (!check_plugin_version(MAKE_NUMERIC_VERSION(2,9,2,72),</span>
+<span class="hl kwa">+				VERSION_NUMERIC, PLUGIN_NAME, error))</span>
+<span class="hl kwa">+  		return -1;</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	if ((dillo_path = g_find_program_in_path(&quot;dillo&quot;)) == NULL) {</span>
+<span class="hl kwa">+		*error = g_strdup(_(&quot;Can&apos;t find the dillo executable in PATH. Is it installed?&quot;));</span>
+<span class="hl kwa">+		return -1;</span>
+<span class="hl kwa">+	}</span>
+<span class="hl kwa">+	g_free(dillo_path);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+        dillo_prefs_init();</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	mimeview_register_viewer_factory(&amp;dillo_viewer_factory);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+	return 0;	</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+gboolean plugin_done(void)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	mimeview_unregister_viewer_factory(&amp;dillo_viewer_factory);</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+        dillo_prefs_done();</span>
+<span class="hl kwa">+	return TRUE;</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+const gchar *plugin_name(void)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	return PLUGIN_NAME;</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+const gchar *plugin_desc(void)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	return _(&quot;This plugin renders HTML mail using the Dillo &quot;</span>
+<span class="hl kwa">+		&quot;web browser.\n&quot;</span>
+<span class="hl kwa">+	        &quot;\n&quot;</span>
+<span class="hl kwa">+	        &quot;Options can be found in /Configuration/Preferences/Plugins/Dillo Browser&quot;);</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+const gchar *plugin_type(void)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	return &quot;GTK2&quot;;</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+const gchar *plugin_licence(void)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	return &quot;GPL3+&quot;;</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+const gchar *plugin_version(void)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	return VERSION;</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwa">+</span>
+<span class="hl kwa">+struct PluginFeature *plugin_provides(void)</span>
+<span class="hl kwa">+{</span>
+<span class="hl kwa">+	static struct PluginFeature features[] = </span>
+<span class="hl kwa">+		{ {PLUGIN_MIMEVIEWER, &quot;text/html&quot;},</span>
+<span class="hl kwa">+		  {PLUGIN_NOTHING, NULL}};</span>
+<span class="hl kwa">+	return features;</span>
+<span class="hl kwa">+}</span>
+<span class="hl kwb">-- </span>
 1.7.10.4
 
+From 1950c0973e8175da4b7fde7eca66184086e903ac Mon Sep 17 00:00:00 2001
+From: Michael Rasmussen &lt;mir&#64;datanom.net&gt;
+Date: Sun, 5 Feb 2017 01:13:03 +0100
+Subject: [PATCH] Fix build when using alternate addressbook
+
+<span class="hl kwb">---</span>
+ src/plugins/dillo/dillo_prefs.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/dillo/dillo_viewer.c b/src/plugins/dillo/dillo_viewer.c
+index 1c63fa3..6c820f0 100644
+<span class="hl kwb">--- a/src/plugins/dillo/dillo_viewer.c</span>
+<span class="hl kwa">+++ b/src/plugins/dillo/dillo_viewer.c</span>
+&#64;&#64; -76,33 +76,6 &#64;&#64; static gboolean socket_destroy_cb(GtkObject *object, gpointer data)
+ 	return FALSE;
+ }
+ 
+<span class="hl kwb">-static gboolean found_in_addressbook(const gchar *address)</span>
+<span class="hl kwb">-{</span>
+<span class="hl kwb">-	gchar *addr = NULL;</span>
+<span class="hl kwb">-	gboolean found = FALSE;</span>
+<span class="hl kwb">-	gint num_addr = 0;</span>
+<span class="hl kwb">-	</span>
+<span class="hl kwb">-	if (!address)</span>
+<span class="hl kwb">-		return FALSE;</span>
+<span class="hl kwb">-	</span>
+<span class="hl kwb">-	addr = g_strdup(address);</span>
+<span class="hl kwb">-	extract_address(addr);</span>
+<span class="hl kwb">-	num_addr = complete_address(addr);</span>
+<span class="hl kwb">-	if (num_addr &gt; 1) {</span>
+<span class="hl kwb">-		/* skip first item (this is the search string itself) */</span>
+<span class="hl kwb">-		int i = 1;</span>
+<span class="hl kwb">-		for (; i &lt; num_addr &amp;&amp; !found; i++) {</span>
+<span class="hl kwb">-			gchar *caddr = get_complete_address(i);</span>
+<span class="hl kwb">-			extract_address(caddr);</span>
+<span class="hl kwb">-			if (strcasecmp(caddr, addr) == 0)</span>
+<span class="hl kwb">-				found = TRUE;</span>
+<span class="hl kwb">-			g_free(caddr);</span>
+<span class="hl kwb">-		}</span>
+<span class="hl kwb">-	}</span>
+<span class="hl kwb">-	g_free(addr);</span>
+<span class="hl kwb">-	return found;</span>
+<span class="hl kwb">-}</span>
+<span class="hl kwb">-</span>
+ static gboolean load_images(DilloViewer *viewer)
+ {
+ 	MessageView *messageview = ((MimeViewer *)viewer)-&gt;mimeview 
+From 2bf719fcbf4e1e2cbfb0b574db48c468375e4dbf Mon Sep 17 00:00:00 2001
+From: Andrej Kacian &lt;ticho&#64;claws-mail.org&gt;
+Date: Sat, 4 Feb 2017 18:31:45 +0100
+Subject: [PATCH] Make --disable-dillo-plugin actually do something.
+
+<span class="hl kwb">---</span>
+ src/plugins/dillo/Makefile.am |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/plugins/dillo/Makefile.am b/src/plugins/dillo/Makefile.am
+index 2dd9349..9f8f42a 100644
+<span class="hl kwb">--- a/src/plugins/dillo/Makefile.am</span>
+<span class="hl kwa">+++ b/src/plugins/dillo/Makefile.am</span>
+<span class="hl kwd">&#64;&#64; -5,7 +5,9 &#64;&#64;</span>
+ 
+ plugindir = $(pkglibdir)/plugins
+ 
+<span class="hl kwa">+if BUILD_DILLO_PLUGIN</span>
+ plugin_LTLIBRARIES = dillo.la
+<span class="hl kwa">+endif</span>
+ 
+ dillo_la_SOURCES = \
+      dillo_viewer.c \
+<span class="hl kwb">-- </span>
+1.7.10.4
+
+diff --git a/src/plugins/dillo/dillo_prefs.c b/src/plugins/dillo/dillo_prefs.c
+index 8d9529b..08718cd 100644
+<span class="hl kwb">--- a/src/plugins/dillo/dillo_prefs.c</span>
+<span class="hl kwa">+++ b/src/plugins/dillo/dillo_prefs.c</span>
+&#64;&#64; -78,7 +78,7 &#64;&#64; static void create_dillo_prefs_page	(PrefsPage *page,
+ static void destroy_dillo_prefs_page	(PrefsPage *page);
+ static void save_dillo_prefs		(PrefsPage *page);
+ 
+<span class="hl kwb">-#ifndef USE_NEW_ADDRBOOK</span>
+<span class="hl kwa">+#ifndef USE_ALT_ADDRBOOK</span>
+ static void dillo_whitelist_ab_select_cb(GtkWidget *widget, gpointer data)
+ {
+ 	DilloBrowserPage *page = (DilloBrowserPage *) data;
+&#64;&#64; -238,7 +238,7 &#64;&#64; static void create_dillo_prefs_page(PrefsPage *page,
+ 			 G_CALLBACK(whitelist_checkbox_toggled),
+ 			 prefs_page);
+ 
+<span class="hl kwb">-#ifndef USE_NEW_ADDRBOOK</span>
+<span class="hl kwa">+#ifndef USE_ALT_ADDRBOOK</span>
+ 	g_signal_connect(G_OBJECT (whitelist_ab_select_btn), &quot;clicked&quot;,
+ 			 G_CALLBACK(dillo_whitelist_ab_select_cb), prefs_page);
+ #else
+<span class="hl kwb">-- </span>
+1.7.10.4
+
+</code></pre></td></tr></table>
+</div> <!-- class=content -->
+<div class="foot" style="padding-left:1em;padding-right:1em;">
+<p>Copyright &copy; 2002-2017 <a href="mailto:jvinet@zeroflux.org"
+title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org"
+title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo
+are recognized trademarks. Some rights reserved. The registered trademark
+Linux&reg; is used pursuant to a sublicense from LMI, the exclusive licensee
+of Linus Torvalds, owner of the mark on a world-wide basis.</p>
+</div>
+</div> <!-- id=cgit -->
+</body>
+</html>
diff --git a/nonprism/claws-mail/enchant-2.patch b/nonprism/claws-mail/enchant-2.patch
new file mode 100644
index 000000000..1a2ee926f
--- /dev/null
+++ b/nonprism/claws-mail/enchant-2.patch
@@ -0,0 +1,11 @@
+--- claws-mail-3.15.1/src/gtk/gtkaspell.c.orig	2017-08-28 17:48:24.000000000 +0000
++++ claws-mail-3.15.1/src/gtk/gtkaspell.c	2017-11-22 15:05:59.371073969 +0000
+@@ -1348,7 +1348,7 @@
+ {
+    	GtkAspell *gtkaspell = (GtkAspell *) data; 
+ 
+-	enchant_dict_add_to_pwl(gtkaspell->gtkaspeller->speller, gtkaspell->theword, strlen(gtkaspell->theword));
++	enchant_dict_add(gtkaspell->gtkaspeller->speller, gtkaspell->theword, strlen(gtkaspell->theword));
+ 
+ 	gtkaspell->ctx.check_word(gtkaspell->ctx.data);
+ 	gtkaspell_dict_changed(gtkaspell);