Changeset 1171

Timestamp:

11/16/06 01:50:21

Author:

pvanhoof

Message:

Fixed no-img mode

Files:

• trunk/configure.ac (modified) (1 diff)
• trunk/libtinymail-gnome-desktop/tny-gnome-platform-factory.c (modified) (1 diff)
• trunk/libtinymailui-mozembed/Makefile.am (modified) (2 diffs)
• trunk/libtinymailui-mozembed/tny-moz-embed-html-mime-part-view.c (modified) (7 diffs)
• trunk/libtinymailui-mozembed/tny-moz-embed-msg-view.c (modified) (3 diffs)
• trunk/libtinymailui-mozembed/tny-moz-embed-stream.c (modified) (5 diffs)

trunk/configure.ac

@@ -47 +47 @@
-
-AC_PROG_CC
+AC_PROG_CXX
-AM_PROG_CC_STDC
-AC_HEADER_STDC

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

@@ -60 +60 @@
-{
-        TnyMsgView *retval;
-
+
-#ifdef MOZEMBED
-        retval = tny_moz_embed_msg_view_new ();

trunk/libtinymailui-mozembed/Makefile.am

@@ -1 @@
-           
-  
-      
-    
- 
+
+
+
+
+
-        -I$(top_srcdir)/libtinymail-camel
-
@@ -12 +12 @@
-lib_LTLIBRARIES = libtinymailui-mozembed-1.0.la
-
-           
-               
-    
+
+
+ 
-        tny-moz-embed-stream.h
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-libtinymailui_mozembed_1_0_la_LIBADD =  \

trunk/libtinymailui-mozembed/tny-moz-embed-html-mime-part-view.c

@@ -1 @@
-gtk
+mozembed
- * Copyright (C) 2006-2007 Philip Van Hoof <pvanhoof@gnome.org>
- *
@@ -20 +20 @@
- 
-#include <config.h>
-
-#include <glib/gi18n-lib.h>
+
+#include "mozilla-preferences.h"
-
-#include <unistd.h>
@@ -44 +45 @@
-#endif
-
-
-static GObjectClass *parent_class = NULL;
-
@@ -124 +124 @@
-}
-
-static guint amount_of_instances = 0;
-
-static void
-tny_moz_embed_html_mime_part_view_instance_init (GTypeInstance *instance, gpointer g_class)
@@ -131 +129 @@
-        TnyMozEmbedHtmlMimePartView *self  = (TnyMozEmbedHtmlMimePartView*) instance;
-        TnyMozEmbedHtmlMimePartViewPriv *priv = TNY_MOZ_EMBED_HTML_MIME_PART_VIEW_GET_PRIVATE (self);
-
-        gtk_moz_embed_push_startup ();
-
-        amount_of_instances++;
-        
-        gtk_moz_embed_set_chrome_mask (GTK_MOZ_EMBED (self), 
@@ -157 +151 @@
-                g_object_unref (G_OBJECT (priv->part));
-
-        if (amount_of_instances > 0)
-                amount_of_instances--;
-        
-        /* if (amount_of_instances == 0)
-                gtk_moz_embed_pop_startup (); */
-
-        (*parent_class->finalize) (object);
-
@@ -191 +179 @@
-
-        g_type_class_add_private (object_class, sizeof (TnyMozEmbedHtmlMimePartViewPriv));
+
+        gtk_moz_embed_push_startup ();
+
+        mozilla_preference_set_int ("permissions.default.image", 2);
+        mozilla_preference_set_int ("permissions.default.script", 2);
+        mozilla_preference_set_boolean ("security.checkloaduri", FALSE);
+        mozilla_preference_set ("general.useragent.misc", "Tinymail/" VERSION);
+        mozilla_preference_set ("network.proxy.no_proxies_on", "localhost");
+
-
-        return;

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

@@ -1 @@
-gtk
+mozembed
- * Copyright (C) 2006-2007 Philip Van Hoof <pvanhoof@gnome.org>
- *
@@ -27 +27 @@
-static GObjectClass *parent_class = NULL;
-
-
-/**
- * tny_moz_embed_msg_view_new:
@@ -37 +36 @@
-{
-        TnyMozEmbedMsgView *self = g_object_new (TNY_TYPE_MOZ_EMBED_MSG_VIEW, NULL);
-
+
-        return TNY_MSG_VIEW (self);
-}

trunk/libtinymailui-mozembed/tny-moz-embed-stream.c

@@ -1 @@
-gtk
+mozembed
- * Copyright (C) 2006-2007 Philip Van Hoof <pvanhoof@gnome.org>
- *
@@ -88 +88 @@
-        return 0;
-}
+
+#ifdef NO_MOZ_PREFS
-
-/* Ad-Hoc tag commenter */
@@ -160 +162 @@
-}
-
+#endif
+
-static ssize_t
-tny_moz_embed_stream_write (TnyStream *self, const char *data, size_t n)
@@ -167 +171 @@
-        if (priv->embed)
-        {
+#ifdef NO_MOZ_PREFS
-                size_t tn = 0, nn = 0;
-                gboolean bis_copy = FALSE, ais_copy = FALSE;
@@ -181 +186 @@
-                if (bis_copy)
-                        g_free (nndata);
+#else
+                gtk_moz_embed_append_data (priv->embed, data, n);
+
+#endif
-        }
-        return (ssize_t) n;