31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
|
commit 044bd7593961389f24b1fdab7849f86da9f96246
|
||
|
|
Author: Avesh Agarwal <avagarwa@redhat.com>
|
||
|
|
Date: Thu Dec 12 14:55:26 2013 -0500
|
||
|
|
|
||
|
|
Fixes for rhbz#1035786 (and its duplicate: rhbz#1040924).
|
||
|
|
The patch is from here:
|
||
|
|
https://bug720319.bugzilla-attachments.gnome.org/attachment.cgi?id=264063
|
||
|
|
Just did minor modifcation.
|
||
|
|
|
||
|
|
diff --git a/properties/nm-openswan.c b/properties/nm-openswan.c
|
||
|
|
index e164e85..7bb1413 100644
|
||
|
|
--- a/properties/nm-openswan.c
|
||
|
|
+++ b/properties/nm-openswan.c
|
||
|
|
@@ -580,6 +580,7 @@ nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error)
|
||
|
|
char *ui_file;
|
||
|
|
NMSettingVPN *s_vpn;
|
||
|
|
gboolean is_new = TRUE;
|
||
|
|
+ const char *object_ids[] = { "openswan-vbox", "model1", "model2", NULL };
|
||
|
|
|
||
|
|
if (error)
|
||
|
|
g_return_val_if_fail (*error == NULL, NULL);
|
||
|
|
@@ -598,7 +599,7 @@ nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error)
|
||
|
|
|
||
|
|
gtk_builder_set_translation_domain (priv->builder, GETTEXT_PACKAGE);
|
||
|
|
|
||
|
|
- if (!gtk_builder_add_from_file (priv->builder, ui_file, error)) {
|
||
|
|
+ if (!gtk_builder_add_objects_from_file (priv->builder, ui_file, object_ids, error)) {
|
||
|
|
g_warning ("Couldn't load builder file: %s",
|
||
|
|
error && *error ? (*error)->message : "(unknown)");
|
||
|
|
g_clear_error (error);
|