Changeset 1810

Timestamp:

04/20/07 19:59:49

Author:

pvanhoof

Message:

Bugfix for merge folders

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/Makefile.am (modified) (1 diff)
• trunk/configure.ac (modified) (5 diffs)
• trunk/libtinymail-queues (added)
• trunk/libtinymail-queues/.svnignore (added)
• trunk/libtinymail-queues/Makefile.am (added)
• trunk/libtinymail-queues/libtinymail-queues.pc.in (added)
• trunk/libtinymail-queues/tny-get-msg-queue.c (added)
• trunk/libtinymail-queues/tny-get-msg-queue.h (added)
• trunk/libtinymail/tny-folder.c (modified) (1 diff)
• trunk/tests/c-demo/tny-demoui-summary-view.c (modified) (4 diffs)

trunk/ChangeLog

@@ -2 +2 @@
-
-        * Further implementing of TnyMergeFolder
+        * Bugfixes in camel-lite (concurrent camel_folder_get_message on
+        folders that are not selected)
+        * Introduction of libtinymail-queues (which depens on asyncworker)
-
-2007-04-18  Philip Van Hoof  <pvanhoof@gnome.org>

trunk/Makefile.am

@@ -21 +21 @@
-if BUILD_ACAP
-SUBDIRS += libtinymail-acap
+endif
+
+if BUILD_QUEUES
+SUBDIRS += libtinymail-queues
-endif
-

trunk/configure.ac

@@ -55 +55 @@
-
-dnl ### default values (will get overwritten)
+build_queues=false
-build_acap=false
-build_gnome=true
@@ -186 +187 @@
-AM_CONDITIONAL(BUILD_ACAP, test x$build_acap = xtrue)
-
+dnl ### Enable queues ##
+AC_ARG_ENABLE(queues,
+AC_HELP_STRING([--enable-queues],
+  [Build using queues]),
+[case "${enableval}" in
+  yes)
+        build_queues=true
+  ;;
+  no)  build_queues=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-queues) ;;
+esac],[build_queues=$build_queues])
+AM_CONDITIONAL(BUILD_QUEUES, test x$build_queues = xtrue)
+
+
-
-dnl ### Enable building the unit tests ##
@@ -262 +277 @@
-AC_SUBST(LIBTINYMAIL_CFLAGS)
-AC_SUBST(LIBTINYMAIL_LIBS)
+
+if test x$build_queues = xtrue; then
+PKG_CHECK_MODULES(LIBTINYMAIL_QUEUES, oasyncworker-1.0 glib-2.0 >= 2.8 gobject-2.0)
+AC_SUBST(LIBTINYMAIL_QUEUES_CFLAGS)
+AC_SUBST(LIBTINYMAIL_QUEUES_LIBS)
+fi
+
-
-dnl ### libtinymailui, the ui abstraction library ##
@@ -436 +458 @@
-libtinymail-acap/Makefile
-libtinymail-acap/libtinymail-acap.pc
+libtinymail-queues/Makefile
+libtinymail-queues/libtinymail-queues.pc
-tests/Makefile
-tests/c-demo/Makefile
@@ -450 +474 @@
-echo "  Enable GNOME features:       $build_gnome"
-echo "  Enable ACAP features:        $build_acap"
+echo "  Build the queues library:    $build_queues"
-echo "  HTML component:              ${with_html_component}"
-echo "  Python language bindings:    $build_pytinymail"

trunk/libtinymail/tny-folder.c

@@ -887 +887 @@
- * @user_data: user data for the callback
- *
-
-
+
- *
- * If you want to use this functionality, it's advised to let your application 

trunk/tests/c-demo/tny-demoui-summary-view.c

@@ -500 +500 @@
-        mode = gtk_tree_selection_get_mode (selection);
-
-        g_mutex_lock (priv->monitor_lock);
-        {
-                if (priv->monitor)
-                {
-                        tny_folder_monitor_stop (priv->monitor);
-                        g_object_unref (G_OBJECT (priv->monitor));
-                }
-        }
-        g_mutex_unlock (priv->monitor_lock);
-
-        if (mode == GTK_SELECTION_SINGLE)
-        {
@@ -549 +539 @@
-                        g_mutex_lock (priv->monitor_lock);
-                        {
+                                if (priv->monitor) {
+                                        tny_folder_monitor_stop (priv->monitor);
+                                        g_object_unref (G_OBJECT (priv->monitor));
+                                }
-                                priv->monitor = TNY_FOLDER_MONITOR (tny_folder_monitor_new (folder));
-                                tny_folder_monitor_add_list (priv->monitor, TNY_LIST (hmodel));
@@ -572 +566 @@
-                                refresh_current_folder, 
-                                refresh_current_folder_status_update, user_data);
-
-
-                        g_object_unref (G_OBJECT (folder));
@@ -611 +604 @@
-                g_mutex_lock (priv->monitor_lock);
-                {
+                        if (priv->monitor) {
+                                tny_folder_monitor_stop (priv->monitor);
+                                g_object_unref (G_OBJECT (priv->monitor));
+                        }
-                        priv->monitor = TNY_FOLDER_MONITOR (tny_folder_monitor_new (merge));
-                        tny_folder_monitor_add_list (priv->monitor, TNY_LIST (hmodel));