[grisbi-cvs] [git push]Grisbi branch grisbi-1.0.x updated. upstream_version_0_9_90-97-gbe22131

Rémi Cardona noreply at sourceforge.net
Thu Apr 18 11:14:14 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  be221317ce10329721303e4fa6a4cb814bdf671b (commit)
       via  557534ff927b5842df6a2b5f4c9b704782a9abd0 (commit)
       via  9ddb70a0e904ce4244962ade90f77f102620d6a9 (commit)
       via  54df03d51d463dc56377bcaedc0ca606179ad4b3 (commit)
       via  cf3f446b7270380430b850c0c8f13ea51b0e5952 (commit)
      from  880a17dfdfb4c9aad9ccce3226dcdc0bc36dcd82 (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;
  }

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:
 src/accueil.c          |    4 +++-
 src/gsb_data_account.c |   17 ++++++++++-------
 src/gsb_select_icon.c  |    1 +
 src/gtk_combofix.c     |   23 +++++++++++++++--------
 src/tiers_onglet.c     |    8 ++++++--
 5 files changed, 35 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
Grisbi


More information about the cvs mailing list