[Xfce4-commits] <midori:master> Remove ability to hide operating controls

[Christian Dywan]

Updating branch refs/heads/master
         to e0c5bbedb349f0a89223e61073585ed0298e87d1 (commit)
       from 1d9d52b59a547a3f2d45c98f06dcc0df52476399 (commit)

commit e0c5bbedb349f0a89223e61073585ed0298e87d1
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sat Dec 11 20:18:04 2010 +0100

    Remove ability to hide operating controls

 midori/midori-panel.c       |   30 ++----------------------------
 midori/midori-websettings.c |    2 ++
 2 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/midori/midori-panel.c b/midori/midori-panel.c
index 0a2f7e0..f109d43 100644
--- a/midori/midori-panel.c
+++ b/midori/midori-panel.c
@@ -30,7 +30,6 @@ struct _MidoriPanel
 
     GtkWidget* labelbar;
     GtkWidget* toolbar;
-    GtkToolItem* button_controls;
     GtkWidget* toolbar_label;
     GtkWidget* frame;
     GtkWidget* toolbook;
@@ -192,6 +191,8 @@ midori_panel_class_init (MidoriPanelClass* class)
      * Whether to show operating controls.
      *
      * Since: 0.1.9
+     *
+     * Deprecated: 0.3.0
      */
     g_object_class_install_property (gobject_class,
                                      PROP_SHOW_CONTROLS,
@@ -450,12 +451,6 @@ midori_panel_set_property (GObject*      object,
         break;
     case PROP_SHOW_CONTROLS:
         panel->show_controls = g_value_get_boolean (value);
-        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));
@@ -619,16 +614,6 @@ midori_panel_action_activate_cb (GtkRadioAction* action,
     }
 }
 
-#if !HAVE_HILDON
-static void
-midori_panel_show_controls_toggled_cb (GtkWidget*   menuitem,
-                                       MidoriPanel* panel)
-{
-    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
-
 /**
  * midori_panel_append_page:
  * @panel: a #MidoriPanel
@@ -691,17 +676,6 @@ midori_panel_append_page (MidoriPanel*    panel,
     gtk_container_add (GTK_CONTAINER (panel->notebook), scrolled);
 
     toolbar = midori_viewable_get_toolbar (viewable);
-    #if !HAVE_HILDON
-    toolitem = gtk_toggle_tool_button_new_from_stock (GTK_STOCK_PROPERTIES);
-    gtk_tool_item_set_tooltip_text (toolitem, _("Hide operating controls"));
-    gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (toolitem),
-        !panel->show_controls);
-    g_signal_connect (toolitem, "clicked",
-        G_CALLBACK (midori_panel_show_controls_toggled_cb), panel);
-    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, 0);
-    gtk_widget_show (GTK_WIDGET (toolitem));
-    panel->button_controls = toolitem;
-    #endif
     gtk_widget_show (toolbar);
     gtk_container_add (GTK_CONTAINER (panel->toolbook), toolbar);
     g_signal_connect (viewable, "destroy",
diff --git a/midori/midori-websettings.c b/midori/midori-websettings.c
index 0240bf0..4148bf1 100644
--- a/midori/midori-websettings.c
+++ b/midori/midori-websettings.c
@@ -565,6 +565,8 @@ midori_web_settings_class_init (MidoriWebSettingsClass* class)
      * Whether to show the operating controls of the panel.
      *
      * Since: 0.1.9
+     *
+     * Deprecated: 0.3.0
      */
     g_object_class_install_property (gobject_class,
                                      PROP_SHOW_PANEL_CONTROLS,