[grisbi-cvs] [SCM] grisbi branch, master, updated. f24c62ed2c08c8661254313c4f505ca6f0399348

[Pierre Biava]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grisbi".

The branch, master has been updated
       via  f24c62ed2c08c8661254313c4f505ca6f0399348 (commit)
      from  c2c7d9331da41fd97b790f1de7c709fc4885a887 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f24c62ed2c08c8661254313c4f505ca6f0399348
Author: pbiava <pierre.biava at nerim.net>
Date:   Mon Aug 9 20:23:24 2010 +0200

    fixed bug 1148

-----------------------------------------------------------------------

Changes:
diff --git a/src/import.c b/src/import.c
index f682e46..6aaf8ee 100644
--- a/src/import.c
+++ b/src/import.c
@@ -3454,29 +3454,33 @@ gboolean click_sur_liste_opes_orphelines ( GtkCellRendererToggle *renderer,
  */
 G_MODULE_EXPORT gchar * unique_imported_name ( gchar * account_name )
 {
-    GSList * tmp_list = liste_comptes_importes;
-    gchar * basename = my_strdup (account_name);
+    GSList *tmp_list;
+    gchar *basename;
     gint iter = 1;
 
+    tmp_list = liste_comptes_importes;
+    basename = my_strdup ( account_name );
     if ( !liste_comptes_importes )
-    return basename;
+        return basename;
 
     do
     {
-    struct struct_compte_importation * tmp_account;
+        struct struct_compte_importation *tmp_account;
 
-    tmp_account = (struct struct_compte_importation *) tmp_list -> data;
+        tmp_account = (struct struct_compte_importation *) tmp_list -> data;
 
-    if ( !strcmp ( basename, tmp_account -> nom_de_compte ) )
-    {
-        tmp_list = liste_comptes_importes;
-        g_free (basename);
-        basename = g_strdup_printf ( _("%s #%d"), account_name, ++iter );
-    }
-    else
-    {
-        tmp_list = tmp_list -> next;
-    }
+        if ( tmp_account -> nom_de_compte == NULL )
+            tmp_account -> nom_de_compte = g_strdup ( basename );
+
+        if ( !strcmp ( basename, tmp_account -> nom_de_compte ) )
+        {
+            tmp_list = liste_comptes_importes;
+
+            g_free (basename);
+            basename = g_strdup_printf ( _("%s #%d"), account_name, ++iter );
+        }
+        else
+            tmp_list = tmp_list -> next;
     }
     while ( tmp_list );
 


hooks/post-receive
-- 
grisbi