From: Sergio Villar Senín Date: Fri, 8 May 2009 08:34:26 +0000 (+0200) Subject: Original patch by Dmitry Kazachkov X-Git-Tag: 3.0.17-rc3~3 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=54b2b4b64a81caaf214c47da59057b54bf7b067c Original patch by Dmitry Kazachkov Fixes several coverity issues. --- diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c index 1ed7dea..7f0ee82 100644 --- a/src/modest-account-mgr.c +++ b/src/modest-account-mgr.c @@ -959,7 +959,7 @@ modest_account_mgr_get_list (ModestAccountMgr *self, const gchar *name, const gchar *key, ModestConfValueType list_type, gboolean server_account) { - ModestAccountMgrPrivate *priv = MODEST_ACCOUNT_MGR_GET_PRIVATE (self); + ModestAccountMgrPrivate *priv = NULL; const gchar *keyname; GSList *retval; diff --git a/src/modest-datetime-formatter.c b/src/modest-datetime-formatter.c index 630022b..9678420 100644 --- a/src/modest-datetime-formatter.c +++ b/src/modest-datetime-formatter.c @@ -188,10 +188,6 @@ init_format (ModestDatetimeFormatter *obj) static void modest_datetime_formatter_instance_init (ModestDatetimeFormatter *obj) { - ModestDatetimeFormatterPrivate *priv; - - priv = MODEST_DATETIME_FORMATTER_GET_PRIVATE (obj); - init_format (obj); } diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index c9986db..4f277ab 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -665,7 +665,7 @@ send_mail_on_sync_async_cb (TnyFolder *folder, self = helper->mail_op; priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - if (cancelled || err) + if (cancelled) goto end; if (err) { @@ -750,7 +750,7 @@ send_mail_on_added_to_outbox (TnySendQueue *send_queue, self = helper->mail_op; priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self); - if (cancelled || err) + if (cancelled) goto end; if (err) { diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 18468d8..b191daa 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -2643,7 +2643,6 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, gboolean selected, ModestMainWindow *main_window) { - ModestConf *conf; GtkWidget *header_view; g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window)); @@ -2653,7 +2652,6 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, if (!header_view) return; - conf = modest_runtime_get_conf (); if (TNY_IS_ACCOUNT (folder_store)) { if (selected) { @@ -2665,14 +2663,11 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view, } else { if (TNY_IS_FOLDER (folder_store) && selected) { TnyAccount *account; - const gchar *account_name = NULL; /* Update the active account */ account = modest_tny_folder_get_account (TNY_FOLDER (folder_store)); if (account) { set_active_account_from_tny_account (account, MODEST_WINDOW (main_window)); - account_name = - modest_tny_account_get_parent_modest_account_name_for_server_account (account); g_object_unref (account); account = NULL; } @@ -2850,13 +2845,11 @@ static gboolean enough_space_for_message (ModestMsgEditWindow *edit_window, MsgData *data) { - TnyAccountStore *acc_store; guint64 available_disk, expected_size; gint parts_count; guint64 parts_size; /* Check size */ - acc_store = TNY_ACCOUNT_STORE (modest_runtime_get_account_store()); available_disk = modest_utils_get_available_space (NULL); modest_msg_edit_window_get_parts_size (edit_window, &parts_count, &parts_size); expected_size = modest_tny_msg_estimate_size (data->plain_body, @@ -6636,7 +6629,8 @@ modest_ui_actions_get_msg_already_deleted_error_msg (ModestWindow *win) #endif } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) { header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win)); - folder = TNY_FOLDER_STORE (tny_header_get_folder (header)); + if (header) + folder = TNY_FOLDER_STORE (tny_header_get_folder (header)); } if (!header || !folder) diff --git a/src/modest-utils.c b/src/modest-utils.c index 7fe1833..1cce3fd 100644 --- a/src/modest-utils.c +++ b/src/modest-utils.c @@ -961,7 +961,8 @@ modest_utils_fill_country_model (GtkTreeModel *model, gint *locale_mcc) file = modest_utils_open_mcc_mapping_file (&translated); if (!file) { - g_warning("Could not open mcc_mapping file"); + g_warning ("Could not open mcc_mapping file"); + return; } /* Get the territory specified for the current locale */ diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c index 9e1b0d8..7f0f0f7 100644 --- a/src/widgets/modest-header-view.c +++ b/src/widgets/modest-header-view.c @@ -806,7 +806,6 @@ TnyList * modest_header_view_get_selected_headers (ModestHeaderView *self) { GtkTreeSelection *sel; - ModestHeaderViewPrivate *priv; TnyList *header_list = NULL; TnyHeader *header; GList *list, *tmp = NULL; @@ -815,7 +814,6 @@ modest_header_view_get_selected_headers (ModestHeaderView *self) g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), NULL); - priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); /* Get selected rows */ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); @@ -1452,14 +1450,12 @@ on_header_row_activated (GtkTreeView *treeview, GtkTreePath *path, GtkTreeViewColumn *column, gpointer userdata) { ModestHeaderView *self = NULL; - ModestHeaderViewPrivate *priv = NULL; GtkTreeIter iter; GtkTreeModel *model = NULL; TnyHeader *header = NULL; TnyHeaderFlags flags; self = MODEST_HEADER_VIEW (treeview); - priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); model = gtk_tree_view_get_model (treeview); if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path))) @@ -1502,14 +1498,12 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) GtkTreePath *path = NULL; GtkTreeIter iter; ModestHeaderView *self; - ModestHeaderViewPrivate *priv; GList *selected = NULL; g_return_if_fail (sel); g_return_if_fail (user_data); self = MODEST_HEADER_VIEW (user_data); - priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); selected = gtk_tree_selection_get_selected_rows (sel, &model); if (selected != NULL) @@ -2122,7 +2116,13 @@ filter_row (GtkTreeModel *model, gtk_tree_model_get_value (model, iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &value); header = (TnyHeader *) g_value_get_object (&value); g_value_unset (&value); - + + /* Get message id from header (ensure is a valid id) */ + if (!header) { + visible = FALSE; + goto frees; + } + /* Hide deleted and mark as deleted heders */ if (flags & TNY_HEADER_FLAG_DELETED || flags & TNY_HEADER_FLAG_EXPUNGED) { @@ -2150,21 +2150,15 @@ filter_row (GtkTreeModel *model, if (modest_email_clipboard_cleared(priv->clipboard)) { visible = TRUE; goto frees; - } - - /* Get message id from header (ensure is a valid id) */ - if (!header) { - visible = FALSE; - goto frees; } - + /* Check hiding */ if (priv->hidding_ids != NULL) { id = tny_header_dup_message_id (header); for (i=0; i < priv->n_selected && !found; i++) if (priv->hidding_ids[i] != NULL && id != NULL) found = (!strcmp (priv->hidding_ids[i], id)); - + visible = !found; g_free(id); } @@ -2173,18 +2167,21 @@ filter_row (GtkTreeModel *model, old_status = priv->status; priv->status = ((gboolean) priv->status) && !visible; if ((priv->notify_status) && (priv->status != old_status)) { - NotifyFilterInfo *info; - if (priv->status_timeout) g_source_remove (priv->status_timeout); - info = g_slice_new0 (NotifyFilterInfo); - info->self = g_object_ref (G_OBJECT (user_data)); - info->folder = tny_header_get_folder (header); - priv->status_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT, 1000, - notify_filter_change, - info, - notify_filter_change_destroy); + if (header) { + NotifyFilterInfo *info; + + info = g_slice_new0 (NotifyFilterInfo); + info->self = g_object_ref (G_OBJECT (user_data)); + if (header) + info->folder = tny_header_get_folder (header); + priv->status_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT, 1000, + notify_filter_change, + info, + notify_filter_change_destroy); + } } return visible; diff --git a/src/widgets/modest-progress-bar.c b/src/widgets/modest-progress-bar.c index a871ab9..1361f41 100644 --- a/src/widgets/modest-progress-bar.c +++ b/src/widgets/modest-progress-bar.c @@ -349,11 +349,6 @@ modest_progress_bar_cancel_current_operation (ModestProgressObject *self) static void modest_progress_bar_cancel_all_operations (ModestProgressObject *self) { - ModestProgressBar *me; - ModestProgressBarPrivate *priv; - - me = MODEST_PROGRESS_BAR (self); - priv = MODEST_PROGRESS_BAR_GET_PRIVATE (me); /* Cancel all the mail operations */ modest_mail_operation_queue_cancel_all (modest_runtime_get_mail_operation_queue ()); diff --git a/src/widgets/modest-recpt-editor.c b/src/widgets/modest-recpt-editor.c index d1a5c89..c1e2fef 100644 --- a/src/widgets/modest-recpt-editor.c +++ b/src/widgets/modest-recpt-editor.c @@ -1050,11 +1050,9 @@ static void modest_recpt_editor_class_init (ModestRecptEditorClass *klass) { GObjectClass *object_class; - GtkWidgetClass *widget_class; parent_class = g_type_class_peek_parent (klass); object_class = (GObjectClass*) klass; - widget_class = GTK_WIDGET_CLASS (klass); object_class->finalize = modest_recpt_editor_finalize; diff --git a/src/widgets/modest-recpt-view.c b/src/widgets/modest-recpt-view.c index cb8511c..ba19dbe 100644 --- a/src/widgets/modest-recpt-view.c +++ b/src/widgets/modest-recpt-view.c @@ -226,11 +226,9 @@ static void modest_recpt_view_class_init (ModestRecptViewClass *klass) { GObjectClass *object_class; - GtkWidgetClass *widget_class; parent_class = g_type_class_peek_parent (klass); object_class = (GObjectClass*) klass; - widget_class = GTK_WIDGET_CLASS (klass); object_class->finalize = modest_recpt_view_finalize; diff --git a/src/widgets/modest-scroll-text.c b/src/widgets/modest-scroll-text.c index a2b2c93..200cdb9 100644 --- a/src/widgets/modest-scroll-text.c +++ b/src/widgets/modest-scroll-text.c @@ -240,11 +240,9 @@ static void modest_scroll_text_class_init (ModestScrollTextClass *klass) { GObjectClass *object_class; - GtkWidgetClass *widget_class; parent_class = g_type_class_peek_parent (klass); object_class = (GObjectClass*) klass; - widget_class = GTK_WIDGET_CLASS (klass); object_class->finalize = modest_scroll_text_finalize; diff --git a/src/widgets/modest-window-mgr.c b/src/widgets/modest-window-mgr.c index 9c71594..f4ab915 100644 --- a/src/widgets/modest-window-mgr.c +++ b/src/widgets/modest-window-mgr.c @@ -605,13 +605,9 @@ static void modest_window_mgr_unregister_window_default (ModestWindowMgr *self, ModestWindow *window) { - ModestWindowMgrPrivate *priv; - g_return_if_fail (MODEST_IS_WINDOW_MGR (self)); g_return_if_fail (MODEST_IS_WINDOW (window)); - priv = MODEST_WINDOW_MGR_GET_PRIVATE (self); - /* Save state */ modest_window_save_state (window);