diff options
author | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:12 +0200 |
---|---|---|
committer | Marcin Kolny <marcin.kolny@gmail.com> | 2015-08-08 14:45:59 +0200 |
commit | 0d5f63b18f5766760cf39e82ee11482984e0a938 (patch) | |
tree | e3f74b9b37e7618c92840024077dff43e6d08f0d /glib/glibmm/signalproxy_connectionnode.cc | |
parent | dce7a844e48a582e42eb2b60eef5c1f2527540ac (diff) | |
parent | d94115843f38967b5e883f5f7d8057882ae364cb (diff) | |
download | glibmm-gir-gmmproc.tar.gz |
Merge branch 'master' into glibmm-gir-gmmprocglibmm-gir-gmmproc
Diffstat (limited to 'glib/glibmm/signalproxy_connectionnode.cc')
-rw-r--r-- | glib/glibmm/signalproxy_connectionnode.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/glib/glibmm/signalproxy_connectionnode.cc b/glib/glibmm/signalproxy_connectionnode.cc index cc6f7079..6784d6eb 100644 --- a/glib/glibmm/signalproxy_connectionnode.cc +++ b/glib/glibmm/signalproxy_connectionnode.cc @@ -51,7 +51,7 @@ void* SignalProxyConnectionNode::notify(void* data) if(conn && conn->object_) { GObject* o = conn->object_; - conn->object_ = 0; + conn->object_ = nullptr; if(g_signal_handler_is_connected(o, conn->connection_id_)) //We check first, because during destruction, GTK+ sometimes seems to disconnect them for us, before we expect it to. See bug #87912 { @@ -84,7 +84,7 @@ void SignalProxyConnectionNode::destroy_notify_handler(gpointer data, GClosure*) if(conn) { // the object has already lost track of this object. - conn->object_ = 0; + conn->object_ = nullptr; delete conn; // if there are connection objects referring to slot_ they are notified during destruction of slot_ } |