Update to 1.2.2:

==============
Epiphany 1.2.2
==============

Translations:
	* Amanpreet Singh Alam (pa)
	* Duarte Loreto (pt)
	* Åsmund Skjævelan (nn)
	* Gujarati team at Magnet-i (gu)
	* Trinh Minh Thanh (vi)


===============
Epiphany 1.2.1
===============

Bug fixes:
	* Fix a crash when opening bookmarks properties (Christian)

Translations:
	* Arafat Medini (ar)
	* Dmitry G. Mastrukov (ru)
	* Gabor Kelemen (hu)
	* Åsmund Skjæveland (nn)
	* Liu Songhe (zh_CN)
	* Marcel Telka (sk)
	* Ma SivaKumar (ta)
	* Rhys Jones (cy)
	* Sanlig Badral (mn)
	* Vladimir Petkov (bg)
	* Xavier Conde Rueda (ca)

===============
Epiphany 1.2.0
===============

Bug fixes:
	* Fix a crash when dragging an url from an external application to
	  epiphany (Marco)
	* Fix crash when downloading a link on Freebsd (Joe Marcus Clarke)

Translations:

	* Åsmund Skjæveland (nn)
	* Gustavo Maciel Dias Vieira (pt_BR)
	* John C Barstow (mi)
	* Ma SivaKumar (ta)
	* Miloslav Trmac (cs)
	* Priit Laes (et)
	* Progga (bn)
	* Roozbeh Pournader (fa)
	* Takeshi AIHANA (ja)
	* tunggul arif siswoyo (id)
	* Vladimir Petkov (bg)

===============
Epiphany 1.1.12
===============

Bug fixes:
	* Fix toolbar remove (Christian)
	* Fix crash when dragging a separator from toolbar back to tbe (Christian)
	* Fix crash when trying to activate the location entry's proxy menu item (Christian)

Translations:

	* Алесь Няхайчык (be)
	* Rhys Jones (cy)
	* Adam Weinberger (en_CA)
	* GNOME PL Team (pl)
	* Mugurel Tudor (ro)


===============
Epiphany 1.1.11
===============

Code changes
	* Change EphyTab to a GtkBin containing the MozillaEmbed widget
	  (Christian)
	* Backup bookmarks files before overwriting them when loading failed (Christian)
	* Adapt to changed Mozilla API (1.7b) (Christian)

Bugfixes
	* Fix check if link can be opened in new tab (Marco)
	* Unescape the suggested filename in the filechooser (Xan)
	* Respect max-size property of EphyEmbedPersist (Marco)
	* Don't show "about:blank" to the user (Marco)
	* Replace entities in imported folder names from mozilla (Christian)
	* Fix for gtk+ filechooser API change (Christian)
	* Don't make windows larger than the screen (Marco)
	* Fix check for firebird bookmarks directory (André Dahlqvist)
	* Fix toolbar dnd to the location entry (Marco)
	* XBEL bookmarks importer fixes (Christian)
	* Fix uncategorising a bookmark (Marco)
	* Don't restore windows in reverse order (Marco)
	* Fix filename decoding in Content-Disposition headers (Christian)
	* Fix double-unref of failed/cancelled favicon downloads (Christian)
	* Fix "Open" button label in content handler (Marco)
	* Fix MozDownload lifecycle bug, was crashing on aborting downloads (Marco)
	* Fix EphyDownload lifecycle interaction with MozDownload bug (Christian)
	* Check for NULL subtree before trying to parse it on node db load (Christian)
	* Activate the downloader tray icon with double-click not single-click (Marco)
	* Ensure we always have a BookmarksBar in the toolbars model (Christian)
	* Fix smart bookmark property update on bmk location change (Christian)
	* Fix smart bookmark property sync on toolbar item (Christian)
	* Don't show two resume dialogues, just raise the existing one (Marco)
	* Don't remember filechooser size, fixes dialogue sizing in Save mode (Christian)
	* Don't ask about unsubmitted changes when the embed is closed from js (Marco)
	* Fix favicon updating in bookmarks menu and toolbar (Christian)
	* Fix bookmarks re-categorising by dnd (Christian)
	* Fix high CPU usage on download by lowering update interval (Christian)
	* Fix "About" dialogue icon (Christian)
	* Fix crash when closing a still-loading popup (Christian)
	* Fix filename validation not to produce invalid unicode string (Christian)
	* Don't assume Desktop location, check with gconf pref (Christian)
	* Fix unsubmitted change check code not to return error for XUL documents (Christian)
	* Fix user-changed accelerator persistence (Christian)
	* Also pop up context menu from Menu key (Christian)

Translations
	* Mətin Əmirov (az)
	* Ole Laursen (da)
	* Κώστας Παπαδήμας (el)
	* Priit Laes (et)
	* Pauli Virtanen (fi)
	* Christophe Merlet (fr)
	* रविशंकर श्रीवास्तव (hi)
	* Laszlo Dvornik (hu)
	* Francesco Marletta (it)
	* Changwoo Ryu (ko)
	* Žygimantas Beručka (lt)
	* Hasbullah Bin Pit (ms)
	* Reinout van Schouwen (nl)
	* Kjartan Maraas (no)
	* Duarte Loreto (pt)
	* Laurent Dhima (sq)
	* Christian Rose (sv)


===============
Epiphany 1.1.10
===============

Bugfixes
	* Adapt to mozilla API changes (Christian)
	* Fix predictable temp file name (Marco)
	* Fix an error in the schema file (Julio M. Merino Vidal)
	* Fix --with-html-dir configure arg (Julio M. Merino Vidal)
	* Fix toolbar editor table layout off-by-one error (Christian)
	* When removing a toolbar make its items available again in the
	  toolbars editor (Christian)
	* Typo fixes in help file (Alexander Winston)
	* Fix toolbar height when adding the first item (Christian)

Translations

	* Adam Weinberger (en_CA)
	* Алесь Няхайчык (be)
	* Changwoo Ryu (ko)
	* Christian Neumair (de)
	* Christian Rose (sv)
	* Данило Шеган (sr, sr@Latn)
	* Duarte Loreto (pt)
	* Francisco Javier F. Serrador (es)
	* GNOME PL Team (pl)
	* Laurent Dhima (sq)
	* Miloslav Trmač (cs)
	* Ole Laursen (da)
	* Reinout van Schouwen (nl)
	* 相花 毅 (ja)


==============
Epiphany 1.1.9
==============

Bugfixes
	* Fix compilation with certain gcc version
	* Fix filechooser filters when shown from mozilla
	* Hide filechooser after response, since it won't be destroyed immediately
	  when shown from javascript

Translations:
	* Christophe Merlet (fr)
	* Kjartan Maraas (no)
	* Miloslav Trmac (cs)
	* Mətin Əmirov (az)

==============
Epiphany 1.1.8
==============

Code changes

	* Use gnome-common to generate help makefiles (Marco)

Interface improvements

	* Use title capitalisation in the clear history dialog (Piers Cornwell)
	* Use a default width/height for dialogs with treeviews
	  that don't have a fixed requisition (Biggest Flake Ever)
	* Set a default height/width for the encoding dialog (Dave)
	* Don't show Find, Add Language, and Encodings dialogue in
          window list.
	* Now that GtkComboBox supports mnemonic activation,
          set the focus target of the combos labels (Christian)
	* Make resume dialog warning message selectable
	  per HIG (Piers Cornwell)
	* Make columns resizable (Marco Pesenti Gritti)

Bugfixes

	* Fix a lot of memleaks (Christian)
	* Fix toolbar overflow menus creation (Christian)
	* Honour the --with-gconf-schema-file-dir and
	  --disable-schemas-install configure options
	  (Julio M. Merino Vidal)
	* Fixup completion matching and priority calculation (Marco)
	* Put the serial numbers in duplicated filenames just before
          the last dot so we won't confuse apps like file-roller. (Xan)
	* In downloader when open is explicitly requested from
	  the dialog use a temporary file (Marco)
	* Sync with mozilla 1.7a api (Christian)
	* Reenable indentation of node xml (Christian)
	* Fix numerous places where we weren't properly
	  converting between UTF-8 and filename encoding. (Christian)
	* Unify fallback downloads dir to get the
	  home directory (Christian)
	* Don't set entries insensitive, only set the non-editable when the
          gconf key isn't writable. (Christian)
	* Changed .pc file version to 1.2 (Christian)
	* Make statusbar api public for plugins (Christian)
	* Fix several problems in the safe/unsafe downloads logic (Marco)

Translations

	* Ales Nyakhaychyk (be)
	* Arafat Medini (ar)
	* Changwoo Ryu (ko)
	* Christian Neumair (de)
	* Christophe Merlet (RedFox) (fr)
	* Danilo Segan (sr)
	* Duarte Loreto (pt)
	* Francisco Javier F. Serrador (es)
	* Funda Wang (zh_CN)
	* GNOME PL Team (pl)
	* Hasbullah Bin Pit (ms)
	* John C Barstow (mi)
	* Kjartan Maraas (no)
	* Kostas Papadimas (el)
	* Laurent Dhima (sq)
	* Maxim Dziumanenko (uk)
	* Miloslav Trmac (cs)
	* Pauli Virtanen (fi)
	* Žygimantas Beručka (lt)

==============
Epiphany 1.1.6
==============

Code changes

	* Add default width/height to EphyDialogs (Marco)
	* Add a way to get the downloads dir (Marco, Christian, Adam Hooper)

Interface improvements

	* Use EPHY_STOCK_DOWNLOAD for download link icon (David Bordoley)
	* Add a hidden "Tools" menu that extensions can use (David Bordoley)

Bugfixes

	* ephy-tab LOAD_PROGRESS property typo fix (Adam Hooper)
	* Fix many, many memory leaks in 28 functions (Christian)
	* Fix property getter of favicon "icon" property (Christian)
	* Fix encoding converstion of "Untitled" filename suggestion (Christian)
	* Don't crash when reading RDF file fails on bookmark import (Christian)
	* Use rdf:resource instead of rdf:about on bookmark export (Christian)
	* Sync topic names in the bookmarks menu (Christian)
	* Fix bookmarks options parsing (Christian)
	* Fix linking with nautilus view enabled (Christian Persch)
	* Don't initialize EphyBrowser multiple times (Marco)
	* Fix download cancelling (Marco)
	* Fix compilation with Mozilla 1.4 (Christian)
	* Don't display accelerators in tab titles (Christian)
	* Remove misleading comment for ephy_string_blank_chr (Adam Hooper)
	* When checking forms for modifications, handle text
	  entries with default value longer than maxlength (Christian)

Documentation

	* Update documentation (Piers Cornwell)
	* Update screenshot (David Bordoley)
	* Update copyright date (Christian)

Translations

	* Changwoo Ryu (ko)
	* Kjartan Maraas (no)
	* Hasbullah Bin Pit (ms)
	* Francisco Javier F. Serrador (es)
	* Miloslav Trmac (cs)
	* Danilo Segan (sr)
	* Danilo Segan (sr@Latn)
	* Christophe Merlet (RedFox) (fr)
	* GNOME PL Team (pl)
	* Žygimantas Beručka (lt)
	* Sanlig Badral (mn)
	* Kostas Papadimas (el)
	* Christian Neumair (de)
	* Reinout van Schouwen (nl)
	* Laurent Dhima (sq)
	* Alastair McKinstry (ga)
	* Duarte Loreto (pt)
	* Christian Rose (sv)

==============
Epiphany 1.1.5
==============

Bugfixes

	* Fix dialogs size persistance

==============
Epiphany 1.1.4
==============

Code changes

	* Make EphyEmbedEvent abstract, implemented by MozillaEmbedEvent (Christian)
	* Api to get the page content into a string (Lee Willis)
	* Use ngettext for number of downloads and remaining minutes display in
	  the tooltip of the tray icon. (Piers Cornwell)
	* Allow to open glade files not inside epiphany dirs (Adam Hooper)
	* Make Cancel safe against non active downloads (Xan)
	* Allow passing the translation domain to ephy_dialog_construct,
          to make extension's dialogues translatable. (Christian)

Interface improvements

	* Allow to  show/hide downloader clicking on tray icon (Xan)
	* Show help for menu items in the statusbar (Christian)
	* Use a Downloads folder on the desktop by default (Marco)
	* Allow to disable automatic downloads (Marco)
	* Re-enable fonts language font filtering (Christian)
	* Better string for history disabling lockdown pref (Marco)
	* Delete UTF-7 from our list of known encodings (Christian)
	* Persist downloader position (Marco)

Bugfixes

	* Fix crash closing windows/tabs (Christian)
	* Actually save the file in downloads dir and then
          open it (Marco)
	* Create an epiphany temp dir in /tmp so that we can have
	  the right permissions on it (Christopher James Lahey)
	* Work around a bug in mozilla where  0xa0 (NBSP) are
	  converted to spaces (Christian)
	* Fix force reload (Christian)
	* Do not use the same pref of 1.0 for the download dir,
	  they are different things (Marco)
	* Do not use the downloader folder key to persist
	  Save As actions (Marco)

Translations

	* Miloslav Trmac (cs)
	* Christian Neumair (de)
	* Nikos Charonitakis (el)
	* Francisco Javier F. Serrador (es)
	* Alastair McKinstry (ga)
	* Changwoo Ryu (ko)
	* Hasbullah Bin Pit (ms)
	* Reinout van Schouwen (nl)
	* Kjartan Maraas (no)
	* Artur Flinta (pl)
	* Danilo Šegan  (sr, sr@Latn)
	* Laurent Dhima (sq)

==============
Epiphany 1.1.3
==============

Code changes

	* Add API to clear http auth cache (Christian)
	* Fix compilation with mozilla 1.4 (Christian)
	* Some API naming unification (Christian)
	* Add API to get the EphyTab from its EphyEmbed (Christian)
	* Better error checking in mozilla glue code (Christian)
	* Track mozilla trunk API changes (Christian)

New features

	* Set SOCKS host from GNOME global preferences (Christian)
	* Check if there was input in forms before closing the tab/window,
	  and warn user if there are unsubmitted changes (Christian)
	* More lockdown features (Christopher J. Lahey, Christian)
	* Caret browsing (enabled/disabled with F7) (Christian)
	* Add back "Download Link As..." to the context menu (Xan)

Interface improvements

	* Always show "Copy" in the context menu when there is a selection
	  (Michael Terry)
	* Add "Help" buttons to all dialogues (Piers Cornwell)

Bugfixes

	* Fix some mem leaks (Christian)
	* Fix the encoding menu in the case that the encoding is unknown to us
	  (Christian)
	* Fix logic error in window position restoring (Dave Jones)
	* Fix startup crash when lockdown enabled (Christopher J. Lahey)
	* Fix gobject implementation error in notebook finalize (Christian)

Documentation

	* Updated OMF file (Piers Cornwell)

Translations

	* Arafat Medini (ar)
	* Changwoo Ryu (ko)
	* Christian Neumair (de)
	* Christian Rose (sv)
	* Danilo Segan (sr, sr@Latn)
	* Duarte Loreto (pt)
	* Francesco Marletta (it)
	* Francisco Javier F. Serrador (es)
	* GNOME PL Team (pl)
	* Joao Emanuel (pt_BR)
	* Michael Everson (ga)
 	* Miloslav Trmač (cs)
	* Progga (bn)
	* Robert Sedak (hr)
	* Roozbeh Pournader (fa)
	* Sanlig Badral (mn)
	* Sebastien Bacher (fr)
	* tunggul arif siswoyo (id)


==============
Epiphany 1.1.2
==============

Code changes

	* Reformat spinner code to conform to epiphany coding style. (Christian)
	* Allow plugins to access the statusbar (Adam Hooper)
	* Use statusbar api directly instead of wrapping it around, so that
	  we can have different groups of messages (Marco)
	* No need to have EphyNode thread safe since we never use
	  it in threads anyway (Marco)
	* Brought toolbar editor code type macros in line with the
	  rest of libegg; use gobject instance private data (Christian)

New features

	* Lockdown: set buttons insensitive when their
          pref key is not writable. (Christian)
	* Allow to move languages up and down in language editor (Christian)

Interface improvements

	* Make ctrl-click equivalent of middle click on links. Make shift-click
          save the link. (Christian)
	* Sort the list of fonts alphabetically (Christian)
	* Make toolbar editing drag icons use the same icon size as the
          actual toolbar icons (Jorn Baayen)
	* In history show only site title by default (Marco)
	* Make print dialogue spacing HIG-compliant (Christian)
	* Use stock icon for print setup (Christian)
	* Better way of mapping hierarchy to topics when importing
          bookmarks from mozilla (Christian)
	* In-line the language editor in the prefs dialog (Christian)
	* Use favicons in the back/forward menus (Christian)
	* Set the download folder selection label to "Home" if download folder
          is home folder (Christian Neumair)

Bugfixes

	* Fix several mem leaks (Christian)
	* Depend on automake 1.7, fix compilation from
	  cvs on systems with 1.6 installed (Marco)
	* Restore tabs menu shortcut keys ALT-1 .. ALT-0 (Christian)
	* Don't try to save the submit button image instead of submitting
          the form
	* Destroy file chooser with its parent window; fixes crashes (Christian)
	* Fix coordinates of under widgets popup in RTL mode (Christian)
	* Do not try to pickup already set MOZILLA_FIVE_HOME,
          hopefully fix crashes oepning links from thunderbird (Marco)
	* Re-implement Pause/Resume in downloader (Xan)
	* Correctly cancel the download instead of just
          cancelling the request. (Marco)

Documentation

	* Updated printing docs (Piers Cornwell)
	* GDK_Meta_L is a keycode, not a modifier code.
          Map meta to GDK_MOD2_MASK. (Christian)

Translations

	* ar (Arafat Medini)
	* be (Ales Nyakhaychyk)
	* cs (Miloslav Trmac)
	* de (Christian Neumair)
	* el (Kostas Papadimas)
	* en_GB (Christian Persch)
	* es (Francisco F. Serrador)
	* nl (Vincent van Adrighem)
	* no (Kjartan Maraas)
	* pt_BR (Gustavo Noronha Silva)
	* sr (Danilo Šegan)
	* sr@Latn (Danilo Šegan)
	* sq (Laurent Dhima)

==============
Epiphany 1.1.1
==============

Code changes

	* Adapt to mozilla API changes (Marco, Xan, Christian)
	* Sync gtk+ NSS dialogues from galeon (Marco)
	* Embed commands interface for clipboard commands (Marco)
	* Re-sync egg-editable-toolbar with gtk+ toolbar api changes (Marco)
	* New file chooser wrapper class (Christian)
	* Re-sync nautilus view with nautilus api changes (Marco)
	* Cleanup of EphyWrapper to use higher-level mozilla api (Marco)
	* Initialize EphyWrapper on realize (Marco)
	* Instantiate an about:blank automatically (Marco)
	* Show filechooser from header sniffer (Marco, Christian)
	* Use content document dom to determine is_framed (Marco)
	* Sync egg-editable-toolbar api with gtk+ toolbar api (Soren Sandmann)
	* Use gnome-vfs helpers to launch apps, drop our own helpers (Marco)
	* Only save history db if it's changed (Christian)
	* Implement new downloading from ContentHandler (Xan)
	* Use stock gcclosure-marshals where they exist (Christian)
	* Implement commands state api (Marco)
	* Rework ContentHandler to use auto_open of downloads (Xan)
	* Resync eel-gconf-extensions from eel (Marco)
	* Migrate old font settings (Marco)
	* Get rid of gresult type (Christian)
	* Remove unused function from ephy-gui (Marco)
	* Use glib gi18n header instead of bonobo/libgnome one (Marc, Christian)
	* Don't cache the dom document since it changes for every load (Marco)
	* List of safe mime types, and script to update it (Marco)
	* Use list of safe mime types to determine if we auto-open (Marco)
	* Use gtk icon theme instead of gnome icon theme (Marco)
	* Better ephy completion model (Marco)
	* Port ephy node db saving and bookmarks RDF export to new libxml
	  xmlWriter api (Christian)
	* Remove some unneeded prototypes (Marco)
	* Cleanup session, also persist bme and history window (Marco)
	* Re-use gtkmozembed signals (Marco)
	* Hack to make tooltips on toolbar items work (Marco)
	* New extensions API (Christian)
	* Port session to new extensions api (Christian)
	* Reworked automation/activation (Marco)
	* Enable deprecations and -Werror only in maintainer mode (Marco)
	* Move gnome session code in the shell (Marco)
	* Port to changed gtk+ combo box api (Marco)
	* gtk-doc support (Marco)
	* handle_content signal on EphyEmbedSingle for external downloader
	  support (Marco)
	* Refactor embed single apis into new EphyCookieManager,
	  EphyPasswordManager and EphyPermissionManager interfaces (Christian)
	* Implement arbitrary_url lockdown pref (Marco, Christopher Lahey)
	* Don't build external protocol handlers with mozilla 1.6, it has
	  its own (Marco)
	* Merge exthandler/content implementation (Marco)
	* Refactored PDM dialogue implementation (Christian)
	* Lockdown: disable loading from unsafe protocols (Christian)
	* Port zoom control to new GtkComboBox (Christian)
	* Show time remaining in download tray icon tooltip (Marco)
	* Lockdown: disable chrome changes from js (Marco, Christopher Lahey)
	* Port EphyDialog and all users to new GtkComboBox (Christian)
	* Remove GtkOptionMenu support from EphyDialog (Christian)
	* Re-enable deprecation when in maintainer mode (Marco)
	* Port GtkNSSClientAuthDialogs to new GtkComboBox (Christian)
	* Remove some unused includes (Marco, Christian)

New features

	* Persist zoom setting per host (Christian)
	* Undo/Redo in forms (Dave, Marco)
	* Gtk+ NSS Auth Dialogues (Crispin Flowerday, from galeon)
	* Tray icon support for downloader (Marco)
	* Beginnings of lockdown mode (Marco, Christian, Christopher Lahey)

Interface improvements

	* Improved downloader interface (Marco, Xan)
	* Move the spinner in its own mini-toolbar (Marco)
	* New hand cursor adapted from eog (Dave)
	* Use hand cursor in toolbar editor (Marco)
	* Made encodings dialogue auto-apply (Christian)
	* Don't pollute statusbar with the "done" mesage (Dave)
	* Auto-close downloader when no more items
	  left (Xan)
	* Use new gtk+ file chooser (Christian)
	* Better sorting of encoding autodetectors (Christian)
	* Implement smart selection in downloader view (Xan)
	* Smoother toolbar drag highlighting (Soren Sandmann)
	* Update commands sensitivity in menus (Marco)
	* Implement UI for download folder (Xan)
	* Make prefs and PDM dialogues global (Christian)
	* Improved cookie properties dialogue (Piers Cornwell)
	* Split print into print setup and print (Christian)

Bugfixes

	* Remove invalid items from toolbars on load (Marco)
	* Don't hide a separator item while dragging it (Marco)
	* Fix delete event handling for downloader (Xan)
	* Add missing default prefs for some language groups (Christian)
	* Fix default prefs file for new mozilla parser changes (Christian)
	* Remember upload path (Christian)
	* Fix bookmarks import dialogue button duplication (Christian)
	* Convert filenames to/from utf-8 before using them (Christian)
	* Fix spinner refcounting (Christian)
	* Fix fullscreen toolbar visibility (Marco)
	* Force encoding on changes, so we can go back to automatic (Christian)
	* Build nautilus server only when view is enabled (Marco)
	* Fix leak of liststores from combo boxes (Marco)
	* Fix dnd data provided by drag handle (Marco)
	* Fix toolbar drag type creation (Marco)
	* Don't require parent window for filechooser (Marco)
	* Fix toolbar highlighting (Marco)
	* Set sensible cursor hotspot in toolbar editor (Marco)
	* Fix filechooser directory persistence (Christian)
	* Unset silent mode after printing (Christian)
	* Don't unref print dialogue twice when shown from mozila (Christian)
	* Fix return value from print dialogue so mozilla won't show erroneous
	  error dialogue (Christian)
	* EphyDialog needs to be initialised when run, too (Christian)
	* Use signal accumulators for boolean-return signals (Christian)
	* Do not try to set sensitivity "Paste" menu items, the wait api
	  cause bad crashes (Marco)
	* Only allow printing the selection if there really is one (Christian)
	* Use show() when run()ning an EphyDialog (Christian)
	* Fix completion model crash on deleting a bookmark (Marco)
	* Fix ephy location entry finalisation (Christian)
	* Fix bookmarks editor crash from gtk clipboard wait api (Marco)
	* Fix history db saving not to save "All" node (Marco)
	* Don't unref the icon theme, we don't own it (Christian)
	* Unlink session file when all windows are closed (Marco)
	* Fix conversion on saving, fixes view-source (Marco)
	* Fix recovery from corrupt toolbar layout file (Christian)
	* Fix completion model column use (Marco)
	* Import gtk NSS dialogues glade file from galeon, too (Christian)
	* Build XUL dialogues with a gtkmozembed in a gtkwindow (Marco)
	* Fix warning when showing the encodings dialogue (Christian)
	* Link up toolbar editor help (Christian)
	* Fix some typos (Marco)
	* Unref on timeout when in server mode (Marco)
	* Expand cmd line args (Marco)
	* Nautilus view refcounting bug fix (Marco)
	* Fix crash when starting with --bookmarks-editor, correctly instantiate
	  a session (Marco)
	* Don't re-fetch POST pages for show-source (Marco)
	* Make encodings dialogue transient (Christian)
	* Remove unused enum values (Christian)
	* Mark EphyFooPriv structs as private for gtk-doc (Christian)
	* Don't assert, return instead in impl_go_up (Marco)
	* Fix context menu leak (Marco)
	* Make session saving low disk safe (Marco)
	* Fix "Download Link" context menu item text (Marco)
	* Use stock icons where provided (Marco)
	* Only set autoproxy url if non-empty (Christian)
	* User ephy filechooser in download folder picker (Xan)
	* Fix RDF export to export 100% instead of only 50% of bookmarks
	  (Christian)
	* Fix cookie manager signal marshaller type (Christian)
	* Restore copy and paste menu items on form fields (Marco)
	* Live updates of cookies list in PDM dialogue (Christian)
	* Don't blindly overwrite files when downloading (Xan)
	* Fix some mem leaks (Christian)
	* Fix ephy_embed_get_location() on an unrealized widget (Marco)
	* Monitor /system/http_proxy for proxy changes (Christian)
	* Set pref widget sensitivity from gconf key writeablility (Christian)
	* Fix strftime(3) usage (Christian)
	* Fix GtkExpander state persistence in NSS dialogue (Christian)
	* Remove duplicate signal from EphyEmbed (Christian)

Documentation

	* Documentation neatening, organisation (Piers Cornwell)
	* Some new sections documented (Piers Cornwell)
	* Some docs fixes (Dave)
	* Beginnings of API documentation (Marco, Christian)
	* Document preferences and downloader (Piers Cornwell)
	* Document security and certificates section (Piers Cornwell)

Translations
	* Christian Neumair (de)
	* Christian Rose (sv)
	* Danilo Segan (sr)
	* Francisco Javier F. Serrador (es)
	* Gustavo Noronha Silva (pt_BR)
	* Hasbullah Bin Pit (ms)
	* KAMAGASAKO Masatoshi (ja)
	* Kostas Papadimas (el)
	* Marcel Telka (sk)
	* Mətin Əmirov(az)
	* Miloslav Trmac (cs)
	* Ole Laursen (da)
	* Paul Duffy (ga)
	* Vincent van Adrighem (nl)


==============
Epiphany 1.1.0
==============

Code changes

	* Remove most egg code and port to the gtk 2.3 api for toolbars and
	  menus (Marco, Christian)
	* Cleanup gobjects using the new add_private api (Christian)
	* Rewrote xbel bookmarks importer using xmlreader api (Christian)
	* Use new dynamic api to create dynamic menus (Marco, Christian)
	* Load default mozilla prefs from a javascript file,
          this is way is possible to override defaults in about:config (Marco)
	* Use gtk invisible event boxes (Christian)
	* Remove deprecated g_value_set_object_take_ownership() (Christian)
	* Use new gnome vfs show_url api (Christian)
	* Refactor node db loading functions into a common one in
          ephy-node-db. Switch to using xmlReader api. (Christian)
	* Use gconf_client_notify to initialize prefs (Christian)
	* Refactor initialization/automation code to ensure we dont
	  use dying shell (Marco)
	* Use GtkIconTheme (Marco)
	* Use ngettext where useful (Christian)
	* New implementation of location entry using GtkComboBox (Marco)
	* New downloads implementation (user interface being worked on) (Xan, Marco)
	* Remove our custom implementation and use gtk api for
	  empty bookmarks menu (Marco, credits to Matthias Clasen for gtk implementation)
	* Make the favourites menu self-updating (Christian)
	* Port history and bookmarks combos to new api (Marco)

New features

	* Added migration from galeon settings (Christopher James Lahey)
	* Add an --import-bookmarks command line option, and really implement
          the --add-bookmark one. (Christian)
	* Ability to choose visible columns in bookmarks and history (Marco)
	* History time filter (Marco)
	* Import bookmarks from Firebird (Christian)
	* Ability to import bookmarks from a custom file (Marco)
	* Allow dragging of tabs to a window even when the tabs bar is not
          shown. (Christian)

Interface improvements

	* Simplify font selection and make it use points instead
	  of pixels like everything in Gnome (Marco)
	* Use a line to make more clear Language/Fonts relation (Marco)
	* Sync spinner with the current active tab (Marco)
	* HIGgify new bookmark dialogue title (Christian)
	* Special, more compact, toolbar layout for fullscreen (Marco)
	* Gtk versions of the mozilla certificate prompts (from galeon)
	* Use Bookmarks instead of All as label in toolbars (Marco)
	* Use radio buttons for tabs menu (Marco)
	* Fix spacing in a few dialogs (Marco)
	* Better icons on mime dialog (Marco)
	* Case insensitive bookmarks matching in autocompletion
	  (Marco, credits to Kristian Rietveld for rocking new widget)
	* Show bookmarks at the top of autocompletion list (Marco)
	* Speedup history dialog (Marco)
	* Visual progress bar in downloader (Marco)
	* Better encoding menu interface. Show most common/most used
	  entry in the menu, split the others out to a dialog. Allow
	  to revert to Automatic. Show current selected encoding with
	  radio buttons (Christian, credits to Matthew Thomas for user
	  interface ideas)
	* Toolbar editor improvements. Show a different cursor when
	  hovering the items. Pickup and drop behavior. Make space
	  for the item instead of showing a line (Marco, credits to
	  Soeren Sandmann for gtk changes)
	* Make location a normal entry, removing the hard to click,
	  vastly unused arrow for typed urls. (Marco)
	* Focus bookmarks search entry by default (Ettore Perazzoli)

Bugfixes

	* Enable dragging the tab from a single-tab window too (Christian)
	* Do not fail if prefs.js is corrupted (Marco)
	* Fix location entry losing content when editing toolbar (Christian)
	* Fix directory selection persistence (Christian)
	* Fix a bug that could have caused bookmarks loss with low disk (Christian)
	* Save session also when closing windows (Marco)
	* Make mime dialogs interrupt download on Esc, simplify the code
	  using response signal (Marco)
	* Fix compilation on Solaris (Marco)
	* Set a MOZ_PLUGIN_PATH default. (Christopher James Lahey)
	* Fix a warning when printing to a file (Christian)
	* Fix intermittent nautilus view activation failure (Mark McLoughlin)
	* Fix downloads with authentication (Marco)
	* Fix history clear, sometimes sites was not removed
	  completely (Marco)
	* Fix some treeview model leaks (Christian, Marco)

Translations

	* cs (Miloslav Trmac)
	* en_GB (Christian Persch)
	* fr (Eric Seigne)
	* ga (Paul Duffy)
	* hi (Guntupalli Karunakar)
	* hu (Andras Timar)
	* lt (Zygimantas Berucka)
	* ml (Abel Cheung)
	* mn (Sanlig Badral)
	* nl (Vincent van Adrighem)
	* pt_BR (Evandro Fernandes Giovanini)
	* ro (Misu Moldovan)
	* sk (Marcel Telka)
	* sq (Laurent Dhima)
	* sr.po (Danilo Segan)
	* sr@Latn.po (Danilo Segan)
	* sv (Christian Rose)
	* ta (Dinesh Nadarajah)
	* vi (Pablo Saratxaga)

6 files changed, 107 insertions, 80 deletions

diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index addca732a1b..5c4275f6639 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2004/03/26 02:27:57 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2004/04/01 18:52:48 jmmv Exp $
 #
 
-DISTNAME=	epiphany-1.0.7
-PKGREVISION=	7
+DISTNAME=	epiphany-1.2.2
 CATEGORIES=	www gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany/1.0/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/epiphany/1.2/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/projects/epiphany/
@@ -19,7 +19,10 @@ USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+
 GCONF2_SCHEMAS=		epiphany.schemas
+GCONF2_SCHEMAS+=	epiphany-lockdown.schemas
 
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/www/epiphany/PLIST b/www/epiphany/PLIST
index 6f1621151b2..8c320f411d5 100644
--- a/www/epiphany/PLIST
+++ b/www/epiphany/PLIST
@@ -1,69 +1,83 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/02/05 17:34:53 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/04/01 18:52:49 jmmv Exp $
 bin/epiphany
 bin/epiphany-bin
-include/epiphany-1.0/epiphany/ephy-bookmarks.h
-include/epiphany-1.0/epiphany/ephy-dialog.h
-include/epiphany-1.0/epiphany/ephy-embed-event.h
-include/epiphany-1.0/epiphany/ephy-embed-persist.h
-include/epiphany-1.0/epiphany/ephy-embed-prefs.h
-include/epiphany-1.0/epiphany/ephy-embed-shell.h
-include/epiphany-1.0/epiphany/ephy-embed-single.h
-include/epiphany-1.0/epiphany/ephy-embed-types.h
-include/epiphany-1.0/epiphany/ephy-embed.h
-include/epiphany-1.0/epiphany/ephy-history.h
-include/epiphany-1.0/epiphany/ephy-langs.h
-include/epiphany-1.0/epiphany/ephy-node-db.h
-include/epiphany-1.0/epiphany/ephy-node.h
-include/epiphany-1.0/epiphany/ephy-notebook.h
-include/epiphany-1.0/epiphany/ephy-shell.h
-include/epiphany-1.0/epiphany/ephy-tab.h
-include/epiphany-1.0/epiphany/ephy-types.h
-include/epiphany-1.0/epiphany/ephy-window.h
-include/epiphany-1.0/epiphany/session.h
+include/epiphany-1.2/epiphany/ephy-bookmarks.h
+include/epiphany-1.2/epiphany/ephy-command-manager.h
+include/epiphany-1.2/epiphany/ephy-cookie-manager.h
+include/epiphany-1.2/epiphany/ephy-dialog.h
+include/epiphany-1.2/epiphany/ephy-embed-event.h
+include/epiphany-1.2/epiphany/ephy-embed-persist.h
+include/epiphany-1.2/epiphany/ephy-embed-prefs.h
+include/epiphany-1.2/epiphany/ephy-embed-shell.h
+include/epiphany-1.2/epiphany/ephy-embed-single.h
+include/epiphany-1.2/epiphany/ephy-embed.h
+include/epiphany-1.2/epiphany/ephy-encodings.h
+include/epiphany-1.2/epiphany/ephy-extension.h
+include/epiphany-1.2/epiphany/ephy-history.h
+include/epiphany-1.2/epiphany/ephy-node-db.h
+include/epiphany-1.2/epiphany/ephy-node.h
+include/epiphany-1.2/epiphany/ephy-notebook.h
+include/epiphany-1.2/epiphany/ephy-password-manager.h
+include/epiphany-1.2/epiphany/ephy-permission-manager.h
+include/epiphany-1.2/epiphany/ephy-session.h
+include/epiphany-1.2/epiphany/ephy-shell.h
+include/epiphany-1.2/epiphany/ephy-statusbar.h
+include/epiphany-1.2/epiphany/ephy-tab.h
+include/epiphany-1.2/epiphany/ephy-window.h
 lib/bonobo/servers/GNOME_Epiphany_Automation.server
 lib/bonobo/servers/GNOME_Epiphany_NautilusView.server
-lib/pkgconfig/epiphany-1.0.pc
+lib/pkgconfig/epiphany-1.2.pc
 share/application-registry/epiphany.applications
 share/applications/bme.desktop
 share/applications/epiphany.desktop
-share/epiphany/art/epiphany-bookmark-page.png
+share/doc/html/epiphany/ch01.html
+share/doc/html/epiphany/epiphany-ephy-cookie-manager.html
+share/doc/html/epiphany/epiphany-ephy-embed-factory.html
+share/doc/html/epiphany/epiphany-ephy-embed-single.html
+share/doc/html/epiphany/epiphany-ephy-password-manager.html
+share/doc/html/epiphany/epiphany-ephy-permission-manager.html
+share/doc/html/epiphany/epiphany-ephy-session.html
+share/doc/html/epiphany/epiphany-ephy-shell.html
+share/doc/html/epiphany/epiphany.devhelp
+share/doc/html/epiphany/home.png
+share/doc/html/epiphany/index.html
+share/doc/html/epiphany/index.sgml
+share/doc/html/epiphany/left.png
+share/doc/html/epiphany/right.png
+share/doc/html/epiphany/up.png
 share/epiphany/art/epiphany-bookmarks.png
 share/epiphany/art/epiphany-download.png
 share/epiphany/art/epiphany-entry.png
-share/epiphany/art/epiphany-fullscreen.png
 share/epiphany/art/epiphany-history.png
-share/epiphany/art/epiphany-new-tab.png
 share/epiphany/art/epiphany-secure.png
-share/epiphany/art/epiphany-send-link.png
 share/epiphany/art/epiphany-tab-loading.gif
 share/epiphany/art/epiphany-unsecure.png
-share/epiphany/art/epiphany-viewsource.png
+share/epiphany/art/hand-open.png
 share/epiphany/conspiracy.xhtml
+share/epiphany/default-prefs.js
 share/epiphany/epiphany-bookmark-editor-ui.xml
+share/epiphany/epiphany-fs-toolbar.xml
 share/epiphany/epiphany-history-window-ui.xml
 share/epiphany/epiphany-toolbar.xml
 share/epiphany/epiphany-ui.xml
 share/epiphany/epiphany.xhtml
+share/epiphany/glade/certificate-dialogs.glade
 share/epiphany/glade/epiphany.glade
 share/epiphany/glade/prefs-dialog.glade
 share/epiphany/glade/print.glade
+share/epiphany/mime-types-permissions.xml
 share/epiphany/nautilus-epiphany-view.xml
+share/gconf/schemas/epiphany-lockdown.schemas
 share/gconf/schemas/epiphany.schemas
 share/gnome/help/epiphany/C/epiphany.xml
 share/gnome/help/epiphany/C/figures/ephy-history-window-screenshot.png
 share/gnome/help/epiphany/C/figures/ephy-screenshot.png
 share/gnome/help/epiphany/C/legal.xml
-share/gnome/help/epiphany/nl/epiphany.xml
-share/gnome/help/epiphany/nl/figures/ephy-screenshot.png
-share/gnome/help/epiphany/nl/legal.xml
-share/gnome/help/epiphany/uk/epiphany.xml
-share/gnome/help/epiphany/uk/figures/ephy-history-window-screenshot.png
-share/gnome/help/epiphany/uk/figures/ephy-screenshot.png
-share/gnome/help/epiphany/uk/legal.xml
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/epiphany.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/epiphany.mo
@@ -71,26 +85,33 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/epiphany.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/epiphany.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/epiphany.mo
+${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/epiphany.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/epiphany.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/epiphany.mo
-${PKGLOCALEDIR}/locale/kn/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/li/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/epiphany.mo
+${PKGLOCALEDIR}/locale/mi/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/epiphany.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/epiphany.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/epiphany.mo
@@ -106,28 +127,25 @@ ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/epiphany.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/epiphany.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/epiphany.mo
 share/omf/epiphany/epiphany-C.omf
-share/omf/epiphany/epiphany-nl.omf
-share/omf/epiphany/epiphany-uk.omf
 share/pixmaps/epiphany-bookmarks.png
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/epiphany
 @comment in scrollkeeper: @dirrm share/omf
-@dirrm share/gnome/help/epiphany/uk/figures
-@dirrm share/gnome/help/epiphany/uk
-@dirrm share/gnome/help/epiphany/nl/figures
-@dirrm share/gnome/help/epiphany/nl
 @dirrm share/gnome/help/epiphany/C/figures
 @dirrm share/gnome/help/epiphany/C
 @dirrm share/gnome/help/epiphany
 @comment in gnome2-dirs: @dirrm share/gnome/help
-@comment in GConf2: @dirrm share/gconf/schemas
+@dirrm share/gconf/schemas
 @dirrm share/epiphany/glade
 @dirrm share/epiphany/art
 @dirrm share/epiphany
-@comment in gnome2-dirs: @dirrm share/applications
-@comment in gnome2-dirs: @dirrm share/application-registry
+@dirrm share/doc/html/epiphany
+@comment in xdg-dirs: @dirrm share/applications
+@comment in xdg-dirs: @dirrm share/application-registry
 @comment in libbonobo: @dirrm lib/bonobo/servers
-@dirrm include/epiphany-1.0/epiphany
-@dirrm include/epiphany-1.0
+@dirrm include/epiphany-1.2/epiphany
+@dirrm include/epiphany-1.2
diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk
new file mode 100644
index 00000000000..1757118cfdc
--- /dev/null
+++ b/www/epiphany/buildlink3.mk
@@ -0,0 +1,34 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/01 18:52:49 jmmv Exp $
+#
+# This Makefile fragment is included by packages that use epiphany.
+#
+# This file was created automatically using createbuildlink-3.1.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+EPIPHANY_BUILDLINK3_MK:=	${EPIPHANY_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	epiphany
+.endif
+
+.if !empty(EPIPHANY_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			epiphany
+BUILDLINK_DEPENDS.epiphany+=		epiphany>=1.2.2
+BUILDLINK_PKGSRCDIR.epiphany?=		../../www/epiphany
+
+.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/libbonoboui/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../net/ORBit2/buildlink3.mk"
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/nautilus/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/scrollkeeper/buildlink3.mk"
+.include "../../www/mozilla-gtk2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.endif # EPIPHANY_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/epiphany/distinfo b/www/epiphany/distinfo
index 7ed3b8d449f..18859985c99 100644
--- a/www/epiphany/distinfo
+++ b/www/epiphany/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.4 2004/02/07 16:41:30 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2004/04/01 18:52:49 jmmv Exp $
 
-SHA1 (epiphany-1.0.7.tar.gz) = 8fc6e5cab2acc1013f719bfe1deed0c245b2e1ce
-Size (epiphany-1.0.7.tar.gz) = 2908935 bytes
-SHA1 (patch-aa) = fd49611defe1885c41d853cadfb49ff8f42892a4
-SHA1 (patch-ab) = cad155e7d392e180f26cdc1f889daca2c399680a
+SHA1 (epiphany-1.2.2.tar.bz2) = 4bece22a45521d42c04057e5c90e0ed431ad5a94
+Size (epiphany-1.2.2.tar.bz2) = 2148870 bytes
diff --git a/www/epiphany/patches/patch-aa b/www/epiphany/patches/patch-aa
deleted file mode 100644
index 2778ce1333e..00000000000
--- a/www/epiphany/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/02/05 17:34:53 jmmv Exp $
-
---- data/Makefile.in.orig	2004-01-13 16:24:12.000000000 +0100
-+++ data/Makefile.in
-@@ -206,7 +206,7 @@ desktop_DATA = $(DESKTOP_FILES)
- applicationsdir = $(datadir)/application-registry
- applications_DATA = epiphany.applications
- 
--schemadir = $(sysconfdir)/gconf/schemas
-+schemadir = $(GCONF_SCHEMA_FILE_DIR)
- schema_in_files = epiphany.schemas.in
- schema_DATA = epiphany.schemas
- 
diff --git a/www/epiphany/patches/patch-ab b/www/epiphany/patches/patch-ab
deleted file mode 100644
index 1fc6cfdf5c8..00000000000
--- a/www/epiphany/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2004/02/07 16:41:30 jmmv Exp $
-
---- embed/ephy-favicon-cache.c.orig	2003-12-18 13:48:42.000000000 +0100
-+++ embed/ephy-favicon-cache.c
-@@ -263,7 +263,7 @@ ephy_favicon_cache_init (EphyFaviconCach
- 					          NULL);
- 
- 	cache->priv->directory = g_build_filename (ephy_dot_dir (),
--						   "favicon_cache/",
-+						   "favicon_cache",
- 						   NULL);
- 
- 	if (g_file_test (cache->priv->directory, G_FILE_TEST_IS_DIR) == FALSE)