Changeset 3010

Show
Ignore:
Timestamp:
11/26/07 21:55:24
Author:
djcb
Message:

* make the conic-using version of tny-maemo-conic the default
* add ChangeLog? entry

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r3005 r3010  
     12007-11-26 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> 
     2         
     3        * add a dummy conic device, so libtinymail-maemo does 
     4          not require libconic anymore 
     5 
    162007-11-25  Philip Van Hoof  <pvanhoof@gnome.org> 
    27 

  • trunk/configure.ac

    r3008 r3010  
    439439                        AC_DEFINE_UNQUOTED(MAEMO_CONIC_DUMMY,1,["Whether to hack the TnyMaemoConicDevice to somewhat work in sbox"]) 
    440440                fi 
    441                 AC_DEFINE_UNQUOTED(MAEMO_HAVE_CONIC,1,["whether libconic is available"]) 
     441        else 
     442                AC_DEFINE_UNQUOTED(LIBTINYMAIL_MAEMO_WITHOUT_CONIC,1,["whether the dummy libconic should be built"]) 
    442443        fi 
    443444 

  • trunk/libtinymail-maemo/tny-maemo-conic-device.h

    r3008 r3010  
    3434 */ 
    3535 
    36 #ifdef MAEMO_HAVE_CONIC 
    37 #include <coniciap.h> 
    38 #else 
     36#ifdef LIBTINYMAIL_MAEMO_WITHOUT_CONIC 
    3937typedef struct { 
    4038} ConIcIap; 
    41 #endif /*MAEMO_HAVE_CONIC*/ 
     39#else 
     40#include <coniciap.h> 
     41#endif /*LIBTINYMAIL_MAEMO_WITHOUT_CONIC*/ 
    4242 
    4343G_BEGIN_DECLS