[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9_1-46-gf72b2b7

[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  f72b2b781d56013b534653068d92d14c0246d834 (commit)
       via  4abf6abb9405763ee8e7db0b24f3940a9b949991 (commit)
      from  6eac2b12d2185a25ce4a0f625eeaa9d39bb805c2 (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 f72b2b781d56013b534653068d92d14c0246d834
Author: pbiava <pierre.biava at nerim.net>
Date:   Mon May 9 21:50:46 2011 +0200

    Fixed a bug in visibility of a transaction selected from a category

commit 4abf6abb9405763ee8e7db0b24f3940a9b949991
Author: pbiava <pierre.biava at nerim.net>
Date:   Mon May 9 20:12:11 2011 +0200

    Uniformization of the name of the configuration file for Windows

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

Changes:
diff --git a/src/gsb_dirs.c b/src/gsb_dirs.c
index d861d7f..666ae44 100644
--- a/src/gsb_dirs.c
+++ b/src/gsb_dirs.c
@@ -69,8 +69,6 @@ void gsb_dirs_init ( void )
     /*
      * FIXME: code from gsb_file_config.h
      */
-#ifndef _WIN32
-
 #if IS_DEVELOPMENT_VERSION == 1
     _C_GRISBIRC = g_strconcat ( PACKAGE, "dev.conf", NULL);
 #else
@@ -79,6 +77,8 @@ void gsb_dirs_init ( void )
 
     _C_OLD_GRISBIRC = g_strconcat ( ".", PACKAGE, "rc", NULL);
 
+#ifndef _WIN32
+
 #ifdef OS_OSX
     _C_PATH_CONFIG = g_strconcat (g_get_home_dir ( ), G_DIR_SEPARATOR_S,
                         "Library/Application Support/Grisbi/config", NULL);
@@ -94,8 +94,6 @@ void gsb_dirs_init ( void )
 #else /* _WIN32 */
 
 /* Some old Windows version have difficulties with dat starting file names */
-    _C_GRISBIRC = g_strconcat ( PACKAGE, "rc", NULL);
-    _C_OLD_GRISBIRC = g_strconcat ( ".", PACKAGE, "rc", NULL);
     _C_PATH_CONFIG = win32_get_grisbirc_folder_path( );
     _C_PATH_DATA_FILES = g_strdup ( g_get_home_dir ( ) );
 
diff --git a/src/gsb_transactions_list.c b/src/gsb_transactions_list.c
index 290f4ef..4544041 100644
--- a/src/gsb_transactions_list.c
+++ b/src/gsb_transactions_list.c
@@ -1185,6 +1185,9 @@ gfloat gsb_transactions_list_get_row_align ( void )
     if (!path)
 	return 0;
 
+    if ( !GDK_IS_DRAWABLE ( gtk_tree_view_get_bin_window ( tree_view ) ) )
+        return 0;
+
     gdk_drawable_get_size ( GDK_DRAWABLE (gtk_tree_view_get_bin_window (tree_view)),
 			    NULL, &height_win);
     gtk_tree_view_get_background_area (tree_view, path, NULL, &back_rect);
diff --git a/src/metatree.c b/src/metatree.c
index fa557d7..21d9ebc 100644
--- a/src/metatree.c
+++ b/src/metatree.c
@@ -1041,8 +1041,8 @@ void metatree_remove_transaction ( GtkTreeView * tree_view,
  * \return FALSE
  *
  */
-gboolean division_column_expanded  ( GtkTreeView * treeview, GtkTreeIter * iter, 
-                        GtkTreePath * tree_path, gpointer user_data ) 
+gboolean division_column_expanded  ( GtkTreeView * treeview, GtkTreeIter * iter,
+                        GtkTreePath * tree_path, gpointer user_data )
 {
     GtkTreeModel * model;
     GtkTreeIter child_iter;
@@ -1130,15 +1130,16 @@ gboolean division_activated ( GtkTreeView * treeview, GtkTreePath * path,
     {
 	gint transaction_number;
 	
-	gtk_tree_model_get( model, &iter, 
+	gtk_tree_model_get( model, &iter,
 			    META_TREE_NO_DIV_COLUMN, &no_division,
 			    META_TREE_NO_SUB_DIV_COLUMN, &no_sub_division,
-			    META_TREE_POINTER_COLUMN, &transaction_number, 
+			    META_TREE_POINTER_COLUMN, &transaction_number,
 			    -1);
 
 	/* We do not jump to a transaction if a division is specified */
 	if ( transaction_number && !no_division && !no_sub_division )
 	{
+        GtkTreePath *path;
         gint account_number;
         gint archive_number;
 
@@ -1161,10 +1162,15 @@ gboolean division_activated ( GtkTreeView * treeview, GtkTreePath * path,
 	    navigation_change_account ( GINT_TO_POINTER ( account_number ) );
 	    gsb_account_property_fill_page ();
 	    gsb_gui_notebook_change_page ( GSB_ACCOUNT_PAGE );
-	    gsb_gui_navigation_set_selection ( GSB_ACCOUNT_PAGE, 
-					       gsb_data_transaction_get_account_number (transaction_number), 
+	    gsb_gui_navigation_set_selection ( GSB_ACCOUNT_PAGE,
+					       gsb_data_transaction_get_account_number (transaction_number),
 					       NULL );
 
+        /* move selected iter */
+        path = gtk_tree_model_get_path ( model, &iter );
+        gtk_tree_view_scroll_to_cell ( treeview, path, NULL, FALSE, 0.0, 0.0 );
+        gtk_tree_path_free ( path );
+
 	    transaction_list_select ( transaction_number );
 	}
     }


hooks/post-receive
-- 
grisbi