summaryrefslogtreecommitdiffstats
path: root/meta-demoapps/recipes-sato/claws-mail
diff options
context:
space:
mode:
Diffstat (limited to 'meta-demoapps/recipes-sato/claws-mail')
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/claws-mail.inc58
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/claws-mail_2.9.1.bb1
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.15.bb14
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/claws-plugin-maildir_0.24.4.bb14
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/claws-plugin-mailmbox_1.13.bb14
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/claws-plugin-rssyl_0.13.bb14
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/files/desktop.patch21
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/files/fix-build.patch26
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/files/owl-window-menu.patch1011
-rw-r--r--meta-demoapps/recipes-sato/claws-mail/files/streamline-ui.patch1010
10 files changed, 0 insertions, 2183 deletions
diff --git a/meta-demoapps/recipes-sato/claws-mail/claws-mail.inc b/meta-demoapps/recipes-sato/claws-mail/claws-mail.inc
deleted file mode 100644
index 664a0bcafb..0000000000
--- a/meta-demoapps/recipes-sato/claws-mail/claws-mail.inc
+++ /dev/null
@@ -1,58 +0,0 @@
1SECTION = "x11/network"
2DESCRIPTION = "Mail user agent"
3#DEPENDS = "gtk+ gpgme libetpan libgnomeprint aspell openssl"
4DEPENDS = "gtk+ libetpan openssl libowl"
5LICENSE = "GPL"
6PR = "r7"
7
8SRC_URI = "\
9 ${SOURCEFORGE_MIRROR}/sylpheed-claws/claws-mail-${PV}.tar.bz2 \
10 file://desktop.patch;patch=1 \
11 file://streamline-ui.patch;patch=1 \
12 file://owl-window-menu.patch;patch=1 \
13 file://fix-build.patch;patch=1 \
14 "
15
16FILES_${PN} = "${bindir} ${datadir}/pixmaps ${datadir}/applications"
17
18#EXTRA_OECONF = "--disable-aspell-test \
19# --disable-dillo-viewer-plugin --with-aspell-prefix=${STAGING_DIR_HOST}${prefix} \
20# --enable-aspell"
21
22EXTRA_OECONF = "--disable-aspell-test \
23 --disable-aspell \
24 --disable-manual \
25 --disable-crash-dialog \
26 --disable-jpilot \
27 --disable-trayicon-plugin \
28 --disable-spamassassin-plugin \
29 --disable-bogofilter-plugin \
30 --disable-pgpcore-plugin \
31 --disable-pgpmime-plugin \
32 --disable-pgpinline-plugin \
33 --disable-dillo-viewer-plugin \
34 --disable-clamav-plugin \
35 --disable-gnomeprint \
36 --disable-valgrind \
37 --disable-static \
38 "
39
40# --disable-openssl \
41# --disable-libetpan \
42
43CFLAGS += "-D_GNU_SOURCE"
44
45inherit autotools pkgconfig gettext
46
47do_install_append() {
48 install -d ${D}${datadir}/applications
49 install -m 0644 claws-mail.desktop ${D}${datadir}/applications/
50 install -d ${D}${datadir}/pixmaps
51 install -m 0644 claws-mail.png ${D}${datadir}/pixmaps/
52}
53
54#python populate_packages_prepend () {
55# abiword_libdir = bb.data.expand('${libdir}/claws-mail/plugins', d)
56#
57# do_split_packages(d, abiword_libdir, '^(.*)\.so$', 'claws-mail-plugin-%s', 'Claws plugin for %s', extra_depends='')
58#}
diff --git a/meta-demoapps/recipes-sato/claws-mail/claws-mail_2.9.1.bb b/meta-demoapps/recipes-sato/claws-mail/claws-mail_2.9.1.bb
deleted file mode 100644
index f8a8396b95..0000000000
--- a/meta-demoapps/recipes-sato/claws-mail/claws-mail_2.9.1.bb
+++ /dev/null
@@ -1 +0,0 @@
1require claws-mail.inc
diff --git a/meta-demoapps/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.15.bb b/meta-demoapps/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.15.bb
deleted file mode 100644
index 82918173e4..0000000000
--- a/meta-demoapps/recipes-sato/claws-mail/claws-plugin-gtkhtml2-viewer_0.15.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1SECTION = "x11/network"
2DESCRIPTION = "Mail user agent plugins"
3DEPENDS = "claws-mail gtkhtml2 curl"
4LICENSE = "GPL"
5PR = "r1"
6
7SRC_URI = "http://www.claws-mail.org/downloads/plugins/gtkhtml2_viewer-${PV}.tar.gz"
8
9inherit autotools pkgconfig gettext
10
11S = "${WORKDIR}/gtkhtml2_viewer-${PV}"
12
13FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
14
diff --git a/meta-demoapps/recipes-sato/claws-mail/claws-plugin-maildir_0.24.4.bb b/meta-demoapps/recipes-sato/claws-mail/claws-plugin-maildir_0.24.4.bb
deleted file mode 100644
index 4351d1e5de..0000000000
--- a/meta-demoapps/recipes-sato/claws-mail/claws-plugin-maildir_0.24.4.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1SECTION = "x11/network"
2DESCRIPTION = "Mail user agent plugins"
3DEPENDS = "claws-mail db"
4LICENSE = "GPL"
5PR = "r1"
6
7SRC_URI = "http://www.claws-mail.org/downloads/plugins/maildir-${PV}.tar.gz"
8
9inherit autotools pkgconfig
10
11S = "${WORKDIR}/maildir-${PV}"
12
13FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
14
diff --git a/meta-demoapps/recipes-sato/claws-mail/claws-plugin-mailmbox_1.13.bb b/meta-demoapps/recipes-sato/claws-mail/claws-plugin-mailmbox_1.13.bb
deleted file mode 100644
index fe7041494f..0000000000
--- a/meta-demoapps/recipes-sato/claws-mail/claws-plugin-mailmbox_1.13.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1SECTION = "x11/network"
2DESCRIPTION = "Mail user agent plugins"
3DEPENDS = "claws-mail"
4LICENSE = "GPL"
5PR = "r2"
6
7SRC_URI = "http://www.claws-mail.org/downloads/plugins/mailmbox-${PV}.tar.gz"
8
9inherit autotools pkgconfig
10
11S = "${WORKDIR}/mailmbox-${PV}"
12
13FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
14FILES_${PN}-dbg = "${libdir}/claws-mail/plugins/.debug"
diff --git a/meta-demoapps/recipes-sato/claws-mail/claws-plugin-rssyl_0.13.bb b/meta-demoapps/recipes-sato/claws-mail/claws-plugin-rssyl_0.13.bb
deleted file mode 100644
index de0705c7fd..0000000000
--- a/meta-demoapps/recipes-sato/claws-mail/claws-plugin-rssyl_0.13.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1SECTION = "x11/network"
2DESCRIPTION = "Mail user agent plugins"
3DEPENDS = "claws-mail libxml2 curl glib-2.0 gtk+"
4LICENSE = "GPL"
5PR = "r1"
6
7SRC_URI = "http://www.claws-mail.org/downloads/plugins/rssyl-${PV}.tar.gz"
8
9inherit autotools pkgconfig gettext
10
11S = "${WORKDIR}/rssyl-${PV}"
12
13FILES_${PN} = "${libdir}/claws-mail/plugins/*.so"
14
diff --git a/meta-demoapps/recipes-sato/claws-mail/files/desktop.patch b/meta-demoapps/recipes-sato/claws-mail/files/desktop.patch
deleted file mode 100644
index d5ca3dbac3..0000000000
--- a/meta-demoapps/recipes-sato/claws-mail/files/desktop.patch
+++ /dev/null
@@ -1,21 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: claws-mail-2.9.1/claws-mail.desktop
4===================================================================
5--- claws-mail-2.9.1.orig/claws-mail.desktop 2007-04-24 17:40:20.000000000 +0100
6+++ claws-mail-2.9.1/claws-mail.desktop 2007-04-25 07:08:36.000000000 +0100
7@@ -1,11 +1,11 @@
8 [Desktop Entry]
9 Encoding=UTF-8
10-Name=Claws Mail
11+Name=Mail
12 Exec=claws-mail
13 Icon=claws-mail
14-Info="Claws Mail"
15+Info=Email Application
16 Categories=GTK;Network;Email;
17-Comment="Gtk+ based Mail Client"
18+Comment=Email Application
19 Terminal=false
20 Type=Application
21 StartupNotify=true
diff --git a/meta-demoapps/recipes-sato/claws-mail/files/fix-build.patch b/meta-demoapps/recipes-sato/claws-mail/files/fix-build.patch
deleted file mode 100644
index 41ca1d65ac..0000000000
--- a/meta-demoapps/recipes-sato/claws-mail/files/fix-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1Upstream-Status: Pending
2
3Remove duplicate file entries as this breaks install with new Automake
4
5JL 19/03/10
6
7Index: claws-mail-2.9.1/src/gtk/Makefile.am
8===================================================================
9--- claws-mail-2.9.1.orig/src/gtk/Makefile.am 2007-03-22 07:52:47.000000000 +0000
10+++ claws-mail-2.9.1/src/gtk/Makefile.am 2010-03-19 14:54:06.565828281 +0000
11@@ -44,7 +44,6 @@
12 filesel.h \
13 foldersort.h \
14 gtkaspell.h \
15- gtksctree.h \
16 gtkshruler.h \
17 gtksctree.h \
18 gtksourceprintjob.h \
19@@ -57,7 +56,6 @@
20 menu.h \
21 pluginwindow.h \
22 prefswindow.h \
23- gtkvscrollbutton.h \
24 progressdialog.h \
25 quicksearch.h \
26 sslcertwindow.h \
diff --git a/meta-demoapps/recipes-sato/claws-mail/files/owl-window-menu.patch b/meta-demoapps/recipes-sato/claws-mail/files/owl-window-menu.patch
deleted file mode 100644
index 97807b213b..0000000000
--- a/meta-demoapps/recipes-sato/claws-mail/files/owl-window-menu.patch
+++ /dev/null
@@ -1,1011 +0,0 @@
1Upstream-Status: Inappropriate [enable feature]
2
3Index: claws-mail-2.9.1/src/addressbook.c
4===================================================================
5--- claws-mail-2.9.1.orig/src/addressbook.c 2007-04-25 10:18:13.000000000 +0100
6+++ claws-mail-2.9.1/src/addressbook.c 2007-04-25 10:30:23.000000000 +0100
7@@ -941,7 +941,6 @@
8 sizeof(addressbook_entries[0]);
9 menubar = menubar_create(window, addressbook_entries, n_entries,
10 "<AddressBook>", NULL);
11- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
12 menu_factory = gtk_item_factory_from_widget(menubar);
13
14 vbox2 = gtk_vbox_new(FALSE, BORDER_WIDTH);
15Index: claws-mail-2.9.1/src/gtk/menu.c
16===================================================================
17--- claws-mail-2.9.1.orig/src/gtk/menu.c 2007-04-25 10:18:13.000000000 +0100
18+++ claws-mail-2.9.1/src/gtk/menu.c 2007-04-25 10:30:23.000000000 +0100
19@@ -35,10 +35,7 @@
20 #include "menu.h"
21 #include "utils.h"
22
23-#ifdef MAEMO
24-#include <hildon-widgets/hildon-program.h>
25-#include <gtk/gtkmain.h>
26-#endif
27+#include <libowl/owlwindowmenu.h>
28
29 static void connect_accel_change_signals(GtkWidget* widget, GtkWidget *wid2) ;
30
31@@ -49,20 +46,14 @@
32 GtkItemFactory *factory;
33 GtkWidget *menubar;
34
35-#ifdef MAEMO
36 factory = gtk_item_factory_new(GTK_TYPE_MENU, path, NULL);
37-#else
38- factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, path, NULL);
39-#endif
40 gtk_item_factory_set_translate_func(factory, menu_translate,
41 NULL, NULL);
42 gtk_item_factory_create_items(factory, n_entries, entries, data);
43 gtk_window_add_accel_group (GTK_WINDOW (window), factory->accel_group);
44
45 menubar = gtk_item_factory_get_widget(factory, path);
46-#ifdef MAEMO
47- hildon_window_set_menu(HILDON_WINDOW(window), GTK_MENU(menubar));
48-#endif
49+ owl_set_window_menu(GTK_WINDOW(window), GTK_MENU(menubar));
50 return menubar;
51 }
52
53Index: claws-mail-2.9.1/src/mainwindow.c
54===================================================================
55--- claws-mail-2.9.1.orig/src/mainwindow.c 2007-04-25 10:26:40.000000000 +0100
56+++ claws-mail-2.9.1/src/mainwindow.c 2007-04-25 10:30:23.000000000 +0100
57@@ -1094,8 +1094,6 @@
58 n_menu_entries = sizeof(mainwin_entries) / sizeof(mainwin_entries[0]);
59 menubar = menubar_create(window, mainwin_entries,
60 n_menu_entries, "<Main>", mainwin);
61- gtk_widget_show(menubar);
62- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
63 ifactory = gtk_item_factory_from_widget(menubar);
64
65 /* gtk_widget_show(gtk_item_factory_get_item(ifactory,"/Message/Mailing-List"));
66Index: claws-mail-2.9.1/src/messageview.c
67===================================================================
68--- claws-mail-2.9.1.orig/src/messageview.c 2007-04-25 10:18:13.000000000 +0100
69+++ claws-mail-2.9.1/src/messageview.c 2007-04-25 10:30:23.000000000 +0100
70@@ -414,8 +414,6 @@
71 n_menu_entries = sizeof(msgview_entries) / sizeof(msgview_entries[0]);
72 menubar = menubar_create(window, msgview_entries,
73 n_menu_entries, "<MessageView>", msgview);
74- gtk_widget_show(menubar);
75- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
76
77 if (prefs_common.toolbar_detachable) {
78 handlebox = gtk_handle_box_new();
79@@ -478,6 +476,7 @@
80 g_signal_connect(G_OBJECT(window), "key_press_event",
81 G_CALLBACK(key_pressed), msgview);
82 #endif
83+ gtk_widget_realize(window);
84 messageview_add_toolbar(msgview, window);
85
86 if (show) {
87Index: claws-mail-2.9.1/configure.ac
88===================================================================
89--- claws-mail-2.9.1.orig/configure.ac 2007-04-25 10:18:13.000000000 +0100
90+++ claws-mail-2.9.1/configure.ac 2007-04-25 10:30:23.000000000 +0100
91@@ -406,6 +406,11 @@
92 AC_SUBST(GTK_CFLAGS)
93 AC_SUBST(GTK_LIBS)
94
95+OWL_CFLAGS=""
96+OWL_LIBS="-lowl"
97+AC_SUBST(OWL_CFLAGS)
98+AC_SUBST(OWL_LIBS)
99+
100 dnl GNU/Aspell is used for spell checking
101 AC_ARG_ENABLE(aspell,
102 [ --disable-aspell Disable GNU/aspell support [default=yes]],
103Index: claws-mail-2.9.1/src/Makefile.am
104===================================================================
105--- claws-mail-2.9.1.orig/src/Makefile.am 2007-04-25 10:18:13.000000000 +0100
106+++ claws-mail-2.9.1/src/Makefile.am 2007-04-25 10:30:23.000000000 +0100
107@@ -471,7 +471,8 @@
108 $(LIBICONV) \
109 $(STARTUP_NOTIFICATION_LIBS) \
110 $(LIBETPAN_LIBS) \
111- $(MAEMO_LIBS)
112+ $(MAEMO_LIBS) \
113+ $(OWL_LIBS)
114
115 AM_CPPFLAGS = \
116 -DG_LOG_DOMAIN=\"Claws-Mail\" \
117@@ -489,6 +490,7 @@
118 $(LIBETPAN_CPPFLAGS) \
119 $(STARTUP_NOTIFICATION_CFLAGS) \
120 $(MAEMO_CFLAGS) \
121+ $(OWL_CFLAGS) \
122 -Wno-unused-function
123
124 #no-unused-function is there because of bison stuff
125Index: claws-mail-2.9.1/configure
126===================================================================
127--- claws-mail-2.9.1.orig/configure 2007-04-25 10:18:13.000000000 +0100
128+++ claws-mail-2.9.1/configure 2007-04-25 10:30:23.000000000 +0100
129@@ -769,7 +769,6 @@
130 # include <unistd.h>
131 #endif"
132
133-gt_needs=
134 ac_subst_vars='SHELL
135 PATH_SEPARATOR
136 PACKAGE_NAME
137@@ -942,6 +941,8 @@
138 PASSCRYPT_KEY
139 GTK_CFLAGS
140 GTK_LIBS
141+OWL_LIBS
142+OWL_CFLAGS
143 ASPELL
144 ASPELL_CFLAGS
145 ASPELL_LIBS
146@@ -2063,7 +2064,6 @@
147 >$cache_file
148 fi
149
150-gt_needs="$gt_needs "
151 # Check that the precious variables saved in the cache have kept the same
152 # value.
153 ac_cache_corrupted=false
154@@ -3001,9 +3001,7 @@
155 # Put the nasty error message in config.log where it belongs
156 echo "$GNOME2_PKG_ERRORS" >&5
157
158- { echo "$as_me:$LINENO: result: no" >&5
159-echo "${ECHO_T}no" >&6; }
160- ac_enable_gnome2=no
161+ ac_enable_gnome2=no
162 elif test $pkg_failed = untried; then
163 ac_enable_gnome2=no
164 else
165@@ -4147,14 +4145,12 @@
166
167
168
169-
170- { echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5
171-echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6; }
172-if test "${ac_cv_lib_cposix_strerror+set}" = set; then
173+{ echo "$as_me:$LINENO: checking for library containing strerror" >&5
174+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
175+if test "${ac_cv_search_strerror+set}" = set; then
176 echo $ECHO_N "(cached) $ECHO_C" >&6
177 else
178- ac_check_lib_save_LIBS=$LIBS
179-LIBS="-lcposix $LIBS"
180+ ac_func_search_save_LIBS=$LIBS
181 cat >conftest.$ac_ext <<_ACEOF
182 /* confdefs.h. */
183 _ACEOF
184@@ -4177,7 +4173,14 @@
185 return 0;
186 }
187 _ACEOF
188-rm -f conftest.$ac_objext conftest$ac_exeext
189+for ac_lib in '' cposix; do
190+ if test -z "$ac_lib"; then
191+ ac_res="none required"
192+ else
193+ ac_res=-l$ac_lib
194+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
195+ fi
196+ rm -f conftest.$ac_objext conftest$ac_exeext
197 if { (ac_try="$ac_link"
198 case "(($ac_try" in
199 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
200@@ -4195,25 +4198,35 @@
201 test ! -s conftest.err
202 } && test -s conftest$ac_exeext &&
203 $as_test_x conftest$ac_exeext; then
204- ac_cv_lib_cposix_strerror=yes
205+ ac_cv_search_strerror=$ac_res
206 else
207 echo "$as_me: failed program was:" >&5
208 sed 's/^/| /' conftest.$ac_ext >&5
209
210- ac_cv_lib_cposix_strerror=no
211+
212 fi
213
214 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
215- conftest$ac_exeext conftest.$ac_ext
216-LIBS=$ac_check_lib_save_LIBS
217+ conftest$ac_exeext
218+ if test "${ac_cv_search_strerror+set}" = set; then
219+ break
220+fi
221+done
222+if test "${ac_cv_search_strerror+set}" = set; then
223+ :
224+else
225+ ac_cv_search_strerror=no
226 fi
227-{ echo "$as_me:$LINENO: result: $ac_cv_lib_cposix_strerror" >&5
228-echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6; }
229-if test $ac_cv_lib_cposix_strerror = yes; then
230- LIBS="$LIBS -lcposix"
231+rm conftest.$ac_ext
232+LIBS=$ac_func_search_save_LIBS
233 fi
234+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
235+echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
236+ac_res=$ac_cv_search_strerror
237+if test "$ac_res" != no; then
238+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
239
240-
241+fi
242
243 # Find a good install program. We prefer a C program (faster),
244 # so one script is as good as another. But avoid the broken or
245@@ -5769,7 +5782,7 @@
246 ;;
247 *-*-irix6*)
248 # Find out which ABI we are using.
249- echo '#line 5772 "configure"' > conftest.$ac_ext
250+ echo '#line 5785 "configure"' > conftest.$ac_ext
251 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
252 (eval $ac_compile) 2>&5
253 ac_status=$?
254@@ -8555,11 +8568,11 @@
255 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
256 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
257 -e 's:$: $lt_compiler_flag:'`
258- (eval echo "\"\$as_me:8558: $lt_compile\"" >&5)
259+ (eval echo "\"\$as_me:8571: $lt_compile\"" >&5)
260 (eval "$lt_compile" 2>conftest.err)
261 ac_status=$?
262 cat conftest.err >&5
263- echo "$as_me:8562: \$? = $ac_status" >&5
264+ echo "$as_me:8575: \$? = $ac_status" >&5
265 if (exit $ac_status) && test -s "$ac_outfile"; then
266 # The compiler can only warn and ignore the option if not recognized
267 # So say no if there are warnings other than the usual output.
268@@ -8823,11 +8836,11 @@
269 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
270 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
271 -e 's:$: $lt_compiler_flag:'`
272- (eval echo "\"\$as_me:8826: $lt_compile\"" >&5)
273+ (eval echo "\"\$as_me:8839: $lt_compile\"" >&5)
274 (eval "$lt_compile" 2>conftest.err)
275 ac_status=$?
276 cat conftest.err >&5
277- echo "$as_me:8830: \$? = $ac_status" >&5
278+ echo "$as_me:8843: \$? = $ac_status" >&5
279 if (exit $ac_status) && test -s "$ac_outfile"; then
280 # The compiler can only warn and ignore the option if not recognized
281 # So say no if there are warnings other than the usual output.
282@@ -8927,11 +8940,11 @@
283 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
284 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
285 -e 's:$: $lt_compiler_flag:'`
286- (eval echo "\"\$as_me:8930: $lt_compile\"" >&5)
287+ (eval echo "\"\$as_me:8943: $lt_compile\"" >&5)
288 (eval "$lt_compile" 2>out/conftest.err)
289 ac_status=$?
290 cat out/conftest.err >&5
291- echo "$as_me:8934: \$? = $ac_status" >&5
292+ echo "$as_me:8947: \$? = $ac_status" >&5
293 if (exit $ac_status) && test -s out/conftest2.$ac_objext
294 then
295 # The compiler can only warn and ignore the option if not recognized
296@@ -11224,7 +11237,7 @@
297 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
298 lt_status=$lt_dlunknown
299 cat > conftest.$ac_ext <<EOF
300-#line 11227 "configure"
301+#line 11240 "configure"
302 #include "confdefs.h"
303
304 #if HAVE_DLFCN_H
305@@ -11324,7 +11337,7 @@
306 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
307 lt_status=$lt_dlunknown
308 cat > conftest.$ac_ext <<EOF
309-#line 11327 "configure"
310+#line 11340 "configure"
311 #include "confdefs.h"
312
313 #if HAVE_DLFCN_H
314@@ -13660,11 +13673,11 @@
315 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
316 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
317 -e 's:$: $lt_compiler_flag:'`
318- (eval echo "\"\$as_me:13663: $lt_compile\"" >&5)
319+ (eval echo "\"\$as_me:13676: $lt_compile\"" >&5)
320 (eval "$lt_compile" 2>conftest.err)
321 ac_status=$?
322 cat conftest.err >&5
323- echo "$as_me:13667: \$? = $ac_status" >&5
324+ echo "$as_me:13680: \$? = $ac_status" >&5
325 if (exit $ac_status) && test -s "$ac_outfile"; then
326 # The compiler can only warn and ignore the option if not recognized
327 # So say no if there are warnings other than the usual output.
328@@ -13764,11 +13777,11 @@
329 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
330 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
331 -e 's:$: $lt_compiler_flag:'`
332- (eval echo "\"\$as_me:13767: $lt_compile\"" >&5)
333+ (eval echo "\"\$as_me:13780: $lt_compile\"" >&5)
334 (eval "$lt_compile" 2>out/conftest.err)
335 ac_status=$?
336 cat out/conftest.err >&5
337- echo "$as_me:13771: \$? = $ac_status" >&5
338+ echo "$as_me:13784: \$? = $ac_status" >&5
339 if (exit $ac_status) && test -s out/conftest2.$ac_objext
340 then
341 # The compiler can only warn and ignore the option if not recognized
342@@ -15325,11 +15338,11 @@
343 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
344 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
345 -e 's:$: $lt_compiler_flag:'`
346- (eval echo "\"\$as_me:15328: $lt_compile\"" >&5)
347+ (eval echo "\"\$as_me:15341: $lt_compile\"" >&5)
348 (eval "$lt_compile" 2>conftest.err)
349 ac_status=$?
350 cat conftest.err >&5
351- echo "$as_me:15332: \$? = $ac_status" >&5
352+ echo "$as_me:15345: \$? = $ac_status" >&5
353 if (exit $ac_status) && test -s "$ac_outfile"; then
354 # The compiler can only warn and ignore the option if not recognized
355 # So say no if there are warnings other than the usual output.
356@@ -15429,11 +15442,11 @@
357 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
358 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
359 -e 's:$: $lt_compiler_flag:'`
360- (eval echo "\"\$as_me:15432: $lt_compile\"" >&5)
361+ (eval echo "\"\$as_me:15445: $lt_compile\"" >&5)
362 (eval "$lt_compile" 2>out/conftest.err)
363 ac_status=$?
364 cat out/conftest.err >&5
365- echo "$as_me:15436: \$? = $ac_status" >&5
366+ echo "$as_me:15449: \$? = $ac_status" >&5
367 if (exit $ac_status) && test -s out/conftest2.$ac_objext
368 then
369 # The compiler can only warn and ignore the option if not recognized
370@@ -17616,11 +17629,11 @@
371 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
372 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
373 -e 's:$: $lt_compiler_flag:'`
374- (eval echo "\"\$as_me:17619: $lt_compile\"" >&5)
375+ (eval echo "\"\$as_me:17632: $lt_compile\"" >&5)
376 (eval "$lt_compile" 2>conftest.err)
377 ac_status=$?
378 cat conftest.err >&5
379- echo "$as_me:17623: \$? = $ac_status" >&5
380+ echo "$as_me:17636: \$? = $ac_status" >&5
381 if (exit $ac_status) && test -s "$ac_outfile"; then
382 # The compiler can only warn and ignore the option if not recognized
383 # So say no if there are warnings other than the usual output.
384@@ -17884,11 +17897,11 @@
385 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
386 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
387 -e 's:$: $lt_compiler_flag:'`
388- (eval echo "\"\$as_me:17887: $lt_compile\"" >&5)
389+ (eval echo "\"\$as_me:17900: $lt_compile\"" >&5)
390 (eval "$lt_compile" 2>conftest.err)
391 ac_status=$?
392 cat conftest.err >&5
393- echo "$as_me:17891: \$? = $ac_status" >&5
394+ echo "$as_me:17904: \$? = $ac_status" >&5
395 if (exit $ac_status) && test -s "$ac_outfile"; then
396 # The compiler can only warn and ignore the option if not recognized
397 # So say no if there are warnings other than the usual output.
398@@ -17988,11 +18001,11 @@
399 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
400 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
401 -e 's:$: $lt_compiler_flag:'`
402- (eval echo "\"\$as_me:17991: $lt_compile\"" >&5)
403+ (eval echo "\"\$as_me:18004: $lt_compile\"" >&5)
404 (eval "$lt_compile" 2>out/conftest.err)
405 ac_status=$?
406 cat out/conftest.err >&5
407- echo "$as_me:17995: \$? = $ac_status" >&5
408+ echo "$as_me:18008: \$? = $ac_status" >&5
409 if (exit $ac_status) && test -s out/conftest2.$ac_objext
410 then
411 # The compiler can only warn and ignore the option if not recognized
412@@ -20960,16 +20973,9 @@
413 found_so=
414 found_a=
415 if test $use_additional = yes; then
416- if test -n "$shlibext" \
417- && { test -f "$additional_libdir/lib$name.$shlibext" \
418- || { test "$shlibext" = dll \
419- && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
420+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
421 found_dir="$additional_libdir"
422- if test -f "$additional_libdir/lib$name.$shlibext"; then
423- found_so="$additional_libdir/lib$name.$shlibext"
424- else
425- found_so="$additional_libdir/lib$name.dll.a"
426- fi
427+ found_so="$additional_libdir/lib$name.$shlibext"
428 if test -f "$additional_libdir/lib$name.la"; then
429 found_la="$additional_libdir/lib$name.la"
430 fi
431@@ -20997,16 +21003,9 @@
432 case "$x" in
433 -L*)
434 dir=`echo "X$x" | sed -e 's/^X-L//'`
435- if test -n "$shlibext" \
436- && { test -f "$dir/lib$name.$shlibext" \
437- || { test "$shlibext" = dll \
438- && test -f "$dir/lib$name.dll.a"; }; }; then
439+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
440 found_dir="$dir"
441- if test -f "$dir/lib$name.$shlibext"; then
442- found_so="$dir/lib$name.$shlibext"
443- else
444- found_so="$dir/lib$name.dll.a"
445- fi
446+ found_so="$dir/lib$name.$shlibext"
447 if test -f "$dir/lib$name.la"; then
448 found_la="$dir/lib$name.la"
449 fi
450@@ -21927,13 +21926,6 @@
451
452
453
454-
455-
456-
457-
458-
459-
460-
461 { echo "$as_me:$LINENO: checking for CFPreferencesCopyAppValue" >&5
462 echo $ECHO_N "checking for CFPreferencesCopyAppValue... $ECHO_C" >&6; }
463 if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then
464@@ -22070,37 +22062,17 @@
465 LTLIBINTL=
466 POSUB=
467
468- case " $gt_needs " in
469- *" need-formatstring-macros "*) gt_api_version=3 ;;
470- *" need-ngettext "*) gt_api_version=2 ;;
471- *) gt_api_version=1 ;;
472- esac
473- gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
474- gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
475-
476 if test "$USE_NLS" = "yes"; then
477 gt_use_preinstalled_gnugettext=no
478
479
480- if test $gt_api_version -ge 3; then
481- gt_revision_test_code='
482-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
483-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
484-#endif
485-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
486-'
487- else
488- gt_revision_test_code=
489- fi
490- if test $gt_api_version -ge 2; then
491- gt_expression_test_code=' + * ngettext ("", "", 0)'
492- else
493- gt_expression_test_code=
494- fi
495+
496+
497+
498
499 { echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
500 echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6; }
501-if { as_var=$gt_func_gnugettext_libc; eval "test \"\${$as_var+set}\" = set"; }; then
502+if test "${gt_cv_func_gnugettext1_libc+set}" = set; then
503 echo $ECHO_N "(cached) $ECHO_C" >&6
504 else
505 cat >conftest.$ac_ext <<_ACEOF
506@@ -22110,14 +22082,13 @@
507 cat >>conftest.$ac_ext <<_ACEOF
508 /* end confdefs.h. */
509 #include <libintl.h>
510-$gt_revision_test_code
511 extern int _nl_msg_cat_cntr;
512 extern int *_nl_domain_bindings;
513 int
514 main ()
515 {
516 bindtextdomain ("", "");
517-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
518+return * gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings
519 ;
520 return 0;
521 }
522@@ -22140,22 +22111,21 @@
523 test ! -s conftest.err
524 } && test -s conftest$ac_exeext &&
525 $as_test_x conftest$ac_exeext; then
526- eval "$gt_func_gnugettext_libc=yes"
527+ gt_cv_func_gnugettext1_libc=yes
528 else
529 echo "$as_me: failed program was:" >&5
530 sed 's/^/| /' conftest.$ac_ext >&5
531
532- eval "$gt_func_gnugettext_libc=no"
533+ gt_cv_func_gnugettext1_libc=no
534 fi
535
536 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
537 conftest$ac_exeext conftest.$ac_ext
538 fi
539-ac_res=`eval echo '${'$gt_func_gnugettext_libc'}'`
540- { echo "$as_me:$LINENO: result: $ac_res" >&5
541-echo "${ECHO_T}$ac_res" >&6; }
542+{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libc" >&5
543+echo "${ECHO_T}$gt_cv_func_gnugettext1_libc" >&6; }
544
545- if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
546+ if test "$gt_cv_func_gnugettext1_libc" != "yes"; then
547
548
549
550@@ -22398,16 +22368,9 @@
551 found_so=
552 found_a=
553 if test $use_additional = yes; then
554- if test -n "$shlibext" \
555- && { test -f "$additional_libdir/lib$name.$shlibext" \
556- || { test "$shlibext" = dll \
557- && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
558+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
559 found_dir="$additional_libdir"
560- if test -f "$additional_libdir/lib$name.$shlibext"; then
561- found_so="$additional_libdir/lib$name.$shlibext"
562- else
563- found_so="$additional_libdir/lib$name.dll.a"
564- fi
565+ found_so="$additional_libdir/lib$name.$shlibext"
566 if test -f "$additional_libdir/lib$name.la"; then
567 found_la="$additional_libdir/lib$name.la"
568 fi
569@@ -22435,16 +22398,9 @@
570 case "$x" in
571 -L*)
572 dir=`echo "X$x" | sed -e 's/^X-L//'`
573- if test -n "$shlibext" \
574- && { test -f "$dir/lib$name.$shlibext" \
575- || { test "$shlibext" = dll \
576- && test -f "$dir/lib$name.dll.a"; }; }; then
577+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
578 found_dir="$dir"
579- if test -f "$dir/lib$name.$shlibext"; then
580- found_so="$dir/lib$name.$shlibext"
581- else
582- found_so="$dir/lib$name.dll.a"
583- fi
584+ found_so="$dir/lib$name.$shlibext"
585 if test -f "$dir/lib$name.la"; then
586 found_la="$dir/lib$name.la"
587 fi
588@@ -22712,7 +22668,7 @@
589
590 { echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
591 echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6; }
592-if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then
593+if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then
594 echo $ECHO_N "(cached) $ECHO_C" >&6
595 else
596 gt_save_CPPFLAGS="$CPPFLAGS"
597@@ -22726,7 +22682,6 @@
598 cat >>conftest.$ac_ext <<_ACEOF
599 /* end confdefs.h. */
600 #include <libintl.h>
601-$gt_revision_test_code
602 extern int _nl_msg_cat_cntr;
603 extern
604 #ifdef __cplusplus
605@@ -22737,7 +22692,7 @@
606 main ()
607 {
608 bindtextdomain ("", "");
609-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
610+return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
611 ;
612 return 0;
613 }
614@@ -22760,17 +22715,17 @@
615 test ! -s conftest.err
616 } && test -s conftest$ac_exeext &&
617 $as_test_x conftest$ac_exeext; then
618- eval "$gt_func_gnugettext_libintl=yes"
619+ gt_cv_func_gnugettext1_libintl=yes
620 else
621 echo "$as_me: failed program was:" >&5
622 sed 's/^/| /' conftest.$ac_ext >&5
623
624- eval "$gt_func_gnugettext_libintl=no"
625+ gt_cv_func_gnugettext1_libintl=no
626 fi
627
628 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
629 conftest$ac_exeext conftest.$ac_ext
630- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
631+ if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then
632 LIBS="$LIBS $LIBICONV"
633 cat >conftest.$ac_ext <<_ACEOF
634 /* confdefs.h. */
635@@ -22779,7 +22734,6 @@
636 cat >>conftest.$ac_ext <<_ACEOF
637 /* end confdefs.h. */
638 #include <libintl.h>
639-$gt_revision_test_code
640 extern int _nl_msg_cat_cntr;
641 extern
642 #ifdef __cplusplus
643@@ -22790,7 +22744,7 @@
644 main ()
645 {
646 bindtextdomain ("", "");
647-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
648+return * gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias ("")
649 ;
650 return 0;
651 }
652@@ -22815,7 +22769,7 @@
653 $as_test_x conftest$ac_exeext; then
654 LIBINTL="$LIBINTL $LIBICONV"
655 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
656- eval "$gt_func_gnugettext_libintl=yes"
657+ gt_cv_func_gnugettext1_libintl=yes
658
659 else
660 echo "$as_me: failed program was:" >&5
661@@ -22830,13 +22784,12 @@
662 CPPFLAGS="$gt_save_CPPFLAGS"
663 LIBS="$gt_save_LIBS"
664 fi
665-ac_res=`eval echo '${'$gt_func_gnugettext_libintl'}'`
666- { echo "$as_me:$LINENO: result: $ac_res" >&5
667-echo "${ECHO_T}$ac_res" >&6; }
668+{ echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext1_libintl" >&5
669+echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6; }
670 fi
671
672- if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
673- || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
674+ if test "$gt_cv_func_gnugettext1_libc" = "yes" \
675+ || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \
676 && test "$PACKAGE" != gettext-runtime \
677 && test "$PACKAGE" != gettext-tools; }; then
678 gt_use_preinstalled_gnugettext=yes
679@@ -22876,7 +22829,7 @@
680 { echo "$as_me:$LINENO: checking where the gettext function comes from" >&5
681 echo $ECHO_N "checking where the gettext function comes from... $ECHO_C" >&6; }
682 if test "$gt_use_preinstalled_gnugettext" = "yes"; then
683- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
684+ if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
685 gt_source="external libintl"
686 else
687 gt_source="libc"
688@@ -22891,7 +22844,7 @@
689 if test "$USE_NLS" = "yes"; then
690
691 if test "$gt_use_preinstalled_gnugettext" = "yes"; then
692- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
693+ if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then
694 { echo "$as_me:$LINENO: checking how to link with libintl" >&5
695 echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6; }
696 { echo "$as_me:$LINENO: result: $LIBINTL" >&5
697@@ -26592,12 +26545,8 @@
698 esac
699 done
700
701-
702-
703-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
704- if test -n "$ac_tool_prefix"; then
705- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
706-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
707+ # Extract the first word of "pkg-config", so it can be a program name with args.
708+set dummy pkg-config; ac_word=$2
709 { echo "$as_me:$LINENO: checking for $ac_word" >&5
710 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
711 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
712@@ -26623,6 +26572,7 @@
713 done
714 IFS=$as_save_IFS
715
716+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
717 ;;
718 esac
719 fi
720@@ -26636,88 +26586,19 @@
721 fi
722
723
724-fi
725-if test -z "$ac_cv_path_PKG_CONFIG"; then
726- ac_pt_PKG_CONFIG=$PKG_CONFIG
727- # Extract the first word of "pkg-config", so it can be a program name with args.
728-set dummy pkg-config; ac_word=$2
729-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
730-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
731-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
732- echo $ECHO_N "(cached) $ECHO_C" >&6
733-else
734- case $ac_pt_PKG_CONFIG in
735- [\\/]* | ?:[\\/]*)
736- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
737- ;;
738- *)
739- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
740-for as_dir in $PATH
741-do
742- IFS=$as_save_IFS
743- test -z "$as_dir" && as_dir=.
744- for ac_exec_ext in '' $ac_executable_extensions; do
745- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
746- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
747- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
748- break 2
749- fi
750-done
751-done
752-IFS=$as_save_IFS
753-
754- ;;
755-esac
756-fi
757-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
758-if test -n "$ac_pt_PKG_CONFIG"; then
759- { echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
760-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6; }
761-else
762- { echo "$as_me:$LINENO: result: no" >&5
763-echo "${ECHO_T}no" >&6; }
764-fi
765-
766- if test "x$ac_pt_PKG_CONFIG" = x; then
767- PKG_CONFIG=""
768- else
769- case $cross_compiling:$ac_tool_warned in
770-yes:)
771-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
772-whose name does not start with the host triplet. If you think this
773-configuration is useful to you, please write to autoconf@gnu.org." >&5
774-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
775-whose name does not start with the host triplet. If you think this
776-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
777-ac_tool_warned=yes ;;
778-esac
779- PKG_CONFIG=$ac_pt_PKG_CONFIG
780- fi
781-else
782- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
783-fi
784-
785-fi
786-if test -n "$PKG_CONFIG"; then
787- _pkg_min_version=0.7
788- { echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
789-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6; }
790- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
791- { echo "$as_me:$LINENO: result: yes" >&5
792-echo "${ECHO_T}yes" >&6; }
793- else
794- { echo "$as_me:$LINENO: result: no" >&5
795-echo "${ECHO_T}no" >&6; }
796- PKG_CONFIG=""
797- fi
798-
799-fi
800
801 no_glib=""
802
803- if test "x$PKG_CONFIG" = x ; then
804+ if test x$PKG_CONFIG != xno ; then
805+ if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
806+ :
807+ else
808+ echo *** pkg-config too old; version 0.7 or better required.
809+ no_glib=yes
810+ PKG_CONFIG=no
811+ fi
812+ else
813 no_glib=yes
814- PKG_CONFIG=no
815 fi
816
817 min_glib_version=2.6.0
818@@ -27223,9 +27104,7 @@
819 # Put the nasty error message in config.log where it belongs
820 echo "$OPENSSL_PKG_ERRORS" >&5
821
822- { echo "$as_me:$LINENO: result: no" >&5
823-echo "${ECHO_T}no" >&6; }
824- ac_cv_enable_openssl=no
825+ ac_cv_enable_openssl=no
826 elif test $pkg_failed = untried; then
827 ac_cv_enable_openssl=no
828 else
829@@ -27793,6 +27672,11 @@
830
831
832
833+OWL_LIBS="-lowl"
834+OLS_CFLAGS=""
835+
836+
837+
838 # Check whether --enable-aspell was given.
839 if test "${enable_aspell+set}" = set; then
840 enableval=$enable_aspell; ac_cv_enable_aspell=$enableval
841@@ -28242,9 +28126,7 @@
842 # Put the nasty error message in config.log where it belongs
843 echo "$MAEMO_PKG_ERRORS" >&5
844
845- { echo "$as_me:$LINENO: result: no" >&5
846-echo "${ECHO_T}no" >&6; }
847- ac_cv_enable_maemo=no
848+ ac_cv_enable_maemo=no
849 elif test $pkg_failed = untried; then
850 ac_cv_enable_maemo=no
851 else
852@@ -29796,8 +29678,6 @@
853 # Put the nasty error message in config.log where it belongs
854 echo "$STARTUP_NOTIFICATION_PKG_ERRORS" >&5
855
856- { echo "$as_me:$LINENO: result: no" >&5
857-echo "${ECHO_T}no" >&6; }
858
859 echo "Building without libstartup-notification"
860 enable_startup_notification=no
861@@ -31300,9 +31180,7 @@
862 # Put the nasty error message in config.log where it belongs
863 echo "$CLAMAV_PKG_ERRORS" >&5
864
865- { echo "$as_me:$LINENO: result: no" >&5
866-echo "${ECHO_T}no" >&6; }
867- ac_cv_enable_clamav_plugin=no
868+ ac_cv_enable_clamav_plugin=no
869 elif test $pkg_failed = untried; then
870 ac_cv_enable_clamav_plugin=no
871 else
872@@ -31684,9 +31562,7 @@
873 # Put the nasty error message in config.log where it belongs
874 echo "$GNOMEPRINT_PKG_ERRORS" >&5
875
876- { echo "$as_me:$LINENO: result: no" >&5
877-echo "${ECHO_T}no" >&6; }
878- ac_cv_enable_gnomeprint=no
879+ ac_cv_enable_gnomeprint=no
880 elif test $pkg_failed = untried; then
881 ac_cv_enable_gnomeprint=no
882 else
883@@ -31794,9 +31670,7 @@
884 # Put the nasty error message in config.log where it belongs
885 echo "$VALGRIND_PKG_ERRORS" >&5
886
887- { echo "$as_me:$LINENO: result: no" >&5
888-echo "${ECHO_T}no" >&6; }
889- ac_cv_enable_valgrind=no
890+ ac_cv_enable_valgrind=no
891 elif test $pkg_failed = untried; then
892 ac_cv_enable_valgrind=no
893 else
894@@ -32884,6 +32758,8 @@
895 PASSCRYPT_KEY!$PASSCRYPT_KEY$ac_delim
896 GTK_CFLAGS!$GTK_CFLAGS$ac_delim
897 GTK_LIBS!$GTK_LIBS$ac_delim
898+OWL_LIBS!$OWL_LIBS$ac_delim
899+OWL_CFLAGS!$OWL_CFLAGS$ac_delim
900 ASPELL!$ASPELL$ac_delim
901 ASPELL_CFLAGS!$ASPELL_CFLAGS$ac_delim
902 ASPELL_LIBS!$ASPELL_LIBS$ac_delim
903@@ -32904,8 +32780,6 @@
904 BUILD_SPAMASSASSIN_PLUGIN_FALSE!$BUILD_SPAMASSASSIN_PLUGIN_FALSE$ac_delim
905 BUILD_BOGOFILTER_PLUGIN_TRUE!$BUILD_BOGOFILTER_PLUGIN_TRUE$ac_delim
906 BUILD_BOGOFILTER_PLUGIN_FALSE!$BUILD_BOGOFILTER_PLUGIN_FALSE$ac_delim
907-GPGME_CONFIG!$GPGME_CONFIG$ac_delim
908-GPGME_CFLAGS!$GPGME_CFLAGS$ac_delim
909 _ACEOF
910
911 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
912@@ -32947,6 +32821,8 @@
913 ac_delim='%!_!# '
914 for ac_last_try in false false false false false :; do
915 cat >conf$$subs.sed <<_ACEOF
916+GPGME_CONFIG!$GPGME_CONFIG$ac_delim
917+GPGME_CFLAGS!$GPGME_CFLAGS$ac_delim
918 GPGME_LIBS!$GPGME_LIBS$ac_delim
919 BUILD_PGPCORE_PLUGIN_TRUE!$BUILD_PGPCORE_PLUGIN_TRUE$ac_delim
920 BUILD_PGPCORE_PLUGIN_FALSE!$BUILD_PGPCORE_PLUGIN_FALSE$ac_delim
921@@ -32979,7 +32855,7 @@
922 LTLIBOBJS!$LTLIBOBJS$ac_delim
923 _ACEOF
924
925- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then
926+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then
927 break
928 elif $ac_last_try; then
929 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
930Index: claws-mail-2.9.1/src/Makefile.in
931===================================================================
932--- claws-mail-2.9.1.orig/src/Makefile.in 2007-04-25 10:18:13.000000000 +0100
933+++ claws-mail-2.9.1/src/Makefile.in 2007-04-25 10:30:23.000000000 +0100
934@@ -45,8 +45,7 @@
935 $(top_srcdir)/m4/aspell.m4 $(top_srcdir)/m4/check-type.m4 \
936 $(top_srcdir)/m4/gnupg-check-typedef.m4 \
937 $(top_srcdir)/m4/gnupg.m4 $(top_srcdir)/m4/gpgme.m4 \
938- $(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/spamassassin.m4 \
939- $(top_srcdir)/configure.ac
940+ $(top_srcdir)/m4/spamassassin.m4 $(top_srcdir)/configure.ac
941 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
942 $(ACLOCAL_M4)
943 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
944@@ -122,7 +121,7 @@
945 $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
946 $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
947 $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
948- $(am__DEPENDENCIES_2)
949+ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2)
950 claws_mail_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
951 $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
952 $(claws_mail_LDFLAGS) $(LDFLAGS) -o $@
953@@ -272,6 +271,8 @@
954 OBJEXT = @OBJEXT@
955 OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
956 OPENSSL_LIBS = @OPENSSL_LIBS@
957+OWL_CFLAGS = @OWL_CFLAGS@
958+OWL_LIBS = @OWL_LIBS@
959 PACKAGE = @PACKAGE@
960 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
961 PACKAGE_NAME = @PACKAGE_NAME@
962@@ -815,7 +816,8 @@
963 $(LIBICONV) \
964 $(STARTUP_NOTIFICATION_LIBS) \
965 $(LIBETPAN_LIBS) \
966- $(MAEMO_LIBS)
967+ $(MAEMO_LIBS) \
968+ $(OWL_LIBS)
969
970 AM_CPPFLAGS = \
971 -DG_LOG_DOMAIN=\"Claws-Mail\" \
972@@ -833,7 +835,7 @@
973 $(LIBETPAN_CPPFLAGS) \
974 $(STARTUP_NOTIFICATION_CFLAGS) \
975 $(MAEMO_CFLAGS) \
976- -Wno-unused-function
977+ $(OWL_CFLAGS)
978
979
980 #no-unused-function is there because of bison stuff
981@@ -1406,6 +1408,7 @@
982 install-exec-hook:
983 @rm -f $(DESTDIR)$(bindir)/sylpheed-claws
984 @ln -s claws-mail $(DESTDIR)$(bindir)/sylpheed-claws
985+ -Wno-unused-function
986
987 @CYGWIN_TRUE@claws-mail$(EXEEXT): $(claws_mail_OBJECTS) $(claws_mail_DEPENDENCIES)
988 @CYGWIN_TRUE@ @rm -f claws-mail$(EXEEXT)
989Index: claws-mail-2.9.1/autogen.sh
990===================================================================
991--- claws-mail-2.9.1.orig/autogen.sh 2007-04-25 10:18:13.000000000 +0100
992+++ claws-mail-2.9.1/autogen.sh 2007-04-25 10:30:23.000000000 +0100
993@@ -74,5 +74,4 @@
994 && libtoolize --force --copy \
995 && autoheader \
996 && automake --add-missing --foreign --copy \
997- && autoconf \
998- && ./configure --enable-maintainer-mode $@
999+ && autoconf
1000Index: claws-mail-2.9.1/src/compose.c
1001===================================================================
1002--- claws-mail-2.9.1.orig/src/compose.c 2007-04-25 10:18:13.000000000 +0100
1003+++ claws-mail-2.9.1/src/compose.c 2007-04-25 10:30:23.000000000 +0100
1004@@ -6192,7 +6192,6 @@
1005 n_menu_entries = sizeof(compose_entries) / sizeof(compose_entries[0]);
1006 menubar = menubar_create(window, compose_entries,
1007 n_menu_entries, "<Compose>", compose);
1008- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
1009
1010 handlebox = gtk_hbox_new(FALSE, 0);
1011 gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
diff --git a/meta-demoapps/recipes-sato/claws-mail/files/streamline-ui.patch b/meta-demoapps/recipes-sato/claws-mail/files/streamline-ui.patch
deleted file mode 100644
index 81a2a6bd90..0000000000
--- a/meta-demoapps/recipes-sato/claws-mail/files/streamline-ui.patch
+++ /dev/null
@@ -1,1010 +0,0 @@
1Upstream-Status: Inappropriate [disable feature]
2
3Index: claws-mail-2.9.1/src/mainwindow.c
4===================================================================
5--- claws-mail-2.9.1.orig/src/mainwindow.c 2007-04-25 07:40:10.000000000 +0100
6+++ claws-mail-2.9.1/src/mainwindow.c 2007-04-25 10:26:40.000000000 +0100
7@@ -189,9 +189,6 @@
8 static void toggle_statusbar_cb (MainWindow *mainwin,
9 guint action,
10 GtkWidget *widget);
11-static void set_layout_cb (MainWindow *mainwin,
12- guint action,
13- GtkWidget *widget);
14
15 static void addressbook_open_cb (MainWindow *mainwin,
16 guint action,
17@@ -538,94 +535,24 @@
18 {N_("/_Edit/_Search folder..."), "<shift><control>F", search_cb, 1, NULL},
19 {N_("/_Edit/_Quick search"), "slash", mainwindow_quicksearch, 0, NULL},
20 {N_("/_View"), NULL, NULL, 0, "<Branch>"},
21- {N_("/_View/Show or hi_de"), NULL, NULL, 0, "<Branch>"},
22- {N_("/_View/Show or hi_de/_Message view"),
23- "V", toggle_message_cb, 0, "<ToggleItem>"},
24- {N_("/_View/Show or hi_de/_Toolbar"),
25- NULL, NULL, 0, "<Branch>"},
26- {N_("/_View/Show or hi_de/_Toolbar/Text _below icons"),
27- NULL, toggle_toolbar_cb, TOOLBAR_BOTH, "<RadioItem>"},
28- {N_("/_View/Show or hi_de/_Toolbar/Text be_side icons"),
29- NULL, toggle_toolbar_cb, TOOLBAR_BOTH_HORIZ, "/View/Show or hide/Toolbar/Text below icons"},
30- {N_("/_View/Show or hi_de/_Toolbar/_Icons only"),
31- NULL, toggle_toolbar_cb, TOOLBAR_ICON, "/View/Show or hide/Toolbar/Text below icons"},
32- {N_("/_View/Show or hi_de/_Toolbar/_Text only"),
33- NULL, toggle_toolbar_cb, TOOLBAR_TEXT, "/View/Show or hide/Toolbar/Text below icons"},
34- {N_("/_View/Show or hi_de/_Toolbar/_Hide"),
35- NULL, toggle_toolbar_cb, TOOLBAR_NONE, "/View/Show or hide/Toolbar/Text below icons"},
36- {N_("/_View/Show or hi_de/Status _bar"),
37- NULL, toggle_statusbar_cb, 0, "<ToggleItem>"},
38 {N_("/_View/Set displayed _columns"), NULL, NULL, 0, "<Branch>"},
39 {N_("/_View/Set displayed _columns/in _Folder list..."), NULL, set_folder_display_item_cb, 0, NULL},
40 {N_("/_View/Set displayed _columns/in _Message list..."),NULL, set_summary_display_item_cb, 0, NULL},
41
42 {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
43- {N_("/_View/La_yout"), NULL, NULL, 0, "<Branch>"},
44- {N_("/_View/Layout/_Standard"), NULL, set_layout_cb, NORMAL_LAYOUT, "<RadioItem>"},
45- {N_("/_View/Layout/_Three columns"), NULL, set_layout_cb, VERTICAL_LAYOUT, "/View/Layout/Standard"},
46- {N_("/_View/Layout/_Wide message"), NULL, set_layout_cb, WIDE_LAYOUT, "/View/Layout/Standard"},
47- {N_("/_View/Layout/W_ide message list"),NULL, set_layout_cb, WIDE_MSGLIST_LAYOUT, "/View/Layout/Standard"},
48- {N_("/_View/Layout/S_mall screen"), NULL, set_layout_cb, SMALL_LAYOUT, "/View/Layout/Standard"},
49- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
50 {N_("/_View/_Sort"), NULL, NULL, 0, "<Branch>"},
51- {N_("/_View/_Sort/by _number"), NULL, sort_summary_cb, SORT_BY_NUMBER, "<RadioItem>"},
52- {N_("/_View/_Sort/by S_ize"), NULL, sort_summary_cb, SORT_BY_SIZE, "/View/Sort/by number"},
53- {N_("/_View/_Sort/by _Date"), NULL, sort_summary_cb, SORT_BY_DATE, "/View/Sort/by number"},
54- {N_("/_View/_Sort/by _From"), NULL, sort_summary_cb, SORT_BY_FROM, "/View/Sort/by number"},
55- {N_("/_View/_Sort/by _To"), NULL, sort_summary_cb, SORT_BY_TO, "/View/Sort/by number"},
56- {N_("/_View/_Sort/by S_ubject"), NULL, sort_summary_cb, SORT_BY_SUBJECT, "/View/Sort/by number"},
57- {N_("/_View/_Sort/by _color label"),
58- NULL, sort_summary_cb, SORT_BY_LABEL, "/View/Sort/by number"},
59- {N_("/_View/_Sort/by _mark"), NULL, sort_summary_cb, SORT_BY_MARK, "/View/Sort/by number"},
60- {N_("/_View/_Sort/by _status"), NULL, sort_summary_cb, SORT_BY_STATUS, "/View/Sort/by number"},
61- {N_("/_View/_Sort/by a_ttachment"),
62- NULL, sort_summary_cb, SORT_BY_MIME, "/View/Sort/by number"},
63- {N_("/_View/_Sort/by score"), NULL, sort_summary_cb, SORT_BY_SCORE, "/View/Sort/by number"},
64- {N_("/_View/_Sort/by locked"), NULL, sort_summary_cb, SORT_BY_LOCKED, "/View/Sort/by number"},
65- {N_("/_View/_Sort/D_on't sort"), NULL, sort_summary_cb, SORT_BY_NONE, "/View/Sort/by number"},
66+ {N_("/_View/_Sort/by _Date"), NULL, sort_summary_cb, SORT_BY_DATE, "<RadioItem>"},
67+ {N_("/_View/_Sort/by _From"), NULL, sort_summary_cb, SORT_BY_FROM, "/View/Sort/by Date"},
68+ {N_("/_View/_Sort/by _To"), NULL, sort_summary_cb, SORT_BY_TO, "/View/Sort/by Date"},
69+ {N_("/_View/_Sort/by S_ubject"), NULL, sort_summary_cb, SORT_BY_SUBJECT, "/View/Sort/by Date"},
70 {N_("/_View/_Sort/---"), NULL, NULL, 0, "<Separator>"},
71 {N_("/_View/_Sort/Ascending"), NULL, sort_summary_type_cb, SORT_ASCENDING, "<RadioItem>"},
72 {N_("/_View/_Sort/Descending"), NULL, sort_summary_type_cb, SORT_DESCENDING, "/View/Sort/Ascending"},
73- {N_("/_View/_Sort/---"), NULL, NULL, 0, "<Separator>"},
74- {N_("/_View/_Sort/_Attract by subject"),
75- NULL, attract_by_subject_cb, 0, NULL},
76 {N_("/_View/Th_read view"), "<control>T", thread_cb, 0, "<ToggleItem>"},
77 {N_("/_View/E_xpand all threads"), NULL, expand_threads_cb, 0, NULL},
78 {N_("/_View/Co_llapse all threads"), NULL, collapse_threads_cb, 0, NULL},
79 {N_("/_View/_Hide read messages"), NULL, hide_read_messages, 0, "<ToggleItem>"},
80
81- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
82- {N_("/_View/_Go to"), NULL, NULL, 0, "<Branch>"},
83- {N_("/_View/_Go to/_Previous message"), "P", prev_cb, 0, NULL},
84- {N_("/_View/_Go to/_Next message"), "N", next_cb, 0, NULL},
85- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
86- {N_("/_View/_Go to/P_revious unread message"),
87- "<shift>P", prev_unread_cb, 0, NULL},
88- {N_("/_View/_Go to/N_ext unread message"),
89- "<shift>N", next_unread_cb, 0, NULL},
90- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
91- {N_("/_View/_Go to/Previous ne_w message"), NULL, prev_new_cb, 0, NULL},
92- {N_("/_View/_Go to/Ne_xt new message"), NULL, next_new_cb, 0, NULL},
93- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
94- {N_("/_View/_Go to/Previous _marked message"),
95- NULL, prev_marked_cb, 0, NULL},
96- {N_("/_View/_Go to/Next m_arked message"),
97- NULL, next_marked_cb, 0, NULL},
98- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
99- {N_("/_View/_Go to/Previous _labeled message"),
100- NULL, prev_labeled_cb, 0, NULL},
101- {N_("/_View/_Go to/Next la_beled message"),
102- NULL, next_labeled_cb, 0, NULL},
103- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
104- {N_("/_View/_Go to/Last read message"),
105- NULL, last_read_cb, 0, NULL},
106- {N_("/_View/_Go to/Parent message"),
107- "<control>Up", parent_cb, 0, NULL},
108- {N_("/_View/_Go to/---"), NULL, NULL, 0, "<Separator>"},
109- {N_("/_View/_Go to/Next unread _folder"), "<shift>G", goto_unread_folder_cb, 0, NULL},
110- {N_("/_View/_Go to/_Other folder..."), "G", goto_folder_cb, 0, NULL},
111- {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
112-
113 #define ENC_SEPARATOR \
114 {N_("/_View/Character _encoding/---"), NULL, NULL, 0, "<Separator>"}
115 #define ENC_ACTION(action) \
116@@ -742,7 +669,6 @@
117 #undef DEC_ACTION
118
119 {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
120- {N_("/_View/Open in new _window"), "<control><alt>N", open_msg_cb, 0, NULL},
121 {N_("/_View/Mess_age source"), "<control>U", view_source_cb, 0, NULL},
122 {N_("/_View/All headers"), "<control>H", show_all_header_cb, 0, "<ToggleItem>"},
123 {N_("/_View/Quotes"), NULL, NULL, 0, "<Branch>"},
124@@ -1137,23 +1063,14 @@
125 gint i;
126 guint n_menu_entries;
127
128- static GdkGeometry geometry;
129-
130 debug_print("Creating main window...\n");
131 mainwin = g_new0(MainWindow, 1);
132
133 /* main window */
134 window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "mainwindow");
135- gtk_window_set_title(GTK_WINDOW(window), PROG_VERSION);
136+ gtk_window_set_title(GTK_WINDOW(window), _("Mail"));
137 gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
138
139- if (!geometry.min_height) {
140- geometry.min_width = 320;
141- geometry.min_height = 200;
142- }
143- gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
144- GDK_HINT_MIN_SIZE);
145-
146 g_signal_connect(G_OBJECT(window), "delete_event",
147 G_CALLBACK(main_window_close_cb), mainwin);
148 MANAGE_WINDOW_SIGNALS_CONNECT(window);
149@@ -1184,21 +1101,9 @@
150 /* gtk_widget_show(gtk_item_factory_get_item(ifactory,"/Message/Mailing-List"));
151 main_create_mailing_list_menu (mainwin, NULL); */
152
153- menu_set_sensitive(ifactory, "/Help/Manual", manual_available(MANUAL_MANUAL_LOCAL));
154-
155- if (prefs_common.toolbar_detachable) {
156- handlebox = gtk_handle_box_new();
157- gtk_widget_show(handlebox);
158- gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
159- g_signal_connect(G_OBJECT(handlebox), "child_attached",
160- G_CALLBACK(toolbar_child_attached), mainwin);
161- g_signal_connect(G_OBJECT(handlebox), "child_detached",
162- G_CALLBACK(toolbar_child_detached), mainwin);
163- } else {
164- handlebox = gtk_hbox_new(FALSE, 0);
165- gtk_widget_show(handlebox);
166- gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
167- }
168+ handlebox = gtk_hbox_new(FALSE, 0);
169+ gtk_widget_show(handlebox);
170+ gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
171 /* link window to mainwin->window to avoid gdk warnings */
172 mainwin->window = window;
173
174@@ -1405,36 +1310,6 @@
175 (ifactory, "/View/Character encoding/Auto detect");
176 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
177
178- switch (prefs_common.toolbar_style) {
179- case TOOLBAR_NONE:
180- menuitem = gtk_item_factory_get_item
181- (ifactory, "/View/Show or hide/Toolbar/Hide");
182- break;
183- case TOOLBAR_ICON:
184- menuitem = gtk_item_factory_get_item
185- (ifactory, "/View/Show or hide/Toolbar/Icons only");
186- break;
187- case TOOLBAR_TEXT:
188- menuitem = gtk_item_factory_get_item
189- (ifactory, "/View/Show or hide/Toolbar/Text only");
190- break;
191- case TOOLBAR_BOTH:
192- menuitem = gtk_item_factory_get_item
193- (ifactory, "/View/Show or hide/Toolbar/Text below icons");
194- break;
195- case TOOLBAR_BOTH_HORIZ:
196- menuitem = gtk_item_factory_get_item
197- (ifactory,
198- "/View/Show or hide/Toolbar/Text beside icons");
199- }
200- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
201-
202- gtk_widget_hide(mainwin->hbox_stat);
203- menuitem = gtk_item_factory_get_item
204- (ifactory, "/View/Show or hide/Status bar");
205- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
206- prefs_common.show_statusbar);
207-
208 /* set account selection menu */
209 ac_menu = gtk_item_factory_get_widget
210 (ifactory, "/Configuration/Change current account");
211@@ -2284,16 +2159,6 @@
212 {"/View/Expand all threads" , M_MSG_EXIST},
213 {"/View/Collapse all threads" , M_MSG_EXIST},
214 {"/View/Hide read messages" , M_HIDE_READ_MSG},
215- {"/View/Go to/Previous message" , M_MSG_EXIST},
216- {"/View/Go to/Next message" , M_MSG_EXIST},
217- {"/View/Go to/Previous unread message" , M_MSG_EXIST},
218- {"/View/Go to/Previous new message" , M_MSG_EXIST},
219- {"/View/Go to/Previous marked message" , M_MSG_EXIST},
220- {"/View/Go to/Previous labeled message", M_MSG_EXIST},
221- {"/View/Go to/Next labeled message", M_MSG_EXIST},
222- {"/View/Go to/Last read message" , M_SINGLE_TARGET_EXIST},
223- {"/View/Go to/Parent message" , M_SINGLE_TARGET_EXIST},
224- {"/View/Open in new window" , M_SINGLE_TARGET_EXIST},
225 {"/View/Message source" , M_SINGLE_TARGET_EXIST},
226 {"/View/All headers" , M_SINGLE_TARGET_EXIST},
227 {"/View/Quotes" , M_SINGLE_TARGET_EXIST},
228@@ -2379,40 +2244,20 @@
229 gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); \
230 }
231
232- SET_CHECK_MENU_ACTIVE("/View/Show or hide/Message view",
233- messageview_is_visible(mainwin->messageview));
234-
235 summaryview = mainwin->summaryview;
236- menu_path = "/View/Sort/Don't sort";
237+ menu_path = "/View/Sort/by Date";
238
239 switch (summaryview->sort_key) {
240- case SORT_BY_NUMBER:
241- menu_path = "/View/Sort/by number"; break;
242- case SORT_BY_SIZE:
243- menu_path = "/View/Sort/by Size"; break;
244- case SORT_BY_DATE:
245- menu_path = "/View/Sort/by Date"; break;
246 case SORT_BY_FROM:
247 menu_path = "/View/Sort/by From"; break;
248 case SORT_BY_TO:
249 menu_path = "/View/Sort/by To"; break;
250 case SORT_BY_SUBJECT:
251 menu_path = "/View/Sort/by Subject"; break;
252- case SORT_BY_LABEL:
253- menu_path = "/View/Sort/by color label"; break;
254- case SORT_BY_MARK:
255- menu_path = "/View/Sort/by mark"; break;
256- case SORT_BY_STATUS:
257- menu_path = "/View/Sort/by status"; break;
258- case SORT_BY_MIME:
259- menu_path = "/View/Sort/by attachment"; break;
260- case SORT_BY_SCORE:
261- menu_path = "/View/Sort/by score"; break;
262- case SORT_BY_LOCKED:
263- menu_path = "/View/Sort/by locked"; break;
264 case SORT_BY_NONE:
265+ case SORT_BY_DATE:
266 default:
267- menu_path = "/View/Sort/Don't sort"; break;
268+ menu_path = "/View/Sort/by Date"; break;
269 }
270 SET_CHECK_MENU_ACTIVE(menu_path, TRUE);
271
272@@ -2735,8 +2580,6 @@
273 gtk_widget_destroy(mainwin->hpaned);
274 }
275
276- menu_set_sensitive(ifactory, "/View/Show or hide/Message view",
277- (layout_mode != WIDE_MSGLIST_LAYOUT && layout_mode != SMALL_LAYOUT));
278 switch (layout_mode) {
279 case VERTICAL_LAYOUT:
280 case NORMAL_LAYOUT:
281@@ -2877,37 +2720,6 @@
282
283 prefs_common.layout_mode = layout_mode;
284
285- menuitem = gtk_item_factory_get_item
286- (ifactory, "/View/Show or hide/Message view");
287- gtk_check_menu_item_set_active
288- (GTK_CHECK_MENU_ITEM(menuitem),
289- messageview_is_visible(mainwin->messageview));
290-
291-#define SET_CHECK_MENU_ACTIVE(path, active) \
292-{ \
293- menuitem = gtk_item_factory_get_widget(ifactory, path); \
294- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), active); \
295-}
296-
297- switch (prefs_common.layout_mode) {
298- case NORMAL_LAYOUT:
299- SET_CHECK_MENU_ACTIVE("/View/Layout/Standard", TRUE);
300- break;
301- case VERTICAL_LAYOUT:
302- SET_CHECK_MENU_ACTIVE("/View/Layout/Three columns", TRUE);
303- break;
304- case WIDE_LAYOUT:
305- SET_CHECK_MENU_ACTIVE("/View/Layout/Wide message", TRUE);
306- break;
307- case WIDE_MSGLIST_LAYOUT:
308- SET_CHECK_MENU_ACTIVE("/View/Layout/Wide message list", TRUE);
309- break;
310- case SMALL_LAYOUT:
311- SET_CHECK_MENU_ACTIVE("/View/Layout/Small screen", TRUE);
312- break;
313- }
314-#undef SET_CHECK_MENU_ACTIVE
315-
316 if (folderwin) {
317 g_signal_connect
318 (G_OBJECT(folderwin), "size_allocate",
319@@ -3116,12 +2928,6 @@
320 summary_toggle_view(mainwin->summaryview);
321 }
322
323-static void toggle_toolbar_cb(MainWindow *mainwin, guint action,
324- GtkWidget *widget)
325-{
326- toolbar_toggle(action, mainwin);
327-}
328-
329 static void main_window_reply_cb(MainWindow *mainwin, guint action,
330 GtkWidget *widget)
331 {
332Index: claws-mail-2.9.1/src/prefs_common.c
333===================================================================
334--- claws-mail-2.9.1.orig/src/prefs_common.c 2007-04-25 07:40:10.000000000 +0100
335+++ claws-mail-2.9.1/src/prefs_common.c 2007-04-25 07:42:17.000000000 +0100
336@@ -262,7 +262,7 @@
337 {"default_reply_list", "TRUE", &prefs_common.default_reply_list, P_BOOL,
338 NULL, NULL, NULL},
339
340-#ifndef MAEMO
341+#if 0
342 {"show_ruler", "TRUE", &prefs_common.show_ruler, P_BOOL,
343 NULL, NULL, NULL},
344 #else
345@@ -300,7 +300,7 @@
346 &prefs_common.normalfont_gtk1, P_STRING, NULL, NULL, NULL},
347
348 /* new fonts */
349-#ifndef MAEMO
350+#if 0
351 {"widget_font_gtk2", NULL,
352 &SPECIFIC_PREFS.widgetfont, P_STRING, NULL, NULL, NULL},
353 {"message_font_gtk2", "Monospace 9",
354@@ -416,7 +416,7 @@
355
356 {"enable_thread", "TRUE", &prefs_common.enable_thread, P_BOOL,
357 NULL, NULL, NULL},
358-#ifndef MAEMO
359+#if 0
360 {"toolbar_style", "3", &prefs_common.toolbar_style, P_ENUM,
361 NULL, NULL, NULL},
362 #else
363@@ -544,7 +544,7 @@
364 {"folder_col_pos_total", "3",
365 &prefs_common.folder_col_pos[F_COL_TOTAL], P_INT, NULL, NULL, NULL},
366
367-#ifndef MAEMO
368+#if 0
369 {"folder_col_size_folder", "120",
370 &prefs_common.folder_col_size[F_COL_FOLDER], P_INT, NULL, NULL, NULL},
371 {"folder_col_size_new", "32",
372@@ -702,7 +702,7 @@
373 &SPECIFIC_PREFS.mime_open_cmd, P_STRING, NULL, NULL, NULL},
374
375 /* Interface */
376-#ifndef MAEMO
377+#if 0
378 {"layout_mode", "0", &prefs_common.layout_mode, P_INT,
379 NULL, NULL, NULL},
380 #else
381Index: claws-mail-2.9.1/src/toolbar.c
382===================================================================
383--- claws-mail-2.9.1.orig/src/toolbar.c 2007-04-25 07:40:10.000000000 +0100
384+++ claws-mail-2.9.1/src/toolbar.c 2007-04-25 07:42:17.000000000 +0100
385@@ -841,26 +841,17 @@
386 gtk_widget_hide(handlebox_wid);
387 break;
388 case TOOLBAR_ICON:
389- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid),
390- GTK_TOOLBAR_ICONS);
391- break;
392 case TOOLBAR_TEXT:
393- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid),
394- GTK_TOOLBAR_TEXT);
395- break;
396 case TOOLBAR_BOTH:
397- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid),
398- GTK_TOOLBAR_BOTH);
399- break;
400 case TOOLBAR_BOTH_HORIZ:
401 gtk_toolbar_set_style(GTK_TOOLBAR(toolbar_wid),
402- GTK_TOOLBAR_BOTH_HORIZ);
403+ GTK_TOOLBAR_ICONS);
404 break;
405 default:
406 return;
407 }
408
409- prefs_common.toolbar_style = (ToolbarStyle)action;
410+ prefs_common.toolbar_style = (ToolbarStyle)TOOLBAR_ICON;
411 gtk_widget_set_size_request(handlebox_wid, 1, -1);
412
413 if (prefs_common.toolbar_style != TOOLBAR_NONE) {
414@@ -1594,7 +1585,7 @@
415 gtk_container_add(GTK_CONTAINER(container), toolbar);
416 gtk_container_set_border_width(GTK_CONTAINER(container), 2);
417 gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL);
418- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH);
419+ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_ICONS);
420
421 for (cur = toolbar_list; cur != NULL; cur = cur->next) {
422
423Index: claws-mail-2.9.1/src/gtk/prefswindow.c
424===================================================================
425--- claws-mail-2.9.1.orig/src/gtk/prefswindow.c 2007-04-25 07:40:10.000000000 +0100
426+++ claws-mail-2.9.1/src/gtk/prefswindow.c 2007-04-25 10:30:15.000000000 +0100
427@@ -343,6 +343,10 @@
428 gint x = gdk_screen_width();
429 gint y = gdk_screen_height();
430 static GdkGeometry geometry;
431+ gint col_count = g_slist_length (prefs_pages);
432+
433+ if (col_count > 1)
434+ col_count = 2;
435
436 prefswindow = g_new0(PrefsWindow, 1);
437
438@@ -360,39 +364,52 @@
439 gtk_window_set_resizable (GTK_WINDOW(prefswindow->window), TRUE);
440 gtk_container_set_border_width(GTK_CONTAINER(prefswindow->window), 4);
441
442- prefswindow->table1 = gtk_table_new(2, 2, FALSE);
443+ prefswindow->table1 = gtk_table_new(col_count, col_count, FALSE);
444 gtk_widget_show(prefswindow->table1);
445 gtk_container_add(GTK_CONTAINER(prefswindow->window), prefswindow->table1);
446
447- prefswindow->scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL);
448- gtk_widget_show(prefswindow->scrolledwindow1);
449- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
450- gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->scrolledwindow1, 0, 1, 0, 1, GTK_FILL, GTK_FILL | GTK_EXPAND, 2, 2);
451-
452- prefswindow->tree_view = prefswindow_tree_view_create(prefswindow);
453- gtk_widget_show(prefswindow->tree_view);
454- gtk_container_add(GTK_CONTAINER(prefswindow->scrolledwindow1),
455- prefswindow->tree_view);
456-
457- prefswindow->frame = gtk_frame_new(NULL);
458- gtk_widget_show(prefswindow->frame);
459- gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->frame), GTK_SHADOW_IN);
460- gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->frame, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 2, 2);
461-
462- prefswindow->table2 = gtk_table_new(1, 2, FALSE);
463- gtk_widget_show(prefswindow->table2);
464- gtk_container_add(GTK_CONTAINER(prefswindow->frame), prefswindow->table2);
465-
466- prefswindow->labelframe = gtk_frame_new(NULL);
467- gtk_widget_show(prefswindow->labelframe);
468- gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->labelframe), GTK_SHADOW_OUT);
469- gtk_table_attach(GTK_TABLE(prefswindow->table2), prefswindow->labelframe, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 1, 1);
470-
471- prefswindow->pagelabel = gtk_label_new("");
472- gtk_widget_show(prefswindow->pagelabel);
473- gtk_label_set_justify(GTK_LABEL(prefswindow->pagelabel), GTK_JUSTIFY_LEFT);
474- gtk_misc_set_alignment(GTK_MISC(prefswindow->pagelabel), 0, 0.0);
475- gtk_container_add(GTK_CONTAINER(prefswindow->labelframe), prefswindow->pagelabel);
476+ if (col_count > 1)
477+ {
478+ prefswindow->scrolledwindow1 = gtk_scrolled_window_new(NULL, NULL);
479+ gtk_widget_show(prefswindow->scrolledwindow1);
480+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
481+ gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->scrolledwindow1, 0, 1, 0, 1, GTK_FILL, GTK_FILL | GTK_EXPAND, 2, 2);
482+
483+ prefswindow->tree_view = prefswindow_tree_view_create(prefswindow);
484+ gtk_widget_show(prefswindow->tree_view);
485+ gtk_container_add(GTK_CONTAINER(prefswindow->scrolledwindow1),
486+ prefswindow->tree_view);
487+
488+ prefswindow->frame = gtk_frame_new(NULL);
489+ gtk_widget_show(prefswindow->frame);
490+ gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->frame), GTK_SHADOW_IN);
491+ gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->frame, col_count - 1, col_count, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 2, 2);
492+
493+ prefswindow->table2 = gtk_table_new(1, 2, FALSE);
494+ gtk_widget_show(prefswindow->table2);
495+ gtk_container_add(GTK_CONTAINER(prefswindow->frame), prefswindow->table2);
496+ }
497+ else
498+ {
499+ prefswindow->table2 = gtk_table_new(1, 2, FALSE);
500+ gtk_widget_show(prefswindow->table2);
501+ gtk_table_attach(GTK_TABLE(prefswindow->table1), prefswindow->table2, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 2, 2);
502+ }
503+
504+
505+ if (col_count > 1)
506+ {
507+ prefswindow->labelframe = gtk_frame_new(NULL);
508+ gtk_widget_show(prefswindow->labelframe);
509+ gtk_frame_set_shadow_type(GTK_FRAME(prefswindow->labelframe), GTK_SHADOW_OUT);
510+ gtk_table_attach(GTK_TABLE(prefswindow->table2), prefswindow->labelframe, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 1, 1);
511+
512+ prefswindow->pagelabel = gtk_label_new("");
513+ gtk_widget_show(prefswindow->pagelabel);
514+ gtk_label_set_justify(GTK_LABEL(prefswindow->pagelabel), GTK_JUSTIFY_LEFT);
515+ gtk_misc_set_alignment(GTK_MISC(prefswindow->pagelabel), 0, 0.0);
516+ gtk_container_add(GTK_CONTAINER(prefswindow->labelframe), prefswindow->pagelabel);
517+ }
518
519 prefswindow->scrolledwindow2 = gtk_scrolled_window_new(NULL, NULL);
520 gtk_widget_show(prefswindow->scrolledwindow2);
521@@ -411,9 +428,38 @@
522 gtk_widget_show(prefswindow->empty_page);
523 gtk_container_add(GTK_CONTAINER(prefswindow->notebook), prefswindow->empty_page);
524
525- prefswindow_build_tree(prefswindow->tree_view, prefs_pages);
526+ if (col_count > 1)
527+ {
528+ prefswindow_build_tree(prefswindow->tree_view, prefs_pages);
529+
530+ gtk_widget_grab_focus(prefswindow->tree_view);
531+ }
532+ else
533+ {
534+ PrefsPage * page = prefs_pages->data;
535+ gint pagenum;
536+ GtkAdjustment *adj;
537+
538+ if (!page->page_open)
539+ {
540+ page->create_widget(page,
541+ GTK_WINDOW(prefswindow->window),
542+ prefswindow->data);
543+ gtk_container_add(GTK_CONTAINER(prefswindow->notebook),
544+ page->widget);
545+ page->page_open = TRUE;
546+ }
547+
548+ pagenum = gtk_notebook_page_num(GTK_NOTEBOOK(prefswindow->notebook),
549+ page->widget);
550+ gtk_notebook_set_current_page(GTK_NOTEBOOK(prefswindow->notebook),
551+ pagenum);
552
553- gtk_widget_grab_focus(prefswindow->tree_view);
554+ adj = gtk_scrolled_window_get_vadjustment(
555+ GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
556+ gtk_adjustment_set_value(adj, 0);
557+
558+ }
559
560 gtkut_stock_button_set_create(&prefswindow->confirm_area,
561 &prefswindow->apply_btn, GTK_STOCK_APPLY,
562@@ -440,28 +486,6 @@
563 G_CALLBACK(prefswindow_key_pressed), &(prefswindow->window));
564 #endif
565
566- /* connect to callback only if we hhave non-NULL pointers to store size to */
567- if (prefswindow->save_width && prefswindow->save_height) {
568- g_signal_connect(G_OBJECT(prefswindow->window), "size_allocate",
569- G_CALLBACK(prefs_size_allocate_cb), prefswindow);
570- }
571-
572- if (!geometry.min_height) {
573-
574- if (x < 800 && y < 600) {
575- geometry.min_width = 600;
576- geometry.min_height = 440;
577- } else {
578- geometry.min_width = 700;
579- geometry.min_height = 550;
580- }
581- }
582- gtk_window_set_geometry_hints(GTK_WINDOW(prefswindow->window), NULL, &geometry,
583- GDK_HINT_MIN_SIZE);
584- if (prefswindow->save_width && prefswindow->save_height) {
585- gtk_widget_set_size_request(prefswindow->window, *(prefswindow->save_width),
586- *(prefswindow->save_height));
587- }
588
589 gtk_widget_show(prefswindow->window);
590 #ifdef MAEMO
591Index: claws-mail-2.9.1/src/compose.c
592===================================================================
593--- claws-mail-2.9.1.orig/src/compose.c 2007-04-25 07:40:10.000000000 +0100
594+++ claws-mail-2.9.1/src/compose.c 2007-04-25 10:18:13.000000000 +0100
595@@ -352,9 +352,6 @@
596
597 /* callback functions */
598
599-static gboolean compose_edit_size_alloc (GtkEditable *widget,
600- GtkAllocation *allocation,
601- GtkSHRuler *shruler);
602 static void account_activated (GtkComboBox *optmenu,
603 gpointer data);
604 static void attach_selected (GtkTreeView *tree_view,
605@@ -439,9 +436,6 @@
606 guint action,
607 GtkWidget *widget);
608
609-static void compose_toggle_ruler_cb (gpointer data,
610- guint action,
611- GtkWidget *widget);
612 static void compose_toggle_sign_cb (gpointer data,
613 guint action,
614 GtkWidget *widget);
615@@ -788,7 +782,6 @@
616 ENC_ACTION(C_WINDOWS_874)},
617
618 {N_("/_Tools"), NULL, NULL, 0, "<Branch>"},
619- {N_("/_Tools/Show _ruler"), NULL, compose_toggle_ruler_cb, 0, "<ToggleItem>"},
620 {N_("/_Tools/_Address book"), "<shift><control>A", compose_address_cb , 0, NULL},
621 {N_("/_Tools/_Template"), NULL, NULL, 0, "<Branch>"},
622 {N_("/_Tools/Actio_ns"), NULL, NULL, 0, "<Branch>"},
623@@ -2067,7 +2060,6 @@
624 menu_set_sensitive(ifactory, "/Message/Insert signature", FALSE);
625 menu_set_sensitive(ifactory, "/Edit", FALSE);
626 menu_set_sensitive(ifactory, "/Options", FALSE);
627- menu_set_sensitive(ifactory, "/Tools/Show ruler", FALSE);
628 menu_set_sensitive(ifactory, "/Tools/Actions", FALSE);
629
630 if (compose->toolbar->draft_btn)
631@@ -5684,7 +5676,7 @@
632 g_signal_connect(G_OBJECT(GTK_COMBO(combo)->entry), "grab_focus",
633 G_CALLBACK(compose_grab_focus_cb), compose);
634 gtk_widget_show(combo);
635- gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1, compose->header_nextrow, compose->header_nextrow+1, GTK_SHRINK, GTK_FILL, 0, 0);
636+ gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1, compose->header_nextrow, compose->header_nextrow+1, GTK_FILL, GTK_FILL, 0, 0);
637 if (compose->header_last) {
638 const gchar *last_header_entry = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry));
639 string = headers;
640@@ -5778,7 +5770,7 @@
641
642 static GtkWidget *compose_create_header(Compose *compose)
643 {
644- GtkWidget *from_optmenu_hbox;
645+ GtkWidget *from_optmenu;
646 GtkWidget *header_scrolledwin;
647 GtkWidget *header_table;
648
649@@ -5788,18 +5780,20 @@
650 header_scrolledwin = gtk_scrolled_window_new(NULL, NULL);
651 gtk_widget_show(header_scrolledwin);
652 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(header_scrolledwin), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
653-
654 header_table = gtk_table_new(2, 2, FALSE);
655+ gtk_table_set_col_spacings (GTK_TABLE (header_table), BORDER_WIDTH);
656 gtk_widget_show(header_table);
657 gtk_container_set_border_width(GTK_CONTAINER(header_table), BORDER_WIDTH);
658 gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(header_scrolledwin), header_table);
659- gtk_viewport_set_shadow_type(GTK_VIEWPORT(GTK_BIN(header_scrolledwin)->child), GTK_SHADOW_ETCHED_IN);
660+ gtk_viewport_set_shadow_type(GTK_VIEWPORT(GTK_BIN(header_scrolledwin)->child), GTK_SHADOW_NONE);
661 count = 0;
662
663 /* option menu for selecting accounts */
664- from_optmenu_hbox = compose_account_option_menu_create(compose);
665- gtk_table_attach(GTK_TABLE(header_table), from_optmenu_hbox,
666- 0, 2, count, count + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
667+ from_optmenu = compose_account_option_menu_create(compose);
668+ gtk_table_attach(GTK_TABLE(header_table), from_optmenu,
669+ 0, 1, count, count + 1, GTK_FILL, GTK_FILL, 0, 0);
670+ gtk_table_attach(GTK_TABLE(header_table), compose->from_name,
671+ 1, 2, count, count + 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
672 count++;
673
674 compose->header_table = header_table;
675@@ -6140,15 +6134,12 @@
676 GtkWidget *vbox2;
677
678 GtkWidget *label;
679- GtkWidget *subject_hbox;
680- GtkWidget *subject_frame;
681+ GtkWidget *edit_frame;
682 GtkWidget *subject_entry;
683 GtkWidget *subject;
684 GtkWidget *paned;
685
686 GtkWidget *edit_vbox;
687- GtkWidget *ruler_hbox;
688- GtkWidget *ruler;
689 GtkWidget *scrolledwin;
690 GtkWidget *text;
691 GtkTextBuffer *buffer;
692@@ -6169,8 +6160,6 @@
693 GtkAspell * gtkaspell = NULL;
694 #endif
695
696- static GdkGeometry geometry;
697-
698 g_return_val_if_fail(account != NULL, NULL);
699
700 debug_print("Creating compose window...\n");
701@@ -6190,28 +6179,6 @@
702
703 window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "compose");
704
705- gtk_window_set_resizable(GTK_WINDOW(window), TRUE);
706- gtk_widget_set_size_request(window, -1, prefs_common.compose_height);
707-
708- if (!geometry.max_width) {
709- geometry.max_width = gdk_screen_width();
710- geometry.max_height = gdk_screen_height();
711- }
712-
713- gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
714- &geometry, GDK_HINT_MAX_SIZE);
715- if (!geometry.min_width) {
716- geometry.min_width = 600;
717- geometry.min_height = 480;
718- }
719- gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
720- &geometry, GDK_HINT_MIN_SIZE);
721-
722-#ifndef MAEMO
723- if (compose_force_window_origin)
724- gtk_widget_set_uposition(window, prefs_common.compose_x,
725- prefs_common.compose_y);
726-#endif
727 g_signal_connect(G_OBJECT(window), "delete_event",
728 G_CALLBACK(compose_delete_cb), compose);
729 MANAGE_WINDOW_SIGNALS_CONNECT(window);
730@@ -6227,11 +6194,7 @@
731 n_menu_entries, "<Compose>", compose);
732 gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
733
734- if (prefs_common.toolbar_detachable) {
735- handlebox = gtk_handle_box_new();
736- } else {
737- handlebox = gtk_hbox_new(FALSE, 0);
738- }
739+ handlebox = gtk_hbox_new(FALSE, 0);
740 gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
741
742 gtk_widget_realize(handlebox);
743@@ -6244,7 +6207,6 @@
744
745 /* Notebook */
746 notebook = gtk_notebook_new();
747- gtk_widget_set_size_request(notebook, -1, 130);
748 gtk_widget_show(notebook);
749
750 /* header labels and entries */
751@@ -6258,18 +6220,10 @@
752 /* Others Tab */
753 gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
754 compose_create_others(compose),
755- gtk_label_new_with_mnemonic(_("Othe_rs")));
756+ gtk_label_new_with_mnemonic(_("Othe_r")));
757
758 /* Subject */
759- subject_hbox = gtk_hbox_new(FALSE, 0);
760- gtk_widget_show(subject_hbox);
761-
762- subject_frame = gtk_frame_new(NULL);
763- gtk_frame_set_shadow_type(GTK_FRAME(subject_frame), GTK_SHADOW_NONE);
764- gtk_box_pack_start(GTK_BOX(subject_hbox), subject_frame, TRUE, TRUE, 0);
765- gtk_widget_show(subject_frame);
766-
767- subject = gtk_hbox_new(FALSE, HSPACING_NARROW);
768+ subject = gtk_hbox_new(FALSE, BORDER_WIDTH);
769 gtk_container_set_border_width(GTK_CONTAINER(subject), 0);
770 gtk_widget_show(subject);
771
772@@ -6283,20 +6237,16 @@
773 G_CALLBACK(compose_grab_focus_cb), compose);
774 gtk_widget_show(subject_entry);
775 compose->subject_entry = subject_entry;
776- gtk_container_add(GTK_CONTAINER(subject_frame), subject);
777
778- edit_vbox = gtk_vbox_new(FALSE, 0);
779+ edit_vbox = gtk_vbox_new(FALSE, BORDER_WIDTH);
780+ gtk_container_set_border_width(GTK_CONTAINER(edit_vbox), BORDER_WIDTH);
781
782- gtk_box_pack_start(GTK_BOX(edit_vbox), subject_hbox, FALSE, FALSE, 0);
783+ gtk_box_pack_start(GTK_BOX(edit_vbox), subject, FALSE, FALSE, 0);
784
785- /* ruler */
786- ruler_hbox = gtk_hbox_new(FALSE, 0);
787- gtk_box_pack_start(GTK_BOX(edit_vbox), ruler_hbox, FALSE, FALSE, 0);
788-
789- ruler = gtk_shruler_new();
790- gtk_ruler_set_range(GTK_RULER(ruler), 0.0, 100.0, 1.0, 100.0);
791- gtk_box_pack_start(GTK_BOX(ruler_hbox), ruler, TRUE, TRUE,
792- BORDER_WIDTH);
793+ edit_frame = gtk_frame_new(NULL);
794+ gtk_frame_set_shadow_type(GTK_FRAME(edit_frame), GTK_SHADOW_IN);
795+ gtk_widget_show(edit_frame);
796+ gtk_container_add(GTK_CONTAINER(edit_frame), edit_vbox);
797
798 /* text widget */
799 scrolledwin = gtk_scrolled_window_new(NULL, NULL);
800@@ -6317,9 +6267,6 @@
801
802 gtk_container_add(GTK_CONTAINER(scrolledwin), text);
803
804- g_signal_connect_after(G_OBJECT(text), "size_allocate",
805- G_CALLBACK(compose_edit_size_alloc),
806- ruler);
807 g_signal_connect(G_OBJECT(buffer), "changed",
808 G_CALLBACK(compose_changed_cb), compose);
809 g_signal_connect(G_OBJECT(text), "grab_focus",
810@@ -6363,7 +6310,7 @@
811 gtk_widget_set_size_request(edit_vbox, -1, mode == COMPOSE_NEW ? 250 : 230);
812 #endif
813 gtk_paned_add1(GTK_PANED(paned), notebook);
814- gtk_paned_add2(GTK_PANED(paned), edit_vbox);
815+ gtk_paned_add2(GTK_PANED(paned), edit_frame);
816 gtk_widget_show_all(paned);
817
818
819@@ -6408,8 +6355,6 @@
820
821 compose->notebook = notebook;
822 compose->edit_vbox = edit_vbox;
823- compose->ruler_hbox = ruler_hbox;
824- compose->ruler = ruler;
825 compose->scrolledwin = scrolledwin;
826 compose->text = text;
827
828@@ -6531,13 +6476,6 @@
829
830 compose_list = g_list_append(compose_list, compose);
831
832- if (!prefs_common.show_ruler)
833- gtk_widget_hide(ruler_hbox);
834-
835- menuitem = gtk_item_factory_get_item(ifactory, "/Tools/Show ruler");
836- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
837- prefs_common.show_ruler);
838-
839 /* Priority */
840 compose->priority = PRIORITY_NORMAL;
841 compose_update_priority_menu_item(compose);
842@@ -6568,7 +6506,6 @@
843 static GtkWidget *compose_account_option_menu_create(Compose *compose)
844 {
845 GList *accounts;
846- GtkWidget *hbox;
847 GtkWidget *optmenu;
848 GtkWidget *optmenubox;
849 GtkListStore *menu;
850@@ -6584,7 +6521,6 @@
851 optmenu = gtkut_sc_combobox_create(optmenubox, FALSE);
852 menu = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(optmenu)));
853
854- hbox = gtk_hbox_new(FALSE, 6);
855 from_name = gtk_entry_new();
856
857 g_signal_connect_after(G_OBJECT(from_name), "grab_focus",
858@@ -6623,9 +6559,6 @@
859 G_CALLBACK(account_activated),
860 compose);
861
862- gtk_box_pack_start(GTK_BOX(hbox), optmenubox, FALSE, FALSE, 0);
863- gtk_box_pack_start(GTK_BOX(hbox), from_name, TRUE, TRUE, 0);
864-
865 gtk_tooltips_set_tip(compose->tooltips, optmenubox,
866 _("Account to use for this email"), NULL);
867 gtk_tooltips_set_tip(compose->tooltips, from_name,
868@@ -6633,7 +6566,7 @@
869
870 compose->from_name = from_name;
871
872- return hbox;
873+ return optmenubox;
874 }
875
876 static void compose_set_priority_cb(gpointer data,
877@@ -7851,32 +7784,6 @@
878
879 /* callback functions */
880
881-/* compose_edit_size_alloc() - called when resized. don't know whether Gtk
882- * includes "non-client" (windows-izm) in calculation, so this calculation
883- * may not be accurate.
884- */
885-static gboolean compose_edit_size_alloc(GtkEditable *widget,
886- GtkAllocation *allocation,
887- GtkSHRuler *shruler)
888-{
889- if (prefs_common.show_ruler) {
890- gint char_width = 0, char_height = 0;
891- gint line_width_in_chars;
892-
893- gtkut_get_font_size(GTK_WIDGET(widget),
894- &char_width, &char_height);
895- line_width_in_chars =
896- (allocation->width - allocation->x) / char_width;
897-
898- /* got the maximum */
899- gtk_ruler_set_range(GTK_RULER(shruler),
900- 0.0, line_width_in_chars, 0,
901- /*line_width_in_chars*/ char_width);
902- }
903-
904- return TRUE;
905-}
906-
907 static void account_activated(GtkComboBox *optmenu, gpointer data)
908 {
909 Compose *compose = (Compose *)data;
910@@ -9040,21 +8947,6 @@
911 compose_update_privacy_system_menu_item(compose, warn);
912 }
913
914-static void compose_toggle_ruler_cb(gpointer data, guint action,
915- GtkWidget *widget)
916-{
917- Compose *compose = (Compose *)data;
918-
919- if (GTK_CHECK_MENU_ITEM(widget)->active) {
920- gtk_widget_show(compose->ruler_hbox);
921- prefs_common.show_ruler = TRUE;
922- } else {
923- gtk_widget_hide(compose->ruler_hbox);
924- gtk_widget_queue_resize(compose->edit_vbox);
925- prefs_common.show_ruler = FALSE;
926- }
927-}
928-
929 static void compose_attach_drag_received_cb (GtkWidget *widget,
930 GdkDragContext *context,
931 gint x,
932Index: claws-mail-2.9.1/src/folderview.c
933===================================================================
934--- claws-mail-2.9.1.orig/src/folderview.c 2007-04-03 19:10:25.000000000 +0100
935+++ claws-mail-2.9.1/src/folderview.c 2007-04-25 10:28:00.000000000 +0100
936@@ -73,6 +73,11 @@
937 #define COL_FOLDER_WIDTH 150
938 #define COL_NUM_WIDTH 32
939
940+/* added dummy column to stop the last column from
941+ * resizing insanely in small screen view
942+ */
943+#define _N_FOLDER_COLS (N_FOLDER_COLS + 1)
944+
945 static GList *folderview_list = NULL;
946
947 static GtkStyle *normal_style;
948@@ -448,7 +453,7 @@
949 gint *col_pos;
950 FolderColumnState *col_state;
951 FolderColumnType type;
952- gchar *titles[N_FOLDER_COLS];
953+ gchar *titles[_N_FOLDER_COLS];
954 gint i;
955 GtkWidget *scrolledwin = folderview->scrolledwin;
956
957@@ -471,8 +476,9 @@
958 titles[col_pos[F_COL_UNREAD]] = _("Unread");
959 /* TRANSLATORS: This in Number sign in American style */
960 titles[col_pos[F_COL_TOTAL]] = _("#");
961+ titles[F_COL_DUMMY] = "";
962
963- ctree = gtk_sctree_new_with_titles(N_FOLDER_COLS, col_pos[F_COL_FOLDER],
964+ ctree = gtk_sctree_new_with_titles(_N_FOLDER_COLS, col_pos[F_COL_FOLDER],
965 titles);
966
967 gtk_clist_set_selection_mode(GTK_CLIST(ctree), GTK_SELECTION_BROWSE);
968@@ -510,6 +516,9 @@
969 (GTK_CLIST(ctree), i, col_state[i].visible);
970 }
971
972+ GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(ctree)->column[i].button,
973+ GTK_CAN_FOCUS);
974+
975 g_signal_connect(G_OBJECT(ctree), "key_press_event",
976 G_CALLBACK(folderview_key_pressed),
977 folderview);
978@@ -605,9 +614,6 @@
979 (GTK_SCROLLED_WINDOW(scrolledwin),
980 GTK_POLICY_AUTOMATIC,
981 prefs_common.folderview_vscrollbar_policy);
982- gtk_widget_set_size_request(scrolledwin,
983- prefs_common.folderview_width,
984- prefs_common.folderview_height);
985
986 folderview->scrolledwin = scrolledwin;
987 ctree = folderview_ctree_create(folderview);
988@@ -2268,7 +2274,7 @@
989 static void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
990 {
991 GtkCTree *ctree = GTK_CTREE(folderview->ctree);
992- gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
993+ gchar *text[_N_FOLDER_COLS] = {NULL, "0", "0", "0", ""};
994 GtkCTreeNode *node, *parent_node;
995 gint *col_pos = folderview->col_pos;
996 FolderItemUpdateData hookdata;
997Index: claws-mail-2.9.1/src/folderview.h
998===================================================================
999--- claws-mail-2.9.1.orig/src/folderview.h 2007-03-22 17:22:52.000000000 +0000
1000+++ claws-mail-2.9.1/src/folderview.h 2007-04-25 10:16:55.000000000 +0100
1001@@ -37,7 +37,8 @@
1002 F_COL_FOLDER,
1003 F_COL_NEW,
1004 F_COL_UNREAD,
1005- F_COL_TOTAL
1006+ F_COL_TOTAL,
1007+ F_COL_DUMMY
1008 } FolderColumnType;
1009
1010 #define N_FOLDER_COLS 4
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-10-05 10:56:23 +0000