2007-11-10 [colin] 3.0.2cvs130
authorColin Leroy <colin@colino.net>
Sat, 10 Nov 2007 12:42:23 +0000 (12:42 +0000)
committerColin Leroy <colin@colino.net>
Sat, 10 Nov 2007 12:42:23 +0000 (12:42 +0000)
* configure.ac
* src/inc.c
* src/main.c
* src/main.h
* src/mimeview.c
* src/statusbar.c
* src/common/utils.c
* src/etpan/Makefile.am
* src/gtk/filesel.c
* src/gtk/gtkutils.h
* src/gtk/menu.c
* src/plugins/bogofilter/Makefile.am
* src/plugins/clamav/Makefile.am
* src/plugins/dillo_viewer/Makefile.am
* src/plugins/pgpcore/Makefile.am
* src/plugins/spamassassin/Makefile.am
* src/plugins/trayicon/Makefile.am
Fixes (mainly preprocessor foo) for Maemo 4.0 (Chinook)

19 files changed:
ChangeLog
PATCHSETS
configure.ac
src/common/utils.c
src/etpan/Makefile.am
src/gtk/filesel.c
src/gtk/gtkutils.h
src/gtk/menu.c
src/inc.c
src/main.c
src/main.h
src/mimeview.c
src/plugins/bogofilter/Makefile.am
src/plugins/clamav/Makefile.am
src/plugins/dillo_viewer/Makefile.am
src/plugins/pgpcore/Makefile.am
src/plugins/spamassassin/Makefile.am
src/plugins/trayicon/Makefile.am
src/statusbar.c

index af7efdd..79dda6a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2007-11-10 [colin]     3.0.2cvs130
+
+       * configure.ac
+       * src/inc.c
+       * src/main.c
+       * src/main.h
+       * src/mimeview.c
+       * src/statusbar.c
+       * src/common/utils.c
+       * src/etpan/Makefile.am
+       * src/gtk/filesel.c
+       * src/gtk/gtkutils.h
+       * src/gtk/menu.c
+       * src/plugins/bogofilter/Makefile.am
+       * src/plugins/clamav/Makefile.am
+       * src/plugins/dillo_viewer/Makefile.am
+       * src/plugins/pgpcore/Makefile.am
+       * src/plugins/spamassassin/Makefile.am
+       * src/plugins/trayicon/Makefile.am
+               Fixes (mainly preprocessor foo) for Maemo 4.0 (Chinook)
+
 2007-11-09 [colin]     3.0.2cvs129
 
        * src/addressbook.c
index d7c8d79..e3af9eb 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.96.2.191 -r 1.96.2.192 src/textview.c;  ) > 3.0.2cvs127.patchset
 ( cvs diff -u -r 1.61.2.75 -r 1.61.2.76 src/account.c;  cvs diff -u -r 1.382.2.419 -r 1.382.2.420 src/compose.c;  cvs diff -u -r 1.94.2.162 -r 1.94.2.163 src/messageview.c;  cvs diff -u -r 1.105.2.115 -r 1.105.2.116 src/prefs_account.c;  cvs diff -u -r 1.49.2.34 -r 1.49.2.35 src/prefs_account.h;  ) > 3.0.2cvs128.patchset
 ( cvs diff -u -r 1.60.2.104 -r 1.60.2.105 src/addressbook.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/ldapupdate.c;  ) > 3.0.2cvs129.patchset
+( cvs diff -u -r 1.654.2.3099 -r 1.654.2.3100 configure.ac;  cvs diff -u -r 1.149.2.84 -r 1.149.2.85 src/inc.c;  cvs diff -u -r 1.115.2.174 -r 1.115.2.175 src/main.c;  cvs diff -u -r 1.7.2.14 -r 1.7.2.15 src/main.h;  cvs diff -u -r 1.83.2.122 -r 1.83.2.123 src/mimeview.c;  cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/statusbar.c;  cvs diff -u -r 1.36.2.122 -r 1.36.2.123 src/common/utils.c;  cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/etpan/Makefile.am;  cvs diff -u -r 1.2.2.35 -r 1.2.2.36 src/gtk/filesel.c;  cvs diff -u -r 1.4.2.39 -r 1.4.2.40 src/gtk/gtkutils.h;  cvs diff -u -r 1.5.2.26 -r 1.5.2.27 src/gtk/menu.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/bogofilter/Makefile.am;  cvs diff -u -r 1.4.2.8 -r 1.4.2.9 src/plugins/clamav/Makefile.am;  cvs diff -u -r 1.4.2.6 -r 1.4.2.7 src/plugins/dillo_viewer/Makefile.am;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/pgpcore/Makefile.am;  cvs diff -u -r 1.5.2.7 -r 1.5.2.8 src/plugins/spamassassin/Makefile.am;  cvs diff -u -r 1.4.2.9 -r 1.4.2.10 src/plugins/trayicon/Makefile.am;  ) > 3.0.2cvs130.patchset
index e86fb11..a9903ac 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=129
+EXTRA_VERSION=130
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -492,7 +492,17 @@ if test $ac_cv_enable_maemo = yes; then
        AC_SUBST(MAEMO_CFLAGS)
        AC_SUBST(MAEMO_LIBS)
        if test $ac_cv_enable_maemo = no; then
-               AC_MSG_ERROR(libosso, hildon-libs or hildon-fm not found)
+               #test for chinook
+               PKG_CHECK_MODULES(MAEMO, libosso hildon-1 hildon-fm-2 gnome-vfs-2.0, ac_cv_enable_maemo=yes,
+                         ac_cv_enable_maemo=no)
+               AC_SUBST(MAEMO_CFLAGS)
+               AC_SUBST(MAEMO_LIBS)
+               if test $ac_cv_enable_maemo = no; then
+                       AC_MSG_ERROR(one of libosso hildon-libs hildon-fm hildon-1 hildon-fm-2 not found)
+               else
+                       AC_DEFINE(MAEMO, 1, Build for maemo)
+                       AC_DEFINE(CHINOOK, 1, Maemo chinook)
+               fi
        else
                AC_DEFINE(MAEMO, 1, Build for maemo)
        fi
index 46d88d1..41eebf0 100644 (file)
 
 #ifdef MAEMO
 #include <libosso.h>
-#include <osso-browser-interface.h>
+#ifdef CHINOOK
+# include <tablet-browser-interface.h>
+#else
+# include <osso-browser-interface.h>
+#endif
 #endif
 
 #include "utils.h"
index c587cfb..5b21cb1 100644 (file)
@@ -22,9 +22,11 @@ INCLUDES = \
 
 AM_CPPFLAGS = \
        $(GTK_CFLAGS) \
-       $(LIBETPAN_CFLAGS) 
+       $(LIBETPAN_CFLAGS) \
+       $(MAEMO_CFLAGS)
 
 libclawsetpan_la_LIBADD = \
        ../common/libclawscommon.la \
        $(GTK_LIBS) \
-       $(LIBETPAN_LIBS)
+       $(LIBETPAN_LIBS) \
+       $(MAEMO_LIBS)
index 6759b6f..f50effa 100644 (file)
 #include <gtk/gtkfilechooserdialog.h>
 
 #ifdef MAEMO
+#ifdef CHINOOK
+#include <hildon/hildon-file-chooser-dialog.h>
+#else
 #include <hildon-widgets/hildon-file-chooser-dialog.h>
 #endif
+#endif
 
 #include "claws.h"
 #include "filesel.h"
index a782806..1a0324a 100644 (file)
 #endif
 
 #ifdef MAEMO
+#ifdef CHINOOK
+#include <hildon/hildon-program.h>
+#else
 #include <hildon-widgets/hildon-program.h>
 #include <hildon-widgets/hildon-window.h>
+#endif
 #include "main.h"
 #include <gtk/gtkmain.h>
 #endif
index 0791115..5f67231 100644 (file)
 #include "utils.h"
 
 #ifdef MAEMO
+#ifdef CHINOOK
+#include <hildon/hildon-program.h>
+#else
 #include <hildon-widgets/hildon-program.h>
+#endif
 #include <gtk/gtkmain.h>
 #endif
 
index 869afd9..c87976a 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
 #include "hooks.h"
 
 #ifdef MAEMO
+#ifdef CHINOOK
+#include <hildon/hildon-banner.h>
+#include <hildon/hildon-sound.h>
+#else
 #include <hildon-widgets/hildon-banner.h>
 #include <hildon-widgets/hildon-system-sound.h>
+#endif
 #include <libosso.h>
 
 #ifdef CONIC
index b926360..86bd124 100644 (file)
 #include "timing.h"
 
 #ifdef MAEMO
+#ifdef CHINOOK
+#include <hildon/hildon-banner.h>
+#include <hildon/hildon-program.h>
+#else
 #include <hildon-widgets/hildon-banner.h>
 #include <hildon-widgets/hildon-program.h>
+#endif
 #include <gtk/gtkmain.h>
 #include <libosso.h>
 #include <libgnomevfs/gnome-vfs-volume.h>
@@ -1064,6 +1069,7 @@ int main(int argc, char *argv[])
                return OSSO_ERROR;
        }
 
+#ifndef CHINOOK
        /* Add handler for Exit D-BUS messages */
        result = osso_application_set_exit_cb(appdata->osso_context,
                                                exit_event_handler,
@@ -1071,6 +1077,7 @@ int main(int argc, char *argv[])
        if (result != OSSO_OK) {
                return OSSO_ERROR;
        }
+#endif
 #endif
        manage_window_focus_in(mainwin->window, NULL, NULL);
        folderview = mainwin->folderview;
index a23bf91..c0909ca 100644 (file)
 #include <glib.h>
 #include <gtk/gtkwidget.h>
 #ifdef MAEMO
+#ifdef CHINOOK
+#include <hildon/hildon-program.h>
+#else
 #include <hildon-widgets/hildon-program.h>
 #include <hildon-widgets/hildon-window.h>
 #endif
+#endif
 
 extern gchar *prog_version;
 extern gboolean debug_mode;
index 35aa0cc..f79315e 100644 (file)
 #include "timing.h"
 
 #ifdef MAEMO
-//#include <hildon-widgets/hildon-program.h>
-//#include <gtk/gtkmain.h>
 #include <libosso.h>
+#ifndef CHINOOK
 #include <osso-mime.h>
+#else
+#include <hildon-mime.h>
+#endif
 #endif
 
 typedef enum
@@ -1821,7 +1823,11 @@ static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboo
        if (content_type != NULL) {
                uri = g_strconcat ("file://", filename, NULL);
                dbusconn = osso_get_dbus_connection (get_osso_context());
+#ifdef CHINOOK
+               r = hildon_mime_open_file_with_mime_type (dbusconn, uri, content_type);
+#else
                r = osso_mime_open_file_with_mime_type (dbusconn, uri, content_type);
+#endif
                g_free(uri);
        }
        if (r != 1) {
index c16d4e3..32e2092 100644 (file)
@@ -16,7 +16,8 @@ cygwin_export_lib =
 endif
 bogofilter_la_LIBADD = $(cygwin_export_lib) \
        $(GTK_LIBS)     \
-       $(OPENSSL_LIBS)
+       $(OPENSSL_LIBS) \
+       $(MAEMO_LIBS)
 
 INCLUDES = \
        -I$(top_srcdir)/src \
@@ -27,4 +28,5 @@ AM_CPPFLAGS = \
        $(ASPELL_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
-       $(OPENSSL_CFLAGS)
+       $(OPENSSL_CFLAGS) \
+       $(MAEMO_CFLAGS)
index 92eb53a..1f8cb31 100644 (file)
@@ -15,7 +15,8 @@ cygwin_export_lib =
 endif
 clamav_plugin_la_LIBADD = $(cygwin_export_lib) \
        $(GTK_LIBS) \
-       $(CLAMAV_LIBS)
+       $(CLAMAV_LIBS) \
+       $(MAEMO_LIBS)
        
 INCLUDES = \
        -I$(top_srcdir)/src \
@@ -25,7 +26,8 @@ INCLUDES = \
 AM_CPPFLAGS = \
        $(ASPELL_CFLAGS) \
        $(GLIB_CFLAGS) \
-       $(GTK_CFLAGS) 
+       $(GTK_CFLAGS) \
+       $(MAEMO_CFLAGS)
 
 EXTRA_DIST = \
        README
index ba2f0b0..9629a1e 100644 (file)
@@ -15,7 +15,8 @@ else
 cygwin_export_lib =
 endif
 dillo_viewer_la_LIBADD = $(cygwin_export_lib) \
-       $(GTK_LIBS)
+       $(GTK_LIBS) \
+       $(MAEMO_LIBS)
 
 INCLUDES = \
        -I$(top_srcdir)/src \
@@ -26,4 +27,5 @@ AM_CPPFLAGS = \
        $(ASPELL_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
-       $(OPENSSL_CFLAGS) 
+       $(OPENSSL_CFLAGS) \
+       $(MAEMO_CFLAGS)
index 05841fa..a96c875 100644 (file)
@@ -67,7 +67,8 @@ pgpcore_la_LDFLAGS = \
 pgpcore_la_DEPENDENCIES = $(plugin_deps)
 pgpcore_la_LIBADD = $(cygwin_export_lib) $(plugin_ldadd) \
         $(GTK_LIBS) \
-       $(GPGME_LIBS)
+       $(GPGME_LIBS) \
+       $(MAEMO_LIBS)
 
 INCLUDES = \
        -I$(top_srcdir)/src \
@@ -79,6 +80,7 @@ AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
        $(GPGME_CFLAGS) \
+       $(MAEMO_CFLAGS) \
        -Wno-deprecated-declarations
 
 clean-local:
index 6bdf63f..335f732 100644 (file)
@@ -18,7 +18,8 @@ cygwin_export_lib =
 endif
 spamassassin_la_LIBADD = $(cygwin_export_lib) \
        $(GTK_LIBS)     \
-       $(OPENSSL_LIBS)
+       $(OPENSSL_LIBS) \
+       $(MAEMO_LIBS)
 
 INCLUDES = \
        -I$(top_srcdir)/src \
@@ -29,7 +30,8 @@ AM_CPPFLAGS = \
        $(ASPELL_CFLAGS) \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
-       $(OPENSSL_CFLAGS)
+       $(OPENSSL_CFLAGS) \
+       $(MAEMO_CFLAGS)
 
 EXTRA_DIST = \
        README
index 99281e9..f46a1f2 100644 (file)
@@ -21,7 +21,8 @@ trayicon_la_LDFLAGS = \
 trayicon_la_LIBADD = libeggtrayicon/libeggtrayicon.la \
        $(cygwin_export_lib) \
        $(GTK_LIBS) \
-       -L/usr/X11R6/lib -lX11
+       -L/usr/X11R6/lib -lX11 \
+       $(MAEMO_LIBS)
 
 INCLUDES = \
        -I$(top_srcdir)/src \
@@ -33,7 +34,8 @@ AM_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        $(GTK_CFLAGS) \
        $(ASPELL_CFLAGS) \
-       $(OPENSSL_CFLAGS) 
+       $(OPENSSL_CFLAGS) \
+       $(MAEMO_CFLAGS)
 
 EXTRA_DIST = \
        README \
index 33e8f06..d902019 100644 (file)
 #include "hooks.h"
 
 #ifdef MAEMO
+#ifdef CHINOOK
+#include <hildon/hildon-banner.h>
+#else
 #include <hildon-widgets/hildon-banner.h>
 #endif
+#endif
 
 
 #define BUFFSIZE 1024