projects / claws.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1f454ab)
2007-07-18 [colin] 2.10.0cvs42
authorColin Leroy <colin@colino.net>
Wed, 18 Jul 2007 17:04:03 +0000 (17:04 +0000)
committerColin Leroy <colin@colino.net>
Wed, 18 Jul 2007 17:04:03 +0000 (17:04 +0000)
* src/inc.c
* configure.ac
Fix build on n770

ChangeLog patch | blob | history
PATCHSETS patch | blob | history
configure.ac patch | blob | history
src/inc.c patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 177498305092b54aef5d268671856b8c31b8545e..54973fcbae1b55be726f60c4425e1b8e4ec5569d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-18 [colin]     2.10.0cvs42
+
+       * src/inc.c
+       * configure.ac
+               Fix build on n770
+
 2007-07-18 [colin]     2.10.0cvs41
 
        * src/inc.c
 2007-07-18 [colin]     2.10.0cvs41
 
        * src/inc.c
diff --git a/PATCHSETS b/PATCHSETS
index 7d2a875a1433ca7602ae631154ffb834b1b49f5e..fdfece7a31f0e3701cd803801d4b50e0f11cc752 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2695,3 +2695,4 @@
 ( cvs diff -u -r 1.94.2.140 -r 1.94.2.141 src/messageview.c;  ) > 2.10.0cvs39.patchset
 ( cvs diff -u -r 1.60.2.34 -r 1.60.2.35 src/filtering.c;  cvs diff -u -r 1.213.2.149 -r 1.213.2.150 src/folder.c;  ) > 2.10.0cvs40.patchset
 ( cvs diff -u -r 1.149.2.75 -r 1.149.2.76 src/inc.c;  cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/statusbar.c;  ) > 2.10.0cvs41.patchset
 ( cvs diff -u -r 1.94.2.140 -r 1.94.2.141 src/messageview.c;  ) > 2.10.0cvs39.patchset
 ( cvs diff -u -r 1.60.2.34 -r 1.60.2.35 src/filtering.c;  cvs diff -u -r 1.213.2.149 -r 1.213.2.150 src/folder.c;  ) > 2.10.0cvs40.patchset
 ( cvs diff -u -r 1.149.2.75 -r 1.149.2.76 src/inc.c;  cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/statusbar.c;  ) > 2.10.0cvs41.patchset
+( cvs diff -u -r 1.149.2.76 -r 1.149.2.77 src/inc.c;  cvs diff -u -r 1.654.2.2751 -r 1.654.2.2752 configure.ac;  ) > 2.10.0cvs42.patchset
diff --git a/configure.ac b/configure.ac
index 21d3f7ea10f35de652d5cb89cfc5536449927c6b..1306694972c471f7bad1f7361fe45987aeff1239 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=41
+EXTRA_VERSION=42
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -445,16 +445,23 @@ AC_ARG_ENABLE(maemo,
        [  --enable-maemo   Build for the Maemo platform [default=no]],
        [ac_cv_enable_maemo=$enableval], [ac_cv_enable_maemo=no])
 if test $ac_cv_enable_maemo = yes; then
        [  --enable-maemo   Build for the Maemo platform [default=no]],
        [ac_cv_enable_maemo=$enableval], [ac_cv_enable_maemo=no])
 if test $ac_cv_enable_maemo = yes; then
-       PKG_CHECK_MODULES(MAEMO, libosso conic hildon-libs hildon-fm, ac_cv_enable_maemo=yes,
+       PKG_CHECK_MODULES(MAEMO, libosso hildon-libs hildon-fm, ac_cv_enable_maemo=yes,
                  ac_cv_enable_maemo=no)
        AC_SUBST(MAEMO_CFLAGS)
        AC_SUBST(MAEMO_LIBS)
        if test $ac_cv_enable_maemo = no; then
                  ac_cv_enable_maemo=no)
        AC_SUBST(MAEMO_CFLAGS)
        AC_SUBST(MAEMO_LIBS)
        if test $ac_cv_enable_maemo = no; then
-               AC_MSG_ERROR(libosso, conic, hildon-libs or hildon-fm not found)
+               AC_MSG_ERROR(libosso, hildon-libs or hildon-fm not found)
        else
                AC_DEFINE(MAEMO, 1, Build for maemo)
        fi
 fi
        else
                AC_DEFINE(MAEMO, 1, Build for maemo)
        fi
 fi
+PKG_CHECK_MODULES(CONIC, conic, ac_cv_enable_conic=yes,
+         ac_cv_enable_conic=no)
+AC_SUBST(CONIC_CFLAGS)
+AC_SUBST(CONIC_LIBS)
+if test $ac_cv_enable_conic = yes; then
+       AC_DEFINE(CONIC, 1, Have conic lib)
+fi
 
 dnl Check for X-Face support
 AC_ARG_ENABLE(compface,
 
 dnl Check for X-Face support
 AC_ARG_ENABLE(compface,
diff --git a/src/inc.c b/src/inc.c
index 60a6779f78eea123f3970d463ef45b8aae50d5a0..82c782e40e0571899dcb2ee0ee6c05b05ee3c97e 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -63,12 +63,15 @@
 
 #ifdef MAEMO
 #include <hildon-widgets/hildon-banner.h>
 
 #ifdef MAEMO
 #include <hildon-widgets/hildon-banner.h>
+
+#ifdef CONIC
 #include <conicconnection.h>
 #include <conicconnectionevent.h>
 
 static ConIcConnection *maemo_connection = NULL;
 static gboolean maemo_warned_offline = FALSE;
 #endif
 #include <conicconnection.h>
 #include <conicconnectionevent.h>
 
 static ConIcConnection *maemo_connection = NULL;
 static gboolean maemo_warned_offline = FALSE;
 #endif
+#endif
 
 static GList *inc_dialog_list = NULL;
 
 
 static GList *inc_dialog_list = NULL;
 
@@ -1403,7 +1406,7 @@ static void inc_notify_cmd(gint new_msgs, gboolean notify)
        g_free(buf);
 }
 
        g_free(buf);
 }
 
-#ifdef MAEMO
+#if (defined(MAEMO) && defined(CONIC))
 static void maemo_connection_event(ConIcConnection *connection, 
                                   ConIcConnectionEvent *event,
                                   gpointer user_data)
 static void maemo_connection_event(ConIcConnection *connection, 
                                   ConIcConnectionEvent *event,
                                   gpointer user_data)
@@ -1428,7 +1431,7 @@ static void maemo_connection_event(ConIcConnection *connection,
 
 void inc_autocheck_timer_init(MainWindow *mainwin)
 {
 
 void inc_autocheck_timer_init(MainWindow *mainwin)
 {
-#ifdef MAEMO
+#if (defined(MAEMO) && defined(CONIC))
        GValue *val = g_new0(GValue, 1);
        maemo_connection = con_ic_connection_new();
 
        GValue *val = g_new0(GValue, 1);
        maemo_connection = con_ic_connection_new();
 
@@ -1464,7 +1467,7 @@ static void inc_autocheck_timer_set_interval(guint interval)
 void inc_autocheck_timer_set(void)
 {
        inc_autocheck_timer_set_interval(prefs_common.autochk_itv * 60000);
 void inc_autocheck_timer_set(void)
 {
        inc_autocheck_timer_set_interval(prefs_common.autochk_itv * 60000);
-#ifdef MAEMO
+#if (defined(MAEMO) && defined(CONIC))
        con_ic_connection_connect (maemo_connection,
                CON_IC_CONNECT_FLAG_AUTOMATICALLY_TRIGGERED);
 #endif
        con_ic_connection_connect (maemo_connection,
                CON_IC_CONNECT_FLAG_AUTOMATICALLY_TRIGGERED);
 #endif
@@ -1501,7 +1504,7 @@ gboolean inc_offline_should_override(gboolean force_ask, const gchar *msg)
        int length = 10; /* minutes */
        gint answer = G_ALERTDEFAULT;
 
        int length = 10; /* minutes */
        gint answer = G_ALERTDEFAULT;
 
-#ifdef MAEMO
+#if (defined(MAEMO) && defined(CONIC))
        if (prefs_common.work_offline) {
                if (force_ask && !maemo_warned_offline) {
                        if (mainwindow_get_mainwindow())
        if (prefs_common.work_offline) {
                if (force_ask && !maemo_warned_offline) {
                        if (mainwindow_get_mainwindow())
Claws Mail