rpms/udisks2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Do not try to remove changed_blacklist hash table in finalize

Browse Source
This commit is contained in:
Vojtech Trefny 2017-06-20 10:24:11 +02:00
parent 8077cb67a1
commit c06b73f255
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
udisks-2.7.0-do-not-try-remove-changed_blacklist-hashtable.patch Normal file
View File

@ -0,0 +1,37 @@
From c6fab8ce4149496eb03205f7ce5fe15ca72c8bb7 Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Mon, 19 Jun 2017 13:37:16 +0200
Subject: [PATCH] UDisksClient: Do not try remove changed_blacklist hash table
in finalize
"changed_blacklist" table is a class member and we really don't
want to destroy it when destroying one instance of the UDisksClient.
---
udisks/udisksclient.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/udisks/udisksclient.c b/udisks/udisksclient.c
index e2cd9a38..e961c655 100644
--- a/udisks/udisksclient.c
+++ b/udisks/udisksclient.c
@@ -127,7 +127,6 @@ static void
udisks_client_finalize (GObject *object)
{
UDisksClient *client = UDISKS_CLIENT (object);
- UDisksClientClass *client_class = UDISKS_CLIENT_GET_CLASS (client);
if (client->changed_timeout_source != NULL)
g_source_destroy (client->changed_timeout_source);
@@ -135,12 +134,6 @@ udisks_client_finalize (GObject *object)
if (client->initialization_error != NULL)
g_clear_error (&(client->initialization_error));
- if (client_class->changed_blacklist != NULL)
- {
- g_hash_table_destroy (client_class->changed_blacklist);
- client_class->changed_blacklist = NULL;
- }
-
/* might be NULL if failing early in the constructor */
if (client->object_manager != NULL)
{

7
udisks2.spec
View File

@ -16,12 +16,13 @@
Name: udisks2
Summary: Disk Manager
Version: 2.7.0
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: https://github.com/storaged-project/udisks
Source0: https://github.com/storaged-project/udisks/releases/download/udisks-%{version}/udisks-%{version}.tar.bz2
Patch0: udisks-2.7.0-fix-changed-signal-filtering.patch
Patch1: udisks-2.7.0-do-not-try-remove-changed_blacklist-hashtable.patch
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
@ -203,6 +204,7 @@ This package contains module for ZRAM configuration.
%prep
%setup -q -n udisks-%{version}
%patch0 -p1
%patch1 -p1
%build
autoreconf -ivf
@ -345,6 +347,9 @@ udevadm trigger
%endif
%changelog
* Tue Jun 20 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.7.0-3
- Do not try to remove changed_blacklist hash table in finalize
* Mon Jun 19 2017 Vojtech Trefny <vtrefny@redhat.com> - 2.7.0-2
- Fix how UDisksClient filters property changes