[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_7_97-3-gcd16083

[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  cd16083058f07400887f5e38e3ed3cd9d2f69a43 (commit)
       via  2805b510b3c2bf6714e613266847a555f9290cf1 (commit)
       via  dddd237e442c11b61f54045cfde03773410dd446 (commit)
      from  ef238ae1f7741b9c1fcbead63b66bae04954e644 (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 cd16083058f07400887f5e38e3ed3cd9d2f69a43
Author: pbiava <pierre.biava at nerim.net>
Date:   Thu Dec 23 11:16:00 2010 +0100

    fixes bug 1230

commit 2805b510b3c2bf6714e613266847a555f9290cf1
Author: pbiava <pierre.biava at nerim.net>
Date:   Thu Dec 23 06:56:34 2010 +0100

    update string

commit dddd237e442c11b61f54045cfde03773410dd446
Author: pbiava <pierre.biava at nerim.net>
Date:   Tue Dec 21 21:38:45 2010 +0100

    fixes minor bugs in the budgetary module

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

Changes:
diff --git a/po/fr.po b/po/fr.po
index 06daff4..805f692 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10641,7 +10641,7 @@ msgstr "Supprimer les tiers inutilisés"
 
 #: ../src/tiers_onglet.c:365 ../src/tiers_onglet.c:391
 msgid "Remove orphan payees"
-msgstr "Supprimer les tiers sans opérations"
+msgstr "Supprimer les tiers sans opération"
 
 #: ../src/tiers_onglet.c:392
 msgid ""
diff --git a/src/bet_config.c b/src/bet_config.c
index c4bcca6..da05c65 100644
--- a/src/bet_config.c
+++ b/src/bet_config.c
@@ -998,6 +998,7 @@ gboolean bet_config_change_account ( GtkWidget *combo )
             bet_config_initialise_finance_widget ( account_number, account_page );
             break;
         case GSB_TYPE_ASSET:
+            gtk_notebook_set_current_page ( GTK_NOTEBOOK ( notebook ), 0 );
             break;
     }
 
@@ -1147,6 +1148,8 @@ void bet_config_use_budget_toggle ( GtkToggleButton *button, GtkWidget *combo )
         gtk_widget_hide_all ( widget );
         widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_historical" );
         gtk_widget_hide_all ( widget );
+        widget = g_object_get_data ( G_OBJECT ( account_page ), "Data_for_credit" );
+        gtk_widget_hide_all ( widget );
     }
 
     if ( gsb_gui_navigation_get_current_account ( ) == account_number )
diff --git a/src/bet_hist.c b/src/bet_hist.c
index 74d7eb8..d479301 100644
--- a/src/bet_hist.c
+++ b/src/bet_hist.c
@@ -85,6 +85,10 @@ static void bet_historical_populate_div_model ( gpointer key,
 static void bet_historical_row_collapse_all ( GtkTreeView *tree_view,
                         GtkTreeIter *iter,
                         GtkTreeModel *model );
+static void bet_historical_row_collapsed_event ( GtkTreeView *tree_view,
+                        GtkTreeIter *iter,
+                        GtkTreePath *path,
+                        GtkTreeModel *model );
 static void bet_historical_row_expanded_event ( GtkTreeView *tree_view,
                         GtkTreeIter *iter,
                         GtkTreePath *path,
@@ -625,6 +629,11 @@ GtkWidget *bet_historical_get_data_tree_view ( GtkWidget *container )
                         tree_view );
 
     g_signal_connect ( G_OBJECT ( tree_view ),
+                        "row-collapsed",
+                        G_CALLBACK ( bet_historical_row_collapsed_event ),
+                        tree_model );
+
+    g_signal_connect ( G_OBJECT ( tree_view ),
                         "row-expanded",
                         G_CALLBACK ( bet_historical_row_expanded_event ),
                         tree_model );
@@ -1294,6 +1303,21 @@ gsb_real bet_historical_get_children_amount ( GtkTreeModel *model, GtkTreeIter *
  *
  *
  * */
+void bet_historical_row_collapsed_event ( GtkTreeView *tree_view,
+                        GtkTreeIter *iter,
+                        GtkTreePath *path,
+                        GtkTreeModel *model )
+{
+    bet_historical_set_background_color ( GTK_WIDGET ( tree_view ) );
+}
+
+
+/**
+ *
+ *
+ *
+ *
+ * */
 void bet_historical_row_expanded_event ( GtkTreeView *tree_view,
                         GtkTreeIter *iter,
                         GtkTreePath *path,
diff --git a/src/qif.c b/src/qif.c
index 3596e6d..0f4fa6d 100644
--- a/src/qif.c
+++ b/src/qif.c
@@ -1030,21 +1030,22 @@ gchar *gsb_qif_get_account_name ( FILE *qif_file, const gchar *coding_system )
 gint gsb_qif_get_account_type ( gchar *header )
 {
     gint account_type = -1;
-    gchar *tmp_str;
+    gchar *ptr;
 
-    tmp_str = g_strdup ( header + 6 );
+    ptr = g_utf8_strchr ( header, -1, ':' );
+    ptr++;
 
-    if ( g_ascii_strncasecmp ( tmp_str, "bank", 4 ) == 0 || my_strcasecmp ( tmp_str, _("bank") ) == 0 )
+    if ( g_ascii_strncasecmp ( ptr, "bank", 4 ) == 0 || my_strcasecmp ( ptr, _("bank") ) == 0 )
         account_type = 0;
-    else if ( g_ascii_strncasecmp ( tmp_str, "invst", 5 ) == 0  || my_strcasecmp ( tmp_str, _("invst)") ) == 0 )
+    else if ( g_ascii_strncasecmp ( ptr, "invst", 5 ) == 0  || my_strcasecmp ( ptr, _("invst)") ) == 0 )
         account_type = 6;
-    else if ( g_ascii_strncasecmp ( tmp_str, "cash", 4 ) == 0  || my_strcasecmp ( tmp_str, _("cash)") ) == 0 )
+    else if ( g_ascii_strncasecmp ( ptr, "cash", 4 ) == 0  || my_strcasecmp ( ptr, _("cash)") ) == 0 )
         account_type = 7;
-    else if ( g_ascii_strncasecmp ( tmp_str, "oth a", 5 ) == 0  || my_strcasecmp ( tmp_str, _("oth a)") ) == 0 )
+    else if ( g_ascii_strncasecmp ( ptr, "oth a", 5 ) == 0  || my_strcasecmp ( ptr, _("oth a)") ) == 0 )
         account_type = 2;
-    else if ( g_ascii_strncasecmp ( tmp_str, "oth l", 5 ) == 0  || my_strcasecmp ( tmp_str, _("oth l)") ) == 0 )
+    else if ( g_ascii_strncasecmp ( ptr, "oth l", 5 ) == 0  || my_strcasecmp ( ptr, _("oth l)") ) == 0 )
         account_type = 3;
-    else if ( g_ascii_strncasecmp ( tmp_str, "ccard", 5 ) == 0  || my_strcasecmp ( tmp_str, _("ccard)") ) == 0 )
+    else if ( g_ascii_strncasecmp ( ptr, "ccard", 5 ) == 0  || my_strcasecmp ( ptr, _("ccard)") ) == 0 )
         account_type = 5;
     else
         account_type = -1;


hooks/post-receive
-- 
grisbi