[balsa/wip/gtk4] GtkEntry API => GtkEditable
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/wip/gtk4] GtkEntry API => GtkEditable
- Date: Fri, 1 Mar 2019 19:14:45 +0000 (UTC)
commit cb933e93d10c9be1302fbd338e59e9d7a37c7973
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Fri Mar 1 14:12:46 2019 -0500
GtkEntry API => GtkEditable
gtk_entry_[gs]et_text have been replaced by corresponding GtkEditable
functions.
libbalsa/address-view.c | 18 +++++-----
libbalsa/address.c | 18 +++++-----
libbalsa/identity-widgets.c | 20 ++++++------
libbalsa/libbalsa-gpgme-cb.c | 2 +-
libbalsa/misc.c | 2 +-
libbalsa/smtp-server.c | 26 +++++++--------
libinit_balsa/assistant_helper.c | 2 +-
libinit_balsa/assistant_page_directory.c | 10 +++---
libinit_balsa/assistant_page_user.c | 12 +++----
src/ab-main.c | 2 +-
src/ab-window.c | 4 +--
src/address-book-config.c | 24 +++++++-------
src/balsa-app.c | 2 +-
src/balsa-message.c | 8 ++---
src/compose-window.c | 22 ++++++-------
src/filter-edit-callbacks.c | 48 +++++++++++++--------------
src/folder-conf.c | 20 ++++++------
src/mailbox-conf.c | 56 ++++++++++++++++----------------
src/main-window.c | 12 +++----
src/pref-manager.c | 14 ++++----
src/spell-check.c | 4 +--
21 files changed, 163 insertions(+), 163 deletions(-)
---
diff --git a/libbalsa/address-view.c b/libbalsa/address-view.c
index ae6ef61c0..dab801f71 100644
--- a/libbalsa/address-view.c
+++ b/libbalsa/address-view.c
@@ -296,7 +296,7 @@ lbav_entry_setup_matches(LibBalsaAddressView * address_view,
const gchar *prefix;
GList *match = NULL;
- prefix = gtk_entry_get_text(entry);
+ prefix = gtk_editable_get_text(GTK_EDITABLE(entry));
if (*prefix)
match = lbav_get_matching_addresses(address_view, prefix, type);
lbav_append_addresses(address_view, completion, match, prefix);
@@ -409,7 +409,7 @@ lbav_combo_changed_idle(LibBalsaAddressView * address_view)
/* Save the address */
child = lbav_get_entry(address_view, row);
- name = gtk_entry_get_text(GTK_ENTRY(child));
+ name = gtk_editable_get_text(GTK_EDITABLE(child));
/* Find the new row for the addrress */
new_type = gtk_combo_box_get_active(GTK_COMBO_BOX(combo_box));
@@ -433,7 +433,7 @@ lbav_combo_changed_idle(LibBalsaAddressView * address_view)
icon = (name == NULL || name[0] == '\0') ? WITH_BOOK_ICON : WITH_CLOSE_ICON;
lbav_insert_row(address_view, row, new_type, icon);
child = lbav_get_entry(address_view, row);
- gtk_entry_set_text(GTK_ENTRY(child), name);
+ gtk_editable_set_text(GTK_EDITABLE(child), name);
if (old_row > row) {
++old_row;
@@ -589,7 +589,7 @@ lbav_ensure_blank_row(LibBalsaAddressView * address_view, gint type)
for (row = 0; (child = lbav_get_entry(address_view, row)) != NULL; /* nothing */) {
const gchar *name;
- name = gtk_entry_get_text(GTK_ENTRY(child));
+ name = gtk_editable_get_text(GTK_EDITABLE(child));
if (name == NULL || name[0] == '\0') {
lbav_remove_row(address_view, row);
} else {
@@ -675,7 +675,7 @@ lbav_add_from_list(LibBalsaAddressView * address_view,
}
child = lbav_get_entry(address_view, row);
- gtk_entry_set_text(GTK_ENTRY(child), name);
+ gtk_editable_set_text(GTK_EDITABLE(child), name);
g_free(name);
}
g_signal_emit(address_view, address_view_signals[VIEW_CHANGED], 0);
@@ -892,7 +892,7 @@ lbav_completion_match_selected_cb(GtkEntryCompletion * completion,
entry = gtk_entry_completion_get_entry(completion);
g_signal_handlers_block_by_func(entry, lbav_entry_changed_cb,
address_view);
- gtk_entry_set_text(GTK_ENTRY(entry), name);
+ gtk_editable_set_text(GTK_EDITABLE(entry), name);
g_signal_handlers_unblock_by_func(entry, lbav_entry_changed_cb,
address_view);
@@ -916,7 +916,7 @@ lbav_notify_has_focus_cb(GtkEntry *entry,
return;
}
- name = gtk_entry_get_text(entry);
+ name = gtk_editable_get_text(GTK_EDITABLE(entry));
if (name == NULL || name[0] == '\0') {
/* No text to match */
@@ -945,7 +945,7 @@ lbav_notify_has_focus_cb(GtkEntry *entry,
g_signal_handlers_block_by_func(entry,
lbav_entry_changed_cb,
address_view);
- gtk_entry_set_text(entry, the_addr);
+ gtk_editable_set_text(GTK_EDITABLE(entry), the_addr);
g_signal_handlers_unblock_by_func(entry,
lbav_entry_changed_cb,
address_view);
@@ -1147,7 +1147,7 @@ libbalsa_address_view_get_list(LibBalsaAddressView * address_view,
InternetAddressList *tmp_list;
child = lbav_get_entry(address_view, row);
- name = gtk_entry_get_text(GTK_ENTRY(child));
+ name = gtk_editable_get_text(GTK_EDITABLE(child));
tmp_list = internet_address_list_parse_string(name);
if (tmp_list != NULL) {
internet_address_list_append(address_list, tmp_list);
diff --git a/libbalsa/address.c b/libbalsa/address.c
index e76fabdd7..b2af7ffc3 100644
--- a/libbalsa/address.c
+++ b/libbalsa/address.c
@@ -753,11 +753,11 @@ libbalsa_address_set_edit_entries(const LibBalsaAddress * address,
nick_name = g_strdup(address->nick_name);
/* Full name must be set after first and last names. */
- gtk_entry_set_text(GTK_ENTRY(entries[FIRST_NAME]), first_name);
- gtk_entry_set_text(GTK_ENTRY(entries[LAST_NAME]), last_name);
- gtk_entry_set_text(GTK_ENTRY(entries[FULL_NAME]), new_name);
- gtk_entry_set_text(GTK_ENTRY(entries[NICK_NAME]), nick_name);
- gtk_entry_set_text(GTK_ENTRY(entries[ORGANIZATION]), new_organization);
+ gtk_editable_set_text(GTK_EDITABLE(entries[FIRST_NAME]), first_name);
+ gtk_editable_set_text(GTK_EDITABLE(entries[LAST_NAME]), last_name);
+ gtk_editable_set_text(GTK_EDITABLE(entries[FULL_NAME]), new_name);
+ gtk_editable_set_text(GTK_EDITABLE(entries[NICK_NAME]), nick_name);
+ gtk_editable_set_text(GTK_EDITABLE(entries[ORGANIZATION]), new_organization);
store = GTK_LIST_STORE(gtk_tree_view_get_model
(GTK_TREE_VIEW(entries[EMAIL_ADDRESS])));
@@ -795,12 +795,12 @@ libbalsa_address_set_edit_entries(const LibBalsaAddress * address,
and enumerated with LibBalsaAddressField constants
*/
static void
-lba_entry_changed(GtkEntry * entry, GtkEntry ** entries)
+lba_entry_changed(GtkEntry * entry, GtkEditable ** editables)
{
gchar *full_name =
- g_strconcat(gtk_entry_get_text(entries[FIRST_NAME]), " ",
- gtk_entry_get_text(entries[LAST_NAME]), NULL);
- gtk_entry_set_text(entries[FULL_NAME], full_name);
+ g_strconcat(gtk_editable_get_text(editables[FIRST_NAME]), " ",
+ gtk_editable_get_text(editables[LAST_NAME]), NULL);
+ gtk_editable_set_text(editables[FULL_NAME], full_name);
g_free(full_name);
}
diff --git a/libbalsa/identity-widgets.c b/libbalsa/identity-widgets.c
index c5b4ad6ae..a426f0e10 100644
--- a/libbalsa/identity-widgets.c
+++ b/libbalsa/identity-widgets.c
@@ -386,7 +386,7 @@ static void set_identity_name_in_tree(GtkTreeView * tree,
const gchar * name);
static void md_response_cb(GtkWidget * dialog, gint response,
GtkTreeView * tree);
-static void md_name_changed(GtkEntry * name, GtkTreeView * tree);
+static void md_name_changed(GtkEditable * name, GtkTreeView * tree);
static void ident_dialog_add_gpg_menu(GtkWidget * grid, gint row,
GtkDialog * dialog,
@@ -726,10 +726,10 @@ setup_ident_frame(GtkDialog * dialog, gboolean createp, gpointer tree,
/* Callback for the "changed" signal of the name entry; updates the name
* in the tree. */
static void
-md_name_changed(GtkEntry * name, GtkTreeView * tree)
+md_name_changed(GtkEditable * name, GtkTreeView * tree)
{
set_identity_name_in_tree(tree, get_selected_identity(tree),
- gtk_entry_get_text(name));
+ gtk_editable_get_text(name));
}
/*
@@ -1213,14 +1213,14 @@ ident_dialog_update(GObject * dlg)
static const gchar *
ident_dialog_get_text(GObject * dialog, const gchar * key)
{
- GtkEntry *entry;
+ GtkEditable *editable;
GtkToggleButton *check;
- entry = g_object_get_data(dialog, key);
- check = g_object_get_data(G_OBJECT(entry), LIBBALSA_IDENTITY_CHECK);
+ editable = g_object_get_data(dialog, key);
+ check = g_object_get_data(G_OBJECT(editable), LIBBALSA_IDENTITY_CHECK);
if (check && !gtk_toggle_button_get_active(check))
return NULL;
- return gtk_entry_get_text(entry);
+ return gtk_editable_get_text(editable);
}
@@ -1580,9 +1580,9 @@ display_frame_set_field(GObject * dialog,
const gchar* key,
const gchar* value)
{
- GtkEntry *entry = g_object_get_data(dialog, key);
+ GtkEditable *editable = g_object_get_data(dialog, key);
- gtk_entry_set_text(entry, value ? value : "");
+ gtk_editable_set_text(editable, value != NULL ? value : "");
}
static void
@@ -1609,7 +1609,7 @@ display_frame_set_path(GObject * dialog,
if(use_chooser)
gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(chooser), value);
else
- gtk_entry_set_text(GTK_ENTRY(chooser), value);
+ gtk_editable_set_text(GTK_EDITABLE(chooser), value);
}
gtk_widget_set_sensitive(GTK_WIDGET(chooser), set);
gtk_toggle_button_set_active(check, set);
diff --git a/libbalsa/libbalsa-gpgme-cb.c b/libbalsa/libbalsa-gpgme-cb.c
index 5e2e11daa..097d2bba1 100644
--- a/libbalsa/libbalsa-gpgme-cb.c
+++ b/libbalsa/libbalsa-gpgme-cb.c
@@ -367,7 +367,7 @@ get_passphrase_real(const gchar * uid_hint, const gchar * passphrase_info,
entry = gtk_entry_new();
gtk_container_add(GTK_CONTAINER(vbox), entry);
- gtk_entry_set_width_chars(GTK_ENTRY(entry), 40);
+ gtk_editable_set_width_chars(GTK_EDITABLE(entry), 40);
gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
diff --git a/libbalsa/misc.c b/libbalsa/misc.c
index 2208635a0..885c14e88 100644
--- a/libbalsa/misc.c
+++ b/libbalsa/misc.c
@@ -949,7 +949,7 @@ libbalsa_create_grid_entry(GtkWidget * grid, GCallback changed_func,
gtk_grid_attach(GTK_GRID(grid), entry, 1, row, 1, 1);
if (initval)
- gtk_entry_set_text(GTK_ENTRY(entry), initval);
+ gtk_editable_set_text(GTK_EDITABLE(entry), initval);
gtk_label_set_mnemonic_widget(GTK_LABEL(hotlabel), entry);
diff --git a/libbalsa/smtp-server.c b/libbalsa/smtp-server.c
index 5881bcdd8..ca64cee54 100644
--- a/libbalsa/smtp-server.c
+++ b/libbalsa/smtp-server.c
@@ -285,23 +285,23 @@ smtp_server_response(GtkDialog * dialog, gint response,
return;
case GTK_RESPONSE_OK:
libbalsa_smtp_server_set_name(sdi->smtp_server,
- gtk_entry_get_text(GTK_ENTRY
+ gtk_editable_get_text(GTK_EDITABLE
(sdi->name)));
libbalsa_server_set_security
(server,
(NetClientCryptMode) (gtk_combo_box_get_active(GTK_COMBO_BOX(sdi->tlsm)) + 1));
libbalsa_server_set_host
(server,
- gtk_entry_get_text(GTK_ENTRY(sdi->host)));
+ gtk_editable_get_text(GTK_EDITABLE(sdi->host)));
libbalsa_server_set_try_anonymous
(server,
!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sdi->auth_button)));
libbalsa_server_set_username
(server,
- gtk_entry_get_text(GTK_ENTRY(sdi->user)));
+ gtk_editable_get_text(GTK_EDITABLE(sdi->user)));
libbalsa_server_set_password
(server,
- gtk_entry_get_text(GTK_ENTRY(sdi->pass)));
+ gtk_editable_get_text(GTK_EDITABLE(sdi->pass)));
libbalsa_server_set_client_cert
(server,
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sdi->cert_button)));
@@ -312,7 +312,7 @@ smtp_server_response(GtkDialog * dialog, gint response,
libbalsa_server_set_cert_passphrase
(server,
- gtk_entry_get_text(GTK_ENTRY(sdi->cert_pass)));
+ gtk_editable_get_text(GTK_EDITABLE(sdi->cert_pass)));
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 =
@@ -344,8 +344,8 @@ smtp_server_changed(GtkWidget G_GNUC_UNUSED *widget,
/* enable ok button only if a name and a host have been given */
if ((sdi->name != NULL) && (sdi->host != NULL)) {
- enable_ok = (*gtk_entry_get_text(GTK_ENTRY(sdi->name)) != '\0')
- && (*gtk_entry_get_text(GTK_ENTRY(sdi->host)) != '\0');
+ enable_ok = (*gtk_editable_get_text(GTK_EDITABLE(sdi->name)) != '\0')
+ && (*gtk_editable_get_text(GTK_EDITABLE(sdi->host)) != '\0');
}
/* user name/password only if authentication is required */
@@ -355,7 +355,7 @@ smtp_server_changed(GtkWidget G_GNUC_UNUSED *widget,
gtk_widget_set_sensitive(sdi->pass, sensitive);
/* disable ok if authentication is required, but no user name given */
- if (sensitive && (*gtk_entry_get_text(GTK_ENTRY(sdi->user)) == '\0')) {
+ if (sensitive && (*gtk_editable_get_text(GTK_EDITABLE(sdi->user)) == '\0')) {
enable_ok = FALSE;
}
}
@@ -462,7 +462,7 @@ libbalsa_smtp_server_dialog(LibBalsaSmtpServer * smtp_server,
gtk_widget_set_hexpand(sdi->name, TRUE);
smtp_server_add_widget(grid, row, _("_Descriptive Name:"), sdi->name);
if (smtp_server->name != NULL) {
- gtk_entry_set_text(GTK_ENTRY(sdi->name), smtp_server->name);
+ gtk_editable_set_text(GTK_EDITABLE(sdi->name), smtp_server->name);
}
g_signal_connect(sdi->name, "changed", G_CALLBACK(smtp_server_changed), sdi);
@@ -470,7 +470,7 @@ libbalsa_smtp_server_dialog(LibBalsaSmtpServer * smtp_server,
sdi->host = gtk_entry_new();
smtp_server_add_widget(grid, ++row, _("_Server:"), sdi->host);
if (libbalsa_server_get_host(server) != NULL) {
- gtk_entry_set_text(GTK_ENTRY(sdi->host), libbalsa_server_get_host(server));
+ gtk_editable_set_text(GTK_EDITABLE(sdi->host), libbalsa_server_get_host(server));
}
g_signal_connect(sdi->host, "changed", G_CALLBACK(smtp_server_changed), sdi);
@@ -490,7 +490,7 @@ libbalsa_smtp_server_dialog(LibBalsaSmtpServer * smtp_server,
sdi->user = gtk_entry_new();
smtp_server_add_widget(grid, ++row, _("_User Name:"), sdi->user);
if (libbalsa_server_get_username(server) != NULL) {
- gtk_entry_set_text(GTK_ENTRY(sdi->user), libbalsa_server_get_username(server));
+ gtk_editable_set_text(GTK_EDITABLE(sdi->user), libbalsa_server_get_username(server));
}
g_signal_connect(sdi->user, "changed", G_CALLBACK(smtp_server_changed), sdi);
@@ -499,7 +499,7 @@ libbalsa_smtp_server_dialog(LibBalsaSmtpServer * smtp_server,
g_object_set(G_OBJECT(sdi->pass), "input-purpose", GTK_INPUT_PURPOSE_PASSWORD, NULL);
gtk_entry_set_visibility(GTK_ENTRY(sdi->pass), FALSE);
if (libbalsa_server_get_password(server) != NULL) {
- gtk_entry_set_text(GTK_ENTRY(sdi->pass), libbalsa_server_get_password(server));
+ gtk_editable_set_text(GTK_EDITABLE(sdi->pass), libbalsa_server_get_password(server));
}
g_signal_connect(sdi->pass, "changed", G_CALLBACK(smtp_server_changed), sdi);
@@ -529,7 +529,7 @@ libbalsa_smtp_server_dialog(LibBalsaSmtpServer * smtp_server,
g_object_set(G_OBJECT(sdi->cert_pass), "input-purpose", GTK_INPUT_PURPOSE_PASSWORD, NULL);
gtk_entry_set_visibility(GTK_ENTRY(sdi->cert_pass), FALSE);
if (libbalsa_server_get_cert_passphrase(server) != NULL) {
- gtk_entry_set_text(GTK_ENTRY(sdi->cert_pass), libbalsa_server_get_cert_passphrase(server));
+ gtk_editable_set_text(GTK_EDITABLE(sdi->cert_pass), libbalsa_server_get_cert_passphrase(server));
}
g_signal_connect(sdi->cert_pass, "changed", G_CALLBACK(smtp_server_changed), sdi);
diff --git a/libinit_balsa/assistant_helper.c b/libinit_balsa/assistant_helper.c
index 281259f52..009642e3b 100644
--- a/libinit_balsa/assistant_helper.c
+++ b/libinit_balsa/assistant_helper.c
@@ -77,7 +77,7 @@ balsa_init_add_grid_entry(GtkGrid * grid, guint num, const gchar * ltext,
ed->master->donemask = (ed->master->donemask << 1) | 1;
}
- gtk_entry_set_text(GTK_ENTRY(e), etext);
+ gtk_editable_set_text(GTK_EDITABLE(e), etext);
return e;
}
diff --git a/libinit_balsa/assistant_page_directory.c b/libinit_balsa/assistant_page_directory.c
index 219885d82..42faa068d 100644
--- a/libinit_balsa/assistant_page_directory.c
+++ b/libinit_balsa/assistant_page_directory.c
@@ -179,7 +179,7 @@ verify_mailbox_entry(GtkWidget * entry, const gchar * name,
if (!*verify)
return;
- text = gtk_entry_get_text(GTK_ENTRY(entry));
+ text = gtk_editable_get_text(GTK_EDITABLE(entry));
error = NULL;
unconditional_mailbox(text, name, mailbox, &error);
@@ -356,22 +356,22 @@ balsa_druid_page_directory_prepare(GtkAssistant * druid,
if (!dir->paths_locked) {
buf = g_build_filename(balsa_app.local_mail_directory, "outbox",
NULL);
- gtk_entry_set_text(GTK_ENTRY(dir->outbox), buf);
+ gtk_editable_set_text(GTK_EDITABLE(dir->outbox), buf);
g_free(buf);
buf = g_build_filename(balsa_app.local_mail_directory, "sentbox",
NULL);
- gtk_entry_set_text(GTK_ENTRY(dir->sentbox), buf);
+ gtk_editable_set_text(GTK_EDITABLE(dir->sentbox), buf);
g_free(buf);
buf = g_build_filename(balsa_app.local_mail_directory, "draftbox",
NULL);
- gtk_entry_set_text(GTK_ENTRY(dir->draftbox), buf);
+ gtk_editable_set_text(GTK_EDITABLE(dir->draftbox), buf);
g_free(buf);
buf = g_build_filename(balsa_app.local_mail_directory, "trash",
NULL);
- gtk_entry_set_text(GTK_ENTRY(dir->trash), buf);
+ gtk_editable_set_text(GTK_EDITABLE(dir->trash), buf);
g_free(buf);
}
diff --git a/libinit_balsa/assistant_page_user.c b/libinit_balsa/assistant_page_user.c
index 6ef4948c6..b784ac4de 100644
--- a/libinit_balsa/assistant_page_user.c
+++ b/libinit_balsa/assistant_page_user.c
@@ -257,11 +257,11 @@ balsa_druid_page_user_next(GtkAssistant * druid, GtkWidget * page,
#endif
/* incoming mail */
- host = gtk_entry_get_text(GTK_ENTRY(user->incoming_srv));
+ host = gtk_editable_get_text(GTK_EDITABLE(user->incoming_srv));
if(host && *host) {
LibBalsaMailbox *mbx = NULL;
- const gchar *login = gtk_entry_get_text(GTK_ENTRY(user->login));
- const gchar *passwd = gtk_entry_get_text(GTK_ENTRY(user->passwd));
+ const gchar *login = gtk_editable_get_text(GTK_EDITABLE(user->login));
+ const gchar *passwd = gtk_editable_get_text(GTK_EDITABLE(user->passwd));
NetClientCryptMode security = balsa_option_get_active(user->security) + NET_CLIENT_CRYPT_ENCRYPTED;
gboolean remember =
balsa_option_get_active(user->remember_passwd) == 0;
@@ -280,7 +280,7 @@ balsa_druid_page_user_next(GtkAssistant * druid, GtkWidget * page,
/* identity */
- mailbox = gtk_entry_get_text(GTK_ENTRY(user->name));
+ mailbox = gtk_editable_get_text(GTK_EDITABLE(user->name));
if (balsa_app.identities == NULL) {
gchar *domain = strrchr(mailbox, '@');
ident = LIBBALSA_IDENTITY(libbalsa_identity_new_with_name
@@ -293,7 +293,7 @@ balsa_druid_page_user_next(GtkAssistant * druid, GtkWidget * page,
ident = balsa_app.current_ident;
}
- ia = internet_address_mailbox_new (mailbox, gtk_entry_get_text(GTK_ENTRY(user->email)));
+ ia = internet_address_mailbox_new (mailbox, gtk_editable_get_text(GTK_EDITABLE(user->email)));
libbalsa_identity_set_address (ident, ia);
g_object_unref(ia);
@@ -307,7 +307,7 @@ balsa_druid_page_user_next(GtkAssistant * druid, GtkWidget * page,
smtp_server = balsa_app.smtp_servers->data;
}
libbalsa_server_set_host(LIBBALSA_SERVER(smtp_server),
- gtk_entry_get_text(GTK_ENTRY(user->smtp)));
+ gtk_editable_get_text(GTK_EDITABLE(user->smtp)));
g_free(balsa_app.local_mail_directory);
balsa_app.local_mail_directory =
diff --git a/src/ab-main.c b/src/ab-main.c
index 85bb733f0..4d5b3a451 100644
--- a/src/ab-main.c
+++ b/src/ab-main.c
@@ -883,7 +883,7 @@ bab_get_edit_button_box(struct ABMainWindow *abmw)
static void
bab_filter_entry_activate(GtkWidget *entry, GtkWidget *button)
{
- const gchar *filter = gtk_entry_get_text(GTK_ENTRY(entry));
+ const gchar *filter = gtk_editable_get_text(GTK_EDITABLE(entry));
bab_set_address_book(contacts_app.address_book, contacts_app.entry_list,
filter);
gtk_widget_set_sensitive(button, FALSE);
diff --git a/src/ab-window.c b/src/ab-window.c
index 3c1f8ed27..331fe1753 100644
--- a/src/ab-window.c
+++ b/src/ab-window.c
@@ -710,7 +710,7 @@ balsa_ab_window_load(BalsaAbWindow *ab)
if (ab->current_address_book == NULL)
return;
- filter = gtk_entry_get_text(GTK_ENTRY(ab->filter_entry));
+ filter = gtk_editable_get_text(GTK_EDITABLE(ab->filter_entry));
err = libbalsa_address_book_load(ab->current_address_book, filter,
(LibBalsaAddressBookLoadFunc)
balsa_ab_window_load_cb, ab);
@@ -805,7 +805,7 @@ balsa_ab_window_find(GtkWidget * group_entry, BalsaAbWindow * ab)
g_return_if_fail(BALSA_IS_AB_WINDOW(ab));
- entry_text = gtk_entry_get_text(GTK_ENTRY(group_entry));
+ entry_text = gtk_editable_get_text(GTK_EDITABLE(group_entry));
if (*entry_text == '\0')
return;
diff --git a/src/address-book-config.c b/src/address-book-config.c
index 9e5d62307..7df5707db 100644
--- a/src/address-book-config.c
+++ b/src/address-book-config.c
@@ -684,7 +684,7 @@ static gboolean
create_book(AddressBookConfig * abc)
{
LibBalsaAddressBook *address_book = NULL;
- const gchar *name = gtk_entry_get_text(GTK_ENTRY(abc->name_entry));
+ const gchar *name = gtk_editable_get_text(GTK_EDITABLE(abc->name_entry));
if (abc->type == LIBBALSA_TYPE_ADDRESS_BOOK_VCARD) {
gchar *path =
@@ -711,15 +711,15 @@ create_book(AddressBookConfig * abc)
#ifdef ENABLE_LDAP
} else if (abc->type == LIBBALSA_TYPE_ADDRESS_BOOK_LDAP) {
const gchar *host =
- gtk_entry_get_text(GTK_ENTRY(abc->ab_specific.ldap.host));
+ gtk_editable_get_text(GTK_EDITABLE(abc->ab_specific.ldap.host));
const gchar *base_dn =
- gtk_entry_get_text(GTK_ENTRY(abc->ab_specific.ldap.base_dn));
+ gtk_editable_get_text(GTK_EDITABLE(abc->ab_specific.ldap.base_dn));
const gchar *bind_dn =
- gtk_entry_get_text(GTK_ENTRY(abc->ab_specific.ldap.bind_dn));
+ gtk_editable_get_text(GTK_EDITABLE(abc->ab_specific.ldap.bind_dn));
const gchar *passwd =
- gtk_entry_get_text(GTK_ENTRY(abc->ab_specific.ldap.passwd));
+ gtk_editable_get_text(GTK_EDITABLE(abc->ab_specific.ldap.passwd));
const gchar *book_dn =
- gtk_entry_get_text(GTK_ENTRY(abc->ab_specific.ldap.book_dn));
+ gtk_editable_get_text(GTK_EDITABLE(abc->ab_specific.ldap.book_dn));
gboolean enable_tls =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON
(abc->ab_specific.ldap.enable_tls));
@@ -770,7 +770,7 @@ modify_book(AddressBookConfig * abc)
gboolean active;
libbalsa_address_book_set_name(address_book,
- gtk_entry_get_text(GTK_ENTRY(abc->name_entry)));
+ gtk_editable_get_text(GTK_EDITABLE(abc->name_entry)));
if (abc->type == LIBBALSA_TYPE_ADDRESS_BOOK_VCARD
|| abc->type == LIBBALSA_TYPE_ADDRESS_BOOK_LDIF
@@ -807,15 +807,15 @@ modify_book(AddressBookConfig * abc)
} else if (abc->type == LIBBALSA_TYPE_ADDRESS_BOOK_LDAP) {
LibBalsaAddressBookLdap *ldap;
const gchar *host =
- gtk_entry_get_text(GTK_ENTRY(abc->ab_specific.ldap.host));
+ gtk_editable_get_text(GTK_EDITABLE(abc->ab_specific.ldap.host));
const gchar *base_dn =
- gtk_entry_get_text(GTK_ENTRY(abc->ab_specific.ldap.base_dn));
+ gtk_editable_get_text(GTK_EDITABLE(abc->ab_specific.ldap.base_dn));
const gchar *bind_dn =
- gtk_entry_get_text(GTK_ENTRY(abc->ab_specific.ldap.bind_dn));
+ gtk_editable_get_text(GTK_EDITABLE(abc->ab_specific.ldap.bind_dn));
const gchar *passwd =
- gtk_entry_get_text(GTK_ENTRY(abc->ab_specific.ldap.passwd));
+ gtk_editable_get_text(GTK_EDITABLE(abc->ab_specific.ldap.passwd));
const gchar *book_dn =
- gtk_entry_get_text(GTK_ENTRY(abc->ab_specific.ldap.book_dn));
+ gtk_editable_get_text(GTK_EDITABLE(abc->ab_specific.ldap.book_dn));
gboolean enable_tls =
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON
(abc->ab_specific.ldap.enable_tls));
diff --git a/src/balsa-app.c b/src/balsa-app.c
index 07b566a79..2a76cd6c3 100644
--- a/src/balsa-app.c
+++ b/src/balsa-app.c
@@ -96,7 +96,7 @@ ask_password_real(LibBalsaServer * server, LibBalsaMailbox * mbox)
entry = gtk_entry_new();
gtk_container_add(GTK_CONTAINER(content_area), entry);
- gtk_entry_set_width_chars(GTK_ENTRY(entry), 20);
+ gtk_editable_set_width_chars(GTK_EDITABLE(entry), 20);
gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
rememb = gtk_check_button_new_with_mnemonic(_(remember_password_message));
diff --git a/src/balsa-message.c b/src/balsa-message.c
index a14a39dbe..5c4b59e21 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -323,7 +323,7 @@ bm_find_set_status(BalsaMessage * bm, BalsaMessageFindStatus status)
/* The widget returned "found"; if it really found a string,
* we sensitize the "next" and "previous" buttons, but if
* the find-entry was empty, we desensitize them. */
- if (gtk_entry_get_text(GTK_ENTRY(bm->find_entry))[0])
+ if (gtk_editable_get_text(GTK_EDITABLE(bm->find_entry))[0])
sensitive = TRUE;
break;
case BM_FIND_STATUS_WRAPPED:
@@ -427,7 +427,7 @@ bm_find_cb(const gchar * text, gboolean found, gpointer data)
static void
bm_find_entry_changed_cb(GtkEditable * editable, gpointer data)
{
- const gchar *text = gtk_entry_get_text(GTK_ENTRY(editable));
+ const gchar *text = gtk_editable_get_text(GTK_EDITABLE(editable));
BalsaMessage *bm = data;
GtkWidget *widget = balsa_mime_widget_get_widget(bm->current_part->mime_widget);
gboolean found = FALSE;
@@ -488,7 +488,7 @@ bm_find_entry_changed_cb(GtkEditable * editable, gpointer data)
static void
bm_find_again(BalsaMessage * bm, gboolean find_forward)
{
- const gchar *text = gtk_entry_get_text(GTK_ENTRY(bm->find_entry));
+ const gchar *text = gtk_editable_get_text(GTK_EDITABLE(bm->find_entry));
GtkWidget *widget = balsa_mime_widget_get_widget(bm->current_part->mime_widget);
gboolean found;
@@ -3270,7 +3270,7 @@ balsa_message_find_in_message(BalsaMessage * bm)
}
bm->find_forward = TRUE;
- gtk_entry_set_text(GTK_ENTRY(bm->find_entry), "");
+ gtk_editable_set_text(GTK_EDITABLE(bm->find_entry), "");
toplevel = gtk_widget_get_toplevel(GTK_WIDGET(bm));
if (GTK_IS_APPLICATION_WINDOW(toplevel))
diff --git a/src/compose-window.c b/src/compose-window.c
index e19f0c0c7..7e2742d57 100644
--- a/src/compose-window.c
+++ b/src/compose-window.c
@@ -894,7 +894,7 @@ edit_with_gnome_check(gpointer data)
line[strlen(line) - 1] = '\0';
if (libbalsa_str_has_prefix(line, _("Subject:")) == 0) {
- gtk_entry_set_text(GTK_ENTRY(data_real->compose_window->subject[1]),
+ gtk_editable_set_text(GTK_EDITABLE(data_real->compose_window->subject[1]),
line + strlen(_("Subject:")) + 1);
continue;
}
@@ -990,7 +990,7 @@ sw_edit_activated(GSimpleAction *action,
guint type;
fprintf(tmp, "%s %s\n", _("Subject:"),
- gtk_entry_get_text(GTK_ENTRY(compose_window->subject[1])));
+ gtk_editable_get_text(GTK_EDITABLE(compose_window->subject[1])));
for (type = 0; type < G_N_ELEMENTS(address_types); type++) {
InternetAddressList *list =
libbalsa_address_view_get_list(compose_window->recipient_view,
@@ -1337,7 +1337,7 @@ update_compose_window_identity(BalsaComposeWindow *compose_window,
}
/* change the subject to use the reply/forward strings */
- subject = gtk_entry_get_text(GTK_ENTRY(compose_window->subject[1]));
+ subject = gtk_editable_get_text(GTK_EDITABLE(compose_window->subject[1]));
/*
* If the subject begins with the old reply string
@@ -1362,12 +1362,12 @@ update_compose_window_identity(BalsaComposeWindow *compose_window,
if (((replen = strlen(old_reply_string)) > 0) &&
g_str_has_prefix(subject, old_reply_string)) {
tmpstr = g_strconcat(reply_string, &(subject[replen]), NULL);
- gtk_entry_set_text(GTK_ENTRY(compose_window->subject[1]), tmpstr);
+ gtk_editable_set_text(GTK_EDITABLE(compose_window->subject[1]), tmpstr);
g_free(tmpstr);
} else if (((fwdlen = strlen(old_forward_string)) > 0) &&
g_str_has_prefix(subject, old_forward_string)) {
tmpstr = g_strconcat(forward_string, &(subject[fwdlen]), NULL);
- gtk_entry_set_text(GTK_ENTRY(compose_window->subject[1]), tmpstr);
+ gtk_editable_set_text(GTK_EDITABLE(compose_window->subject[1]), tmpstr);
g_free(tmpstr);
} else {
if (((replen == 0) && reply_type) ||
@@ -4135,7 +4135,7 @@ compose_window_set_subject_from_body(BalsaComposeWindow *compose_window,
}
}
- gtk_entry_set_text(GTK_ENTRY(compose_window->subject[1]), subject);
+ gtk_editable_set_text(GTK_EDITABLE(compose_window->subject[1]), subject);
g_free(subject);
}
@@ -5402,7 +5402,7 @@ subject_not_empty(BalsaComposeWindow *compose_window)
/* read the subject widget and verify that it is contains something else
than spaces */
- subj = gtk_entry_get_text(GTK_ENTRY(compose_window->subject[1]));
+ subj = gtk_editable_get_text(GTK_EDITABLE(compose_window->subject[1]));
if (subj) {
const gchar *p = subj;
@@ -5459,7 +5459,7 @@ subject_not_empty(BalsaComposeWindow *compose_window)
gtk_container_add (GTK_CONTAINER (hbox), label);
subj_entry = gtk_entry_new ();
- gtk_entry_set_text(GTK_ENTRY(subj_entry), _("(no subject)"));
+ gtk_editable_set_text(GTK_EDITABLE(subj_entry), _("(no subject)"));
gtk_widget_set_hexpand(subj_entry, TRUE);
gtk_container_add (GTK_CONTAINER (hbox), subj_entry);
gtk_entry_set_activates_default (GTK_ENTRY (subj_entry), TRUE);
@@ -5472,8 +5472,8 @@ subject_not_empty(BalsaComposeWindow *compose_window)
response = gtk_dialog_run(GTK_DIALOG(no_subj_dialog));
/* always set the current string in the subject entry */
- gtk_entry_set_text(GTK_ENTRY(compose_window->subject[1]),
- gtk_entry_get_text(GTK_ENTRY(subj_entry)));
+ gtk_editable_set_text(GTK_EDITABLE(compose_window->subject[1]),
+ gtk_editable_get_text(GTK_EDITABLE(subj_entry)));
gtk_widget_destroy(no_subj_dialog);
return response == GTK_RESPONSE_OK;
@@ -6982,7 +6982,7 @@ balsa_compose_window_set_title(BalsaComposeWindow *compose_window)
g_object_unref(list);
title = g_strdup_printf(title_format, to_string ? to_string : "",
- gtk_entry_get_text(GTK_ENTRY(compose_window->subject[1])));
+ gtk_editable_get_text(GTK_EDITABLE(compose_window->subject[1])));
g_free(to_string);
gtk_window_set_title(GTK_WINDOW(compose_window), title);
g_free(title);
diff --git a/src/filter-edit-callbacks.c b/src/filter-edit-callbacks.c
index d790b84be..1e8b1ff3a 100644
--- a/src/filter-edit-callbacks.c
+++ b/src/filter-edit-callbacks.c
@@ -269,10 +269,10 @@ fe_regexs_selection_changed(GtkTreeSelection *selection,
selected = gtk_tree_selection_get_selected(selection, &model, &iter);
if (selected) {
gtk_tree_model_get(model, &iter, 0, &str, -1);
- gtk_entry_set_text(GTK_ENTRY(fe_type_regex_entry),str);
+ gtk_editable_set_text(GTK_EDITABLE(fe_type_regex_entry),str);
g_free(str);
}
- else gtk_entry_set_text(GTK_ENTRY(fe_type_regex_entry),"");
+ else gtk_editable_set_text(GTK_EDITABLE(fe_type_regex_entry),"");
gtk_widget_set_sensitive(fe_regex_remove_button, selected);
}
#endif /* REGULAR_EXPRESSION_FILTERING_IS_IMPLEMENTED */
@@ -553,7 +553,7 @@ condition_validate(LibBalsaCondition* new_cnd)
}
switch (new_cnd->type) {
case CONDITION_STRING:
- c_str = gtk_entry_get_text(GTK_ENTRY(fe_type_simple_entry));
+ c_str = gtk_editable_get_text(GTK_EDITABLE(fe_type_simple_entry));
if (!c_str || c_str[0]=='\0') {
balsa_information(LIBBALSA_INFORMATION_ERROR,
_("You must provide a string"));
@@ -571,7 +571,7 @@ condition_validate(LibBalsaCondition* new_cnd)
#endif /* REGULAR_EXPRESSION_FILTERING_IS_IMPLEMENTED */
break;
case CONDITION_DATE:
- c_str = gtk_entry_get_text(GTK_ENTRY(fe_type_date_low_entry));
+ c_str = gtk_editable_get_text(GTK_EDITABLE(fe_type_date_low_entry));
if (c_str && c_str[0]!='\0') {
(void) strptime("00:00:00","%T",&date);
p=(gchar *)strptime(c_str,"%x",&date);
@@ -582,7 +582,7 @@ condition_validate(LibBalsaCondition* new_cnd)
}
new_cnd->match.date.date_low=mktime(&date);
}
- c_str = gtk_entry_get_text(GTK_ENTRY(fe_type_date_high_entry));
+ c_str = gtk_editable_get_text(GTK_EDITABLE(fe_type_date_high_entry));
if (c_str && c_str[0]!='\0') {
(void) strptime("23:59:59","%T",&date);
p=(gchar *)strptime(c_str,"%x",&date);
@@ -662,13 +662,13 @@ clear_condition_widgets()
gtk_tree_view_get_model(fe_type_regex_list);
#endif /* REGULAR_EXPRESSION_FILTERING_IS_IMPLEMENTED */
- gtk_entry_set_text(GTK_ENTRY(fe_type_simple_entry),"");
+ gtk_editable_set_text(GTK_EDITABLE(fe_type_simple_entry),"");
#if REGULAR_EXPRESSION_FILTERING_IS_IMPLEMENTED
- gtk_entry_set_text(GTK_ENTRY(fe_type_regex_entry),"");
+ gtk_editable_set_text(GTK_EDITABLE(fe_type_regex_entry),"");
gtk_list_store_clear(GTK_LIST_STORE(model));
#endif /* REGULAR_EXPRESSION_FILTERING_IS_IMPLEMENTED */
- gtk_entry_set_text(GTK_ENTRY(fe_type_date_low_entry),"");
- gtk_entry_set_text(GTK_ENTRY(fe_type_date_high_entry),"");
+ gtk_editable_set_text(GTK_EDITABLE(fe_type_date_low_entry),"");
+ gtk_editable_set_text(GTK_EDITABLE(fe_type_date_high_entry),"");
}
/* set_button_sensitivities:
@@ -727,11 +727,11 @@ fill_condition_widgets(LibBalsaCondition* cnd)
condition_not=cnd->negate;
/* Clear all widgets */
if (cnd->type!=CONDITION_STRING)
- gtk_entry_set_text(GTK_ENTRY(fe_type_simple_entry),"");
+ gtk_editable_set_text(GTK_EDITABLE(fe_type_simple_entry),"");
#if REGULAR_EXPRESSION_FILTERING_IS_IMPLEMENTED
if (cnd->type!=CONDITION_REGEX)
- gtk_entry_set_text(GTK_ENTRY(fe_type_regex_entry),"");
+ gtk_editable_set_text(GTK_EDITABLE(fe_type_regex_entry),"");
gtk_list_store_clear(GTK_LIST_STORE(model));
#endif /* REGULAR_EXPRESSION_FILTERING_IS_IMPLEMENTED */
@@ -763,14 +763,14 @@ fill_condition_widgets(LibBalsaCondition* cnd)
}
else {
gtk_widget_set_sensitive(fe_user_header,FALSE);
- gtk_entry_set_text(GTK_ENTRY
+ gtk_editable_set_text(GTK_EDITABLE
(gtk_bin_get_child(GTK_BIN(fe_user_header))),
"");
}
/* Next update type specific fields */
switch (cnd->type) {
case CONDITION_STRING:
- gtk_entry_set_text(GTK_ENTRY(fe_type_simple_entry),
+ gtk_editable_set_text(GTK_EDITABLE(fe_type_simple_entry),
cnd->match.string.string
? cnd->match.string.string : "");
fe_update_label(fe_type_simple_label, &simple_label);
@@ -800,7 +800,7 @@ fill_condition_widgets(LibBalsaCondition* cnd)
str = g_date_time_format(date, xformat);
g_date_time_unref(date);
}
- gtk_entry_set_text(GTK_ENTRY(fe_type_date_low_entry),str);
+ gtk_editable_set_text(GTK_EDITABLE(fe_type_date_low_entry),str);
g_free(str);
if (cnd->match.date.date_high==0) str = g_strdup("");
else {
@@ -808,7 +808,7 @@ fill_condition_widgets(LibBalsaCondition* cnd)
str = g_date_time_format(date, xformat);
g_date_time_unref(date);
}
- gtk_entry_set_text(GTK_ENTRY(fe_type_date_high_entry),str);
+ gtk_editable_set_text(GTK_EDITABLE(fe_type_date_high_entry),str);
g_free(str);
fe_update_label(fe_type_date_label, &date_label);
break;
@@ -1579,7 +1579,7 @@ fe_add_pressed(GtkWidget * widget, gpointer throwaway)
GtkTreeIter iter;
GtkTreeSelection *selection;
- text = gtk_entry_get_text(GTK_ENTRY(fe_type_regex_entry));
+ text = gtk_editable_get_text(GTK_EDITABLE(fe_type_regex_entry));
if (!text || text[0] == '\0')
return;
@@ -1785,8 +1785,8 @@ fe_delete_pressed(GtkWidget * widget, gpointer data)
else {
/* ...the store is empty: */
/* We clear all widgets */
- gtk_entry_set_text(GTK_ENTRY(fe_name_entry),"");
- gtk_entry_set_text(GTK_ENTRY(fe_popup_entry),"");
+ gtk_editable_set_text(GTK_EDITABLE(fe_name_entry),"");
+ gtk_editable_set_text(GTK_EDITABLE(fe_popup_entry),"");
/*gtk_option_menu_set_history(GTK_OPTION_MENU(fe_mailboxes), 0); */
gtk_list_store_clear(GTK_LIST_STORE
(gtk_tree_view_get_model
@@ -1828,7 +1828,7 @@ fe_apply_pressed(GtkWidget * widget, gpointer data)
return;
/* quick check before we malloc */
- temp = gtk_entry_get_text(GTK_ENTRY(fe_name_entry));
+ temp = gtk_editable_get_text(GTK_EDITABLE(fe_name_entry));
if (!temp || temp[0] == '\0') {
balsa_information(LIBBALSA_INFORMATION_ERROR,
_("No filter name specified."));
@@ -1934,9 +1934,9 @@ fe_apply_pressed(GtkWidget * widget, gpointer data)
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(fe_popup_button))) {
static gchar defstring[] = N_("Filter has matched");
const gchar *tmpstr;
-
- tmpstr = gtk_entry_get_text(GTK_ENTRY(fe_popup_entry));
-
+
+ tmpstr = gtk_editable_get_text(GTK_EDITABLE(fe_popup_entry));
+
fil->popup_text=g_strdup(((!tmpstr)
|| (tmpstr[0] ==
'\0')) ? _(defstring) : tmpstr);
@@ -2045,10 +2045,10 @@ fe_filters_list_selection_changed(GtkTreeSelection * selection,
gtk_tree_model_get(model, &iter, 1, &fil, -1);
/* Populate all fields with filter data */
- gtk_entry_set_text(GTK_ENTRY(fe_name_entry),fil->name);
+ gtk_editable_set_text(GTK_EDITABLE(fe_name_entry),fil->name);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fe_popup_button),
fil->popup_text!=NULL);
- gtk_entry_set_text(GTK_ENTRY(fe_popup_entry),
+ gtk_editable_set_text(GTK_EDITABLE(fe_popup_entry),
fil->popup_text!=NULL
? fil->popup_text : "");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fe_sound_button),
diff --git a/src/folder-conf.c b/src/folder-conf.c
index 211d39773..bbc9cbbb5 100644
--- a/src/folder-conf.c
+++ b/src/folder-conf.c
@@ -139,9 +139,9 @@ validate_folder(GtkWidget *w, FolderDialogData * fcw)
CommonDialogData *cdd = (CommonDialogData *) fcw;
gboolean sensitive = TRUE;
- if (!*gtk_entry_get_text(GTK_ENTRY(fcw->folder_name))) {
+ if (!*gtk_editable_get_text(GTK_EDITABLE(fcw->folder_name))) {
sensitive = FALSE;
- } else if (!*gtk_entry_get_text(GTK_ENTRY(fcw->bsc.server))) {
+ } else if (!*gtk_editable_get_text(GTK_EDITABLE(fcw->bsc.server))) {
sensitive = FALSE;
}
@@ -197,8 +197,8 @@ folder_conf_clicked_ok(FolderDialogData * fcw)
const gchar *username;
const gchar *host;
- host = gtk_entry_get_text(GTK_ENTRY(fcw->bsc.server));
- username = gtk_entry_get_text(GTK_ENTRY(fcw->username));
+ host = gtk_editable_get_text(GTK_EDITABLE(fcw->bsc.server));
+ username = gtk_editable_get_text(GTK_EDITABLE(fcw->username));
if (cdd->mbnode) {
insert = FALSE;
@@ -232,7 +232,7 @@ folder_conf_clicked_ok(FolderDialogData * fcw)
libbalsa_server_set_remember_passwd(s,
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(fcw->remember)));
libbalsa_server_set_password(s,
- gtk_entry_get_text(GTK_ENTRY
+ gtk_editable_get_text(GTK_EDITABLE
(fcw->password)));
if (!cdd->mbnode) {
cdd->mbnode = balsa_mailbox_node_new_imap_folder(s, NULL);
@@ -246,9 +246,9 @@ folder_conf_clicked_ok(FolderDialogData * fcw)
}
balsa_mailbox_node_set_dir(cdd->mbnode,
- gtk_entry_get_text(GTK_ENTRY(fcw->prefix)));
+ gtk_editable_get_text(GTK_EDITABLE(fcw->prefix)));
balsa_mailbox_node_set_name(cdd->mbnode,
- gtk_entry_get_text(GTK_ENTRY(fcw->folder_name)));
+ gtk_editable_get_text(GTK_EDITABLE(fcw->folder_name)));
balsa_mailbox_node_set_subscribed(cdd->mbnode,
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(fcw->subscribed)));
balsa_mailbox_node_set_list_inbox(cdd->mbnode,
@@ -483,7 +483,7 @@ validate_sub_folder(GtkWidget * w, SubfolderDialogData * sdd)
*/
gtk_dialog_set_response_sensitive(GTK_DIALOG(cdd->dialog), GTK_RESPONSE_OK,
have_server &&
- *gtk_entry_get_text(GTK_ENTRY
+ *gtk_editable_get_text(GTK_EDITABLE
(sdd->folder_name)));
}
@@ -536,7 +536,7 @@ browse_button_response(GtkDialog * dialog, gint response,
bbd->sdd->parent = mbnode;
dir = balsa_mailbox_node_get_dir(mbnode);
if (dir != NULL)
- gtk_entry_set_text(GTK_ENTRY(bbd->sdd->parent_folder), dir);
+ gtk_editable_set_text(GTK_EDITABLE(bbd->sdd->parent_folder), dir);
server = balsa_mailbox_node_get_server(mbnode);
if (server != NULL)
gtk_label_set_label(GTK_LABEL(bbd->sdd->host_label),
@@ -899,7 +899,7 @@ folder_conf_imap_sub_node(BalsaMailboxNode * mn)
(void) libbalsa_create_grid_label(_("Subfolder of:"), grid, row);
sdd->parent_folder = gtk_entry_new();
gtk_editable_set_editable(GTK_EDITABLE(sdd->parent_folder), FALSE);
- gtk_entry_set_text(GTK_ENTRY(sdd->parent_folder), sdd->old_parent);
+ gtk_editable_set_text(GTK_EDITABLE(sdd->parent_folder), sdd->old_parent);
button = gtk_button_new_with_mnemonic(_("_Browse…"));
g_signal_connect(button, "clicked",
diff --git a/src/mailbox-conf.c b/src/mailbox-conf.c
index 5e4eb4de7..4977552ee 100644
--- a/src/mailbox-conf.c
+++ b/src/mailbox-conf.c
@@ -611,19 +611,19 @@ mailbox_conf_set_values_pop3(LibBalsaMailbox * mailbox,
/* basic settings */
if (libbalsa_server_get_host(server) != NULL) {
- gtk_entry_set_text(GTK_ENTRY(mcw->mb_data.pop3.bsc.server),
+ gtk_editable_set_text(GTK_EDITABLE(mcw->mb_data.pop3.bsc.server),
libbalsa_server_get_host(server));
}
gtk_combo_box_set_active(GTK_COMBO_BOX(mcw->mb_data.pop3.bsc.security),
libbalsa_server_get_security(server) - 1);
if (libbalsa_server_get_username(server) != NULL) {
- gtk_entry_set_text(GTK_ENTRY(mcw->mb_data.pop3.username),
+ gtk_editable_set_text(GTK_EDITABLE(mcw->mb_data.pop3.username),
libbalsa_server_get_username(server));
}
if (libbalsa_server_get_password(server) != NULL) {
- gtk_entry_set_text(GTK_ENTRY(mcw->mb_data.pop3.password),
+ gtk_editable_set_text(GTK_EDITABLE(mcw->mb_data.pop3.password),
libbalsa_server_get_password(server));
}
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
@@ -639,7 +639,7 @@ mailbox_conf_set_values_pop3(LibBalsaMailbox * mailbox,
filter_cmd = libbalsa_mailbox_pop3_get_filter_cmd(pop3);
if (filter_cmd != NULL)
- gtk_entry_set_text(GTK_ENTRY(mcw->mb_data.pop3.filter_cmd), filter_cmd);
+ gtk_editable_set_text(GTK_EDITABLE(mcw->mb_data.pop3.filter_cmd), filter_cmd);
gtk_widget_set_sensitive(mcw->mb_data.pop3.filter_cmd, filter_cmd != NULL);
/* advanced settings */
@@ -663,7 +663,7 @@ mailbox_conf_set_values_pop3(LibBalsaMailbox * mailbox,
sensitive);
if (libbalsa_server_get_cert_passphrase(server) != NULL) {
- gtk_entry_set_text(GTK_ENTRY
+ gtk_editable_set_text(GTK_EDITABLE
(mcw->mb_data.pop3.bsc.client_cert_passwd),
libbalsa_server_get_cert_passphrase(server));
}
@@ -694,7 +694,7 @@ mailbox_conf_set_values(MailboxConfWindow *mcw)
g_return_if_fail(LIBBALSA_IS_MAILBOX(mailbox));
if (mcw->mailbox_name && libbalsa_mailbox_get_name(mailbox))
- gtk_entry_set_text(GTK_ENTRY(mcw->mailbox_name), libbalsa_mailbox_get_name(mailbox));
+ gtk_editable_set_text(GTK_EDITABLE(mcw->mailbox_name), libbalsa_mailbox_get_name(mailbox));
if (LIBBALSA_IS_MAILBOX_LOCAL(mailbox)) {
if (libbalsa_mailbox_get_url(mailbox)) {
@@ -716,10 +716,10 @@ mailbox_conf_set_values(MailboxConfWindow *mcw)
server = LIBBALSA_MAILBOX_REMOTE_GET_SERVER(mailbox);
if (libbalsa_server_get_host(server))
- gtk_entry_set_text(GTK_ENTRY(mcw->mb_data.imap.bsc.server),
+ gtk_editable_set_text(GTK_EDITABLE(mcw->mb_data.imap.bsc.server),
libbalsa_server_get_host(server));
if (libbalsa_server_get_username(server))
- gtk_entry_set_text(GTK_ENTRY(mcw->mb_data.imap.username),
+ gtk_editable_set_text(GTK_EDITABLE(mcw->mb_data.imap.username),
libbalsa_server_get_username(server));
gtk_toggle_button_set_active
(GTK_TOGGLE_BUTTON(mcw->mb_data.imap.anonymous),
@@ -728,11 +728,11 @@ mailbox_conf_set_values(MailboxConfWindow *mcw)
(GTK_TOGGLE_BUTTON(mcw->mb_data.imap.remember),
libbalsa_server_get_remember_passwd(server));
if (libbalsa_server_get_password(server))
- gtk_entry_set_text(GTK_ENTRY(mcw->mb_data.imap.password),
+ gtk_editable_set_text(GTK_EDITABLE(mcw->mb_data.imap.password),
libbalsa_server_get_password(server));
path = libbalsa_mailbox_imap_get_path(imap);
if (path)
- gtk_entry_set_text(GTK_ENTRY(mcw->mb_data.imap.folderpath),
+ gtk_editable_set_text(GTK_EDITABLE(mcw->mb_data.imap.folderpath),
path);
if(libbalsa_imap_server_has_persistent_cache
(LIBBALSA_IMAP_SERVER(server)))
@@ -771,7 +771,7 @@ check_for_blank_fields(GtkWidget G_GNUC_UNUSED *widget, MailboxConfWindow *mcw)
sensitive = TRUE;
- if (mcw->mailbox_name &&!*gtk_entry_get_text(GTK_ENTRY(mcw->mailbox_name))) {
+ if (mcw->mailbox_name &&!*gtk_editable_get_text(GTK_EDITABLE(mcw->mailbox_name))) {
sensitive = FALSE;
} else if (g_type_is_a(mcw->mailbox_type, LIBBALSA_TYPE_MAILBOX_LOCAL) ) {
gchar *filename =
@@ -783,22 +783,22 @@ check_for_blank_fields(GtkWidget G_GNUC_UNUSED *widget, MailboxConfWindow *mcw)
}
} else if (g_type_is_a(mcw->mailbox_type, LIBBALSA_TYPE_MAILBOX_IMAP ) ) {
bsc = &mcw->mb_data.imap.bsc;
- if (!*gtk_entry_get_text(GTK_ENTRY(mcw->mb_data.imap.folderpath))
- || !*gtk_entry_get_text(GTK_ENTRY(bsc->server))
- || !*gtk_entry_get_text(GTK_ENTRY(mcw->mb_data.imap.username))) {
+ if (!*gtk_editable_get_text(GTK_EDITABLE(mcw->mb_data.imap.folderpath))
+ || !*gtk_editable_get_text(GTK_EDITABLE(bsc->server))
+ || !*gtk_editable_get_text(GTK_EDITABLE(mcw->mb_data.imap.username))) {
sensitive = FALSE;
}
} else if (g_type_is_a(mcw->mailbox_type, LIBBALSA_TYPE_MAILBOX_POP3) ) {
/* POP3: require user name and server */
bsc = &mcw->mb_data.pop3.bsc;
- if ((gtk_entry_get_text(GTK_ENTRY(mcw->mb_data.pop3.username))[0] == '\0') ||
- (gtk_entry_get_text(GTK_ENTRY(bsc->server))[0] == '\0')) {
+ if ((gtk_editable_get_text(GTK_EDITABLE(mcw->mb_data.pop3.username))[0] == '\0') ||
+ (gtk_editable_get_text(GTK_EDITABLE(bsc->server))[0] == '\0')) {
sensitive = FALSE;
}
/* procmail filtering requires command */
if (sensitive &&
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mcw->mb_data.pop3.filter)) &&
- (gtk_entry_get_text(GTK_ENTRY(mcw->mb_data.pop3.filter_cmd))[0] == '\0')) {
+ (gtk_editable_get_text(GTK_EDITABLE(mcw->mb_data.pop3.filter_cmd))[0] == '\0')) {
sensitive = FALSE;
}
}
@@ -837,7 +837,7 @@ fill_in_imap_data(MailboxConfWindow *mcw, gchar ** name, gchar ** path)
g_free(*name);
*name = g_strdup_printf(_("%s on %s"), *path,
- gtk_entry_get_text(GTK_ENTRY
+ gtk_editable_get_text(GTK_EDITABLE
(mcw->mb_data.imap.bsc.server)));
}
}
@@ -860,21 +860,21 @@ update_pop_mailbox(MailboxConfWindow * mcw)
/* basic data */
libbalsa_mailbox_set_name((LibBalsaMailbox *) mailbox,
- gtk_entry_get_text(GTK_ENTRY
+ gtk_editable_get_text(GTK_EDITABLE
(mcw->mailbox_name)));
security = balsa_server_conf_get_security(&mcw->mb_data.pop3.bsc);
libbalsa_server_set_security(server, security);
libbalsa_server_set_host(server,
- gtk_entry_get_text(GTK_ENTRY
+ gtk_editable_get_text(GTK_EDITABLE
(mcw->mb_data.pop3.bsc.server)));
libbalsa_server_set_username(server,
- gtk_entry_get_text(GTK_ENTRY
+ gtk_editable_get_text(GTK_EDITABLE
(mcw->mb_data.pop3.
username)));
libbalsa_server_set_password(server,
- gtk_entry_get_text(GTK_ENTRY
+ gtk_editable_get_text(GTK_EDITABLE
(mcw->mb_data.pop3.
password)));
libbalsa_server_config_changed(server);
@@ -893,7 +893,7 @@ update_pop_mailbox(MailboxConfWindow * mcw)
(GTK_TOGGLE_BUTTON
(mcw->mb_data.pop3.filter)));
libbalsa_mailbox_pop3_set_filter_cmd(mailbox,
- gtk_entry_get_text(GTK_ENTRY
+ gtk_editable_get_text(GTK_EDITABLE
(mcw->mb_data.
pop3.
filter_cmd)));
@@ -911,7 +911,7 @@ update_pop_mailbox(MailboxConfWindow * mcw)
g_free(filename);
libbalsa_server_set_cert_passphrase(server,
- gtk_entry_get_text(GTK_ENTRY
+ gtk_editable_get_text(GTK_EDITABLE
(bsc->
client_cert_passwd)));
libbalsa_mailbox_pop3_set_disable_apop(mailbox,
@@ -952,7 +952,7 @@ update_imap_mailbox(MailboxConfWindow *mcw)
libbalsa_mailbox_set_name((LibBalsaMailbox *) mailbox, name);
g_free(name);
libbalsa_server_set_username(server,
- gtk_entry_get_text(GTK_ENTRY
+ gtk_editable_get_text(GTK_EDITABLE
(mcw->mb_data.imap.username)));
libbalsa_server_set_try_anonymous(server,
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(mcw->
@@ -963,7 +963,7 @@ update_imap_mailbox(MailboxConfWindow *mcw)
security = balsa_server_conf_get_security(&mcw->mb_data.imap.bsc);
libbalsa_server_set_security(server, security);
libbalsa_server_set_password(server,
- gtk_entry_get_text(GTK_ENTRY
+ gtk_editable_get_text(GTK_EDITABLE
(mcw->mb_data.imap.password)));
libbalsa_imap_server_enable_persistent_cache
(LIBBALSA_IMAP_SERVER(server),
@@ -976,7 +976,7 @@ update_imap_mailbox(MailboxConfWindow *mcw)
/* Set host after all other server changes, as it triggers
* save-to-config for any folder or mailbox using this server. */
libbalsa_server_set_host(server,
- gtk_entry_get_text(GTK_ENTRY
+ gtk_editable_get_text(GTK_EDITABLE
(mcw->mb_data.imap.bsc.server)));
libbalsa_server_config_changed(server);
libbalsa_server_connect_get_password(server, G_CALLBACK(ask_password), mailbox);
@@ -1450,7 +1450,7 @@ create_imap_mailbox_dialog(MailboxConfWindow *mcw)
mcw->mb_data.imap.folderpath = entry = gtk_entry_new();
gtk_widget_set_hexpand(entry, TRUE);
- gtk_entry_set_text(GTK_ENTRY(mcw->mb_data.imap.folderpath), "INBOX");
+ gtk_editable_set_text(GTK_EDITABLE(mcw->mb_data.imap.folderpath), "INBOX");
gtk_label_set_mnemonic_widget(GTK_LABEL(label),
mcw->mb_data.imap.folderpath);
diff --git a/src/main-window.c b/src/main-window.c
index 9ed1df37d..5e3be8210 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -375,7 +375,7 @@ bw_set_view_filter(BalsaWindow * bw, gint filter_no, GtkWidget * entry)
view_filter = bw_get_view_filter(bw);
balsa_index_set_view_filter(BALSA_INDEX(index), filter_no,
- gtk_entry_get_text(GTK_ENTRY(entry)),
+ gtk_editable_get_text(GTK_EDITABLE(entry)),
view_filter);
libbalsa_condition_unref(view_filter);
}
@@ -1343,7 +1343,7 @@ reset_filter_activated(GSimpleAction * action,
GtkWidget *index;
/* do it by resetting the sos filder */
- gtk_entry_set_text(GTK_ENTRY(priv->sos_entry), "");
+ gtk_editable_set_text(GTK_EDITABLE(priv->sos_entry), "");
index = balsa_window_find_current_index(window);
bw_set_view_filter(window, balsa_index_get_filter_no(BALSA_INDEX(index)),
priv->sos_entry);
@@ -3929,7 +3929,7 @@ bw_find_real(BalsaWindow * window, BalsaIndex * bindex, gboolean again)
gtk_container_add(GTK_CONTAINER(box), button);
if (cnd->match.string.string)
- gtk_entry_set_text(GTK_ENTRY(search_entry),
+ gtk_editable_set_text(GTK_EDITABLE(search_entry),
cnd->match.string.string);
gtk_toggle_button_set_active(matching_body,
CONDITION_CHKMATCH(cnd,
@@ -4053,7 +4053,7 @@ bw_get_view_filter(BalsaWindow *window)
i = gtk_combo_box_get_active(GTK_COMBO_BOX(priv->filter_choice));
if (i >= 0) {
- const gchar *str = gtk_entry_get_text(GTK_ENTRY(priv->sos_entry));
+ const gchar *str = gtk_editable_get_text(GTK_EDITABLE(priv->sos_entry));
g_assert(((guint) i) < G_N_ELEMENTS(view_filters));
filter = view_filters[i].filter(str);
} else filter = NULL;
@@ -4112,7 +4112,7 @@ bw_reset_filter(BalsaWindow * window)
BalsaIndex *bindex = BALSA_INDEX(balsa_window_find_current_index(window));
/* do it by resetting the sos filder */
- gtk_entry_set_text(GTK_ENTRY(priv->sos_entry), "");
+ gtk_editable_set_text(GTK_EDITABLE(priv->sos_entry), "");
bw_set_view_filter(window, balsa_index_get_filter_no(bindex), priv->sos_entry);
}
@@ -4301,7 +4301,7 @@ bw_notebook_switch_page_cb(GtkWidget * notebook,
bw_enable_mailbox_menus(window, index);
filter_string = balsa_index_get_filter_string(index);
- gtk_entry_set_text(GTK_ENTRY(priv->sos_entry),
+ gtk_editable_set_text(GTK_EDITABLE(priv->sos_entry),
filter_string != NULL ? filter_string : "");
gtk_combo_box_set_active(GTK_COMBO_BOX(priv->filter_choice),
balsa_index_get_filter_no(index));
diff --git a/src/pref-manager.c b/src/pref-manager.c
index 160a10cd9..740f6b9db 100644
--- a/src/pref-manager.c
+++ b/src/pref-manager.c
@@ -542,7 +542,7 @@ apply_prefs(GtkDialog * pbox)
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON
(pui->mark_quoted));
g_free(balsa_app.quote_regex);
- tmp = gtk_entry_get_text(GTK_ENTRY(pui->quote_pattern));
+ tmp = gtk_editable_get_text(GTK_EDITABLE(pui->quote_pattern));
balsa_app.quote_regex = g_strcompress(tmp);
balsa_app.browse_wrap =
@@ -594,8 +594,8 @@ apply_prefs(GtkDialog * pbox)
/* selected headers */
g_free(balsa_app.selected_headers);
balsa_app.selected_headers =
- g_ascii_strdown(gtk_entry_get_text
- (GTK_ENTRY(pui->selected_headers)), -1);
+ g_ascii_strdown(gtk_editable_get_text
+ (GTK_EDITABLE(pui->selected_headers)), -1);
/* quoted text color */
for (i = 0; i < MAX_QUOTED_COLOR; i++) {
@@ -774,12 +774,12 @@ set_prefs(void)
balsa_app.edit_headers);
/* arp */
- gtk_entry_set_text(GTK_ENTRY(pui->quote_str), balsa_app.quote_str);
+ gtk_editable_set_text(GTK_EDITABLE(pui->quote_str), balsa_app.quote_str);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pui->mark_quoted),
balsa_app.mark_quoted);
gtk_widget_set_sensitive(pui->quote_pattern, balsa_app.mark_quoted);
tmp = g_strescape(balsa_app.quote_regex, NULL);
- gtk_entry_set_text(GTK_ENTRY(pui->quote_pattern), tmp);
+ gtk_editable_set_text(GTK_EDITABLE(pui->quote_pattern), tmp);
g_free(tmp);
/* wrap incoming text/plain */
@@ -832,12 +832,12 @@ set_prefs(void)
/* date format */
if (balsa_app.date_string)
- gtk_entry_set_text(GTK_ENTRY(pui->date_format),
+ gtk_editable_set_text(GTK_EDITABLE(pui->date_format),
balsa_app.date_string);
/* selected headers */
if (balsa_app.selected_headers)
- gtk_entry_set_text(GTK_ENTRY(pui->selected_headers),
+ gtk_editable_set_text(GTK_EDITABLE(pui->selected_headers),
balsa_app.selected_headers);
/* Colour */
diff --git a/src/spell-check.c b/src/spell-check.c
index 7621e72ae..493a96c3f 100644
--- a/src/spell-check.c
+++ b/src/spell-check.c
@@ -418,7 +418,7 @@ select_word_cb(GtkTreeSelection *selection,
BalsaSpellCheck *spell_check = BALSA_SPELL_CHECK(data);
gtk_tree_model_get(model, &iter, 0, &str, -1);
- gtk_entry_set_text(spell_check->entry, str);
+ gtk_editable_set_text(GTK_EDITABLE(spell_check->entry), str);
g_free(str);
}
}
@@ -1008,7 +1008,7 @@ finish_check(BalsaSpellCheck *spell_check)
/* get rid of the suggestions */
gtk_list_store_clear(GTK_LIST_STORE(model));
- gtk_entry_set_text(spell_check->entry, "");
+ gtk_editable_set_text(GTK_EDITABLE(spell_check->entry), "");
enchant_dict_free_string_list(spell_check->dict,
spell_check->suggestions);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]