* settings-dialogs/xfwm4-tweaks-dialog.glade,

	  settings-dialogs/tweaks-settings.c, src/settings.c, src/settings.h, 
	  src/client.c, src/client.h, defaults/defaults: Add new option do 
	  disable blinking of urgent windows. 
 

(Old svn revision: 28585)

2 files changed, 55 insertions, 21 deletions

diff --git a/settings-dialogs/tweaks-settings.c b/settings-dialogs/tweaks-settings.c
index bec7d6cbd..4bb241cc4 100644
--- a/settings-dialogs/tweaks-settings.c
+++ b/settings-dialogs/tweaks-settings.c
@@ -1,6 +1,7 @@
 /*
  *  Copyright (c) 2008 Stephan Arts <stephan@xfce.org>
  *  Copyright (c) 2008 Jannis Pohlmann <jannis@xfce.org>
+ *  Copyright (c) 2008 Olivier Fourdan <olivier@xfce.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -128,6 +129,13 @@ cb_activate_placement_mouse_radio_toggled (GtkToggleButton *toggle, XfconfChanne
 }
 
 static void
+cb_urgent_blink_button_toggled (GtkToggleButton *toggle, GtkWidget *repeat_urgent_blink)
+{
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (repeat_urgent_blink), FALSE);
+    gtk_widget_set_sensitive (repeat_urgent_blink, gtk_toggle_button_get_active (toggle));
+}
+
+static void
 wm_tweaks_dialog_configure_widgets (GladeXML *gxml)
 {
     GtkWidget *vbox;
@@ -150,7 +158,6 @@ wm_tweaks_dialog_configure_widgets (GladeXML *gxml)
     /* Focus tab */
     GtkWidget *prevent_focus_stealing_check = glade_xml_get_widget (gxml, "prevent_focus_stealing_check");
     GtkWidget *focus_hint_check = glade_xml_get_widget (gxml, "focus_hint_check");
-    GtkWidget *repeat_urgent_blink = glade_xml_get_widget (gxml, "repeat_urgent_blink");
 
     GtkWidget *activate_action_bring_option = glade_xml_get_widget (gxml, "activate_action_bring_option");
     GtkWidget *activate_action_switch_option = glade_xml_get_widget (gxml, "activate_action_switch_option");
@@ -162,6 +169,8 @@ wm_tweaks_dialog_configure_widgets (GladeXML *gxml)
     GtkWidget *borderless_maximize_check = glade_xml_get_widget (gxml, "borderless_maximize_check");
     GtkWidget *restore_on_move_check = glade_xml_get_widget (gxml, "restore_on_move_check");
     GtkWidget *snap_resist_check = glade_xml_get_widget (gxml, "snap_resist_check");
+    GtkWidget *urgent_blink = glade_xml_get_widget (gxml, "urgent_blink");
+    GtkWidget *repeat_urgent_blink = glade_xml_get_widget (gxml, "repeat_urgent_blink");
 
     /* Workspaces tab */
     GtkWidget *scroll_workspaces_check = glade_xml_get_widget (gxml, "scroll_workspaces_check");
@@ -265,6 +274,10 @@ wm_tweaks_dialog_configure_widgets (GladeXML *gxml)
                       "changed",
                       G_CALLBACK (cb_easy_click_combo_box_changed),
                       xfwm4_channel);
+    g_signal_connect (G_OBJECT (urgent_blink),
+                      "toggled",
+                      G_CALLBACK (cb_urgent_blink_button_toggled),
+                      repeat_urgent_blink);
 
     /* Bind easy properties */
     /* Cycling tab */
@@ -294,10 +307,6 @@ wm_tweaks_dialog_configure_widgets (GladeXML *gxml)
                             "/general/focus_hint",
                             G_TYPE_BOOLEAN,
                             (GObject *)focus_hint_check, "active");
-    xfconf_g_property_bind (xfwm4_channel,
-                            "/general/repeat_urgent_blink",
-                            G_TYPE_BOOLEAN,
-                            (GObject *)repeat_urgent_blink, "active");
 
     /* Accessibility tab */
     xfconf_g_property_bind (xfwm4_channel,
@@ -316,6 +325,16 @@ wm_tweaks_dialog_configure_widgets (GladeXML *gxml)
                             "/general/snap_resist",
                             G_TYPE_BOOLEAN,
                             (GObject *)snap_resist_check, "active");
+    xfconf_g_property_bind (xfwm4_channel,
+                            "/general/urgent_blink",
+                            G_TYPE_BOOLEAN,
+                            (GObject *)urgent_blink, "active");
+    xfconf_g_property_bind (xfwm4_channel,
+                            "/general/repeat_urgent_blink",
+                            G_TYPE_BOOLEAN,
+                            (GObject *)repeat_urgent_blink, "active");
+    gtk_widget_set_sensitive (repeat_urgent_blink, 
+	                          gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (urgent_blink)));
 
     /* Workspaces tab */
     xfconf_g_property_bind (xfwm4_channel,
diff --git a/settings-dialogs/xfwm4-tweaks-dialog.glade b/settings-dialogs/xfwm4-tweaks-dialog.glade
index fa978d25a..126802d6c 100644
--- a/settings-dialogs/xfwm4-tweaks-dialog.glade
+++ b/settings-dialogs/xfwm4-tweaks-dialog.glade
@@ -132,21 +132,6 @@ or "skip taskbar" properties set</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkCheckButton" id="repeat_urgent_blink">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="label" translatable="yes">Keep urgent windows blinking</property>
-                    <property name="use_underline">True</property>
-                    <property name="response_id">0</property>
-                    <property name="draw_indicator">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <child>
                   <widget class="GtkVBox" id="prevent_focus_stealing_box">
                     <property name="visible">True</property>
                     <property name="spacing">6</property>
@@ -219,7 +204,7 @@ or "skip taskbar" properties set</property>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
-                    <property name="position">3</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
               </widget>
@@ -338,6 +323,36 @@ or "skip taskbar" properties set</property>
                     <property name="position">4</property>
                   </packing>
                 </child>
+                <child>
+                  <widget class="GtkCheckButton" id="urgent_blink">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">Notify of _urgency by making window's decoration blink</property>
+                    <property name="use_underline">True</property>
+                    <property name="response_id">0</property>
+                    <property name="draw_indicator">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkCheckButton" id="repeat_urgent_blink">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="label" translatable="yes">Keep urgent windows _blinking repeatedly</property>
+                    <property name="use_underline">True</property>
+                    <property name="response_id">0</property>
+                    <property name="draw_indicator">True</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">6</property>
+                  </packing>
+                </child>
               </widget>
               <packing>
                 <property name="position">2</property>