[grisbi-cvs] [git push]Grisbi branch master updated. upstream_version_1_0_0-295-g7608f83
Pierre Biava
noreply at sourceforge.net
Sun Sep 11 20:41:55 CEST 2016
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, master has been updated
via 7608f83b0dda4816e866c2bdc5097cb3bc2f0d63 (commit)
via 19dceafa8cb84631e7a2416c1114ff892bc98b57 (commit)
via d5f9d77a47e4ae1d9a1e154f0aa2d1277ffcdd55 (commit)
via 6fdec839bf8d025435ce04b0276fae9fa8b4d6a5 (commit)
via 1d4cebe677b171c109789c220c224d38e1b5855a (commit)
via 45e7f8e08305787517c9019826bb330a855ec63b (commit)
via 5f7f096f686f14743b905a003328e26fadfeb6b2 (commit)
via 14bfd3e326fecab45ed2b42e3b23c5ccf5866da0 (commit)
via d6845dfeeaefcfe1a7b59f43ceb5d0ed52176ab1 (commit)
via 9826cbff27e23bb0ba4d2685dccaf00de58340eb (commit)
via e1c0eb7eff9e0eceeed9e35a81645405961f52eb (commit)
via c43c73e478dc18a74c4c2a9404948f0fddf8df5c (commit)
via a801ad2f4ffb687cf2d11626e03c17ca14f9c7ad (commit)
via a77e40f91bdef80cb12df2bb6725dd7565c13583 (commit)
via 00ee706041aed802ff57d69fabade1a3a5b079b4 (commit)
via fb4c0f58d9655bd256e17c2d9bad8e020ddcc3cd (commit)
via 804b141d5939ad3ee1510028b17463dd0116fd41 (commit)
via 1a0e00fc918adc14fce413f484fdbe8f14e495b5 (commit)
via 71367484696f50094dc8062db4ed97687bfa9d1a (commit)
via e54aea36da6e417f16b8445bb145bd35f4787a0f (commit)
via aeb60d33717b2faaaf81d4cff055c53a6ed112d9 (commit)
via 5cf9183537d0beb6343238bef8851e6d928e3c60 (commit)
via fe9411341e0b23c3ad35763d7e812d2d2a1bfc17 (commit)
via 4a971766cfc3e362bb274f5e298d108c01fc0eab (commit)
via d6042e1448471017b273b6f282ef477c46cb70d2 (commit)
via 062e43d6eaa72ece5260da4f340fd3d2f7f8520a (commit)
via 7004b64ad034ac37d3a0ba27f1ded2bee5970711 (commit)
via b7ccb7a057447546ed762c36859542910f922c24 (commit)
via 9f1f2abe6bb8a1b1881d85a476c313723e46a456 (commit)
via 1c27bffc8e2daf0a39cace487fbc48bd05faa62d (commit)
via 1405eb1db1fffbf81bcff36561ced5696c867801 (commit)
via e03153ece90977e25606c59c37bd80cec323466d (commit)
via 4d1066f8a6c639fab39bf6398033d3eac9c4c2a8 (commit)
via 2ecb9730b97d5d0ec019d93c63117d4b71b8a3fe (commit)
via b585598515d9f69ca9f63d0fb1e548984b053ede (commit)
via e6d1a418e6fb95b3903f0fcb17fd6fc29d393aa6 (commit)
via 7608019c2f199b5a503f2c938b4b7e5594a489f1 (commit)
via 27fd5cbece20a16c6d4fc0e10503a57a9456ce60 (commit)
via ed21eb638cbc883fe579c344ac73dd1cdd9902c8 (commit)
via 8c1a8c63688a0e71849c96078eb9fca78adbecda (commit)
via eaf0de0b2637e4882b5cd69945bd2bc0b0b18f33 (commit)
via 815cedd5609a411cbf574a6a457c5547640b7ca8 (commit)
via 2ae5fa11f0fccd43b3002367fec5366039b1aaa6 (commit)
via 10ef82373a9e8db71de961950d6ec0c539d48d74 (commit)
from 7b3011fb7b35e6e53e0903c487dac789032595a0 (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 7608f83b0dda4816e866c2bdc5097cb3bc2f0d63
Merge: 7b3011f 19dceaf
Author: pbiava <pierre.biava at orange.fr>
Date: Sun Sep 11 19:40:11 2016 +0200
Merge branch 'grisbi-1.0.x' into master
diff --cc configure.ac
index 984e704,39ef7f3..05b84a0
--- a/configure.ac
+++ b/configure.ac
@@@ -1,7 -1,7 +1,8 @@@
dnl Process this file with autoconf to produce a configure script.
m4_define(grisbi_major_version, 1)
-m4_define(grisbi_minor_version, 0)
+m4_define(grisbi_minor_version, 1)
++
m4_define(grisbi_micro_version, 1)
m4_define(grisbi_version, grisbi_major_version.grisbi_minor_version.grisbi_micro_version)
@@@ -8,9 -10,9 +11,10 @@@ m4_pattern_allow([AM_PROG_AR]
AC_INIT([grisbi],[grisbi_version],[http://www.grisbi.org/mantis/login_select_proj_page.php?ref=bug_report_page.php],[grisbi],[http://www.grisbi.org/index.php])
AC_CONFIG_SRCDIR(src/main.c)
+ AC_CONFIG_AUX_DIR(.)
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR(.)
AC_DEFINE(GRISBI_MAJOR_VERSION, grisbi_major_version, [grisbi major version])
AC_SUBST(GRISBI_MAJOR_VERSION, grisbi_major_version)
@@@ -259,7 -266,7 +263,8 @@@ if test "x$platform_osx" = xyes; the
platform=darwin/quartz
AC_MSG_RESULT(yes)
AC_DEFINE(GDK_QUARTZ,[1],[Using GDK Quartz (not X11)])
- PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk3, [os_osx=yes], [os_osx=no])
- PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk2, [os_osx=yes], [os_osx=no])
++
++ PKG_CHECK_MODULES(GTK_MAC, gtk-mac-integration-gtk3, [os_osx=yes], [os_osx=no])
if test "x$os_osx" = xyes; then
AC_DEFINE([GTKOSXAPPLICATION],[1],[Defined if app is GtkOSXApplication])
AC_SUBST(GTK_MAC_LIBS)
diff --cc src/accueil.c
index 870c7b3,c9803f6..0ae20f0
--- a/src/accueil.c
+++ b/src/accueil.c
@@@ -266,339 -508,6 +266,338 @@@ static gint gsb_main_page_account_have_
return FALSE;
}
+/**
+ * called by a click on an account name or balance of accounts on the main page
+ * it's just a mediator between the signal and gsb_navigation_show_account
+ *
+ * \param account_number a pointer wich is the number of account we want to switch
+ *
+ * \return FALSE
+ * */
+static gboolean gsb_main_page_click_on_account ( gint *account_number )
+{
+ devel_debug_int (GPOINTER_TO_INT (account_number));
+ gsb_gui_navigation_set_selection ( GSB_ACCOUNT_PAGE,
+ GPOINTER_TO_INT (account_number),
+ NULL );
+ return FALSE;
+}
+
+/**
+ * Affiche une ligne pour le compte donné en paramètre
+ *
+ * \param table
+ * \param account number
+ * \param ligne dans la table
+ *
+ * \return FALSE
+ * */
+static void gsb_main_page_affiche_ligne_du_compte ( GtkWidget *pTable,
+ gint account_number,
+ gint i )
+{
+ GtkWidget *pEventBox;
+ GtkWidget *pLabel;
+ GtkStyleContext* context;
+ GSList *list = NULL;
+ gchar *tmp_str;
+
+ /* Première colonne : elle contient le nom du compte */
+ tmp_str = g_strconcat ( gsb_data_account_get_name (account_number), " : ", NULL );
+ pLabel = gtk_label_new ( tmp_str );
+ g_free ( tmp_str );
+ utils_labels_set_alignement ( GTK_LABEL ( pLabel ), MISC_LEFT, MISC_VERT_CENTER );
+ gtk_size_group_add_widget ( GTK_SIZE_GROUP ( size_group_accueil ), pLabel );
+
+ /* Création d'une boite à évènement qui sera rattachée au nom du compte */
+ pEventBox = gtk_event_box_new ();
+ gtk_widget_set_name ( pEventBox, "accueil_nom_compte");
+ context = gtk_widget_get_style_context ( pEventBox );
+ gtk_style_context_set_state ( context, GTK_STATE_FLAG_ACTIVE );
+
+ list = g_slist_append ( list, pEventBox );
+ g_signal_connect ( G_OBJECT ( pEventBox ),
+ "enter-notify-event",
+ G_CALLBACK ( utils_event_box_change_state ),
+ context );
+ g_signal_connect ( G_OBJECT ( pEventBox ),
+ "leave-notify-event",
+ G_CALLBACK ( utils_event_box_change_state ),
+ context );
+ g_signal_connect_swapped ( G_OBJECT ( pEventBox ),
+ "button-press-event",
+ G_CALLBACK ( gsb_main_page_click_on_account ),
+ GINT_TO_POINTER (account_number) );
+ gtk_grid_attach ( GTK_GRID ( pTable ), pEventBox, 0, i, 1, 1 );
+ gtk_widget_show ( pEventBox );
+ gtk_container_add ( GTK_CONTAINER ( pEventBox ), pLabel );
+ gtk_widget_show ( pLabel );
+
+ /* Deuxième colonne : elle contient le solde pointé du compte */
+ tmp_str = utils_real_get_string_with_currency (
+ gsb_data_account_get_marked_balance ( account_number ),
+ gsb_data_account_get_currency (account_number), TRUE);
+ pLabel = gtk_label_new ( tmp_str );
+ g_free ( tmp_str );
+ utils_labels_set_alignement ( GTK_LABEL ( pLabel ), MISC_RIGHT, MISC_VERT_CENTER );
+
+ /* Création d'une boite à évènement qui sera rattachée au solde pointé du compte */
+ pEventBox = gtk_event_box_new ();
+
+ /* Mise en place du style du label en fonction du solde courant */
+ if ( gsb_real_cmp ( gsb_data_account_get_marked_balance (account_number),
+ gsb_data_account_get_mini_balance_wanted (account_number)) != -1)
+ {
+ gtk_widget_set_name ( pEventBox, "accueil_solde_alarme_verte");
+ }
+ else
+ {
+ if ( gsb_real_cmp ( gsb_data_account_get_marked_balance (account_number),
+ gsb_data_account_get_mini_balance_authorized (account_number)) != -1 )
+ {
+ gtk_widget_set_name ( pEventBox, "accueil_solde_alarme_orange");
+ }
+ else
+ {
-
+ gtk_widget_set_name ( pEventBox, "accueil_solde_alarme_rouge");
+ }
+ }
+
+ context = gtk_widget_get_style_context ( pEventBox );
+ gtk_style_context_set_state ( context, GTK_STATE_FLAG_ACTIVE );
+
+ list = g_slist_append ( list, pEventBox );
+ g_signal_connect ( G_OBJECT ( pEventBox ),
+ "enter-notify-event",
+ G_CALLBACK ( utils_event_box_change_state ),
+ context );
+ g_signal_connect ( G_OBJECT ( pEventBox ),
+ "leave-notify-event",
+ G_CALLBACK ( utils_event_box_change_state ),
+ context );
+ g_signal_connect_swapped ( G_OBJECT ( pEventBox ),
+ "button-press-event",
+ G_CALLBACK ( gsb_main_page_click_on_account ),
+ GINT_TO_POINTER (account_number) );
+ gtk_grid_attach ( GTK_GRID ( pTable ), pEventBox, 1, i, 1, 1 );
+ gtk_widget_show ( pEventBox );
+ gtk_container_add ( GTK_CONTAINER ( pEventBox ), pLabel );
+ gtk_widget_show ( pLabel );
+
+ /* Troisième colonne : elle contient le solde courant du compte */
+ tmp_str = utils_real_get_string_with_currency (
+ gsb_data_account_get_current_balance (account_number),
+ gsb_data_account_get_currency (account_number), TRUE);
+ pLabel = gtk_label_new ( tmp_str );
+ g_free ( tmp_str );
+ utils_labels_set_alignement ( GTK_LABEL ( pLabel ), MISC_RIGHT, MISC_VERT_CENTER );
+
+ /* Création d'une boite à évènement qui sera rattachée au solde courant du compte */
+ pEventBox = gtk_event_box_new ();
+
+ /* Mise en place du style du label en fonction du solde courant */
+ if ( gsb_real_cmp ( gsb_data_account_get_current_balance (account_number),
+ gsb_data_account_get_mini_balance_wanted (account_number)) != -1)
+ {
+ gtk_widget_set_name ( pEventBox, "accueil_solde_alarme_verte");
+ }
+ else
+ {
+ if ( gsb_real_cmp ( gsb_data_account_get_current_balance (account_number),
+ gsb_data_account_get_mini_balance_authorized (account_number)) != -1 )
+ {
+ gtk_widget_set_name ( pEventBox, "accueil_solde_alarme_orange");
+ }
+ else
+ {
+ gtk_widget_set_name ( pEventBox, "accueil_solde_alarme_rouge");
+ }
+ }
+
+ context = gtk_widget_get_style_context ( pEventBox );
+ gtk_style_context_set_state ( context, GTK_STATE_FLAG_ACTIVE );
+
+ list = g_slist_append ( list, pEventBox );
+ g_signal_connect ( G_OBJECT ( pEventBox ),
+ "enter-notify-event",
+ G_CALLBACK ( utils_event_box_change_state ),
+ context );
+ g_signal_connect ( G_OBJECT ( pEventBox ),
+ "leave-notify-event",
+ G_CALLBACK ( utils_event_box_change_state ),
+ context );
+ g_signal_connect_swapped ( G_OBJECT ( pEventBox ),
+ "button-press-event",
+ G_CALLBACK (gsb_main_page_click_on_account),
+ GINT_TO_POINTER (account_number) );
+ gtk_grid_attach ( GTK_GRID ( pTable ), pEventBox, 2, i, 1, 1 );
+ gtk_widget_show ( pEventBox );
+ gtk_container_add ( GTK_CONTAINER ( pEventBox ), pLabel );
+ gtk_widget_show ( pLabel );
+}
+
+/**
+ * Création de ou des lignes de solde partiels
+ *
+ * */
+static gint affiche_soldes_partiels ( GtkWidget *table,
+ gint i,
+ gint nb_comptes,
+ GSList *liste,
+ gint currency_number,
+ gint type_compte )
+{
+ GtkWidget *label;
+ gchar *tmp_str;
+ gint nbre_lignes = 0;
+ gboolean concerne = FALSE;
+
+ while ( liste )
+ {
+ gint partial_number;
+ kind_account kind;
+
+ partial_number = gsb_data_partial_balance_get_number ( liste -> data );
+ kind = gsb_data_partial_balance_get_kind ( partial_number );
+
+ if ( kind == -1 )
+ {
+ liste = liste -> next;
+ continue;
+ }
+ else if (
+ ( kind == type_compte
+ ||
+ ( kind < GSB_TYPE_LIABILITIES && type_compte < GSB_TYPE_LIABILITIES ) )
+ &&
+ gsb_data_partial_balance_get_currency ( partial_number ) == currency_number )
+ {
+ if ( concerne == FALSE )
+ {
+ /* on commence par une ligne vide */
+ label = gtk_label_new ( chaine_espace );
+ gtk_size_group_add_widget ( GTK_SIZE_GROUP ( size_group_accueil ), label );
+ utils_labels_set_alignement ( GTK_LABEL ( label ), MISC_RIGHT, MISC_VERT_CENTER );
+ gtk_grid_attach ( GTK_GRID ( table ), label, 0, i, 1, 1 );
+ gtk_widget_show ( label );
+ i ++;
+ nbre_lignes ++;
+
+ /* On met les titres du sous ensemble solde(s) partiel(s) */
+ label = gtk_label_new ( NULL );
+ if ( nb_comptes == 1 )
+ tmp_str = g_strconcat ("<span weight=\"bold\">", _("Partial balance: "), "</span>", NULL );
+ else
+ tmp_str = g_strconcat ("<span weight=\"bold\">", _("Partial balances: "), "</span>", NULL );
+ gtk_label_set_markup ( GTK_LABEL ( label ), tmp_str );
+ g_free ( tmp_str );
+ utils_labels_set_alignement ( GTK_LABEL ( label ), MISC_LEFT, MISC_VERT_CENTER );
+ gtk_size_group_add_widget ( GTK_SIZE_GROUP ( size_group_accueil ), label );
+ gtk_grid_attach ( GTK_GRID ( table ), label, 0, 1, i, i+1 );
+ gtk_widget_show ( label );
+ label = gtk_label_new (_("Reconciled balance"));
+ utils_labels_set_alignement ( GTK_LABEL ( label ), MISC_RIGHT, MISC_VERT_CENTER );
+ gtk_grid_attach ( GTK_GRID ( table ), label, 1, i, 1, 1 );
+ gtk_widget_show ( label );
+ label = gtk_label_new (_("Current balance"));
+ utils_labels_set_alignement ( GTK_LABEL ( label ), MISC_RIGHT, MISC_VERT_CENTER );
+ gtk_grid_attach ( GTK_GRID ( table ), label, 2, i, 1, 1 );
+ gtk_widget_show ( label );
+ i ++;
+ nbre_lignes ++;
+ concerne = TRUE;
+ }
+ /* Première colonne : elle contient le nom du solde partiel */
+ tmp_str = g_strconcat ( gsb_data_partial_balance_get_name ( partial_number ),
+ " : ", NULL );
+ label = gtk_label_new ( tmp_str );
+ g_free ( tmp_str );
+ utils_labels_set_alignement ( GTK_LABEL ( label ), MISC_LEFT, MISC_VERT_CENTER );
+ gtk_size_group_add_widget ( GTK_SIZE_GROUP ( size_group_accueil ), label );
+ gtk_grid_attach ( GTK_GRID ( table ), label, 0, i, 1, 1 );
+ gtk_widget_show ( label );
+
+ /* Deuxième colonne : elle contient le solde pointé du solde partiel */
+ tmp_str = gsb_data_partial_balance_get_marked_balance ( partial_number );
+ label = gtk_label_new ( tmp_str );
+ gtk_label_set_markup ( GTK_LABEL ( label ), tmp_str );
+ g_free ( tmp_str );
+ utils_labels_set_alignement ( GTK_LABEL ( label ), MISC_RIGHT, MISC_VERT_CENTER );
+ gtk_grid_attach ( GTK_GRID ( table ), label, 1, i, 1, 1 );
+ gtk_widget_show ( label );
+
+ /* Troisième colonne : elle contient le solde courant du solde partiel */
+ tmp_str = gsb_data_partial_balance_get_current_balance ( partial_number );
+ label = gtk_label_new ( NULL );
+ gtk_label_set_markup ( GTK_LABEL ( label ), tmp_str );
+ g_free ( tmp_str );
+ utils_labels_set_alignement ( GTK_LABEL ( label ), MISC_RIGHT, MISC_VERT_CENTER );
+ gtk_grid_attach ( GTK_GRID ( table ), label, 2, i, 1, 1 );
+ gtk_widget_show ( label );
+
+ i++;
+ nbre_lignes ++;
+ }
+ liste = liste -> next;
+ }
+
+ return nbre_lignes;
+}
+
+/**
+ * Création de la ligne de solde des comptes
+ *
+ * */
+static void affiche_solde_des_comptes ( GtkWidget *table,
+ gint i,
+ gint nb_comptes,
+ gint currency_number,
+ gsb_real solde_global_courant,
+ gsb_real solde_global_pointe )
+{
+ GtkWidget *label;
+ gchar *tmp_str;
+
+ /* on commence par une ligne vide */
+ label = gtk_label_new ( chaine_espace );
+ gtk_size_group_add_widget ( GTK_SIZE_GROUP ( size_group_accueil ), label );
+ utils_labels_set_alignement ( GTK_LABEL ( label ), MISC_RIGHT, MISC_VERT_CENTER );
+ gtk_grid_attach ( GTK_GRID ( table ), label, 0, i, 1, 1 );
+ gtk_widget_show ( label );
+ i ++;
+
+ /* Première colonne */
+ label = gtk_label_new ( NULL );
+ if ( nb_comptes == 1 )
+ tmp_str = g_strconcat ("<span weight=\"bold\">", _("Global balance: "), "</span>", NULL );
+ else if ( conf.pluriel_final )
+ tmp_str = g_strconcat ("<span weight=\"bold\">", "Soldes finaux: ", "</span>", NULL );
+ else
+ tmp_str = g_strconcat ("<span weight=\"bold\">", _("Global balances: "), "</span>", NULL );
+ gtk_label_set_markup ( GTK_LABEL ( label ), tmp_str );
+ g_free ( tmp_str );
+
+ utils_labels_set_alignement ( GTK_LABEL ( label ), MISC_LEFT, MISC_VERT_CENTER );
+ gtk_size_group_add_widget ( GTK_SIZE_GROUP ( size_group_accueil ), label );
+ gtk_grid_attach ( GTK_GRID ( table ), label, 0, i, 1, 1 );
+ gtk_widget_show ( label );
+
+ /* Deuxième colonne : elle contient le solde total pointé des comptes */
+ tmp_str = utils_real_get_string_with_currency ( solde_global_pointe, currency_number, TRUE );
+ label = gtk_label_new ( tmp_str );
+ g_free ( tmp_str );
+ utils_labels_set_alignement ( GTK_LABEL ( label ), MISC_RIGHT, MISC_VERT_CENTER );
+ gtk_grid_attach ( GTK_GRID ( table ), label, 1, i, 1, 1 );
+ gtk_widget_show ( label );
+
+ /* Troisième colonne : elle contient le solde total courant des comptes */
+ tmp_str = utils_real_get_string_with_currency ( solde_global_courant, currency_number, TRUE );
+ label = gtk_label_new ( tmp_str );
+ g_free ( tmp_str );
+ utils_labels_set_alignement ( GTK_LABEL ( label ), MISC_RIGHT, MISC_VERT_CENTER );
+ gtk_grid_attach ( GTK_GRID ( table ), label, 2, i, 1, 1 );
+ gtk_widget_show ( label );
+}
/**
* routine qui affiche les comptes dans la bonne frame
diff --cc src/bet_future.c
index a5774be,f184c76..845199a
--- a/src/bet_future.c
+++ b/src/bet_future.c
@@@ -2426,8 -2463,20 +2463,20 @@@ static GtkWidget *bet_transfert_create_
g_object_set_data ( G_OBJECT ( dialog ), "date_entry", date_entry );
gtk_box_pack_start ( GTK_BOX ( hbox ), date_entry, FALSE, FALSE, 0 );
+ button = gtk_check_button_new_with_label (
+ _("Last banking day of the month") );
+ gtk_toggle_button_set_active ( GTK_TOGGLE_BUTTON ( button ), FALSE );
+ g_object_set_data ( G_OBJECT ( dialog ), "bet_transfert_last_banking_day", button );
+ gtk_box_pack_start ( GTK_BOX ( hbox ), button, FALSE, FALSE, 0 );
+
+ g_signal_connect ( G_OBJECT ( button ),
+ "toggled",
+ G_CALLBACK ( bet_transfert_last_banking_day_toggle ),
+ date_entry );
+
+
/* boite verticale pour rendre actif ou non les champs ci-dessous */
- vbox = gtk_vbox_new ( FALSE, 5 );
+ vbox = gtk_box_new ( GTK_ORIENTATION_VERTICAL, 5 );
g_object_set_data ( G_OBJECT ( dialog ), "bet_transfert_main_vbox_data", vbox );
/* check button Automatic creation of the direct debit transaction */
diff --cc src/etats_onglet.c
index c3a5c51,dc7b19e..fa7f30c
--- a/src/etats_onglet.c
+++ b/src/etats_onglet.c
@@@ -1244,10 -1243,12 +1248,12 @@@ void importer_etat ( void
{
case GTK_RESPONSE_OK :
nom_etat =file_selection_get_filename ( GTK_FILE_CHOOSER ( fenetre_nom ));
- gsb_file_update_last_path (file_selection_get_last_directory (GTK_FILE_CHOOSER (fenetre_nom), TRUE));
+ tmp_last_directory = file_selection_get_last_directory ( GTK_FILE_CHOOSER ( fenetre_nom ), TRUE );
+ gsb_file_update_last_path ( tmp_last_directory );
+ g_free ( tmp_last_directory );
gtk_widget_destroy ( GTK_WIDGET ( fenetre_nom ));
- /* la vérification que c'est possible a �t� faite par la boite de selection*/
+ /* la vérification que c'est possible a été faite par la boite de selection*/
if ( !gsb_file_others_load_report ( nom_etat ))
{
return;
diff --cc src/gsb_scheduler_list.c
index 8c50576,b214690..8880328
--- a/src/gsb_scheduler_list.c
+++ b/src/gsb_scheduler_list.c
@@@ -2237,8 -2240,8 +2237,8 @@@ gboolean gsb_scheduler_list_popup_custo
for ( i = 0; j_m_a_names[i]; i++ )
{
- gtk_combo_box_append_text ( GTK_COMBO_BOX ( combobox ),
+ gtk_combo_box_text_append_text ( GTK_COMBO_BOX_TEXT ( combobox ),
- g_dgettext ( NULL, j_m_a_names[etat.affichage_echeances_perso_j_m_a] ) );
+ g_dgettext ( NULL, j_m_a_names[i] ) );
}
gtk_combo_box_set_active ( GTK_COMBO_BOX ( combobox ), etat.affichage_echeances_perso_j_m_a );
... 123 lines suppressed ...
hooks/post-receive
--
Grisbi
More information about the cvs
mailing list