aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--idl/EphyAutomation.idl1
-rw-r--r--src/bookmarks/ephy-bookmarks-editor.c1
-rw-r--r--src/ephy-automation.c1
-rw-r--r--src/ephy-main.c9
4 files changed, 1 insertions, 11 deletions
diff --git a/idl/EphyAutomation.idl b/idl/EphyAutomation.idl
index a9a286dcd..64e5ef8a9 100644
--- a/idl/EphyAutomation.idl
+++ b/idl/EphyAutomation.idl
@@ -4,7 +4,6 @@ module GNOME {
interface EphyAutomation : Bonobo::Unknown {
void loadurl (in string url,
- in string geometry,
in boolean fullscreen,
in boolean open_in_existing_tab,
in boolean open_in_new_tab,
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index aed373524..2e6302430 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -361,6 +361,7 @@ cmd_delete (EggAction *action,
{
ephy_node_view_remove (EPHY_NODE_VIEW (editor->priv->key_view));
}
+ g_list_free (selected);
}
}
diff --git a/src/ephy-automation.c b/src/ephy-automation.c
index 014702762..d03562adb 100644
--- a/src/ephy-automation.c
+++ b/src/ephy-automation.c
@@ -83,7 +83,6 @@ ephy_automation_new (void)
static void
impl_ephy_automation_loadurl (PortableServer_Servant _servant,
const CORBA_char * url,
- const CORBA_char * geometry,
const CORBA_boolean fullscreen,
const CORBA_boolean open_in_existing_tab,
const CORBA_boolean open_in_new_window,
diff --git a/src/ephy-main.c b/src/ephy-main.c
index e14c4abf3..4fa9e41d5 100644
--- a/src/ephy-main.c
+++ b/src/ephy-main.c
@@ -50,7 +50,6 @@ static gboolean noraise = FALSE; /* no raise
static gboolean open_in_new_window = FALSE; /* force open in a new window? */
static gboolean open_fullscreen = FALSE; /* open ephy in full screen ? */
static gchar *session_filename = NULL; /* the session filename */
-static gchar *geometry_string = NULL; /* the geometry string */
static gchar *bookmark_url = NULL; /* the temp bookmark to add */
static gboolean close_option = FALSE; /* --close */
static gboolean quit_option = FALSE; /* --quit */
@@ -93,10 +92,6 @@ static struct poptOption popt_options[] =
{ "add-bookmark", 't', POPT_ARG_STRING, &bookmark_url,
0, N_("Add a bookmark (don't open any window)"),
N_("URL")},
- { "geometry", 'g', POPT_ARG_STRING, &geometry_string,
- 0, N_("Create the initial window with the given geometry.\n"
- "see X(1) for the GEOMETRY format"),
- N_("GEOMETRY")},
{ "close", 'c', POPT_ARG_NONE, &close_option, 0,
N_("Close all Ephy windows"),
NULL },
@@ -236,8 +231,6 @@ ephy_main_start (gpointer data)
/* no, open a default window */
GNOME_EphyAutomation_loadurl
(gaserver, "",
- geometry_string ?
- geometry_string : "",
open_fullscreen,
open_in_existing,
open_in_new_window,
@@ -252,8 +245,6 @@ ephy_main_start (gpointer data)
{
GNOME_EphyAutomation_loadurl
(gaserver, url[i],
- geometry_string ?
- geometry_string : "",
open_fullscreen,
open_in_existing,
open_in_new_window,