[grisbi-cvs] [SCM] grisbi branch, grisbi-1.0.x, updated. upstream_version_0_9_90-19-g90b4009
Rémi Cardona
nobody at users.sourceforge.net
Sun Jan 6 10:08:15 CET 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 90b40096d02c55d95c2534fed055b3f8ac84625c (commit)
from 4bf044749da997b43875c076c8478e0a67f287d5 (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 90b40096d02c55d95c2534fed055b3f8ac84625c
Author: Rémi Cardona <remi at gentoo.org>
Date: Tue Jan 1 18:25:11 2013 +0100
Replace uses of dialogue_special() with dialogue_*_hint() calls
-----------------------------------------------------------------------
Changes:
diff --git a/src/dialog.c b/src/dialog.c
index 623f029..0a9c0d6 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -35,6 +35,7 @@
/*END_INCLUDE*/
/*START_STATIC*/
+static void dialogue_special ( GtkMessageType param, gchar *text );
static void dialogue_conditional ( gchar *text, gchar *var );
static GtkDialog *dialogue_conditional_new ( gchar *text,
gchar *var,
diff --git a/src/dialog.h b/src/dialog.h
index 52555ff..6acbb2c 100644
--- a/src/dialog.h
+++ b/src/dialog.h
@@ -27,7 +27,6 @@ void dialogue_error_hint ( const gchar *text, gchar *hint );
void dialogue_error_memory ();
void dialogue_hint ( gchar *text, gchar *hint );
const gchar *dialogue_hint_with_entry ( gchar *text, gchar *hint, gchar *entry_description );
-void dialogue_special ( GtkMessageType param, gchar *text );
GtkWidget *dialogue_special_no_run ( GtkMessageType param,
GtkButtonsType buttons,
gchar *text );
diff --git a/src/etats_config.c b/src/etats_config.c
index 47eeafe..2f7b69c 100644
--- a/src/etats_config.c
+++ b/src/etats_config.c
@@ -1510,9 +1510,8 @@ void recuperation_info_perso_etat ( void )
&&
gsb_data_report_get_financial_year_type (current_report_number) == 3 )
{
- dialogue_special ( GTK_MESSAGE_INFO,
- make_hint ( _("Performance issue."),
- _("All financial years have been selected. Grisbi will run faster without the \"Detail financial years\" option activated.") ) );
+ dialogue_hint ( _("All financial years have been selected. Grisbi will run faster without the \"Detail financial years\" option activated."),
+ _("Performance issue.") );
gsb_data_report_set_financial_year_type ( current_report_number,
0 );
}
@@ -1569,9 +1568,8 @@ void recuperation_info_perso_etat ( void )
&&
gsb_data_report_get_account_use_chosen (current_report_number))
{
- dialogue_special ( GTK_MESSAGE_INFO,
- make_hint ( _("Performance issue."),
- _("All accounts have been selected. Grisbi will run faster without the \"Detail accounts used\" option activated.") ) );
+ dialogue_hint ( _("All accounts have been selected. Grisbi will run faster without the \"Detail accounts used\" option activated."),
+ _("Performance issue.") );
gsb_data_report_set_account_use_chosen ( current_report_number,
0 );
}
@@ -1718,9 +1716,8 @@ void recuperation_info_perso_etat ( void )
&&
gsb_data_report_get_payee_detail_used (current_report_number))
{
- dialogue_special ( GTK_MESSAGE_INFO,
- make_hint ( _("Performance issue."),
- _("All payees have been selected. Grisbi will run faster without the \"Detail payees used\" option activated.") ) );
+ dialogue_hint ( _("All payees have been selected. Grisbi will run faster without the \"Detail payees used\" option activated."),
+ _("Performance issue."));
gsb_data_report_set_payee_detail_used ( current_report_number,
0 );
}
@@ -1897,9 +1894,8 @@ void recuperation_info_perso_etat ( void )
&&
gsb_data_report_get_method_of_payment_used (current_report_number))
{
- dialogue_special ( GTK_MESSAGE_INFO,
- make_hint ( _("Performance issue."),
- _("All methods of payment have been selected. Grisbi will run faster without the \"Detail methods of payment used\" option activated.") ) );
+ dialogue_hint ( _("All methods of payment have been selected. Grisbi will run faster without the \"Detail methods of payment used\" option activated."),
+ _("Performance issue.") );
gsb_data_report_set_method_of_payment_used ( current_report_number,
0 );
}
@@ -3680,13 +3676,11 @@ static GSList *report_config_categ_budget_get_selected ( gboolean is_categ )
if (all_selected)
{
if (is_categ)
- dialogue_special ( GTK_MESSAGE_INFO,
- make_hint ( _("Performance issue."),
- _("All categories have been selected. Grisbi will run faster without the \"Detail categories used\" option activated.")));
+ dialogue_hint ( _("All categories have been selected. Grisbi will run faster without the \"Detail categories used\" option activated."),
+ _("Performance issue.") );
else
- dialogue_special ( GTK_MESSAGE_INFO,
- make_hint ( _("Performance issue."),
- _("All budgets have been selected. Grisbi will run faster without the \"Detail budgets used\" option activated.")));
+ dialogue_hint ( _("All budgets have been selected. Grisbi will run faster without the \"Detail budgets used\" option activated."),
+ _("Performance issue.") );
report_config_mix_select_all (model, FALSE);
gsb_data_report_free_categ_budget_struct (tmp_list);
diff --git a/src/import_csv.c b/src/import_csv.c
index 1236759..ef16edd 100644
--- a/src/import_csv.c
+++ b/src/import_csv.c
@@ -1097,10 +1097,10 @@ gboolean import_enter_csv_preview_page ( GtkWidget * assistant )
size = 0;
bytes_written = 0;
- dialogue_special ( GTK_MESSAGE_WARNING, make_hint (
- _("The conversion to utf8 went wrong."),
+ dialogue_warning_hint (
_("If the result does not suit you, try again by selecting the "
- "correct character set in the window for selecting files.") ) );
+ "correct character set in the window for selecting files."),
+ _("The conversion to utf8 went wrong.") );
contents = g_convert_with_fallback ( tmp_str, -1, "UTF-8", "ISO-8859-1",
"?", &size, &bytes_written, &error );
diff --git a/src/utils_files.c b/src/utils_files.c
index 79e6347..8cebd5c 100644
--- a/src/utils_files.c
+++ b/src/utils_files.c
@@ -277,10 +277,10 @@ gint get_utf8_line_from_file ( FILE *fichier,
tmp_string = latin2utf8 (pointeur_char);
if ( tmp_string == NULL )
{
- dialogue_special ( GTK_MESSAGE_ERROR, make_hint (
- _("Convert to utf8 failed."),
+ dialogue_error_hint (
_("If the result is not correct, try again by selecting the "
- "correct character set in the window for selecting files.") ) );
+ "correct character set in the window for selecting files."),
+ _("Convert to utf8 failed.") );
return 0;
}
}
hooks/post-receive
--
grisbi
More information about the cvs
mailing list