<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[119086] trunk/dports/gnome/gdm</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/119086">119086</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-04-16 16:10:17 -0700 (Wed, 16 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gdm: update to version 3.11.90, most recent version that builds.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegdmPortfile">trunk/dports/gnome/gdm/Portfile</a></li>
<li><a href="#trunkdportsgnomegdmfilespatchconfigureacdiff">trunk/dports/gnome/gdm/files/patch-configure.ac.diff</a></li>
<li><a href="#trunkdportsgnomegdmfilespatchdaemongdmsessionworkercdiff">trunk/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegdmfilespatchdaemondiff">trunk/dports/gnome/gdm/files/patch-daemon.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegdmfilespatchuseg_credentials_get_unix_piddiff">trunk/dports/gnome/gdm/files/patch-use-g_credentials_get_unix_pid.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnomegdm">trunk/dports/gnome/gdm/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegdm"></a>
<div class="propset"><h4>Property changes: trunk/dports/gnome/gdm</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/users/devans/GNOME-3/stable/dports/gnome/gdm:108269-113174
</span><span class="cx">/users/rmstonecipher/gnome/gdm:102363-103172
</span><span class="cx"> + /branches/mld-qt-481/dports/gnome/gdm:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
</span><span class="cx">/users/devans/GNOME-3/stable/dports/gnome/gdm:108269-118732
</span><span class="cx">/users/devans/GNOME-3/unstable/dports/gnome/gdm:114069-118152
</span><span class="cx">/users/rmstonecipher/gnome/gdm:102363-103172
</span><a id="trunkdportsgnomegdmPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gdm/Portfile (119085 => 119086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gdm/Portfile 2014-04-16 21:03:49 UTC (rev 119085)
+++ trunk/dports/gnome/gdm/Portfile 2014-04-16 23:10:17 UTC (rev 119086)
</span><span class="lines">@@ -7,8 +7,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name gdm
</span><del>-version 3.10.0.1
-revision 2
</del><ins>+version 3.11.90
</ins><span class="cx"> license GPL-2
</span><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> description The Gnome Display Manager is a re-implementation of the well known xdm program.
</span><span class="lines">@@ -23,8 +22,8 @@
</span><span class="cx">
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 3e4839d56165e2f68451374d89d70986f5e247a1 \
- sha256 549a42009af9c79a4e07632e405dcb71ba2e876e766cff02471511ad641b6ae7
</del><ins>+checksums rmd160 98ccd8bfc99773264d73ef077c424b0518ae1df8 \
+ sha256 51b54d428aeb1c55d91e992edd8c4603d6e528c888321d39cfc9d17039545482
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="lines">@@ -32,6 +31,7 @@
</span><span class="cx">
</span><span class="cx"> depends_lib port:desktop-file-utils \
</span><span class="cx"> port:gtk3 \
</span><ins>+ port:dconf \
</ins><span class="cx"> port:accountsservice \
</span><span class="cx"> port:nss \
</span><span class="cx"> port:libcanberra \
</span><span class="lines">@@ -50,13 +50,12 @@
</span><span class="cx"> depends_run port:gnome-session \
</span><span class="cx"> port:gnome-settings-daemon
</span><span class="cx">
</span><del>-patchfiles patch-daemon-gdm-session-worker.c.diff \
- patch-use-g_credentials_get_unix_pid.diff \
</del><ins>+patchfiles patch-daemon.diff \
+ patch-daemon-gdm-session-worker.c.diff \
</ins><span class="cx"> patch-configure.ac.diff
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@MP_PREFIX@|${prefix}|" ${worksrcpath}/configure.ac
</span><del>- file attributes ${worksrcpath}/install-sh -permissions +x
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> use_parallel_build no
</span><span class="lines">@@ -72,6 +71,9 @@
</span><span class="cx">
</span><span class="cx"> configure.args --enable-ipv6 \
</span><span class="cx"> --without-console-kit \
</span><ins>+ --without-plymouth \
+ --disable-systemd-journal \
+ --disable-wayland-support \
</ins><span class="cx"> --disable-schemas-compile \
</span><span class="cx"> --disable-silent-rules
</span><span class="cx">
</span><span class="lines">@@ -102,4 +104,4 @@
</span><span class="cx"> file attributes ${prefix}/var/gdm -owner gdm -group gdm
</span><span class="cx"> }
</span><span class="cx">
</span><del>-livecheck.type gnome
</del><ins>+livecheck.type gnome-with-unstable
</ins></span></pre></div>
<a id="trunkdportsgnomegdmfilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gdm/files/patch-configure.ac.diff (119085 => 119086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gdm/files/patch-configure.ac.diff 2014-04-16 21:03:49 UTC (rev 119085)
+++ trunk/dports/gnome/gdm/files/patch-configure.ac.diff 2014-04-16 23:10:17 UTC (rev 119086)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- configure.ac.orig 2014-03-15 07:56:54.000000000 -0700
-+++ configure.ac 2014-03-15 08:00:06.000000000 -0700
-@@ -499,6 +499,7 @@
</del><ins>+--- configure.ac.orig 2014-02-21 05:24:30.000000000 -0800
++++ configure.ac 2014-03-28 08:44:04.000000000 -0700
+@@ -496,6 +496,7 @@
</ins><span class="cx"> AC_CHECK_LIB(pam, pam_syslog, [AC_DEFINE(HAVE_PAM_SYSLOG, [], [Define to 1 if you have the pam_syslog function])])
</span><span class="cx">
</span><span class="cx"> dnl test whether struct pam_message is const (Linux) or not (Sun)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> if test "x$have_pam" = "xyes"; then
</span><span class="cx"> pam_appl_h="$ac_pam_includes/security/pam_appl.h"
</span><span class="cx"> AC_MSG_CHECKING(for const pam_message)
</span><del>-@@ -1217,7 +1218,17 @@
</del><ins>+@@ -1222,7 +1223,17 @@
</ins><span class="cx"> # and /usr/X11 since they often symlink to each other, and configure
</span><span class="cx"> # should use the more stable location (the real directory) if possible.
</span><span class="cx"> #
</span><span class="lines">@@ -27,31 +27,3 @@
</span><span class="cx"> X_PATH="/usr/X11/bin"
</span><span class="cx"> X_SERVER_PATH="/usr/X11/bin"
</span><span class="cx"> X_SERVER="/usr/X11/bin/Xserver"
</span><del>-From c14b16af23529afb7371890e3c686457c365e8be Mon Sep 17 00:00:00 2001
-From: Laurent Bigonville <bigon@bigon.be>
-Date: Mon, 11 Nov 2013 06:36:26 +0000
-Subject: Don't use both AM_GNU_GETTEXT and IT_PROG_INTLTOOL
-
-When using IT_PROG_INTLTOOL using the gettext automake macros isn't
-necessary. To make matters worse, when mixing the marcos both try to
-generate po/Makefile.in.in. Recent versions of intltool detect when
-gettext won and bails when building.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=711818
----
-diff --git a/configure.ac b/configure.ac
-index fdb0497..6afa49e 100644
---- configure.ac
-+++ configure.ac
-@@ -52,9 +52,6 @@ AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes)
- # i18n stuff
- IT_PROG_INTLTOOL([0.40.0])
-
--AM_GNU_GETTEXT_VERSION([0.17])
--AM_GNU_GETTEXT([external])
--
- GETTEXT_PACKAGE=gdm
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
---
-cgit v0.9.2
</del></span></pre></div>
<a id="trunkdportsgnomegdmfilespatchdaemongdmsessionworkercdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff (119085 => 119086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff 2014-04-16 21:03:49 UTC (rev 119085)
+++ trunk/dports/gnome/gdm/files/patch-daemon-gdm-session-worker.c.diff 2014-04-16 23:10:17 UTC (rev 119086)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- daemon/gdm-session-worker.c.orig 2013-12-18 13:49:21.000000000 -0800
-+++ daemon/gdm-session-worker.c 2013-12-18 13:52:29.000000000 -0800
-@@ -740,6 +740,33 @@
</del><ins>+--- daemon/gdm-session-worker.c.orig 2014-02-20 12:01:48.000000000 -0800
++++ daemon/gdm-session-worker.c 2014-03-16 20:16:54.000000000 -0700
+@@ -741,6 +741,33 @@
</ins><span class="cx"> return utf8;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsgnomegdmfilespatchdaemondifffromrev118732usersdevansGNOME3stabledportsgnomegdmfilespatchdaemondiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/gnome/gdm/files/patch-daemon.diff (from rev 118732, users/devans/GNOME-3/stable/dports/gnome/gdm/files/patch-daemon.diff) (0 => 119086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gdm/files/patch-daemon.diff (rev 0)
+++ trunk/dports/gnome/gdm/files/patch-daemon.diff 2014-04-16 23:10:17 UTC (rev 119086)
</span><span class="lines">@@ -0,0 +1,173 @@
</span><ins>+diff -ur daemon.orig/gdm-server.c daemon/gdm-server.c
+--- daemon.orig/gdm-server.c 2014-03-19 14:39:09.000000000 -0700
++++ daemon/gdm-server.c 2014-03-19 14:39:56.000000000 -0700
+@@ -94,6 +94,7 @@
+ char *auth_file;
+
+ guint child_watch_id;
++ guint sigusr1_id;
+
+ gboolean is_initial;
+ };
+@@ -179,77 +180,16 @@
+ return g_strdup (server->priv->display_device);
+ }
+
+-static void
+-gdm_server_ready (GdmServer *server)
+-{
+- g_debug ("GdmServer: Got USR1 from X server - emitting READY");
+- g_signal_emit (server, signals[READY], 0);
+-}
+-
+-static GSList *active_servers;
+-static gboolean sigusr1_thread_running;
+-static GCond sigusr1_thread_cond;
+-static GMutex sigusr1_thread_mutex;
+-
+ static gboolean
+-got_sigusr1 (gpointer user_data)
+-{
+- GPid pid = GPOINTER_TO_UINT (user_data);
+- GSList *l;
+-
+- g_debug ("GdmServer: got SIGUSR1 from PID %d", pid);
+-
+- for (l = active_servers; l; l = l->next) {
+- GdmServer *server = l->data;
+-
+- if (server->priv->pid == pid)
+- gdm_server_ready (server);
+- }
+-
+- return G_SOURCE_REMOVE;
+-}
+-
+-static gpointer
+-sigusr1_thread_main (gpointer user_data)
+-{
+- sigset_t sigusr1_mask;
+-
+- /* Handle only SIGUSR1 */
+- sigemptyset (&sigusr1_mask);
+- sigaddset (&sigusr1_mask, SIGUSR1);
+- sigprocmask (SIG_SETMASK, &sigusr1_mask, NULL);
++on_sigusr1 (gpointer user_data)
+
+- g_mutex_lock (&sigusr1_thread_mutex);
+- sigusr1_thread_running = TRUE;
+- g_cond_signal (&sigusr1_thread_cond);
+- g_mutex_unlock (&sigusr1_thread_mutex);
+-
+- /* Spin waiting for a SIGUSR1 */
+- while (TRUE) {
+- siginfo_t info;
+-
+- if (sigwaitinfo (&sigusr1_mask, &info) == -1)
+- continue;
+-
+- g_idle_add (got_sigusr1, GUINT_TO_POINTER (info.si_pid));
+- }
+-
+- return NULL;
+-}
+-
+-static void
+-gdm_server_launch_sigusr1_thread_if_needed (void)
+ {
+- static GThread *sigusr1_thread;
++ GdmServer *server = user_data;
+
+- if (sigusr1_thread == NULL) {
+- sigusr1_thread = g_thread_new ("gdm SIGUSR1 catcher", sigusr1_thread_main, NULL);
++ g_debug ("GdmServer: Got USR1 from X server - emitting READY");
+
+- g_mutex_lock (&sigusr1_thread_mutex);
+- while (!sigusr1_thread_running)
+- g_cond_wait (&sigusr1_thread_cond, &sigusr1_thread_mutex);
+- g_mutex_unlock (&sigusr1_thread_mutex);
+- }
++ g_signal_emit (server, signals[READY], 0);
++ return FALSE;
+ }
+
+ /* We keep a connection (parent_dsp) open with the parent X server
+@@ -736,8 +676,6 @@
+ g_signal_emit (server, signals [DIED], 0, num);
+ }
+
+- active_servers = g_slist_remove (active_servers, server);
+-
+ g_spawn_close_pid (server->priv->pid);
+ server->priv->pid = -1;
+
+@@ -781,10 +719,6 @@
+ g_debug ("GdmServer: Starting X server process: %s", freeme);
+ g_free (freeme);
+
+- active_servers = g_slist_append (active_servers, server);
+-
+- gdm_server_launch_sigusr1_thread_if_needed ();
+-
+ if (!g_spawn_async_with_pipes (NULL,
+ argv,
+ (char **)env->pdata,
+@@ -1129,11 +1063,16 @@
+ static void
+ gdm_server_init (GdmServer *server)
+ {
++
+ server->priv = GDM_SERVER_GET_PRIVATE (server);
+
+ server->priv->pid = -1;
+
+ server->priv->log_dir = g_strdup (LOGDIR);
++
++ server->priv->sigusr1_id = g_unix_signal_add (SIGUSR1,
++ on_sigusr1,
++ server);
+ }
+
+ static void
+@@ -1148,6 +1087,9 @@
+
+ g_return_if_fail (server->priv != NULL);
+
++ if (server->priv->sigusr1_id > 0)
++ g_source_remove (server->priv->sigusr1_id);
++
+ gdm_server_stop (server);
+
+ g_free (server->priv->command);
+diff -ur daemon.orig/main.c daemon/main.c
+--- daemon.orig/main.c 2014-03-19 14:39:09.000000000 -0700
++++ daemon/main.c 2014-03-19 14:40:05.000000000 -0700
+@@ -295,19 +295,6 @@
+ return debug;
+ }
+
+-/* SIGUSR1 is used by the X server to tell us that we're ready, so
+- * block it. We'll unblock it in the worker thread in gdm-server.c
+- */
+-static void
+-block_sigusr1 (void)
+-{
+- sigset_t mask;
+-
+- sigemptyset (&mask);
+- sigaddset (&mask, SIGUSR1);
+- sigprocmask (SIG_BLOCK, &mask, NULL);
+-}
+-
+ int
+ main (int argc,
+ char **argv)
+@@ -328,8 +315,6 @@
+ { NULL }
+ };
+
+- block_sigusr1 ();
+-
+ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+ textdomain (GETTEXT_PACKAGE);
+ setlocale (LC_ALL, "");
</ins></span></pre></div>
<a id="trunkdportsgnomegdmfilespatchuseg_credentials_get_unix_piddiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/gnome/gdm/files/patch-use-g_credentials_get_unix_pid.diff (119085 => 119086)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/gdm/files/patch-use-g_credentials_get_unix_pid.diff 2014-04-16 21:03:49 UTC (rev 119085)
+++ trunk/dports/gnome/gdm/files/patch-use-g_credentials_get_unix_pid.diff 2014-04-16 23:10:17 UTC (rev 119086)
</span><span class="lines">@@ -1,87 +0,0 @@
</span><del>-From 87f181489983bb8d640a6a227caa8cbfc0fff853 Mon Sep 17 00:00:00 2001
-From: Laurent Bigonville <bigon@bigon.be>
-Date: Sun, 10 Nov 2013 23:21:37 +0000
-Subject: Use g_credentials_get_unix_pid() instead of home baked function
-
-This function is available in GIO since 2.36
-
-Thanks to Petr Salinger <Petr.Salinger@seznam.cz> for the patch
-Debian Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=692739
-
-https://bugzilla.gnome.org/show_bug.cgi?id=687921
----
-diff --git a/configure.ac b/configure.ac
-index bffc88b..0008c62 100644
---- configure.ac
-+++ configure.ac
-@@ -63,7 +63,7 @@ dnl ---------------------------------------------------------------------------
- dnl - Dependencies
- dnl ---------------------------------------------------------------------------
-
--GLIB_REQUIRED_VERSION=2.35.0
-+GLIB_REQUIRED_VERSION=2.36.0
- GTK_REQUIRED_VERSION=2.91.1
- LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
- ACCOUNTS_SERVICE_REQUIRED_VERSION=0.6.12
-diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
-index d74bed6..b2d931d 100644
---- daemon/gdm-session.c
-+++ daemon/gdm-session.c
-@@ -970,28 +970,6 @@ allow_worker_function (GDBusAuthObserver *observer,
- return FALSE;
- }
-
--static GPid
--credentials_get_unix_pid (GCredentials *credentials)
--{
-- GPid pid = 0;
-- gpointer native_credentials = NULL;
--
--#ifdef __linux__
-- native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_LINUX_UCRED);
-- pid = (GPid) ((struct ucred *) native_credentials)->pid;
--#elif defined (__FreeBSD__)
-- native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED);
-- pid = (GPid) ((struct cmsgcred *) native_credentials)->cmcred_pid;
--#elif defined (__OpenBSD__)
-- native_credentials = g_credentials_get_native (credentials, G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED);
-- pid = (GPid) ((struct sockpeercred *) native_credentials)->pid;
--#else
--#error "platform not supported, need mechanism to detect pid of connected process"
--#endif
--
-- return pid;
--}
--
- static gboolean
- register_worker (GdmDBusWorkerManager *worker_manager_interface,
- GDBusMethodInvocation *invocation,
-@@ -1021,7 +999,7 @@ register_worker (GdmDBusWorkerManager *worker_manager_interface,
- connection_node);
-
- credentials = g_dbus_connection_get_peer_credentials (connection);
-- pid = credentials_get_unix_pid (credentials);
-+ pid = g_credentials_get_unix_pid (credentials, NULL);
-
- conversation = find_conversation_by_pid (self, (GPid) pid);
-
-@@ -1479,7 +1457,7 @@ on_outside_connection_closed (GDBusConnection *connection,
- connection);
-
- credentials = g_dbus_connection_get_peer_credentials (connection);
-- pid_of_client = credentials_get_unix_pid (credentials);
-+ pid_of_client = g_credentials_get_unix_pid (credentials, NULL);
-
- g_signal_emit (G_OBJECT (self),
- signals [CLIENT_DISCONNECTED],
-@@ -1531,7 +1509,7 @@ handle_connection_from_outside (GDBusServer *server,
- }
-
- credentials = g_dbus_connection_get_peer_credentials (connection);
-- pid_of_client = credentials_get_unix_pid (credentials);
-+ pid_of_client = g_credentials_get_unix_pid (credentials, NULL);
-
- g_signal_emit (G_OBJECT (self),
- signals [CLIENT_CONNECTED],
---
-cgit v0.9.2
</del></span></pre>
</div>
</div>
</body>
</html>