summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Penhey <tim.penhey@canonical.com>2011-08-19 22:00:57 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2011-08-19 22:00:57 +0800
commit41f088c8963b7fe1e2677fa30c77c92d7b06d345 (patch)
treee0377ed8a8ec89eb53286d5431f9a4894a94b3ad
parentb0a1b5eb1d2e5b21a462f83d86b8a09ff7e08ba8 (diff)
parent3504586e605caec5e0767a5cd6a967f96cd2d478 (diff)
downloadmobileperf-41f088c8963b7fe1e2677fa30c77c92d7b06d345.tar.gz
mobileperf-41f088c8963b7fe1e2677fa30c77c92d7b06d345.tar.bz2
Merge lp:~thumper/compiz-core/fix-crash-on-event-source-cleanup
-rw-r--r--src/eventsource.cpp6
-rw-r--r--src/privateeventsource.h5
-rw-r--r--src/privatescreen.h4
3 files changed, 10 insertions, 5 deletions
diff --git a/src/eventsource.cpp b/src/eventsource.cpp
index 2973d17..cb35773 100644
--- a/src/eventsource.cpp
+++ b/src/eventsource.cpp
@@ -26,10 +26,12 @@
#include "privatescreen.h"
-Glib::RefPtr <CompEventSource>
+//Glib::RefPtr <CompEventSource>
+CompEventSource*
CompEventSource::create ()
{
- return Glib::RefPtr <CompEventSource> (new CompEventSource ());
+ // return Glib::RefPtr <CompEventSource> (new CompEventSource ());
+ return new CompEventSource ();
}
sigc::connection
diff --git a/src/privateeventsource.h b/src/privateeventsource.h
index 92eda18..d629582 100644
--- a/src/privateeventsource.h
+++ b/src/privateeventsource.h
@@ -32,7 +32,8 @@ class CompEventSource:
public:
static
- Glib::RefPtr <CompEventSource> create ();
+ // Glib::RefPtr <CompEventSource> create ();
+ CompEventSource* create ();
sigc::connection connect (const sigc::slot <bool> &slot);
@@ -43,7 +44,7 @@ class CompEventSource:
bool dispatch (sigc::slot_base *slot);
bool callback ();
- explicit CompEventSource ();
+ CompEventSource ();
virtual ~CompEventSource ();
private:
diff --git a/src/privatescreen.h b/src/privatescreen.h
index b6cd6b6..e0798c3 100644
--- a/src/privatescreen.h
+++ b/src/privatescreen.h
@@ -302,7 +302,9 @@ class PrivateScreen :
PrivateScreen *priv;
Glib::RefPtr <Glib::MainLoop> mainloop;
- Glib::RefPtr <CompEventSource> source;
+ // See https://bugzilla.gnome.org/show_bug.cgi?id=561885
+ // Glib::RefPtr <CompEventSource> source;
+ CompEventSource* source;
Glib::RefPtr <CompTimeoutSource> timeout;
Glib::RefPtr <Glib::MainContext> ctx;