~ubuntu-branches/ubuntu/precise/epiphany-browser/precise-updates

« back to all changes in this revision

Viewing changes to src/epiphany.h

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2011-07-22 11:25:31 UTC
  • mfrom: (1.6.2 upstream) (98.2.2 sid)
  • Revision ID: james.westby@ubuntu.com-20110722112531-0np34twsgorr803p
Tags: 3.0.4-1ubuntu1
* Resynchronize on Debian, remaining diffs:
* debian/branding.conf.in: set the branding to Ubuntu.
* debian/epiphany-browser-data.gconf-defaults:
  - set startpage and search to Ubuntu
* debian/patches/80_ubuntu_search_url.patch: use Ubuntu search
* 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).

Show diffs side-by-side

added added

removed removed

Lines of Context:
25
25
/* From GTK_CHECK_VERSION */
26
26
#define EPHY_MAJOR_VERSION (3)
27
27
#define EPHY_MINOR_VERSION (0)
28
 
#define EPHY_MICRO_VERSION (3)
 
28
#define EPHY_MICRO_VERSION (4)
29
29
 
30
30
#define EPHY_CHECK_VERSION(major, minor, micro)\
31
31
  (EPHY_MAJOR_VERSION > (major) || \