Merge lp:~davidgomes/granite/fix-1116864 into lp:~elementary-pantheon/granite/granite

Proposed by David Gomes
Status: Merged
Merged at revision: 539
Proposed branch: lp:~davidgomes/granite/fix-1116864
Merge into: lp:~elementary-pantheon/granite/granite
Diff against target: 26 lines (+3/-0)
1 file modified
lib/Widgets/DynamicNotebook.vala (+3/-0)
To merge this branch: bzr merge lp:~davidgomes/granite/fix-1116864
Reviewer Review Type Date Requested Status
RabbitBot Approve
Review via email: mp+153237@code.launchpad.net

Description of the change

Fixed bug #1116864 by destroying a tab's page_container. I used kalikiana's patch, so I --author'd him.

To post a comment you must log in.
Revision history for this message
David Gomes (davidgomes) wrote :

Note: this needs testing.

Revision history for this message
David Gomes (davidgomes) wrote :

Alright, I tested it and it works as a fix for Midori Granite. More testing is appreciated, though.

Revision history for this message
Sergey "Shnatsel" Davidoff (shnatsel) wrote :

Try tricking people into running "elementary-test-merge https://code.launchpad.net/~davidgomes/granite/fix-1116864/+merge/153237" and observe results.

Revision history for this message
RabbitBot (rabbitbot-a) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/Widgets/DynamicNotebook.vala'
--- lib/Widgets/DynamicNotebook.vala 2013-01-03 05:38:19 +0000
+++ lib/Widgets/DynamicNotebook.vala 2013-03-13 20:05:28 +0000
@@ -459,6 +459,7 @@
459 unowned Gtk.Notebook on_create_window (Gtk.Widget page, int x, int y) {459 unowned Gtk.Notebook on_create_window (Gtk.Widget page, int x, int y) {
460 var tab = notebook.get_tab_label (page) as Tab;460 var tab = notebook.get_tab_label (page) as Tab;
461 notebook.remove_page (notebook.page_num (tab.page_container));461 notebook.remove_page (notebook.page_num (tab.page_container));
462 tab.page_container.destroy ();
462463
463 tab_moved (tab, 0, true, x, y);464 tab_moved (tab, 0, true, x, y);
464 return null;465 return null;
@@ -491,6 +492,7 @@
491 var pos = get_tab_position (tab);492 var pos = get_tab_position (tab);
492 if (pos != -1)493 if (pos != -1)
493 notebook.remove_page (pos);494 notebook.remove_page (pos);
495 tab.page_container.destroy ();
494 }496 }
495497
496 public void next_page () {498 public void next_page () {
@@ -578,6 +580,7 @@
578580
579 tab.new_window.connect (() => {581 tab.new_window.connect (() => {
580 notebook.remove_page (notebook.page_num (tab.page_container));582 notebook.remove_page (notebook.page_num (tab.page_container));
583 tab.page_container.destroy ();
581 tab_moved (tab, 0, true, 0, 0);584 tab_moved (tab, 0, true, 0, 0);
582 });585 });
583586

Subscribers

People subscribed via source and target branches