[network-manager-applet/lr/gtk4: 34/43] libnma: avoid using GtkEntry API removed from GTK4
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-applet/lr/gtk4: 34/43] libnma: avoid using GtkEntry API removed from GTK4
- Date: Tue, 10 Sep 2019 14:19:58 +0000 (UTC)
commit 5f5fc1276a9fd820cbec87ebb238d215a9c2f161
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Wed May 29 18:28:54 2019 +0200
libnma: avoid using GtkEntry API removed from GTK4
Some calls were moved to GtkEditable. Call the new variants, while
providing a compatibility wrappers for the GTK3 versions.
Makefile.am | 4 ++-
meson.build | 1 +
src/libnma/nma-file-cert-chooser.c | 5 ++--
src/libnma/nma-mobile-wizard.c | 13 ++++-----
src/libnma/nma-pkcs11-cert-chooser.c | 15 ++++++-----
src/libnma/nma-private.h | 33 +++++++++++++++++++++++
src/libnma/nma-ui-utils.c | 7 ++---
src/libnma/nma-vpn-password-dialog.c | 14 +++++-----
src/libnma/nma-wifi-dialog.c | 7 ++---
src/libnma/tests/bar-code.c | 7 ++---
src/mobile-helpers.c | 4 +--
src/wireless-security/eap-method-fast.c | 5 ++--
src/wireless-security/eap-method-leap.c | 37 +++++++++++++++-----------
src/wireless-security/eap-method-peap.c | 9 ++++---
src/wireless-security/eap-method-simple.c | 44 +++++++++++++++++++------------
src/wireless-security/eap-method-tls.c | 13 ++++-----
src/wireless-security/eap-method-ttls.c | 9 ++++---
src/wireless-security/helpers.c | 4 +--
src/wireless-security/ws-leap.c | 11 ++++----
src/wireless-security/ws-wep-key.c | 17 ++++++------
src/wireless-security/ws-wpa-psk.c | 7 ++---
21 files changed, 166 insertions(+), 100 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index c863e8d4..863dbc69 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -536,7 +536,8 @@ EXTRA_DIST += \
src/libnma/qrcodegen.h
libnma_h_priv_real = \
- src/libnma/nma-cert-chooser-private.h
+ src/libnma/nma-cert-chooser-private.h \
+ src/libnma/nma-private.h
libnma_h_priv_gcr = \
src/libnma/nma-pkcs11-token-login-dialog.h \
@@ -1075,6 +1076,7 @@ IGNORE_HFILES = \
nma-resources.h \
nma-version.h \
nma-cert-chooser-private.h \
+ nma-private.h \
nma-pkcs11-token-login-dialog.h \
nma-pkcs11-cert-chooser-dialog.h \
nma-cert-chooser-button.h
diff --git a/meson.build b/meson.build
index 75a866ea..9c80c0b6 100644
--- a/meson.build
+++ b/meson.build
@@ -448,6 +448,7 @@ if enable_gtk_doc
'nma-pkcs11-cert-chooser-dialog.h',
'nma-pkcs11-token-login-dialog.h',
'nma-resources.h',
+ 'nma-private.h'
'nma-version.h'
]
diff --git a/src/libnma/nma-file-cert-chooser.c b/src/libnma/nma-file-cert-chooser.c
index 1a3e200b..36de9294 100644
--- a/src/libnma/nma-file-cert-chooser.c
+++ b/src/libnma/nma-file-cert-chooser.c
@@ -8,6 +8,7 @@
*/
#include "nm-default.h"
+#include "nma-private.h"
#include "nma-cert-chooser-private.h"
#include "utils.h"
#ifdef LIBNM_BUILD
@@ -24,7 +25,7 @@ set_key_password (NMACertChooser *cert_chooser, const gchar *password)
NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
g_return_if_fail (priv->key_password != NULL);
- gtk_entry_set_text (GTK_ENTRY (priv->key_password), password);
+ gtk_editable_set_text (GTK_EDITABLE (priv->key_password), password);
}
static const gchar *
@@ -33,7 +34,7 @@ get_key_password (NMACertChooser *cert_chooser)
NMAFileCertChooserPrivate *priv = NMA_FILE_CERT_CHOOSER_GET_PRIVATE (cert_chooser);
g_return_val_if_fail (priv->key_password != NULL, NULL);
- return gtk_entry_get_text (GTK_ENTRY (priv->key_password));
+ return gtk_editable_get_text (GTK_EDITABLE (priv->key_password));
}
static void
diff --git a/src/libnma/nma-mobile-wizard.c b/src/libnma/nma-mobile-wizard.c
index cf10e0a8..44a59ce6 100644
--- a/src/libnma/nma-mobile-wizard.c
+++ b/src/libnma/nma-mobile-wizard.c
@@ -8,6 +8,7 @@
*/
#include "nm-default.h"
+#include "nma-private.h"
#include <stdlib.h>
@@ -90,7 +91,7 @@ typedef struct {
GtkTreeStore *plan_store;
guint32 plan_focus_id;
- GtkEntry *plan_apn_entry;
+ GtkEditable *plan_apn_entry;
/* Confirm page */
GtkWidget *confirm_page;
@@ -165,7 +166,7 @@ assistant_closed (GtkButton *button, gpointer user_data)
}
} else {
family = NMA_MOBILE_FAMILY_3GPP;
- wiz_method->gsm_apn = g_strdup (gtk_entry_get_text (priv->plan_apn_entry));
+ wiz_method->gsm_apn = g_strdup (gtk_editable_get_text (priv->plan_apn_entry));
}
}
}
@@ -271,7 +272,7 @@ confirm_prepare (NMAMobileWizard *self)
else
gtk_label_set_text (priv->confirm_plan, _("Unlisted"));
- apn = gtk_entry_get_text (priv->plan_apn_entry);
+ apn = gtk_editable_get_text (priv->plan_apn_entry);
}
if (apn) {
@@ -339,7 +340,7 @@ plan_update_complete (NMAMobileWizard *self)
} else {
const char *manual_apn;
- manual_apn = gtk_entry_get_text (priv->plan_apn_entry);
+ manual_apn = gtk_editable_get_text (priv->plan_apn_entry);
gtk_assistant_set_page_complete (assistant, priv->plan_page,
(manual_apn && strlen (manual_apn)));
}
@@ -354,10 +355,10 @@ plan_combo_changed (NMAMobileWizard *self)
method = get_selected_method (self, &is_manual);
if (method) {
- gtk_entry_set_text (priv->plan_apn_entry, nma_mobile_access_method_get_3gpp_apn (method));
+ gtk_editable_set_text (priv->plan_apn_entry, nma_mobile_access_method_get_3gpp_apn (method));
gtk_widget_set_sensitive (GTK_WIDGET (priv->plan_apn_entry), FALSE);
} else {
- gtk_entry_set_text (priv->plan_apn_entry, "");
+ gtk_editable_set_text (priv->plan_apn_entry, "");
gtk_widget_set_sensitive (GTK_WIDGET (priv->plan_apn_entry), TRUE);
gtk_widget_grab_focus (GTK_WIDGET (priv->plan_apn_entry));
}
diff --git a/src/libnma/nma-pkcs11-cert-chooser.c b/src/libnma/nma-pkcs11-cert-chooser.c
index b0449ec5..8e45138e 100644
--- a/src/libnma/nma-pkcs11-cert-chooser.c
+++ b/src/libnma/nma-pkcs11-cert-chooser.c
@@ -7,6 +7,7 @@
*/
#include "nm-default.h"
+#include "nma-private.h"
#include "nma-cert-chooser-private.h"
#include "nma-cert-chooser-button.h"
#include "nma-ui-utils.h"
@@ -27,7 +28,7 @@ set_key_password (NMACertChooser *cert_chooser, const gchar *password)
g_return_if_fail (priv->key_password != NULL);
if (password)
- gtk_entry_set_text (GTK_ENTRY (priv->key_password), password);
+ gtk_editable_set_text (GTK_EDITABLE (priv->key_password), password);
}
static const gchar *
@@ -37,7 +38,7 @@ get_key_password (NMACertChooser *cert_chooser)
const gchar *text;
g_return_val_if_fail (priv->key_password != NULL, NULL);
- text = gtk_entry_get_text (GTK_ENTRY (priv->key_password));
+ text = gtk_editable_get_text (GTK_EDITABLE (priv->key_password));
return text && text[0] ? text : NULL;
}
@@ -72,7 +73,7 @@ set_cert_password (NMACertChooser *cert_chooser, const gchar *password)
g_return_if_fail (priv->cert_password != NULL);
if (password)
- gtk_entry_set_text (GTK_ENTRY (priv->cert_password), password);
+ gtk_editable_set_text (GTK_EDITABLE (priv->cert_password), password);
}
static const gchar *
@@ -82,7 +83,7 @@ get_cert_password (NMACertChooser *cert_chooser)
const gchar *text;
g_return_val_if_fail (priv->cert_password != NULL, NULL);
- text = gtk_entry_get_text (GTK_ENTRY (priv->cert_password));
+ text = gtk_editable_get_text (GTK_EDITABLE (priv->cert_password));
return text && text[0] ? text : NULL;
}
@@ -281,7 +282,7 @@ cert_changed_cb (NMACertChooserButton *button, gpointer user_data)
if (nma_cert_chooser_button_get_remember_pin (button))
pin = nma_cert_chooser_button_get_pin (button);
if (pin)
- gtk_entry_set_text (GTK_ENTRY (priv->cert_password), pin);
+ gtk_editable_set_text (GTK_EDITABLE (priv->cert_password), pin);
gtk_widget_set_sensitive (priv->cert_password, uri_data != NULL);
gtk_widget_set_sensitive (priv->cert_password_label, uri_data != NULL);
@@ -297,7 +298,7 @@ cert_changed_cb (NMACertChooserButton *button, gpointer user_data)
gtk_widget_set_sensitive (priv->key_password, TRUE);
gtk_widget_set_sensitive (priv->key_password_label, TRUE);
if (pin)
- gtk_entry_set_text (GTK_ENTRY (priv->key_password), pin);
+ gtk_editable_set_text (GTK_EDITABLE (priv->key_password), pin);
}
}
}
@@ -319,7 +320,7 @@ key_changed_cb (NMACertChooserButton *button, gpointer user_data)
if (nma_cert_chooser_button_get_remember_pin (button))
pin = nma_cert_chooser_button_get_pin (button);
if (pin) {
- gtk_entry_set_text (GTK_ENTRY (priv->key_password), pin);
+ gtk_editable_set_text (GTK_EDITABLE (priv->key_password), pin);
g_free (pin);
}
diff --git a/src/libnma/nma-private.h b/src/libnma/nma-private.h
new file mode 100644
index 00000000..2ab0bc0f
--- /dev/null
+++ b/src/libnma/nma-private.h
@@ -0,0 +1,33 @@
+/* NetworkManager Applet -- allow user control over networking
+ *
+ * Lubomir Rintel <lkundrak v3 sk>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ * Copyright (C) 2019 Red Hat, Inc.
+ */
+
+#ifndef NMA_PRIVATE_H
+
+#if !GTK_CHECK_VERSION(3,96,0)
+#define gtk_editable_set_text(editable,text) gtk_entry_set_text(GTK_ENTRY(editable), (text))
+#define gtk_editable_get_text(editable) gtk_entry_get_text(GTK_ENTRY(editable))
+#define gtk_editable_set_width_chars(editable, n_chars) gtk_entry_set_width_chars(GTK_ENTRY(editable),
(n_chars))
+#endif
+
+#define NMA_PRIVATE_H
+
+#endif /* NMA_PRIVATE_H */
diff --git a/src/libnma/nma-ui-utils.c b/src/libnma/nma-ui-utils.c
index 91d13214..37939bfe 100644
--- a/src/libnma/nma-ui-utils.c
+++ b/src/libnma/nma-ui-utils.c
@@ -4,6 +4,7 @@
*/
#include "nm-default.h"
+#include "nma-private.h"
#include <string.h>
@@ -74,11 +75,11 @@ change_password_storage_icon (GtkWidget *passwd_entry, MenuItem item)
if ( (item == ITEM_STORAGE_ASK && !ask_mode)
|| item == ITEM_STORAGE_UNUSED) {
/* Store the old password */
- old_pwd = gtk_entry_get_text (GTK_ENTRY (passwd_entry));
+ old_pwd = gtk_editable_get_text (GTK_EDITABLE (passwd_entry));
if (old_pwd && *old_pwd)
g_object_set_data_full (G_OBJECT (passwd_entry), "password-old",
g_strdup (old_pwd), g_free_str0);
- gtk_entry_set_text (GTK_ENTRY (passwd_entry), "");
+ gtk_editable_set_text (GTK_EDITABLE (passwd_entry), "");
if (gtk_widget_is_focus (passwd_entry))
gtk_widget_child_focus ((gtk_widget_get_toplevel (passwd_entry)),
GTK_DIR_TAB_BACKWARD);
@@ -87,7 +88,7 @@ change_password_storage_icon (GtkWidget *passwd_entry, MenuItem item)
/* Set the old password to the entry */
old_pwd = g_object_get_data (G_OBJECT (passwd_entry), "password-old");
if (old_pwd && *old_pwd)
- gtk_entry_set_text (GTK_ENTRY (passwd_entry), old_pwd);
+ gtk_editable_set_text (GTK_EDITABLE (passwd_entry), old_pwd);
g_object_set_data (G_OBJECT (passwd_entry), "password-old", NULL);
if (!gtk_widget_get_can_focus (passwd_entry)) {
diff --git a/src/libnma/nma-vpn-password-dialog.c b/src/libnma/nma-vpn-password-dialog.c
index a0397b49..07e601ca 100644
--- a/src/libnma/nma-vpn-password-dialog.c
+++ b/src/libnma/nma-vpn-password-dialog.c
@@ -19,7 +19,7 @@
*/
#include "nm-default.h"
-
+#include "nma-private.h"
#include "nma-vpn-password-dialog.h"
typedef struct {
@@ -169,7 +169,7 @@ nma_vpn_password_dialog_set_password (NMAVpnPasswordDialog *dialog,
g_return_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog));
priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
- gtk_entry_set_text (GTK_ENTRY (priv->password_entry), password ? password : "");
+ gtk_editable_set_text (GTK_EDITABLE (priv->password_entry), password ? password : "");
}
void
@@ -181,7 +181,7 @@ nma_vpn_password_dialog_set_password_secondary (NMAVpnPasswordDialog *dialog,
g_return_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog));
priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
- gtk_entry_set_text (GTK_ENTRY (priv->password_entry_secondary),
+ gtk_editable_set_text (GTK_EDITABLE (priv->password_entry_secondary),
password_secondary ? password_secondary : "");
}
@@ -194,7 +194,7 @@ nma_vpn_password_dialog_set_password_ternary (NMAVpnPasswordDialog *dialog,
g_return_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog));
priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
- gtk_entry_set_text (GTK_ENTRY (priv->password_entry_tertiary),
+ gtk_editable_set_text (GTK_EDITABLE (priv->password_entry_tertiary),
password_tertiary ? password_tertiary : "");
}
@@ -286,7 +286,7 @@ nma_vpn_password_dialog_get_password (NMAVpnPasswordDialog *dialog)
g_return_val_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog), NULL);
priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
- return gtk_entry_get_text (GTK_ENTRY (priv->password_entry));
+ return gtk_editable_get_text (GTK_EDITABLE (priv->password_entry));
}
const char *
@@ -297,7 +297,7 @@ nma_vpn_password_dialog_get_password_secondary (NMAVpnPasswordDialog *dialog)
g_return_val_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog), NULL);
priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
- return gtk_entry_get_text (GTK_ENTRY (priv->password_entry_secondary));
+ return gtk_editable_get_text (GTK_EDITABLE (priv->password_entry_secondary));
}
const char *
@@ -308,7 +308,7 @@ nma_vpn_password_dialog_get_password_ternary (NMAVpnPasswordDialog *dialog)
g_return_val_if_fail (NMA_VPN_IS_PASSWORD_DIALOG (dialog), NULL);
priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
- return gtk_entry_get_text (GTK_ENTRY (priv->password_entry_tertiary));
+ return gtk_editable_get_text (GTK_EDITABLE (priv->password_entry_tertiary));
}
void nma_vpn_password_dialog_set_password_label (NMAVpnPasswordDialog *dialog,
diff --git a/src/libnma/nma-wifi-dialog.c b/src/libnma/nma-wifi-dialog.c
index 121441ac..2b969f6e 100644
--- a/src/libnma/nma-wifi-dialog.c
+++ b/src/libnma/nma-wifi-dialog.c
@@ -7,6 +7,7 @@
*/
#include "nm-default.h"
+#include "nma-private.h"
#include <string.h>
#include <netinet/ether.h>
@@ -219,7 +220,7 @@ validate_dialog_ssid (NMAWifiDialog *self)
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "network_name_entry"));
- ssid = gtk_entry_get_text (GTK_ENTRY (widget));
+ ssid = gtk_editable_get_text (GTK_EDITABLE (widget));
if (!ssid || strlen (ssid) == 0 || strlen (ssid) > 32)
return NULL;
@@ -365,10 +366,10 @@ connection_combo_changed (GtkWidget *combo,
s_wireless = nm_connection_get_setting_wireless (priv->connection);
ssid = nm_setting_wireless_get_ssid (s_wireless);
utf8_ssid = nm_utils_ssid_to_utf8 (g_bytes_get_data (ssid, NULL), g_bytes_get_size (ssid));
- gtk_entry_set_text (GTK_ENTRY (widget), utf8_ssid);
+ gtk_editable_set_text (GTK_EDITABLE (widget), utf8_ssid);
g_free (utf8_ssid);
} else {
- gtk_entry_set_text (GTK_ENTRY (widget), "");
+ gtk_editable_set_text (GTK_EDITABLE (widget), "");
}
gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (priv->builder, "network_name_entry")),
is_new);
diff --git a/src/libnma/tests/bar-code.c b/src/libnma/tests/bar-code.c
index 8da5e093..7925b880 100644
--- a/src/libnma/tests/bar-code.c
+++ b/src/libnma/tests/bar-code.c
@@ -13,6 +13,7 @@
*/
#include "nm-default.h"
+#include "nma-private.h"
#include <stdio.h>
#include <string.h>
@@ -59,7 +60,7 @@ password_changed (GtkEditable *editable, gpointer user_data)
g_object_set (s_wsec,
NM_SETTING_WIRELESS_SECURITY_PSK,
- gtk_entry_get_text (GTK_ENTRY (editable)),
+ gtk_editable_get_text (editable),
NULL);
}
@@ -131,7 +132,7 @@ main (int argc, char *argv[])
w = gtk_entry_new ();
g_signal_connect (w, "changed", G_CALLBACK (ssid_changed), connection);
- gtk_entry_set_text (GTK_ENTRY (w), "\"ab:cd\"");
+ gtk_editable_set_text (GTK_EDITABLE (w), "\"ab:cd\"");
gtk_widget_show (w);
gtk_grid_attach (GTK_GRID (grid), w, 1, 0, 1, 1);
@@ -142,7 +143,7 @@ main (int argc, char *argv[])
pass = gtk_entry_new ();
g_signal_connect (pass, "changed", G_CALLBACK (password_changed), connection);
- gtk_entry_set_text (GTK_ENTRY (pass), "lolofon");
+ gtk_editable_set_text (GTK_EDITABLE (pass), "lolofon");
gtk_widget_show (pass);
gtk_grid_attach (GTK_GRID (grid), pass, 1, 1, 1, 1);
diff --git a/src/mobile-helpers.c b/src/mobile-helpers.c
index 0621a81b..54f250b8 100644
--- a/src/mobile-helpers.c
+++ b/src/mobile-helpers.c
@@ -7,7 +7,7 @@
*/
#include "nm-default.h"
-
+#include "nma-private.h"
#include <ctype.h>
#include <libsecret/secret.h>
@@ -469,7 +469,7 @@ ask_for_pin (GtkEntry **out_secret_entry)
w = gtk_entry_new ();
*out_secret_entry = GTK_ENTRY (w);
gtk_entry_set_max_length (GTK_ENTRY (w), 8);
- gtk_entry_set_width_chars (GTK_ENTRY (w), 8);
+ gtk_editable_set_width_chars (GTK_EDITABLE (w), 8);
gtk_entry_set_activates_default (GTK_ENTRY (w), TRUE);
gtk_entry_set_visibility (GTK_ENTRY (w), FALSE);
gtk_box_pack_start (box, w, FALSE, FALSE, 0);
diff --git a/src/wireless-security/eap-method-fast.c b/src/wireless-security/eap-method-fast.c
index 311371c3..32674739 100644
--- a/src/wireless-security/eap-method-fast.c
+++ b/src/wireless-security/eap-method-fast.c
@@ -6,6 +6,7 @@
*/
#include "nm-default.h"
+#include "nma-private.h"
#include <ctype.h>
#include <string.h>
@@ -131,7 +132,7 @@ fill_connection (EAPMethod *parent, NMConnection *connection)
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_anon_identity_entry"));
g_assert (widget);
- text = gtk_entry_get_text (GTK_ENTRY (widget));
+ text = gtk_editable_get_text (GTK_EDITABLE (widget));
if (text && strlen (text))
g_object_set (s_8021x, NM_SETTING_802_1X_ANONYMOUS_IDENTITY, text, NULL);
@@ -382,7 +383,7 @@ eap_method_fast_new (WirelessSecurity *ws_parent,
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_anon_identity_entry"));
if (s_8021x && nm_setting_802_1x_get_anonymous_identity (s_8021x))
- gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_802_1x_get_anonymous_identity (s_8021x));
+ gtk_editable_set_text (GTK_EDITABLE (widget), nm_setting_802_1x_get_anonymous_identity
(s_8021x));
g_signal_connect (G_OBJECT (widget), "changed",
(GCallback) wireless_security_changed_cb,
ws_parent);
diff --git a/src/wireless-security/eap-method-leap.c b/src/wireless-security/eap-method-leap.c
index 2f43ab85..ee45257b 100644
--- a/src/wireless-security/eap-method-leap.c
+++ b/src/wireless-security/eap-method-leap.c
@@ -7,6 +7,7 @@
*/
#include "nm-default.h"
+#include "nma-private.h"
#include <ctype.h>
#include <string.h>
@@ -46,7 +47,7 @@ validate (EAPMethod *parent, GError **error)
const char *text;
gboolean ret = TRUE;
- text = gtk_entry_get_text (method->username_entry);
+ text = gtk_editable_get_text (GTK_EDITABLE (method->username_entry));
if (!text || !strlen (text)) {
widget_set_error (GTK_WIDGET (method->username_entry));
g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("missing EAP-LEAP username"));
@@ -54,7 +55,7 @@ validate (EAPMethod *parent, GError **error)
} else
widget_unset_error (GTK_WIDGET (method->username_entry));
- text = gtk_entry_get_text (method->password_entry);
+ text = gtk_editable_get_text (GTK_EDITABLE (method->password_entry));
if (!text || !strlen (text)) {
widget_set_error (GTK_WIDGET (method->password_entry));
if (ret) {
@@ -94,8 +95,10 @@ fill_connection (EAPMethod *parent, NMConnection *connection)
nm_setting_802_1x_add_eap_method (s_8021x, "leap");
- g_object_set (s_8021x, NM_SETTING_802_1X_IDENTITY, gtk_entry_get_text (method->username_entry), NULL);
- g_object_set (s_8021x, NM_SETTING_802_1X_PASSWORD, gtk_entry_get_text (method->password_entry), NULL);
+ g_object_set (s_8021x,
+ NM_SETTING_802_1X_IDENTITY, gtk_editable_get_text (GTK_EDITABLE
(method->username_entry)),
+ NM_SETTING_802_1X_PASSWORD, gtk_editable_get_text (GTK_EDITABLE
(method->password_entry)),
+ NULL);
passwd_entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_leap_password_entry"));
g_assert (passwd_entry);
@@ -126,15 +129,19 @@ update_secrets (EAPMethod *parent, NMConnection *connection)
static void
set_userpass_ui (EAPMethodLEAP *method)
{
- if (method->ws_parent->username)
- gtk_entry_set_text (method->username_entry, method->ws_parent->username);
- else
- gtk_entry_set_text (method->username_entry, "");
-
- if (method->ws_parent->password && !method->ws_parent->always_ask)
- gtk_entry_set_text (method->password_entry, method->ws_parent->password);
- else
- gtk_entry_set_text (method->password_entry, "");
+ if (method->ws_parent->username) {
+ gtk_editable_set_text (GTK_EDITABLE (method->username_entry),
+ method->ws_parent->username);
+ } else {
+ gtk_editable_set_text (GTK_EDITABLE (method->username_entry), "");
+ }
+
+ if (method->ws_parent->password && !method->ws_parent->always_ask) {
+ gtk_editable_set_text (GTK_EDITABLE (method->password_entry),
+ method->ws_parent->password);
+ } else {
+ gtk_editable_set_text (GTK_EDITABLE (method->password_entry), "");
+ }
gtk_toggle_button_set_active (method->show_password, method->ws_parent->show_password);
}
@@ -149,8 +156,8 @@ static void
widgets_unrealized (GtkWidget *widget, EAPMethodLEAP *method)
{
wireless_security_set_userpass (method->ws_parent,
- gtk_entry_get_text (method->username_entry),
- gtk_entry_get_text (method->password_entry),
+ gtk_editable_get_text (GTK_EDITABLE (method->username_entry)),
+ gtk_editable_get_text (GTK_EDITABLE (method->password_entry)),
(gboolean) -1,
gtk_toggle_button_get_active (method->show_password));
}
diff --git a/src/wireless-security/eap-method-peap.c b/src/wireless-security/eap-method-peap.c
index 4c765dbc..a7dd3e59 100644
--- a/src/wireless-security/eap-method-peap.c
+++ b/src/wireless-security/eap-method-peap.c
@@ -7,6 +7,7 @@
*/
#include "nm-default.h"
+#include "nma-private.h"
#include <ctype.h>
#include <string.h>
@@ -142,14 +143,14 @@ fill_connection (EAPMethod *parent, NMConnection *connection)
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_anon_identity_entry"));
g_assert (widget);
- text = gtk_entry_get_text (GTK_ENTRY (widget));
+ text = gtk_editable_get_text (GTK_EDITABLE (widget));
if (text && strlen (text))
g_object_set (s_8021x, NM_SETTING_802_1X_ANONYMOUS_IDENTITY, text, NULL);
#if LIBNM_BUILD
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_domain_entry"));
g_assert (widget);
- text = gtk_entry_get_text (GTK_ENTRY (widget));
+ text = gtk_editable_get_text (GTK_EDITABLE (widget));
if (text && strlen (text))
g_object_set (s_8021x, NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH, text, NULL);
#endif
@@ -455,7 +456,7 @@ eap_method_peap_new (WirelessSecurity *ws_parent,
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_anon_identity_entry"));
if (s_8021x && nm_setting_802_1x_get_anonymous_identity (s_8021x))
- gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_802_1x_get_anonymous_identity (s_8021x));
+ gtk_editable_set_text (GTK_EDITABLE (widget), nm_setting_802_1x_get_anonymous_identity
(s_8021x));
g_signal_connect (G_OBJECT (widget), "changed",
(GCallback) wireless_security_changed_cb,
ws_parent);
@@ -463,7 +464,7 @@ eap_method_peap_new (WirelessSecurity *ws_parent,
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_peap_domain_entry"));
#if LIBNM_BUILD
if (s_8021x && nm_setting_802_1x_get_domain_suffix_match (s_8021x))
- gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_802_1x_get_domain_suffix_match (s_8021x));
+ gtk_editable_set_text (GTK_EDITABLE (widget), nm_setting_802_1x_get_domain_suffix_match
(s_8021x));
g_signal_connect (G_OBJECT (widget), "changed",
(GCallback) wireless_security_changed_cb,
ws_parent);
diff --git a/src/wireless-security/eap-method-simple.c b/src/wireless-security/eap-method-simple.c
index 20322868..26aef0de 100644
--- a/src/wireless-security/eap-method-simple.c
+++ b/src/wireless-security/eap-method-simple.c
@@ -7,6 +7,7 @@
*/
#include "nm-default.h"
+#include "nma-private.h"
#include <ctype.h>
#include <string.h>
@@ -70,7 +71,7 @@ validate (EAPMethod *parent, GError **error)
gboolean ret = TRUE;
if (method->username_requested) {
- text = gtk_entry_get_text (method->username_entry);
+ text = gtk_editable_get_text (GTK_EDITABLE (method->username_entry));
if (!text || !strlen (text)) {
widget_set_error (GTK_WIDGET (method->username_entry));
g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("missing EAP username"));
@@ -84,7 +85,7 @@ validate (EAPMethod *parent, GError **error)
if (always_ask_selected (method->password_entry))
widget_unset_error (GTK_WIDGET (method->password_entry));
else {
- text = gtk_entry_get_text (method->password_entry);
+ text = gtk_editable_get_text (GTK_EDITABLE (method->password_entry));
if (!text || !strlen (text)) {
widget_set_error (GTK_WIDGET (method->password_entry));
if (ret) {
@@ -98,7 +99,7 @@ validate (EAPMethod *parent, GError **error)
}
if (method->pkey_passphrase_requested) {
- text = gtk_entry_get_text (method->pkey_passphrase_entry);
+ text = gtk_editable_get_text (GTK_EDITABLE (method->pkey_passphrase_entry));
if (!text || !strlen (text)) {
widget_set_error (GTK_WIDGET (method->pkey_passphrase_entry));
if (ret) {
@@ -193,8 +194,11 @@ fill_connection (EAPMethod *parent, NMConnection *connection)
nm_setting_802_1x_add_eap_method (s_8021x, eap_type->name);
}
- if (method->username_requested)
- g_object_set (s_8021x, NM_SETTING_802_1X_IDENTITY, gtk_entry_get_text
(method->username_entry), NULL);
+ if (method->username_requested) {
+ g_object_set (s_8021x, NM_SETTING_802_1X_IDENTITY,
+ gtk_editable_get_text (GTK_EDITABLE (method->username_entry)),
+ NULL);
+ }
if (method->password_requested) {
/* Save the password always ask setting */
@@ -209,7 +213,8 @@ fill_connection (EAPMethod *parent, NMConnection *connection)
*/
if (!(method->flags & EAP_METHOD_SIMPLE_FLAG_IS_EDITOR) || not_saved == FALSE) {
g_object_set (s_8021x, NM_SETTING_802_1X_PASSWORD,
- gtk_entry_get_text (method->password_entry), NULL);
+ gtk_editable_get_text (GTK_EDITABLE (method->password_entry)),
+ NULL);
}
/* Update secret flags and popup when editing the connection */
@@ -225,7 +230,8 @@ fill_connection (EAPMethod *parent, NMConnection *connection)
if (method->pkey_passphrase_requested) {
g_object_set (s_8021x, NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD,
- gtk_entry_get_text (method->pkey_passphrase_entry), NULL);
+ gtk_editable_get_text (GTK_EDITABLE (method->pkey_passphrase_entry)),
+ NULL);
}
}
@@ -280,15 +286,19 @@ password_storage_changed (GObject *entry,
static void
set_userpass_ui (EAPMethodSimple *method)
{
- if (method->ws_parent->username)
- gtk_entry_set_text (method->username_entry, method->ws_parent->username);
- else
- gtk_entry_set_text (method->username_entry, "");
+ if (method->ws_parent->username) {
+ gtk_editable_set_text (GTK_EDITABLE (method->username_entry),
+ method->ws_parent->username);
+ } else {
+ gtk_editable_set_text (GTK_EDITABLE (method->username_entry), "");
+ }
- if (method->ws_parent->password && !method->ws_parent->always_ask)
- gtk_entry_set_text (method->password_entry, method->ws_parent->password);
- else
- gtk_entry_set_text (method->password_entry, "");
+ if (method->ws_parent->password && !method->ws_parent->always_ask) {
+ gtk_editable_set_text (GTK_EDITABLE (method->password_entry),
+ method->ws_parent->password);
+ } else {
+ gtk_editable_set_text (GTK_EDITABLE (method->password_entry), "");
+ }
gtk_toggle_button_set_active (method->show_password, method->ws_parent->show_password);
password_storage_changed (NULL, NULL, method);
@@ -304,8 +314,8 @@ static void
widgets_unrealized (GtkWidget *widget, EAPMethodSimple *method)
{
wireless_security_set_userpass (method->ws_parent,
- gtk_entry_get_text (method->username_entry),
- gtk_entry_get_text (method->password_entry),
+ gtk_editable_get_text (GTK_EDITABLE (method->username_entry)),
+ gtk_editable_get_text (GTK_EDITABLE (method->password_entry)),
always_ask_selected (method->password_entry),
gtk_toggle_button_get_active (method->show_password));
}
diff --git a/src/wireless-security/eap-method-tls.c b/src/wireless-security/eap-method-tls.c
index 12374e87..79f296dc 100644
--- a/src/wireless-security/eap-method-tls.c
+++ b/src/wireless-security/eap-method-tls.c
@@ -8,6 +8,7 @@
*/
#include "nm-default.h"
+#include "nma-private.h"
#include <ctype.h>
#include <string.h>
@@ -44,7 +45,7 @@ validate (EAPMethod *parent, GError **error)
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_identity_entry"));
g_assert (widget);
- identity = gtk_entry_get_text (GTK_ENTRY (widget));
+ identity = gtk_editable_get_text (GTK_EDITABLE (widget));
if (!identity || !strlen (identity)) {
widget_set_error (widget);
g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("missing EAP-TLS identity"));
@@ -114,14 +115,14 @@ fill_connection (EAPMethod *parent, NMConnection *connection)
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_identity_entry"));
g_assert (widget);
- g_object_set (s_8021x, NM_SETTING_802_1X_IDENTITY, gtk_entry_get_text (GTK_ENTRY (widget)), NULL);
+ g_object_set (s_8021x, NM_SETTING_802_1X_IDENTITY, gtk_editable_get_text (GTK_EDITABLE (widget)),
NULL);
#if LIBNM_BUILD
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_domain_entry"));
g_assert (widget);
g_object_set (s_8021x,
parent->phase2 ? NM_SETTING_802_1X_PHASE2_DOMAIN_SUFFIX_MATCH :
NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH,
- gtk_entry_get_text (GTK_ENTRY (widget)), NULL);
+ gtk_editable_get_text (GTK_EDITABLE (widget)), NULL);
#endif
/* TLS private key */
@@ -398,7 +399,7 @@ eap_method_tls_new (WirelessSecurity *ws_parent,
(GCallback) wireless_security_changed_cb,
ws_parent);
if (s_8021x && nm_setting_802_1x_get_identity (s_8021x))
- gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_802_1x_get_identity (s_8021x));
+ gtk_editable_set_text (GTK_EDITABLE (widget), nm_setting_802_1x_get_identity (s_8021x));
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_tls_domain_entry"));
g_assert (widget);
@@ -408,10 +409,10 @@ eap_method_tls_new (WirelessSecurity *ws_parent,
ws_parent);
if (phase2) {
if (s_8021x && nm_setting_802_1x_get_phase2_domain_suffix_match (s_8021x))
- gtk_entry_set_text (GTK_ENTRY (widget),
nm_setting_802_1x_get_phase2_domain_suffix_match (s_8021x));
+ gtk_editable_set_text (GTK_EDITABLE (widget),
nm_setting_802_1x_get_phase2_domain_suffix_match (s_8021x));
} else {
if (s_8021x && nm_setting_802_1x_get_domain_suffix_match (s_8021x))
- gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_802_1x_get_domain_suffix_match
(s_8021x));
+ gtk_editable_set_text (GTK_EDITABLE (widget),
nm_setting_802_1x_get_domain_suffix_match (s_8021x));
}
#else
gtk_widget_hide (widget);
diff --git a/src/wireless-security/eap-method-ttls.c b/src/wireless-security/eap-method-ttls.c
index c94a9deb..1d589ee7 100644
--- a/src/wireless-security/eap-method-ttls.c
+++ b/src/wireless-security/eap-method-ttls.c
@@ -7,6 +7,7 @@
*/
#include "nm-default.h"
+#include "nma-private.h"
#include <ctype.h>
#include <string.h>
@@ -138,14 +139,14 @@ fill_connection (EAPMethod *parent, NMConnection *connection)
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_anon_identity_entry"));
g_assert (widget);
- text = gtk_entry_get_text (GTK_ENTRY (widget));
+ text = gtk_editable_get_text (GTK_EDITABLE (widget));
if (text && strlen (text))
g_object_set (s_8021x, NM_SETTING_802_1X_ANONYMOUS_IDENTITY, text, NULL);
#if LIBNM_BUILD
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_domain_entry"));
g_assert (widget);
- text = gtk_entry_get_text (GTK_ENTRY (widget));
+ text = gtk_editable_get_text (GTK_EDITABLE (widget));
if (text && strlen (text))
g_object_set (s_8021x, NM_SETTING_802_1X_DOMAIN_SUFFIX_MATCH, text, NULL);
#endif
@@ -487,7 +488,7 @@ eap_method_ttls_new (WirelessSecurity *ws_parent,
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_anon_identity_entry"));
if (s_8021x && nm_setting_802_1x_get_anonymous_identity (s_8021x))
- gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_802_1x_get_anonymous_identity (s_8021x));
+ gtk_editable_set_text (GTK_EDITABLE (widget), nm_setting_802_1x_get_anonymous_identity
(s_8021x));
g_signal_connect (G_OBJECT (widget), "changed",
(GCallback) wireless_security_changed_cb,
ws_parent);
@@ -495,7 +496,7 @@ eap_method_ttls_new (WirelessSecurity *ws_parent,
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_ttls_domain_entry"));
#if LIBNM_BUILD
if (s_8021x && nm_setting_802_1x_get_domain_suffix_match (s_8021x))
- gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_802_1x_get_domain_suffix_match (s_8021x));
+ gtk_editable_set_text (GTK_EDITABLE (widget), nm_setting_802_1x_get_domain_suffix_match
(s_8021x));
g_signal_connect (G_OBJECT (widget), "changed",
(GCallback) wireless_security_changed_cb,
ws_parent);
diff --git a/src/wireless-security/helpers.c b/src/wireless-security/helpers.c
index 5cb86377..31009cb2 100644
--- a/src/wireless-security/helpers.c
+++ b/src/wireless-security/helpers.c
@@ -7,7 +7,7 @@
*/
#include "nm-default.h"
-
+#include "nma-private.h"
#include "helpers.h"
void
@@ -32,7 +32,7 @@ helper_fill_secret_entry (NMConnection *connection,
if (tmp) {
widget = GTK_WIDGET (gtk_builder_get_object (builder, entry_name));
g_assert (widget);
- gtk_entry_set_text (GTK_ENTRY (widget), tmp);
+ gtk_editable_set_text (GTK_EDITABLE (widget), tmp);
}
}
}
diff --git a/src/wireless-security/ws-leap.c b/src/wireless-security/ws-leap.c
index f102fc6a..e400a10a 100644
--- a/src/wireless-security/ws-leap.c
+++ b/src/wireless-security/ws-leap.c
@@ -7,6 +7,7 @@
*/
#include "nm-default.h"
+#include "nma-private.h"
#include <string.h>
@@ -44,7 +45,7 @@ validate (WirelessSecurity *parent, GError **error)
entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "leap_username_entry"));
g_assert (entry);
- text = gtk_entry_get_text (GTK_ENTRY (entry));
+ text = gtk_editable_get_text (GTK_EDITABLE (entry));
if (!text || !strlen (text)) {
widget_set_error (entry);
g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("missing leap-username"));
@@ -56,7 +57,7 @@ validate (WirelessSecurity *parent, GError **error)
g_assert (entry);
secret_flags = nma_utils_menu_to_secret_flags (entry);
- text = gtk_entry_get_text (GTK_ENTRY (entry));
+ text = gtk_editable_get_text (GTK_EDITABLE (entry));
if ( secret_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED
|| secret_flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED
@@ -99,11 +100,11 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection)
nm_connection_add_setting (connection, (NMSetting *) s_wireless_sec);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "leap_username_entry"));
- leap_username = gtk_entry_get_text (GTK_ENTRY (widget));
+ leap_username = gtk_editable_get_text (GTK_EDITABLE (widget));
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "leap_password_entry"));
passwd_entry = widget;
- leap_password = gtk_entry_get_text (GTK_ENTRY (widget));
+ leap_password = gtk_editable_get_text (GTK_EDITABLE (widget));
g_object_set (s_wireless_sec,
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "ieee8021x",
@@ -190,7 +191,7 @@ ws_leap_new (NMConnection *connection, gboolean secrets_only)
(GCallback) wireless_security_changed_cb,
sec);
if (wsec)
- gtk_entry_set_text (GTK_ENTRY (widget), nm_setting_wireless_security_get_leap_username
(wsec));
+ gtk_editable_set_text (GTK_EDITABLE (widget), nm_setting_wireless_security_get_leap_username
(wsec));
if (secrets_only)
gtk_widget_hide (widget);
diff --git a/src/wireless-security/ws-wep-key.c b/src/wireless-security/ws-wep-key.c
index caedfa5f..fc5a4b74 100644
--- a/src/wireless-security/ws-wep-key.c
+++ b/src/wireless-security/ws-wep-key.c
@@ -7,6 +7,7 @@
*/
#include "nm-default.h"
+#include "nma-private.h"
#include <string.h>
@@ -49,7 +50,7 @@ key_index_combo_changed_cb (GtkWidget *combo, WirelessSecurity *parent)
/* Save WEP key for old key index */
entry = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wep_key_entry"));
- key = gtk_entry_get_text (GTK_ENTRY (entry));
+ key = gtk_editable_get_text (GTK_EDITABLE (entry));
if (key)
g_strlcpy (sec->keys[sec->cur_index], key, sizeof (sec->keys[sec->cur_index]));
else
@@ -60,7 +61,7 @@ key_index_combo_changed_cb (GtkWidget *combo, WirelessSecurity *parent)
g_return_if_fail (key_index >= 0);
/* Populate entry with key from new index */
- gtk_entry_set_text (GTK_ENTRY (entry), sec->keys[key_index]);
+ gtk_editable_set_text (GTK_EDITABLE (entry), sec->keys[key_index]);
sec->cur_index = key_index;
wireless_security_changed_cb (combo, parent);
@@ -89,7 +90,7 @@ validate (WirelessSecurity *parent, GError **error)
g_assert (entry);
secret_flags = nma_utils_menu_to_secret_flags (entry);
- key = gtk_entry_get_text (GTK_ENTRY (entry));
+ key = gtk_editable_get_text (GTK_EDITABLE (entry));
if ( secret_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED
|| secret_flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED) {
@@ -166,7 +167,7 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection)
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wep_key_entry"));
passwd_entry = widget;
- key = gtk_entry_get_text (GTK_ENTRY (widget));
+ key = gtk_editable_get_text (GTK_EDITABLE (widget));
g_strlcpy (sec->keys[sec->cur_index], key, sizeof (sec->keys[sec->cur_index]));
/* Blow away the old security setting by adding a clear one */
@@ -217,7 +218,7 @@ update_secrets (WirelessSecurity *parent, NMConnection *connection)
{
WirelessSecurityWEPKey *sec = (WirelessSecurityWEPKey *) parent;
NMSettingWirelessSecurity *s_wsec;
- GtkWidget *widget;
+ GtkEditable *entry;
const char *tmp;
int i;
@@ -228,9 +229,9 @@ update_secrets (WirelessSecurity *parent, NMConnection *connection)
g_strlcpy (sec->keys[i], tmp, sizeof (sec->keys[i]));
}
- widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wep_key_entry"));
+ entry = GTK_EDITABLE (gtk_builder_get_object (parent->builder, "wep_key_entry"));
if (strlen (sec->keys[sec->cur_index]))
- gtk_entry_set_text (GTK_ENTRY (widget), sec->keys[sec->cur_index]);
+ gtk_editable_set_text (entry, sec->keys[sec->cur_index]);
}
WirelessSecurityWEPKey *
@@ -267,7 +268,7 @@ ws_wep_key_new (NMConnection *connection,
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wep_key_entry"));
g_assert (widget);
- gtk_entry_set_width_chars (GTK_ENTRY (widget), 28);
+ gtk_editable_set_width_chars (GTK_EDITABLE (widget), 28);
/* Create password-storage popup menu for password entry under entry's secondary icon */
if (connection)
diff --git a/src/wireless-security/ws-wpa-psk.c b/src/wireless-security/ws-wpa-psk.c
index a7531041..f0801e14 100644
--- a/src/wireless-security/ws-wpa-psk.c
+++ b/src/wireless-security/ws-wpa-psk.c
@@ -7,6 +7,7 @@
*/
#include "nm-default.h"
+#include "nma-private.h"
#include <ctype.h>
#include <string.h>
@@ -51,7 +52,7 @@ validate (WirelessSecurity *parent, GError **error)
g_assert (entry);
secret_flags = nma_utils_menu_to_secret_flags (entry);
- key = gtk_entry_get_text (GTK_ENTRY (entry));
+ key = gtk_editable_get_text (GTK_EDITABLE (entry));
len = key ? strlen (key) : 0;
if ( secret_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED
@@ -115,7 +116,7 @@ fill_connection (WirelessSecurity *parent, NMConnection *connection)
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "wpa_psk_entry"));
passwd_entry = widget;
- key = gtk_entry_get_text (GTK_ENTRY (widget));
+ key = gtk_editable_get_text (GTK_EDITABLE (widget));
g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_PSK, key, NULL);
/* Save PSK_FLAGS to the connection */
@@ -188,7 +189,7 @@ ws_wpa_psk_new (NMConnection *connection, gboolean secrets_only)
g_signal_connect (G_OBJECT (widget), "changed",
(GCallback) wireless_security_changed_cb,
sec);
- gtk_entry_set_width_chars (GTK_ENTRY (widget), 28);
+ gtk_editable_set_width_chars (GTK_EDITABLE (widget), 28);
/* Create password-storage popup menu for password entry under entry's secondary icon */
if (connection)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
