[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9_1-11-g66cff3c

[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  66cff3ce75c1c2806006f00d569bfe00dbaa2089 (commit)
      from  7fbe090d5557dcf5a946773b61e20877111c01b3 (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 66cff3ce75c1c2806006f00d569bfe00dbaa2089
Author: pbiava <pierre.biava at nerim.net>
Date:   Fri Apr 29 21:45:55 2011 +0200

    Fixed a display problem of split transactions in the budget module

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

Changes:
diff --git a/src/bet_tab.c b/src/bet_tab.c
index 11f0e97..176b4b9 100644
--- a/src/bet_tab.c
+++ b/src/bet_tab.c
@@ -994,8 +994,7 @@ void bet_array_refresh_transactions_data ( GtkTreeModel *tab_model,
             continue;
 
         /* ignore splitted transactions */
-        if ( gsb_data_transaction_get_mother_transaction_number (
-         transaction_number ) != 0 )
+        if ( gsb_data_transaction_get_split_of_transaction ( transaction_number ) == TRUE )
             continue;
 
         /* Ignore transactions that are before date_com */
@@ -2769,7 +2768,7 @@ gboolean bet_array_list_replace_planned_line_by_transfert ( GtkTreeModel *tab_mo
             {
                 /* on cherche une opération par son IB */
                 gint tmp_budget_number;
-                gint tmp_sub_budget_number;
+                gint tmp_sub_budget_number = 0;
 
                 tmp_budget_number = gsb_data_scheduled_get_budgetary_number ( scheduled_number );
                 if ( transfert -> sub_budgetary_number )
diff --git a/src/gsb_file_load.c b/src/gsb_file_load.c
index 4a71b13..80f437a 100644
--- a/src/gsb_file_load.c
+++ b/src/gsb_file_load.c
@@ -8980,7 +8980,7 @@ gboolean gsb_file_load_set_last_reconcile_data ( gint account_number,
     {
         gint reconcile_number_next;
         gint reconcile_number;
-        const GDate *last_date_next;
+        const GDate *last_date_next = NULL;
         const GDate *last_date;
                 
         reconcile_number = GPOINTER_TO_INT ( rec_list -> data );
diff --git a/src/navigation.c b/src/navigation.c
index 2b5ff23..c9cf33f 100644
--- a/src/navigation.c
+++ b/src/navigation.c
@@ -171,6 +171,8 @@ const gchar *default_navigation_order_list = "0-2-3-4-5-6-7";
 static gboolean account_expander = TRUE;
 static gboolean report_expander = FALSE;
 
+/* gestion du drag and drop */
+static gboolean drag_and_drop = TRUE;
 
 /**
  * Create the navigation pane on the left of the GUI.  It contains
@@ -1616,6 +1618,9 @@ gboolean navigation_row_drop_possible ( GtkTreeDragDest *drag_dest,
                         GtkTreePath *dest_path,
                         GtkSelectionData *selection_data )
 {
+    if ( drag_and_drop == FALSE )
+        return FALSE;
+
     if ( dest_path && selection_data )
     {
         GtkTreePath *orig_path;
@@ -1700,7 +1705,7 @@ gboolean gsb_gui_navigation_move_ordre ( gint src_ordre,
     GQueue *tmp_queue;
     GList *dst_list;
     gint i;
-    struct_page *page;
+    struct_page *page = NULL;
 
     tmp_queue = pages_list;
     for ( i = 0 ; i < tmp_queue -> length ; i++ )
@@ -1977,9 +1982,12 @@ gboolean gsb_gui_navigation_button_press ( GtkWidget *tree_view,
 
         if ( gtk_tree_view_get_path_at_pos ( GTK_TREE_VIEW ( tree_view ), ev -> x, ev -> y, &path, NULL, NULL, NULL ) )
         {
+            drag_and_drop = FALSE;
             gsb_gui_navigation_context_menu ( tree_view, path );
             gtk_tree_path_free ( path );
 
+            drag_and_drop = TRUE;
+
             return FALSE;
         }
     }


hooks/post-receive
-- 
grisbi