diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-02-21 12:20:35 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-02-21 12:20:35 +0800 |
| commit | 3f7a7518a0edfcb653deec36f2814f6280635103 (patch) | |
| tree | ed6fc8fa88c668aded4eed7258dfa217ab547d8a /x11/gnome-screensaver | |
| parent | 11a840c6321cb80418b0e6e505f1aaf4c1f44e27 (diff) | |
| download | marcuscom-ports-3f7a7518a0edfcb653deec36f2814f6280635103.tar marcuscom-ports-3f7a7518a0edfcb653deec36f2814f6280635103.tar.gz marcuscom-ports-3f7a7518a0edfcb653deec36f2814f6280635103.tar.bz2 marcuscom-ports-3f7a7518a0edfcb653deec36f2814f6280635103.tar.lz marcuscom-ports-3f7a7518a0edfcb653deec36f2814f6280635103.tar.xz marcuscom-ports-3f7a7518a0edfcb653deec36f2814f6280635103.tar.zst marcuscom-ports-3f7a7518a0edfcb653deec36f2814f6280635103.zip | |
Do not enter an infinite loop if GDM is not running.
Obtained from: GNOME SVN
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8380 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gnome-screensaver')
| -rw-r--r-- | x11/gnome-screensaver/Makefile | 3 | ||||
| -rw-r--r-- | x11/gnome-screensaver/files/patch-src_cut-n-paste_gdm-queue.c | 23 |
2 files changed, 23 insertions, 3 deletions
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index 2793836fc..5687897a5 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.66 2007/01/29 01:49:59 marcus Exp $ +# $MCom: ports/x11/gnome-screensaver/Makefile,v 1.67 2007/02/13 07:19:21 mezz Exp $ # PORTNAME= gnome-screensaver PORTVERSION= 2.17.7 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11/gnome-screensaver/files/patch-src_cut-n-paste_gdm-queue.c b/x11/gnome-screensaver/files/patch-src_cut-n-paste_gdm-queue.c index 8e297b019..b470e145a 100644 --- a/x11/gnome-screensaver/files/patch-src_cut-n-paste_gdm-queue.c +++ b/x11/gnome-screensaver/files/patch-src_cut-n-paste_gdm-queue.c @@ -1,5 +1,5 @@ ---- src/cut-n-paste/gdm-queue.c.orig Fri Feb 2 23:52:26 2007 -+++ src/cut-n-paste/gdm-queue.c Fri Feb 2 23:52:32 2007 +--- src/cut-n-paste/gdm-queue.c.orig Tue Jan 30 11:21:39 2007 ++++ src/cut-n-paste/gdm-queue.c Tue Feb 20 23:20:17 2007 @@ -32,6 +32,7 @@ #include <sys/un.h> #include <errno.h> @@ -8,3 +8,22 @@ #include "gdm-queue.h" +@@ -235,13 +236,14 @@ gboolean gdm_run_queue (void *dummy) + addr.sun_family = AF_UNIX; + + if (fcntl (gdm_socket, F_SETFL, O_NONBLOCK) < 0) { +- close_gdm_socket (); +- return TRUE; ++ VE_IGNORE_EINTR (close (gdm_socket)); ++ return FALSE; + } + + if (connect (gdm_socket, (struct sockaddr *)&addr, sizeof (addr)) < 0) { +- close_gdm_socket (); +- return TRUE; ++ g_warning ("Unable to connect to GDM socket: %s", GDM_SOCKET_FILENAME); ++ VE_IGNORE_EINTR (close (gdm_socket)); ++ return FALSE; + } + + gdm_send_command("VERSION"); |