[libnma/lr/gtk-4.0: 6/23] all: GtkCheckButton is no longer a GtkToggleButton in Gtk4
- From: Lubomir Rintel <lkundrak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libnma/lr/gtk-4.0: 6/23] all: GtkCheckButton is no longer a GtkToggleButton in Gtk4
- Date: Mon, 25 Oct 2021 13:06:09 +0000 (UTC)
commit 04a10f861cb71019a02be8389fd626c21a2656f4
Author: Lubomir Rintel <lkundrak v3 sk>
Date: Thu Oct 7 11:16:01 2021 +0200
all: GtkCheckButton is no longer a GtkToggleButton in Gtk4
Replace the calls. We provide compatibility calls already.
src/nma-mobile-wizard.c | 22 +++++++++++-----------
src/nma-pkcs11-token-login-dialog.c | 6 ++++--
src/nma-vpn-password-dialog.c | 2 +-
src/nma-ws/nma-eap-fast.c | 4 ++--
src/nma-ws/nma-eap-leap.c | 14 +++++++-------
src/nma-ws/nma-eap-peap.c | 4 ++--
src/nma-ws/nma-eap-simple.c | 24 ++++++++++++------------
src/nma-ws/nma-eap-tls.c | 6 +++---
src/nma-ws/nma-eap-ttls.c | 4 ++--
src/nma-ws/nma-ws-leap.c | 4 ++--
src/nma-ws/nma-ws-sae.c | 4 ++--
src/nma-ws/nma-ws-wep-key.c | 2 +-
src/nma-ws/nma-ws-wpa-psk.c | 4 ++--
13 files changed, 51 insertions(+), 49 deletions(-)
---
diff --git a/src/nma-mobile-wizard.c b/src/nma-mobile-wizard.c
index 3416f849..ec299087 100644
--- a/src/nma-mobile-wizard.c
+++ b/src/nma-mobile-wizard.c
@@ -87,9 +87,9 @@ typedef struct {
GtkTreeStore *providers_store;
GtkTreeModel *providers_sort;
guint32 providers_focus_id;
- GtkToggleButton *providers_view_radio;
+ GtkCheckButton *providers_view_radio;
- GtkToggleButton *provider_unlisted_radio;
+ GtkCheckButton *provider_unlisted_radio;
GtkComboBox *provider_unlisted_type_combo;
gboolean provider_only_cdma;
@@ -533,7 +533,7 @@ get_selected_provider (NMAMobileWizard *self)
GtkTreeIter iter;
NMAMobileProvider *provider = NULL;
- if (!gtk_toggle_button_get_active (priv->providers_view_radio))
+ if (!gtk_check_button_get_active (priv->providers_view_radio))
return NULL;
selection = gtk_tree_view_get_selection (priv->providers_view);
@@ -552,7 +552,7 @@ providers_update_complete (NMAMobileWizard *self)
NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
gboolean use_view;
- use_view = gtk_toggle_button_get_active (priv->providers_view_radio);
+ use_view = gtk_check_button_get_active (priv->providers_view_radio);
if (use_view) {
NMAMobileProvider *provider;
@@ -600,13 +600,13 @@ focus_provider_unlisted_type_combo (gpointer user_data)
}
static void
-providers_radio_toggled (GtkToggleButton *button, gpointer user_data)
+providers_radio_toggled (GtkCheckButton *button, gpointer user_data)
{
NMAMobileWizard *self = user_data;
NMAMobileWizardPrivate *priv = NMA_MOBILE_WIZARD_GET_PRIVATE (self);
gboolean use_view;
- use_view = gtk_toggle_button_get_active (priv->providers_view_radio);
+ use_view = gtk_check_button_get_active (priv->providers_view_radio);
if (use_view) {
if (!priv->providers_focus_id)
priv->providers_focus_id = g_idle_add (focus_providers_view, self);
@@ -742,10 +742,10 @@ providers_prepare (NMAMobileWizard *self)
if (gtk_tree_model_iter_n_children (GTK_TREE_MODEL (priv->providers_store), NULL) == 0) {
/* No providers to choose from. */
- gtk_toggle_button_set_active (priv->provider_unlisted_radio, TRUE);
+ gtk_check_button_set_active (priv->provider_unlisted_radio, TRUE);
gtk_widget_set_sensitive (GTK_WIDGET (priv->providers_view_radio), FALSE);
} else {
- gtk_toggle_button_set_active (priv->providers_view_radio, TRUE);
+ gtk_check_button_set_active (priv->providers_view_radio, TRUE);
gtk_widget_set_sensitive (GTK_WIDGET (priv->providers_view_radio), TRUE);
}
@@ -1312,7 +1312,7 @@ forward_func (gint current_page, gpointer user_data)
/* If the provider is unlisted, we can skip ahead of the user's
* access technology is CDMA.
*/
- if (gtk_toggle_button_get_active (priv->provider_unlisted_radio)) {
+ if (gtk_check_button_get_active (priv->provider_unlisted_radio)) {
if (family == NMA_MOBILE_FAMILY_UNKNOWN)
family = get_provider_unlisted_type (self);
} else {
@@ -1421,9 +1421,9 @@ nma_mobile_wizard_init (NMAMobileWizard *self)
priv->country_page = GTK_WIDGET (gtk_builder_get_object (builder, "country_page"));
priv->country_view = GTK_TREE_VIEW (gtk_builder_get_object (builder, "country_view"));
priv->providers_page = GTK_WIDGET (gtk_builder_get_object (builder, "providers_page"));
- priv->providers_view_radio = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder,
"providers_view_radio"));
+ priv->providers_view_radio = GTK_CHECK_BUTTON (gtk_builder_get_object (builder,
"providers_view_radio"));
priv->providers_view = GTK_TREE_VIEW (gtk_builder_get_object (builder, "providers_view"));
- priv->provider_unlisted_radio = GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder,
"provider_unlisted_radio"));
+ priv->provider_unlisted_radio = GTK_CHECK_BUTTON (gtk_builder_get_object (builder,
"provider_unlisted_radio"));
priv->provider_unlisted_type_combo = GTK_COMBO_BOX (gtk_builder_get_object (builder,
"provider_unlisted_type_combo"));
priv->plan_page = GTK_WIDGET (gtk_builder_get_object (builder, "plan_page"));
priv->plan_combo = GTK_COMBO_BOX (gtk_builder_get_object (builder, "plan_combo"));
diff --git a/src/nma-pkcs11-token-login-dialog.c b/src/nma-pkcs11-token-login-dialog.c
index 606c296c..46b338bc 100644
--- a/src/nma-pkcs11-token-login-dialog.c
+++ b/src/nma-pkcs11-token-login-dialog.c
@@ -3,10 +3,12 @@
*
* Lubomir Rintel <lkundrak v3 sk>
*
- * Copyright (C) 2016,2017 Red Hat, Inc.
+ * Copyright (C) 2016 - 2021 Red Hat, Inc.
*/
#include "nm-default.h"
+#include "nma-private.h"
+
#include "nma-pkcs11-token-login-dialog.h"
#include <gck/gck.h>
@@ -86,7 +88,7 @@ nma_pkcs11_token_login_dialog_get_remember_pin (NMAPkcs11TokenLoginDialog *self)
{
NMAPkcs11TokenLoginDialogPrivate *priv = self->priv;
- return gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->remember));
+ return gtk_check_button_get_active (GTK_CHECK_BUTTON (priv->remember));
}
static void
diff --git a/src/nma-vpn-password-dialog.c b/src/nma-vpn-password-dialog.c
index dd85db1c..87377052 100644
--- a/src/nma-vpn-password-dialog.c
+++ b/src/nma-vpn-password-dialog.c
@@ -56,7 +56,7 @@ show_passwords_toggled_cb (GtkWidget *widget, gpointer user_data)
NMAVpnPasswordDialogPrivate *priv = NMA_VPN_PASSWORD_DIALOG_GET_PRIVATE (dialog);
gboolean visible;
- visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
+ visible = gtk_check_button_get_active (GTK_CHECK_BUTTON (widget));
gtk_entry_set_visibility (GTK_ENTRY (priv->password_entry), visible);
gtk_entry_set_visibility (GTK_ENTRY (priv->password_entry_secondary), visible);
diff --git a/src/nma-ws/nma-eap-fast.c b/src/nma-ws/nma-eap-fast.c
index d35c2ce0..d2cbee11 100644
--- a/src/nma-ws/nma-eap-fast.c
+++ b/src/nma-ws/nma-eap-fast.c
@@ -305,7 +305,7 @@ pac_toggled_cb (GtkWidget *widget, gpointer user_data)
provision_combo = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_fast_pac_provision_combo"));
g_return_if_fail (provision_combo);
- enabled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
+ enabled = gtk_check_button_get_active (GTK_CHECK_BUTTON (widget));
gtk_widget_set_sensitive (provision_combo, enabled);
@@ -424,7 +424,7 @@ nma_eap_fast_new (NMAWs8021x *ws_8021x,
ws_8021x);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_pac_provision_checkbutton"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), provisioning_enabled);
+ gtk_check_button_set_active (GTK_CHECK_BUTTON (widget), provisioning_enabled);
g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (pac_toggled_cb), parent);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "eap_fast_anon_identity_entry"));
diff --git a/src/nma-ws/nma-eap-leap.c b/src/nma-ws/nma-eap-leap.c
index d0929efc..4a577f0d 100644
--- a/src/nma-ws/nma-eap-leap.c
+++ b/src/nma-ws/nma-eap-leap.c
@@ -2,7 +2,7 @@
/*
* Dan Williams <dcbw redhat com>
*
- * Copyright 2007 - 2019 Red Hat, Inc.
+ * Copyright (C) 2007 - 2021 Red Hat, Inc.
*/
#include "nm-default.h"
@@ -30,15 +30,15 @@ struct _NMAEapLeap {
const char *password_flags_name;
GtkEntry *username_entry;
GtkEntry *password_entry;
- GtkToggleButton *show_password;
+ GtkCheckButton *show_password;
};
static void
-show_toggled_cb (GtkToggleButton *button, NMAEapLeap *method)
+show_toggled_cb (GtkCheckButton *button, NMAEapLeap *method)
{
gboolean visible;
- visible = gtk_toggle_button_get_active (button);
+ visible = gtk_check_button_get_active (button);
gtk_entry_set_visibility (method->password_entry, visible);
}
@@ -144,7 +144,7 @@ set_userpass_ui (NMAEapLeap *method)
gtk_editable_set_text (GTK_EDITABLE (method->password_entry), "");
}
- gtk_toggle_button_set_active (method->show_password, method->ws_8021x->show_password);
+ gtk_check_button_set_active (method->show_password, method->ws_8021x->show_password);
}
static void
@@ -160,7 +160,7 @@ widgets_unrealized (GtkWidget *widget, NMAEapLeap *method)
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));
+ gtk_check_button_get_active (method->show_password));
}
static void
@@ -240,7 +240,7 @@ nma_eap_leap_new (NMAWs8021x *ws_8021x,
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_eapleap"));
g_assert (widget);
- method->show_password = GTK_TOGGLE_BUTTON (widget);
+ method->show_password = GTK_CHECK_BUTTON (widget);
g_signal_connect (G_OBJECT (widget), "toggled",
(GCallback) show_toggled_cb,
parent);
diff --git a/src/nma-ws/nma-eap-peap.c b/src/nma-ws/nma-eap-peap.c
index 4d5cc644..831abf91 100644
--- a/src/nma-ws/nma-eap-peap.c
+++ b/src/nma-ws/nma-eap-peap.c
@@ -72,7 +72,7 @@ ca_cert_not_required_toggled (GtkWidget *button, gpointer user_data)
NMAEapPeap *method = (NMAEapPeap *) user_data;
gtk_widget_set_sensitive (method->ca_cert_chooser,
- !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)));
+ !gtk_check_button_get_active (GTK_CHECK_BUTTON (button)));
}
static void
@@ -421,7 +421,7 @@ nma_eap_peap_new (NMAWs8021x *ws_8021x,
g_signal_connect (G_OBJECT (widget), "toggled",
(GCallback) nma_ws_changed_cb,
ws_8021x);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), ca_not_required);
+ gtk_check_button_set_active (GTK_CHECK_BUTTON (widget), ca_not_required);
widget = inner_auth_combo_init (method, connection, s_8021x, secrets_only);
inner_auth_combo_changed_cb (widget, (gpointer) method);
diff --git a/src/nma-ws/nma-eap-simple.c b/src/nma-ws/nma-eap-simple.c
index a26f6bda..fb0bae11 100644
--- a/src/nma-ws/nma-eap-simple.c
+++ b/src/nma-ws/nma-eap-simple.c
@@ -2,7 +2,7 @@
/*
* Dan Williams <dcbw redhat com>
*
- * Copyright 2007 - 2019 Red Hat, Inc.
+ * Copyright (C) 2007 - 2021 Red Hat, Inc.
*/
#include "nm-default.h"
@@ -34,27 +34,27 @@ struct _NMAEapSimple {
gboolean pkey_passphrase_requested;
GtkEntry *username_entry;
GtkEntry *password_entry;
- GtkToggleButton *show_password;
+ GtkCheckButton *show_password;
GtkEntry *pkey_passphrase_entry;
- GtkToggleButton *show_pkey_passphrase;
+ GtkCheckButton *show_pkey_passphrase;
guint idle_func_id;
};
static void
-show_password_toggled_cb (GtkToggleButton *button, NMAEapSimple *method)
+show_password_toggled_cb (GtkCheckButton *button, NMAEapSimple *method)
{
gboolean visible;
- visible = gtk_toggle_button_get_active (button);
+ visible = gtk_check_button_get_active (button);
gtk_entry_set_visibility (method->password_entry, visible);
}
static void
-show_pkey_passphrase_toggled_cb (GtkToggleButton *button, NMAEapSimple *method)
+show_pkey_passphrase_toggled_cb (GtkCheckButton *button, NMAEapSimple *method)
{
gboolean visible;
- visible = gtk_toggle_button_get_active (button);
+ visible = gtk_check_button_get_active (button);
gtk_entry_set_visibility (method->pkey_passphrase_entry, visible);
}
@@ -271,7 +271,7 @@ password_storage_changed (GObject *entry,
if (always_ask && !secrets_only) {
/* we always clear this button and do not restore it
* (because we want to hide the password). */
- gtk_toggle_button_set_active (method->show_password, FALSE);
+ gtk_check_button_set_active (method->show_password, FALSE);
}
gtk_widget_set_sensitive (GTK_WIDGET (method->show_password),
@@ -300,7 +300,7 @@ set_userpass_ui (NMAEapSimple *method)
gtk_editable_set_text (GTK_EDITABLE (method->password_entry), "");
}
- gtk_toggle_button_set_active (method->show_password, method->ws_8021x->show_password);
+ gtk_check_button_set_active (method->show_password, method->ws_8021x->show_password);
password_storage_changed (NULL, NULL, method);
}
@@ -318,7 +318,7 @@ widgets_unrealized (GtkWidget *widget, NMAEapSimple *method)
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));
+ gtk_check_button_get_active (method->show_password));
}
static void
@@ -437,7 +437,7 @@ nma_eap_simple_new (NMAWs8021x *ws_8021x,
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder, "show_checkbutton_eapsimple"));
g_assert (widget);
- method->show_password = GTK_TOGGLE_BUTTON (widget);
+ method->show_password = GTK_CHECK_BUTTON (widget);
g_signal_connect (G_OBJECT (widget), "toggled",
(GCallback) show_password_toggled_cb,
method);
@@ -451,7 +451,7 @@ nma_eap_simple_new (NMAWs8021x *ws_8021x,
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_simple_show_pkey_passphrase_checkbutton"));
g_assert (widget);
- method->show_pkey_passphrase = GTK_TOGGLE_BUTTON (widget);
+ method->show_pkey_passphrase = GTK_CHECK_BUTTON (widget);
g_signal_connect (G_OBJECT (widget), "toggled",
(GCallback) show_pkey_passphrase_toggled_cb,
method);
diff --git a/src/nma-ws/nma-eap-tls.c b/src/nma-ws/nma-eap-tls.c
index 5f671fab..4d47718a 100644
--- a/src/nma-ws/nma-eap-tls.c
+++ b/src/nma-ws/nma-eap-tls.c
@@ -3,7 +3,7 @@
* Dan Williams <dcbw redhat com>
* Lubomir Rintel <lkundrak v3 sk>
*
- * Copyright 2007 - 2019 Red Hat, Inc.
+ * Copyright (C) 2007 - 2021 Red Hat, Inc.
*/
#include "nm-default.h"
@@ -66,7 +66,7 @@ ca_cert_not_required_toggled (GtkWidget *button, gpointer user_data)
NMAEapTls *method = (NMAEapTls *) user_data;
gtk_widget_set_sensitive (method->ca_cert_chooser,
- !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)));
+ !gtk_check_button_get_active (GTK_CHECK_BUTTON (button)));
}
static void
@@ -480,7 +480,7 @@ nma_eap_tls_new (NMAWs8021x *ws_8021x,
phase2 ? nm_setting_802_1x_get_phase2_private_key_password :
nm_setting_802_1x_get_private_key_password);
widget = GTK_WIDGET (gtk_builder_get_object (parent->builder,
"eap_tls_ca_cert_not_required_checkbox"));
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), ca_not_required);
+ gtk_check_button_set_active (GTK_CHECK_BUTTON (widget), ca_not_required);
/* Create password-storage popup menus for password entries under their secondary icon */
nma_cert_chooser_setup_cert_password_storage (NMA_CERT_CHOOSER (method->ca_cert_chooser),
diff --git a/src/nma-ws/nma-eap-ttls.c b/src/nma-ws/nma-eap-ttls.c
index 859955b3..06b808bc 100644
--- a/src/nma-ws/nma-eap-ttls.c
+++ b/src/nma-ws/nma-eap-ttls.c
@@ -73,7 +73,7 @@ ca_cert_not_required_toggled (GtkWidget *button, gpointer user_data)
NMAEapTtls *method = (NMAEapTtls *) user_data;
gtk_widget_set_sensitive (method->ca_cert_chooser,
- !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)));
+ !gtk_check_button_get_active (GTK_CHECK_BUTTON (button)));
}
static void
@@ -474,7 +474,7 @@ nma_eap_ttls_new (NMAWs8021x *ws_8021x,
g_signal_connect (G_OBJECT (widget), "toggled",
(GCallback) nma_ws_changed_cb,
ws_8021x);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), ca_not_required);
+ gtk_check_button_set_active (GTK_CHECK_BUTTON (widget), ca_not_required);
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))
diff --git a/src/nma-ws/nma-ws-leap.c b/src/nma-ws/nma-ws-leap.c
index df6d2dde..a919e7e1 100644
--- a/src/nma-ws/nma-ws-leap.c
+++ b/src/nma-ws/nma-ws-leap.c
@@ -2,7 +2,7 @@
/*
* Dan Williams <dcbw redhat com>
*
- * Copyright 2007 - 2019 Red Hat, Inc.
+ * Copyright (C) 2007 - 2021 Red Hat, Inc.
*/
#include "nm-default.h"
@@ -53,7 +53,7 @@ show_toggled_cb (GtkCheckButton *button, gpointer user_data)
NMAWsLeap *self = NMA_WS_LEAP (user_data);
gboolean visible;
- visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+ visible = gtk_check_button_get_active (GTK_CHECK_BUTTON (button));
gtk_entry_set_visibility (GTK_ENTRY (self->leap_password_entry), visible);
}
diff --git a/src/nma-ws/nma-ws-sae.c b/src/nma-ws/nma-ws-sae.c
index 00fb6ff5..0d309297 100644
--- a/src/nma-ws/nma-ws-sae.c
+++ b/src/nma-ws/nma-ws-sae.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * Copyright 2007 - 2019 Red Hat, Inc.
+ * Copyright (C) 2007 - 2021 Red Hat, Inc.
*/
#include "nm-default.h"
@@ -51,7 +51,7 @@ show_toggled_cb (GtkCheckButton *button, gpointer user_data)
NMAWsSae *self = NMA_WS_SAE (user_data);
gboolean visible;
- visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+ visible = gtk_check_button_get_active (GTK_CHECK_BUTTON (button));
gtk_entry_set_visibility (GTK_ENTRY (self->psk_entry), visible);
}
diff --git a/src/nma-ws/nma-ws-wep-key.c b/src/nma-ws/nma-ws-wep-key.c
index 911dcd2b..380e8994 100644
--- a/src/nma-ws/nma-ws-wep-key.c
+++ b/src/nma-ws/nma-ws-wep-key.c
@@ -60,7 +60,7 @@ show_toggled_cb (GtkCheckButton *button, gpointer user_data)
NMAWsWepKey *self = NMA_WS_WEP_KEY (user_data);
gboolean visible;
- visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+ visible = gtk_check_button_get_active (GTK_CHECK_BUTTON (button));
gtk_entry_set_visibility (GTK_ENTRY (self->wep_key_entry), visible);
}
diff --git a/src/nma-ws/nma-ws-wpa-psk.c b/src/nma-ws/nma-ws-wpa-psk.c
index 27604960..477aca12 100644
--- a/src/nma-ws/nma-ws-wpa-psk.c
+++ b/src/nma-ws/nma-ws-wpa-psk.c
@@ -2,7 +2,7 @@
/*
* Dan Williams <dcbw redhat com>
*
- * Copyright 2007 - 2019 Red Hat, Inc.
+ * Copyright (C) 2007 - 2021 Red Hat, Inc.
*/
#include "nm-default.h"
@@ -55,7 +55,7 @@ show_toggled_cb (GtkCheckButton *button, gpointer user_data)
NMAWsWpaPsk *self = NMA_WS_WPA_PSK (user_data);
gboolean visible;
- visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button));
+ visible = gtk_check_button_get_active (GTK_CHECK_BUTTON (button));
gtk_entry_set_visibility (GTK_ENTRY (self->wpa_psk_entry), visible);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]