aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--MAINTAINERS1
-rw-r--r--doc/reference/tmpl/ephy-embed.sgml13
-rw-r--r--doc/reference/tmpl/ephy-tab.sgml5
-rw-r--r--doc/reference/tmpl/epiphany-unused.sgml11
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c2
-rwxr-xr-xsrc/ephy-toolbar.c2
7 files changed, 31 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 34687cd68..b7460cf46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2005-08-08 Christian Persch <chpe@cvs.gnome.org>
+ * src/bookmarks/ephy-bookmarks-editor.c:
+ * src/ephy-toolbar.c: (ephy_toolbar_set_window):
+
+ Tiny string fix just before string freeze :)
+
+2005-08-08 Christian Persch <chpe@cvs.gnome.org>
+
* embed/ephy-favicon-cache.c: (ephy_favicon_cache_get):
Disable favicons from non-http URLs.
diff --git a/MAINTAINERS b/MAINTAINERS
index c5f26768f..fb98b09dd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,2 +1,3 @@
+Email: epiphany-list@gnome.org
Email: marco@gnome.org
Email: chpe@gnome.org
diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index e602de567..d2f2bf874 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -262,6 +262,10 @@ be done by casting).
@:
@:
@:
+@:
+@:
+@:
+@:
@:
<!-- ##### SIGNAL EphyEmbed::ge-search-key-press ##### -->
@@ -341,7 +345,6 @@ be done by casting).
@set_print_preview_mode:
@print_preview_n_pages:
@print_preview_navigate:
-@activate:
@has_modified_forms:
<!-- ##### ENUM EphyEmbedChrome ##### -->
@@ -604,14 +607,6 @@ windows opened with JavaScript often use a nonstandard chrome.
@page:
-<!-- ##### FUNCTION ephy_embed_activate ##### -->
-<para>
-
-</para>
-
-@embed:
-
-
<!-- ##### FUNCTION ephy_embed_has_modified_forms ##### -->
<para>
diff --git a/doc/reference/tmpl/ephy-tab.sgml b/doc/reference/tmpl/ephy-tab.sgml
index ad6c4e921..7b9bf485f 100644
--- a/doc/reference/tmpl/ephy-tab.sgml
+++ b/doc/reference/tmpl/ephy-tab.sgml
@@ -47,6 +47,11 @@ To retrieve an #EphyTab's parent #EphyWindow, use gtk_widget_get_toplevel().
</para>
+<!-- ##### ARG EphyTab:icon-address ##### -->
+<para>
+
+</para>
+
<!-- ##### ARG EphyTab:load-progress ##### -->
<para>
diff --git a/doc/reference/tmpl/epiphany-unused.sgml b/doc/reference/tmpl/epiphany-unused.sgml
index 7cd406692..1fd156867 100644
--- a/doc/reference/tmpl/epiphany-unused.sgml
+++ b/doc/reference/tmpl/epiphany-unused.sgml
@@ -1,3 +1,7 @@
+<!-- ##### SECTION ./tmpl/epiphany-unused.sgml:Stability_Level ##### -->
+
+
+
<!-- ##### SECTION ./tmpl/mozilla-embed-event.sgml:Long_Description ##### -->
<para>
@@ -206,6 +210,13 @@ Represents the state of an #EphyEmbed with regards to networking negotiations.
</para>
+<!-- ##### FUNCTION ephy_embed_activate ##### -->
+<para>
+
+</para>
+
+@embed:
+
<!-- ##### FUNCTION ephy_embed_find_next ##### -->
<para>
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 860e9da3a..26f9e7af5 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -137,6 +137,8 @@ static void cmd_help_contents (GtkAction *action,
#define CONF_BOOKMARKS_VIEW_DETAILS "/apps/epiphany/dialogs/bookmarks_view_details"
+#define RESERVED_STRING N_("Remove from this topic")
+
struct _EphyBookmarksEditorPrivate
{
EphyBookmarks *bookmarks;
diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c
index da6b9ac55..377eb5357 100755
--- a/src/ephy-toolbar.c
+++ b/src/ephy-toolbar.c
@@ -323,7 +323,7 @@ ephy_toolbar_set_window (EphyToolbar *toolbar,
"name", "Location",
"label", _("Address Entry"),
"stock_id", EPHY_STOCK_ENTRY,
- "tooltip", _("Enter a web address to open, or a phrase to search for on the web"),
+ "tooltip", _("Enter a web address to open, or a phrase to search for"),
"visible-overflown", FALSE,
"window", priv->window,
NULL);