From eb607190f9d0b1ba5ae11eaa1857393cf47e8f0c Mon Sep 17 00:00:00 2001
From: Robert Love <rml@novell.com>
Date: Mon, 23 Jan 2006 19:02:34 +0000
Subject: [PATCH] 2006-01-23  Robert Love  <rml@novell.com>

	* properties/nm-vpnc-dialog.glade: Add (back) 'Optional Information'
	  label for GtkExpander.  Use new-style Glade (separate label, not a
	  property of the GtkExpander).


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1378 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
---
 vpn-daemons/vpnc/ChangeLog                    |  6 +++++
 .../vpnc/properties/nm-vpnc-dialog.glade      | 25 ++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/vpn-daemons/vpnc/ChangeLog b/vpn-daemons/vpnc/ChangeLog
index ed8b089ba..26d04843e 100644
--- a/vpn-daemons/vpnc/ChangeLog
+++ b/vpn-daemons/vpnc/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-23  Robert Love  <rml@novell.com>
+
+	* properties/nm-vpnc-dialog.glade: Add (back) 'Optional Information'
+	  label for GtkExpander.  Use new-style Glade (separate label, not a
+	  property of the GtkExpander).
+
 2006-01-05  Tim Niemueller <tim@niemueller.de>
 
 	* configure.in: Explicitly set AUX_DIR to . to prevent autoconf from
diff --git a/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade b/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade
index 52dd2ea97..0d3f1d744 100644
--- a/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade
+++ b/vpn-daemons/vpnc/properties/nm-vpnc-dialog.glade
@@ -415,7 +415,7 @@
 	<widget class="GtkExpander" id="vpnc-optional-information-expander">
 	  <property name="visible">True</property>
 	  <property name="can_focus">True</property>
-	  <property name="expanded">True</property>
+	  <property name="expanded">False</property>
 	  <property name="spacing">6</property>
 
 	  <child>
@@ -729,6 +729,29 @@
 	      </child>
 	    </widget>
 	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label17">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">O_ptional Information</property>
+	      <property name="use_underline">True</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.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="type">label_item</property>
+	    </packing>
+	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>