* plugins/gtk+/gtk+.xml.in: Setting "can-focus" as "save-always" for all widgets (bug 638079).

Conflicts:

	plugins/gtk+/gtk+.xml.in

2 files changed, 6 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index c70dc372..4378e2db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,9 +10,11 @@
 	  object's value as a consequence of dupping (backend uses this to write properties with custom
 	  values and does not expect that).
 
-	* m4/python.m4: Applying patch to allow better builds on win32, patch by Dieter Verfaillie, 
+	* m4/python.m4: Applying patch to allow better builds on win32, patch by Dieter Verfaillie,
 	  bug 634978.
 
+	* plugins/gtk+/gtk+.xml.in: Setting "can-focus" as "save-always" for all widgets (bug 638079).
+
 2010-12-30  Christian Persch <chpe@gnome.org>
 
 	* plugins/gtk+/glade-attributes.c: Use locale-independent strtod &
diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
index 333bd323..3aee116f 100644
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@ -57,6 +57,9 @@
 	  <visible-lines>2</visible-lines>
 	</property>
 	<property id="tooltip-markup" since="2.12" weight="4.1" libglade-unsupported="True"/>
+        <property id="can-focus" common="True" save-always="True"/>
+	<property id="has-default" common="True" ignore="True"/>
+	<property id="can-default" common="True" />
 	<property id="visible" default="True" common="True" ignore="True"/>
 	<property id="width-request"  common="True" optional="True" optional-default="False" default="0"/>
 	<property id="height-request" common="True" optional="True" optional-default="False" default="0"/>
@@ -111,7 +114,6 @@
 	<property id="parent" disabled="True"/>
 	<property id="style" disabled="True"/>
 	<property id="sensitive" ignore="True"/>
-	<property id="has-default" ignore="True" common="True"/>
 	<property id="double-buffered" since="2.18"/>
 
 	<!-- Accelerators -->
@@ -802,7 +804,6 @@ embedded in another object</_tooltip>
       </signals>
 
       <properties>
-        <property id="can-focus" save-always="True"/>
 	<property id="text" translatable="True" custom-layout="True"/>
         <property id="buffer" libglade-unsupported="True" create-type="GtkEntryBuffer" since="2.18" custom-layout="True"/>
 
@@ -899,7 +900,6 @@ embedded in another object</_tooltip>
       <write-widget-function>glade_gtk_button_write_widget</write-widget-function>
 
       <properties>
-	<property id="can-focus" save-always="True"/>
 	<property id="receives-default" save-always="True"/>
 	<property id="image" parentless-widget="True" create-type="GtkImage" 
 		  libglade-unsupported="True" custom-layout="True"/>
@@ -993,7 +993,6 @@ embedded in another object</_tooltip>
       <properties>
         <property id="text" disabled="True"/>
         <property id="value" disabled="True"/>
-	<property id="can-focus" default="True"/>
         <property id="adjustment" default="0 0 100 1 10 0"/>
         <property id="update-policy">
   	  <displayable-values>
@@ -1583,7 +1582,6 @@ embedded in another object</_tooltip>
     
     <glade-widget-class name="GtkScrolledWindow" generic-name="scrolledwindow" _title="Scrolled Window">
       <properties>
-        <property id="can-focus" save-always="True"/>
         <property id="window-placement-set" since="2.10" ignore="True"/>
       	<property id="hscrollbar-policy" default="GTK_POLICY_AUTOMATIC">
   	  <displayable-values>
@@ -1679,9 +1677,6 @@ embedded in another object</_tooltip>
 	<property id="default-height" default="115" optional="True" optional-default="False"/>
 
 	<property common="True" id="sensitive"/>
-	<property common="True" id="can-default"/>
-	<property common="True" id="has-default"/>
-	<property common="True" id="can-focus"/>
 
 	<property id="image" since="2.10" parentless-widget="True"/>
 	<property id="secondary-text" translatable="True" since="2.10"/>