sync with 0.8.0cvs3

[claws.git] / src / editaddress.c

diff --git a/src/editaddress.c b/src/editaddress.c
index 31644e91f83829bc91b562424957256b6aaa169d..55ab6254f2991dd53b3f601e34938a4097baa873 100644 (file)
--- a/src/editaddress.c
+++ b/src/editaddress.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -161,7 +161,6 @@ static void edit_person_set_window_title( gint pageNum ) {
                        name = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_name), 0, -1 );
                        sTitle = g_strdup_printf( "%s - %s", _title_edit_, name );
                        g_free( name );
-                                       
                }
                gtk_window_set_title( GTK_WINDOW(personeditdlg.window), sTitle );
                g_free( sTitle );
@@ -263,12 +262,15 @@ static void edit_person_email_delete( gpointer data ) {
 
 static ItemEMail *edit_person_email_edit( gboolean *error, ItemEMail *email ) {
        ItemEMail *retVal = NULL;
-       gchar *sEmail, *sAlias, *sRemarks, *tEmail;
+       gchar *sEmail, *sAlias, *sRemarks, *sEmail_;
+
        *error = TRUE;
-       tEmail = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_email), 0, -1 );
+       sEmail_ = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_email), 0, -1 );
        sAlias = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_alias), 0, -1 );
        sRemarks = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_remarks), 0, -1 );
-       sEmail = mgu_email_check_empty( tEmail );
+       sEmail = mgu_email_check_empty( sEmail_ );
+       g_free( sEmail_ );
+
        if( sEmail ) {
                if( email == NULL ) {
                        email = addritem_create_item_email();
@@ -282,10 +284,11 @@ static ItemEMail *edit_person_email_edit( gboolean *error, ItemEMail *email ) {
        else {
                edit_person_status_show( _( "An E-Mail address must be supplied." ) );
        }
-       g_free( tEmail );
+
        g_free( sEmail );
        g_free( sAlias );
        g_free( sRemarks );
+
        return retVal;
 }
 
@@ -396,12 +399,16 @@ static void edit_person_attrib_delete( gpointer data ) {
 
 static UserAttribute *edit_person_attrib_edit( gboolean *error, UserAttribute *attrib ) {
        UserAttribute *retVal = NULL;
-       gchar *sName, *sValue, *tName, *tValue;
+       gchar *sName, *sValue, *sName_, *sValue_;
+
        *error = TRUE;
-       tName = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_atname), 0, -1 );
-       tValue = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_atvalue), 0, -1 );
-       sName = mgu_email_check_empty( tName );
-       sValue = mgu_email_check_empty( tValue );
+       sName_ = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_atname), 0, -1 );
+       sValue_ = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_atvalue), 0, -1 );
+       sName = mgu_email_check_empty( sName_ );
+       sValue = mgu_email_check_empty( sValue_ );
+       g_free( sName_ );
+       g_free( sValue_ );
+
        if( sName && sValue ) {
                if( attrib == NULL ) {
                        attrib = addritem_create_attribute();
@@ -414,10 +421,10 @@ static UserAttribute *edit_person_attrib_edit( gboolean *error, UserAttribute *a
        else {
                edit_person_status_show( _( "A Name and Value must be supplied." ) );
        }
-       g_free( tName );
+
        g_free( sName );
-       g_free( tValue );
        g_free( sValue );
+
        return retVal;
 }
 
@@ -1002,11 +1009,11 @@ ItemPerson *addressbook_edit_person( AddressBookFile *abf, ItemFolder *parent, I
                }
        }
 
-       if( ! cancelled ) {
+       if( !cancelled ) {
                /* Set person stuff */
                gchar *name;
                addritem_person_set_common_name( person, cn );
-               name = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_first), 0, -1 ); 
+               name = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_first), 0, -1 );
                addritem_person_set_first_name( person, name );
                g_free( name );
                name = gtk_editable_get_chars( GTK_EDITABLE(personeditdlg.entry_last), 0, -1 );