lp:~aauzi/midori/fix-1179624

Created by André Auzi and last modified
Get this branch:
bzr branch lp:~aauzi/midori/fix-1179624
Only André Auzi can upload to this branch. If you are André Auzi please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
André Auzi
Project:
Midori Web Browser
Status:
Merged

Recent revisions

6180. By André Auzi

Take into account review comments + merge lp:midori

6179. By André Auzi

merge lp:midori

6178. By André Auzi

Change code style

6177. By André Auzi

Remove change in midori_browser_bookmark_open_activate_cb

6176. By André Auzi

Merge lp:midori

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

6172. By André Auzi

Take into account review remarks

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
This branch contains Public information 
Everyone can see this information.

Subscribers