Merge lp:~ted/ubuntu-app-launch/atexit-pain into lp:ubuntu-app-launch/16.10

Proposed by Ted Gould
Status: Merged
Approved by: dobey
Approved revision: 251
Merged at revision: 260
Proposed branch: lp:~ted/ubuntu-app-launch/atexit-pain
Merge into: lp:ubuntu-app-launch/16.10
Prerequisite: lp:~ted/ubuntu-app-launch/icon-basepath
Diff against target: 24 lines (+1/-3)
2 files modified
CMakeLists.txt (+0/-2)
libubuntu-app-launch/ubuntu-app-launch.cpp (+1/-1)
To merge this branch: bzr merge lp:~ted/ubuntu-app-launch/atexit-pain
Reviewer Review Type Date Requested Status
dobey (community) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+305764@code.launchpad.net

Commit message

Switch from g_atexit to std::atexit to avoid deprecation warnings

Description of the change

OMG! Should have done this a while ago!

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:251
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/100/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/648
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/654
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/470
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/470/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/470
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/470/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/470
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/470/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/470
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/470/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/470
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/470/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/470
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/470/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/470
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/470/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/470
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/470/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/470
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/470/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/100/rebuild

review: Approve (continuous-integration)
Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-09-14 22:00:31 +0000
3+++ CMakeLists.txt 2016-09-14 22:00:32 +0000
4@@ -52,8 +52,6 @@
5 add_compile_options(
6 # Because we believe in quality
7 -Wall -Werror
8-# Deprecated needed for g_atexit() in libual
9- -Wno-error=deprecated-declarations
10 -g
11 -pthread
12 )
13
14=== modified file 'libubuntu-app-launch/ubuntu-app-launch.cpp'
15--- libubuntu-app-launch/ubuntu-app-launch.cpp 2016-09-14 22:00:31 +0000
16+++ libubuntu-app-launch/ubuntu-app-launch.cpp 2016-09-14 22:00:32 +0000
17@@ -1214,7 +1214,7 @@
18 {
19 static gboolean final_cleanup = FALSE;
20 if (!final_cleanup) {
21- g_atexit(proxy_cleanup_list);
22+ std::atexit(proxy_cleanup_list);
23 final_cleanup = TRUE;
24 }
25

Subscribers

People subscribed via source and target branches