Changeset 1782

Show
Ignore:
Timestamp:
04/12/07 22:02:56
Author:
pvanhoof
Message:

Added the skeleton for ACAP support

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r1780 r1782  
     12007-04-12  Philip Van Hoof  <pvanhoof@gnome.org> 
     2 
     3        * Added skeleton for ACAP support 
     4 
     5        * This was a major API change 
     6 
    172007-04-11  Philip Van Hoof  <pvanhoof@gnome.org> 
    28 

  • trunk/Makefile.am

    r1648 r1782  
    1717 
    1818SUBDIRS += libtinymail-camel $(PLATFORMDIR)  
     19 
     20if BUILD_ACAP 
     21SUBDIRS += libtinymail-acap 
     22endif 
    1923 
    2024SUBDIRS += tests bindings po  

  • trunk/configure.ac

    r1648 r1782  
    5555 
    5656dnl ### default values (will get overwritten) 
     57build_acap=false 
    5758build_gnome=true 
    5859build_uigtk=true 
    …… 
    156157AM_CONDITIONAL(BUILD_DEMOUI, test x$build_demoui = xtrue) 
    157158 
     159 
    158160dnl ### Enable gnome features ## 
    159161AC_ARG_ENABLE(gnome, 
    …… 
    169171esac],[build_gnome=$build_gnome]) 
    170172AM_CONDITIONAL(BUILD_GNOME, test x$build_gnome = xtrue) 
     173 
     174 
     175dnl ### Enable acap features ## 
     176AC_ARG_ENABLE(acap, 
     177AC_HELP_STRING([--enable-acap], 
     178  [Build using acap features]), 
     179[case "${enableval}" in 
     180  yes) 
     181        build_acap=true 
     182  ;; 
     183  no)  build_acap=false ;; 
     184  *) AC_MSG_ERROR(bad value ${enableval} for --enable-acap) ;; 
     185esac],[build_acap=$build_acap]) 
     186AM_CONDITIONAL(BUILD_ACAP, test x$build_acap = xtrue) 
     187 
    171188 
    172189dnl ### Enable building the unit tests ## 
    …… 
    396413libtinymail-gpe/libtinymail-gpe.pc 
    397414libtinymail-test/Makefile 
     415libtinymail-acap/Makefile 
     416libtinymail-acap/libtinymail-acap.pc 
    398417tests/Makefile 
    399418tests/c-demo/Makefile 
    …… 
    409428echo "" 
    410429echo "  Enable GNOME features:       $build_gnome" 
     430echo "  Enable ACAP features:        $build_acap" 
    411431echo "  HTML component:              ${with_html_component}" 
    412432echo "  Python language bindings:    $build_pytinymail" 

  • trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.c

    r1758 r1782  
    732732                s->idx = i; 
    733733 
     734                g_static_rec_mutex_lock (&global_lock); 
    734735                mi = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_load(s, &must_add); 
     736                g_static_rec_mutex_unlock (&global_lock); 
    735737 
    736738                if (mi == NULL) 
    …… 
    21182120        ptrchr = camel_file_util_mmap_decode_uint32 (ptrchr, &mi->flags, FALSE);  
    21192121 
    2120  
    21212122        mi->flags &= ~CAMEL_MESSAGE_INFO_NEEDS_FREE; 
    21222123        mi->flags &= ~CAMEL_MESSAGE_INFO_UID_NEEDS_FREE; 
    …… 
    32723273        g_static_mutex_lock (&global_lock2); 
    32733274 
    3274         if (mi == NULL || mi->refcount <=0) 
    3275                 retval = (void*) 0; 
    3276         if (((CamelMessageInfoBase*)mi)->flags & CAMEL_MESSAGE_FREED) 
     3275        if (G_UNLIKELY (mi == NULL || mi->refcount <=0)) 
     3276                retval = "Invalid refcount"; 
     3277        if (G_UNLIKELY(((CamelMessageInfoBase*)mi)->flags & CAMEL_MESSAGE_FREED)) 
    32773278                retval = "Invalid"; 
    32783279        else switch (id)