Changeset 335

Timestamp:

05/18/06 00:26:20

Author:

pvanhoof

Message:

Huge refactoring

Files:

• trunk/Makefile.am (modified) (1 diff)
• trunk/configure.ac (modified) (4 diffs)
• trunk/libtinymail-gnome-desktop/Makefile.am (modified) (4 diffs)
• trunk/libtinymail-gnome-desktop/tny-platform-factory.c (modified) (2 diffs)
• trunk/libtinymailui-gtk/tny-attach-list-model.c (modified) (1 diff)
• trunk/libtinymailui-gtk/tny-msg-view.c (modified) (3 diffs)
• trunk/libtinymailui-mozembed (modified) (1 prop)
• trunk/libtinymailui-mozembed/.svnignore (added)
• trunk/libtinymailui-mozembed/Makefile.am (added)
• trunk/libtinymailui-mozembed/libtinymailui-mozembed.pc.in (added)
• trunk/libtinymailui-mozembed/tny-moz-embed-msg-view.c (moved) (moved from trunk/libtinymail-gnome-desktop/tny-moz-embed-msg-view.c) (3 diffs)
• trunk/libtinymailui-mozembed/tny-moz-embed-msg-view.h (moved) (moved from trunk/libtinymail-gnome-desktop/tny-moz-embed-msg-view.h)
• trunk/libtinymailui-mozembed/tny-moz-embed-stream.c (moved) (moved from trunk/libtinymail-gnome-desktop/tny-moz-embed-stream.c)
• trunk/libtinymailui-mozembed/tny-moz-embed-stream.h (moved) (moved from trunk/libtinymail-gnome-desktop/tny-moz-embed-stream.h)
• trunk/tinymail/tny-summary-window.c (modified) (1 diff)

trunk/Makefile.am

@@ -5 +5 @@
-PYTINYMAILDIR = tinymail-python
-endif
-
+
+
+
+

trunk/configure.ac

@@ -26 +26 @@
-AC_PROG_LIBTOOL
-
+
-dnl ### Enable gnome features ##
-AC_ARG_ENABLE(gnome,
@@ -35 +36 @@
-esac],[build_gnome=true])
-AM_CONDITIONAL(BUILD_GNOME, test x$build_gnome = xtrue)
+
+dnl ### Enable the gtkmozembed widget ##
+AC_ARG_ENABLE(mozembed,
+[  --enable-mozembed    build using the gtkmozembed widget [default=yes]],
+[case "${enableval}" in
+  yes) build_mozembed=true ;;
+  no)  build_mozembed=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-mozembed) ;;
+esac],[build_mozembed=true])
+AM_CONDITIONAL(BUILD_MOZEMBED, test x$build_mozembed = xtrue)
-
-dnl ### Enable the python language bindings ##
@@ -102 +113 @@
-AC_SUBST(LIBTINYMAILUI_GTK_LIBS)
-
+dnl ### libtinymailui-mozembed, a library that wraps the gtkmozembed widget ##
+if test x$build_mozembed = xtrue; then
+  extraplatpkgs="firefox-nss firefox-xpcom firefox-gtkmozembed"
+  PKG_CHECK_MODULES(LIBTINYMAILUI_MOZEMBED, $extraplatpkgs glib-2.0 >= 2.8 gobject-2.0 gtk+-2.0 $extragtkpkgs)
+else
+  LIBTINYMAILUI_MOZEMBED_CFLAGS=
+  LIBTINYMAILUI_MOZEMBED_LIBS=
+fi
+
-dnl ### libtinymail-gnome-desktop, a GNOME platform library implementation ##
-if test x$PLATFORMDIR = xlibtinymail-gnome-desktop; then
- firefox-nss firefox-xpcom firefox-gtkmozembed
+$extraplatpkgs
-else
-  LIBTINYMAIL_GNOME_DESKTOP_CFLAGS=
@@ -168 +188 @@
-libtinymailui-gtk/Makefile
-libtinymailui-gtk/libtinymailui-gtk.pc
+libtinymailui-mozembed/Makefile
+libtinymailui-mozembed/libtinymailui-mozembed.pc
-libtinymail-gnomevfs/Makefile
-libtinymail-gnomevfs/libtinymail-gnomevfs.pc

trunk/libtinymail-gnome-desktop/Makefile.am

@@ -6 +6 @@
-        -I$(top_srcdir)/libtinymail-camel        \
-        -I$(top_srcdir)/libtinymail-gnomevfs 
+
+if BUILD_MOZEMBED
+INCLUDES += -I$(top_srcdir)/libtinymailui-mozembed -DMOZEMBED
+endif
-
-if BUILD_GNOME
@@ -15 +19 @@
-libtinymail_gnome_desktop_1_0_headers =          \
-        tny-account-store.h                      \
-        tny-moz-embed-msg-view.h                 \
-        tny-moz-embed-stream.h                   \
-        tny-password-dialog.h                    \
-        tny-device.h                             \
@@ -26 +28 @@
-        tny-device-priv.h                        \
-        tny-device.c                             \
-        tny-moz-embed-msg-view.c                 \
-        tny-moz-embed-stream.c                   \
-        tny-password-dialog.c                    \
-        tny-platform-factory.c
@@ -33 +33 @@
-libtinymail_gnome_desktop_1_0_la_LIBADD =       \
-        $(LIBTINYMAIL_GNOME_DESKTOP_LIBS)       \
-
+  
-        $(top_builddir)/libtinymailui/libtinymailui-$(API_VERSION).la \
-        $(top_builddir)/libtinymailui-gtk/libtinymailui-gtk-$(API_VERSION).la
+
+if BUILD_MOZEMBED
+libtinymail_gnome_desktop_1_0_la_LIBADD += $(top_builddir)/libtinymailui-mozembed/libtinymailui-mozembed-$(API_VERSION).la
+endif
-
-libtinymailgnomedesktopincludedir = $(includedir)/libtinymail-gnome-desktop-$(API_VERSION)

trunk/libtinymail-gnome-desktop/tny-platform-factory.c

@@ -27 +27 @@
-
-#include <tny-msg-view-iface.h>
+
+#ifdef MOZEMBED
-#include <tny-moz-embed-msg-view.h>
+#else
+#include <tny-msg-view.h>
+#endif
-
-static GObjectClass *parent_class = NULL;
@@ -53 +58 @@
-tny_platform_factory_new_msg_view (TnyPlatformFactoryIface *self)
-{
+#ifdef MOZEMBED
-        return TNY_MSG_VIEW_IFACE (tny_moz_embed_msg_view_new ());
+#else
+        return TNY_MSG_VIEW_IFACE (tny_msg_view_new ());
+#endif
-}
-

trunk/libtinymailui-gtk/tny-attach-list-model.c

@@ -75 +75 @@
-                tny_msg_mime_part_iface_get_content_type (part), 0, NULL);
-#else
-GTK_STOCK_FILE
+g_strdup (GTK_STOCK_FILE)
-#endif
-

trunk/libtinymailui-gtk/tny-msg-view.c

@@ -25 +25 @@
-#include <tny-vfs-stream.h>
-
+#ifdef GNOME
-#include <libgnomevfs/gnome-vfs.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
+#endif
-
-#include "tny-attach-list-model-priv.h"
@@ -146 +148 @@
-}
-
+/* TODO: Improve this (refactoring) */
+
+#ifdef GNOME
-static GnomeVFSResult
-save_to_file (const gchar *uri, TnyMsgMimePartIface *part)
@@ -167 +172 @@
-        return result;
-}
+#else
+static void
+save_to_file (const gchar *uri, TnyMsgMimePartIface *part)
+{
+        g_print ("UNIMPLEMENTED: save_to_file for non-gnome-vfs platforms\n");
+        return result;
+}
+#endif
-
-static void

trunk/libtinymailui-mozembed/tny-moz-embed-msg-view.c

@@ -25 +25 @@
-#include <tny-vfs-stream.h>
-
+#ifdef GNOME
-#include <libgnomevfs/gnome-vfs.h>
-#include <libgnomevfs/gnome-vfs-utils.h>
+#endif
-
-#include "tny-attach-list-model-priv.h"
@@ -201 +203 @@
-        return;
-}
-
+
+
-static GnomeVFSResult
-save_to_file (const gchar *uri, TnyMsgMimePartIface *part)
@@ -225 +228 @@
-        return result;
-}
+#else
+static void
+save_to_file (const gchar *uri, TnyMsgMimePartIface *part)
+{
+        g_print ("UNIMPLEMENTED: save_to_file for non-gnome-vfs platforms\n");
+        return result;
+}
+#endif
-
-static void

trunk/tinymail/tny-summary-window.c

@@ -37 +37 @@
-
-#include <tny-msg-view-iface.h>
-#include <tny-moz-embed-msg-view.h>
-#include <tny-msg-view.h>
-
-#include <tny-msg-window-iface.h>