← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/ephy-prefs.h

  • 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:
lib/ephy-prefs.h
103
103
 
104
104
#define EPHY_PREFS_SCHEMA                         "org.gnome.Epiphany"
105
105
#define EPHY_PREFS_USER_AGENT                     "user-agent"
106
 
#define EPHY_PREFS_CACHE_SIZE                     "cache-size"
107
106
#define EPHY_PREFS_NEW_WINDOWS_IN_TABS            "new-windows-in-tabs"
108
107
#define EPHY_PREFS_AUTO_DOWNLOADS                 "automatic-downloads"
109
108
#define EPHY_PREFS_WARN_ON_CLOSE_UNSUBMITTED_DATA "warn-on-close-unsubmitted-data"