From edafff81d6a94a4853361f91ca3c5a225cbbbae8 Mon Sep 17 00:00:00 2001 From: Jens Granseuer Date: Sat, 21 Apr 2007 19:03:59 +0000 Subject: [PATCH] don't print a warning to the console if the "self" contact does not yet 2007-04-21 Jens Granseuer * gnome-about-me.c: (about_me_setup_dialog): don't print a warning to the console if the "self" contact does not yet exist (closes bug #419332). Also fix a small memory leak svn path=/trunk/; revision=7480 --- capplets/about-me/ChangeLog | 6 ++++++ capplets/about-me/gnome-about-me.c | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/capplets/about-me/ChangeLog b/capplets/about-me/ChangeLog index 5961d566d..992440579 100644 --- a/capplets/about-me/ChangeLog +++ b/capplets/about-me/ChangeLog @@ -1,3 +1,9 @@ +2007-04-21 Jens Granseuer + + * gnome-about-me.c: (about_me_setup_dialog): don't print a warning to + the console if the "self" contact does not yet exist (closes bug + #419332). Also fix a small memory leak + 2007-04-08 Jens Granseuer Patch by: Kristof Vansant diff --git a/capplets/about-me/gnome-about-me.c b/capplets/about-me/gnome-about-me.c index 4c4211e96..d8b2a082a 100644 --- a/capplets/about-me/gnome-about-me.c +++ b/capplets/about-me/gnome-about-me.c @@ -799,17 +799,16 @@ about_me_setup_dialog (void) if (error->code == E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED) { about_me_error (NULL, _("There was an error while trying to get the addressbook information\n" \ "Evolution Data Server can't handle the protocol")); + g_clear_error (&error); about_me_destroy (me); return -1; } - me->create_self = TRUE; - - me->contact = e_contact_new (); - - g_warning ("%s\n", error->message); g_clear_error (&error); + me->create_self = TRUE; + me->contact = e_contact_new (); + if (me->book == NULL) { me->book = e_book_new_system_addressbook (&error); if (me->book == NULL || error != NULL) {