[grisbi-cvs] [SCM] grisbi branch, grisbi-1.0.x, updated. upstream_version_0_9_90-48-g8c66d76

[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, grisbi-1.0.x has been updated
       via  8c66d76f72a061ef3a9d8be27a70a2a165e6cd41 (commit)
       via  92be360c9831f0530c31ecbdfc52e5e96f4d7d60 (commit)
       via  f84c9084f8fbb66e9e9913337b4ccee733b918f1 (commit)
      from  82a76d87914b7446fcc01a20a8cb13267be76965 (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 8c66d76f72a061ef3a9d8be27a70a2a165e6cd41
Author: pbiava <pierre.biava at nerim.net>
Date:   Sat Jan 19 15:28:38 2013 +0100

    minor change(cherry picked from commit 2131feccad22cd6105c0c9bd880939db6114af45)

commit 92be360c9831f0530c31ecbdfc52e5e96f4d7d60
Author: pbiava <pierre.biava at nerim.net>
Date:   Sat Jan 19 15:12:15 2013 +0100

    prohibits the modification of the voucher for a child transaction(cherry picked from commit a22e4fa2789c827c34ae3a2608c358cedcdb298d)

commit f84c9084f8fbb66e9e9913337b4ccee733b918f1
Author: pbiava <pierre.biava at nerim.net>
Date:   Sat Jan 19 15:03:53 2013 +0100

    fixes the indenting(cherry picked from commit fc8505b0cc88532ae142c62eee0e72e712eca535)

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

Changes:
diff --git a/src/gsb_form.c b/src/gsb_form.c
index 6508d5a..7618aa2 100644
--- a/src/gsb_form.c
+++ b/src/gsb_form.c
@@ -579,55 +579,53 @@ gboolean gsb_form_set_sensitive ( gboolean split,
     GSList *tmp_list;
 
     /* for now, come here only for split or split child */
-    if (!split
-	&&
-	!split_child)
-	return FALSE;
+    if ( !split && !split_child )
+        return FALSE;
 
     tmp_list = gsb_form_widget_get_list ();
 
-    while (tmp_list)
+    while ( tmp_list )
     {
-	struct_element *element;
+        struct_element *element;
 
-	element = tmp_list -> data;
+        element = tmp_list -> data;
 
-	/* for a split, hide the exercice and the budget */
-	if (split)
-	{
-	    switch (element -> element_number)
-	    {
-		case TRANSACTION_FORM_BUDGET:
-		case TRANSACTION_FORM_VOUCHER:
-		    gtk_widget_set_sensitive ( element -> element_widget,
-					       FALSE );
-		    break;
-	    }
-	}
+        /* for a split, hide the exercice and the budget */
+        if ( split )
+        {
+            switch ( element -> element_number )
+            {
+            case TRANSACTION_FORM_EXERCICE:
+            case TRANSACTION_FORM_BUDGET:
+                gtk_widget_set_sensitive ( element -> element_widget, FALSE );
+                break;
+            }
+        }
 
-	/* for a child of split, cannot change the date, payee... */
-	if ( split_child )
-	{
-	    /* mixed widgets for transactions and scheduled transactions */
-	    switch (element -> element_number)
-	    {
-		case TRANSACTION_FORM_DATE:
-		case TRANSACTION_FORM_VALUE_DATE:
-		case TRANSACTION_FORM_PARTY:
-		case TRANSACTION_FORM_DEVISE:
-		case TRANSACTION_FORM_CHANGE:
-		case TRANSACTION_FORM_TYPE:
-		case TRANSACTION_FORM_CHEQUE:
-		case TRANSACTION_FORM_BANK:
-		    gtk_widget_set_sensitive ( element -> element_widget,
-					       FALSE );
-		    break;
-	    }
-	    /* specific widgets for scheduled transactions */
-	    gtk_widget_hide (gsb_form_get_scheduler_part ());
-	}
-	tmp_list = tmp_list -> next;
+        /* for a child of split, cannot change the date, payee... */
+        if ( split_child )
+        {
+            /* mixed widgets for transactions and scheduled transactions */
+            switch ( element -> element_number )
+            {
+            case TRANSACTION_FORM_DATE:
+            case TRANSACTION_FORM_VALUE_DATE:
+            case TRANSACTION_FORM_PARTY:
+            case TRANSACTION_FORM_DEVISE:
+            case TRANSACTION_FORM_CHANGE:
+            case TRANSACTION_FORM_TYPE:
+            case TRANSACTION_FORM_CHEQUE:
+            case TRANSACTION_FORM_BANK:
+            case TRANSACTION_FORM_VOUCHER:
+                gtk_widget_set_sensitive ( element -> element_widget, FALSE );
+                break;
+            }
+            /* specific widgets for scheduled transactions */
+            gtk_widget_hide ( gsb_form_get_scheduler_part () );
+        }
+        tmp_list = tmp_list -> next;
     }
+
     return FALSE;
 }
 
@@ -2744,7 +2742,10 @@ gboolean gsb_form_finish_edition ( void )
 
     /* give the focus to the date widget */
     if ( is_transaction )
-        gsb_form_widget_set_focus ( TRANSACTION_FORM_DATE );
+    {
+        if ( mother_number == 0 )
+            gsb_form_widget_set_focus ( TRANSACTION_FORM_DATE );
+    }
     else
         gsb_scheduler_list_edit_transaction (gsb_scheduler_list_get_current_scheduled_number ());
 


hooks/post-receive
-- 
grisbi