[Pkg-utopia-commits] r1481 - in
/packages/unstable/network-manager-vpnc/debian: changelog control
patches/02_fix_bugs_88073_90200_ubuntu.diff
shawarma-guest at users.alioth.debian.org
shawarma-guest at users.alioth.debian.org
Thu May 10 11:03:36 UTC 2007
Author: shawarma-guest
Date: Thu May 10 11:03:36 2007
New Revision: 1481
URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1481
Log:
Add gui niceness
New SVN checkout
Added:
packages/unstable/network-manager-vpnc/debian/patches/02_fix_bugs_88073_90200_ubuntu.diff
Modified:
packages/unstable/network-manager-vpnc/debian/changelog
packages/unstable/network-manager-vpnc/debian/control
Modified: packages/unstable/network-manager-vpnc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-vpnc/debian/changelog?rev=1481&op=diff
==============================================================================
--- packages/unstable/network-manager-vpnc/debian/changelog (original)
+++ packages/unstable/network-manager-vpnc/debian/changelog Thu May 10 11:03:36 2007
@@ -1,10 +1,11 @@
-network-manager-vpnc (0.6.4svn2550-1) unstable; urgency=low
+network-manager-vpnc (0.6.4svn2569-1) unstable; urgency=low
* New SVN checkout
- * Add Single DES encryption and Disable Nat Traversal options.
- Thanks to Stéphane Graber.
+ * Add "Single DES encryption" and "Disable Nat Traversal" options,
+ thanks to Stéphane Graber
+ * Add network-manager-gnome dependency
- -- Soren Hansen <sh at linux2go.dk> Sun, 22 Apr 2007 20:26:35 +0200
+ -- Soren Hansen <sh at linux2go.dk> Thu, 10 May 2007 12:52:36 +0200
network-manager-vpnc (0.6.4svn2422-1) unstable; urgency=low
Modified: packages/unstable/network-manager-vpnc/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-vpnc/debian/control?rev=1481&op=diff
==============================================================================
--- packages/unstable/network-manager-vpnc/debian/control (original)
+++ packages/unstable/network-manager-vpnc/debian/control Thu May 10 11:03:36 2007
@@ -7,7 +7,7 @@
Package: network-manager-vpnc
Architecture: any
-Depends: ${shlibs:Depends}, vpnc
+Depends: ${shlibs:Depends}, vpnc, network-manager-gnomer
Description: network management framework (VPNC plugin)
NetworkManager attempts to keep an active network connection available at
all times. It is intended primarily for laptops where it allows easy
Added: packages/unstable/network-manager-vpnc/debian/patches/02_fix_bugs_88073_90200_ubuntu.diff
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-vpnc/debian/patches/02_fix_bugs_88073_90200_ubuntu.diff?rev=1481&op=file
==============================================================================
--- packages/unstable/network-manager-vpnc/debian/patches/02_fix_bugs_88073_90200_ubuntu.diff (added)
+++ packages/unstable/network-manager-vpnc/debian/patches/02_fix_bugs_88073_90200_ubuntu.diff Thu May 10 11:03:36 2007
@@ -1,0 +1,1358 @@
+diff -Nrup ../network-manager-vpnc_0.6.4svn2422/properties/nm-vpnc.c ./properties/nm-vpnc.c
+--- ../network-manager-vpnc_0.6.4svn2422/properties/nm-vpnc.c 2007-03-06 16:08:43.000000000 +0100
++++ ./properties/nm-vpnc.c 2007-03-11 22:35:10.000000000 +0100
+@@ -55,6 +55,8 @@ struct _NetworkManagerVpnUIImpl {
+ GtkCheckButton *w_use_domain;
+ GtkEntry *w_domain;
+ GtkCheckButton *w_use_routes;
++ GtkCheckButton *w_disable_natt;
++ GtkCheckButton *w_enable_singledes;
+ GtkEntry *w_routes;
+ GtkExpander *w_opt_info_expander;
+ GtkButton *w_import_button;
+@@ -68,6 +70,8 @@ vpnc_clear_widget (NetworkManagerVpnUIIm
+ gtk_entry_set_text (impl->w_group_name, "");
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_alternate_username), FALSE);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_routes), FALSE);
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_disable_natt), FALSE);
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_enable_singledes), FALSE);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_domain), FALSE);
+ gtk_entry_set_text (impl->w_username, "");
+ gtk_entry_set_text (impl->w_routes, "");
+@@ -125,6 +129,10 @@ impl_get_widget (NetworkManagerVpnUI *se
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_domain), TRUE);
+ gtk_widget_set_sensitive (GTK_WIDGET (impl->w_domain), TRUE);
+ should_expand = TRUE;
++ } else if (strcmp (key, "Disable NAT Traversal") == 0) {
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_disable_natt), TRUE);
++ } else if (strcmp (key, "Enable Single DES") == 0) {
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_enable_singledes), TRUE);
+ }
+ }
+
+@@ -172,6 +180,8 @@ impl_get_properties (NetworkManagerVpnUI
+ gboolean use_alternate_username;
+ const char *username;
+ gboolean use_domain;
++ gboolean disable_natt;
++ gboolean enable_singledes;
+ const char *domain;
+
+ connectionname = gtk_entry_get_text (impl->w_connection_name);
+@@ -180,6 +190,8 @@ impl_get_properties (NetworkManagerVpnUI
+ use_alternate_username = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_alternate_username));
+ username = gtk_entry_get_text (impl->w_username);
+ use_domain = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_domain));
++ disable_natt = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_disable_natt));
++ enable_singledes = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_enable_singledes));
+ domain = gtk_entry_get_text (impl->w_domain);
+
+ data = NULL;
+@@ -195,6 +207,14 @@ impl_get_properties (NetworkManagerVpnUI
+ data = g_slist_append (data, g_strdup ("Domain"));
+ data = g_slist_append (data, g_strdup (domain));
+ }
++ if (enable_singledes) {
++ data = g_slist_append (data, g_strdup ("Enable Single DES"));
++ data = g_slist_append (data, g_strdup (""));
++ }
++ if (disable_natt) {
++ data = g_slist_append (data, g_strdup ("Disable NAT Traversal"));
++ data = g_slist_append (data, g_strdup (""));
++ }
+
+ return data;
+ }
+@@ -266,6 +286,8 @@ impl_is_valid (NetworkManagerVpnUI *self
+ gboolean use_routes;
+ const char *routes_entry;
+ gboolean use_domain;
++ gboolean disable_natt;
++ gboolean enable_singledes;
+ const char *domain_entry;
+
+ is_valid = FALSE;
+@@ -276,6 +298,8 @@ impl_is_valid (NetworkManagerVpnUI *self
+ use_alternate_username = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_alternate_username));
+ username = gtk_entry_get_text (impl->w_username);
+ use_routes = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_routes));
++ disable_natt = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_disable_natt));
++ enable_singledes = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_enable_singledes));
+ routes_entry = gtk_entry_get_text (impl->w_routes);
+ use_domain = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_domain));
+ domain_entry = gtk_entry_get_text (impl->w_domain);
+@@ -429,6 +453,8 @@ impl_get_confirmation_details (NetworkMa
+ gboolean use_alternate_username;
+ const char *username;
+ gboolean use_routes;
++ gboolean disable_natt;
++ gboolean enable_singledes;
+ const char *routes;
+ gboolean use_domain;
+ const char *domain;
+@@ -439,6 +465,8 @@ impl_get_confirmation_details (NetworkMa
+ use_alternate_username = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_alternate_username));
+ username = gtk_entry_get_text (impl->w_username);
+ use_routes = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_routes));
++ disable_natt = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_disable_natt));
++ enable_singledes = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_enable_singledes));
+ routes = gtk_entry_get_text (impl->w_routes);
+ use_domain = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_domain));
+ domain = gtk_entry_get_text (impl->w_domain);
+@@ -468,6 +496,14 @@ impl_get_confirmation_details (NetworkMa
+ g_string_append (buf, "\n\t");
+ g_string_append_printf (buf, _("Routes: %s"), routes);
+ }
++ if (enable_singledes) {
++ g_string_append (buf, "\n\t");
++ g_string_append_printf (buf, _("Enable Single DES"));
++ }
++ if (disable_natt) {
++ g_string_append (buf, "\n\t");
++ g_string_append_printf (buf, _("Disable NAT Traversal"));
++ }
+
+ g_string_append (buf, "\n\n");
+ g_string_append (buf, _("The connection details can be changed using the \"Edit\" button."));
+@@ -530,6 +566,27 @@ import_from_file (NetworkManagerVpnUIImp
+
+ gtk_expander_set_expanded (impl->w_opt_info_expander, expand);
+
++ if ((buf = pcf_file_lookup_value (pcf, "main", "SingleDES"))) {
++ if (strncmp (buf, "1", 1) == 0) {
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_enable_singledes), TRUE);
++ }
++ else
++ {
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_enable_singledes), FALSE);
++ }
++ }
++
++ if ((buf = pcf_file_lookup_value (pcf, "main", "EnableNat"))) {
++ if (strncmp (buf, "0", 1) == 0) {
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_disable_natt), TRUE);
++ }
++ else
++ {
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_disable_natt), FALSE);
++ }
++ }
++
++
+ if ((buf = pcf_file_lookup_value (pcf, "main", "TunnelingMode"))) {
+ /* If applicable, put up warning that TCP tunneling will be disabled */
+
+@@ -625,6 +682,8 @@ export_to_file (NetworkManagerVpnUIImpl
+ FILE *f;
+ GSList *i;
+ const char *gateway = NULL;
++ const char *enablenat = "1";
++ const char *singledes = "0";
+ const char *groupname = NULL;
+ const char *username = NULL;
+ const char *domain = NULL;
+@@ -648,6 +707,10 @@ export_to_file (NetworkManagerVpnUIImpl
+ username = value;
+ } else if (strcmp (key, "Domain") == 0) {
+ domain = value;
++ } else if (strcmp (key, "Disable NAT Traversal") == 0) {
++ enablenat = "0";
++ } else if (strcmp (key, "Enable Single DES") == 0) {
++ singledes = "1";
+ }
+ }
+
+@@ -693,7 +756,7 @@ export_to_file (NetworkManagerVpnUIImpl
+ "SaveUserPassword=0\n"
+ "EnableBackup=0\n"
+ "BackupServer=\n"
+- "EnableNat=1\n"
++ "EnableNat=%s\n"
+ "CertStore=0\n"
+ "CertName=\n"
+ "CertPath=\n"
+@@ -714,13 +777,16 @@ export_to_file (NetworkManagerVpnUIImpl
+ "SendCertChain=0\n"
+ "VerifyCertDN=\n"
+ "EnableSplitDNS=1\n"
++ "SingleDES=%s\n"
+ "SPPhonebook=\n"
+ "%s",
+ /* Description */ connection_name,
+ /* Host */ gateway,
+ /* GroupName */ groupname,
+ /* Username */ username != NULL ? username : "",
++ /* EnableNat */ enablenat,
+ /* NTDomain */ domain != NULL ? domain : "",
++ /* SingleDES */ singledes,
+ /* X-NM-Routes */ routes_str != NULL ? routes_str : "");
+
+ fclose (f);
+@@ -825,6 +891,8 @@ impl_get_object (void)
+ impl->w_use_alternate_username = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "vpnc-use-alternate-username"));
+ impl->w_username = GTK_ENTRY (glade_xml_get_widget (impl->xml, "vpnc-username"));
+ impl->w_use_routes = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "vpnc-use-routes"));
++ impl->w_disable_natt = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "vpnc-disable-natt"));
++ impl->w_enable_singledes = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "vpnc-enable-singledes"));
+ impl->w_routes = GTK_ENTRY (glade_xml_get_widget (impl->xml, "vpnc-routes"));
+ impl->w_use_domain = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "vpnc-use-domain"));
+ impl->w_domain = GTK_ENTRY (glade_xml_get_widget (impl->xml, "vpnc-domain"));
+diff -Nrup ../network-manager-vpnc_0.6.4svn2422/properties/nm-vpnc-dialog.glade ./properties/nm-vpnc-dialog.glade
+--- ../network-manager-vpnc_0.6.4svn2422/properties/nm-vpnc-dialog.glade 2007-03-06 16:08:43.000000000 +0100
++++ ./properties/nm-vpnc-dialog.glade 2007-03-11 22:28:45.000000000 +0100
+@@ -1,720 +1,425 @@
+-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
+-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
+-
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
++<!--*- mode: xml -*-->
+ <glade-interface>
+-<requires lib="gnome"/>
+-
+-<widget class="GtkWindow" id="nm-vpnc-widget-window">
+- <property name="title" translatable="yes"></property>
+- <property name="type">GTK_WINDOW_TOPLEVEL</property>
+- <property name="window_position">GTK_WIN_POS_NONE</property>
+- <property name="modal">False</property>
+- <property name="resizable">False</property>
+- <property name="destroy_with_parent">False</property>
+- <property name="decorated">True</property>
+- <property name="skip_taskbar_hint">False</property>
+- <property name="skip_pager_hint">False</property>
+- <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+- <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+- <property name="focus_on_map">True</property>
+- <property name="urgency_hint">False</property>
+-
+- <child>
+- <widget class="GtkVBox" id="nm-vpnc-widget">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">6</property>
+-
+- <child>
+- <widget class="GtkLabel" id="label1">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">Please enter the information provided by your system administrator below. Do not enter your password here as you will be prompted when connecting.</property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">True</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkVBox" id="vbox7">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">6</property>
+-
+- <child>
+- <widget class="GtkVBox" id="vbox2">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">6</property>
+-
+- <child>
+- <widget class="GtkLabel" id="label2">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes"><b>Connection Name</b></property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">True</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">3</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkAlignment" id="alignment2">
+- <property name="visible">True</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xscale">1</property>
+- <property name="yscale">1</property>
+- <property name="top_padding">0</property>
+- <property name="bottom_padding">0</property>
+- <property name="left_padding">6</property>
+- <property name="right_padding">0</property>
+-
+- <child>
+- <widget class="GtkVBox" id="vbox3">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">6</property>
+-
+- <child>
+- <widget class="GtkAlignment" id="alignment8">
+- <property name="visible">True</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xscale">1</property>
+- <property name="yscale">1</property>
+- <property name="top_padding">0</property>
+- <property name="bottom_padding">0</property>
+- <property name="left_padding">0</property>
+- <property name="right_padding">6</property>
+-
+- <child>
+- <widget class="GtkEntry" id="vpnc-connection-name">
+- <property name="visible">True</property>
+- <property name="tooltip" translatable="yes">Name used to identify the connection to the private network, e.g. "Campus VPN" or "Corporate Network"</property>
+- <property name="can_focus">True</property>
+- <property name="editable">True</property>
+- <property name="visibility">True</property>
+- <property name="max_length">0</property>
+- <property name="text" translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="activates_default">False</property>
+- <accessibility>
+- <atkproperty name="AtkObject::accessible_name" translatable="yes">Connection Name</atkproperty>
+- <atkproperty name="AtkObject::accessible_description" translatable="yes">Name used to identify the connection to the private network, e.g. "Campus VPN" or "Corporate Network"</atkproperty>
+- </accessibility>
+- </widget>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+- </widget>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="label20">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes"><b>Connection Information</b></property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">True</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">3</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkNotebook" id="notebook1">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="show_tabs">True</property>
+- <property name="show_border">True</property>
+- <property name="tab_pos">GTK_POS_TOP</property>
+- <property name="scrollable">False</property>
+- <property name="enable_popup">False</property>
+-
+- <child>
+- <widget class="GtkVBox" id="vbox4">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">6</property>
+-
+- <child>
+- <widget class="GtkAlignment" id="alignment3">
+- <property name="visible">True</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xscale">1</property>
+- <property name="yscale">1</property>
+- <property name="top_padding">3</property>
+- <property name="bottom_padding">0</property>
+- <property name="left_padding">12</property>
+- <property name="right_padding">3</property>
+-
+- <child>
+- <widget class="GtkTable" id="table1">
+- <property name="visible">True</property>
+- <property name="n_rows">2</property>
+- <property name="n_columns">2</property>
+- <property name="homogeneous">False</property>
+- <property name="row_spacing">6</property>
+- <property name="column_spacing">12</property>
+-
+- <child>
+- <widget class="GtkEntry" id="vpnc-gateway">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="editable">True</property>
+- <property name="visibility">True</property>
+- <property name="max_length">0</property>
+- <property name="text" translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="activates_default">False</property>
+- </widget>
+- <packing>
+- <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="top_attach">0</property>
+- <property name="bottom_attach">1</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkEntry" id="vpnc-group-name">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="editable">True</property>
+- <property name="visibility">True</property>
+- <property name="max_length">0</property>
+- <property name="text" translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="activates_default">False</property>
+- </widget>
+- <packing>
+- <property name="left_attach">1</property>
+- <property name="right_attach">2</property>
+- <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="label7">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">_Gateway:</property>
+- <property name="use_underline">True</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">1</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="mnemonic_widget">vpnc-gateway</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="right_attach">1</property>
+- <property name="top_attach">0</property>
+- <property name="bottom_attach">1</property>
+- <property name="x_options">fill</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="label8">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">G_roup Name:</property>
+- <property name="use_underline">True</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">1</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="mnemonic_widget">vpnc-group-name</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="left_attach">0</property>
+- <property name="right_attach">1</property>
+- <property name="top_attach">1</property>
+- <property name="bottom_attach">2</property>
+- <property name="x_options">fill</property>
+- </packing>
+- </child>
+- </widget>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="tab_expand">False</property>
+- <property name="tab_fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="label18">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes"><b>Required</b></property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">True</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="type">tab</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkAlignment" id="alignment4">
+- <property name="visible">True</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xscale">1</property>
+- <property name="yscale">1</property>
+- <property name="top_padding">0</property>
+- <property name="bottom_padding">0</property>
+- <property name="left_padding">12</property>
+- <property name="right_padding">0</property>
+-
+- <child>
+- <widget class="GtkVBox" id="vbox5">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">6</property>
+-
+- <child>
+- <widget class="GtkCheckButton" id="vpnc-use-alternate-username">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="label" translatable="yes">Override _user name</property>
+- <property name="use_underline">True</property>
+- <property name="relief">GTK_RELIEF_NORMAL</property>
+- <property name="focus_on_click">True</property>
+- <property name="active">False</property>
+- <property name="inconsistent">False</property>
+- <property name="draw_indicator">True</property>
+- </widget>
+- <packing>
+- <property name="padding">3</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkAlignment" id="alignment5">
+- <property name="visible">True</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xscale">1</property>
+- <property name="yscale">1</property>
+- <property name="top_padding">0</property>
+- <property name="bottom_padding">0</property>
+- <property name="left_padding">12</property>
+- <property name="right_padding">3</property>
+-
+- <child>
+- <widget class="GtkEntry" id="vpnc-username">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="editable">True</property>
+- <property name="visibility">True</property>
+- <property name="max_length">0</property>
+- <property name="text" translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="activates_default">False</property>
+- </widget>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkCheckButton" id="vpnc-use-domain">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="label" translatable="yes">Use _domain for authentication</property>
+- <property name="use_underline">True</property>
+- <property name="relief">GTK_RELIEF_NORMAL</property>
+- <property name="focus_on_click">True</property>
+- <property name="active">False</property>
+- <property name="inconsistent">False</property>
+- <property name="draw_indicator">True</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkAlignment" id="alignment6">
+- <property name="visible">True</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xscale">1</property>
+- <property name="yscale">1</property>
+- <property name="top_padding">0</property>
+- <property name="bottom_padding">0</property>
+- <property name="left_padding">12</property>
+- <property name="right_padding">3</property>
+-
+- <child>
+- <widget class="GtkEntry" id="vpnc-domain">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="editable">True</property>
+- <property name="visibility">True</property>
+- <property name="max_length">0</property>
+- <property name="text" translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="activates_default">False</property>
+- </widget>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkCheckButton" id="vpnc-use-routes">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="label" translatable="yes">_Only use VPN connection for these addresses</property>
+- <property name="use_underline">True</property>
+- <property name="relief">GTK_RELIEF_NORMAL</property>
+- <property name="focus_on_click">True</property>
+- <property name="active">False</property>
+- <property name="inconsistent">False</property>
+- <property name="draw_indicator">True</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkAlignment" id="alignment7">
+- <property name="visible">True</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xscale">1</property>
+- <property name="yscale">1</property>
+- <property name="top_padding">0</property>
+- <property name="bottom_padding">3</property>
+- <property name="left_padding">12</property>
+- <property name="right_padding">3</property>
+-
+- <child>
+- <widget class="GtkVBox" id="vbox6">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">6</property>
+-
+- <child>
+- <widget class="GtkLabel" id="label14">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes"><i>example: 172.16.0.0/16 10.11.12.0/24</i></property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">True</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkEntry" id="vpnc-routes">
+- <property name="visible">True</property>
+- <property name="can_focus">True</property>
+- <property name="editable">True</property>
+- <property name="visibility">True</property>
+- <property name="max_length">0</property>
+- <property name="text" translatable="yes"></property>
+- <property name="has_frame">True</property>
+- <property name="activates_default">False</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+- </widget>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+- </widget>
+- </child>
+- </widget>
+- <packing>
+- <property name="tab_expand">False</property>
+- <property name="tab_fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="Optional">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">Optional</property>
+- <property name="use_underline">False</property>
+- <property name="use_markup">True</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- <accessibility>
+- <atkproperty name="AtkObject::accessible_name" translatable="yes">Optional</atkproperty>
+- </accessibility>
+- </widget>
+- <packing>
+- <property name="type">tab</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkHButtonBox" id="hbuttonbox1">
+- <property name="visible">True</property>
+- <property name="layout_style">GTK_BUTTONBOX_END</property>
+- <property name="spacing">0</property>
+-
+- <child>
+- <widget class="GtkAlignment" id="alignment9">
+- <property name="visible">True</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xscale">1</property>
+- <property name="yscale">1</property>
+- <property name="top_padding">0</property>
+- <property name="bottom_padding">3</property>
+- <property name="left_padding">0</property>
+- <property name="right_padding">3</property>
+-
+- <child>
+- <widget class="GtkButton" id="vpnc-import-button">
+- <property name="visible">True</property>
+- <property name="tooltip" translatable="yes">Please note that the file you import is not a Cisco VPN or VPNC configuration file. Ask your adminstrator for the file.</property>
+- <property name="can_default">True</property>
+- <property name="can_focus">True</property>
+- <property name="relief">GTK_RELIEF_NORMAL</property>
+- <property name="focus_on_click">True</property>
+- <accessibility>
+- <atkproperty name="AtkObject::accessible_description" translatable="yes">Please note that the file you import is not a Cisco VPN or VPNC configuration file. Ask your adminstrator for the file.</atkproperty>
+- </accessibility>
+-
+- <child>
+- <widget class="GtkAlignment" id="alignment1">
+- <property name="visible">True</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xscale">0</property>
+- <property name="yscale">0</property>
+- <property name="top_padding">0</property>
+- <property name="bottom_padding">0</property>
+- <property name="left_padding">0</property>
+- <property name="right_padding">0</property>
+-
+- <child>
+- <widget class="GtkHBox" id="hbox7">
+- <property name="visible">True</property>
+- <property name="homogeneous">False</property>
+- <property name="spacing">2</property>
+-
+- <child>
+- <widget class="GtkImage" id="image1">
+- <property name="visible">True</property>
+- <property name="stock">gtk-add</property>
+- <property name="icon_size">4</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+-
+- <child>
+- <widget class="GtkLabel" id="label15">
+- <property name="visible">True</property>
+- <property name="label" translatable="yes">_Import Saved Configuration...</property>
+- <property name="use_underline">True</property>
+- <property name="use_markup">False</property>
+- <property name="justify">GTK_JUSTIFY_LEFT</property>
+- <property name="wrap">False</property>
+- <property name="selectable">False</property>
+- <property name="xalign">0.5</property>
+- <property name="yalign">0.5</property>
+- <property name="xpad">0</property>
+- <property name="ypad">0</property>
+- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+- <property name="width_chars">-1</property>
+- <property name="single_line_mode">False</property>
+- <property name="angle">0</property>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">False</property>
+- <property name="fill">False</property>
+- </packing>
+- </child>
+- </widget>
+- </child>
+- </widget>
+- </child>
+- </widget>
+- </child>
+- </widget>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+- </widget>
+- <packing>
+- <property name="padding">0</property>
+- <property name="expand">True</property>
+- <property name="fill">True</property>
+- </packing>
+- </child>
+- </widget>
+- </child>
+-</widget>
+-
++ <widget class="GtkWindow" id="nm-vpnc-widget-window">
++ <property name="resizable">False</property>
++ <child>
++ <widget class="GtkVBox" id="nm-vpnc-widget">
++ <property name="visible">True</property>
++ <property name="spacing">6</property>
++ <child>
++ <widget class="GtkLabel" id="label1">
++ <property name="visible">True</property>
++ <property name="xalign">0</property>
++ <property name="label" translatable="yes">Please enter the information provided by your system administrator below. Do not enter your password here as you will be prompted when connecting.</property>
++ <property name="wrap">True</property>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkVBox" id="vbox7">
++ <property name="visible">True</property>
++ <property name="spacing">6</property>
++ <child>
++ <widget class="GtkVBox" id="vbox2">
++ <property name="visible">True</property>
++ <property name="spacing">6</property>
++ <child>
++ <widget class="GtkLabel" id="label2">
++ <property name="visible">True</property>
++ <property name="xalign">0</property>
++ <property name="xpad">3</property>
++ <property name="label" translatable="yes"><b>Connection Name</b></property>
++ <property name="use_markup">True</property>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkAlignment" id="alignment2">
++ <property name="visible">True</property>
++ <property name="left_padding">6</property>
++ <child>
++ <widget class="GtkVBox" id="vbox3">
++ <property name="visible">True</property>
++ <property name="spacing">6</property>
++ <child>
++ <widget class="GtkAlignment" id="alignment8">
++ <property name="visible">True</property>
++ <property name="right_padding">6</property>
++ <child>
++ <widget class="GtkEntry" id="vpnc-connection-name">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="tooltip" translatable="yes">Name used to identify the connection to the private network, e.g. "Campus VPN" or "Corporate Network"</property>
++ <accessibility>
++ <atkproperty name="AtkObject::accessible_name" translatable="yes">Connection Name</atkproperty>
++ <atkproperty name="AtkObject::accessible_description" translatable="yes">Name used to identify the connection to the private network, e.g. "Campus VPN" or "Corporate Network"</atkproperty>
++ </accessibility>
++ </widget>
++ </child>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ </packing>
++ </child>
++ </widget>
++ </child>
++ </widget>
++ <packing>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </widget>
++ </child>
++ <child>
++ <widget class="GtkLabel" id="label20">
++ <property name="visible">True</property>
++ <property name="xalign">0</property>
++ <property name="xpad">3</property>
++ <property name="label" translatable="yes"><b>Connection Information</b></property>
++ <property name="use_markup">True</property>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkNotebook" id="notebook1">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <child>
++ <widget class="GtkVBox" id="vbox4">
++ <property name="visible">True</property>
++ <property name="spacing">6</property>
++ <child>
++ <widget class="GtkAlignment" id="alignment3">
++ <property name="visible">True</property>
++ <property name="top_padding">3</property>
++ <property name="left_padding">12</property>
++ <property name="right_padding">3</property>
++ <child>
++ <widget class="GtkTable" id="table1">
++ <property name="visible">True</property>
++ <property name="n_rows">2</property>
++ <property name="n_columns">2</property>
++ <property name="column_spacing">12</property>
++ <property name="row_spacing">6</property>
++ <child>
++ <widget class="GtkEntry" id="vpnc-gateway">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ </widget>
++ <packing>
++ <property name="left_attach">1</property>
++ <property name="right_attach">2</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkEntry" id="vpnc-group-name">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ </widget>
++ <packing>
++ <property name="left_attach">1</property>
++ <property name="right_attach">2</property>
++ <property name="top_attach">1</property>
++ <property name="bottom_attach">2</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkLabel" id="label7">
++ <property name="visible">True</property>
++ <property name="xalign">1</property>
++ <property name="label" translatable="yes">_Gateway:</property>
++ <property name="use_underline">True</property>
++ <property name="mnemonic_widget">vpnc-gateway</property>
++ </widget>
++ <packing>
++ <property name="x_options">GTK_FILL</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkLabel" id="label8">
++ <property name="visible">True</property>
++ <property name="xalign">1</property>
++ <property name="label" translatable="yes">G_roup Name:</property>
++ <property name="use_underline">True</property>
++ <property name="mnemonic_widget">vpnc-group-name</property>
++ </widget>
++ <packing>
++ <property name="top_attach">1</property>
++ <property name="bottom_attach">2</property>
++ <property name="x_options">GTK_FILL</property>
++ </packing>
++ </child>
++ </widget>
++ </child>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ </packing>
++ </child>
++ </widget>
++ <packing>
++ <property name="tab_expand">False</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkLabel" id="label18">
++ <property name="visible">True</property>
++ <property name="xalign">0</property>
++ <property name="label" translatable="yes"><b>Required</b></property>
++ <property name="use_markup">True</property>
++ </widget>
++ <packing>
++ <property name="type">tab</property>
++ <property name="tab_expand">False</property>
++ <property name="tab_fill">False</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkAlignment" id="alignment4">
++ <property name="visible">True</property>
++ <property name="left_padding">12</property>
++ <child>
++ <widget class="GtkVBox" id="vbox5">
++ <property name="visible">True</property>
++ <property name="spacing">6</property>
++ <child>
++ <widget class="GtkCheckButton" id="vpnc-use-alternate-username">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="label" translatable="yes">Override _user name</property>
++ <property name="use_underline">True</property>
++ <property name="draw_indicator">True</property>
++ </widget>
++ <packing>
++ <property name="padding">3</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkAlignment" id="alignment5">
++ <property name="visible">True</property>
++ <property name="left_padding">12</property>
++ <property name="right_padding">3</property>
++ <child>
++ <widget class="GtkEntry" id="vpnc-username">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ </widget>
++ </child>
++ </widget>
++ <packing>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkCheckButton" id="vpnc-use-domain">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="label" translatable="yes">Use _domain for authentication</property>
++ <property name="use_underline">True</property>
++ <property name="draw_indicator">True</property>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">2</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkAlignment" id="alignment6">
++ <property name="visible">True</property>
++ <property name="left_padding">12</property>
++ <property name="right_padding">3</property>
++ <child>
++ <widget class="GtkEntry" id="vpnc-domain">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ </widget>
++ </child>
++ </widget>
++ <packing>
++ <property name="position">3</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkCheckButton" id="vpnc-use-routes">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="label" translatable="yes">_Only use VPN connection for these addresses</property>
++ <property name="use_underline">True</property>
++ <property name="draw_indicator">True</property>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">4</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkAlignment" id="alignment7">
++ <property name="visible">True</property>
++ <property name="bottom_padding">3</property>
++ <property name="left_padding">12</property>
++ <property name="right_padding">3</property>
++ <child>
++ <widget class="GtkVBox" id="vbox6">
++ <property name="visible">True</property>
++ <property name="spacing">6</property>
++ <child>
++ <widget class="GtkLabel" id="label14">
++ <property name="visible">True</property>
++ <property name="xalign">0</property>
++ <property name="label" translatable="yes"><i>example: 172.16.0.0/16 10.11.12.0/24</i></property>
++ <property name="use_markup">True</property>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkEntry" id="vpnc-routes">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ </widget>
++ <packing>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </widget>
++ </child>
++ </widget>
++ <packing>
++ <property name="position">5</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkCheckButton" id="vpnc-disable-natt">
++ <property name="visible">True</property>
++ <property name="label" translatable="yes">Disable NAT Traversal</property>
++ <property name="draw_indicator">True</property>
++ </widget>
++ <packing>
++ <property name="position">6</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkCheckButton" id="vpnc-enable-singledes">
++ <property name="visible">True</property>
++ <property name="label" translatable="yes">Enable weak single DES encryption</property>
++ <property name="draw_indicator">True</property>
++ </widget>
++ <packing>
++ <property name="position">7</property>
++ </packing>
++ </child>
++ </widget>
++ </child>
++ </widget>
++ <packing>
++ <property name="position">1</property>
++ <property name="tab_expand">False</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkLabel" id="Optional">
++ <property name="visible">True</property>
++ <property name="xalign">0</property>
++ <property name="label" translatable="yes">Optional</property>
++ <property name="use_markup">True</property>
++ <accessibility>
++ <atkproperty name="AtkObject::accessible_name" translatable="yes">Optional</atkproperty>
++ </accessibility>
++ </widget>
++ <packing>
++ <property name="type">tab</property>
++ <property name="position">1</property>
++ <property name="tab_expand">False</property>
++ <property name="tab_fill">False</property>
++ </packing>
++ </child>
++ </widget>
++ <packing>
++ <property name="position">2</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkHButtonBox" id="hbuttonbox1">
++ <property name="visible">True</property>
++ <property name="layout_style">GTK_BUTTONBOX_END</property>
++ <child>
++ <widget class="GtkAlignment" id="alignment9">
++ <property name="visible">True</property>
++ <property name="bottom_padding">3</property>
++ <property name="right_padding">3</property>
++ <child>
++ <widget class="GtkButton" id="vpnc-import-button">
++ <property name="visible">True</property>
++ <property name="can_focus">True</property>
++ <property name="can_default">True</property>
++ <property name="tooltip" translatable="yes">Please note that the file you import is not a Cisco VPN or VPNC configuration file. Ask your adminstrator for the file.</property>
++ <accessibility>
++ <atkproperty name="AtkObject::accessible_description" translatable="yes">Please note that the file you import is not a Cisco VPN or VPNC configuration file. Ask your adminstrator for the file.</atkproperty>
++ </accessibility>
++ <child>
++ <widget class="GtkAlignment" id="alignment1">
++ <property name="visible">True</property>
++ <property name="xscale">0</property>
++ <property name="yscale">0</property>
++ <child>
++ <widget class="GtkHBox" id="hbox7">
++ <property name="visible">True</property>
++ <property name="spacing">2</property>
++ <child>
++ <widget class="GtkImage" id="image1">
++ <property name="visible">True</property>
++ <property name="stock">gtk-add</property>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ </packing>
++ </child>
++ <child>
++ <widget class="GtkLabel" id="label15">
++ <property name="visible">True</property>
++ <property name="label" translatable="yes">_Import Saved Configuration...</property>
++ <property name="use_underline">True</property>
++ </widget>
++ <packing>
++ <property name="expand">False</property>
++ <property name="fill">False</property>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </widget>
++ </child>
++ </widget>
++ </child>
++ </widget>
++ </child>
++ </widget>
++ </child>
++ </widget>
++ <packing>
++ <property name="position">3</property>
++ </packing>
++ </child>
++ </widget>
++ <packing>
++ <property name="position">1</property>
++ </packing>
++ </child>
++ </widget>
++ </child>
++ </widget>
+ </glade-interface>
+diff -Nrup ../network-manager-vpnc_0.6.4svn2422/src/nm-vpnc-service.c ./src/nm-vpnc-service.c
+--- ../network-manager-vpnc_0.6.4svn2422/src/nm-vpnc-service.c 2007-03-06 16:08:43.000000000 +0100
++++ ./src/nm-vpnc-service.c 2007-03-11 22:28:59.000000000 +0100
+@@ -504,6 +504,8 @@ static gboolean nm_vpnc_config_options_v
+ { "Perfect Forward Secrecy", OPT_TYPE_ASCII },
+ { "Application Version", OPT_TYPE_ASCII },
+ { "Rekeying interval", OPT_TYPE_ASCII },
++ { "Disable NAT Traversal", OPT_TYPE_NONE },
++ { "Enable Single DES", OPT_TYPE_NONE },
+ { "NAT-Keepalive packet interval", OPT_TYPE_ASCII },
+ { NULL, OPT_TYPE_UNKNOWN }
+ };
More information about the Pkg-utopia-commits
mailing list