unity-scopes-shell

Merge lp:~unity-api-team/unity-scopes-shell/today-scope-crash into lp:unity-scopes-shell/rtm-14.09

  1. today-scope-crash
  2. Merge into rtm-14.09
Proposed by Pete Woods
Status: Merged
Approved by: Pete Woods
Approved revision: 133
Merged at revision: 134
Proposed branch: lp:~unity-api-team/unity-scopes-shell/today-scope-crash
Merge into: lp:unity-scopes-shell/rtm-14.09
Prerequisite: lp:~unity-api-team/unity-scopes-shell/geoip-thread-affinity-fix
Diff against target: 30 lines (+10/-0)
2 files modified
src/Unity/categories.cpp (+8/-0)
src/Unity/categories.h (+2/-0)
To merge this branch: bzr merge lp:~unity-api-team/unity-scopes-shell/today-scope-crash
Reviewer Review Type Date Requested Status
Marcus Tomlinson (community) Approve
Paweł Stołowski Pending
PS Jenkins bot continuous-integration Pending
Review via email: mp+242355@code.launchpad.net

This proposal supersedes a proposal from 2014-11-19.

Commit message

Fix today scope crash

Description of the change

Fix today scope crash

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:165
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/262/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/4

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

review: Approve (continuous-integration)
Revision history for this message
Paweł Stołowski (stolowski) wrote : Posted in a previous version of this proposal

Yes, it definately makes sense! +1

review: Approve
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Outstanding! :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Unity/categories.cpp'
2--- src/Unity/categories.cpp 2014-08-05 23:33:32 +0000
3+++ src/Unity/categories.cpp 2014-11-20 14:17:21 +0000
4@@ -306,6 +306,14 @@
5 {
6 }
7
8+Categories::~Categories()
9+{
10+ // Pete Woods: Do not remove these clear methods unless you are doing
11+ // serious refactoring. Fixes: https://bugs.launchpad.net/ubuntu/+source/unity-scopes-shell/+bug/1394155
12+ m_categories.clear();
13+ m_categoryResults.clear();
14+}
15+
16 int Categories::rowCount(const QModelIndex& parent) const
17 {
18 Q_UNUSED(parent);
19
20=== modified file 'src/Unity/categories.h'
21--- src/Unity/categories.h 2014-07-17 15:44:03 +0000
22+++ src/Unity/categories.h 2014-11-20 14:17:21 +0000
23@@ -43,6 +43,8 @@
24 public:
25 explicit Categories(QObject* parent = 0);
26
27+ ~Categories();
28+
29 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
30 int rowCount(const QModelIndex& parent = QModelIndex()) const override;
31

Subscribers

People subscribed via source and target branches

to all changes: