Midori Web Browser

Merge lp:~ivaldi/midori/delayed-load-item-ownership into lp:midori

  1. delayed-load-item-ownership
  2. Merge into trunk
Proposed by André Stösel
Status: Merged
Approved by: Cris Dywan
Approved revision: 6413
Merged at revision: 6414
Proposed branch: lp:~ivaldi/midori/delayed-load-item-ownership
Merge into: lp:midori
Diff against target: 23 lines (+2/-4)
1 file modified
extensions/delayed-load.vala (+2/-4)
To merge this branch: bzr merge lp:~ivaldi/midori/delayed-load-item-ownership
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Review via email: mp+187831@code.launchpad.net

Commit message

fix for proxy item ownership in delayed load extension

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote :

Makes sense.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'extensions/delayed-load.vala'
2--- extensions/delayed-load.vala 2013-08-29 19:52:41 +0000
3+++ extensions/delayed-load.vala 2013-09-26 16:21:28 +0000
4@@ -82,8 +82,7 @@
5 Midori.View? view = browser.tab as Midori.View;
6 Midori.View scheduled_view = tasks.index (0) as Midori.View;
7 if (scheduled_view == view) {
8- Katze.Item item = view.get_proxy_item ();
9- item.ref();
10+ unowned Katze.Item item = view.get_proxy_item ();
11
12 int64 delay = item.get_meta_integer ("delay");
13 if (delay == Midori.Delay.PENDING_UNDELAY) {
14@@ -136,8 +135,7 @@
15 Midori.App app = get_app ();
16 Midori.Browser browser = app.browser;
17
18- Katze.Item item = new_view.get_proxy_item ();
19- item.ref();
20+ unowned Katze.Item item = new_view.get_proxy_item ();
21
22 int64 delay = item.get_meta_integer ("delay");
23 if (delay == Midori.Delay.PENDING_UNDELAY && new_view.progress < 1.0) {

Subscribers

People subscribed via source and target branches

to all changes: