From 7ff5920fc20f91d502675628f7f433ae63b4564c Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Fri, 27 Feb 2009 12:04:24 +0000 Subject: [PATCH] Some Maemo compilation fixes pmo-trunk-r7726 --- src/dbus_api/modest-dbus-callbacks.c | 8 +++++--- src/maemo/modest-platform.c | 1 + src/modest-ui-dimming-rules.c | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c index 4c46a6a..5eae34e 100644 --- a/src/dbus_api/modest-dbus-callbacks.c +++ b/src/dbus_api/modest-dbus-callbacks.c @@ -1194,12 +1194,14 @@ on_idle_open_account (gpointer user_data) #else if (MODEST_IS_MAIN_WINDOW (top)) { gchar *server_name; + GtkWidget *folder_view; + folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (top), MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); - server_name = modest_account_mgr_get_server_account_name (mgr, acc_name, - TNY_ACCOUNT_TYPE_STORE); + server_name = modest_account_mgr_get_server_account_name (modest_runtime_get_account_mgr (), + acc_name, TNY_ACCOUNT_TYPE_STORE); if (server_name) { - modest_folder_view_set_account_id_of_visible_server_account (folder_view, + modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (folder_view), server_name); g_free (server_name); } diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c index 6677eab..0eca33f 100644 --- a/src/maemo/modest-platform.c +++ b/src/maemo/modest-platform.c @@ -29,6 +29,7 @@ #include #include +#include #include #include #include diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c index 6891397..500ef1c 100644 --- a/src/modest-ui-dimming-rules.c +++ b/src/modest-ui-dimming-rules.c @@ -83,7 +83,7 @@ static gboolean _selected_folder_has_subfolder_with_same_name (ModestWindow *win static void fill_list_of_caches (gpointer key, gpointer value, gpointer userdata); static gboolean _send_receive_in_progress (ModestWindow *win); static gboolean _msgs_send_in_progress (void); -static gboolean _all_msgs_in_sending_status (ModestHeaderView *header_view); +static gboolean _all_msgs_in_sending_status (ModestHeaderView *header_view) G_GNUC_UNUSED; static DimmedState * _define_main_window_dimming_state (ModestMainWindow *window) @@ -1438,7 +1438,7 @@ modest_ui_dimming_rules_on_save_attachments (ModestWindow *win, gpointer user_da dimmed = _invalid_attach_selected (win, FALSE, FALSE, FALSE, rule); if (!dimmed) { - dimmed = _purged_attach_selected (win, TRUE); + dimmed = _purged_attach_selected (win, TRUE, NULL); if (dimmed) { modest_dimming_rule_set_notification (rule, _("mail_ib_attach_not_local")); } -- 1.7.9.5