[balsa/wip/gtk4: 192/351] Use gtk_editable_get_chars()
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/wip/gtk4: 192/351] Use gtk_editable_get_chars()
- Date: Wed, 23 May 2018 21:33:05 +0000 (UTC)
commit 2637c245255a435114cd1d4e2c3f1a100339d419
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Mon Feb 26 14:28:52 2018 -0500
Use gtk_editable_get_chars()
instead of g_strdup(gtk_entry_get_text()).
libbalsa/libbalsa-gpgme-cb.c | 2 +-
libbalsa/smtp-server.c | 3 ++-
src/balsa-app.c | 4 ++--
src/filter-edit-callbacks.c | 2 +-
src/folder-conf.c | 4 ++--
src/mailbox-conf.c | 10 ++++++----
src/main-window.c | 2 +-
src/pref-manager.c | 4 ++--
8 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/libbalsa/libbalsa-gpgme-cb.c b/libbalsa/libbalsa-gpgme-cb.c
index b1583d4..9c8b527 100644
--- a/libbalsa/libbalsa-gpgme-cb.c
+++ b/libbalsa/libbalsa-gpgme-cb.c
@@ -380,7 +380,7 @@ get_passphrase_real(const gchar * uid_hint, const gchar * passphrase_info,
gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
gtk_widget_grab_focus(entry);
if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK)
- passwd = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
+ passwd = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
else
passwd = NULL;
diff --git a/libbalsa/smtp-server.c b/libbalsa/smtp-server.c
index e5717df..c735cce 100644
--- a/libbalsa/smtp-server.c
+++ b/libbalsa/smtp-server.c
@@ -339,7 +339,8 @@ smtp_server_response(GtkDialog * dialog, gint response,
g_free(server->cert_file);
server->cert_file = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(sdi->cert_file));
g_free(server->cert_passphrase);
- server->cert_passphrase = g_strdup(gtk_entry_get_text(GTK_ENTRY(sdi->cert_pass)));
+ server->cert_passphrase =
+ gtk_editable_get_chars(GTK_EDITABLE(sdi->cert_pass), 0, -1);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sdi->split_button))) {
/* big_message is stored in kB, but the widget is in MB. */
sdi->smtp_server->big_message =
diff --git a/src/balsa-app.c b/src/balsa-app.c
index dcf6f44..530bef0 100644
--- a/src/balsa-app.c
+++ b/src/balsa-app.c
@@ -110,8 +110,8 @@ ask_password_real(LibBalsaServer * server, LibBalsaMailbox * mbox)
if(gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {
unsigned old_rem = server->remember_passwd;
- passwd = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry)));
- server->remember_passwd =
+ passwd = gtk_editable_get_chars(GTK_EDITABLE(entry), 0, -1);
+ server->remember_passwd =
!!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(rememb));
libbalsa_server_set_password(server, passwd);
if( server->remember_passwd || old_rem )
diff --git a/src/filter-edit-callbacks.c b/src/filter-edit-callbacks.c
index 3195b26..d7832e4 100644
--- a/src/filter-edit-callbacks.c
+++ b/src/filter-edit-callbacks.c
@@ -620,7 +620,7 @@ condition_validate(LibBalsaCondition* new_cnd)
switch (new_cnd->type) {
case CONDITION_STRING:
new_cnd->match.string.string =
- g_strdup(gtk_entry_get_text(GTK_ENTRY(fe_type_simple_entry)));
+ gtk_editable_get_chars(GTK_EDITABLE(fe_type_simple_entry), 0, -1);
break;
case CONDITION_REGEX:
diff --git a/src/folder-conf.c b/src/folder-conf.c
index eefd746..1f0a0f9 100644
--- a/src/folder-conf.c
+++ b/src/folder-conf.c
@@ -225,10 +225,10 @@ folder_conf_clicked_ok(FolderDialogData * fcw)
}
g_free(fcw->mbnode->dir);
- fcw->mbnode->dir = g_strdup(gtk_entry_get_text(GTK_ENTRY(fcw->prefix)));
+ fcw->mbnode->dir = gtk_editable_get_chars(GTK_EDITABLE(fcw->prefix), 0, -1);
g_free(fcw->mbnode->name);
fcw->mbnode->name =
- g_strdup(gtk_entry_get_text(GTK_ENTRY(fcw->folder_name)));
+ gtk_editable_get_chars(GTK_EDITABLE(fcw->folder_name), 0, -1);
fcw->mbnode->subscribed =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(fcw->subscribed));
fcw->mbnode->list_inbox =
diff --git a/src/mailbox-conf.c b/src/mailbox-conf.c
index 74362f2..4cc37e6 100644
--- a/src/mailbox-conf.c
+++ b/src/mailbox-conf.c
@@ -870,7 +870,7 @@ fill_in_imap_data(MailboxConfWindow *mcw, gchar ** name, gchar ** path)
0, -1);
if (mcw->mailbox_name && (!(*name =
- g_strdup(gtk_entry_get_text(GTK_ENTRY(mcw->mailbox_name))))
+ gtk_editable_get_chars(GTK_EDITABLE(mcw->mailbox_name), 0, -1))
|| *(g_strstrip(*name)) == '\0')) {
if (*name)
g_free(*name);
@@ -897,7 +897,8 @@ update_pop_mailbox(MailboxConfWindow *mcw)
/* basic data */
g_free(LIBBALSA_MAILBOX(mailbox)->name);
- LIBBALSA_MAILBOX(mailbox)->name = g_strdup(gtk_entry_get_text(GTK_ENTRY(mcw->mailbox_name)));
+ LIBBALSA_MAILBOX(mailbox)->name =
+ gtk_editable_get_chars(GTK_EDITABLE(mcw->mailbox_name), 0, -1);
libbalsa_server_set_host(server, gtk_entry_get_text(GTK_ENTRY(mcw->mb_data.pop3.bsc.server)), FALSE);
server->security = gtk_combo_box_get_active(GTK_COMBO_BOX(mcw->mb_data.pop3.security)) + 1;
@@ -910,14 +911,15 @@ update_pop_mailbox(MailboxConfWindow *mcw)
mailbox->delete_from_server = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON
(mcw->mb_data.pop3.delete_from_server));
mailbox->filter = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mcw->mb_data.pop3.filter));
g_free(mailbox->filter_cmd);
- mailbox->filter_cmd = g_strdup(gtk_entry_get_text(GTK_ENTRY(mcw->mb_data.pop3.filter_cmd)));
+ mailbox->filter_cmd =
+ gtk_editable_get_chars(GTK_EDITABLE(mcw->mb_data.pop3.filter_cmd), 0, -1);
/* advanced settings */
server->client_cert = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(bsc->need_client_cert));
g_free(server->cert_file);
server->cert_file = g_strdup(gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(bsc->client_cert_file)));;
g_free(server->cert_passphrase);
- server->cert_passphrase = g_strdup(gtk_entry_get_text(GTK_ENTRY(bsc->client_cert_passwd)));
+ server->cert_passphrase = gtk_editable_get_chars(GTK_EDITABLE(bsc->client_cert_passwd), 0, -1);
mailbox->disable_apop =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mcw->mb_data.pop3.disable_apop));
mailbox->enable_pipe = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mcw->mb_data.pop3.enable_pipe));
}
diff --git a/src/main-window.c b/src/main-window.c
index a570108..2267faf 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -3917,7 +3917,7 @@ bw_find_real(BalsaWindow * window, BalsaIndex * bindex, gboolean again)
(wrap_button));
g_free(cnd->match.string.string);
cnd->match.string.string =
- g_strdup(gtk_entry_get_text(GTK_ENTRY(search_entry)));
+ gtk_editable_get_chars(GTK_EDITABLE(search_entry), 0, -1);
cnd->match.string.fields=CONDITION_EMPTY;
if (gtk_toggle_button_get_active(matching_body))
diff --git a/src/pref-manager.c b/src/pref-manager.c
index 23d713b..74131f0 100644
--- a/src/pref-manager.c
+++ b/src/pref-manager.c
@@ -527,7 +527,7 @@ apply_prefs(GtkDialog * pbox)
/* arp */
g_free(balsa_app.quote_str);
balsa_app.quote_str =
- g_strdup(gtk_entry_get_text(GTK_ENTRY(pui->quote_str)));
+ gtk_editable_get_chars(GTK_EDITABLE(pui->quote_str), 0, -1);
/* fonts */
balsa_app.use_system_fonts =
@@ -587,7 +587,7 @@ apply_prefs(GtkDialog * pbox)
/* date format */
g_free(balsa_app.date_string);
balsa_app.date_string =
- g_strdup(gtk_entry_get_text(GTK_ENTRY(pui->date_format)));
+ gtk_editable_get_chars(GTK_EDITABLE(pui->date_format), 0, -1);
/* selected headers */
g_free(balsa_app.selected_headers);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]