IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

String cleanup; fix manual emulation of ngettext; fix some memory leaks due to g_strconcat, but not yet all

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@13230 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2006-02-12 11:10:43 +00:00
parent 465a454667
commit c5dd052244
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/gnome/druid-merge.c
View File

@ -48,7 +48,6 @@ qof_book_mergeData *mergeData = NULL;
QofSession *merge_session = NULL; QofSession *merge_session = NULL;
QofBook *mergeBook = NULL; QofBook *mergeBook = NULL;
QofBook *targetBook = NULL; QofBook *targetBook = NULL;
gchar *buffer = "";
static QofLogModule log_module = GNC_QSF_IMPORT; static QofLogModule log_module = GNC_QSF_IMPORT;
@ -100,8 +99,7 @@ on_MergeUpdate_clicked (GtkButton *button,
if(count == 0) if(count == 0)
{ {
output = GTK_LABEL(merge_get_widget("OutPut")); output = GTK_LABEL(merge_get_widget("OutPut"));
buffer = g_strdup_printf(_("No conflicts to be resolved.")); gtk_label_set_text(output,_("No conflicts to be resolved."));
gtk_label_set_text(output,buffer);
gtk_widget_show(GTK_WIDGET(output)); gtk_widget_show(GTK_WIDGET(output));
} }
LEAVE (" "); LEAVE (" ");
@ -129,8 +127,7 @@ on_MergeDuplicate_clicked (GtkButton *button,
if(count == 0) if(count == 0)
{ {
output = GTK_LABEL(merge_get_widget("OutPut")); output = GTK_LABEL(merge_get_widget("OutPut"));
buffer = g_strdup_printf(_("No conflicts to be resolved.")); gtk_label_set_text(output,_("No conflicts to be resolved."));
gtk_label_set_text(output,buffer);
gtk_widget_show(GTK_WIDGET(output)); gtk_widget_show(GTK_WIDGET(output));
} }
LEAVE (" "); LEAVE (" ");
@ -155,8 +152,7 @@ on_MergeNew_clicked (GtkButton *button,
if(count == 0) if(count == 0)
{ {
output = GTK_LABEL(merge_get_widget("OutPut")); output = GTK_LABEL(merge_get_widget("OutPut"));
buffer = g_strdup_printf(_("No conflicts to be resolved.")); gtk_label_set_text(output,_("No conflicts to be resolved."));
gtk_label_set_text(output,buffer);
gtk_widget_show(GTK_WIDGET(output)); gtk_widget_show(GTK_WIDGET(output));
} }
LEAVE (" "); LEAVE (" ");
@ -258,8 +254,7 @@ on_merge_prepare (GnomeDruidPage *gnomedruidpage,
if(count == 0) if(count == 0)
{ {
output = GTK_LABEL(merge_get_widget("OutPut")); output = GTK_LABEL(merge_get_widget("OutPut"));
buffer = g_strdup_printf(_("No conflicts to be resolved.")); gtk_label_set_text(output,_("No conflicts to be resolved."));
gtk_label_set_text(output,buffer);
gtk_widget_show(GTK_WIDGET(output)); gtk_widget_show(GTK_WIDGET(output));
} }
gnc_resume_gui_refresh (); gnc_resume_gui_refresh ();
@ -317,6 +312,7 @@ void collision_rule_loop(qof_book_mergeData *mergeData, qof_book_mergeRule *rule
QofParam *one_param; QofParam *one_param;
gchar *importstring, *targetstring; gchar *importstring, *targetstring;
GtkLabel *output; GtkLabel *output;
gchar *buffer, *buffer2, *buffer3;
g_return_if_fail(rule != NULL); g_return_if_fail(rule != NULL);
buffer = ""; buffer = "";
@ -333,19 +329,27 @@ void collision_rule_loop(qof_book_mergeData *mergeData, qof_book_mergeRule *rule
count = 1; /* user display text counts from 1, not zero */ count = 1; /* user display text counts from 1, not zero */
importstring = targetstring = NULL; importstring = targetstring = NULL;
gnc_suspend_gui_refresh (); gnc_suspend_gui_refresh ();
if(remainder == 1) { /* Translators: %i is the number of conflicts. This is a
buffer = g_strdup_printf(_("\n%i conflict needs to be resolved.\n"), ngettext(3) message. */
remainder); buffer2 = g_strdup_printf(ngettext("%i conflict needs to be resolved.",
} "%i conflicts need to be resolved.",
else { remainder),
buffer = g_strdup_printf(_("\n%i conflicts need to be resolved.\n"), remainder);
remainder); /* Translators: %i is the number of values. This is a
} ngettext(3) message. */
buffer = g_strconcat(buffer, buffer3 = g_strdup_printf(ngettext("%i parameter value for this \"%s\" object.",
g_strdup_printf(_("\n%i parameter values for this \"%s\" object.\n"), "%i parameter values for this \"%s\" object.",
g_slist_length(user_reports), rule->targetEnt->e_type), NULL); g_slist_length(user_reports)),
g_slist_length(user_reports), rule->targetEnt->e_type);
buffer = g_strconcat("\n", buffer2, "\n", "\n", buffer3, "\n", NULL);
g_free(buffer2);
g_free(buffer3);
while(user_reports != NULL) { while(user_reports != NULL) {
one_param = user_reports->data; one_param = user_reports->data;
/* FIXME: each g_strdup_printf as well as g_strconcat
will allocate a new string; all of these need to be
freed later. Currently this causes a lot of memory
leaks. */
buffer = g_strconcat(buffer, g_strdup_printf(_("%i:Parameter name: %s "), buffer = g_strconcat(buffer, g_strdup_printf(_("%i:Parameter name: %s "),
count, one_param->param_name), NULL); count, one_param->param_name), NULL);
importstring = qof_book_merge_param_as_string(one_param, rule->importEnt); importstring = qof_book_merge_param_as_string(one_param, rule->importEnt);