aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--idl/EphyAutomation.idl2
-rw-r--r--src/ephy-automation.c2
-rw-r--r--src/ephy-main.c19
4 files changed, 13 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog
index 1853b5f52..dbe5f0f11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2003-09-24 Christian Persch <chpe@cvs.gnome.org>
+ * idl/EphyAutomation.idl:
+ * src/ephy-automation.c: (impl_ephy_automation_quit):
+ * src/ephy-main.c: (ephy_main_start):
+
+ Remove --server mode. It was a dirty hack anyway, and had a
+ crasher when loggin out from gnome-session. Sort of fixes bug #123047.
+ Flames will be redirected > /dev/null .
+
+2003-09-24 Christian Persch <chpe@cvs.gnome.org>
+
* src/ephy-shell.c: (ephy_shell_finalize),
(ephy_shell_get_session):
* src/session.c: (session_new), (save_tab), (parse_embed),
diff --git a/idl/EphyAutomation.idl b/idl/EphyAutomation.idl
index adc334602..074b341c8 100644
--- a/idl/EphyAutomation.idl
+++ b/idl/EphyAutomation.idl
@@ -20,7 +20,7 @@ module GNOME {
* server mode is disbaled
* (and Epiphany exits)
*/
- void quit (in boolean disableServer);
+ void quit ();
void loadSession (in string filename);
diff --git a/src/ephy-automation.c b/src/ephy-automation.c
index 0abb0d540..4f5b8b1b4 100644
--- a/src/ephy-automation.c
+++ b/src/ephy-automation.c
@@ -41,7 +41,6 @@ impl_ephy_automation_import_bookmarks (PortableServer_Servant _servant,
CORBA_Environment * ev);
static void
impl_ephy_automation_quit (PortableServer_Servant _servant,
- const CORBA_boolean disableServer,
CORBA_Environment * ev);
static void
impl_ephy_automation_load_session (PortableServer_Servant _servant,
@@ -171,7 +170,6 @@ impl_ephy_automation_import_bookmarks (PortableServer_Servant _servant,
static void
impl_ephy_automation_quit (PortableServer_Servant _servant,
- const CORBA_boolean disableServer,
CORBA_Environment * ev)
{
Session *session;
diff --git a/src/ephy-main.c b/src/ephy-main.c
index 5edd4617c..4cd79fc7e 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -49,8 +49,6 @@ static gchar *session_filename = NULL; /* the session filename
static gchar *bookmark_url = NULL; /* the temp bookmark to add */
static gchar *bookmarks_file = NULL; /* the bookmarks file to import */
static gboolean close_option = FALSE; /* --close */
-static gboolean quit_option = FALSE; /* --quit */
-static gboolean ephy_server_mode = FALSE;
static gboolean open_as_bookmarks_editor = FALSE; /* --bookmarks-editor */
static gboolean open_as_nautilus_view = FALSE;
@@ -81,10 +79,6 @@ static struct poptOption popt_options[] =
{ "load-session", 'l', POPT_ARG_STRING, &session_filename, 0,
N_("Load the given session file"),
N_("FILE") },
- { "server", 's', POPT_ARG_NONE, &ephy_server_mode, 0,
- N_("Don't open any windows; instead act as a server "
- "for quick startup of new Epiphany instances"),
- NULL },
{ "add-bookmark", 't', POPT_ARG_STRING, &bookmark_url,
0, N_("Add a bookmark (don't open any window)"),
N_("URL")},
@@ -94,9 +88,6 @@ static struct poptOption popt_options[] =
{ "close", 'c', POPT_ARG_NONE, &close_option, 0,
N_("Close all Epiphany windows"),
NULL },
- { "quit", 'q', POPT_ARG_NONE, &quit_option, 0,
- N_("Same as --close, but exits server mode too"),
- NULL },
{ "nautilus-view", 'v', POPT_ARG_NONE, &open_as_nautilus_view, 0,
N_("Used internally by the nautilus view"),
NULL },
@@ -194,12 +185,6 @@ ephy_main_start (gpointer data)
gtk_dialog_run (GTK_DIALOG (dialog));
}
- /* FIXME ephy --server doesnt work when not first istance */
- /* Server mode */
- else if (ephy_server_mode)
- {
- g_object_ref (G_OBJECT(ephy_shell));
- }
/* Launch the bookmarks editor */
else if (open_as_bookmarks_editor)
{
@@ -224,10 +209,10 @@ ephy_main_start (gpointer data)
GNOME_EphyAutomation_addBookmark
(gaserver, bookmark_url, &corba_env);
}
- else if (close_option || quit_option)
+ else if (close_option)
{
GNOME_EphyAutomation_quit
- (gaserver, quit_option, &corba_env);
+ (gaserver, &corba_env);
}
/* provided with urls? */
else if (n_urls == 0 &&