Changeset 1418

Timestamp:

01/16/07 11:35:34

Author:

pvanhoof

Message:

Temporary fix

Files:

• trunk/libtinymail-camel/tny-camel-store-account.c (modified) (5 diffs)
• trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c (modified) (1 diff)

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

@@ -178 +178 @@
-
-        /* Get store */
-
+
+
-        store = camel_session_get_store ((CamelSession*) apriv->session, 
-                        apriv->url_string, &ex);
-
+
+
+
-
-        if (!camel_store_supports_subscriptions (store)) 
@@ -295 +298 @@
-        }
-
+        /* Disco store ? */
+
-        (*parent_class->finalize) (object);
-
@@ -317 +322 @@
-        g_assert (TNY_IS_CAMEL_FOLDER (folder));
-
+/*      store = camel_session_get_store ((CamelSession*) apriv->session, 
+                        apriv->url_string, &ex); */
+
+/*      g_static_rec_mutex_lock (apriv->service_lock);
-        store = camel_session_get_store ((CamelSession*) apriv->session, 
-                        apriv->url_string, &ex);
+        g_static_rec_mutex_unlock (apriv->service_lock); */
+
+        store = CAMEL_STORE (apriv->service);
-
-        if (camel_exception_is_set (&ex)) 
@@ -384 +396 @@
-        g_assert (CAMEL_IS_SESSION (apriv->session));
-
+/*      store = camel_session_get_store ((CamelSession*) apriv->session, 
+                        apriv->url_string, &ex); */
+
+/*      g_static_rec_mutex_lock (apriv->service_lock);
-        store = camel_session_get_store ((CamelSession*) apriv->session, 
-                        apriv->url_string, &ex);
+        g_static_rec_mutex_unlock (apriv->service_lock); */
+
+        store = CAMEL_STORE (apriv->service);
-
-        if (camel_exception_is_set (&ex)) 
@@ -452 +471 @@
-                g_assert (TNY_IS_FOLDER_STORE_QUERY (query));
-
+/*      store = camel_session_get_store ((CamelSession*) apriv->session, 
+                        apriv->url_string, &ex); */
+
+/*      g_static_rec_mutex_lock (apriv->service_lock);
-        store = camel_session_get_store ((CamelSession*) apriv->session, 
-                        apriv->url_string, &ex);
+        g_static_rec_mutex_unlock (apriv->service_lock); */
+
+        store = CAMEL_STORE (apriv->service);
-
-        if (camel_exception_is_set (&ex))

trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c

@@ -212 +212 @@
-{
-        TnyGtkFolderStoreTreeModel *self = g_object_new (TNY_TYPE_GTK_FOLDER_STORE_TREE_MODEL, NULL);
-async
+FALSE
-        if (query) self->query = g_object_ref (G_OBJECT (query));
-        return GTK_TREE_MODEL (self);