Backport patch for 2.26 which still uses glade

1 files changed, 93 insertions, 102 deletions

diff --git a/debian/patches/01_focus_windows.patch b/debian/patches/01_focus_windows.patch
index 9157f5c5..df8c6fd9 100644
--- a/debian/patches/01_focus_windows.patch
+++ b/debian/patches/01_focus_windows.patch
@@ -1,105 +1,96 @@
 Debian #528455
 GNOME #561131
+zenity windows don't appear with the focus
 
-From b87f233061134f8876803d150f1d1196d2d41561 Mon Sep 17 00:00:00 2001
-From: Lucas Rocha <lucasr@litl.com>
-Date: Thu, 06 Aug 2009 14:42:04 +0000
-Subject: Bug 561131 – zenity windows don't appear with the focus
-
----
-diff --git a/src/zenity.ui b/src/zenity.ui
-index db30432..5275a07 100644
---- a/src/zenity.ui
-+++ b/src/zenity.ui
-@@ -7,7 +7,7 @@
-     <property name="title" translatable="yes">Calendar selection</property>
-     <property name="window_position">center</property>
-     <property name="type_hint">dialog</property>
--    <property name="focus_on_map">False</property>
-+    <property name="focus_on_map">True</property>
-     <property name="has_separator">False</property>
-     <signal name="destroy" handler="gtk_main_quit"/>
-     <child internal-child="vbox">
-@@ -129,7 +129,7 @@
-     <property name="title" translatable="yes">Warning</property>
-     <property name="window_position">center</property>
-     <property name="type_hint">dialog</property>
--    <property name="focus_on_map">False</property>
-+    <property name="focus_on_map">True</property>
-     <property name="has_separator">False</property>
-     <signal name="destroy" handler="gtk_main_quit"/>
-     <child internal-child="vbox">
-@@ -213,7 +213,7 @@
-     <property name="title" translatable="yes">Question</property>
-     <property name="window_position">center</property>
-     <property name="type_hint">dialog</property>
--    <property name="focus_on_map">False</property>
-+    <property name="focus_on_map">True</property>
-     <property name="has_separator">False</property>
-     <signal name="destroy" handler="gtk_main_quit"/>
-     <child internal-child="vbox">
-@@ -278,7 +278,7 @@
-     <property name="title" translatable="yes">Add a new entry</property>
-     <property name="window_position">center</property>
-     <property name="type_hint">dialog</property>
--    <property name="focus_on_map">False</property>
-+    <property name="focus_on_map">True</property>
-     <property name="has_separator">False</property>
-     <signal name="destroy" handler="gtk_main_quit"/>
-     <child internal-child="vbox">
-@@ -377,7 +377,7 @@
-     <property name="default_width">300</property>
-     <property name="default_height">200</property>
-     <property name="type_hint">dialog</property>
--    <property name="focus_on_map">False</property>
-+    <property name="focus_on_map">True</property>
-     <property name="has_separator">False</property>
-     <signal name="destroy" handler="gtk_main_quit"/>
-     <child internal-child="vbox">
-@@ -455,7 +455,7 @@
-     <property name="title" translatable="yes">Progress</property>
-     <property name="window_position">center</property>
-     <property name="type_hint">dialog</property>
--    <property name="focus_on_map">False</property>
-+    <property name="focus_on_map">True</property>
-     <property name="has_separator">False</property>
-     <signal name="destroy" handler="gtk_main_quit"/>
-     <child internal-child="vbox">
-@@ -551,7 +551,7 @@
-     <property name="title" translatable="yes">Error</property>
-     <property name="window_position">center</property>
-     <property name="type_hint">dialog</property>
--    <property name="focus_on_map">False</property>
-+    <property name="focus_on_map">True</property>
-     <property name="has_separator">False</property>
-     <signal name="destroy" handler="gtk_main_quit"/>
-     <child internal-child="vbox">
-@@ -643,7 +643,7 @@
-     <property name="default_width">300</property>
-     <property name="default_height">196</property>
-     <property name="type_hint">dialog</property>
--    <property name="focus_on_map">False</property>
-+    <property name="focus_on_map">True</property>
-     <property name="has_separator">False</property>
-     <signal name="destroy" handler="gtk_main_quit"/>
-     <child internal-child="vbox">
-@@ -744,7 +744,7 @@
-     <property name="title" translatable="yes">Information</property>
-     <property name="window_position">center</property>
-     <property name="type_hint">dialog</property>
--    <property name="focus_on_map">False</property>
-+    <property name="focus_on_map">True</property>
-     <property name="has_separator">False</property>
-     <signal name="destroy" handler="gtk_main_quit"/>
-     <child internal-child="vbox">
-@@ -827,7 +827,7 @@
-     <property name="default_width">300</property>
-     <property name="default_height">100</property>
-     <property name="type_hint">dialog</property>
--    <property name="focus_on_map">False</property>
-+    <property name="focus_on_map">True</property>
-     <property name="has_separator">False</property>
-     <signal name="destroy" handler="gtk_main_quit"/>
-     <child internal-child="vbox">
---
-cgit v0.8.2
+--- src/zenity.glade.orig	2009-08-18 18:24:11.718036836 +0200
++++ src/zenity.glade	2009-08-18 18:25:45.013694578 +0200
+@@ -16,7 +16,7 @@
+   <property name="skip_pager_hint">False</property>
+   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+-  <property name="focus_on_map">False</property>
++  <property name="focus_on_map">True</property>
+   <property name="urgency_hint">False</property>
+   <property name="has_separator">False</property>
+   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Fri, 27 Dec 2002 19:08:11 GMT"/>
+@@ -177,7 +177,7 @@
+   <property name="skip_pager_hint">False</property>
+   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+-  <property name="focus_on_map">False</property>
++  <property name="focus_on_map">True</property>
+   <property name="urgency_hint">False</property>
+   <property name="has_separator">False</property>
+   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Fri, 27 Dec 2002 23:24:20 GMT"/>
+@@ -288,7 +288,7 @@
+   <property name="skip_pager_hint">False</property>
+   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+-  <property name="focus_on_map">False</property>
++  <property name="focus_on_map">True</property>
+   <property name="urgency_hint">False</property>
+   <property name="has_separator">False</property>
+   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 12:03:54 GMT"/>
+@@ -385,7 +385,7 @@
+   <property name="skip_pager_hint">False</property>
+   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+-  <property name="focus_on_map">False</property>
++  <property name="focus_on_map">True</property>
+   <property name="urgency_hint">False</property>
+   <property name="has_separator">False</property>
+   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 12:15:37 GMT"/>
+@@ -510,7 +510,7 @@
+   <property name="skip_pager_hint">False</property>
+   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+-  <property name="focus_on_map">False</property>
++  <property name="focus_on_map">True</property>
+   <property name="urgency_hint">False</property>
+   <property name="has_separator">False</property>
+   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 12:34:38 GMT"/>
+@@ -613,7 +613,7 @@
+   <property name="skip_pager_hint">False</property>
+   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+-  <property name="focus_on_map">False</property>
++  <property name="focus_on_map">True</property>
+   <property name="urgency_hint">False</property>
+   <property name="has_separator">False</property>
+   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 14:46:29 GMT"/>
+@@ -736,7 +736,7 @@
+   <property name="skip_pager_hint">False</property>
+   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+-  <property name="focus_on_map">False</property>
++  <property name="focus_on_map">True</property>
+   <property name="urgency_hint">False</property>
+   <property name="has_separator">False</property>
+   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 15:05:42 GMT"/>
+@@ -862,7 +862,7 @@
+   <property name="skip_pager_hint">False</property>
+   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+-  <property name="focus_on_map">False</property>
++  <property name="focus_on_map">True</property>
+   <property name="urgency_hint">False</property>
+   <property name="has_separator">False</property>
+   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 22:19:04 GMT"/>
+@@ -998,7 +998,7 @@
+   <property name="skip_pager_hint">False</property>
+   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+-  <property name="focus_on_map">False</property>
++  <property name="focus_on_map">True</property>
+   <property name="urgency_hint">False</property>
+   <property name="has_separator">False</property>
+   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Sat, 28 Dec 2002 15:05:42 GMT"/>
+@@ -1111,7 +1111,7 @@
+   <property name="skip_pager_hint">False</property>
+   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+-  <property name="focus_on_map">False</property>
++  <property name="focus_on_map">True</property>
+   <property name="urgency_hint">False</property>
+   <property name="has_separator">False</property>
+   <signal name="destroy" handler="gtk_main_quit" last_modification_time="Tue, 13 Dec 2005 04:03:21 GMT"/>