diff options
| author | Juan Pablo Ugarte <juanpablougarte@gmail.com> | 2012-11-01 21:20:22 -0300 |
|---|---|---|
| committer | Juan Pablo Ugarte <juanpablougarte@gmail.com> | 2012-11-01 21:30:38 -0300 |
| commit | 6ad10b3960d2dd7962cb9d4f58d76cf6296c76bc (patch) | |
| tree | e46a65ad7c0ceb83d3e076dc45932d14273a8813 | |
| parent | 2dfa5f216727d14ca9dbef4bb6d8115f3872a0c2 (diff) | |
| download | glade-6ad10b3960d2dd7962cb9d4f58d76cf6296c76bc.tar.gz | |
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.
| -rw-r--r-- | plugins/gtk+/glade-gtk-activatable.c | 1 | ||||
| -rw-r--r-- | 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 31d538f3..1fec1fb3 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 7028319c..4c4620ca 100644 --- a/plugins/gtk+/gtk+.xml.in +++ b/plugins/gtk+/gtk+.xml.in @@ -545,7 +545,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" @@ -766,7 +766,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> @@ -1058,7 +1058,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"> @@ -1143,7 +1143,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> |