Updating branch refs/heads/master to 317eefa1c8ad5b4e36ddab84dbdd7041b07e27e9 (commit) from dba473e06980c4e5074ad0b89be7259762698cb3 (commit)
commit 317eefa1c8ad5b4e36ddab84dbdd7041b07e27e9 Author: Christian Dywan <christ...@twotoasts.de> Date: Fri Jan 8 01:08:37 2010 +0100 Prevent a recurive loop when toggling operating controls midori/midori-panel.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/midori/midori-panel.c b/midori/midori-panel.c index 2bf780e..4f5c097 100644 --- a/midori/midori-panel.c +++ b/midori/midori-panel.c @@ -522,11 +522,9 @@ midori_panel_set_property (GObject* object, sokoke_widget_set_visible (panel->labelbar, panel->show_controls); sokoke_widget_set_visible (panel->toolbar, panel->show_controls); if (panel->button_controls) - { gtk_toggle_tool_button_set_active ( GTK_TOGGLE_TOOL_BUTTON (panel->button_controls), !panel->show_controls); - } break; case PROP_RIGHT_ALIGNED: midori_panel_set_right_aligned (panel, g_value_get_boolean (value)); @@ -726,7 +724,8 @@ static void midori_panel_show_controls_toggled_cb (GtkWidget* menuitem, MidoriPanel* panel) { - g_object_set (panel, "show-controls", !panel->show_controls, NULL); + if (panel->show_controls != !gtk_toggle_tool_button_get_active (GTK_TOGGLE_TOOL_BUTTON (menuitem))) + g_object_set (panel, "show-controls", !panel->show_controls, NULL); } #endif _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits