[grisbi-cvs] [git push]Grisbi branch grisbi-1.0.x updated. upstream_version_0_9_90-100-gab9fdc7

Pierre Biava noreply at sourceforge.net
Sat Apr 20 10:46:22 CEST 2013


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  ab9fdc7a100b53cfd48ad80edc75be6c983cc6af (commit)
       via  2f1f80a236a9bd3677cdcb9a96b8b9562420bbc6 (commit)
       via  569bc2304308c1319db9f002aabe7a1700a2bbb7 (commit)
      from  be221317ce10329721303e4fa6a4cb814bdf671b (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 -----------------------------------------------------------------
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;
  }

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;
  }

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

Summary of changes:
 po/fr.po              |    2 +-
 src/bet_data.c        |   43 +++++++++
 src/bet_data.h        |    1 +
 src/etats_config.c    |    3 +-
 src/etats_onglet.c    |    5 +-
 src/file_obfuscate.c  |  244 +++++++++++++++++++++++++++++++------------------
 src/gsb_form_widget.c |   19 +++-
 src/gsb_form_widget.h |    3 +-
 src/gtk_combofix.c    |  219 +++++++++++++++++++++++++++++++++++++++++++-
 src/gtk_combofix.h    |    4 +
 src/import.c          |    6 -
 src/navigation.c      |    8 +-
 12 files changed, 444 insertions(+), 113 deletions(-)


hooks/post-receive
-- 
Grisbi


More information about the cvs mailing list