Add a GError** to ephy_file_helpers_init and ephy_ensure_dir_exists, so we

2006-01-23  Christian Persch  <chpe@cvs.gnome.org>

	* embed/mozilla/MozDownload.cpp:
	* lib/ephy-file-helpers.c: (ephy_file_helpers_init),
	(ephy_ensure_dir_exists):
	* lib/ephy-file-helpers.h:

	Add a GError** to ephy_file_helpers_init and ephy_ensure_dir_exists,
	so we can show the error to the user in main().

	* src/ephy-dbus.c: (ephy_dbus_connect_to_session_bus_cb),
	(ephy_dbus_connect_to_system_bus_cb), (session_filter_func),
	(system_filter_func), (ephy_dbus_connect_to_system_bus),
	(ephy_dbus_connect_to_session_bus), (ephy_dbus_shutdown),
	(ephy_dbus_finalize), (ephy_dbus_get_type),
	(ephy_dbus_get_default), (ephy_dbus_get_bus),
	(ephy_dbus_get_proxy), (_ephy_dbus_startup), (_ephy_dbus_release),
	(_ephy_dbus_is_name_owner):
	* src/ephy-dbus.h:

	Refactored. Propagate errors to callers via GError**, and change
	lifecycle to the app lifetime.

	* src/ephy-lockdown.c: (ephy_lockdown_init),
	(ephy_lockdown_finalize):

	Move gconf notification add/remove for the lockdown key dirs
	here from main().

	* src/ephy-shell.c: (ephy_shell_dispose),
	(_ephy_shell_create_instance):
	* src/ephy-shell.h:
	* src/epiphany.defs:

	Remove ephy_shell_startup and related stuff.

	* src/ephy-main.c: (handle_url), (handle_email),
	(shell_weak_notify), (dbus_g_proxy_finalized_cb),
	(save_yourself_cb), (die_cb), (gnome_session_init),
	(path_from_command_line_arg), (open_urls), (call_dbus_proxy),
	(show_error_message), (main):

	Move all startup code to main(), so we can show errors to
	the user instead of crashing when things go wrong.
	Part of bug #326807.

1 files changed, 7 insertions, 3 deletions

diff --git a/src/ephy-lockdown.c b/src/ephy-lockdown.c
index 48f6f5e1a..723042320 100644
--- a/src/ephy-lockdown.c
+++ b/src/ephy-lockdown.c
@@ -233,16 +233,17 @@ ephy_lockdown_init (EphyLockdown *lockdown)
 
 	LOG ("EphyLockdown initialising");
 
-	/* lockdown pref notifiers */
 	for (i = 0; i < G_N_ELEMENTS (keys); i++)
 	{
 		priv->notifier_id[i] =eel_gconf_notification_add
 			(keys[i], (GConfClientNotifyFunc) notifier, lockdown);
 	}
-
 	/* We know that no windows are open yet,
-	 * so we don't need to do anything else here.
+	 * so we don't need to do notify here.
 	 */
+
+	eel_gconf_monitor_add ("/apps/epiphany/lockdown");
+	eel_gconf_monitor_add ("/desktop/gnome/lockdown");
 }
 
 static void
@@ -254,6 +255,9 @@ ephy_lockdown_finalize (GObject *object)
 
 	LOG ("EphyLockdown finalising");
 
+	eel_gconf_monitor_remove ("/apps/epiphany/lockdown");
+	eel_gconf_monitor_remove ("/desktop/gnome/lockdown");
+
 	for (i = 0; i < G_N_ELEMENTS (keys); i++)
 	{
 		eel_gconf_notification_remove (priv->notifier_id[i]);