[Xfce4-commits] <thunar:nick/patch-queue> Add another UCA patch to fix the first (second actually) one.

[Jannis Pohlmann]

Updating branch refs/heads/nick/patch-queue
         to c9d04eabcd801444955f72dd231378afcaf8afbd (commit)
       from 758f2ceed69f1ff1a02b41e04eb38af239bfb8c2 (commit)

commit c9d04eabcd801444955f72dd231378afcaf8afbd
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Sat Dec 19 15:14:22 2009 +0100

    Add another UCA patch to fix the first (second actually) one.

 add-startup-notification-to-the-uca-plugin.patch |    7 ++--
 fix-issues-in-the-uca-patch.patch                |   43 ++++++++++++++++++++++
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/add-startup-notification-to-the-uca-plugin.patch b/add-startup-notification-to-the-uca-plugin.patch
index 0103df1..e98e603 100644
--- a/add-startup-notification-to-the-uca-plugin.patch
+++ b/add-startup-notification-to-the-uca-plugin.patch
@@ -1,13 +1,14 @@
-From 9ca920912a7bedf6ed47935dac3f60388375448c Mon Sep 17 00:00:00 2001
+From 185694b7658647fbcd46af79eead14fb19b5b2da Mon Sep 17 00:00:00 2001
 From: Nick Schermer <nick at xfce.org>
 Date: Thu, 17 Dec 2009 22:08:23 +0100
-Subject: [PATCH] Add startup notification to the UCA plugin.
+Subject: [PATCH 1/2] Add startup notification to the UCA plugin.
 
 This makes the UCA plugin work properly with focus stealing. It
 requires a version of libxfce4ui with the
 xfce_spawn_on_screen_with_child_watch() function.
 
 Signed-off-by: Nick Schermer <nick at xfce.org>
+Signed-off-by: Jannis Pohlmann <jannis at xfce.org>
 ---
  plugins/thunar-uca/Makefile.am           |    6 ++
  plugins/thunar-uca/thunar-uca-editor.c   |   22 ++++-
@@ -505,5 +506,5 @@ index 3c5550a..bfaeb85 100644
 +    }
 +}
 -- 
-1.6.5.6
+1.6.5
 
diff --git a/fix-issues-in-the-uca-patch.patch b/fix-issues-in-the-uca-patch.patch
new file mode 100644
index 0000000..92eac58
--- /dev/null
+++ b/fix-issues-in-the-uca-patch.patch
@@ -0,0 +1,43 @@
+From d833f38cb626d33d72f8eea8e400ba7e211d07fd Mon Sep 17 00:00:00 2001
+From: Jannis Pohlmann <jannis at xfce.org>
+Date: Sat, 19 Dec 2009 15:01:44 +0100
+Subject: [PATCH 2/2] Fix issues in the patch.
+
+---
+ plugins/thunar-uca/thunar-uca-editor.c   |    6 +++---
+ plugins/thunar-uca/thunar-uca-provider.c |    2 ++
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/thunar-uca/thunar-uca-editor.c b/plugins/thunar-uca/thunar-uca-editor.c
+index eac1241..00add99 100644
+--- a/plugins/thunar-uca/thunar-uca-editor.c
++++ b/plugins/thunar-uca/thunar-uca-editor.c
+@@ -201,9 +201,9 @@ thunar_uca_editor_init (ThunarUcaEditor *uca_editor)
+   g_object_unref (G_OBJECT (relation));
+ 
+   uca_editor->sn_button = gtk_check_button_new_with_label (_("Use Startup Notification"));
+-  gtk_widget_set_tooltip_text (uca_editor->sn_button, _("Enable this option if you want a waiting cursor when the action "
+-                                                        "is launched. This is also highly recommended when you have focus "
+-                                                        "stealing enabled in your window manager."));
++  gtk_widget_set_tooltip_text (uca_editor->sn_button, _("Enable this option if you want a waiting cursor to be shown while the "
++                                                        "action is launched. This is also highly recommended if you have focus "
++                                                        "stealing prevention enabled in your window manager."));
+   gtk_table_attach (GTK_TABLE (table), uca_editor->sn_button, 1, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
+   gtk_widget_show (uca_editor->sn_button);
+ 
+diff --git a/plugins/thunar-uca/thunar-uca-provider.c b/plugins/thunar-uca/thunar-uca-provider.c
+index bfaeb85..3ac481d 100644
+--- a/plugins/thunar-uca/thunar-uca-provider.c
++++ b/plugins/thunar-uca/thunar-uca-provider.c
+@@ -24,6 +24,8 @@
+ #endif
+ 
+ #include <gio/gio.h>
++
++#include <libxfce4util/libxfce4util.h>
+ #include <libxfce4ui/libxfce4ui.h>
+ 
+ #include <thunar-uca/thunar-uca-chooser.h>
+-- 
+1.6.5
+