Changeset 1212

Timestamp:

11/23/06 14:46:55

Author:

svillar

Message:

* Added support to folder rename
* Fixed a leak
* Refactored subscriptions code

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/docs/devel/reference/tmpl/tny-account-store.sgml (modified) (4 diffs)
• trunk/docs/devel/reference/tmpl/tny-device.sgml (modified) (1 diff)
• trunk/docs/devel/reference/tmpl/tny-shared.sgml (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (5 diffs)
• trunk/libtinymail-camel/tny-camel-store-account.c (modified) (5 diffs)
• trunk/libtinymail-gnome-desktop/tny-gnome-account-store.c (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2006-11-23  Sergio Villar Senin <svillar@igalia.com>
+        * libtinymail-camel/tny-camel-folder.c: added support to rename
+        folders
+        * libtinymail-camel/tny-camel-store-account.c: refactored the
+        subscriptions code
+        * libtinymail-gnome-desktop/tny-gnome-account-store.c: removed a small
+        leak
+
-2006-11-21  Sergio Villar Senin <svillar@igalia.com>
-        * Fixed a bug when subscribing new folders

trunk/docs/devel/reference/tmpl/tny-account-store.sgml

@@ -43 +43 @@
-</para>
-
+@: 
+@:
+
-@tnyaccountstore: the object which received the signal.
-@arg1: 
@@ -50 +53 @@
-
-</para>
+
+@: 
+@:
-
-@tnyaccountstore: the object which received the signal.
@@ -59 +65 @@
-</para>
-
+@: 
+@:
+
-@tnyaccountstore: the object which received the signal.
-@arg1: 
@@ -66 +75 @@
-
-</para>
+
+@:
-
-@tnyaccountstore: the object which received the signal.

trunk/docs/devel/reference/tmpl/tny-device.sgml

@@ -29 +29 @@
-
-</para>
+
+@: 
+@:
-
-@tnydevice: the object which received the signal.

trunk/docs/devel/reference/tmpl/tny-shared.sgml

@@ -292 +292 @@
-</para>
-
-tnystoreaccount: the object which received the signal.
-arg1
+: 
+
-
-<!-- ##### STRUCT TnyStoreAccountIface ##### -->

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

@@ -196 +196 @@
-                }
-
-
+
+
+
+
-
-                /* priv->folder_changed_id = camel_object_hook_event (priv->folder, 
@@ -381 +384 @@
-
-        g_mutex_lock (priv->folder_lock);
+
+        if (!priv->folder || !priv->loaded || !CAMEL_IS_FOLDER (priv->folder))
+        {
+                CamelStore *store;
+                CamelFolder *cfolder;
+
+                if (!load_folder_no_lock (priv)) 
+                {
+                        g_mutex_unlock (priv->folder_lock);
+                        return;
+                }
+                store = (CamelStore*) _tny_camel_account_get_service 
+                        (TNY_CAMEL_ACCOUNT (priv->account));
+                cfolder = tny_camel_folder_get_folder (TNY_CAMEL_FOLDER (self));
+                priv->subscribed = camel_store_folder_subscribed (store, 
+                                                                  camel_folder_get_full_name (cfolder));
+        }
+
-        retval = priv->subscribed;
-        g_mutex_unlock (priv->folder_lock);
@@ -1068 +1089 @@
-{
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                return;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        if (G_UNLIKELY (priv->cached_name))
@@ -1079 +1141 @@
-        priv->cached_name = g_strdup (name);
-
-return
+g_mutex_unlock (priv->folder_lock)
-}
-
@@ -1356 +1418 @@
-        info = camel_store_create_folder (store, priv->folder_name, name, &ex);
-
-
-
+
+
+
-                        camel_exception_get_description (&ex));
-                g_object_unref (G_OBJECT (folder));

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

@@ -89 +89 @@
-                
-                        camel_url_set_protocol (url, priv->proto); 
-
-                        camel_url_set_user (url, priv->user);
-                        camel_url_set_host (url, priv->host);
@@ -165 +164 @@
-}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        CamelException ex = CAMEL_EXCEPTION_INITIALISER;
-        CamelStore *store;
@@ -175 +178 @@
-        const gchar *folder_full_name;
-
-
-
+
+
+
-        g_static_rec_mutex_lock (apriv->service_lock);
-        store = camel_session_get_store ((CamelSession*) apriv->session, 
@@ -182 +186 @@
-        g_static_rec_mutex_unlock (apriv->service_lock);
-
+        if (!camel_store_supports_subscriptions (store)) 
+                goto cleanup;
+
-        /* Retrieve the folder full name */
-        cfolder = tny_camel_folder_get_folder (TNY_CAMEL_FOLDER (folder));
-        folder_full_name = camel_folder_get_full_name (cfolder);
-
-
-
-
+
+
+
+
+
-                camel_store_subscribe_folder (store, folder_full_name, &ex);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-        if (camel_exception_is_set (&ex)) {
-
+
+
-                           tny_folder_get_name (folder), 
-                           camel_exception_get_description (&ex));
@@ -235 +210 @@
-        } else {
-                /* Sync */
-FALSE
-
+subscribe
+
-                g_signal_emit (self, 
-                               tny_store_account_signals [TNY_STORE_ACCOUNT_SUBSCRIPTION_CHANGED], 
-                               0, folder);
-        }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

trunk/libtinymail-gnome-desktop/tny-gnome-account-store.c

@@ -415 +415 @@
-                        if (options)
-                        {
+                                GSList *tmp = options;
-                                while (options)
-                                {
@@ -421 +422 @@
-                                        options = g_slist_next (options);
-                                }
-options
+tmp
-                        }
-