diff options
| -rw-r--r-- | data/epiphany.pc.in | 2 | ||||
| -rw-r--r-- | src/ephy-automation.c | 224 |
2 files changed, 1 insertions, 225 deletions
diff --git a/data/epiphany.pc.in b/data/epiphany.pc.in index 5b450ebe4..85e9abb20 100644 --- a/data/epiphany.pc.in +++ b/data/epiphany.pc.in @@ -13,6 +13,6 @@ engine=@with_engine@ Name: Epiphany Browser Description: GNOME Web Browser Version: @VERSION@ -Requires: gtk+-2.0, libxml-2.0, libgnomeui-2.0, bonobo-activation-2.0, ORBit-2.0, libglade-2.0, gnome-vfs-2.0, gnome-vfs-module-2.0, gconf-2.0 +Requires: gtk+-2.0, libxml-2.0, libgnomeui-2.0, libglade-2.0, gconf-2.0 Libs: -L${libdir} Cflags: -I${includedir} diff --git a/src/ephy-automation.c b/src/ephy-automation.c deleted file mode 100644 index 4ee53f792..000000000 --- a/src/ephy-automation.c +++ /dev/null @@ -1,224 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* - * Copyright © 2000, 2001, 2002 Marco Pesenti Gritti - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * $Id$ - */ - -#include "config.h" - -#include "ephy-automation.h" - -#include "EphyAutomation.h" -#include "ephy-shell.h" -#include "ephy-embed.h" -#include "ephy-window.h" -#include "ephy-session.h" -#include "ephy-bookmarks.h" -#include "ephy-bookmarks-import.h" -#include "eel-gconf-extensions.h" -#include "ephy-prefs.h" -#include "ephy-gui.h" - -#include <string.h> -#include <bonobo/bonobo-main.h> -#include <bonobo/bonobo-context.h> - -static void ephy_automation_class_init (EphyAutomationClass *klass); - -static GObjectClass *parent_class = NULL; - -static void -impl_ephy_automation_loadUrlWithStartupId (PortableServer_Servant _servant, - const CORBA_char *url, - const CORBA_boolean fullscreen, - const CORBA_boolean open_in_existing_tab, - const CORBA_boolean open_in_new_tab, - const CORBA_unsigned_long startup_id, - CORBA_Environment *ev) -{ - EphyNewTabFlags flags = 0; - EphyWindow *window; - EphySession *session; - guint32 user_time = (guint32) startup_id; - - session = EPHY_SESSION (ephy_shell_get_session (ephy_shell)); - g_return_if_fail (session != NULL); - - if (eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_ARBITRARY_URL)) - { - url = ""; - } - - if (ephy_session_autoresume (session, user_time) && *url == '\0') - { - /* no need to open the homepage, - * we did already open session windows */ - return; - } - - window = ephy_session_get_active_window (session); - - if (open_in_existing_tab && window != NULL) - { - ephy_gui_window_update_user_time (GTK_WIDGET (window), - user_time); - ephy_window_load_url (window, url); - return; - } - - if (*url == '\0') - { - flags |= EPHY_NEW_TAB_HOME_PAGE; - } - else - { - flags |= EPHY_NEW_TAB_OPEN_PAGE; - } - - if (open_in_new_tab) - { - flags |= EPHY_NEW_TAB_IN_EXISTING_WINDOW | - EPHY_NEW_TAB_JUMP; - } - else - { - flags |= EPHY_NEW_TAB_IN_NEW_WINDOW; - } - - if (fullscreen) - { - flags |= EPHY_NEW_TAB_FULLSCREEN_MODE; - } - - ephy_shell_new_tab_full (ephy_shell, window, NULL, url, flags, - EPHY_EMBED_CHROME_ALL, FALSE, user_time); -} - -static void -impl_ephy_automation_loadurl (PortableServer_Servant _servant, - const CORBA_char *url, - const CORBA_boolean fullscreen, - const CORBA_boolean open_in_existing_tab, - const CORBA_boolean open_in_new_tab, - CORBA_Environment *ev) -{ - impl_ephy_automation_loadUrlWithStartupId (_servant, - url, - fullscreen, - open_in_existing_tab, - open_in_new_tab, - 0, /* no startup ID */ - ev); -} - -static void -impl_ephy_automation_addBookmark (PortableServer_Servant _servant, - const CORBA_char * url, - CORBA_Environment * ev) -{ - ephy_bookmarks_add (ephy_shell_get_bookmarks (ephy_shell), - url /* title */, url); -} - -static void -impl_ephy_automation_importBookmarks (PortableServer_Servant _servant, - const CORBA_char *filename, - CORBA_Environment *ev) -{ - ephy_bookmarks_import (ephy_shell_get_bookmarks (ephy_shell), - filename); -} - -static void -impl_ephy_automation_loadSessionWithStartupId (PortableServer_Servant _servant, - const CORBA_char *filename, - const CORBA_unsigned_long startup_id, - CORBA_Environment *ev) -{ - EphySession *session; - guint32 user_time = (guint32) startup_id; - - session = EPHY_SESSION (ephy_shell_get_session (ephy_shell)); - ephy_session_load (session, filename, user_time); -} - -static void -impl_ephy_automation_loadSession (PortableServer_Servant _servant, - const CORBA_char *filename, - CORBA_Environment *ev) -{ - impl_ephy_automation_loadSessionWithStartupId (_servant, - filename, - 0, /* no startup ID */ - ev); -} - -static void -impl_ephy_automation_openBookmarksEditorWithStartupId (PortableServer_Servant _servant, - const CORBA_unsigned_long startup_id, - CORBA_Environment *ev) -{ - GtkWidget *editor; - guint32 user_time = (guint32) startup_id; - - if (eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_BOOKMARK_EDITING)) return; - - editor = ephy_shell_get_bookmarks_editor (ephy_shell); - - ephy_gui_window_update_user_time (editor, user_time); - - gtk_window_present (GTK_WINDOW (editor)); -} - -static void -impl_ephy_automation_openBookmarksEditor (PortableServer_Servant _servant, - CORBA_Environment *ev) -{ - impl_ephy_automation_openBookmarksEditorWithStartupId (_servant, - 0, /* no startup ID */ - ev); -} - -static void -ephy_automation_init (EphyAutomation *c) -{ -} - -static void -ephy_automation_class_init (EphyAutomationClass *klass) -{ - POA_GNOME_EphyAutomation__epv *epv = &klass->epv; - - parent_class = g_type_class_peek_parent (klass); - - /* connect implementation callbacks */ - epv->loadurl = impl_ephy_automation_loadurl; - epv->addBookmark = impl_ephy_automation_addBookmark; - epv->importBookmarks = impl_ephy_automation_importBookmarks; - epv->loadSession = impl_ephy_automation_loadSession; - epv->openBookmarksEditor = impl_ephy_automation_openBookmarksEditor; - epv->loadUrlWithStartupId = impl_ephy_automation_loadUrlWithStartupId; - epv->loadSessionWithStartupId = impl_ephy_automation_loadSessionWithStartupId; - epv->openBookmarksEditorWithStartupId = impl_ephy_automation_openBookmarksEditorWithStartupId; -} - -BONOBO_TYPE_FUNC_FULL ( - EphyAutomation, - GNOME_EphyAutomation, - BONOBO_TYPE_OBJECT, - ephy_automation); |