diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/pst-import/pst-importer.c | 2 | ||||
| -rw-r--r-- | plugins/publish-calendar/publish-calendar.c | 2 | ||||
| -rw-r--r-- | plugins/templates/templates.c | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index e691962f67..768d1b17c0 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -867,7 +867,7 @@ pst_import_folders (PstImporter *m, d_ptr = d_ptr->next; } else { - while (d_ptr != topitem && d_ptr->next == NULL) { + while (d_ptr && d_ptr != topitem && d_ptr->next == NULL) { if (m->folder) { g_object_unref (m->folder); m->folder = NULL; diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c index 9a06c45b38..7175050aff 100644 --- a/plugins/publish-calendar/publish-calendar.c +++ b/plugins/publish-calendar/publish-calendar.c @@ -279,7 +279,7 @@ mount_ready_cb (GObject *source_object, g_file_mount_enclosing_volume_finish (G_FILE (source_object), result, &error); if (error) { - error_queue_add (g_strdup_printf (_("Mount of %s failed:"), ms->uri->location), error); + error_queue_add (g_strdup_printf (_("Mount of %s failed:"), ms ? ms->uri->location : "???"), error); if (ms) g_object_unref (ms->mount_op); diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index 0738e475c2..5416a8f8f9 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -530,9 +530,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) g_strfreev (temp); } - if (clue_list) { - g_strfreev (clue_list); - } + g_strfreev (clue_list); /* Add the list here */ |