[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9_1-19-g5b78669

[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  5b78669fc8bfd58eeb2fba4b9b69bc61bb3ea2c7 (commit)
      from  37a7cabf0a65640c1eac2cf9fccea16a12e5059b (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 5b78669fc8bfd58eeb2fba4b9b69bc61bb3ea2c7
Author: pbiava <pierre.biava at nerim.net>
Date:   Sun May 1 16:23:46 2011 +0200

    temporarily corrects a side effect in drag and drop in the left panel of Grisbi.

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

Changes:
diff --git a/src/etats_gtktable.c b/src/etats_gtktable.c
index 17a2358..d9112df 100644
--- a/src/etats_gtktable.c
+++ b/src/etats_gtktable.c
@@ -47,6 +47,7 @@
 #include "fenetre_principale.h"
 #include "etats_config.h"
 #include "etats_affiche.h"
+#include "erreur.h"
 /*END_INCLUDE*/
 
 /*START_STATIC*/
@@ -78,7 +79,6 @@ extern GtkWidget *scrolled_window_etat;
 /*END_EXTERN*/
 
 
-
 /**
  * Attach a label at given positions.
  *
@@ -252,7 +252,7 @@ gint gtktable_initialise ( GSList * opes_selectionnees, gchar * filename )
 
     /* just update screen so that the user does not see the previous report anymore
      * while we are processing the new report */
-    update_gui ( );
+/*     update_gui ( );  */
 
     table_etat = gtk_table_new ( 0, nb_colonnes, FALSE );
     gtk_table_set_col_spacings ( GTK_TABLE ( table_etat ), 5 );
@@ -265,8 +265,8 @@ gint gtktable_initialise ( GSList * opes_selectionnees, gchar * filename )
 /*****************************************************************************************************/
 gint gtktable_finish ()
 {
-
-    gtk_scrolled_window_add_with_viewport ( GTK_SCROLLED_WINDOW ( scrolled_window_etat ), table_etat );
+    while ( GTK_WIDGET ( table_etat ) -> parent );
+        gtk_scrolled_window_add_with_viewport ( GTK_SCROLLED_WINDOW ( scrolled_window_etat ), table_etat );
     gtk_scrolled_window_set_shadow_type ( GTK_SCROLLED_WINDOW ( scrolled_window_etat ), GTK_SHADOW_NONE );
 
     gtk_container_set_border_width ( GTK_CONTAINER(table_etat), 6 );
diff --git a/src/navigation.c b/src/navigation.c
index d95b5b9..1c15686 100644
--- a/src/navigation.c
+++ b/src/navigation.c
@@ -1975,14 +1975,10 @@ 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 ) )
         {
-            gtk_tree_view_unset_rows_drag_source ( GTK_TREE_VIEW ( tree_view ) );
             gsb_gui_navigation_context_menu ( tree_view, path );
             gtk_tree_path_free ( path );
 
-            gtk_tree_view_enable_model_drag_source ( GTK_TREE_VIEW ( navigation_tree_view ),
-					    GDK_BUTTON1_MASK,
-                        row_targets, 1,
-					    GDK_ACTION_MOVE | GDK_ACTION_COPY );
+            while ( g_main_context_iteration ( NULL, FALSE ) );
 
             return FALSE;
         }
@@ -2030,7 +2026,7 @@ void gsb_gui_navigation_context_menu ( GtkWidget *tree_view,
     model = gtk_tree_view_get_model ( GTK_TREE_VIEW ( tree_view ) );
 
     gtk_tree_model_get_iter ( model, &iter, path );
-    gtk_tree_model_get ( model, &iter, 
+    gtk_tree_model_get ( model, &iter,
                         NAVIGATION_PAGE, &type_page,
                         NAVIGATION_ACCOUNT, &account_number,
                         NAVIGATION_REPORT, &report_number,
@@ -2128,6 +2124,15 @@ void gsb_gui_navigation_activate_expander ( GtkTreeView *tree_view,
 }
 
 
+void gsb_gui_navigation_enable_drag_source ( void )
+{
+    gtk_tree_view_enable_model_drag_source ( GTK_TREE_VIEW ( navigation_tree_view ),
+					    GDK_BUTTON1_MASK,
+                        row_targets, 1,
+					    GDK_ACTION_MOVE | GDK_ACTION_COPY );
+}
+
+
 /* Local Variables: */
 /* c-basic-offset: 4 */
 /* End: */
diff --git a/src/navigation.h b/src/navigation.h
index 7a70561..204d70d 100644
--- a/src/navigation.h
+++ b/src/navigation.h
@@ -37,6 +37,7 @@ void gsb_gui_navigation_add_account ( gint account_number,
 void gsb_gui_navigation_add_report ( gint report_number );
 void gsb_gui_navigation_create_account_list ( GtkTreeModel *model );
 GtkWidget *gsb_gui_navigation_create_navigation_pane ( void );
+void gsb_gui_navigation_enable_drag_source ( void );
 void gsb_gui_navigation_free_pages_list ( void );
 gint gsb_gui_navigation_get_current_account ( void );
 gint gsb_gui_navigation_get_current_page ( void );


hooks/post-receive
-- 
grisbi