[Xfce4-commits] <midori:master> Move 'Flash windows' option into History List

[Christian Dywan]

Updating branch refs/heads/master
         to 3acf3d986bf8d463660d873349bbf0845943f961 (commit)
       from 66c7441c81b0b7fa95f97d1c63b9bb9d4600ef2d (commit)

commit 3acf3d986bf8d463660d873349bbf0845943f961
Author: Christian Dywan <christian at twotoasts.de>
Date:   Thu Mar 28 18:01:44 2013 +0100

    Move 'Flash windows' option into History List

 extensions/history-list.vala |    6 ++++++
 katze/katze.vapi             |    1 +
 midori/midori-preferences.c  |    9 ---------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/extensions/history-list.vala b/extensions/history-list.vala
index 6ad4ad6..8aaea2a 100644
--- a/extensions/history-list.vala
+++ b/extensions/history-list.vala
@@ -312,6 +312,12 @@ namespace HistoryList {
 
             table.attach_defaults (this.closing_behavior, 1, 2, 0, 1);
 
+#if !HAVE_WIN32
+            var proxy = Katze.property_proxy (this.hl_manager.get_app ().settings, "flash-window-on-new-bg-tabs", null);
+            (proxy as Gtk.Button).label = _("Flash window on background tabs");
+            table.attach_defaults (proxy, 0, 2, 1, 2);
+#endif
+
 #if HAVE_GTK3
             (get_content_area() as Gtk.Box).pack_start (table, false, true, 0);
 #else
diff --git a/katze/katze.vapi b/katze/katze.vapi
index 018893e..c5cf318 100644
--- a/katze/katze.vapi
+++ b/katze/katze.vapi
@@ -4,6 +4,7 @@
 [CCode (cprefix = "Katze", lower_case_cprefix = "katze_")]
 namespace Katze {
     static void assert_str_equal (string input, string result, string? expected);
+    static unowned Gtk.Widget property_proxy (void* object, string property, string? hint);
 
     [CCode (cheader_filename = "katze/katze.h")]
     public class Array : Katze.Item {
diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index c3a9508..c54c25c 100644
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -411,15 +411,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
     gtk_button_set_label (GTK_BUTTON (button), _("Allow scripts to open popups"));
     gtk_widget_set_tooltip_text (button, _("Whether scripts are allowed to open popup windows automatically"));
     SPANNED_ADD (button);
-    button = katze_property_proxy (settings, "middle-click-opens-selection", NULL);
-    gtk_button_set_label (GTK_BUTTON (button), _("Middle click opens Selection"));
-    gtk_widget_set_tooltip_text (button, _("Load an address from the selection via middle click"));
-    INDENTED_ADD (button);
-    #ifndef G_OS_WIN32
-    button = katze_property_proxy (settings, "flash-window-on-new-bg-tabs", NULL);
-    gtk_button_set_label (GTK_BUTTON (button), _("Flash window on background tabs"));
-    SPANNED_ADD (button);
-    #endif
 
     FRAME_NEW (NULL);
     button = gtk_label_new (_("Preferred languages"));