Merge lp:~azzar1/compiz/fix-1214459 into lp:compiz/0.9.11

[Andrea Azzarone]

Use Glib::RefPtr<Glib::Source> in glib_integration_test. After the fix of bug https://bugzilla.gnome.org/show_bug.cgi?id=561885 Glib::Source::~Source is called when both Source::unreference() and SourceCallbackData::destroy_notify_callback() are called.

== Problem ==
Bug #1214459: Failing GLibSourceDestroyIntegration unit tests on compiz/0.9.10

== Fix ==
After the fix of bug https://bugzilla.gnome.org/show_bug.cgi?id=561885 Glib::Source::~Source is called when both Source::unreference() and SourceCallbackData::destroy_notify_callback() are called. It forces us to use Glib::Source in couple with Glib::RefPtr.

== Test ==
N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3783
http://jenkins.qa.ubuntu.com/job/compiz-ci/289/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/102

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/289/rebuild

review: Approve (continuous-integration)

[Stephen M. Webb (bregma)]

Better to leak than to crash.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3784
http://jenkins.qa.ubuntu.com/job/compiz-ci/290/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-amd64-ci/103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-armhf-ci/103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-saucy-i386-ci/103

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/290/rebuild

review: Approve (continuous-integration)

=== modified file 'src/eventsource.cpp'
--- src/eventsource.cpp	2012-12-02 17:41:42 +0000
+++ src/eventsource.cpp	2013-08-20 17:45:34 +0000
@@ -27,11 +27,10 @@
 #include "privateeventsource.h"
 #include "core/screen.h"
 
-CompEventSource *
+Glib::RefPtr<CompEventSource>
 CompEventSource::create ()
 {
-    return new CompEventSource (screen->dpy (),
-				ConnectionNumber (screen->dpy ()));
+    return Glib::RefPtr<CompEventSource> (new CompEventSource (screen->dpy (), ConnectionNumber (screen->dpy ())));
 }
 
 sigc::connection
 
=== modified file 'src/privateeventsource.h'
--- src/privateeventsource.h	2012-12-02 12:06:02 +0000
+++ src/privateeventsource.h	2013-08-20 17:45:34 +0000
@@ -37,9 +37,7 @@
 
 	virtual ~CompEventSource ();
 
-	static
-	CompEventSource *
-	create ();
+	static Glib::RefPtr<CompEventSource> create ();
 
 	sigc::connection connect (const sigc::slot <bool> &slot);
 
 
=== modified file 'src/privateiosource.h'
--- src/privateiosource.h	2012-12-02 12:06:02 +0000
+++ src/privateiosource.h	2013-08-20 17:45:34 +0000
@@ -47,9 +47,7 @@
 	virtual ~CompWatchFd ();
 
 	static
-	CompWatchFd * create (int,
-			      Glib::IOCondition,
-			      FdWatchCallBack);
+	Glib::RefPtr<CompWatchFd> create (int, Glib::IOCondition, FdWatchCallBack);
 
     protected:
 
 
=== modified file 'src/privatescreen.h'
--- src/privatescreen.h	2013-05-12 08:20:10 +0000
+++ src/privatescreen.h	2013-08-20 17:45:34 +0000
@@ -314,14 +314,11 @@
 
 	Glib::RefPtr <Glib::MainLoop>  mainloop;
 
-	/* We cannot use RefPtrs. See
-	 * https://bugzilla.gnome.org/show_bug.cgi?id=561885
-	 */
-	CompEventSource * source;
-	CompTimeoutSource * timeout;
-	CompSignalSource * sighupSource;
-	CompSignalSource * sigtermSource;
-	CompSignalSource * sigintSource;
+	Glib::RefPtr <CompEventSource> source;
+	Glib::RefPtr <CompTimeoutSource> timeout;
+	CompSignalSource *sighupSource;
+	CompSignalSource *sigtermSource;
+	CompSignalSource *sigintSource;
 	Glib::RefPtr <Glib::MainContext> ctx;
 
 	CompFileWatchList   fileWatch;
@@ -329,7 +326,7 @@
 
 	// TODO - almost certainly the wrong data structure
 	// Why not a std::map<CompWatchFdHandle, CompWatchFd>?
-	std::list< CompWatchFd * > watchFds;
+	std::list<Glib::RefPtr<CompWatchFd> > watchFds;
 	CompWatchFdHandle        lastWatchFdHandle;
 
         bool	grabbed;   /* true once we receive a GrabNotify
 
=== modified file 'src/screen.cpp'
--- src/screen.cpp	2013-05-13 13:27:30 +0000
+++ src/screen.cpp	2013-08-20 17:45:34 +0000
@@ -272,12 +272,12 @@
 {
 }
 
-CompWatchFd *
+Glib::RefPtr<CompWatchFd>
 CompWatchFd::create (int               fd,
 		     Glib::IOCondition events,
 		     FdWatchCallBack   callback)
 {
-    return new CompWatchFd (fd, events, callback);
+    return Glib::RefPtr<CompWatchFd> (new CompWatchFd (fd, events, callback));
 }
 
 CompWatchFdHandle
@@ -308,7 +308,7 @@
     if (events & POLLHUP)
 	gEvents |= Glib::IO_HUP;
 
-    CompWatchFd *watchFd = CompWatchFd::create (fd, gEvents, callBack);
+    Glib::RefPtr<CompWatchFd> watchFd = CompWatchFd::create (fd, gEvents, callBack);
 
     watchFd->attach (ctx);
 
@@ -333,8 +333,8 @@
 void
 cps::EventManager::removeWatchFd (CompWatchFdHandle handle)
 {
-    std::list<CompWatchFd * >::iterator it;
-    CompWatchFd *			w;
+    std::list<Glib::RefPtr<CompWatchFd> >::iterator it;
+    Glib::RefPtr<CompWatchFd> w;
 
     for (it = watchFds.begin();
 	 it != watchFds.end (); ++it)
@@ -354,7 +354,6 @@
 	return;
     }
 
-    delete w;
     watchFds.erase (it);
 }
 
@@ -5271,10 +5270,10 @@
     /* Not guaranteed to be created by EventManager's constructor */
     if (timeout)
     {
-	/* This will implicitly call ~CompTimeoutSource
-	 * See LP: #1085590 */
+
 	g_source_destroy (timeout->gobj ());
     }
+
     delete sigintSource;
     delete sigtermSource;
     delete sighupSource;
@@ -5282,12 +5281,11 @@
     /* Not guaranteed to be created by EventManager's constructor */
     if (source)
     {
-	/* This will implicitly call ~CompEventSource */
 	g_source_destroy (source->gobj ());
     }
 
     /* This will implicitly call ~CompWatchFd */
-    foreach (CompWatchFd *fd, watchFds)
+    foreach (Glib::RefPtr<CompWatchFd> fd, watchFds)
 	g_source_destroy (fd->gobj ());
 
     watchFds.clear ();
 
=== modified file 'src/timer/src/privatetimeoutsource.h'
--- src/timer/src/privatetimeoutsource.h	2012-12-02 12:06:02 +0000
+++ src/timer/src/privatetimeoutsource.h	2013-08-20 17:45:34 +0000
@@ -37,7 +37,7 @@
 
 	virtual ~CompTimeoutSource ();
 
-	static CompTimeoutSource * create  (Glib::RefPtr <Glib::MainContext> &ctx);
+	static Glib::RefPtr<CompTimeoutSource> create (Glib::RefPtr <Glib::MainContext> &ctx);
 	sigc::connection connect (const sigc::slot <bool> &slot);
 
     protected:
 
=== modified file 'src/timer/src/timer.cpp'
--- src/timer/src/timer.cpp	2012-09-05 13:04:40 +0000
+++ src/timer/src/timer.cpp	2013-08-20 17:45:34 +0000
@@ -56,10 +56,6 @@
     set_priority (G_PRIORITY_DEFAULT);
     attach (ctx);
 
-    /* We have to unreference the source so that it is destroyed
-     * when the main context destroys it */
-    unreference ();
-
     connect (sigc::mem_fun <bool, CompTimeoutSource> (this, &CompTimeoutSource::callback));
 }
 
@@ -73,10 +69,10 @@
     return connect_generic (slot);
 }
 
-CompTimeoutSource *
+Glib::RefPtr<CompTimeoutSource>
 CompTimeoutSource::create (Glib::RefPtr <Glib::MainContext> &ctx)
 {
-    return new CompTimeoutSource (ctx);
+    return Glib::RefPtr<CompTimeoutSource> (new CompTimeoutSource (ctx));
 }
 
 static const unsigned short COMPIZ_TIMEOUT_WAIT = 15;
 
=== modified file 'src/timer/tests/test-timer.h'
--- src/timer/tests/test-timer.h	2012-07-27 07:18:40 +0000
+++ src/timer/tests/test-timer.h	2013-08-20 17:45:34 +0000
@@ -48,7 +48,7 @@
 
     Glib::RefPtr <Glib::MainContext> mc;
     Glib::RefPtr <Glib::MainLoop> ml;
-    CompTimeoutSource *ts;
+    Glib::RefPtr <CompTimeoutSource> ts;
     std::deque <CompTimer *> timers;
 
     int lastTimerTriggered;
 
=== modified file 'tests/integration/glib/glib_integration_test.cpp'
--- tests/integration/glib/glib_integration_test.cpp	2012-12-02 17:43:53 +0000
+++ tests/integration/glib/glib_integration_test.cpp	2013-08-20 17:45:34 +0000
@@ -119,7 +119,7 @@
 
 TEST_F (GLibSourceDestroyIntegration, TimeoutSourceGSourceDestroy)
 {
-    StubTimeoutSource *sts = new StubTimeoutSource (&die, context);
+    Glib::RefPtr<StubTimeoutSource> sts(new StubTimeoutSource (&die, context));
 
     EXPECT_CALL (die, Die ());
 
@@ -128,7 +128,7 @@
 
 TEST_F (GLibSourceDestroyIntegration, EventSourceGSourceDestroy)
 {
-    StubEventSource *sts = new StubEventSource (&die);
+    Glib::RefPtr<StubEventSource> sts(new StubEventSource (&die));
 
     sts->attach (context);
 
@@ -142,7 +142,7 @@
     Glib::IOCondition iocond = Glib::IO_IN;
     int fd = 0;
     FdWatchCallBack cb;
-    StubWatchFd *sts = new StubWatchFd (&die, fd, iocond, cb);
+    Glib::RefPtr<StubWatchFd> sts(new StubWatchFd (&die, fd, iocond, cb));
 
     sts->attach (context);