[grisbi-cvs] [SCM] grisbi branch, grisbi-0.8.x, updated. upstream_version_0_8_4-5-g1751953

[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, grisbi-0.8.x has been updated
       via  175195364d43c8f5164b798634d187f2bbba1a6f (commit)
       via  e03c1b9db93b2fe1cf346882bce0b4063564642b (commit)
      from  c547a9bac54fc6b96a41cd745c1658456cd76848 (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 175195364d43c8f5164b798634d187f2bbba1a6f
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
    (cherry picked from commit 81fe92a5e79cfb63855c294017ef892fd332122f)

commit e03c1b9db93b2fe1cf346882bce0b4063564642b
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
    (cherry picked from commit 7babc6d26a4ced007fdc2b61ab21a381a5d0d947)

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

Changes:
diff --git a/src/gsb_assistant_archive.c b/src/gsb_assistant_archive.c
index ebe911f..1663b83 100644
--- a/src/gsb_assistant_archive.c
+++ b/src/gsb_assistant_archive.c
@@ -69,7 +69,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*/
@@ -170,7 +170,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);
 
@@ -626,7 +626,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 :
@@ -711,11 +711,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/transaction_list.c b/src/transaction_list.c
index e7d03ee..4d3eafb 100644
--- a/src/transaction_list.c
+++ b/src/transaction_list.c
@@ -305,7 +305,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;
@@ -385,15 +386,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