From 197bc10de62600f8a9187084a01a9c8457fa06b7 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Wed, 10 Oct 2007 18:00:34 +0000 Subject: [PATCH 1/1] 2007-10-10 [colin] 3.0.2cvs55 * src/editaddress.c Initialise error correctly --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/editaddress.c | 3 ++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3839f4b8d..cd22507b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-10-10 [colin] 3.0.2cvs55 + + * src/editaddress.c + Initialise error correctly + 2007-10-10 [paul] 3.0.2cvs54 * src/prefs_filtering_action.c diff --git a/PATCHSETS b/PATCHSETS index e0bd847b3..d1255d5d3 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2967,3 +2967,4 @@ ( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/printing.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/printing.h; ) > 3.0.2cvs52.patchset ( cvs diff -u -r 1.9.2.19 -r 1.9.2.20 src/addressadd.c; cvs diff -u -r 1.14.2.35 -r 1.14.2.36 src/editaddress.c; cvs diff -u -r 1.8.2.25 -r 1.8.2.26 src/headerview.c; cvs diff -u -r 1.96.2.186 -r 1.96.2.187 src/textview.c; ) > 3.0.2cvs53.patchset ( cvs diff -u -r 1.1.4.40 -r 1.1.4.41 src/prefs_filtering_action.c; cvs diff -u -r 1.5.2.23 -r 1.5.2.24 src/gtk/description_window.c; cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/gtk/foldersort.c; cvs diff -u -r 1.1.2.79 -r 1.1.2.80 src/gtk/quicksearch.c; ) > 3.0.2cvs54.patchset +( cvs diff -u -r 1.14.2.36 -r 1.14.2.37 src/editaddress.c; ) > 3.0.2cvs55.patchset diff --git a/configure.ac b/configure.ac index 2726b693e..d4eaa8a7c 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=2 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=54 +EXTRA_VERSION=55 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/editaddress.c b/src/editaddress.c index ed015211e..ef17f600c 100644 --- a/src/editaddress.c +++ b/src/editaddress.c @@ -742,6 +742,7 @@ static void addressbook_edit_person_set_picture(GtkWidget *widget, alertpanel_error(_("Failed to import image: \n%s"), error->message); g_error_free(error); + error = NULL; } personeditdlg.picture_set = TRUE; g_free(filename); @@ -1383,7 +1384,7 @@ static gboolean addressbook_edit_person_close( gboolean cancelled ) { GList *listEMail = NULL; GList *listAttrib = NULL; - GError *error; + GError *error = NULL; gchar *cn = NULL; listEMail = edit_person_build_email_list(); -- 2.25.1