From 2fbf650480a6c94da0408508d47b84ce89f23730 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Wed, 8 Apr 2009 15:57:46 +0000 Subject: [PATCH] Fix Gnome build pmo-trunk-r8702 --- configure.ac | 2 +- src/gnome/modest-msg-edit-window.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 4966223..ae3aa86 100644 --- a/configure.ac +++ b/configure.ac @@ -180,7 +180,7 @@ have_hildon0=false have_gtk=false PKG_CHECK_EXISTS(hildon-1, have_hildon1=true,have_hildon1=false) if test "$have_hildon1" = "true"; then - PKG_CHECK_EXISTS(hildon-1 >= 2.1.0, have_hildon2=true, have_hildon2=false) + PKG_CHECK_EXISTS(hildon-1 >= 2.1.0 hildon-fm-2, have_hildon2=true, have_hildon2=false) PKG_CHECK_MODULES(MODEST_HILDON_WIDGETS,hildon-1 hildon-fm-2) hildonpkgs="hildon-1 hildon-fm-2" detected_toolkit=hildon1 diff --git a/src/gnome/modest-msg-edit-window.c b/src/gnome/modest-msg-edit-window.c index e9cd50a..1fe4b9e 100644 --- a/src/gnome/modest-msg-edit-window.c +++ b/src/gnome/modest-msg-edit-window.c @@ -201,7 +201,7 @@ get_transports (void) while (cursor) { gchar *account_name = cursor->data ? g_strdup((gchar*)cursor->data) : NULL; gchar *from_string = modest_account_mgr_get_from_string (account_mgr, - account_name); + account_name, NULL); if (!from_string) { /* something went wrong: ignore this one */ g_free (account_name); @@ -459,6 +459,7 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg) ModestWindow * modest_msg_edit_window_new (TnyMsg *msg, const gchar *account, + const gchar *mailbox, gboolean preserve_is_rich) { ModestMsgEditWindow *self; @@ -593,8 +594,8 @@ modest_msg_edit_window_get_msg_data (ModestMsgEditWindow *edit_window) account_name = (gchar*)modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->from_field)); if (account_name) - from_string = modest_account_mgr_get_from_string ( - modest_runtime_get_account_mgr(), account_name); + from_string = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr(), + account_name, NULL); if (!from_string) { g_printerr ("modest: cannot get from string\n"); return NULL; @@ -834,7 +835,7 @@ modest_msg_edit_window_remove_attachments (ModestMsgEditWindow *window, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, - message); + "%s", message); g_free (message); dialog_response = (gtk_dialog_run (GTK_DIALOG (confirmation_dialog))==GTK_RESPONSE_OK); gtk_widget_destroy (confirmation_dialog); -- 1.7.9.5