diff options
author | Christian Persch <chpe@svn.gnome.org> | 2007-01-29 21:05:16 +0000 |
---|---|---|
committer | Christian Persch <chpe@src.gnome.org> | 2007-01-29 21:05:16 +0000 |
commit | 9557a3f60ee76ced7f0285651490341bb0be4854 (patch) | |
tree | 402a3359f1d9bf1283449c31e4f27ecc20862b8c | |
parent | b3b2d61a8433613f0e76a5dda25ce0269a6a6ab0 (diff) | |
download | epiphany-9557a3f60ee76ced7f0285651490341bb0be4854.tar.gz |
=== Release 2.16.3 ===RELEASE_2_16_3
2007-01-29 Christian Persch <chpe@svn.gnome.org>
=== Release 2.16.3 ===
* NEWS:
* configure.ac:
* doc/reference/tmpl/ephy-embed.sgml:
* doc/reference/tmpl/ephy-shell.sgml:
* embed/mozilla/ContentHandler.cpp:
* src/popup-commands.c: (background_download_completed):
svn path=/branches/gnome-2-16/; revision=6872
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | doc/reference/tmpl/ephy-embed.sgml | 83 | ||||
-rw-r--r-- | doc/reference/tmpl/ephy-shell.sgml | 1 | ||||
-rw-r--r-- | embed/mozilla/ContentHandler.cpp | 1 | ||||
-rw-r--r-- | src/popup-commands.c | 3 |
7 files changed, 21 insertions, 82 deletions
@@ -1,3 +1,14 @@ +2007-01-29 Christian Persch <chpe@svn.gnome.org> + + === Release 2.16.3 === + + * NEWS: + * configure.ac: + * doc/reference/tmpl/ephy-embed.sgml: + * doc/reference/tmpl/ephy-shell.sgml: + * embed/mozilla/ContentHandler.cpp: + * src/popup-commands.c: (background_download_completed): + 2007-01-28 Jean-François Rameau <jframeau@cvs.gnome.org> * embed/mozilla/ContentHandler.cpp: (GContentHandler::Show): @@ -1,5 +1,5 @@ =============== -Epiphany 2.16.2 +Epiphany 2.16.3 =============== Changes: diff --git a/configure.ac b/configure.ac index d54e38176..f4a9095d2 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ # with this program; if not, write to the Free Software Foundation, Inc., # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -AC_INIT([GNOME Web Browser],[2.16.2.0.90],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany]) +AC_INIT([GNOME Web Browser],[2.16.3],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany]) GNOME_COMMON_INIT diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml index aa5c6d64d..152bfebb3 100644 --- a/doc/reference/tmpl/ephy-embed.sgml +++ b/doc/reference/tmpl/ephy-embed.sgml @@ -177,177 +177,103 @@ be done by casting). @ephyembed: the object which received the signal. @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: -@: @: @: -@: @: @: -@: @: @: -@: @: @: -@: @: @: -@: @: @: -@: @: @: -@: @: @: -@: @: @: -@: @: @: -@: @: @: -@: @: @: -@: @: @: -@: @: @: -@: -@: @: -@: @: @: @: +@: +@Param2: +@Param3: +@Param4: <!-- ##### SIGNAL EphyEmbed::ge-search-key-press ##### --> <para> @@ -400,6 +326,7 @@ be done by casting). @search_key_press: @close_request: @load_url: +@load: @stop_load: @reload: @can_go_back: diff --git a/doc/reference/tmpl/ephy-shell.sgml b/doc/reference/tmpl/ephy-shell.sgml index 147153966..81cf01eb2 100644 --- a/doc/reference/tmpl/ephy-shell.sgml +++ b/doc/reference/tmpl/ephy-shell.sgml @@ -38,6 +38,7 @@ ephy-shell @EPHY_NEW_TAB_JUMP: @EPHY_NEW_TAB_IN_NEW_WINDOW: @EPHY_NEW_TAB_IN_EXISTING_WINDOW: +@EPHY_NEW_TAB_ALLOW_FIXUP: <!-- ##### FUNCTION ephy_shell_new_tab ##### --> <para> diff --git a/embed/mozilla/ContentHandler.cpp b/embed/mozilla/ContentHandler.cpp index 61301b75f..301a117fc 100644 --- a/embed/mozilla/ContentHandler.cpp +++ b/embed/mozilla/ContentHandler.cpp @@ -377,6 +377,7 @@ NS_METHOD GContentHandler::MIMEInitiateAction (void) { const char *id = gnome_vfs_mime_application_get_desktop_id (mHelperApp); + /* FIXME! menu editing can make this check fail!!!! */ if (id && strcmp (id, "epiphany.desktop") == 0) { mHelperApp = nsnull; diff --git a/src/popup-commands.c b/src/popup-commands.c index a60a3ec5a..edd80f22e 100644 --- a/src/popup-commands.c +++ b/src/popup-commands.c @@ -254,7 +254,6 @@ static void background_download_completed (EphyEmbedPersist *persist) { const char *bg; - char *type; guint32 user_time; user_time = ephy_embed_persist_get_user_time (persist); @@ -269,7 +268,7 @@ background_download_completed (EphyEmbedPersist *persist) /* If the above try didn't work, then we try the Fedora name. * This is a fix for #387206, but is actually a workaround for * bugzilla.redhat.com #201867 */ - ephy_file_launch_desktop_file ("gnome-background.desktop", bg, user_time) + ephy_file_launch_desktop_file ("gnome-background.desktop", bg, user_time); } } |