← Back to branch summary

~noskcaj/ubuntu/wily/epiphany-browser/merge

« back to all changes in this revision

Viewing changes to src/ephy-encoding-dialog.c

  • Committer: Package Import Robot
  • Author(s): Jackson Doak
  • Date: 2015-06-02 10:42:34 UTC
  • mfrom: (1.10.3) (105.1.15 sid)
  • Revision ID: package-import@ubuntu.com-20150602104234-aud9080wq37exs53
Tags: 3.16.1-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - debian/patches/07_bookmarks.patch:
    Add Ubuntu-specific default bookmarks, borrowed from Firefox
  - debian/patches/81_ubuntu_force_update_bookmarks_menu.patch:
    update the bookmarks menu every time the internal structure
    is changed (needed for the indicator application menu to work
    correctly).
  - debian/patches/ubuntu_titlebars.patch: Use traditional titlebars
    for non-GNOME sessions

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ephy-encoding-dialog.c
341
341
                                (EPHY_EMBED_SHELL (ephy_shell_get_default ())));
342
342
 
343
343
        ephy_dialog_construct (EPHY_DIALOG (dialog),
344
 
                               "/org/gnome/epiphany/epiphany.ui",
 
344
                               "/org/gnome/epiphany/encoding-dialog.ui",
345
345
                               "encoding_dialog",
346
346
                               NULL);
347
347