← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/ephy-toolbar-editor.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/ephy-toolbar-editor.c
178
178
 
179
179
        toolbar = ephy_window_get_toolbar (priv->window);
180
180
 
181
 
        vbox = GTK_DIALOG (dialog)->vbox;
 
181
        vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
182
182
        gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)), 5);
183
 
        gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
 
183
        gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 2);
184
184
        gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
185
185
        gtk_window_set_title (GTK_WINDOW (dialog), _("Toolbar Editor"));
186
186
        gtk_window_set_icon_name (GTK_WINDOW (dialog), EPHY_STOCK_EPHY);