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