← Back to branch summary

~mterry/unity-mir/appurl

« back to all changes in this revision

Viewing changes to src/modules/Unity/Application/application.h

  • Committer: CI bot
  • Author(s): Gerry Boland
  • Date: 2014-05-16 12:20:55 UTC
  • mfrom: (219.1.16 shortAppIds)
  • Revision ID: ps-jenkins@lists.canonical.com-20140516122055-e5jw3w0k5obulsdr
Add support for short appIds

Shells should use only short AppIds (i.e. appId without the version string). In order to support this, needed to
- slightly decouple appId from the desktop file path, now need to ask the ApplicationController implementation for the path to the desktop file
- DesktopFileReader now just a dumb file reader
- in the upstart ApplicationController interface & implementation, convert any long appIds to short appIds
- in ApplicationManager, to ease transition, have startApplication support both long & short appIds. But otherwise it uses short appIds only. Fixes: 1239750

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/Unity/Application/application.h
89
89
    void visibleChanged();
90
90
 
91
91
private:
 
92
    QString longAppId() const;
92
93
    void setPid(pid_t pid);
93
94
    void setState(State state);
94
95
    void setFocused(bool focus);
98
99
 
99
100
    QSharedPointer<TaskController> m_taskController;
100
101
    DesktopFileReader* m_desktopData;
 
102
    QString m_longAppId;
101
103
    qint64 m_pid;
102
104
    Stage m_stage;
103
105
    State m_state;