Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Save mattdangerw/788a13ae3e6b53bdaa2c to your computer and use it in GitHub Desktop.
Save mattdangerw/788a13ae3e6b53bdaa2c to your computer and use it in GitHub Desktop.
From 9d5477d77febb7f6dbf1487270a5165922e35617 Mon Sep 17 00:00:00 2001
From: Matt Watson <mattdangerw@gmail.com>
Date: Fri, 8 Jan 2016 16:06:53 -0800
Subject: [PATCH] resource file: add cancel to dummy monitor
gfilemonitor has a cancel vfunc and will call into the in dispose.
If we don't stub it out we get a segfault.
---
gio/gresourcefile.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/gio/gresourcefile.c b/gio/gresourcefile.c
index f4af711..6f211f4 100644
--- a/gio/gresourcefile.c
+++ b/gio/gresourcefile.c
@@ -595,6 +595,12 @@ GType g_resource_file_monitor_get_type (void);
G_DEFINE_TYPE (GResourceFileMonitor, g_resource_file_monitor, G_TYPE_FILE_MONITOR)
+static gboolean
+g_resource_file_monitor_cancel (GFileMonitor *monitor)
+{
+ return TRUE;
+}
+
static void
g_resource_file_monitor_init (GResourceFileMonitor *monitor)
{
@@ -603,6 +609,7 @@ g_resource_file_monitor_init (GResourceFileMonitor *monitor)
static void
g_resource_file_monitor_class_init (GResourceFileMonitorClass *class)
{
+ class->cancel = g_resource_file_monitor_cancel;
}
static GFileMonitor *
--
2.1.4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment