Changeset 503

Timestamp:

06/12/06 15:57:38

Author:

pvanhoof

Message:

FC4 backporting

Files:

• trunk/README (modified) (1 diff)
• trunk/configure.ac (modified) (7 diffs)
• trunk/libtinymail-camel/tny-msg-mime-part.c (modified) (1 diff)
• trunk/libtinymail-camel/tny-store-account.c (modified) (1 diff)
• trunk/libtinymailui-gtk/tny-save-strategy.c (modified) (1 diff)
• trunk/po/Makefile.in.in (modified) (2 diffs)

trunk/README

@@ -3 +3 @@
-Required packages on a Ubuntu Breezy (for building from subversion repository)
-gnome-devel, subversion, firefox-dev, libcamel1.2-dev, libnm-glib-0-dev, automake-1.7
+
+Required packages on a Fedora Core 4 & 5 (for building from subversion repository) subversion, gnome-common, evolution-data-server-devel, NetworkManager-devel, NetworkManager-glib, gnome-keyring-devel, automake-1.7. Use --with-html-component=none to disable building any HTML component

trunk/configure.ac

@@ -120 +120 @@
-
-dnl ### libtinymail, the abstraction library ##
-8
+6
-AC_SUBST(LIBTINYMAIL_CFLAGS)
-AC_SUBST(LIBTINYMAIL_LIBS)
-
-dnl ### libtinymailui, the ui abstraction library ##
-8
+6
-AC_SUBST(LIBTINYMAILUI_CFLAGS)
-AC_SUBST(LIBTINYMAILUI_LIBS)
-
-dnl ### libtinymail-camel, a camel implementation of libtinymail ##
-8
+6
-AC_SUBST(LIBTINYMAIL_CAMEL_CFLAGS)
-AC_SUBST(LIBTINYMAIL_CAMEL_LIBS)
@@ -136 +136 @@
-dnl ### libtinymail-gnomevfs, a tnystreamiface for gnome-vfs ##
-if test x$build_gnome = xtrue; then
-libgnomeui-2.0
-gnome-vfs-2.0
-8
+"libgnomeui-2.0 gnome-keyring-1"
+"gnome-vfs-2.0"
+6
-else
-  LIBTINYMAIL_GNOMEVFS_CFLAGS=
@@ -149 +149 @@
-
-dnl ### libtinymailui-gtk, a gtk+ implementation of libtinymail-ui ##
-8
+6
-AC_SUBST(LIBTINYMAILUI_GTK_CFLAGS)
-AC_SUBST(LIBTINYMAILUI_GTK_LIBS)
@@ -157 +157 @@
-  extraplatpkgs="firefox-nspr firefox-nss firefox-xpcom firefox-gtkmozembed"
-  extratnypkgs="$extratnypkgs $extraplatpkgs"
-8
+6
-else
-  LIBTINYMAILUI_MOZEMBED_CFLAGS=
@@ -165 +165 @@
-dnl ### libtinymail-gnome-desktop, a GNOME platform library implementation ##
-if test x$PLATFORMDIR = xlibtinymail-gnome-desktop; then
-$extraplatpkgs libnm_glib glib-2.0 >= 2.8 gobject-2.0 libgnomeui-2.0 gtk+-2.0
+gconf-2.0 $extraplatpkgs libnm_glib glib-2.0 >= 2.6 gobject-2.0 gtk+-2.0 $extragtkpkgs
-else
-  LIBTINYMAIL_GNOME_DESKTOP_CFLAGS=
@@ -178 +178 @@
-dnl ### libtinymail-test, a library for testing purposes ##
-if test x$build_unittests = xtrue; then
-8
+6
-else
-  LIBTINYMAIL_TEST_CFLAGS=
@@ -188 +188 @@
-dnl ### tinymail, the demo-ui ##
-dnl Try to remove the gtk+ and gconf dependency by refactoring to libraries
-8
+6
-AC_SUBST(TINYMAIL_CFLAGS)
-AC_SUBST(TINYMAIL_LIBS)

trunk/libtinymail-camel/tny-msg-mime-part.c

@@ -49 +49 @@
-#include <camel/camel-mime-filter-charset.h>
-#include <camel/camel-mime-filter-windows.h>
-#include <camel/camel-mime-filter-pgp.h>
-
-

trunk/libtinymail-camel/tny-store-account.c

@@ -34 +34 @@
-#include <camel/camel-session.h>
-#include <camel/camel-store.h>
+
+#ifndef CAMEL_FOLDER_TYPE_SENT
+#define CAMEL_FOLDER_TYPE_SENT (5 << 10)
+#endif
-
-

trunk/libtinymailui-gtk/tny-save-strategy.c

@@ -106 +106 @@
-        gboolean destr=FALSE;
-
-
-
+/* 
+ */
-
-        gtk_file_chooser_set_current_folder 

trunk/po/Makefile.in.in

@@ -79 +79 @@
-.po.gmo:
-        file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-c -
+
-
-.po.cat:
@@ -94 +94 @@
-        $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \
-          --add-comments --keyword=_ --keyword=N_ \
-          --flag=g_strdup_printf:1:c-format \
-          --flag=g_string_printf:2:c-format \
-          --flag=g_string_append_printf:2:c-format \
-          --flag=g_error_new:3:c-format \
-          --flag=g_set_error:4:c-format \
-          --flag=g_markup_printf_escaped:1:c-format \
-          --flag=g_log:3:c-format \
-          --flag=g_print:1:c-format \
-          --flag=g_printerr:1:c-format \
-          --flag=g_printf:1:c-format \
-          --flag=g_fprintf:2:c-format \
-          --flag=g_sprintf:2:c-format \
-          --flag=g_snprintf:3:c-format \
-          --flag=g_scanner_error:2:c-format \
-          --flag=g_scanner_warn:2:c-format \
-          --files-from=$(srcdir)/POTFILES.in \
-        && test ! -f $(GETTEXT_PACKAGE).po \