Merge lp:~laney/unity/launcher-check-same-file into lp:unity

[Iain Lane]

launcher: Always make sure we check the right file when seeing if .desktop files have been deleted. Fixes disappearing launcher icons when applications are upgraded when we are using glib > 2.44.

launcher: Always make sure we check the right file when seeing if .desktop files have been deleted.

We were checking the GFile which came in via the changed signal, but sometimes
(e.g. for paired delete/create events caused by moves), this can be a file that
is being moved onto our target.

Always check the target file that we watched initially.

This fixes disappearing launcher icons when applications are updated with glib > 2.44.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4009
http://jenkins.qa.ubuntu.com/job/unity-ci/1299/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/77/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/75
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/75/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1299/rebuild

review: Needs Fixing (continuous-integration)

[Iain Lane (laney)]

On Fri, Sep 18, 2015 at 06:01:18PM -0000, PS Jenkins bot wrote:
> Review: Needs Fixing continuous-integration
>
> FAILED: Continuous integration, rev:4009
> http://jenkins.qa.ubuntu.com/job/unity-ci/1299/
> Executed test runs:
> FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/77/console
> SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/75
> FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/75/console

Did I break those?

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[Marco Trevisan (Treviño) (3v1n0)]

Just a small fix.

[Marco Trevisan (Treviño) (3v1n0)]

> On Fri, Sep 18, 2015 at 06:01:18PM -0000, PS Jenkins bot wrote:
> > Review: Needs Fixing continuous-integration
> >
> > FAILED: Continuous integration, rev:4009
> > http://jenkins.qa.ubuntu.com/job/unity-ci/1299/
> > Executed test runs:
> > FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/77/console
> > SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/75
> > FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/75/console
>
> Did I break those?

Nope... For some reason there are failures in CI which doesn't happen both locally and when building in silos, so we need to do something to fortify them.

[Iain Lane (laney)]

On Mon, Sep 21, 2015 at 02:38:56PM -0000, Marco Trevisan (Treviño) wrote:
> Just a small fix.

Thanks, I pushed a new one. Didn't build it myself though this time.

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:4010
http://jenkins.qa.ubuntu.com/job/unity-ci/1302/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/80/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/78/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1302/rebuild

review: Needs Fixing (continuous-integration)

[Marco Trevisan (Treviño) (3v1n0)]

Thanks, just update the file to the proper naming...

review: Needs Fixing

[Iain Lane (laney)]

On Mon, Sep 21, 2015 at 04:57:42PM -0000, Marco Trevisan (Treviño) wrote:
> Review: Needs Fixing
>
> Thanks, just update the file to the proper naming...

SHOULD HAVE BUILT IT!

--
Iain Lane [ <email address hidden> ]
Debian Developer [ <email address hidden> ]
Ubuntu Developer [ <email address hidden> ]

[Marco Trevisan (Treviño) (3v1n0)]

> On Mon, Sep 21, 2015 at 04:57:42PM -0000, Marco Trevisan (Treviño) wrote:
> > Review: Needs Fixing
> >
> > Thanks, just update the file to the proper naming...
>
> SHOULD HAVE BUILT IT!

Eheh, no worries :)

[Marco Trevisan (Treviño) (3v1n0)]

So... Thanks!

review: Approve

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2015-07-10 10:31:46 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2015-09-21 17:05:34 +0000
@@ -559,14 +559,13 @@
     g_file_monitor_set_rate_limit(_desktop_file_monitor, 2000);
 
     _gsignals.Add<void, GFileMonitor*, GFile*, GFile*, GFileMonitorEvent>(_desktop_file_monitor, "changed",
-      [this] (GFileMonitor*, GFile* f, GFile*, GFileMonitorEvent event_type) {
+      [this, desktop_file] (GFileMonitor*, GFile*,  GFile*, GFileMonitorEvent event_type) {
       switch (event_type)
       {
         case G_FILE_MONITOR_EVENT_DELETED:
         {
-          glib::Object<GFile> file(f, glib::AddRef());
-          _source_manager.AddTimeoutSeconds(1, [this, file] {
-            if (!g_file_query_exists(file, nullptr))
+          _source_manager.AddTimeoutSeconds(1, [this, desktop_file] {
+            if (!g_file_query_exists(desktop_file, nullptr))
             {
               UnStick();
               LogUnityEvent(ApplicationEventType::DELETE);