diff options
| -rw-r--r-- | deskutils/gnome-utils/Makefile | 2 | ||||
| -rw-r--r-- | deskutils/gnome-utils/files/patch-gnome-screenshot_screenshot-save.c | 36 | ||||
| -rw-r--r-- | deskutils/gnomeutils2/Makefile | 2 | ||||
| -rw-r--r-- | deskutils/gnomeutils2/files/patch-gnome-screenshot_screenshot-save.c | 36 |
4 files changed, 56 insertions, 20 deletions
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index 3579f43b1..adcc1b072 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomeutils2 PORTVERSION= 2.9.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} 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); diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile index 3579f43b1..adcc1b072 100644 --- a/deskutils/gnomeutils2/Makefile +++ b/deskutils/gnomeutils2/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnomeutils2 PORTVERSION= 2.9.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/deskutils/gnomeutils2/files/patch-gnome-screenshot_screenshot-save.c b/deskutils/gnomeutils2/files/patch-gnome-screenshot_screenshot-save.c index 2dbb345fb..0cc89594e 100644 --- a/deskutils/gnomeutils2/files/patch-gnome-screenshot_screenshot-save.c +++ b/deskutils/gnomeutils2/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); |