2007-10-10 [colin] 3.0.2cvs55
authorColin Leroy <colin@colino.net>
Wed, 10 Oct 2007 18:00:34 +0000 (18:00 +0000)
committerColin Leroy <colin@colino.net>
Wed, 10 Oct 2007 18:00:34 +0000 (18:00 +0000)
* src/editaddress.c
Initialise error correctly

ChangeLog
PATCHSETS
configure.ac
src/editaddress.c

index 3839f4b8d197291785dc13eab88288a1b68c40e0..cd22507b6b5c5476fb487d4f0449d55413cc90d0 100644 (file)
--- 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
index e0bd847b32d3fedfb7699a4376c4fafe769a4518..d1255d5d3c734e9659217f6e8e2f2d764ee1f901 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 2726b693ed5f1ccaca18f18f630335d4b3ec05d2..d4eaa8a7c2b23c5b7459d18bff89140f6abe3c64 100644 (file)
@@ -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=
 
index ed015211e0d5494e6bdd508ce18db64252b2a6da..ef17f600cd5fba48cf2f4f0badfd8c5b546b241d 100644 (file)
@@ -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();