diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/em-filter-editor-folder-element.c | 12 | ||||
| -rw-r--r-- | mail/em-utils.c | 13 |
2 files changed, 7 insertions, 18 deletions
diff --git a/mail/em-filter-editor-folder-element.c b/mail/em-filter-editor-folder-element.c index f4ec559157..025693cc80 100644 --- a/mail/em-filter-editor-folder-element.c +++ b/mail/em-filter-editor-folder-element.c @@ -143,17 +143,6 @@ filter_editor_folder_element_dispose (GObject *object) G_OBJECT_CLASS (em_filter_editor_folder_element_parent_class)->dispose (object); } -static void -filter_editor_folder_element_finalize (GObject *object) -{ - EMFilterEditorFolderElementPrivate *priv; - - priv = EM_FILTER_EDITOR_FOLDER_ELEMENT_GET_PRIVATE (object); - - /* Chain up to parent's finalize() method. */ - G_OBJECT_CLASS (em_filter_editor_folder_element_parent_class)->finalize (object); -} - static GtkWidget * filter_editor_folder_element_get_widget (EFilterElement *fe) { @@ -188,7 +177,6 @@ em_filter_editor_folder_element_class_init (EMFilterEditorFolderElementClass *cl object_class->set_property = filter_editor_folder_element_set_property; object_class->get_property = filter_editor_folder_element_get_property; object_class->dispose = filter_editor_folder_element_dispose; - object_class->finalize = filter_editor_folder_element_finalize; filter_element_class = E_FILTER_ELEMENT_CLASS (class); filter_element_class->get_widget = filter_editor_folder_element_get_widget; diff --git a/mail/em-utils.c b/mail/em-utils.c index f30a26fc8e..4d74b80a13 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -891,7 +891,8 @@ em_utils_build_export_filename (CamelFolder *folder, const gchar *tmpdir) { CamelMessageInfo *info; - gchar *file, *tmpfile; + gchar *file = NULL; + gchar *tmpfile = NULL; struct tm *ts; gchar datetmp[15]; @@ -927,11 +928,11 @@ em_utils_build_export_filename (CamelFolder *folder, } - e_filename_make_safe (file); - - tmpfile = g_build_filename (tmpdir, file, NULL); - - g_free (file); + if (file != NULL) { + e_filename_make_safe (file); + tmpfile = g_build_filename (tmpdir, file, NULL); + g_free (file); + } return tmpfile; } |