Changeset 1723

Timestamp:

03/14/07 20:00:07

Author:

pvanhoof

Message:

API change for tny_folder_store_remove

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-folder-priv.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (12 diffs)
• trunk/libtinymail-camel/tny-camel-store-account.c (modified) (2 diffs)
• trunk/libtinymail/tny-folder-store.c (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2007-03-14  Philip Van Hoof  <pvanhoof@gnome.org>
+
+        * tny_folder_store_remove now specifies and its implementation will
+        unsubscribe all the observers of the folder being removed.
+
+        * This was a major API change
+
-2007-03-14  Sergio Villar Senin  <svillar@igalia.com>
-

trunk/libtinymail-camel/tny-camel-folder-priv.h

@@ -34 +34 @@
-        guint folder_changed_id;
-        guint headers_managed;
-
+, *obs_lock
-        CamelFolder *folder;
-        gchar *folder_name;

trunk/libtinymail-camel/tny-camel-folder.c

@@ -81 +81 @@
-                return;
-
+        g_static_rec_mutex_lock (priv->obs_lock);
+
-        iter = tny_list_create_iterator (priv->sobservers);
-        while (!tny_iterator_is_done (iter))
@@ -90 +92 @@
-        }
-        g_object_unref (G_OBJECT (iter));
+
+        g_static_rec_mutex_unlock (priv->obs_lock);
+
-}
-
@@ -100 +105 @@
-        if (!priv->observers)
-                return;
+
+        g_static_rec_mutex_lock (priv->obs_lock);
-
-        iter = tny_list_create_iterator (priv->observers);
@@ -110 +117 @@
-        }
-        g_object_unref (G_OBJECT (iter));
+
+        g_static_rec_mutex_unlock (priv->obs_lock);
+
-}
-
@@ -2231 +2241 @@
-                        CamelException subex = CAMEL_EXCEPTION_INITIALISER;
-
+                        g_static_rec_mutex_lock (cpriv->obs_lock);
+                        if (cpriv->observers) {
+                                g_object_unref (G_OBJECT (cpriv->observers));
+                                cpriv->observers = NULL;
+                        }
+                        if (cpriv->sobservers) {
+                                g_object_unref (G_OBJECT (cpriv->sobservers));
+                                cpriv->sobservers = NULL;
+                        }
+                        g_static_rec_mutex_unlock (priv->obs_lock);
+
-                        if (camel_store_supports_subscriptions (store))
-                                camel_store_subscribe_folder (store, cfolname, &subex);
@@ -2783 +2804 @@
-        g_assert (TNY_IS_FOLDER_OBSERVER (observer));
-
-
-
+
-        if (!priv->observers)
-                priv->observers = tny_simple_list_new ();
-
-        tny_list_prepend (priv->observers, G_OBJECT (observer));
+        g_static_rec_mutex_unlock (priv->obs_lock);
-
-        determine_push_email (priv);
@@ -2812 +2832 @@
-                return;
-
+        g_static_rec_mutex_lock (priv->obs_lock);
-        tny_list_remove (priv->observers, G_OBJECT (observer));
+        g_static_rec_mutex_unlock (priv->obs_lock);
-
-        determine_push_email (priv);
@@ -2852 +2874 @@
-        g_assert (TNY_IS_FOLDER_STORE_OBSERVER (observer));
-
-
-
+
-        if (!priv->sobservers)
-                priv->sobservers = tny_simple_list_new ();
-
-        tny_list_prepend (priv->sobservers, G_OBJECT (observer));
+        g_static_rec_mutex_unlock (priv->obs_lock);
-
-        return;
@@ -2879 +2900 @@
-                return;
-
+        g_static_rec_mutex_lock (priv->obs_lock);
-        tny_list_remove (priv->sobservers, G_OBJECT (observer));
+        g_static_rec_mutex_unlock (priv->obs_lock);
-
-        return;
@@ -2955 +2978 @@
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
-
-
-
-
+
+
-        if (priv->observers)
-                g_object_unref (G_OBJECT (priv->observers));
-        if (priv->sobservers)
-                g_object_unref (G_OBJECT (priv->sobservers));
+        g_static_rec_mutex_unlock (priv->obs_lock);
+
+        g_static_rec_mutex_lock (priv->folder_lock);
+        priv->dont_fkill = FALSE;
-
-        if (priv->account && TNY_IS_CAMEL_STORE_ACCOUNT (priv->account))
@@ -3003 +3029 @@
-        g_static_rec_mutex_free (priv->folder_lock);
-        priv->folder_lock = NULL;
+
+        g_static_rec_mutex_free (priv->obs_lock);
+        priv->obs_lock = NULL;
+
-
-        if (priv->folder_name)
@@ -3150 +3180 @@
-        priv->folder_lock = g_new0 (GStaticRecMutex, 1);
-        g_static_rec_mutex_init (priv->folder_lock);
+        priv->obs_lock = g_new0 (GStaticRecMutex, 1);
+        g_static_rec_mutex_init (priv->obs_lock);
-
-        return;

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

@@ -393 +393 @@
-        g_assert (TNY_IS_CAMEL_FOLDER (folder));
-
+        /* TNY TODO: Support non-TnyCamelFolder TnyFolder implementations too */
+
-        if (!_tny_session_check_operation (apriv->session, err, 
-                        TNY_FOLDER_STORE_ERROR, TNY_FOLDER_STORE_ERROR_REMOVE_FOLDER))
@@ -425 +427 @@
-        g_assert (CAMEL_IS_STORE (store));
-        g_assert (cpriv->folder_name != NULL);
+
+        g_static_rec_mutex_lock (cpriv->obs_lock);
+        if (cpriv->observers) {
+                g_object_unref (G_OBJECT (cpriv->observers));
+                cpriv->observers = NULL;
+        }
+        if (cpriv->sobservers) {
+                g_object_unref (G_OBJECT (cpriv->sobservers));
+                cpriv->sobservers = NULL;
+        }
+        g_static_rec_mutex_unlock (cpriv->obs_lock);
-
-        if (camel_store_supports_subscriptions (store))

trunk/libtinymail/tny-folder-store.c

@@ -80 +80 @@
- * not do this for you, leaving the @folder instance in an unusable state. The 
- * id of the @folder instance will be blanked once really deleted from the
-
-
+
+
+
- * Example:
- * <informalexample><programlisting>