lp:~aauzi/midori/fix-1179624
- Get this branch:
- bzr branch lp:~aauzi/midori/fix-1179624
Branch merges
- Cris Dywan: Approve
- André Auzi: Needs Resubmitting
- Paweł Forysiuk: Approve
-
Diff: 547 lines (+404/-10)4 files modifiedmidori/midori-array.c (+150/-0)
midori/midori-array.h (+7/-0)
midori/midori-browser.c (+15/-4)
panels/midori-bookmarks.c (+232/-6)
Related bugs
Bug #1179624: Lack of visual feedback in bookmarks panel | Wishlist | Fix Released |
Related blueprints
Branch information
Recent revisions
- 6175. By André Auzi
-
Complete remove of "app" related code
Take pfor's comments into account: texts simplifications and redundancy
reduced - 6174. By André Auzi
-
Fix potential memory leak in:
489 +static KatzeItem*
490 +midori_bookmarks_ get_item_ at_pos (GtkTreeView *treeview,
491 + gint x, gint y)
492 +{
493 + GtkTreeModel* model = gtk_tree_view_get_ model (treeview);
494 + GtkTreePath* path;
495 + GtkTreeIter iter;
496 + KatzeItem* item;
497 +
498 + gtk_tree_view_get_ path_at_ pos (treeview, x, y,
499 + &path, NULL, NULL, NULL);
500 +
501 + if (!path)
502 + return NULL;
503 +
504 + if (!gtk_tree_model_get_ iter (model, &iter, path))
505 + return NULL;
506 +
507 + gtk_tree_model_get (model, &iter, 0, &item, -1);
508 +
509 + gtk_tree_path_free (path); <= can leak if gtk_tree_model_get_ iter returned FALSE
510 +
511 + return item;
512 +} - 6173. By André Auzi
-
Merge with lp:midori.
1 conflict solved:
* remove of Open link as web application in link popup context menu - 6171. By André Auzi
-
Take into account review comments
Implements:
* use of ngettext for plural translations
* use pure SGLite commands for midori_array_count_ recursive_ by
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:midori