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

use gtk_entry_get_text instead of gtk_editable_get_chars

Browse Source 
the former returns a const char* which does not need to be freed.
This commit is contained in:
Christopher Lam 2022-08-01 23:44:05 +08:00
parent d1aefc851d
commit 1b845a86f3
9 changed files with 54 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnucash/gnome-utils/gnc-account-sel.c
View File

@ -204,10 +204,11 @@ gas_populate_list (GNCAccountSel *gas)
GtkEntry *entry; GtkEntry *entry;
gint i, active = -1; gint i, active = -1;
GList *accts, *ptr; GList *accts, *ptr;
gchar *currentSel, *name; const gchar *currentSel;
gchar *name;
entry = GTK_ENTRY(gtk_bin_get_child (GTK_BIN(gas->combo))); entry = GTK_ENTRY(gtk_bin_get_child (GTK_BIN(gas->combo)));
currentSel = gtk_editable_get_chars (GTK_EDITABLE(entry), 0, -1 ); currentSel = gtk_entry_get_text (entry);
g_signal_handlers_block_by_func (gas->combo, combo_changed_cb , gas); g_signal_handlers_block_by_func (gas->combo, combo_changed_cb , gas);
@ -244,8 +245,6 @@ gas_populate_list (GNCAccountSel *gas)
g_signal_handlers_unblock_by_func (gas->combo, combo_changed_cb , gas); g_signal_handlers_unblock_by_func (gas->combo, combo_changed_cb , gas);
g_list_free (atnd.outList); g_list_free (atnd.outList);
if (currentSel)
g_free (currentSel);
} }
static void static void

55
gnucash/gnome/dialog-customer.c
View File

@ -213,44 +213,25 @@ static void gnc_ui_to_customer (CustomerWindow *cw, GncCustomer *cust)
if (cw->dialog_type == NEW_CUSTOMER) if (cw->dialog_type == NEW_CUSTOMER)
qof_event_gen(QOF_INSTANCE(cust), QOF_EVENT_ADD, NULL); qof_event_gen(QOF_INSTANCE(cust), QOF_EVENT_ADD, NULL);
gncCustomerSetID (cust, gtk_editable_get_chars gncCustomerSetID (cust, gtk_entry_get_text (GTK_ENTRY (cw->id_entry)));
(GTK_EDITABLE (cw->id_entry), 0, -1)); gncCustomerSetName (cust, gtk_entry_get_text (GTK_ENTRY (cw->company_entry)));
gncCustomerSetName (cust, gtk_editable_get_chars
(GTK_EDITABLE (cw->company_entry), 0, -1));
gncAddressSetName (addr, gtk_editable_get_chars gncAddressSetName (addr, gtk_entry_get_text (GTK_ENTRY (cw->name_entry)));
(GTK_EDITABLE (cw->name_entry), 0, -1)); gncAddressSetAddr1 (addr, gtk_entry_get_text (GTK_ENTRY (cw->addr1_entry)));
gncAddressSetAddr1 (addr, gtk_editable_get_chars gncAddressSetAddr2 (addr, gtk_entry_get_text (GTK_ENTRY (cw->addr2_entry)));
(GTK_EDITABLE (cw->addr1_entry), 0, -1)); gncAddressSetAddr3 (addr, gtk_entry_get_text (GTK_ENTRY (cw->addr3_entry)));
gncAddressSetAddr2 (addr, gtk_editable_get_chars gncAddressSetAddr4 (addr, gtk_entry_get_text (GTK_ENTRY (cw->addr4_entry)));
(GTK_EDITABLE (cw->addr2_entry), 0, -1)); gncAddressSetPhone (addr, gtk_entry_get_text (GTK_ENTRY (cw->phone_entry)));
gncAddressSetAddr3 (addr, gtk_editable_get_chars gncAddressSetFax (addr, gtk_entry_get_text (GTK_ENTRY (cw->fax_entry)));
(GTK_EDITABLE (cw->addr3_entry), 0, -1)); gncAddressSetEmail (addr, gtk_entry_get_text (GTK_ENTRY (cw->email_entry)));
gncAddressSetAddr4 (addr, gtk_editable_get_chars gncAddressSetName (shipaddr, gtk_entry_get_text (GTK_ENTRY (cw->shipname_entry)));
(GTK_EDITABLE (cw->addr4_entry), 0, -1)); gncAddressSetAddr1 (shipaddr, gtk_entry_get_text (GTK_ENTRY (cw->shipaddr1_entry)));
gncAddressSetPhone (addr, gtk_editable_get_chars gncAddressSetAddr2 (shipaddr, gtk_entry_get_text (GTK_ENTRY (cw->shipaddr2_entry)));
(GTK_EDITABLE (cw->phone_entry), 0, -1)); gncAddressSetAddr3 (shipaddr, gtk_entry_get_text (GTK_ENTRY (cw->shipaddr3_entry)));
gncAddressSetFax (addr, gtk_editable_get_chars gncAddressSetAddr4 (shipaddr, gtk_entry_get_text (GTK_ENTRY (cw->shipaddr4_entry)));
(GTK_EDITABLE (cw->fax_entry), 0, -1)); gncAddressSetPhone (shipaddr, gtk_entry_get_text (GTK_ENTRY (cw->shipphone_entry)));
gncAddressSetEmail (addr, gtk_editable_get_chars gncAddressSetFax (shipaddr, gtk_entry_get_text (GTK_ENTRY (cw->shipfax_entry)));
(GTK_EDITABLE (cw->email_entry), 0, -1)); gncAddressSetEmail (shipaddr, gtk_entry_get_text (GTK_ENTRY (cw->shipemail_entry)));
gncAddressSetName (shipaddr, gtk_editable_get_chars
(GTK_EDITABLE (cw->shipname_entry), 0, -1));
gncAddressSetAddr1 (shipaddr, gtk_editable_get_chars
(GTK_EDITABLE (cw->shipaddr1_entry), 0, -1));
gncAddressSetAddr2 (shipaddr, gtk_editable_get_chars
(GTK_EDITABLE (cw->shipaddr2_entry), 0, -1));
gncAddressSetAddr3 (shipaddr, gtk_editable_get_chars
(GTK_EDITABLE (cw->shipaddr3_entry), 0, -1));
gncAddressSetAddr4 (shipaddr, gtk_editable_get_chars
(GTK_EDITABLE (cw->shipaddr4_entry), 0, -1));
gncAddressSetPhone (shipaddr, gtk_editable_get_chars
(GTK_EDITABLE (cw->shipphone_entry), 0, -1));
gncAddressSetFax (shipaddr, gtk_editable_get_chars
(GTK_EDITABLE (cw->shipfax_entry), 0, -1));
gncAddressSetEmail (shipaddr, gtk_editable_get_chars
(GTK_EDITABLE (cw->shipemail_entry), 0, -1));
gncCustomerSetActive (cust, gtk_toggle_button_get_active gncCustomerSetActive (cust, gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (cw->active_check))); (GTK_TOGGLE_BUTTON (cw->active_check)));

9
gnucash/gnome/dialog-doclink.c
View File

@ -109,12 +109,12 @@ gnc_doclink_open_uri (GtkWindow *parent, const gchar *uri)
/* =================================================================== */ /* =================================================================== */
static void static void
location_ok_cb (GtkEditable *editable, gpointer user_data) location_ok_cb (GtkEntry *entry, gpointer user_data)
{ {
GtkWidget *ok_button = user_data; GtkWidget *ok_button = user_data;
gboolean have_scheme = FALSE; gboolean have_scheme = FALSE;
gchar *text = gtk_editable_get_chars (editable, 0, -1); const gchar *text = gtk_entry_get_text (entry);
GtkWidget *warning_hbox = g_object_get_data (G_OBJECT(editable), "whbox"); GtkWidget *warning_hbox = g_object_get_data (G_OBJECT(entry), "whbox");
if (text && *text) if (text && *text)
{ {
@ -126,7 +126,6 @@ location_ok_cb (GtkEditable *editable, gpointer user_data)
} }
gtk_widget_set_visible (warning_hbox, !have_scheme); gtk_widget_set_visible (warning_hbox, !have_scheme);
gtk_widget_set_sensitive (ok_button, have_scheme); gtk_widget_set_sensitive (ok_button, have_scheme);
g_free (text);
} }
static void static void
@ -216,7 +215,7 @@ uri_type_selected_cb (GtkToggleButton *button, GtkWidget *widget)
{ {
if (g_strcmp0 (gtk_buildable_get_name ( if (g_strcmp0 (gtk_buildable_get_name (
GTK_BUILDABLE(parent_hbox)), "location_hbox") == 0) GTK_BUILDABLE(parent_hbox)), "location_hbox") == 0)
location_ok_cb (GTK_EDITABLE(widget), ok_button); location_ok_cb (GTK_ENTRY (widget), ok_button);
else else
file_ok_cb (GTK_BUTTON(widget), ok_button); file_ok_cb (GTK_BUTTON(widget), ok_button);

34
gnucash/gnome/dialog-employee.c
View File

@ -129,32 +129,20 @@ static void gnc_ui_to_employee (EmployeeWindow *ew, GncEmployee *employee)
if (ew->dialog_type == NEW_EMPLOYEE) if (ew->dialog_type == NEW_EMPLOYEE)
qof_event_gen(QOF_INSTANCE(employee), QOF_EVENT_ADD, NULL); qof_event_gen(QOF_INSTANCE(employee), QOF_EVENT_ADD, NULL);
gncEmployeeSetID (employee, gtk_editable_get_chars gncEmployeeSetID (employee, gtk_entry_get_text (GTK_ENTRY (ew->id_entry)));
(GTK_EDITABLE (ew->id_entry), 0, -1)); gncEmployeeSetUsername (employee, gtk_entry_get_text (GTK_ENTRY (ew->username_entry)));
gncEmployeeSetUsername (employee, gtk_editable_get_chars
(GTK_EDITABLE (ew->username_entry), 0, -1));
gncAddressSetName (addr, gtk_editable_get_chars
(GTK_EDITABLE (ew->name_entry), 0, -1));
gncAddressSetAddr1 (addr, gtk_editable_get_chars
(GTK_EDITABLE (ew->addr1_entry), 0, -1));
gncAddressSetAddr2 (addr, gtk_editable_get_chars
(GTK_EDITABLE (ew->addr2_entry), 0, -1));
gncAddressSetAddr3 (addr, gtk_editable_get_chars
(GTK_EDITABLE (ew->addr3_entry), 0, -1));
gncAddressSetAddr4 (addr, gtk_editable_get_chars
(GTK_EDITABLE (ew->addr4_entry), 0, -1));
gncAddressSetPhone (addr, gtk_editable_get_chars
(GTK_EDITABLE (ew->phone_entry), 0, -1));
gncAddressSetFax (addr, gtk_editable_get_chars
(GTK_EDITABLE (ew->fax_entry), 0, -1));
gncAddressSetEmail (addr, gtk_editable_get_chars
(GTK_EDITABLE (ew->email_entry), 0, -1));
gncAddressSetName (addr, gtk_entry_get_text (GTK_ENTRY (ew->name_entry)));
gncAddressSetAddr1 (addr, gtk_entry_get_text (GTK_ENTRY (ew->addr1_entry)));
gncAddressSetAddr2 (addr, gtk_entry_get_text (GTK_ENTRY (ew->addr2_entry)));
gncAddressSetAddr3 (addr, gtk_entry_get_text (GTK_ENTRY (ew->addr3_entry)));
gncAddressSetAddr4 (addr, gtk_entry_get_text (GTK_ENTRY (ew->addr4_entry)));
gncAddressSetPhone (addr, gtk_entry_get_text (GTK_ENTRY (ew->phone_entry)));
gncAddressSetFax (addr, gtk_entry_get_text (GTK_ENTRY (ew->fax_entry)));
gncAddressSetEmail (addr, gtk_entry_get_text (GTK_ENTRY (ew->email_entry)));
gncEmployeeSetActive (employee, gtk_toggle_button_get_active gncEmployeeSetActive (employee, gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (ew->active_check))); (GTK_TOGGLE_BUTTON (ew->active_check)));
gncEmployeeSetLanguage (employee, gtk_editable_get_chars gncEmployeeSetLanguage (employee, gtk_entry_get_text (GTK_ENTRY (ew->language_entry)));
(GTK_EDITABLE (ew->language_entry), 0, -1));
/* Parse and set the workday and rate amounts */ /* Parse and set the workday and rate amounts */
gncEmployeeSetWorkday (employee, gnc_amount_edit_get_amount gncEmployeeSetWorkday (employee, gnc_amount_edit_get_amount

6
gnucash/gnome/dialog-invoice.c
View File

@ -399,10 +399,8 @@ static void gnc_ui_to_invoice (InvoiceWindow *iw, GncInvoice *invoice)
/* Only set these values for NEW/MOD INVOICE types */ /* Only set these values for NEW/MOD INVOICE types */
if (iw->dialog_type != EDIT_INVOICE) if (iw->dialog_type != EDIT_INVOICE)
{ {
gncInvoiceSetID (invoice, gtk_editable_get_chars gncInvoiceSetID (invoice, gtk_entry_get_text (GTK_ENTRY (iw->id_entry)));
(GTK_EDITABLE (iw->id_entry), 0, -1)); gncInvoiceSetBillingID (invoice, gtk_entry_get_text (GTK_ENTRY (iw->billing_id_entry)));
gncInvoiceSetBillingID (invoice, gtk_editable_get_chars
(GTK_EDITABLE (iw->billing_id_entry), 0, -1));
gncInvoiceSetTerms (invoice, iw->terms); gncInvoiceSetTerms (invoice, iw->terms);
gncInvoiceSetDateOpened (invoice, time); gncInvoiceSetDateOpened (invoice, time);

9
gnucash/gnome/dialog-job.c
View File

@ -105,12 +105,9 @@ static void gnc_ui_to_job (JobWindow *jw, GncJob *job)
qof_event_gen(QOF_INSTANCE(job), QOF_EVENT_ADD, NULL); qof_event_gen(QOF_INSTANCE(job), QOF_EVENT_ADD, NULL);
gncJobSetID (job, gtk_editable_get_chars (GTK_EDITABLE (jw->id_entry), gncJobSetID (job, gtk_entry_get_text (GTK_ENTRY (jw->id_entry)));
0, -1)); gncJobSetName (job, gtk_entry_get_text (GTK_ENTRY (jw->name_entry)));
gncJobSetName (job, gtk_editable_get_chars (GTK_EDITABLE (jw->name_entry), gncJobSetReference (job, gtk_entry_get_text (GTK_ENTRY (jw->desc_entry)));
0, -1));
gncJobSetReference (job, gtk_editable_get_chars
(GTK_EDITABLE (jw->desc_entry), 0, -1));
gncJobSetRate (job, gnc_amount_edit_get_amount gncJobSetRate (job, gnc_amount_edit_get_amount
(GNC_AMOUNT_EDIT (jw->rate_entry))); (GNC_AMOUNT_EDIT (jw->rate_entry)));
gncJobSetActive (job, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON gncJobSetActive (job, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON

6
gnucash/gnome/dialog-order.c
View File

@ -133,16 +133,14 @@ static void gnc_ui_to_order (OrderWindow *ow, GncOrder *order)
gnc_suspend_gui_refresh (); gnc_suspend_gui_refresh ();
gncOrderBeginEdit (order); gncOrderBeginEdit (order);
gncOrderSetID (order, gtk_editable_get_chars gncOrderSetID (order, gtk_entry_get_text (GTK_ENTRY (ow->id_entry)));
(GTK_EDITABLE (ow->id_entry), 0, -1));
text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(ow->notes_text)); text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(ow->notes_text));
gtk_text_buffer_get_bounds (text_buffer, &start, &end); gtk_text_buffer_get_bounds (text_buffer, &start, &end);
text = gtk_text_buffer_get_text (text_buffer, &start, &end, FALSE); text = gtk_text_buffer_get_text (text_buffer, &start, &end, FALSE);
gncOrderSetNotes (order, text); gncOrderSetNotes (order, text);
gncOrderSetReference (order, gtk_editable_get_chars gncOrderSetReference (order, gtk_entry_get_text (GTK_ENTRY (ow->ref_entry)));
(GTK_EDITABLE (ow->ref_entry), 0, -1));
tt = gnc_date_edit_get_date (GNC_DATE_EDIT (ow->opened_date)); tt = gnc_date_edit_get_date (GNC_DATE_EDIT (ow->opened_date));
gncOrderSetDateOpened (order, tt); gncOrderSetDateOpened (order, tt);

2
gnucash/gnome/dialog-sx-editor.c
View File

@ -264,7 +264,7 @@ editor_ok_button_clicked_cb (GtkButton *b, GncSxEditorDialog *sxed)
static gboolean static gboolean
gnc_sxed_check_name_changed (GncSxEditorDialog *sxed) gnc_sxed_check_name_changed (GncSxEditorDialog *sxed)
{ {
char *name = gtk_editable_get_chars (GTK_EDITABLE (sxed->nameEntry), 0, -1); const char *name = gtk_entry_get_text (GTK_ENTRY (sxed->nameEntry));
if (strlen (name) == 0) if (strlen (name) == 0)
return TRUE; return TRUE;

30
gnucash/gnome/dialog-vendor.c
View File

@ -146,27 +146,17 @@ static void gnc_ui_to_vendor (VendorWindow *vw, GncVendor *vendor)
if (vw->dialog_type == NEW_VENDOR) if (vw->dialog_type == NEW_VENDOR)
qof_event_gen(QOF_INSTANCE(vendor), QOF_EVENT_ADD, NULL); qof_event_gen(QOF_INSTANCE(vendor), QOF_EVENT_ADD, NULL);
gncVendorSetID (vendor, gtk_editable_get_chars gncVendorSetID (vendor, gtk_entry_get_text (GTK_ENTRY (vw->id_entry)));
(GTK_EDITABLE (vw->id_entry), 0, -1)); gncVendorSetName (vendor, gtk_entry_get_text (GTK_ENTRY (vw->company_entry)));
gncVendorSetName (vendor, gtk_editable_get_chars
(GTK_EDITABLE (vw->company_entry), 0, -1));
gncAddressSetName (addr, gtk_editable_get_chars gncAddressSetName (addr, gtk_entry_get_text (GTK_ENTRY (vw->name_entry)));
(GTK_EDITABLE (vw->name_entry), 0, -1)); gncAddressSetAddr1 (addr, gtk_entry_get_text (GTK_ENTRY (vw->addr1_entry)));
gncAddressSetAddr1 (addr, gtk_editable_get_chars gncAddressSetAddr2 (addr, gtk_entry_get_text (GTK_ENTRY (vw->addr2_entry)));
(GTK_EDITABLE (vw->addr1_entry), 0, -1)); gncAddressSetAddr3 (addr, gtk_entry_get_text (GTK_ENTRY (vw->addr3_entry)));
gncAddressSetAddr2 (addr, gtk_editable_get_chars gncAddressSetAddr4 (addr, gtk_entry_get_text (GTK_ENTRY (vw->addr4_entry)));
(GTK_EDITABLE (vw->addr2_entry), 0, -1)); gncAddressSetPhone (addr, gtk_entry_get_text (GTK_ENTRY (vw->phone_entry)));
gncAddressSetAddr3 (addr, gtk_editable_get_chars gncAddressSetFax (addr, gtk_entry_get_text (GTK_ENTRY (vw->fax_entry)));
(GTK_EDITABLE (vw->addr3_entry), 0, -1)); gncAddressSetEmail (addr, gtk_entry_get_text (GTK_ENTRY (vw->email_entry)));
gncAddressSetAddr4 (addr, gtk_editable_get_chars
(GTK_EDITABLE (vw->addr4_entry), 0, -1));
gncAddressSetPhone (addr, gtk_editable_get_chars
(GTK_EDITABLE (vw->phone_entry), 0, -1));
gncAddressSetFax (addr, gtk_editable_get_chars
(GTK_EDITABLE (vw->fax_entry), 0, -1));
gncAddressSetEmail (addr, gtk_editable_get_chars
(GTK_EDITABLE (vw->email_entry), 0, -1));
gncVendorSetActive (vendor, gtk_toggle_button_get_active gncVendorSetActive (vendor, gtk_toggle_button_get_active
(GTK_TOGGLE_BUTTON (vw->active_check))); (GTK_TOGGLE_BUTTON (vw->active_check)));