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, 11 insertions, 4 deletions

diff --git a/src/ephy-dbus.h b/src/ephy-dbus.h
index eb6b64d83..597109910 100644
--- a/src/ephy-dbus.h
+++ b/src/ephy-dbus.h
@@ -47,6 +47,9 @@ G_BEGIN_DECLS
 #define EPHY_IS_DBUS_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), EPHY_TYPE_DBUS))
 #define EPHY_DBUS_GET_CLASS(o)	(G_TYPE_INSTANCE_GET_CLASS ((o), EPHY_TYPE_DBUS, EphyDbusClass))
 
+extern GQuark ephy_dbus_error_quark;
+#define EPHY_DBUS_ERROR_QUARK	(ephy_dbus_error_quark)
+
 typedef struct _EphyDbus	EphyDbus;
 typedef struct _EphyDbusPrivate	EphyDbusPrivate;
 typedef struct _EphyDbusClass	EphyDbusClass;
@@ -60,7 +63,6 @@ typedef enum
 struct _EphyDbus
 {
 	GObject parent;
-	gboolean is_session_service_owner;
 
 	/*< private >*/
 	EphyDbusPrivate *priv;
@@ -79,9 +81,7 @@ struct _EphyDbusClass
 
 GType		ephy_dbus_get_type	(void);
 
-void		ephy_dbus_startup	(EphyDbus *dbus);
-
-void		ephy_dbus_shutdown	(EphyDbus *dbus);
+EphyDbus       *ephy_dbus_get_default	(void);
 
 DBusGConnection *ephy_dbus_get_bus	(EphyDbus *dbus,
 					 EphyDbusBus kind);
@@ -89,6 +89,13 @@ DBusGConnection *ephy_dbus_get_bus	(EphyDbus *dbus,
 DBusGProxy	*ephy_dbus_get_proxy	(EphyDbus *dbus,
 					 EphyDbusBus kind);
 
+/* private */
+gboolean       _ephy_dbus_startup	(GError **error);
+
+void	       _ephy_dbus_release	(void);
+
+gboolean       _ephy_dbus_is_name_owner	(void);
+
 G_END_DECLS
 
 #endif /* !EPHY_DBUS_H */