From 55110a9e0762e8e0f94798e29fc5d29d54e4aee6 Mon Sep 17 00:00:00 2001
From: marcm <marcm@openbsd.org>
Date: Fri, 27 May 2005 17:27:08 +0000
Subject: [PATCH] Crap.  This patch was overlooked.  Screenshots don't work w/o
 it.

Bump package version.
---
 x11/gnome/utils/Makefile                      |  3 +-
 .../patch-gnome-screenshot_screenshot-save_c  | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 x11/gnome/utils/patches/patch-gnome-screenshot_screenshot-save_c

diff --git a/x11/gnome/utils/Makefile b/x11/gnome/utils/Makefile
index 1dda280a98e..f21adcc883d 100644
--- a/x11/gnome/utils/Makefile
+++ b/x11/gnome/utils/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2005/05/26 22:54:07 marcm Exp $
+# $OpenBSD: Makefile,v 1.10 2005/05/27 17:27:08 marcm Exp $
 
 COMMENT=		"GNOME utility programs"
 
 DISTNAME=		gnome-utils-2.10.1
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		x11/gnome
 
 HOMEPAGE=		http://www.gnome.org/
diff --git a/x11/gnome/utils/patches/patch-gnome-screenshot_screenshot-save_c b/x11/gnome/utils/patches/patch-gnome-screenshot_screenshot-save_c
new file mode 100644
index 00000000000..bbfdce7fc33
--- /dev/null
+++ b/x11/gnome/utils/patches/patch-gnome-screenshot_screenshot-save_c
@@ -0,0 +1,29 @@
+--- gnome-screenshot/screenshot-save.c.orig	Mon Nov  1 12:56:19 2004
++++ gnome-screenshot/screenshot-save.c	Thu May 26 10:36:37 2005
+@@ -94,16 +94,20 @@ read_pipe_from_child (GIOChannel   *sour
+       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);