From fc21883ff4129a4db7366403accb63241a146c49 Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Tue, 18 Aug 2009 16:23:12 +0000 Subject: 01_focus_windows.patch: stolen upstream. Focus zenity windows by default. Closes: #528455. --- debian/patches/01_focus_windows.patch | 105 ++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 debian/patches/01_focus_windows.patch (limited to 'debian/patches') diff --git a/debian/patches/01_focus_windows.patch b/debian/patches/01_focus_windows.patch new file mode 100644 index 00000000..9157f5c5 --- /dev/null +++ b/debian/patches/01_focus_windows.patch @@ -0,0 +1,105 @@ +Debian #528455 +GNOME #561131 + +From b87f233061134f8876803d150f1d1196d2d41561 Mon Sep 17 00:00:00 2001 +From: Lucas Rocha +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 @@ + Calendar selection + center + dialog +- False ++ True + False + + +@@ -129,7 +129,7 @@ + Warning + center + dialog +- False ++ True + False + + +@@ -213,7 +213,7 @@ + Question + center + dialog +- False ++ True + False + + +@@ -278,7 +278,7 @@ + Add a new entry + center + dialog +- False ++ True + False + + +@@ -377,7 +377,7 @@ + 300 + 200 + dialog +- False ++ True + False + + +@@ -455,7 +455,7 @@ + Progress + center + dialog +- False ++ True + False + + +@@ -551,7 +551,7 @@ + Error + center + dialog +- False ++ True + False + + +@@ -643,7 +643,7 @@ + 300 + 196 + dialog +- False ++ True + False + + +@@ -744,7 +744,7 @@ + Information + center + dialog +- False ++ True + False + + +@@ -827,7 +827,7 @@ + 300 + 100 + dialog +- False ++ True + False + + +-- +cgit v0.8.2 -- cgit From bb190a168b401b1a79d2f94c717119adc3a5fa5d Mon Sep 17 00:00:00 2001 From: Josselin Mouette Date: Tue, 18 Aug 2009 16:26:42 +0000 Subject: Backport patch for 2.26 which still uses glade --- debian/patches/01_focus_windows.patch | 195 ++++++++++++++++------------------ 1 file changed, 93 insertions(+), 102 deletions(-) (limited to 'debian/patches') 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 -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 @@ - Calendar selection - center - dialog -- False -+ True - False - - -@@ -129,7 +129,7 @@ - Warning - center - dialog -- False -+ True - False - - -@@ -213,7 +213,7 @@ - Question - center - dialog -- False -+ True - False - - -@@ -278,7 +278,7 @@ - Add a new entry - center - dialog -- False -+ True - False - - -@@ -377,7 +377,7 @@ - 300 - 200 - dialog -- False -+ True - False - - -@@ -455,7 +455,7 @@ - Progress - center - dialog -- False -+ True - False - - -@@ -551,7 +551,7 @@ - Error - center - dialog -- False -+ True - False - - -@@ -643,7 +643,7 @@ - 300 - 196 - dialog -- False -+ True - False - - -@@ -744,7 +744,7 @@ - Information - center - dialog -- False -+ True - False - - -@@ -827,7 +827,7 @@ - 300 - 100 - dialog -- False -+ True - False - - --- -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 @@ + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST +- False ++ True + False + False + +@@ -177,7 +177,7 @@ + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST +- False ++ True + False + False + +@@ -288,7 +288,7 @@ + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST +- False ++ True + False + False + +@@ -385,7 +385,7 @@ + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST +- False ++ True + False + False + +@@ -510,7 +510,7 @@ + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST +- False ++ True + False + False + +@@ -613,7 +613,7 @@ + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST +- False ++ True + False + False + +@@ -736,7 +736,7 @@ + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST +- False ++ True + False + False + +@@ -862,7 +862,7 @@ + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST +- False ++ True + False + False + +@@ -998,7 +998,7 @@ + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST +- False ++ True + False + False + +@@ -1111,7 +1111,7 @@ + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST +- False ++ True + False + False + -- cgit From c137b795849bc9fcfb20cdb479aacc652e70e6b0 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Thu, 24 Sep 2009 18:04:48 +0000 Subject: * New upstream release. * debian/control: - Bumped standards-version to 3.8.3. No changes needed. - libglade2-dev B-D removed, it's no more needed as per configure.ac requirements. - libglib2.0-dev B-D added as per configure.ac requirements. * debian/copyright: - added missing copyright holders. * debian/patches/01_focus_windows: - removed, applied upstream * debian/rules: - simple-patchsys include removed as far as we have no patches to get applied anymore. --- debian/patches/01_focus_windows.patch | 96 ----------------------------------- 1 file changed, 96 deletions(-) (limited to 'debian/patches') diff --git a/debian/patches/01_focus_windows.patch b/debian/patches/01_focus_windows.patch index df8c6fd9..e69de29b 100644 --- a/debian/patches/01_focus_windows.patch +++ b/debian/patches/01_focus_windows.patch @@ -1,96 +0,0 @@ -Debian #528455 -GNOME #561131 -zenity windows don't appear with the focus - ---- 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 @@ - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST -- False -+ True - False - False - -@@ -177,7 +177,7 @@ - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST -- False -+ True - False - False - -@@ -288,7 +288,7 @@ - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST -- False -+ True - False - False - -@@ -385,7 +385,7 @@ - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST -- False -+ True - False - False - -@@ -510,7 +510,7 @@ - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST -- False -+ True - False - False - -@@ -613,7 +613,7 @@ - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST -- False -+ True - False - False - -@@ -736,7 +736,7 @@ - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST -- False -+ True - False - False - -@@ -862,7 +862,7 @@ - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST -- False -+ True - False - False - -@@ -998,7 +998,7 @@ - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST -- False -+ True - False - False - -@@ -1111,7 +1111,7 @@ - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST -- False -+ True - False - False - -- cgit From 8a1a2ef0857c8afd7076e176693bb5757e63f11c Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Sat, 27 Feb 2010 14:41:57 +0000 Subject: * debian/patches/02_dont_quit_zenity_when_stdin_ends.patch: - Don't quit zenity when listening on stdin and the stream ends. Closes: #506425. --- .../02_dont_quit_zenity_when_stdin_ends.patch | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 debian/patches/02_dont_quit_zenity_when_stdin_ends.patch (limited to 'debian/patches') diff --git a/debian/patches/02_dont_quit_zenity_when_stdin_ends.patch b/debian/patches/02_dont_quit_zenity_when_stdin_ends.patch new file mode 100644 index 00000000..3310189a --- /dev/null +++ b/debian/patches/02_dont_quit_zenity_when_stdin_ends.patch @@ -0,0 +1,30 @@ +From fc381b5938f7235401286d4821f03d2b05d4876a Mon Sep 17 00:00:00 2001 +From: Emilio Pozuelo Monfort +Date: Sat, 27 Feb 2010 15:32:23 +0100 +Subject: [PATCH] Don't quit zenity when the input stream is closed + +When using --listen for a notification, zenity quits when the stream +ends. This makes it impossible to read commands from a pipe as in +`echo icon:info | zenity --notification --listen'. + +https://bugzilla.gnome.org/show_bug.cgi?id=525596 +--- + src/notification.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/src/notification.c b/src/notification.c +index 674eaec..ab44477 100644 +--- a/src/notification.c ++++ b/src/notification.c +@@ -229,8 +229,6 @@ zenity_notification_handle_stdin (GIOChannel *channel, + + if ((condition & G_IO_HUP) != 0) { + g_io_channel_shutdown (channel, TRUE, NULL); +- zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK); +- gtk_main_quit (); + return FALSE; + } + +-- +1.7.0 + -- cgit From 0e82248225dd2ba5c8f148cbfd4789d94d8a68ca Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Sat, 27 Feb 2010 16:11:07 +0000 Subject: * debian/patches/01_focus_windows.patch: - Removed, it's empty. * debian/patches/01_dont_quit_zenity_when_stdin_ends.patch: * debian/rules: - Include simple-patchsys.mk. --- .../01_dont_quit_zenity_when_stdin_ends.patch | 30 ++++++++++++++++++++++ debian/patches/01_focus_windows.patch | 0 .../02_dont_quit_zenity_when_stdin_ends.patch | 30 ---------------------- 3 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 debian/patches/01_dont_quit_zenity_when_stdin_ends.patch delete mode 100644 debian/patches/01_focus_windows.patch delete mode 100644 debian/patches/02_dont_quit_zenity_when_stdin_ends.patch (limited to 'debian/patches') diff --git a/debian/patches/01_dont_quit_zenity_when_stdin_ends.patch b/debian/patches/01_dont_quit_zenity_when_stdin_ends.patch new file mode 100644 index 00000000..3310189a --- /dev/null +++ b/debian/patches/01_dont_quit_zenity_when_stdin_ends.patch @@ -0,0 +1,30 @@ +From fc381b5938f7235401286d4821f03d2b05d4876a Mon Sep 17 00:00:00 2001 +From: Emilio Pozuelo Monfort +Date: Sat, 27 Feb 2010 15:32:23 +0100 +Subject: [PATCH] Don't quit zenity when the input stream is closed + +When using --listen for a notification, zenity quits when the stream +ends. This makes it impossible to read commands from a pipe as in +`echo icon:info | zenity --notification --listen'. + +https://bugzilla.gnome.org/show_bug.cgi?id=525596 +--- + src/notification.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/src/notification.c b/src/notification.c +index 674eaec..ab44477 100644 +--- a/src/notification.c ++++ b/src/notification.c +@@ -229,8 +229,6 @@ zenity_notification_handle_stdin (GIOChannel *channel, + + if ((condition & G_IO_HUP) != 0) { + g_io_channel_shutdown (channel, TRUE, NULL); +- zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK); +- gtk_main_quit (); + return FALSE; + } + +-- +1.7.0 + diff --git a/debian/patches/01_focus_windows.patch b/debian/patches/01_focus_windows.patch deleted file mode 100644 index e69de29b..00000000 diff --git a/debian/patches/02_dont_quit_zenity_when_stdin_ends.patch b/debian/patches/02_dont_quit_zenity_when_stdin_ends.patch deleted file mode 100644 index 3310189a..00000000 --- a/debian/patches/02_dont_quit_zenity_when_stdin_ends.patch +++ /dev/null @@ -1,30 +0,0 @@ -From fc381b5938f7235401286d4821f03d2b05d4876a Mon Sep 17 00:00:00 2001 -From: Emilio Pozuelo Monfort -Date: Sat, 27 Feb 2010 15:32:23 +0100 -Subject: [PATCH] Don't quit zenity when the input stream is closed - -When using --listen for a notification, zenity quits when the stream -ends. This makes it impossible to read commands from a pipe as in -`echo icon:info | zenity --notification --listen'. - -https://bugzilla.gnome.org/show_bug.cgi?id=525596 ---- - src/notification.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/src/notification.c b/src/notification.c -index 674eaec..ab44477 100644 ---- a/src/notification.c -+++ b/src/notification.c -@@ -229,8 +229,6 @@ zenity_notification_handle_stdin (GIOChannel *channel, - - if ((condition & G_IO_HUP) != 0) { - g_io_channel_shutdown (channel, TRUE, NULL); -- zen_data->exit_code = zenity_util_return_exit_code (ZENITY_OK); -- gtk_main_quit (); - return FALSE; - } - --- -1.7.0 - -- cgit