More chinook changes

diff --git a/src/cb.c b/src/cb.c
index 2b2b0b311aea345cbd7cf6970078039fb7b7c6a1..4cc067558a955f178998123d9ced27d0caa019c2 100644 (file)
--- a/src/cb.c
+++ b/src/cb.c
@@ -540,7 +540,7 @@ return TRUE;
 gboolean 
 menu_cb_help(GtkAction * action)
 {
-#ifdef WITH_OSSO
+#ifdef WITH_OSSO_HELP
 ossohelp_show(_osso, HELP_ID_INTRO, 0);
 #endif
 return TRUE;

diff --git a/src/hildon-mapper.h b/src/hildon-mapper.h
index 819043660fe61a017db428c011c13a4490991b90..dd90a974e29cfaf368d9a630e1d94cb645ac7563 100644 (file)
--- a/src/hildon-mapper.h
+++ b/src/hildon-mapper.h
@@ -5,9 +5,16 @@
 
 #ifdef WITH_OSSO
 #include <libosso.h>
+
+#ifdef WITH_OSSO_HELP
 #include <osso-helplib.h>
-#include <osso-ic-dbus.h>
+#endif
+
+#ifdef WITH_OSSO_IC
 #include <osso-ic.h>
+#include <osso-ic-dbus.h>
+#endif
+
 #include <bt-dbus.h>
 #include "maemo-osso.h"
 #include "iap.h"
@@ -17,23 +24,26 @@
 
 #ifdef WITH_HILDON_NEW
 #include <hildon/hildon-program.h>
-#include <hildon/hildon-program.h>
 #include <hildon/hildon-controlbar.h>
 #include <hildon/hildon-note.h>
 #include <hildon/hildon-color-button.h>
 #include <hildon/hildon-number-editor.h>
 #include <hildon/hildon-banner.h>
+
 #ifdef WITH_HILDONFM
 #include <hildon/hildon-file-chooser-dialog.h>
 #endif
 
+#ifdef WITH_HILDON_HELP
+#include <hildon/hildon-help.h>
+#endif
+
 #ifdef WITH_DEVICE_770
 #include <device_symbols.h>
 #endif
 
 #else
 
-#include <hildon-widgets/hildon-program.h>
 #include <hildon-widgets/hildon-program.h>
 #include <hildon-widgets/hildon-controlbar.h>
 #include <hildon-widgets/hildon-note.h>

diff --git a/src/iap.c b/src/iap.c
index 1ae439fab09a6b8b2ae5f253de30c55fd8a43302..3d14bed9bf397d1a3d0774e1651d445e701b1333 100644 (file)
--- a/src/iap.c
+++ b/src/iap.c
@@ -99,8 +99,13 @@ return iap_connected;
 
 #endif
 
-#ifdef WITH_CONIC
+/*************************************************************/
+/*
+ * libconic
+ *
+ */
 
+#ifdef WITH_CONIC
 static ConIcConnection *connection=NULL;
 
 static void 
@@ -151,6 +156,10 @@ return con_ic_connection_connect(connection, CON_IC_CONNECT_FLAG_NONE);
 gboolean
 iap_is_connected(void)
 {
+#ifdef MAEMO_SDK_DEBUG
+g_printerr("SDK: Assuming connection is ok.\n");
+return TRUE;
+#endif
 return iap_connected;
 }
 

diff --git a/src/maemo-osso.c b/src/maemo-osso.c
index d31ec2c45582ab49d130752653292aca1eb793b9..68058ee2a3293bcc48d3cf5f743dd9db7c3329de 100644 (file)
--- a/src/maemo-osso.c
+++ b/src/maemo-osso.c
@@ -10,11 +10,12 @@
 #include <gtk/gtk.h>
 
 #ifdef WITH_OSSO
-
 #include <libosso.h>
-#include <osso-helplib.h>
-#include <osso-ic-dbus.h>
+
+#ifdef WITH_OSSO_IC
 #include <osso-ic.h>
+#include <osso-ic-dbus.h>
+#endif
 
 #include "map.h"
 #include "map-download.h"

diff --git a/src/mapper.c b/src/mapper.c
index 62ecda10b99cc48f71c513e9a795e633b4cb4bca..ccb8061a79afb6381ab1e50dbc1e7b92b67269e9 100644 (file)
--- a/src/mapper.c
+++ b/src/mapper.c
@@ -169,15 +169,15 @@ if (OSSO_OK != osso_rpc_set_default_cb_f(_osso, dbus_cb_default, NULL)) {
        g_printerr("osso_rpc_set_default_cb_f failed.\n");
        return 1;
 }
+#endif
 
+#ifdef WITH_OSSO_IC
 filter_string = g_strdup_printf("interface=%s", ICD_DBUS_INTERFACE);
 /* add match */
 dbus_bus_add_match(dbus_conn, filter_string, NULL);
 g_free(filter_string);
-#endif
 
 /* add the callback */
-#ifdef WITH_OSSO_IC
 dbus_connection_add_filter(dbus_conn, get_connection_status_signal_cb, NULL, NULL);
 osso_iap_cb(iap_callback);
 #endif

diff --git a/src/settings-gui.c b/src/settings-gui.c
index 8b745c6fd8a0d10e52260f41a3fafe196ba74e88..ceb4ba33846fdd39a3480a355f1ea94314f6586a 100644 (file)
--- a/src/settings-gui.c
+++ b/src/settings-gui.c
@@ -405,7 +405,7 @@ settings_dialog(void)
                                             GTK_DIALOG_MODAL, GTK_STOCK_OK,
                                             GTK_RESPONSE_ACCEPT, NULL);
 
-#ifdef WITH_OSSO
+#ifdef WITH_OSSO_HELP
        /* Enable the help button. */
        ossohelp_dialog_help_enable(GTK_DIALOG(dialog), HELP_ID_SETTINGS, _osso);
 #endif