[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9_5-64-ga181f30

[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  a181f3078143e5c742c5dcde99d264c024ac67a0 (commit)
      from  15d5605ba7ea0500ce909baebbfe1e5ae16a8e5c (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 a181f3078143e5c742c5dcde99d264c024ac67a0
Author: pbiava <pierre.biava at nerim.net>
Date:   Wed Feb 15 22:16:11 2012 +0100

    fixed a bug to display OK button

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

Changes:
diff --git a/src/bet_future.c b/src/bet_future.c
index b243100..36ca31c 100644
--- a/src/bet_future.c
+++ b/src/bet_future.c
@@ -1817,6 +1817,11 @@ gboolean bet_transfert_new_line_dialog ( GtkTreeModel *tab_model,
     if ( bet_transfert_dialog == NULL )
     {
         bet_transfert_dialog = bet_transfert_create_dialog ( account_number );
+        if ( bet_transfert_dialog == NULL )
+        {
+            dialogue_warning ( _("You must create at least one cash account") );
+            return FALSE;
+        }
     }
     else
     {
@@ -1834,11 +1839,8 @@ gboolean bet_transfert_new_line_dialog ( GtkTreeModel *tab_model,
     gsb_form_widget_set_empty ( widget, FALSE );
     gsb_calendar_entry_set_date ( widget, date );
 
-    gtk_dialog_set_response_sensitive ( GTK_DIALOG ( bet_transfert_dialog ),
-                        GTK_RESPONSE_OK, FALSE );
-
 dialog_return:
-	result = gtk_dialog_run ( GTK_DIALOG ( bet_transfert_dialog ) );
+    result = gtk_dialog_run ( GTK_DIALOG ( bet_transfert_dialog ) );
 
     if ( result == GTK_RESPONSE_OK )
     {
@@ -1910,19 +1912,19 @@ GtkWidget *bet_transfert_create_dialog ( gint account_number )
 
     /* Create the dialog */
     dialog = gtk_dialog_new_with_buttons ( _("Select an account"),
-					   GTK_WINDOW ( run.window ),
-					   GTK_DIALOG_MODAL,
-					   GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-					   GTK_STOCK_OK, GTK_RESPONSE_OK,
-					   NULL );
+                        GTK_WINDOW ( run.window ),
+                        GTK_DIALOG_MODAL,
+                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+                        GTK_STOCK_OK, GTK_RESPONSE_OK,
+                        NULL );
 
     gtk_window_set_position ( GTK_WINDOW ( dialog ), GTK_WIN_POS_CENTER_ON_PARENT );
     gtk_window_set_resizable ( GTK_WINDOW ( dialog ), TRUE );
     gtk_dialog_set_default_response ( GTK_DIALOG ( dialog ), GTK_RESPONSE_OK );
 
-	vbox = gtk_vbox_new ( FALSE, 0 );
-	gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog )->vbox ), vbox, TRUE, TRUE, 0 );
-	gtk_container_set_border_width ( GTK_CONTAINER ( vbox ), 12 );
+    vbox = gtk_vbox_new ( FALSE, 0 );
+    gtk_box_pack_start ( GTK_BOX ( GTK_DIALOG ( dialog )->vbox ), vbox, TRUE, TRUE, 0 );
+    gtk_container_set_border_width ( GTK_CONTAINER ( vbox ), 12 );
 
     /* list of accounts */
     paddingbox = new_paddingbox_with_title (vbox, FALSE,  _("List of accounts") );
@@ -1940,6 +1942,10 @@ GtkWidget *bet_transfert_create_dialog ( gint account_number )
 
     /* create the account list */
     tree_view = bet_transfert_create_account_list_part ( dialog, account_number );
+
+    if ( tree_view == NULL )
+        return NULL;
+
     gtk_container_add (GTK_CONTAINER ( sw ), tree_view );
     gtk_container_set_resize_mode (GTK_CONTAINER ( sw ), GTK_RESIZE_PARENT );
 
@@ -2092,7 +2098,7 @@ GtkWidget *bet_transfert_create_account_list_part ( GtkWidget *dialog, gint acco
             }
         }
 
-	    tmp_list = tmp_list -> next;
+        tmp_list = tmp_list -> next;
     }
 
     tmp_list = gsb_data_partial_balance_get_list ( );


hooks/post-receive
-- 
grisbi