From: Tobias Brunner Date: Wed, 20 Apr 2022 12:19:54 +0000 (+0200) Subject: nm: Add support for GTK4 X-Git-Tag: 5.9.7dr1~3^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=790e0b1cd44c73f16432bc6c68361b8c3595ccfd;p=thirdparty%2Fstrongswan.git nm: Add support for GTK4 --- diff --git a/src/frontends/gnome/.gitignore b/src/frontends/gnome/.gitignore index 67309cafb6..82fd10c9eb 100644 --- a/src/frontends/gnome/.gitignore +++ b/src/frontends/gnome/.gitignore @@ -12,4 +12,6 @@ config.sub.cdbs-orig NetworkManager-strongswan.metainfo.xml NetworkManager-strongswan.pot properties/nm-strongswan-resources.c -properties/nm-strongswan-resources.h \ No newline at end of file +properties/nm-strongswan-resources.h +properties/gtk4/nm-strongswan-dialog.ui +properties/gtk4/nm-strongswan-resources.c diff --git a/src/frontends/gnome/configure.ac b/src/frontends/gnome/configure.ac index 7684f8a085..715ffb3805 100644 --- a/src/frontends/gnome/configure.ac +++ b/src/frontends/gnome/configure.ac @@ -70,12 +70,24 @@ AC_ARG_ENABLE( [nm-absolute-paths], AS_HELP_STRING([--enable-nm-absolute-paths],[use absolute paths for NM plugins in the .name file]) ) +AC_ARG_WITH( + [gtk4], + AS_HELP_STRING([--with-gtk4], [build NetworkManager-strongswan with libnma-gtk4 support]), + [], [with_gtk4=no] +) + +AM_CONDITIONAL(WITH_GTK4, test "$with_gtk4" != no) PKG_CHECK_MODULES(LIBNM, libnm >= 1.1.0) LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MIN_REQUIRED=NM_VERSION_1_2" LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2" PKG_CHECK_MODULES(LIBNMA, libnma >= 1.1.0) +if test x"$with_gtk4" != xno; then + PKG_CHECK_MODULES(GTK4, gtk4 >= 4.0) + PKG_CHECK_MODULES(LIBNMA_GTK4, libnma-gtk4 >= 1.8.33) +fi + if test -z "$nm_libexecdir"; then nm_libexecdir=$($PKG_CONFIG --variable=exec_prefix libnm)/lib/NetworkManager fi diff --git a/src/frontends/gnome/po/POTFILES.skip b/src/frontends/gnome/po/POTFILES.skip new file mode 100644 index 0000000000..ba7da4ed65 --- /dev/null +++ b/src/frontends/gnome/po/POTFILES.skip @@ -0,0 +1 @@ +properties/gtk4/nm-strongswan-dialog.ui diff --git a/src/frontends/gnome/properties/Makefile.am b/src/frontends/gnome/properties/Makefile.am index 5c69452225..28af9f569d 100644 --- a/src/frontends/gnome/properties/Makefile.am +++ b/src/frontends/gnome/properties/Makefile.am @@ -2,6 +2,11 @@ nm_plugin_LTLIBRARIES = \ libnm-vpn-plugin-strongswan.la \ libnm-vpn-plugin-strongswan-editor.la +if WITH_GTK4 +nm_plugin_LTLIBRARIES += \ + libnm-gtk4-vpn-plugin-strongswan-editor.la +endif + nm-strongswan-resources.h: nm-strongswan-dialog.gresource.xml $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) \ --generate-header --internal @@ -10,6 +15,16 @@ nm-strongswan-resources.c: nm-strongswan-dialog.gresource.xml $(shell $(GLIB_COM $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(srcdir) \ --generate-source --internal +gtk4/nm-strongswan-resources.c: nm-strongswan-dialog.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/nm-strongswan-dialog.gresource.xml|sed "s,^$(srcdir)/,$(builddir)/gtk4/,") + @mkdir -p $(builddir)/gtk4 + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ \ + --sourcedir=$(srcdir)/gtk4 --sourcedir=$(builddir)/gtk4 \ + --generate-source --internal + +gtk4/%.ui: %.ui + @mkdir -p $(builddir)/gtk4 + gtk4-builder-tool simplify --3to4 $< | grep -v 'border-width\|can-default\|has-default' >$@ + libnm_vpn_plugin_strongswan_la_SOURCES = \ nm-strongswan-plugin.c \ nm-strongswan-plugin.h @@ -22,6 +37,13 @@ libnm_vpn_plugin_strongswan_editor_la_SOURCES = \ nm-strongswan.c \ nm-strongswan.h +nodist_libnm_gtk4_vpn_plugin_strongswan_editor_la_SOURCES = \ + gtk4/nm-strongswan-resources.c \ + nm-strongswan-resources.h + +libnm_gtk4_vpn_plugin_strongswan_editor_la_SOURCES = \ + $(libnm_vpn_plugin_strongswan_editor_la_SOURCES) + common_CFLAGS = \ -DG_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED @@ -36,6 +58,12 @@ libnm_vpn_plugin_strongswan_editor_la_CFLAGS = \ $(LIBNMA_CFLAGS) \ $(common_CFLAGS) +libnm_gtk4_vpn_plugin_strongswan_editor_la_CFLAGS = \ + $(GTK4_CFLAGS) \ + $(LIBNM_CFLAGS) \ + $(LIBNMA_GTK4_CFLAGS) \ + $(common_CFLAGS) + libnm_vpn_plugin_strongswan_la_LIBADD = \ $(LIBNM_LIBS) \ $(DL_LIBS) @@ -45,19 +73,34 @@ libnm_vpn_plugin_strongswan_editor_la_LIBADD = \ $(LIBNMA_LIBS) \ $(LIBNM_LIBS) +libnm_gtk4_vpn_plugin_strongswan_editor_la_LIBADD = \ + $(GTK4_LIBS) \ + $(LIBNMA_GTK4_LIBS) \ + $(LIBNM_LIBS) + libnm_vpn_plugin_strongswan_la_LDFLAGS = \ -avoid-version libnm_vpn_plugin_strongswan_editor_la_LDFLAGS = \ -avoid-version +libnm_gtk4_vpn_plugin_strongswan_editor_la_LDFLAGS = \ + -avoid-version + BUILT_SOURCES = \ nm-strongswan-resources.c \ nm-strongswan-resources.h +if WITH_GTK4 +BUILT_SOURCES += \ + gtk4/nm-strongswan-resources.c +endif + CLEANFILES = \ nm-strongswan-resources.c \ - nm-strongswan-resources.h + nm-strongswan-resources.h \ + gtk4/nm-strongswan-resources.c \ + gtk4/nm-strongswan-dialog.ui EXTRA_DIST = \ nm-strongswan-dialog.ui \ diff --git a/src/frontends/gnome/properties/nm-strongswan-plugin.c b/src/frontends/gnome/properties/nm-strongswan-plugin.c index 611eb4b86a..57320088e0 100644 --- a/src/frontends/gnome/properties/nm-strongswan-plugin.c +++ b/src/frontends/gnome/properties/nm-strongswan-plugin.c @@ -36,7 +36,8 @@ #define STRONGSWAN_PLUGIN_NAME _("IPsec/IKEv2 (strongswan)") #define STRONGSWAN_PLUGIN_DESC _("IPsec with the IKEv2 key exchange protocol.") #define STRONGSWAN_PLUGIN_SERVICE "org.freedesktop.NetworkManager.strongswan" -#define STRONGSWAN_EDITOR_FILE "libnm-vpn-plugin-strongswan-editor.so" +#define STRONGSWAN_EDITOR_GTK3 "libnm-vpn-plugin-strongswan-editor.so" +#define STRONGSWAN_EDITOR_GTK4 "libnm-gtk4-vpn-plugin-strongswan-editor.so" #define STRONGSWAN_EDITOR_FACTORY "strongswan_editor_new" /************** plugin class **************/ @@ -60,13 +61,30 @@ get_editor (NMVpnEditorPlugin *iface, NMConnection *connection, GError **error) static struct { NMVpnEditor *(*factory)(NMConnection*, GError**); void *dl_module; + char *file; } cache = {}; NMVpnEditor *editor; + char *file; g_return_val_if_fail (NM_IS_CONNECTION (connection), NULL); g_return_val_if_fail (!error || !*error, NULL); - if (!cache.factory) + /* check for a GTK3-only symbol to decide which editor to load */ + if (dlsym(RTLD_DEFAULT, "gtk_container_add")) + { + file = STRONGSWAN_EDITOR_GTK3; + } + else + { + + file = STRONGSWAN_EDITOR_GTK4; + } + + if (cache.factory) + { /* we can't switch GTK versions */ + g_return_val_if_fail (cache.file && !strcmp(cache.file, file), NULL); + } + else { Dl_info plugin_info; void *dl_module; @@ -81,7 +99,7 @@ get_editor (NMVpnEditorPlugin *iface, NMConnection *connection, GError **error) return NULL; } dirname = g_path_get_dirname (plugin_info.dli_fname); - module_path = g_build_filename (dirname, STRONGSWAN_EDITOR_FILE, NULL); + module_path = g_build_filename (dirname, file, NULL); g_free(dirname); dl_module = dlopen(module_path, RTLD_LAZY | RTLD_LOCAL); @@ -112,6 +130,7 @@ get_editor (NMVpnEditorPlugin *iface, NMConnection *connection, GError **error) } cache.factory = factory; cache.dl_module = dl_module; + cache.file = strdup(file); } editor = cache.factory (connection, error); diff --git a/src/frontends/gnome/properties/nm-strongswan.c b/src/frontends/gnome/properties/nm-strongswan.c index 2976f87d35..ed706c498f 100644 --- a/src/frontends/gnome/properties/nm-strongswan.c +++ b/src/frontends/gnome/properties/nm-strongswan.c @@ -36,6 +36,21 @@ #define NM_DBUS_PATH_STRONGSWAN "/org/freedesktop/NetworkManager/strongswan" #define STRONGSWAN_UI_RESOURCE NM_DBUS_PATH_STRONGSWAN "/nm-strongswan-dialog.ui" +#if !GTK_CHECK_VERSION(4,0,0) +typedef void GtkRoot; +#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_check_button_get_active(button) gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)) +#define gtk_check_button_set_active(button, active) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), active) +#define gtk_widget_get_root(widget) gtk_widget_get_toplevel(widget) +#define gtk_window_set_hide_on_close(window, hide) \ + G_STMT_START { \ + G_STATIC_ASSERT (hide); \ + g_signal_connect_swapped (G_OBJECT (window), "delete-event", \ + G_CALLBACK (gtk_widget_hide_on_delete), window); \ + } G_STMT_END +#endif + /************** UI widget class **************/ static void strongswan_plugin_ui_widget_interface_init (NMVpnEditorInterface *iface_class); @@ -95,7 +110,7 @@ check_validity (StrongswanPluginUiWidget *self, GError **error) char *str; widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "address-entry")); - str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); + str = (char *) gtk_editable_get_text (GTK_EDITABLE (widget)); if (!str || !strlen (str)) { g_set_error (error, STRONGSWAN_PLUGIN_UI_ERROR, @@ -113,7 +128,7 @@ check_validity (StrongswanPluginUiWidget *self, GError **error) { case NM_SETTING_SECRET_FLAG_NONE: case NM_SETTING_SECRET_FLAG_AGENT_OWNED: - str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); + str = (char *) gtk_editable_get_text (GTK_EDITABLE (widget)); if (str && strlen (str) < 20) { g_set_error (error, STRONGSWAN_PLUGIN_UI_ERROR, @@ -222,7 +237,7 @@ show_toggled_cb (GtkCheckButton *button, StrongswanPluginUiWidget *self) GtkWidget *widget; gboolean visible; - visible = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)); + visible = gtk_check_button_get_active (GTK_CHECK_BUTTON (button)); widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "passwd-entry")); gtk_entry_set_visibility (GTK_ENTRY (widget), visible); @@ -232,7 +247,7 @@ static void toggle_proposal_cb(GtkCheckButton *button, StrongswanPluginUiWidget *self) { StrongswanPluginUiWidgetPrivate *priv = STRONGSWAN_PLUGIN_UI_WIDGET_GET_PRIVATE (self); - gboolean visible = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)); + gboolean visible = gtk_check_button_get_active(GTK_CHECK_BUTTON(button)); gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(priv->builder, "ike-entry")), visible); gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(priv->builder, "esp-entry")), visible); } @@ -281,9 +296,9 @@ chooser_response_cb (GtkDialog *chooser, gint response_id, gpointer user_data) static void chooser_show_cb (GtkWidget *parent, GtkWidget *widget) { - GtkWidget *root; + GtkRoot *root; - root = gtk_widget_get_toplevel (parent); + root = gtk_widget_get_root (parent); g_return_if_fail (GTK_IS_WINDOW (root)); gtk_window_set_transient_for (GTK_WINDOW (widget), GTK_WINDOW (root)); @@ -320,7 +335,7 @@ init_password_icon (StrongswanPluginUiWidget *self, NMSettingVpn *settings, nm_setting_get_secret_flags (NM_SETTING (settings), secret_key, &pw_flags, NULL); } - value = gtk_entry_get_text (GTK_ENTRY (entry)); + value = gtk_editable_get_text (GTK_EDITABLE (entry)); if ((!value || !*value) && (pw_flags == NM_SETTING_SECRET_FLAG_NONE)) { nma_utils_update_password_storage (entry, NM_SETTING_SECRET_FLAG_NOT_SAVED, @@ -342,8 +357,7 @@ init_chooser (GtkBuilder *builder, NMSettingVpn *settings, const char *setting, widget = GTK_WIDGET (gtk_builder_get_object (builder, chooser)); label = GTK_LABEL (gtk_builder_get_object (builder, label_name)); - g_signal_connect_swapped (G_OBJECT (widget), "delete-event", - G_CALLBACK (gtk_widget_hide_on_delete), widget); + gtk_window_set_hide_on_close (GTK_WINDOW(widget), TRUE); value = nm_setting_vpn_get_data_item (settings, setting); if (value) { @@ -373,7 +387,7 @@ init_plugin_ui (StrongswanPluginUiWidget *self, NMConnection *connection, GError widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "address-entry")); value = nm_setting_vpn_get_data_item (settings, "address"); if (value) - gtk_entry_set_text (GTK_ENTRY (widget), value); + gtk_editable_set_text (GTK_EDITABLE (widget), value); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (settings_changed_cb), self); init_chooser (priv->builder, settings, "certificate", "certificate-chooser", @@ -382,13 +396,13 @@ init_plugin_ui (StrongswanPluginUiWidget *self, NMConnection *connection, GError widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "remote-identity-entry")); value = nm_setting_vpn_get_data_item (settings, "remote-identity"); if (value) - gtk_entry_set_text (GTK_ENTRY (widget), value); + gtk_editable_set_text (GTK_EDITABLE (widget), value); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (settings_changed_cb), self); widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "server-port-entry")); value = nm_setting_vpn_get_data_item (settings, "server-port"); if (value) - gtk_entry_set_text (GTK_ENTRY (widget), value); + gtk_editable_set_text (GTK_EDITABLE (widget), value); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (settings_changed_cb), self); widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "local-identity-entry")); @@ -397,14 +411,14 @@ init_plugin_ui (StrongswanPluginUiWidget *self, NMConnection *connection, GError if (!value && method && g_strcmp0 (method, "psk") == 0) value = nm_setting_vpn_get_data_item (settings, "user"); if (value) - gtk_entry_set_text (GTK_ENTRY (widget), value); + gtk_editable_set_text (GTK_EDITABLE (widget), value); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (settings_changed_cb), self); widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "user-entry")); value = nm_setting_vpn_get_data_item (settings, "user"); /* PSK auth now uses local identity, see above */ if (value && method && g_strcmp0 (method, "psk") != 0) - gtk_entry_set_text (GTK_ENTRY (widget), value); + gtk_editable_set_text (GTK_EDITABLE (widget), value); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (settings_changed_cb), self); widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "passwd-show")); @@ -412,7 +426,7 @@ init_plugin_ui (StrongswanPluginUiWidget *self, NMConnection *connection, GError widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "passwd-entry")); value = nm_setting_vpn_get_secret (settings, "password"); if (value) - gtk_entry_set_text (GTK_ENTRY (widget), value); + gtk_editable_set_text (GTK_EDITABLE (widget), value); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (settings_changed_cb), self); init_password_icon (self, settings, "password", "passwd-entry"); @@ -483,7 +497,7 @@ init_plugin_ui (StrongswanPluginUiWidget *self, NMConnection *connection, GError value = nm_setting_vpn_get_data_item (settings, "virtual"); if (value && strcmp(value, "yes") == 0) { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + gtk_check_button_set_active(GTK_CHECK_BUTTON(widget), TRUE); } g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (settings_changed_cb), self); @@ -491,7 +505,7 @@ init_plugin_ui (StrongswanPluginUiWidget *self, NMConnection *connection, GError value = nm_setting_vpn_get_data_item (settings, "encap"); if (value && strcmp(value, "yes") == 0) { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + gtk_check_button_set_active(GTK_CHECK_BUTTON(widget), TRUE); } g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (settings_changed_cb), self); @@ -499,14 +513,14 @@ init_plugin_ui (StrongswanPluginUiWidget *self, NMConnection *connection, GError value = nm_setting_vpn_get_data_item (settings, "ipcomp"); if (value && strcmp(value, "yes") == 0) { - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + gtk_check_button_set_active(GTK_CHECK_BUTTON(widget), TRUE); } g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (settings_changed_cb), self); widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "proposal-check")); value = nm_setting_vpn_get_data_item(settings, "proposal"); if (value && strcmp(value, "yes") == 0) - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); + gtk_check_button_set_active(GTK_CHECK_BUTTON(widget), TRUE); else toggle_proposal_cb(GTK_CHECK_BUTTON(widget), self); g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (toggle_proposal_cb), self); @@ -516,7 +530,7 @@ init_plugin_ui (StrongswanPluginUiWidget *self, NMConnection *connection, GError if (value) { value = g_strdelimit (g_strdup (value), ";", ','); - gtk_entry_set_text (GTK_ENTRY (widget), value); + gtk_editable_set_text (GTK_EDITABLE (widget), value); g_free ((char*)value); } g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (settings_changed_cb), self); @@ -526,7 +540,7 @@ init_plugin_ui (StrongswanPluginUiWidget *self, NMConnection *connection, GError if (value) { value = g_strdelimit (g_strdup (value), ";", ','); - gtk_entry_set_text (GTK_ENTRY (widget), value); + gtk_editable_set_text (GTK_EDITABLE (widget), value); g_free ((char*)value); } g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (settings_changed_cb), self); @@ -560,7 +574,7 @@ save_password_and_flags (NMSettingVpn *settings, GtkBuilder *builder, case NM_SETTING_SECRET_FLAG_NONE: /* FALL */ case NM_SETTING_SECRET_FLAG_AGENT_OWNED: - password = gtk_entry_get_text (GTK_ENTRY (entry)); + password = gtk_editable_get_text (GTK_EDITABLE (entry)); if (password && strlen (password)) { nm_setting_vpn_add_secret (settings, secret_key, password); @@ -602,7 +616,7 @@ save_entry (NMSettingVpn *settings, GtkBuilder *builder, const char *str; entry = GTK_WIDGET (gtk_builder_get_object (builder, name)); - str = (char *) gtk_entry_get_text (GTK_ENTRY (entry)); + str = (char *) gtk_editable_get_text (GTK_EDITABLE (entry)); if (str && strlen (str)) { nm_setting_vpn_add_data_item (settings, key, str); } @@ -696,23 +710,23 @@ update_connection (NMVpnEditor *iface, nm_setting_vpn_add_data_item (settings, "method", str); widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "virtual-check")); - active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + active = gtk_check_button_get_active(GTK_CHECK_BUTTON(widget)); nm_setting_vpn_add_data_item (settings, "virtual", active ? "yes" : "no"); widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "encap-check")); - active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + active = gtk_check_button_get_active(GTK_CHECK_BUTTON(widget)); nm_setting_vpn_add_data_item (settings, "encap", active ? "yes" : "no"); widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "ipcomp-check")); - active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + active = gtk_check_button_get_active(GTK_CHECK_BUTTON(widget)); nm_setting_vpn_add_data_item (settings, "ipcomp", active ? "yes" : "no"); widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "proposal-check")); - active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); + active = gtk_check_button_get_active(GTK_CHECK_BUTTON(widget)); nm_setting_vpn_add_data_item (settings, "proposal", active ? "yes" : "no"); widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "ike-entry")); - str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); + str = (char *) gtk_editable_get_text (GTK_EDITABLE (widget)); if (str && strlen (str)) { str = g_strdelimit (g_strdup (str), ",", ';'); nm_setting_vpn_add_data_item (settings, "ike", str); @@ -720,7 +734,7 @@ update_connection (NMVpnEditor *iface, } widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "esp-entry")); - str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); + str = (char *) gtk_editable_get_text (GTK_EDITABLE (widget)); if (str && strlen (str)) { str = g_strdelimit (g_strdup (str), ",", ';'); nm_setting_vpn_add_data_item (settings, "esp", str);