[grisbi-cvs] [SCM] grisbi branch, grisbi-1.0.x, updated. upstream_version_0_9_90-26-g390645e

[Rémi Cardona]

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-1.0.x has been updated
       via  390645e54206204ac63a2055709ca99cd0d54f35 (commit)
       via  057115ea79242fb6da6fb533a4f8ad01e975f3c1 (commit)
       via  c80eec4935dff748982b41144df737cb537db7fa (commit)
       via  acac4501462a56013bb2e5af3f1b7940dcab3ecb (commit)
       via  783d9d913aeca036c636ed9ec109109855d3b835 (commit)
       via  da8ab3645043162eeba54686fb49ad04bdb5b18f (commit)
      from  251eb8b50b4f5b5978e7ae580511e88d4595c826 (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 390645e54206204ac63a2055709ca99cd0d54f35
Author: Rémi Cardona <remi at gentoo.org>
Date:   Sun Jan 6 16:48:19 2013 +0100

    Fix potential memory leak in file_obfuscate_qif_run()
    
    The 'file_selection' is initialized with 'assistant' as its parent window,
    so chances are that this widget is properly cleaned-up. But since
    gtk_widget_destroy() was already here, we might as well call it all the
    time.

commit 057115ea79242fb6da6fb533a4f8ad01e975f3c1
Author: Rémi Cardona <remi at gentoo.org>
Date:   Sun Jan 6 16:45:42 2013 +0100

    Fix null-pointer dereference in file_obfuscate_qif_run()

commit c80eec4935dff748982b41144df737cb537db7fa
Author: Rémi Cardona <remi at gentoo.org>
Date:   Sun Jan 6 16:29:37 2013 +0100

    Remove dead assignments in gsb_currency_config_add_currency()

commit acac4501462a56013bb2e5af3f1b7940dcab3ecb
Author: Rémi Cardona <remi at gentoo.org>
Date:   Sun Jan 6 16:27:55 2013 +0100

    Remove leaking and unused variable in gsb_assistant_first_page_3()

commit 783d9d913aeca036c636ed9ec109109855d3b835
Author: Rémi Cardona <remi at gentoo.org>
Date:   Sun Jan 6 16:26:40 2013 +0100

    Fix null-pointer dereference in gtk_combofix_select_item()

commit da8ab3645043162eeba54686fb49ad04bdb5b18f
Author: Rémi Cardona <remi at gentoo.org>
Date:   Mon Jan 7 21:40:32 2013 +0100

    Fix build with gtk+ 2.20
    
    Reported-by: Benjamin Drieu <bdrieu at april.org>

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

Changes:
diff --git a/src/file_obfuscate_qif.c b/src/file_obfuscate_qif.c
index e8f2151..c8312b3 100644
--- a/src/file_obfuscate_qif.c
+++ b/src/file_obfuscate_qif.c
@@ -110,18 +110,14 @@ gboolean file_obfuscate_qif_run ( void )
 	gtk_file_filter_add_pattern ( filter, "*" );
 	gtk_file_chooser_add_filter ( GTK_FILE_CHOOSER ( file_selection ), filter );
 
-	switch ( gtk_dialog_run ( GTK_DIALOG (file_selection)))
+	if ( gtk_dialog_run ( GTK_DIALOG (file_selection) ) == GTK_RESPONSE_OK )
 	{
-	    case GTK_RESPONSE_OK:
 		    qif_name = file_selection_get_filename ( GTK_FILE_CHOOSER ( file_selection ) ) ;
 		    gtk_widget_destroy ( file_selection );
-		    if (qif_name || strlen (qif_name))
+		    if (qif_name && strlen (qif_name))
 			file_obfuscate_qif_start (qif_name);
-		    break;
-	    default:
-		    gtk_widget_destroy ( file_selection );
-		    break;
 	}
+	gtk_widget_destroy ( file_selection );
     }
 
     gtk_widget_destroy ( assistant );
diff --git a/src/gsb_assistant_first.c b/src/gsb_assistant_first.c
index 4438174..6ebf3fc 100644
--- a/src/gsb_assistant_first.c
+++ b/src/gsb_assistant_first.c
@@ -332,15 +332,12 @@ static GtkWidget *gsb_assistant_first_page_3 ( GtkWidget *assistant )
     GtkWidget *vbox;
     GtkWidget *label;
     GtkWidget *paddingbox;
-    GtkSizeGroup *size_group;
     GtkWidget *hbox;
     GtkWidget *image;
 
     page = gtk_hbox_new (FALSE, 15);
     gtk_container_set_border_width ( GTK_CONTAINER (page), 10 );
 
-    size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-
     vbox = new_vbox_with_title_and_icon ( _("Reconciliation"), "reconciliationlg.png" );
     gtk_box_pack_start ( GTK_BOX (page), vbox, TRUE, TRUE, 0 );
 
diff --git a/src/gsb_currency_config.c b/src/gsb_currency_config.c
index c634a47..6803fef 100644
--- a/src/gsb_currency_config.c
+++ b/src/gsb_currency_config.c
@@ -1044,18 +1044,8 @@ dialog_return:
     {
         /* check if the currency exists si la devise existe on ne fait rien */
 
-        if ( gsb_data_currency_get_number_by_name ( currency_name ) )
-        {
-            currency_number = gsb_data_currency_get_number_by_name
-                        ( currency_name );
-        }
-        else if ( gsb_data_currency_get_number_by_code_iso4217
-                        ( currency_isocode ) )
-        {
-            currency_number = gsb_data_currency_get_number_by_code_iso4217
-                        ( currency_isocode );
-        }
-        else
+        if ( ! gsb_data_currency_get_number_by_name ( currency_name ) &&
+             ! gsb_data_currency_get_number_by_code_iso4217 ( currency_isocode ) )
         {
             currency_number = gsb_currency_config_create_currency ( currency_name,
                         currency_code, currency_isocode, floating_point );
diff --git a/src/gtk_combofix.c b/src/gtk_combofix.c
index cda0c5b..6bd2969 100644
--- a/src/gtk_combofix.c
+++ b/src/gtk_combofix.c
@@ -1770,7 +1770,7 @@ static gboolean gtk_combofix_select_item ( GtkComboFix *combofix,
 
     if ( !combofix )
 	    return FALSE;
-    if ( !item && strlen ( item ) == 0 )
+    if ( !item || strlen ( item ) == 0 )
         return FALSE;
 
     if ( ( ptr = g_utf8_strchr ( item, -1, ':' ) ) )
diff --git a/src/main.c b/src/main.c
index 979bfa3..cc4e3a0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -541,7 +541,7 @@ static gboolean main_window_key_press_event ( GtkWidget *widget,
 {
     switch ( event -> keyval )
     {
-        case GDK_KEY_F11 :
+        case GDK_F11 :
             if ( conf.full_screen )
                 gtk_window_unfullscreen ( GTK_WINDOW ( widget ) );
             else


hooks/post-receive
-- 
grisbi