From aa562c8bc5bec4125180a5d3b940610bd93cf823 Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Mon, 25 Jun 2007 12:26:37 +0000 Subject: [PATCH] 2007-06-25 Murray Cumming * libmodest-dbus-client/libmodest-dbus-client.c: (libmodest_dbus_client_search): Fix the build. Sorry. * src/modest-ui-actions.c: (modest_ui_actions_on_new_msg), (reply_forward_cb): Initialize variables to fix the build. * src/modest-tny-account-store.c: (modest_tny_account_store_get_tny_account_by): Fix the account URI comparison (a silly typo) so that email search results can be opened when there are more than one account. pmo-trunk-r2398 --- ChangeLog2 | 12 ++++++++++++ libmodest-dbus-client/libmodest-dbus-client.c | 3 +-- src/modest-tny-account-store.c | 2 +- src/modest-ui-actions.c | 8 ++++---- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/ChangeLog2 b/ChangeLog2 index 7d75478..509aa92 100644 --- a/ChangeLog2 +++ b/ChangeLog2 @@ -1,6 +1,18 @@ 2007-06-25 Murray Cumming * libmodest-dbus-client/libmodest-dbus-client.c: + (libmodest_dbus_client_search): Fix the build. Sorry. + * src/modest-ui-actions.c: (modest_ui_actions_on_new_msg), + (reply_forward_cb): Initialize variables to fix the build. + + * src/modest-tny-account-store.c: + (modest_tny_account_store_get_tny_account_by): Fix the account URI + comparison (a silly typo) so that email search results can be opened + when there are more than one account. + +2007-06-25 Murray Cumming + + * libmodest-dbus-client/libmodest-dbus-client.c: (libmodest_dbus_client_search), (libmodest_dbus_client_get_folders): Use large timeouts (2 minutes) instead of 1 second, because the search gets folders and messages from diff --git a/libmodest-dbus-client/libmodest-dbus-client.c b/libmodest-dbus-client/libmodest-dbus-client.c index 5a6113a..19210d3 100644 --- a/libmodest-dbus-client/libmodest-dbus-client.c +++ b/libmodest-dbus-client/libmodest-dbus-client.c @@ -671,8 +671,6 @@ libmodest_dbus_client_search (osso_context_t *osso_ctx, dbus_message_set_auto_start (msg, TRUE); - dbus_error_init (&err); - /* Use a long timeout (2 minutes) because the search currently * gets folders and messages from the servers. */ timeout = 120000; //milliseconds. @@ -682,6 +680,7 @@ libmodest_dbus_client_search (osso_context_t *osso_ctx, __FUNCTION__); */ /* TODO: Detect the timeout somehow. */ DBusError err; + dbus_error_init (&err); reply = dbus_connection_send_with_reply_and_block (con, msg, timeout, diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c index 1d4409d..46516ac 100644 --- a/src/modest-tny-account-store.c +++ b/src/modest-tny-account-store.c @@ -1127,7 +1127,7 @@ modest_tny_account_store_get_tny_account_by (ModestTnyAccountStore *self, } if (type == MODEST_TNY_ACCOUNT_STORE_QUERY_URL && - tny_account_matches_url_string (TNY_ACCOUNT(cursor->data), val)) { + tny_account_matches_url_string (TNY_ACCOUNT(cursor->data), str)) { account = TNY_ACCOUNT (cursor->data); goto end; } else { diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 439343f..ada3f99 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -486,7 +486,7 @@ modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win) void modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win) { - ModestWindow *msg_win; + ModestWindow *msg_win = NULL; TnyMsg *msg = NULL; TnyFolder *folder = NULL; gchar *account_name = NULL; @@ -785,11 +785,11 @@ reply_forward_cb (ModestMailOperation *mail_op, { TnyMsg *new_msg; ReplyForwardHelper *rf_helper; - ModestWindow *msg_win; + ModestWindow *msg_win = NULL; ModestEditType edit_type; - gchar *from; + gchar *from = NULL; TnyAccount *account = NULL; - ModestWindowMgr *mgr; + ModestWindowMgr *mgr = NULL; gchar *signature = NULL; g_return_if_fail (user_data != NULL); -- 1.7.9.5