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, 0 insertions, 64 deletions

diff --git a/src/epiphany.defs b/src/epiphany.defs
index 76c0e0322..34ce537de 100644
--- a/src/epiphany.defs
+++ b/src/epiphany.defs
@@ -404,32 +404,6 @@
   )
 )
 
-(define-enum ShellError
-  (in-module "Ephy")
-  (c-name "EphyShellError")
-  (gtype-id "EPHY_TYPE_SHELL_ERROR")
-  (values
-    '("missing-server" "EPHY_SHELL_ERROR_MISSING_SERVER")
-    '("object-reg-failed" "EPHY_SHELL_ERROR_OBJECT_REG_FAILED")
-    '("factory-reg-failed" "EPHY_SHELL_ERROR_FACTORY_REG_FAILED")
-  )
-)
-
-(define-flags ShellStartupFlags
-  (in-module "Ephy")
-  (c-name "EphyShellStartupFlags")
-  (gtype-id "EPHY_TYPE_SHELL_STARTUP_FLAGS")
-  (values
-    '("tabs" "EPHY_SHELL_STARTUP_TABS")
-    '("existing-window" "EPHY_SHELL_STARTUP_EXISTING_WINDOW")
-    '("fullscreen" "EPHY_SHELL_STARTUP_FULLSCREEN")
-    '("bookmarks-editor" "EPHY_SHELL_STARTUP_BOOKMARKS_EDITOR")
-    '("session" "EPHY_SHELL_STARTUP_SESSION")
-    '("import-bookmarks" "EPHY_SHELL_STARTUP_IMPORT_BOOKMARKS")
-    '("add-bookmark" "EPHY_SHELL_STARTUP_ADD_BOOKMARK")
-  )
-)
-
 (define-flags NewTabFlags
   (in-module "Ephy")
   (c-name "EphyNewTabFlags")
@@ -3033,16 +3007,6 @@
 
 ;; From ../../src/ephy-shell.h
 
-(define-function ephy_shell_error_get_type
-  (c-name "ephy_shell_error_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_shell_startup_flags_get_type
-  (c-name "ephy_shell_startup_flags_get_type")
-  (return-type "GType")
-)
-
 (define-function ephy_new_tab_flags_get_type
   (c-name "ephy_new_tab_flags_get_type")
   (return-type "GType")
@@ -3053,11 +3017,6 @@
   (return-type "GType")
 )
 
-(define-function ephy_shell_error_quark
-  (c-name "ephy_shell_error_quark")
-  (return-type "GQuark")
-)
-
 (define-function ephy_shell_get_default
   (c-name "ephy_shell_get_default")
   (return-type "EphyShell*")
@@ -3069,19 +3028,6 @@
   (return-type "EphyShell*")
 )
 
-(define-method startup
-  (of-object "EphyShell")
-  (c-name "ephy_shell_startup")
-  (return-type "gboolean")
-  (parameters
-    '("EphyShellStartupFlags" "flags")
-    '("guint32" "user_time")
-    '("const-char**" "args")
-    '("const-char*" "string_arg")
-    '("GError**" "error")
-  )
-)
-
 (define-method new_tab
   (of-object "EphyShell")
   (c-name "ephy_shell_new_tab")
@@ -3518,16 +3464,6 @@
   (return-type "GType")
 )
 
-(define-function ephy_shell_error_get_type
-  (c-name "ephy_shell_error_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_shell_startup_flags_get_type
-  (c-name "ephy_shell_startup_flags_get_type")
-  (return-type "GType")
-)
-
 (define-function ephy_new_tab_flags_get_type
   (c-name "ephy_new_tab_flags_get_type")
   (return-type "GType")