Changeset 1297

Timestamp:

12/04/06 22:06:45

Author:

pvanhoof

Message:

Some fixes

Files:

• trunk/configure.ac (modified) (8 diffs)
• trunk/libtinymailui-gtk/tny-gtk-msg-view.c (modified) (16 diffs)
• trunk/libtinymailui-gtk/tny-gtk-msg-view.h (modified) (2 diffs)

trunk/configure.ac

@@ -256 +256 @@
-
-dnl ### libtinymail, the abstraction library ##
-6
+8
-AC_SUBST(LIBTINYMAIL_CFLAGS)
-AC_SUBST(LIBTINYMAIL_LIBS)
-
-dnl ### libtinymailui, the ui abstraction library ##
-6
+8
-AC_SUBST(LIBTINYMAILUI_CFLAGS)
-AC_SUBST(LIBTINYMAILUI_LIBS)
-
-dnl ### libtinymail-camel, a camel implementation of libtinymail ##
-6
+8
-AC_SUBST(LIBTINYMAIL_CAMEL_CFLAGS)
-AC_SUBST(LIBTINYMAIL_CAMEL_LIBS)
@@ -274 +274 @@
-extragtkpkgs="libgnomeui-2.0 gnome-keyring-1"
-extratnypkgs="gnome-vfs-2.0"
-6
+8
-else
-  LIBTINYMAIL_GNOMEVFS_CFLAGS=
@@ -285 +285 @@
-
-dnl ### libtinymailui-gtk, a gtk+ implementation of libtinymail-ui ##
-6
+8
-AC_SUBST(LIBTINYMAILUI_GTK_CFLAGS)
-AC_SUBST(LIBTINYMAILUI_GTK_LIBS)
@@ -294 +294 @@
-  extraplatpkgs="$mozilla_nspr $mozilla_nss $mozilla_xpcom $mozilla_gtkmozembed"
-  extratnypkgs="$extratnypkgs $extraplatpkgs"
-6
+8
-else
-  LIBTINYMAILUI_MOZEMBED_CFLAGS=
@@ -302 +302 @@
-dnl ### libtinymail-gnome-desktop, a GNOME platform library implementation ##
-if test x$PLATFORMDIR = xlibtinymail-gnome-desktop; then
-6
+8
-else
-  LIBTINYMAIL_GNOME_DESKTOP_CFLAGS=
@@ -348 +348 @@
-dnl ### libtinymail-test, a library for testing purposes ##
-if test x$build_unittests = xtrue; then
-6
+8
-else
-  LIBTINYMAIL_TEST_CFLAGS=
@@ -358 +358 @@
-dnl ### libtinymail-api-test, a library for testing API/ABI compatibility ##
-if test x$build_apitests = xtrue; then
-6
+8
-else
-  LIBTINYMAIL_API_TEST_CFLAGS=
@@ -367 +367 @@
-
-dnl ### tinymail, the demo-ui ##
-6
+8
-AC_SUBST(TINYMAIL_CFLAGS)
-AC_SUBST(TINYMAIL_LIBS)

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

@@ -66 +66 @@
-        GtkWidget *attachview_sw;
-        GList *unattached_views;
-        gboolean display_one_body;
-        gboolean display_html;
-        gboolean display_plain;
@@ -72 +71 @@
-        gboolean display_rfc822;
-        gboolean first_attachment;
-        TnyMimePartView *text_body_viewer;
-        GtkBox *kid; gboolean in_expander;
-};
@@ -86 +84 @@
-
-
-
+, gboolean alternatives
-static void remove_mime_part_viewer (TnyMimePartView *mpview, GtkContainer *mpviewers);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-/**
@@ -155 +141 @@
-}
-
-
-
-/**
- * tny_gtk_msg_view_set_display_one_body:
- * @self: A #TnyGtkMsgView instance
- * @setting: whether or not to display only one text/html or only one text/plain mime part
- *
- * With this setting will the default implementation of #TnyGtkMsgView display
- * only one text/html or only one text/plain mime part. Default value is FALSE.
- *
- * Note that these settings only affect the instance in case an overridden
- * implementation of tny_msg_view_create_mime_part_view_for doesn't handle
- * creating a viewer for a mime part.
- * 
- * So for example in case a more advanced implementation that inherits this
- * type implements viewing a text/html mime part, and will therefore not call
- * this types original tny_msg_view_create_mime_part_view_for method for the
- * mime part anymore, the setting isn't used.
- **/
-void 
-tny_gtk_msg_view_set_display_one_body (TnyGtkMsgView *self, gboolean setting)
-{
-        TnyGtkMsgViewPriv *priv = TNY_GTK_MSG_VIEW_GET_PRIVATE (self);
-        priv->display_one_body = setting;
-        return;
-}
-
-/**
@@ -445 +405 @@
-                                TnyList *list = tny_simple_list_new ();
-
-                                /* if (TNY_IS_MSG (part) && TNY_IS_GTK_MSG_VIEW (mpview))
-                                {
-                                        TnyGtkMsgViewPriv *mppriv = TNY_GTK_MSG_VIEW_GET_PRIVATE (mpview);
-                                        TnyHeader *header = (TnyHeader *) tny_msg_get_header (TNY_MSG (part));
-                                        if (header && TNY_IS_HEADER (header))
-                                        {
-                                                tny_header_view_set_header (mppriv->headerview, header);
-                                                g_object_unref (G_OBJECT (header));
-                                                gtk_widget_show (GTK_WIDGET (mppriv->headerview));
-                                        }
-                                } */
-
-                                tny_mime_part_get_parts (part, list);
-
+, FALSE
-                                g_object_unref (G_OBJECT (list));
-                        } else {
@@ -467 +415 @@
-                        TnyList *list = tny_simple_list_new ();
-                        tny_mime_part_get_parts (part, list);
-
+
+
-                        g_object_unref (G_OBJECT (list));
-
@@ -493 +442 @@
- * This is non-public API documentation
- * 
-
-
-
-
-
+
- *
- * The method will use the tny_msg_view_create_mime_part_view_for on self to get
@@ -509 +454 @@
- * will that list be unreferenced.
- **/
-void
+gboolean
-tny_gtk_msg_view_display_part (TnyMsgView *self, TnyMimePart *part)
-{
@@ -516 +461 @@
-        gboolean doit = TRUE;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        if (mpview) 
@@ -590 +515 @@
-                g_warning (_("I don't have a mime part viewer for %s\n"),
-                        tny_mime_part_get_content_type (part));
+
+                return FALSE;
-        }
-
+        return TRUE;
-}
-
@@ -605 +533 @@
- **/
-static void
-
+, gboolean alternatives
-{
-        TnyIterator *iterator = tny_list_create_iterator (parts);
@@ -612 +540 @@
-        {
-                TnyMimePart *part = (TnyMimePart*)tny_iterator_get_current (iterator);
-
+
+
-                g_object_unref (G_OBJECT (part));
+                if (alternatives && displayed)
+                        break;
-                tny_iterator_next (iterator);
-        }
@@ -668 +599 @@
-        GList *kids = gtk_container_get_children (viewers);
-
-        priv->text_body_viewer = NULL;
-        g_list_foreach (kids, (GFunc)remove_mime_part_viewer, viewers);
-        g_list_free (kids);
@@ -728 +658 @@
-                if (!tny_mime_part_content_type_is (part, "multipart/*"))
-                        tny_gtk_msg_view_display_part (TNY_MSG_VIEW (self), part);
- 
+
-                {
-                        TnyIterator *iterator;
@@ -735 +665 @@
-
-                        tny_mime_part_get_parts (part, list);
-);
-
+, 
+               tny_mime_part_content_type_is (part, "multipart/alternative"));
-                        g_object_unref (G_OBJECT (list));
-                }
@@ -796 +726 @@
-        priv->display_attachments = TRUE;
-        priv->display_rfc822 = TRUE;
-        priv->display_one_body = FALSE;
-        priv->text_body_viewer = NULL;
-        priv->first_attachment = TRUE;
-        priv->unattached_views = NULL;

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

@@ -71 +71 @@
-void tny_gtk_msg_view_set_display_attachments (TnyGtkMsgView *self, gboolean setting);
-void tny_gtk_msg_view_set_display_plain (TnyGtkMsgView *self, gboolean setting);
-void tny_gtk_msg_view_set_display_one_body (TnyGtkMsgView *self, gboolean setting);
-
-gboolean tny_gtk_msg_view_get_display_html (TnyGtkMsgView *self);
@@ -77 +76 @@
-gboolean tny_gtk_msg_view_get_display_attachments (TnyGtkMsgView *self);
-gboolean tny_gtk_msg_view_get_display_plain (TnyGtkMsgView *self);
-gboolean tny_gtk_msg_view_get_display_one_body (TnyGtkMsgView *self);
-
-G_END_DECLS