[grisbi-cvs] [SCM] grisbi branch, master, updated. upstream_version_0_9.0-118-g81fe92a

[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  81fe92a5e79cfb63855c294017ef892fd332122f (commit)
       via  7babc6d26a4ced007fdc2b61ab21a381a5d0d947 (commit)
       via  e35402ee388ff478055fe1d19d415fd0b936f3fb (commit)
      from  0a67c48f9bf12842f557628b9aedf561dd107ed4 (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 81fe92a5e79cfb63855c294017ef892fd332122f
Author: pbiava <pierre.biava at nerim.net>
Date:   Sat Apr 2 11:56:40 2011 +0200

    Don't update the tree view when it's not here while making an archive

commit 7babc6d26a4ced007fdc2b61ab21a381a5d0d947
Author: pbiava <pierre.biava at nerim.net>
Date:   Sat Apr 2 10:25:08 2011 +0200

    Typo in function name. Don't repeat twice the same by Mokona

commit e35402ee388ff478055fe1d19d415fd0b936f3fb
Author: pbiava <pierre.biava at nerim.net>
Date:   Sat Apr 2 10:18:50 2011 +0200

    Remove unused variable

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

Changes:
diff --git a/src/gsb_assistant_archive.c b/src/gsb_assistant_archive.c
index cb798cf..6fc8a95 100644
--- a/src/gsb_assistant_archive.c
+++ b/src/gsb_assistant_archive.c
@@ -70,7 +70,7 @@ static gboolean gsb_assistant_archive_switch_to_intro ( GtkWidget *assistant,
                         gint new_page );
 static gboolean gsb_assistant_archive_switch_to_menu ( GtkWidget *assistant,
                         gint new_page );
-static gboolean gsb_assistant_archive_switch_to_succes ( GtkWidget *assistant,
+static gboolean gsb_assistant_archive_switch_to_success ( GtkWidget *assistant,
                         gint new_page );
 static gboolean gsb_assistant_archive_update_labels ( GtkWidget *assistant );
 /*END_STATIC*/
@@ -171,7 +171,7 @@ GtkResponseType gsb_assistant_archive_run ( gboolean origin )
 			     ARCHIVE_ASSISTANT_SUCCESS,
 			     ARCHIVE_ASSISTANT_MENU,
 			     0,
-			     G_CALLBACK (gsb_assistant_archive_switch_to_succes));
+			     G_CALLBACK (gsb_assistant_archive_switch_to_success));
     return_value = gsb_assistant_run (assistant);
     gtk_widget_destroy (assistant);
 
@@ -627,7 +627,7 @@ static gboolean gsb_assistant_archive_switch_to_archive_name ( GtkWidget *assist
  *
  * \return FALSE
  * */
-static gboolean gsb_assistant_archive_switch_to_succes ( GtkWidget *assistant,
+static gboolean gsb_assistant_archive_switch_to_success ( GtkWidget *assistant,
                         gint new_page )
 {
     /* if we come here, we are sure that :
@@ -712,11 +712,12 @@ static gboolean gsb_assistant_archive_switch_to_succes ( GtkWidget *assistant,
     gsb_transactions_list_fill_archive_store ( );
 
     /* set the message */
+    guint archived_transaction_count = g_slist_length (list_transaction_to_archive);
     string = g_strdup_printf ( _("Archive '%s' was successfully created and %d transactions "
                                  "out of %d were archived.\n\n"),
                         gsb_data_archive_get_name (archive_number),
-                        g_slist_length (list_transaction_to_archive),
-                        g_slist_length (list_transaction_to_archive) +
+                        archived_transaction_count,
+                        archived_transaction_count +
                         g_slist_length (gsb_data_transaction_get_transactions_list ()));
 
     buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (congratulations_view));
diff --git a/src/gsb_scheduler.c b/src/gsb_scheduler.c
index 77603a5..b02a046 100644
--- a/src/gsb_scheduler.c
+++ b/src/gsb_scheduler.c
@@ -84,10 +84,6 @@ gboolean gsb_scheduler_increase_scheduled ( gint scheduled_number )
 {
     GDate *new_date;
 
-    gchar* tmpstr = g_strdup_printf ("%d", scheduled_number);
-    devel_debug ( tmpstr );
-    g_free ( tmpstr );
-
     g_return_val_if_fail ( g_date_valid (gsb_data_scheduled_get_date (scheduled_number)), TRUE );
 
     /* increase the date of the scheduled_transaction */
diff --git a/src/traitement_variables.c b/src/traitement_variables.c
index 744352c..de5c64a 100644
--- a/src/traitement_variables.c
+++ b/src/traitement_variables.c
@@ -188,7 +188,6 @@ GdkColor couleur_nom_compte_prelight;
 
 GdkColor couleur_bleue;
 GdkColor couleur_jaune;
-GdkColor couleur_noire;
 
 /* colors for the balance estimate modul */
 GdkColor couleur_bet_division;
diff --git a/src/transaction_list.c b/src/transaction_list.c
index fcba551..400127c 100644
--- a/src/transaction_list.c
+++ b/src/transaction_list.c
@@ -306,7 +306,8 @@ void transaction_list_append_archive (gint archive_store_number)
 
     custom_list = transaction_model_get_model ();
 
-    g_return_if_fail ( custom_list != NULL );
+    if ( custom_list == NULL )
+        return;
 
     /* get the new number of the first row in the complete list of row */
     pos = custom_list->num_rows;
@@ -386,15 +387,16 @@ gboolean transaction_list_remove_transaction ( gint transaction_number )
 
     custom_list = transaction_model_get_model ();
 
-    g_return_val_if_fail ( custom_list != NULL, FALSE);
+    if ( custom_list == NULL )
+        return FALSE;
 
     /* get the record */
     if (!transaction_model_get_transaction_iter (&iter, transaction_number, 0))
-	return FALSE;
+        return FALSE;
 
     record = iter.user_data;
     if (!record)
-	return FALSE;
+        return FALSE;
 
     /* if selected transaction, remove it */
     if (record == custom_list -> selected_row)


hooks/post-receive
-- 
grisbi