summaryrefslogtreecommitdiff
path: root/glib/glibmm/main.cc
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2017-04-05 12:23:49 +0200
committerMurray Cumming <murrayc@murrayc.com>2017-04-05 12:25:01 +0200
commit04f14381a5fcefa3cf78d792c604318ffed81427 (patch)
treec38f93c8b75166e2a9aead8878fe1510c1650033 /glib/glibmm/main.cc
parentc5c5f3e0d63e61bda7477ab75f2d29e81a66af1a (diff)
downloadglibmm-04f14381a5fcefa3cf78d792c604318ffed81427.tar.gz
IOChannel: Avoid creating a RefPtr to this.
By adding a private IOSource constructor (and create()), accessible via a friend declaration, that takes the raw GIOChannel. See https://bugzilla.gnome.org/show_bug.cgi?id=755037#c20
Diffstat (limited to 'glib/glibmm/main.cc')
-rw-r--r--glib/glibmm/main.cc12
1 files changed, 12 insertions, 0 deletions
diff --git a/glib/glibmm/main.cc b/glib/glibmm/main.cc
index 1f19f46e..36317f88 100644
--- a/glib/glibmm/main.cc
+++ b/glib/glibmm/main.cc
@@ -1231,6 +1231,12 @@ IOSource::create(const Glib::RefPtr<IOChannel>& channel, IOCondition condition)
return Glib::RefPtr<IOSource>(new IOSource(channel, condition));
}
+Glib::RefPtr<IOSource>
+IOSource::create(GIOChannel* channel, IOCondition condition)
+{
+ return Glib::RefPtr<IOSource>(new IOSource(channel, condition));
+}
+
sigc::connection
IOSource::connect(const sigc::slot<bool(IOCondition)>& slot)
{
@@ -1248,6 +1254,12 @@ IOSource::IOSource(const Glib::RefPtr<IOChannel>& channel, IOCondition condition
{
}
+IOSource::IOSource(GIOChannel* channel, IOCondition condition)
+: Source(g_io_create_watch(channel, (GIOCondition)condition),
+ (GSourceFunc)&glibmm_iosource_callback)
+{
+}
+
IOSource::IOSource(GSource* cast_item, GSourceFunc callback_func) : Source(cast_item, callback_func)
{
}