aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--src/ephy-main.c13
-rw-r--r--src/window-commands.c41
3 files changed, 44 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 645779167..e7cc674ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2005-07-31 Christian Persch <chpe@cvs.gnome.org>
+ * src/ephy-main.c: (main):
+ * src/window-commands.c: (window_cmd_view_stop),
+ (window_cmd_help_about):
+
+ Update about dialogue.
+
+2005-07-31 Christian Persch <chpe@cvs.gnome.org>
+
* embed/ephy-embed-shell.c: (ephy_embed_shell_get_default):
* embed/ephy-embed-shell.h:
diff --git a/src/ephy-main.c b/src/ephy-main.c
index e5b9094b2..f9c7fd5b3 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -47,6 +47,7 @@ static gboolean open_in_existing = FALSE;
static gboolean open_in_new_tab = FALSE;
static gboolean open_fullscreen = FALSE;
static gboolean open_as_bookmarks_editor = FALSE;
+static gboolean reload_plugins = FALSE;
static char *session_filename = NULL;
static char *bookmark_url = NULL;
@@ -55,10 +56,10 @@ static char *bookmarks_file = NULL;
static struct poptOption popt_options[] =
{
{ "new-tab", 'n', POPT_ARG_NONE, &open_in_new_tab, 0,
- N_("Open a new tab in an existing Epiphany window"),
+ N_("Open a new tab in an existing window"),
NULL },
{ "fullscreen", 'f', POPT_ARG_NONE, &open_fullscreen, 0,
- N_("Run Epiphany in full screen mode"),
+ N_("Run in full screen mode"),
NULL },
{ "load-session", 'l', POPT_ARG_STRING, &session_filename, 0,
N_("Load the given session file"),
@@ -72,6 +73,7 @@ static struct poptOption popt_options[] =
{ "bookmarks-editor", 'b', POPT_ARG_NONE, &open_as_bookmarks_editor, 0,
N_("Launch the bookmarks editor"),
NULL },
+ { "reload-plugins", '\0', POPT_ARG_NONE, &reload_plugins, 0, NULL, NULL },
{ NULL, 0, 0, NULL, 0, NULL, NULL }
};
@@ -217,15 +219,18 @@ main (int argc, char *argv[])
program = gnome_program_init (PACKAGE, VERSION,
LIBGNOMEUI_MODULE, argc, argv,
GNOME_PARAM_POPT_TABLE, popt_options,
- GNOME_PARAM_HUMAN_READABLE_NAME, _("Epiphany Web Browser"),
+ GNOME_PARAM_HUMAN_READABLE_NAME, _("Web Browser"),
GNOME_PARAM_APP_DATADIR, DATADIR,
NULL);
/* Get a timestamp manually if need be */
if (user_time == 0)
+ {
user_time = slowly_and_stupidly_obtain_timestamp (gdk_display);
+ }
- g_set_application_name (_("Epiphany Web Browser"));
+ /* sets the name to appear in the window list applet when grouping windows */
+ g_set_application_name (_("Web Browser"));
/* Set default window icon */
gtk_window_set_default_icon_name ("web-browser");
diff --git a/src/window-commands.c b/src/window-commands.c
index 1203e536a..33a01dcad 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -28,7 +28,6 @@
#include "ephy-debug.h"
#include "ephy-command-manager.h"
#include "window-commands.h"
-#include "print-dialog.h"
#include "eel-gconf-extensions.h"
#include "ephy-prefs.h"
#include "ephy-embed-prefs.h"
@@ -45,6 +44,7 @@
#include "ephy-notebook.h"
#include "ephy-toolbar-editor.h"
#include "ephy-find-toolbar.h"
+#include "ephy-location-entry.h"
#include <string.h>
#include <glib.h>
@@ -193,7 +193,7 @@ window_cmd_view_stop (GtkAction *action,
EphyWindow *window)
{
EphyEmbed *embed;
-
+
embed = ephy_window_get_active_embed (window);
g_return_if_fail (embed != NULL);
@@ -753,24 +753,37 @@ void
window_cmd_help_about (GtkAction *action,
GtkWidget *window)
{
- static const char * const authors[] = {
- "Marco Pesenti Gritti <marco@gnome.org>",
- "Xan Lopez <xan@gnome.org>",
- "David Bordoley <bordoley@msu.edu>",
- "Christian Persch <chpe@gnome.org>",
- NULL
+ const char * const authors[] = {
+ "Marco Pesenti Gritti",
+ "Adam Hooper",
+ "Xan Lopez",
+ "Christian Persch",
+ "Jean-François Rameau",
+ "",
+ _("Write us:"),
+ "<epiphany-list@gnome.org>",
+ "",
+ _("Contributors:"),
+ "",
+ _("Past developers:"),
+ "David Bordoley",
+ NULL,
};
- static const char *const documenters[] = {
- "Patanjali Somayaji <patanjali@codito.com>",
- "David Bordoley <bordoley@msu.edu>",
- "Piers Cornwell <piers@gnome.org>",
+ const char * const documenters[] = {
+ "Piers Cornwell",
+ "Patanjali Somayaji",
+ "David Bordoley",
+ "",
+ _("Write us:"),
+ "<epiphany-list@gnome.org> or <gnome-doc-list@gnome.org>",
NULL
};
gtk_show_about_dialog (GTK_WINDOW (window),
- "name", _("Epiphany"),
+ "name", _("Epiphany Web Browser"),
"version", VERSION,
- "copyright", "Copyright \xc2\xa9 2002-2005 Marco Pesenti Gritti",
+ "copyright", "Copyright © 2002-2004 Marco Pesenti Gritti\n"
+ "Copyright © 2003-2005 The Epiphany Developers",
"authors", authors,
"documenters", documenters,
/* Translators: This is a special message that shouldn't be translated