diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | src/ephy-activation.c | 14 | ||||
| -rw-r--r-- | src/ephy-activation.h | 6 |
3 files changed, 26 insertions, 4 deletions
@@ -1,5 +1,15 @@ 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. + +2006-01-27 Christian Persch <chpe@cvs.gnome.org> + * src/ephy-main.c: (main): Disable pango rendering by default, unless MOZ_ENABLE_PANGO env 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; } diff --git a/src/ephy-activation.h b/src/ephy-activation.h index 0776a919f..030c9a8d7 100644 --- a/src/ephy-activation.h +++ b/src/ephy-activation.h @@ -29,7 +29,8 @@ G_BEGIN_DECLS gboolean ephy_activation_load_url (EphyDbus *ephy_dbus, char *url, char *options, - guint startup_id); + guint startup_id, + GError **error); gboolean ephy_activation_load_session (EphyDbus *ephy_dbus, char *session_name, @@ -37,7 +38,8 @@ gboolean ephy_activation_load_session (EphyDbus *ephy_dbus, GError **error); gboolean ephy_activation_open_bookmarks_editor (EphyDbus *ephy_dbus, - guint user_time); + guint user_time, + GError **error); G_END_DECLS |