don't print a warning to the console if the "self" contact does not yet

2007-04-21  Jens Granseuer  <jensgr@gmx.net>

	* 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
This commit is contained in:
Jens Granseuer 2007-04-21 19:03:59 +00:00 committed by Jens Granseuer
parent 94cf357974
commit edafff81d6
2 changed files with 10 additions and 5 deletions

View file

@ -1,3 +1,9 @@
2007-04-21 Jens Granseuer <jensgr@gmx.net>
* 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 <jensgr@gmx.net> 2007-04-08 Jens Granseuer <jensgr@gmx.net>
Patch by: Kristof Vansant <de_lupus@pandora.be> Patch by: Kristof Vansant <de_lupus@pandora.be>

View file

@ -799,17 +799,16 @@ about_me_setup_dialog (void)
if (error->code == E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED) { 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" \ about_me_error (NULL, _("There was an error while trying to get the addressbook information\n" \
"Evolution Data Server can't handle the protocol")); "Evolution Data Server can't handle the protocol"));
g_clear_error (&error);
about_me_destroy (me); about_me_destroy (me);
return -1; return -1;
} }
me->create_self = TRUE;
me->contact = e_contact_new ();
g_warning ("%s\n", error->message);
g_clear_error (&error); g_clear_error (&error);
me->create_self = TRUE;
me->contact = e_contact_new ();
if (me->book == NULL) { if (me->book == NULL) {
me->book = e_book_new_system_addressbook (&error); me->book = e_book_new_system_addressbook (&error);
if (me->book == NULL || error != NULL) { if (me->book == NULL || error != NULL) {