[grisbi-cvs] [git push]Grisbi branch wip_merge created. upstream_version_0_9_92-151-g6194ba7

[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, wip_merge has been created
        at  6194ba78f9b075f207ed803d97be6df18d2c20bf (commit)

- Log -----------------------------------------------------------------
http://grisbi.git.sourceforge.net/git/gitweb.cgi?p=grisbi/code;a=commitdiff;h=

commit b834029c837ecdae0546a5d83d3b20d17a4e730b
Merge: 0359c24 6cce921
Author: Rémi Cardona <remi at gentoo.org>
Date:   Wed Apr 3 23:29:40 2013 +0200

    Merge remote-tracking branch 'origin/grisbi-1.0.x'

diff --cc src/bet_config.c
index 6c211b3,6172559..37cf73e
--- a/src/bet_config.c
+++ b/src/bet_config.c
@@@ -122,11 -122,10 +122,10 @@@ GtkWidget *bet_config_general_create_ge
  
      /* Calculation of period */
      paddingbox = new_paddingbox_with_title ( vbox, FALSE, _("Common data") );
- 
-     widget = bet_config_general_get_period_widget ( paddingbox );
+     bet_config_general_get_period_widget ( paddingbox );
  
      /* add a separator */
 -    gtk_box_pack_start ( GTK_BOX ( vbox ), gtk_hseparator_new (), FALSE, FALSE, 5 );
 +    gtk_box_pack_start ( GTK_BOX ( vbox ), gtk_separator_new ( GTK_ORIENTATION_HORIZONTAL ), FALSE, FALSE, 5 );
  
      /* option pour les comptes de caisse */
      paddingbox = new_paddingbox_with_title ( vbox, FALSE, _("Option for cash accounts") );
@@@ -667,12 -659,11 +666,11 @@@ GtkWidget *bet_config_account_get_selec
  {
      GtkWidget *vbox;
      GtkWidget *paddingbox;
-     GtkWidget *hbox;
  
 -    vbox = gtk_vbox_new ( FALSE, 0 );
 +    vbox = gtk_box_new ( GTK_ORIENTATION_VERTICAL, 0 );
  
      paddingbox = new_paddingbox_with_title ( vbox, FALSE, _(title) );
-     hbox = bet_config_get_select_historical_data ( paddingbox, gsb_gui_get_account_page () );
 -    bet_config_get_select_historical_data ( paddingbox, account_page );
++    bet_config_get_select_historical_data ( paddingbox, gsb_gui_get_account_page () );
  
      return vbox;
  }

http://grisbi.git.sourceforge.net/git/gitweb.cgi?p=grisbi/code;a=commitdiff;h=

commit b834029c837ecdae0546a5d83d3b20d17a4e730b
Merge: 0359c24 6cce921
Author: Rémi Cardona <remi at gentoo.org>
Date:   Wed Apr 3 23:29:40 2013 +0200

    Merge remote-tracking branch 'origin/grisbi-1.0.x'

diff --cc src/bet_config.c
index 6c211b3,6172559..37cf73e
--- a/src/bet_config.c
+++ b/src/bet_config.c
@@@ -122,11 -122,10 +122,10 @@@ GtkWidget *bet_config_general_create_ge
  
      /* Calculation of period */
      paddingbox = new_paddingbox_with_title ( vbox, FALSE, _("Common data") );
- 
-     widget = bet_config_general_get_period_widget ( paddingbox );
+     bet_config_general_get_period_widget ( paddingbox );
  
      /* add a separator */
 -    gtk_box_pack_start ( GTK_BOX ( vbox ), gtk_hseparator_new (), FALSE, FALSE, 5 );
 +    gtk_box_pack_start ( GTK_BOX ( vbox ), gtk_separator_new ( GTK_ORIENTATION_HORIZONTAL ), FALSE, FALSE, 5 );
  
      /* option pour les comptes de caisse */
      paddingbox = new_paddingbox_with_title ( vbox, FALSE, _("Option for cash accounts") );
@@@ -667,12 -659,11 +666,11 @@@ GtkWidget *bet_config_account_get_selec
  {
      GtkWidget *vbox;
      GtkWidget *paddingbox;
-     GtkWidget *hbox;
  
 -    vbox = gtk_vbox_new ( FALSE, 0 );
 +    vbox = gtk_box_new ( GTK_ORIENTATION_VERTICAL, 0 );
  
      paddingbox = new_paddingbox_with_title ( vbox, FALSE, _(title) );
-     hbox = bet_config_get_select_historical_data ( paddingbox, gsb_gui_get_account_page () );
 -    bet_config_get_select_historical_data ( paddingbox, account_page );
++    bet_config_get_select_historical_data ( paddingbox, gsb_gui_get_account_page () );
  
      return vbox;
  }

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


hooks/post-receive
-- 
Grisbi