Changeset 3646

Timestamp:

05/06/08 18:36:22

Author:

jdapena

Message:

* libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.[ch]:

Now references to current_folder, old_folder and last_folder
are weak references. This way, when they're finalized we
properly remove the store reference to them.
Removed some small leaks and compilation warnings.
* libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store-priv.h:
Added. Includes internal declarations of weak reference handlers
for folders in the imap store.
* libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-command.c,
libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c:
Use weak references to folders in accesses to store.

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/Makefile.am (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-command.c (modified) (5 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c (modified) (3 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c (modified) (12 diffs)

trunk/ChangeLog

@@ -11 +11 @@
-        Protect PR_Reads and writes to avoid calls to PR_Close before one of
-        them. Should avoid some crashes and bad memory accesses.
+
+        * libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.[ch]:
+        Now references to current_folder, old_folder and last_folder
+        are weak references. This way, when they're finalized we
+        properly remove the store reference to them.
+        Removed some small leaks and compilation warnings.
+
+        * libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store-priv.h:
+        Added. Includes internal declarations of weak reference handlers
+        for folders in the imap store.
+
+        * libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-command.c,
+        libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c:
+        Use weak references to folders in accesses to store.
-
-2008-04-30  Philip Van Hoof <pvanhoof@gnome.org>

trunk/libtinymail-camel/camel-lite/camel/providers/imap/Makefile.am

@@ -34 +34 @@
-        camel-imap-search.h                     \
-        camel-imap-store.h                      \
+        camel-imap-store-priv.h                 \
-        camel-imap-store-summary.h              \
-        camel-imap-summary.h                    \

trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-command.c

@@ -46 +46 @@
-#include "camel-imap-store-summary.h"
-#include "camel-imap-store.h"
+#include "camel-imap-store-priv.h"
-#include "camel-imap-utils.h"
-#include "camel-imap-summary.h"
@@ -136 +137 @@
-                        camel_object_unref(store->current_folder); */
-
-
+ {
-                        store->last_folder = store->current_folder;
-
+
+
+
+
-                        modseq = camel_imap_folder_get_highestmodseq (CAMEL_IMAP_FOLDER (folder));
+                        if (store->last_folder)
+                                camel_object_unhook_event (store->last_folder, "finalize",
+                                                           _camel_imap_store_last_folder_finalize, store);
-                        store->last_folder = NULL;
-                }
-
+
+
+
+
-                store->current_folder = folder;
-
+
+
+
+
-                if (modseq && (store->capabilities & IMAP_CAPABILITY_QRESYNC))
-                {
@@ -286 +299 @@
-                if (!store->current_folder) {
-                        store->current_folder = store->last_folder;
+                        if (store->current_folder)
+                                camel_object_hook_event (store->current_folder, "finalize",
+                                                         _camel_imap_store_current_folder_finalize, store);
-                        wasnull = TRUE;
-                }
-                camel_imap_store_stop_idle (store);
-
-
+
+
+
+
+
+
+
-        }
-
@@ -1284 +1305 @@
-                start = *p ? p + 1 : p;
-        }
-
+
-        g_ptr_array_free (args, TRUE);
-
+
-        return out;
-}
@@ -1295 +1316 @@
-        va_list ap;
-        char *result;
-
+
-        va_start (ap, fmt);
-        result = imap_command_strdup_vprintf (store, fmt, ap);
-        va_end (ap);
-
+
-        return result;
-}

trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c

@@ -90 +90 @@
-#include "camel-imap-search.h"
-#include "camel-imap-store.h"
+#include "camel-imap-store-priv.h"
-#include "camel-imap-summary.h"
-#include "camel-imap-utils.h"
@@ -799 +800 @@
-        }
-
-
+
+
+
-                store->current_folder = NULL;
+        }
-
-        if (imap_folder->search)
@@ -3827 +3831 @@
-                        break;
-        }
+        camel_exception_clear (&ex);
-        if (resp)
-                g_free (resp);

trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c

@@ -71 +71 @@
-#include "camel-imap-store-summary.h"
-#include "camel-imap-store.h"
+#include "camel-imap-store-priv.h"
-#include "camel-imap-summary.h"
-#include "camel-imap-utils.h"
@@ -322 +323 @@
-                        camel_imap_response_free (imap_store, response2);
-                }
+                camel_exception_clear (&nex);
-                camel_imap_store_start_idle (imap_store);
-        }
@@ -395 +397 @@
-
-        let_idle_die (imap_store, TRUE);
+
+        if (imap_store->current_folder) {
+                camel_object_unhook_event (imap_store->current_folder, "finalize",
+                                           _camel_imap_store_current_folder_finalize, imap_store);
+                imap_store->current_folder = NULL;
+        }
+
+        if (imap_store->old_folder) {
+                camel_object_unhook_event (imap_store->old_folder, "finalize",
+                                           _camel_imap_store_old_folder_finalize, imap_store);
+                imap_store->old_folder = NULL;
+        }
-
-        /* This frees current_folder, folders, authtypes, streams, and namespace. */
@@ -902 +916 @@
-        CamelStream *tcp_stream;
-        CamelSockOptData sockopt;
-, ssl_ena = FALSE
+
-        gboolean clean_quit = TRUE;
-        char *buf;
@@ -2122 +2136 @@
-                camel_object_unref (store->current_folder); */
-        store->old_folder = store->current_folder;
+        if (store->old_folder)
+                camel_object_hook_event (store->old_folder, "finalize",
+                                         _camel_imap_store_old_folder_finalize, store);
+        if (store->current_folder)
+                camel_object_unhook_event (store->current_folder, "finalize",
+                                           _camel_imap_store_current_folder_finalize, store);
-        store->current_folder = NULL;
-
@@ -2630 +2650 @@
-        if (imap_store->current_folder) {
-                /* camel_object_unref (imap_store->current_folder); */
+                camel_object_unhook_event (imap_store->current_folder, "finalize",
+                                           _camel_imap_store_current_folder_finalize, imap_store);
-                imap_store->current_folder = NULL;
-        }
@@ -2807 +2829 @@
-
-                imap_store->current_folder = new_folder;
+                camel_object_hook_event (imap_store, "finalize",
+                                         _camel_imap_store_current_folder_finalize, imap_store);
-                /* camel_object_ref (new_folder); */
-                camel_exception_init (&local_ex);
@@ -2814 +2838 @@
-                        camel_exception_xfer (ex, &local_ex);
-                        /* camel_object_unref (imap_store->current_folder); */
+                        camel_object_unhook_event (imap_store, "finalize",
+                                                   _camel_imap_store_current_folder_finalize, imap_store);
-                        imap_store->current_folder = NULL;
-                        camel_object_unref (new_folder);
@@ -2882 +2908 @@
-
-        /* no need to actually create a CamelFolder for INBOX */
+        camel_object_unhook_event (imap_store->current_folder, "finalize",
+                                   _camel_imap_store_current_folder_finalize, imap_store);
-        imap_store->current_folder = NULL;
-
@@ -3047 +3075 @@
-                g_mkdir (newpath, S_IRWXU);
-
-file = g_dir_read_name (dir)
+(file = g_dir_read_name (dir)) != NULL
-                        gchar *old_fullname;
-                        gchar *new_fullname;
@@ -3106 +3134 @@
-                camel_object_unref (imap_store->current_folder); */
-        /* no need to actually create a CamelFolder for INBOX */
+        camel_object_unhook_event (imap_store->current_folder, "finalize",
+                                   _camel_imap_store_current_folder_finalize, imap_store);
-        imap_store->current_folder = NULL;
-
@@ -4455 +4485 @@
-        return nread;
-}
+
+void 
+_camel_imap_store_current_folder_finalize (CamelObject *stream, gpointer event_data, gpointer user_data)
+{
+        CamelImapStore *store = (CamelImapStore *) user_data;
+
+        store->current_folder = NULL;
+}
+void 
+_camel_imap_store_old_folder_finalize (CamelObject *stream, gpointer event_data, gpointer user_data)
+{
+        CamelImapStore *store = (CamelImapStore *) user_data;
+
+        store->old_folder = NULL;
+}
+
+void 
+_camel_imap_store_last_folder_finalize (CamelObject *stream, gpointer event_data, gpointer user_data)
+{
+        CamelImapStore *store = (CamelImapStore *) user_data;
+
+        store->last_folder = NULL;
+}