[glade/glade-3-14] Fixed Bug #685816 "Widget attributes editing broken" by reverting old fix and setting use-action-app

[Juan Pablo Ugarte <jpu src gnome org>]

commit a56908fbb4668354904f0020f3e5de1627d9b39b
Author: Juan Pablo Ugarte <juanpablougarte gmail com>
Date:   Thu Nov 1 21:20:22 2012 -0300

    Fixed Bug #685816 "Widget attributes editing broken" by reverting old fix
    and setting use-action-appearance default back to false so the old sensitivity
    code can work as ussual.

 plugins/gtk+/glade-gtk-activatable.c |    1 +
 plugins/gtk+/gtk+.xml.in             |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/plugins/gtk+/glade-gtk-activatable.c b/plugins/gtk+/glade-gtk-activatable.c
index 31d538f..1fec1fb 100644
--- a/plugins/gtk+/glade-gtk-activatable.c
+++ b/plugins/gtk+/glade-gtk-activatable.c
@@ -73,6 +73,7 @@ glade_gtk_activatable_evaluate_property_sensitivity (GObject *object,
       glade_widget_property_set_sensitive (gwidget, "stock", sensitivity, msg);
       //glade_widget_property_set_sensitive (gwidget, "use-stock", sensitivity, msg);
       glade_widget_property_set_sensitive (gwidget, "image", sensitivity, msg);
+      glade_widget_property_set_sensitive (gwidget, "image-position", sensitivity, msg);
       glade_widget_property_set_sensitive (gwidget, "custom-child", sensitivity, msg);
       glade_widget_property_set_sensitive (gwidget, "stock-id", sensitivity, msg);
       glade_widget_property_set_sensitive (gwidget, "label-widget", sensitivity, msg);
diff --git a/plugins/gtk+/gtk+.xml.in b/plugins/gtk+/gtk+.xml.in
index 1d9ccf5..f1c8464 100644
--- a/plugins/gtk+/gtk+.xml.in
+++ b/plugins/gtk+/gtk+.xml.in
@@ -535,7 +535,7 @@ embedded in another object</_tooltip>
 
 	<!-- GtkActivatable -->
       	<property id="related-action" _name="Related Action" custom-layout="True" since="2.16" save="False" needs-sync="True"/>
-      	<property id="use-action-appearance" _name="Use Action Appearance" save="False" custom-layout="True" needs-sync="True" since="2.16"/>
+      	<property id="use-action-appearance" _name="Use Action Appearance" save="False" custom-layout="True" needs-sync="True" since="2.16" default="False"/>
 
 	<!-- Atk click property -->
 	<property id="atk-click" _name="Click" ignore="True" atk-property="True" save="False" 
@@ -756,7 +756,7 @@ embedded in another object</_tooltip>
       <properties>
 	<!-- GtkActivatable -->
       	<property id="related-action" _name="Related Action" custom-layout="True" since="2.16" save="False" needs-sync="True"/>
-      	<property id="use-action-appearance" _name="Use Action Appearance" custom-layout="True" save="False" needs-sync="True" since="2.16"/>
+      	<property id="use-action-appearance" _name="Use Action Appearance" custom-layout="True" save="False" needs-sync="True" since="2.16" default="False"/>
       </properties>
 
     </glade-widget-class>
@@ -1048,7 +1048,7 @@ embedded in another object</_tooltip>
 
 	<!-- GtkActivatable -->
       	<property id="related-action" _name="Related Action" custom-layout="True" since="2.16" save="False" needs-sync="True"/>
-      	<property id="use-action-appearance" _name="Use Action Appearance" custom-layout="True" save="False" needs-sync="True" since="2.16"/>
+      	<property id="use-action-appearance" _name="Use Action Appearance" custom-layout="True" save="False" needs-sync="True" since="2.16" default="False"/>
 
 	<!-- Atk click property -->
 	<property id="atk-click" _name="Click" ignore="True" atk-property="True" save="False" multiline="True">
@@ -1133,7 +1133,7 @@ embedded in another object</_tooltip>
 	    <value-type>GtkToggleAction</value-type>
           </parameter-spec>
         </property>
-        <property id="use-action-appearance" _name="Use Action Appearance" custom-layout="True" save="False" needs-sync="True"/>
+        <property id="use-action-appearance" _name="Use Action Appearance" custom-layout="True" save="False" needs-sync="True" default="False"/>
       </properties>
     </glade-widget-class>