cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only disconnect the signal handler after the lock is removed

Browse Source 
ck_inhibit_remove_lock() will end up emitting a changed signal
so disconnecting the signal handler before that is not a good
idea

ok aja@
This commit is contained in:
robert 2020-12-04 15:00:39 +00:00
parent ab41ec0480
commit 1465cf1eac
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/consolekit/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.80 2020/11/29 10:48:26 robert Exp $
# $OpenBSD: Makefile,v 1.81 2020/12/04 15:00:39 robert Exp $
COMMENT= framework for defining and tracking users, sessions & seats
PKGNAME= ${DISTNAME:L}
REVISION= 13
REVISION= 14
GH_TAGNAME= 1.2.1
GH_ACCOUNT= ConsoleKit2

13
sysutils/consolekit/patches/patch-src_ck-inhibit-manager_c
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_ck-inhibit-manager_c,v 1.2 2020/11/29 11:33:30 ajacoutot Exp $
$OpenBSD: patch-src_ck-inhibit-manager_c,v 1.3 2020/12/04 15:00:39 robert Exp $
From 5d9925bae370cc1edc260909a55b44f6550294f1 Mon Sep 17 00:00:00 2001
From: Robert Nagy <robert@openbsd.org>
@ -36,7 +36,7 @@ Index: src/ck-inhibit-manager.c
{
CkInhibitManagerPrivate *priv;
GList *l;
@@ -256,7 +255,7 @@ ck_inhibit_manager_remove_lock (CkInhibitManager *mana
@@ -256,15 +255,15 @@ ck_inhibit_manager_remove_lock (CkInhibitManager *mana
priv = CK_INHIBIT_MANAGER_GET_PRIVATE (manager);
for (l = g_list_first (priv->inhibit_list); l != NULL; l = l->next) {
@ -45,3 +45,12 @@ Index: src/ck-inhibit-manager.c
CkInhibit *inhibit = l->data;
/* Found it! Remove it from the list and unref the object */
priv->inhibit_list = g_list_remove (priv->inhibit_list, inhibit);
+ ck_inhibit_remove_lock (inhibit);
g_signal_handlers_disconnect_by_func (inhibit,
G_CALLBACK (cb_changed_event),
manager);
- ck_inhibit_remove_lock (inhibit);
g_object_unref (inhibit);
return TRUE;
}