diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2019-09-10 15:51:26 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2019-09-20 15:22:37 +0200 |
| commit | af58de61c24bba3f0160c9a27a89c8ea716abbc9 (patch) | |
| tree | ca50abb7729208bfa38db251c5e8b2e35e6cbe91 | |
| parent | 6d3ad853adb966d8b49e2119fdf9a8563311e431 (diff) | |
| download | network-manager-applet-af58de61c24bba3f0160c9a27a89c8ea716abbc9.tar.gz | |
nma/vpn-password-dialog: deal with the GTK4 gtk_widget_activate_default
Replaces Gtk4's gtk_window_activate_default. This probably deserves a
better solution, but it will have to do for now.
| -rw-r--r-- | src/libnma/nma-private.h | 2 | ||||
| -rw-r--r-- | src/libnma/nma-ui-utils.c | 10 | ||||
| -rw-r--r-- | src/libnma/nma-vpn-password-dialog.c | 2 | ||||
| -rw-r--r-- | src/libnma/nma-vpn-password-dialog.ui | 6 |
4 files changed, 16 insertions, 4 deletions
diff --git a/src/libnma/nma-private.h b/src/libnma/nma-private.h index 32934551..8470fbf3 100644 --- a/src/libnma/nma-private.h +++ b/src/libnma/nma-private.h @@ -14,6 +14,8 @@ #define gtk_editable_set_width_chars(editable, n_chars) gtk_entry_set_width_chars(GTK_ENTRY(editable), (n_chars)) #endif +void nma_gtk_widget_activate_default (GtkWidget *widget); + #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 37939bfe..cca10be8 100644 --- a/src/libnma/nma-ui-utils.c +++ b/src/libnma/nma-ui-utils.c @@ -206,6 +206,16 @@ popup_menu_item_info_register (GtkWidget *item, (GClosureNotify) popup_menu_item_info_destroy, 0); } +void +nma_gtk_widget_activate_default (GtkWidget *widget) +{ +#if GTK_CHECK_VERSION(3,90,0) + gtk_widget_activate_default (widget); +#else + gtk_window_activate_default (GTK_WINDOW (widget)); +#endif +} + static void icon_release_cb (GtkEntry *entry, GtkEntryIconPosition position, diff --git a/src/libnma/nma-vpn-password-dialog.c b/src/libnma/nma-vpn-password-dialog.c index 07e601ca..a6738146 100644 --- a/src/libnma/nma-vpn-password-dialog.c +++ b/src/libnma/nma-vpn-password-dialog.c @@ -83,7 +83,7 @@ nma_vpn_password_dialog_class_init (NMAVpnPasswordDialogClass *klass) gtk_widget_class_bind_template_callback (widget_class, dialog_close_callback); gtk_widget_class_bind_template_callback (widget_class, dialog_show_callback); - gtk_widget_class_bind_template_callback (widget_class, gtk_window_activate_default); + gtk_widget_class_bind_template_callback (widget_class, nma_gtk_widget_activate_default); gtk_widget_class_bind_template_callback (widget_class, show_passwords_toggled_cb); } diff --git a/src/libnma/nma-vpn-password-dialog.ui b/src/libnma/nma-vpn-password-dialog.ui index ca3009dc..4774d2e4 100644 --- a/src/libnma/nma-vpn-password-dialog.ui +++ b/src/libnma/nma-vpn-password-dialog.ui @@ -90,7 +90,7 @@ <property name="can_focus">True</property> <property name="visibility">False</property> <property name="width_chars">20</property> - <signal name="activate" handler="gtk_window_activate_default" swapped="yes"/> + <signal name="activate" handler="nma_gtk_widget_activate_default" swapped="yes"/> </object> <packing> <property name="left_attach">2</property> @@ -103,7 +103,7 @@ <property name="can_focus">True</property> <property name="visibility">False</property> <property name="width_chars">20</property> - <signal name="activate" handler="gtk_window_activate_default" swapped="yes"/> + <signal name="activate" handler="nma_gtk_widget_activate_default" swapped="yes"/> </object> <packing> <property name="left_attach">2</property> @@ -116,7 +116,7 @@ <property name="can_focus">True</property> <property name="visibility">False</property> <property name="width_chars">20</property> - <signal name="activate" handler="gtk_window_activate_default" swapped="yes"/> + <signal name="activate" handler="nma_gtk_widget_activate_default" swapped="yes"/> </object> <packing> <property name="left_attach">2</property> |