* build fixes for Bora

pmo-trunk-r1541

diff --git a/src/maemo/modest-main-window-ui.h b/src/maemo/modest-main-window-ui.h
index 9af67ee..8f41f57 100644 (file)
--- a/src/maemo/modest-main-window-ui.h
+++ b/src/maemo/modest-main-window-ui.h
@@ -37,6 +37,11 @@
 G_BEGIN_DECLS
 
 
+#ifndef GTK_STOCK_FULLSCREEN
+#define GTK_STOCK_FULLSCREEN NULL
+#endif /*GTK_STOCK_FULLSCREEN*/
+
+
 /* Action entries */
 static const GtkActionEntry modest_action_entries [] = {
 

diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c
index 079111d..9cbab26 100644 (file)
--- a/src/maemo/modest-main-window.c
+++ b/src/maemo/modest-main-window.c
@@ -471,6 +471,6 @@ modest_main_window_new (void)
 
        /* Needed to show the contents of the toolbar */
        gtk_widget_show_all (GTK_WIDGET (self));
-
+               
        return MODEST_WINDOW(self);
 }

diff --git a/src/modest-main.c b/src/modest-main.c
index 925b84c..1b8a440 100644 (file)
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -119,23 +119,25 @@ main (int argc, char *argv[])
        if (!modest_runtime_init ()) {
                g_printerr ("modest: cannot init runtime\n");
                return MODEST_ERR_INIT;
+               
        }
-       
 
        account_or_default = check_account (account);
        g_free (account);
-
-/*     if (modest_conf_get_bool (modest_runtime_get_conf(), MODEST_CONF_CONNECT_AT_STARTUP, NULL))
-               tny_device_force_online (modest_runtime_get_device());
-*/                     
+       
        if (!batch) {
                if (!modest_runtime_init_ui (argc, argv)) {
                        g_printerr ("modest: cannot start ui\n");
                        retval = MODEST_ERR_UI;
                        goto cleanup;
-               } else
+               } else {
+                       if (modest_conf_get_bool (modest_runtime_get_conf(),
+                                                 MODEST_CONF_CONNECT_AT_STARTUP, NULL))
+                               tny_device_force_online (modest_runtime_get_device());
+                       
                        retval = start_ui (account_or_default,
                                           mailto, cc, bcc, subject, body);
+               }
        } else {
                if (!account_or_default) {
                        g_printerr ("modest: no account has been defined yet\n");

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index dabce5d..a48682f 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -750,8 +750,12 @@ modest_tny_account_store_get_tny_account_by_account (ModestTnyAccountStore *self
        else if (account_data->transport_account)
                id = account_data->transport_account->account_name;
 
-       if (id) 
+       if (!id)
+               g_printerr ("modest: could not get an id for account %s\n",
+                           account_name);
+       else    
                account =  modest_tny_account_store_get_tny_account_by_id  (self, id);
+
        if (!account)
                g_printerr ("modest: could not get tny %s account for %s (id=%s)\n",
                            type == TNY_ACCOUNT_TYPE_STORE? "store" : "transport",

diff --git a/src/widgets/modest-msg-view.c b/src/widgets/modest-msg-view.c
index 685b7d2..b91e125 100644 (file)
--- a/src/widgets/modest-msg-view.c
+++ b/src/widgets/modest-msg-view.c
@@ -66,7 +66,11 @@ static gboolean on_link_clicked (GtkWidget *widget, const gchar *uri, ModestMsgV
 static gboolean on_url_requested (GtkWidget *widget, const gchar *uri, GtkHTMLStream *stream,
                                  ModestMsgView *msg_view);
 static gboolean on_link_hover (GtkWidget *widget, const gchar *uri, ModestMsgView *msg_view);
-static void     on_tap_and_hold (GtkWidget *widget, gpointer userdata);
+
+#ifdef MAEMO_CHANGES
+static void     on_tap_and_hold (GtkWidget *widget, gpointer userdata); 
+#endif /*MAEMO_CHANGES*/
+
 
 /* size allocation and drawing handlers */
 static void get_view_allocation (ModestMsgView *msg_view, GtkAllocation *allocation);