diff options
author | 2013-03-29 22:58:04 +0000 | |
---|---|---|
committer | 2013-03-29 22:58:04 +0000 | |
commit | 365527c53d44d7e4b3ca180ae53547d90d897ae7 (patch) | |
tree | 71831a8ae4dc253c9d25146534671a0015a5f44d /gnome-extra/zenity/files | |
parent | Drop sqlite patch that is in the 3.14.3 release already. (diff) | |
download | historical-365527c53d44d7e4b3ca180ae53547d90d897ae7.tar.gz historical-365527c53d44d7e4b3ca180ae53547d90d897ae7.tar.bz2 historical-365527c53d44d7e4b3ca180ae53547d90d897ae7.zip |
Clean up old revision.
Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806
Diffstat (limited to 'gnome-extra/zenity/files')
3 files changed, 0 insertions, 114 deletions
diff --git a/gnome-extra/zenity/files/zenity-3.4.0-list-check.patch b/gnome-extra/zenity/files/zenity-3.4.0-list-check.patch deleted file mode 100644 index bcd751717547..000000000000 --- a/gnome-extra/zenity/files/zenity-3.4.0-list-check.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 127c298ac43cbdf3b965002e7e9115571ca1d90d Mon Sep 17 00:00:00 2001 -From: Julian Taylor <jtaylor.debian@googlemail.com> -Date: Tue, 8 May 2012 22:14:58 +0200 -Subject: [PATCH] mask the result of g_io_channel_get_flags for the wanted - flag - ---- - src/tree.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/tree.c b/src/tree.c -index 721817e..b347b15 100644 ---- a/src/tree.c -+++ b/src/tree.c -@@ -120,13 +120,13 @@ zenity_tree_handle_stdin (GIOChannel *channel, - - string = g_string_new (NULL); - -- while (g_io_channel_get_flags(channel) != G_IO_FLAG_IS_READABLE) -+ while ((g_io_channel_get_flags(channel) & G_IO_FLAG_IS_READABLE) != G_IO_FLAG_IS_READABLE) - ; - do { - gint status; - - do { -- if (g_io_channel_get_flags(channel) == G_IO_FLAG_IS_READABLE) -+ if (g_io_channel_get_flags(channel) & G_IO_FLAG_IS_READABLE) - status = g_io_channel_read_line_string (channel, string, NULL, &error); - else - return FALSE; -@@ -645,7 +645,7 @@ zenity_tree_dialog_response (GtkWidget *widget, int response, gpointer data) - zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC); - break; - } -- if (channel != NULL && g_io_channel_get_flags (channel) == G_IO_FLAG_IS_READABLE) -+ if (channel != NULL && g_io_channel_get_flags (channel) & G_IO_FLAG_IS_READABLE) - g_io_channel_shutdown (channel, TRUE, NULL); - - gtk_main_quit (); --- -1.7.8.6 - diff --git a/gnome-extra/zenity/files/zenity-3.4.0-list-default-column.patch b/gnome-extra/zenity/files/zenity-3.4.0-list-default-column.patch deleted file mode 100644 index bcac9adb838d..000000000000 --- a/gnome-extra/zenity/files/zenity-3.4.0-list-default-column.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 68fc98278ffb871309b67080b8bdd5af2b2326a8 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Sat, 19 May 2012 20:53:27 -0400 -Subject: [PATCH] Do not crash in --forms --add-list without column values - -Be a bit more user friendly, and instead of crashing, add a default -column name if the user forgot to use --column-values with a --forms list. - -https://bugzilla.gnome.org/show_bug.cgi?id=676406 ---- - src/option.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/src/option.c b/src/option.c -index 7fdb7f1..334ec86 100644 ---- a/src/option.c -+++ b/src/option.c -@@ -1918,7 +1918,9 @@ zenity_forms_post_callback (GOptionContext *context, - results->forms_data->column_values = g_slist_append (results->forms_data->column_values, values); - values = zenity_forms_list_values[++i]; - } -- } -+ } else -+ results->forms_data->column_values = g_slist_append (NULL, "column"); -+ - if (zenity_forms_date_format) - results->forms_data->date_format = zenity_forms_date_format; - else --- -1.7.8.6 - diff --git a/gnome-extra/zenity/files/zenity-3.4.0-list-segfault.patch b/gnome-extra/zenity/files/zenity-3.4.0-list-segfault.patch deleted file mode 100644 index 3feef3909b75..000000000000 --- a/gnome-extra/zenity/files/zenity-3.4.0-list-segfault.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 4a30be17b3adfd7b8383f5c23fae71e31933326b Mon Sep 17 00:00:00 2001 -From: Arx Cruz <arxcruz@gnome.org> -Date: Tue, 17 Apr 2012 16:50:52 -0300 -Subject: [PATCH] Bug #673529 Fix segmentation fault in --list option - ---- - src/tree.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/tree.c b/src/tree.c -index ad4a6d1..721817e 100644 ---- a/src/tree.c -+++ b/src/tree.c -@@ -120,13 +120,13 @@ zenity_tree_handle_stdin (GIOChannel *channel, - - string = g_string_new (NULL); - -- while (channel->is_readable != TRUE) -+ while (g_io_channel_get_flags(channel) != G_IO_FLAG_IS_READABLE) - ; - do { - gint status; - - do { -- if (channel->is_readable == TRUE) -+ if (g_io_channel_get_flags(channel) == G_IO_FLAG_IS_READABLE) - status = g_io_channel_read_line_string (channel, string, NULL, &error); - else - return FALSE; -@@ -645,7 +645,7 @@ zenity_tree_dialog_response (GtkWidget *widget, int response, gpointer data) - zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC); - break; - } -- if (channel->is_readable == TRUE) -+ if (channel != NULL && g_io_channel_get_flags (channel) == G_IO_FLAG_IS_READABLE) - g_io_channel_shutdown (channel, TRUE, NULL); - - gtk_main_quit (); --- -1.7.8.6 - |