← Back to branch summary

~ubuntu-branches/ubuntu/maverick/epiphany-browser/maverick

« back to all changes in this revision

Viewing changes to src/bookmarks/ephy-bookmark-factory-action.c

  • Committer: Bazaar Package Importer
  • Author(s): Josselin Mouette, Gustavo Noronha Silva, Josselin Mouette
  • Date: 2009-11-13 19:28:48 UTC
  • mfrom: (1.3.10 sid)
  • Revision ID: james.westby@ubuntu.com-20091113192848-l1ktaulwcdb1cd2i
Tags: 2.29.1-2
[ Gustavo Noronha Silva ]
* debian/patches/04_set_prgname.patch:
- New patch, to make sure GNOME Shell is able to match the application
  windows to the .desktop file, and app well favourite.

[ Josselin Mouette ]
* Add a conflict with swfdec-mozilla, the plugin makes the browser 
  completely unusable on any website with Flash content.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/bookmarks/ephy-bookmark-factory-action.c
57
57
        g_return_if_fail (model);
58
58
        
59
59
        children = gtk_container_get_children (GTK_CONTAINER (etoolbar));
60
 
        pos = g_list_index (children, toolbar->parent);
 
60
        pos = g_list_index (children, gtk_widget_get_parent (toolbar));
61
61
        index = gtk_toolbar_get_item_index (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (item));
62
62
        g_list_free (children);
63
63
        
186
186
        g_object_set_data (G_OBJECT (model), EGG_TOOLBARS_MODEL_DATA, NULL);
187
187
 
188
188
        children = gtk_container_get_children (GTK_CONTAINER (etoolbar));
189
 
        pos = g_list_index (children, toolbar->parent);
 
189
        pos = g_list_index (children, gtk_widget_get_parent (toolbar));
190
190
        index = gtk_toolbar_get_item_index (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (item));
191
191
        g_list_free (children);
192
192