summaryrefslogtreecommitdiffstats
path: root/deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-12-18 12:14:44 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2004-12-18 12:14:44 +0800
commitf6c457d7b6afb2b7ff52778a050e67eedc5a9a34 (patch)
tree17322ad7e6f7036ce2e404ddf8a001c6d3463ee1 /deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c
parent0494b383a09377a2943f8ca44eb134061158091e (diff)
downloadmarcuscom-ports-f6c457d7b6afb2b7ff52778a050e67eedc5a9a34.tar
marcuscom-ports-f6c457d7b6afb2b7ff52778a050e67eedc5a9a34.tar.gz
marcuscom-ports-f6c457d7b6afb2b7ff52778a050e67eedc5a9a34.tar.bz2
marcuscom-ports-f6c457d7b6afb2b7ff52778a050e67eedc5a9a34.tar.lz
marcuscom-ports-f6c457d7b6afb2b7ff52778a050e67eedc5a9a34.tar.xz
marcuscom-ports-f6c457d7b6afb2b7ff52778a050e67eedc5a9a34.tar.zst
marcuscom-ports-f6c457d7b6afb2b7ff52778a050e67eedc5a9a34.zip
Use a better patch to fix the screenshot save error. See
http://bugzilla.gnome.org/show_bug.cgi?id=161525 for more details. Obtained from: Jonathan Blandford <jrb@redhat.com> git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3262 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c')
-rw-r--r--deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c36
1 files changed, 27 insertions, 9 deletions
diff --git a/deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c b/deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c
index 2dbb345fb..0cc89594e 100644
--- a/deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c
+++ b/deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c
@@ -1,11 +1,29 @@
---- gnome-screenshot/screenshot-save.c.orig Fri Dec 17 01:34:33 2004
-+++ gnome-screenshot/screenshot-save.c Fri Dec 17 01:34:40 2004
-@@ -89,7 +89,7 @@
- GIOCondition condition,
- gpointer data)
- {
-- if (condition & G_IO_IN)
-+ if (!condition & G_IO_IN)
- {
+--- gnome-screenshot/screenshot-save.c.orig Mon Nov 1 15:56:19 2004
++++ gnome-screenshot/screenshot-save.c Fri Dec 17 23:11:51 2004
+@@ -94,16 +94,20 @@
gchar *message = NULL;
gchar *error_message = NULL;
+ GtkWidget *dialog;
++ GIOStatus status;
+
+- g_io_channel_read_line (source, &error_message, NULL, NULL, NULL);
+- message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message);
+- dialog = gtk_message_dialog_new (NULL, 0,
++ status = g_io_channel_read_line (source, &error_message, NULL, NULL, NULL);
++ if (status == G_IO_STATUS_NORMAL)
++ {
++ message = g_strdup_printf ("Unable to save the screenshot to disk:\n\n%s", error_message);
++ dialog = gtk_message_dialog_new (NULL, 0,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ message);
+- gtk_dialog_run (GTK_DIALOG (dialog));
+- gtk_widget_destroy (dialog);
+- exit (1);
++ gtk_dialog_run (GTK_DIALOG (dialog));
++ gtk_widget_destroy (dialog);
++ exit (1);
++ }
+ }
+
+ (*save_callback) (save_user_data);