From: Dirk-Jan C. Binnema Date: Tue, 13 Nov 2007 08:44:00 +0000 (+0000) Subject: * coverity fixes: remove unused params, dead code X-Git-Tag: git_migration_finished~2110 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=960da3f965a39552b47357edba59a3a9d748fba6 * coverity fixes: remove unused params, dead code pmo-trunk-r3717 --- diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c index e7832fa..3478e21 100644 --- a/src/maemo/modest-msg-edit-window.c +++ b/src/maemo/modest-msg-edit-window.c @@ -1953,16 +1953,12 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window) void modest_msg_edit_window_offer_attach_file (ModestMsgEditWindow *window) -{ - - ModestMsgEditWindowPrivate *priv; +{ GtkWidget *dialog = NULL; gint response = 0; GSList *uris = NULL; GSList *uri_node; - priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window); - dialog = hildon_file_chooser_dialog_new (GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_OPEN); gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_select_attachment_title")); gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (dialog), TRUE); diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c index e6064c4..df707ab 100644 --- a/src/maemo/modest-msg-view-window.c +++ b/src/maemo/modest-msg-view-window.c @@ -1096,10 +1096,9 @@ void modest_msg_view_window_update_model_replaced( * not care about it's model (msg list). Else if the * header-view shows the folder the msg shown by us is in, we * shall replace our model reference and make some check. */ - if(tny_folder_id == NULL || - !g_str_equal(tny_folder_id, priv->header_folder_id)) + if(tny_folder_id == NULL || !g_str_equal(tny_folder_id, priv->header_folder_id)) return; - + /* Model is changed(replaced), so we should forget the old * one. Because there might be other references and there * might be some change on the model even if we unreferenced @@ -1133,9 +1132,6 @@ void modest_msg_view_window_update_model_replaced( modest_ui_actions_check_toolbar_dimming_rules(MODEST_WINDOW(window)); - if(tny_folder_id == NULL) - return; - g_assert(model != NULL); /* Also we must connect to the new model for row insertions. @@ -1207,15 +1203,12 @@ modest_msg_view_window_get_header (ModestMsgViewWindow *self) TnyMsg* modest_msg_view_window_get_message (ModestMsgViewWindow *self) { - ModestMsgView *msg_view; ModestMsgViewWindowPrivate *priv; - + g_return_val_if_fail (self, NULL); - + priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self); - - msg_view = MODEST_MSG_VIEW (priv->msg_view); - + return tny_msg_view_get_msg (TNY_MSG_VIEW (priv->msg_view)); }