[grisbi-cvs] grisbi/src gsb_data_account.c, 1.83, 1.84 gsb_scheduler_list.c, 1.67, 1.68 metatree.c, 1.136, 1.137

[Pierre Biava]

Update of /cvsroot/grisbi/grisbi/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv12827/src

Modified Files:
	gsb_data_account.c gsb_scheduler_list.c metatree.c 
Log Message:
Fixed a bug in the display of the payees in the transactions of the trees of categories

Index: metatree.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/metatree.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- metatree.c	4 Jun 2009 20:11:31 -0000	1.136
+++ metatree.c	9 Jun 2009 21:19:30 -0000	1.137
@@ -425,47 +425,47 @@
 
     string = gsb_data_transaction_get_notes ( transaction_number);
 
-    if (string)
+    if ( string && strlen ( string ) > 0 )
     {
-	if ( strlen ( gsb_data_transaction_get_notes ( transaction_number)) > 30 )
-	{
-	    const gchar *tmp;
+        if ( strlen ( string ) > 30 )
+        {
+            const gchar *tmp;
 
-	    tmp = string + 30;
+            tmp = string + 30;
 
-	    tmp = strchr ( tmp, ' ' );
-	    if ( !tmp )
-	    {
-		/* We do not risk splitting the string
-		   in the middle of a UTF-8 accent
-		   ... the end is probably near btw. */
-		notes = my_strdup (gsb_data_transaction_get_notes ( transaction_number));
-	    }
-	    else 
-	    {
-		gchar * trunc = g_strndup ( gsb_data_transaction_get_notes ( transaction_number), 
-					    (tmp - string));
-		notes = g_strconcat ( trunc, " ...", NULL );
-		g_free ( trunc );
-	    }
-	}
-	else 
-	{
-	    notes = my_strdup (gsb_data_transaction_get_notes ( transaction_number));
-	}
+            tmp = strchr ( tmp, ' ' );
+            if ( !tmp )
+            {
+                /* We do not risk splitting the string
+                   in the middle of a UTF-8 accent
+                   ... the end is probably near btw. */
+                notes = my_strdup ( string );
+            }
+            else 
+            {
+                gchar * trunc = g_strndup ( string, ( tmp - string ) );
+                notes = g_strconcat ( trunc, " ...", NULL );
+                g_free ( trunc );
+            }
+        }
+        else 
+        {
+            notes = my_strdup ( string );
+        }
     }
     else
     {
-	notes = my_strdup (gsb_data_payee_get_name (gsb_data_transaction_get_party_number (transaction_number),
-						   TRUE));
+        notes = my_strdup (gsb_data_payee_get_name (
+                        gsb_data_transaction_get_party_number ( transaction_number),
+                        TRUE));
     }
 
     label = gsb_format_gdate ( gsb_data_transaction_get_date (transaction_number));
  
     if ( notes )
     {
-	label = g_strconcat ( label, " : ", notes, NULL );
-	g_free (notes); 
+        label = g_strconcat ( label, " : ", notes, NULL );
+        g_free (notes); 
     }
 
     if ( gsb_data_transaction_get_mother_transaction_number ( transaction_number))

Index: gsb_data_account.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_data_account.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- gsb_data_account.c	7 Jun 2009 21:35:31 -0000	1.83
+++ gsb_data_account.c	9 Jun 2009 21:19:30 -0000	1.84
@@ -967,7 +967,7 @@
     gsb_real marked_balance;
     gint floating_point;
 
-    devel_debug_int ( account_number );
+    //~ devel_debug_int ( account_number );
     account = gsb_data_account_get_structure ( account_number );
 
     if ( !account )

Index: gsb_scheduler_list.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/gsb_scheduler_list.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- gsb_scheduler_list.c	17 May 2009 15:53:25 -0000	1.67
+++ gsb_scheduler_list.c	9 Jun 2009 21:19:30 -0000	1.68
@@ -702,7 +702,7 @@
     const gchar *line[SCHEDULER_COL_VISIBLE_COLUMNS];
     gint mother_scheduled_number;
 
-    devel_debug_int (scheduled_number);
+    //~ devel_debug_int (scheduled_number);
 
     if (!tree_model_scheduler_list)
 	return FALSE;