Changeset 3823

Timestamp:

11/21/08 18:01:16

Author:

svillar

Message:

Some misc fixes

Files:

• trunk/ChangeLog (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-default-connection-policy.c (modified) (1 diff)
• trunk/libtinymail-gnomevfs/tny-vfs-stream.c (modified) (2 diffs)
• trunk/libtinymail-maemo/tny-maemo-device.c (modified) (1 diff)
• trunk/libtinymailui-gtkhtml/tny-gtk-html-mime-part-view.c (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2008-11-21  Sergio Villar Senin  <svillar@iglaia.com>
+
+        * libtinymail-camel/tny-camel-default-connection-policy.c: added
+        missing license
+        * libtinymail-gnomevfs/tny-vfs-stream.c: prevent a double free of a
+        file pointer
+        * libtinymail-maemo/tny-maemo-device.c: added missing initialization
+        * libtinymailui-gtkhtml/tny-gtk-html-mime-part-view.c: added missing
+        initialization
+
-2008-11-21  Martin Bonnin  <martinbonnin@gmail.com>
- 
@@ -6 +16 @@
- 
-        * revert last changeset:
-
+   
-
-2008-11-20  Martin Bonnin  <martinbonnin@gmail.com>
-
+
-        * camel operation:
-        adding camel_operation_mute/unmute() and use it to filter the progress

trunk/libtinymail-camel/tny-camel-default-connection-policy.c

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#include <config.h>

trunk/libtinymail-gnomevfs/tny-vfs-stream.c

@@ -247 +247 @@
-        TnyVfsStreamPriv *priv = TNY_VFS_STREAM_GET_PRIVATE (self);
-
-
+ {
-                gnome_vfs_close (priv->handle);
+                priv->handle = NULL;
+        }
-
-        if (!handle)
@@ -289 +291 @@
-        priv->bound_start = 0;
-        priv->bound_end = (~0);
+        priv->position = 0;
-
-        return;

trunk/libtinymail-maemo/tny-maemo-device.c

@@ -140 +140 @@
-tny_maemo_device_instance_init (GTypeInstance *instance, gpointer g_class)
-{
-
+
+
+
+
-}
-

trunk/libtinymailui-gtkhtml/tny-gtk-html-mime-part-view.c

@@ -136 +136 @@
-}
-
-
-
-
-#if 0
-typedef struct {
-        gpointer buffer;
-        GtkHTML *html;
-        GtkHTMLStream *stream;
-        gboolean html_finalized;
-} ImageFetcherInfo;
-
-static void
-html_finalized_notify (ImageFetcherInfo *ifinfo,
-                       GObject *destroyed)
-{
-        ifinfo->html_finalized = TRUE;
-}
-
-static void
-image_fetcher_close (GnomeVFSAsyncHandle *handle,
-                     GnomeVFSResult result,
-                     gpointer data)
-{
-}
-
-static void
-image_fetcher_read (GnomeVFSAsyncHandle *handle,
-                    GnomeVFSResult result,
-                    gpointer buffer,
-                    GnomeVFSFileSize bytes_requested,
-                    GnomeVFSFileSize bytes_read,
-                    ImageFetcherInfo *ifinfo)
-{
-
-        if (ifinfo->html_finalized || result != GNOME_VFS_OK) {
-                gnome_vfs_async_close (handle, (GnomeVFSAsyncCloseCallback) image_fetcher_close, (gpointer) NULL);
-                if (!ifinfo->html_finalized) {
-                        gtk_html_stream_close (ifinfo->stream, GTK_HTML_STREAM_OK);
-                        g_object_weak_unref ((GObject *) ifinfo->html, (GWeakNotify) html_finalized_notify, (gpointer) ifinfo);
-                }
-                g_slice_free1 (128, ifinfo->buffer);
-                g_slice_free (ImageFetcherInfo, ifinfo);
-                return;
-        }
-        gtk_html_stream_write (ifinfo->stream, buffer, bytes_read);
-        gnome_vfs_async_read (handle, ifinfo->buffer, 128, 
-                              (GnomeVFSAsyncReadCallback)image_fetcher_read, ifinfo);
-        return;
-}
-
-static void
-image_fetcher_open (GnomeVFSAsyncHandle *handle,
-                    GnomeVFSResult result,
-                    ImageFetcherInfo *ifinfo)
-{
-        if (!ifinfo->html_finalized && result == GNOME_VFS_OK) {
-                ifinfo->buffer = g_slice_alloc (128);
-                gnome_vfs_async_read (handle, ifinfo->buffer, 128, 
-                                      (GnomeVFSAsyncReadCallback) image_fetcher_read, ifinfo);
-        } else {
-                if (!ifinfo->html_finalized) {
-                        gtk_html_stream_close (ifinfo->stream, GTK_HTML_STREAM_OK);
-                        g_object_weak_unref ((GObject *) ifinfo->html, (GWeakNotify) html_finalized_notify, (gpointer) ifinfo);
-                }
-                g_slice_free (ImageFetcherInfo, ifinfo);
-        }
-}
-
-#endif
-
-static gboolean
-on_url_requested (GtkWidget *widget, const gchar *uri, GtkHTMLStream *stream, TnyMimePartView *self)
@@ -211 +141 @@
-        gboolean result;
-        TnyStream *tny_stream;
-
-#if 0
-        if (g_str_has_prefix (uri, "http:") && TRUE /* TODO: make optional */) {
-                GnomeVFSAsyncHandle *handle;
-                ImageFetcherInfo *ifinfo;
-
-                ifinfo = g_slice_new (ImageFetcherInfo);
-                ifinfo->html_finalized = FALSE;
-                ifinfo->html = (GtkHTML *) self;
-                ifinfo->buffer = NULL;
-                ifinfo->stream = stream;
-                g_object_weak_ref ((GObject *) self, (GWeakNotify) html_finalized_notify, (gpointer) ifinfo);
-                gnome_vfs_async_open (&handle, uri, GNOME_VFS_OPEN_READ,
-                                      GNOME_VFS_PRIORITY_DEFAULT, 
-                                      (GnomeVFSAsyncOpenCallback) image_fetcher_open, ifinfo);
-                return FALSE;
-        }
-#endif
-
-        tny_stream = TNY_STREAM (tny_gtk_html_stream_new (stream));