commit 1569d009b9d9e6351bbe9d0e86baa830c2c78406
parent 75159a963c037dad74569ce353f5cc1f12f3cb03
Author: Ricardo Mones <mones@claws-mail.org>
Date: Sat, 9 Mar 2013 01:20:47 +0000
2013-03-09 [mones] 3.9.0cvs111
* INSTALL
Update required GTK+ version and configure plugin flags
* src/mainwindow.c
* src/summaryview.c
Remove unnecessary checks, newer keysyms are already
included by gtkutils.h if needed
Diffstat:
6 files changed, 81 insertions(+), 36 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+2013-03-09 [mones] 3.9.0cvs111
+
+ * INSTALL
+ Update required GTK+ version and configure plugin flags
+ * src/mainwindow.c
+ * src/summaryview.c
+ Remove unnecessary checks, newer keysyms are already
+ included by gtkutils.h if needed
+
2013-03-08 [paul] 3.9.0cvs110
* configure.ac
diff --git a/INSTALL b/INSTALL
@@ -1,14 +1,14 @@
Installation
============
-This program requires GTK+ 2.10.0 or higher to be compiled.
+This program requires GTK+ 2.16 or higher to be compiled.
Build it
========
-Please make sure that gtk-devel and glib-devel (or similar) packages are
-installed before the compilation (you may also require flex (lex) and bison
-(yacc)).
+If you're using a package-based system, please make sure that gtk-devel
+and glib-devel (or similar) packages are installed before the compilation
+(you may also require flex (lex) and bison (yacc)).
To compile and install, just type:
@@ -29,41 +29,77 @@ only needed if you require the additional functionality
Bogofilter
for Bogofilter plugin support
http://bogofilter.sourceforge.net/
+Bsfilter
+ for Bsfilter plugin support
+ http://sourceforge.jp/projects/bsfilter/
+Canberra (>= 0.6)
+ for some sound features of Notification plugin
+ http://0pointer.de/lennart/projects/libcanberra/
compface
for X-Face support
http://freshmeat.net/projects/compface/
-D-Bus
+Clam AntiVirus daemon
+ for Clamd plugin support
+ http://www.clamav.net/
+D-Bus (>= 0.60)
for interprocess communication support
http://www.freedesktop.org/wiki/Software/dbus
-Dillo (>= 0.7.0)
- for Dillo HTML viewer plugin support
- http://www.dillo.org/
-Enchant (and dictionaries)
+Enchant (and dictionaries) (>= 1.0.0)
for spell-checker support
http://www.abisource.com/enchant/
+GData (>= 0.6.4)
+ for GData plugin support
+ https://live.gnome.org/libgdata/
GnuPG (>= 1.2.1) and GPGME (>= 0.4.5)
for GnuPG and S/MIME plugin support
http://www.gnupg.org/
ftp://ftp.gnupg.org/gcrypt/gpgme/
+GnuTLS (>= 0.4.2)
+ for SSL support
+ http://www.gnu.org/software/gnutls/
+GTK+ WebKit (>= 1.0)
+ for Fancy plugin support
+ http://trac.webkit.org/wiki/WebKitGTK/
+Gs tool
+ for PostScript feature of PDF Viewer plugin
+ http://pages.cs.wisc.edu/~ghost/
+Indicate (>= 0.3.0)
+ for indicator feature of Notification plugin
+ https://launchpad.net/libindicator/
J-Pilot
for J-Pilot support
http://www.jpilot.org/
+LCDproc daemon
+ for lcdproc feature of Notification plugin
+ http://www.lcdproc.org
libEtPan! (>= 0.57)
- for IMAP4 and NNTP support
+ for IMAP4, NNTP and Mailmbox plugin support
http://www.etpan.org
-Network Manager
+Network Manager (>= 0.6.2)
for support for detection of network connection changes
http://www.gnome.org/projects/NetworkManager/
OpenLDAP (>= 2.0.7)
for LDAP support
http://www.openldap.org/
+Perl (>= 5.8.0)
+ for perl plugin support
+ http://www.perl.org/
+Poppler (>= 0.4.2)
+ for PDF Viewer plugin support
+ http://poppler.freedesktop.org/
GnuTLS (>= 0.4.2)
for SSL support
http://www.gnu.org/software/gnutls/
+PyGTK (>= 2.10.3)
+ for Python plugin support
+ http://www.pygtk.org/
+Python
+ for Python plugin support
+ http://python.org/
SpamAssassin
for SpamAssassin plugin support
http://spamassassin.apache.org/
-
+
Options for configure script
============================
Most options are automatically enabled if the dependencies
@@ -80,7 +116,7 @@ are matched.
--disable-jpilot disable JPilot support
--disable-startup-notification disable startup notification support
--disable-valgrind disable valgrind support for debugging
- --enable-crash-dialog enable crash dialog
+ --enable-crash-dialog enable crash dialog
--disable-startup-notification disable startup notification support
--disable-trayicon-plugin do not build System Tray Icon plugin
--disable-spamassassin-plugin do not build SpamAssassin plugin
@@ -88,8 +124,27 @@ are matched.
--disable-pgpmime-plugin do not build PGP/MIME plugin
--disable-pgpinline-plugin do not build PGP/Inline plugin
--disable-smime-plugin do not build S/Mime plugin
- --disable-dillo-viewer-plugin do not build Dillo plugin
- --disable-bogofilter-plugin do not build bogofilter plugin
+ --disable-bogofilter-plugin do not build Bogofilter plugin
+ --disable-address_keeper-plugin do not build Address Keeper plugin
+ --disable-archive-plugin do not build Archive plugin
+ --disable-att_remover-plugin do not build Att Remover plugin
+ --disable-attachwarner-plugin do not build Attachwarner plugin
+ --disable-bsfilter-plugin do not build BSfilter plugin
+ --disable-clamd-plugin do not build Clamd plugin
+ --disable-fancy-plugin do not build Fancy plugin
+ --disable-fetchinfo-plugin do not build Fetchinfo plugin
+ --disable-gdata-plugin do not build GData plugin
+ --disable-mailmbox-plugin do not build MailMbox plugin
+ --disable-newmail-plugin do not build NewMail plugin
+ --disable-notification-plugin do not build Notification plugin
+ --disable-pdf_viewer-plugin do not build PDF Viewer plugin
+ --disable-perl-plugin do not build Perl plugin
+ --disable-python-plugin do not build Python plugin
+ --disable-rssyl-plugin do not build RSSyl plugin
+ --disable-spamassassin-plugin do not build SpamAssassin plugin
+ --disable-spam_report-plugin do not build Spam Report plugin
+ --disable-tnef_parse-plugin do not build TNEF Parse plugin
+ --disable-vcalendar-plugin do not build vCalendar plugin
--disable-manual do not build user manuals
--disable-nls do not use Native Language Support
diff --git a/PATCHSETS b/PATCHSETS
@@ -4608,3 +4608,4 @@
( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/fancy/fancy_prefs.c; ) > 3.9.0cvs108.patchset
( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/fancy/fancy_prefs.c; ) > 3.9.0cvs109.patchset
( cvs diff -u -r 1.654.2.4686 -r 1.654.2.4687 configure.ac; ) > 3.9.0cvs110.patchset
+( cvs diff -u -r 1.29.2.13 -r 1.29.2.14 INSTALL; cvs diff -u -r 1.274.2.366 -r 1.274.2.367 src/mainwindow.c; cvs diff -u -r 1.395.2.462 -r 1.395.2.463 src/summaryview.c; ) > 3.9.0cvs111.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=9
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=110
+EXTRA_VERSION=111
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -1182,11 +1182,7 @@ static void mainwindow_colorlabel_menu_create(MainWindow *mainwin, gboolean refr
accel_path = g_strdup_printf("<ClawsColorLabels>/None");
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
g_free(accel_path);
-#if !GTK_CHECK_VERSION(2, 24, 0)
- gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_0, GDK_CONTROL_MASK);
-#else
gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_KEY_0, GDK_CONTROL_MASK);
-#endif
item = gtk_menu_item_new();
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
gtk_widget_show(item);
@@ -1205,11 +1201,7 @@ static void mainwindow_colorlabel_menu_create(MainWindow *mainwin, gboolean refr
accel_path = g_strdup_printf("<ClawsColorLabels>/%d", i+1);
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
if (i < 9)
-#if !GTK_CHECK_VERSION(2, 24, 0)
- gtk_accel_map_add_entry(accel_path, GDK_1+i, GDK_CONTROL_MASK);
-#else
gtk_accel_map_add_entry(accel_path, GDK_KEY_1+i, GDK_CONTROL_MASK);
-#endif
g_free(accel_path);
g_signal_connect (gtk_ui_manager_get_accel_group(mainwin->ui_manager),
"accel-changed", G_CALLBACK (mainwin_accel_changed_cb), item);
@@ -1314,11 +1306,7 @@ static void mainwindow_tags_menu_create(MainWindow *mainwin, gboolean refresh)
accel_path = g_strdup_printf("<ClawsTags>/ApplyTags");
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
g_free(accel_path);
-#if !GTK_CHECK_VERSION(2, 24, 0)
- gtk_accel_map_add_entry("<ClawsTags>/ApplyTags", GDK_T, GDK_CONTROL_MASK|GDK_SHIFT_MASK);
-#else
gtk_accel_map_add_entry("<ClawsTags>/ApplyTags", GDK_KEY_T, GDK_CONTROL_MASK|GDK_SHIFT_MASK);
-#endif
g_slist_free(orig);
gtk_widget_show(menu);
gtk_menu_item_set_submenu(GTK_MENU_ITEM(label_menuitem), menu);
diff --git a/src/summaryview.c b/src/summaryview.c
@@ -6014,11 +6014,7 @@ static void summary_colorlabel_menu_create(SummaryView *summaryview, gboolean re
accel_path = g_strdup_printf("<ClawsColorLabels>/None");
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
g_free(accel_path);
-#if !GTK_CHECK_VERSION(2, 24, 0)
- gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_0, GDK_CONTROL_MASK);
-#else
gtk_accel_map_add_entry("<ClawsColorLabels>/None", GDK_KEY_0, GDK_CONTROL_MASK);
-#endif
item = gtk_menu_item_new();
gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
@@ -6038,11 +6034,7 @@ static void summary_colorlabel_menu_create(SummaryView *summaryview, gboolean re
accel_path = g_strdup_printf("<ClawsColorLabels>/%d", i+1);
gtk_menu_item_set_accel_path(GTK_MENU_ITEM(item), accel_path);
if (i < 9)
-#if !GTK_CHECK_VERSION(2, 24, 0)
- gtk_accel_map_add_entry(accel_path, GDK_1+i, GDK_CONTROL_MASK);
-#else
gtk_accel_map_add_entry(accel_path, GDK_KEY_1+i, GDK_CONTROL_MASK);
-#endif
g_free(accel_path);
g_signal_connect (gtk_ui_manager_get_accel_group(mainwindow_get_mainwindow()->ui_manager),
"accel-changed", G_CALLBACK (mainwin_accel_changed_cb), item);
