[evolution] Fix more compiler warnings.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Fix more compiler warnings.
- Date: Sat, 3 Mar 2012 20:22:40 +0000 (UTC)
commit ad543e66844ff509f3db3d31c1c63b2ea512461f
Author: Matthew Barnes <mbarnes redhat com>
Date: Sat Mar 3 15:22:13 2012 -0500
Fix more compiler warnings.
libemail-engine/mail-ops.c | 2 +-
mail/em-filter-editor-folder-element.c | 12 ------------
mail/em-utils.c | 13 +++++++------
3 files changed, 8 insertions(+), 19 deletions(-)
---
diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c
index d62b5c6..3e40bd0 100644
--- a/libemail-engine/mail-ops.c
+++ b/libemail-engine/mail-ops.c
@@ -219,7 +219,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m,
CamelService *service;
CamelSession *session;
CamelURL *url;
- gboolean is_local_delivery;
+ gboolean is_local_delivery = FALSE;
const gchar *uid;
gint i;
diff --git a/mail/em-filter-editor-folder-element.c b/mail/em-filter-editor-folder-element.c
index f4ec559..025693c 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 f30a26f..4d74b80 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;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]