aboutsummaryrefslogtreecommitdiffstats
path: root/src/ephy-activation.c
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2006-01-28 04:29:36 +0800
committerChristian Persch <chpe@src.gnome.org>2006-01-28 04:29:36 +0800
commitf8fa4046d19f289188dfeebcc57ece73e949f433 (patch)
tree5cb9b95f109d7cd33eaa3aa4474cf28d20867bd9 /src/ephy-activation.c
parentca5f11319afff03fbd1421ef3f0063727f76d955 (diff)
downloadgsoc2013-epiphany-f8fa4046d19f289188dfeebcc57ece73e949f433.tar
gsoc2013-epiphany-f8fa4046d19f289188dfeebcc57ece73e949f433.tar.gz
gsoc2013-epiphany-f8fa4046d19f289188dfeebcc57ece73e949f433.tar.bz2
gsoc2013-epiphany-f8fa4046d19f289188dfeebcc57ece73e949f433.tar.lz
gsoc2013-epiphany-f8fa4046d19f289188dfeebcc57ece73e949f433.tar.xz
gsoc2013-epiphany-f8fa4046d19f289188dfeebcc57ece73e949f433.tar.zst
gsoc2013-epiphany-f8fa4046d19f289188dfeebcc57ece73e949f433.zip
Add required GError** params, and actually set the error when returning
2006-01-27 Christian Persch <chpe@cvs.gnome.org> * src/ephy-activation.c: (ephy_activation_load_url), (ephy_activation_load_session), (ephy_activation_open_bookmarks_editor): * src/ephy-activation.h: Add required GError** params, and actually set the error when returning FALSE.
Diffstat (limited to 'src/ephy-activation.c')
-rw-r--r--src/ephy-activation.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/ephy-activation.c b/src/ephy-activation.c
index f56b5018e..b7cb4a54a 100644
--- a/src/ephy-activation.c
+++ b/src/ephy-activation.c
@@ -35,7 +35,8 @@ gboolean
ephy_activation_load_url (EphyDbus *ephy_dbus,
char *url,
char *options,
- guint startup_id)
+ guint startup_id,
+ GError **error)
{
EphyNewTabFlags flags = 0;
EphyWindow *window;
@@ -101,22 +102,31 @@ ephy_activation_load_session (EphyDbus *ephy_dbus,
session = EPHY_SESSION (ephy_shell_get_session (ephy_shell));
ephy_session_load (session, session_name, user_time);
+
return TRUE;
}
gboolean
ephy_activation_open_bookmarks_editor (EphyDbus *ephy_dbus,
- guint startup_id)
+ guint startup_id,
+ GError **error)
{
GtkWidget *editor;
guint32 user_time = (guint32) startup_id;
if (eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_BOOKMARK_EDITING))
{
+ g_set_error (error,
+ g_quark_from_static_string ("ephy-activation-error"),
+ 0,
+ "Bookmarks editing is locked down.");
+
return FALSE;
}
+
editor = ephy_shell_get_bookmarks_editor (ephy_shell);
ephy_gui_window_update_user_time (editor, user_time);
gtk_window_present (GTK_WINDOW (editor));
+
return TRUE;
}