Midori Web Browser

Merge lp:~xapantu/midori/fix-granite-tabs into lp:midori

  1. fix-granite-tabs
  2. Merge into trunk
Proposed by xapantu
Status: Rejected
Rejected by: xapantu
Proposed branch: lp:~xapantu/midori/fix-granite-tabs
Merge into: lp:midori
Diff against target: 12 lines (+1/-1)
1 file modified
midori/midori-browser.c (+1/-1)
To merge this branch: bzr merge lp:~xapantu/midori/fix-granite-tabs
Reviewer Review Type Date Requested Status
Cris Dywan Needs Fixing
Review via email: mp+169694@code.launchpad.net

Description of the change

To fix #1157350, an API break has been needed (it adds an argument to remove_tab so as a tab deletion can be forced for tab drag and drop for instance).

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

We need to hold this off until the API break is planned properly. Just changing a function signature now is not a recipe for a long and peaceful life.

review: Needs Fixing
Revision history for this message
xapantu (xapantu) wrote :

Yes, it is outdated now since the API is eventually not broken (as I said, it is my fault, I didn't think that this API was already used in released software, I thought it was still considered as being beta).

Unmerged revisions

6215. By xapantu

Adapt to the upcoming granite API

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-browser.c'
2--- midori/midori-browser.c 2013-06-09 20:00:41 +0000
3+++ midori/midori-browser.c 2013-06-16 16:47:25 +0000
4@@ -1595,7 +1595,7 @@
5 MidoriView* view = MIDORI_VIEW (widget);
6 #ifdef HAVE_GRANITE
7 granite_widgets_dynamic_notebook_remove_tab (
8- GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), midori_view_get_tab (view));
9+ GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook), midori_view_get_tab (view), FALSE);
10 #else
11 gtk_widget_destroy (widget);
12 #endif

Subscribers

People subscribed via source and target branches

to all changes: