diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-08-30 04:43:26 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-08-30 04:43:26 +0800 |
| commit | a408932bc0fc6cc05147639a52594f954917618f (patch) | |
| tree | 2f55b61a9e07b1cae6642ec4345b4ba3dfd753e7 /sysutils | |
| parent | fc91a98cc1d6a69ab3df64eb9e971380a1e39397 (diff) | |
| download | marcuscom-ports-a408932bc0fc6cc05147639a52594f954917618f.tar marcuscom-ports-a408932bc0fc6cc05147639a52594f954917618f.tar.gz marcuscom-ports-a408932bc0fc6cc05147639a52594f954917618f.tar.bz2 marcuscom-ports-a408932bc0fc6cc05147639a52594f954917618f.tar.lz marcuscom-ports-a408932bc0fc6cc05147639a52594f954917618f.tar.xz marcuscom-ports-a408932bc0fc6cc05147639a52594f954917618f.tar.zst marcuscom-ports-a408932bc0fc6cc05147639a52594f954917618f.zip | |
Try a different, safer fix for the runaway mapping-daemon problem.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7169 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/nautilus-cd-burner/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/nautilus-cd-burner/files/patch-src_mapping-protocol.c | 31 |
2 files changed, 24 insertions, 11 deletions
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index e1bda2743..3f5b73dca 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.108 2006/08/22 05:30:45 marcus Exp $ +# $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.109 2006/08/29 14:57:02 marcus Exp $ # PORTNAME= nautilus-cd-burner PORTVERSION= 2.15.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/sysutils/nautilus-cd-burner/files/patch-src_mapping-protocol.c b/sysutils/nautilus-cd-burner/files/patch-src_mapping-protocol.c index feff04bb3..79fdef26c 100644 --- a/sysutils/nautilus-cd-burner/files/patch-src_mapping-protocol.c +++ b/sysutils/nautilus-cd-burner/files/patch-src_mapping-protocol.c @@ -1,5 +1,5 @@ --- src/mapping-protocol.c.orig Sun Aug 20 08:47:20 2006 -+++ src/mapping-protocol.c Tue Aug 29 10:53:50 2006 ++++ src/mapping-protocol.c Tue Aug 29 16:39:11 2006 @@ -26,6 +26,8 @@ #include "config.h" @@ -9,17 +9,30 @@ #include <stdio.h> #include <unistd.h> #include <string.h> -@@ -1188,6 +1190,13 @@ mapping_protocol_channel_fill_read_buffe - } +@@ -86,6 +88,7 @@ static gboolean handle_write + #ifdef DEBUG_ENABLE + + static FILE *debug_out = NULL; ++static gboolean at_eof = FALSE; + + static void + debug_init (void) +@@ -1189,6 +1192,9 @@ mapping_protocol_channel_fill_read_buffe status = g_io_channel_read_chars (channel->iochannel, data, count, &length, NULL); -+ + + if (status == G_IO_STATUS_EOF) { -+ channel->read_watch_id = 0; -+ if (channel->message_handler != NULL) { -+ channel->message_handler (channel, NULL, channel->user_data); -+ } ++ at_eof = TRUE; + } - if (status != G_IO_STATUS_NORMAL) { return; + } +@@ -1340,7 +1346,7 @@ handle_read (GIOChannel *sou + mapping_protocol_channel_do_iteration (channel); + } + +- if (condition & G_IO_HUP) { ++ if (condition & G_IO_HUP || at_eof) { + channel->read_watch_id = 0; + res = FALSE; + /* send a NULL message to signal error */ |