diff options
| author | Alexander Larsson <alexl@src.gnome.org> | 2007-09-13 11:21:17 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2007-09-13 11:21:17 +0000 |
| commit | a8e542e4bc0e9672fff7f8f24ea2abb258e6db59 (patch) | |
| tree | 1a98faef85bc6af8fb04871e3548d1e48507f52c /daemon/gvfsdaemon.c | |
| parent | feb08a4d251b648914cd324f9ef28e63501910dd (diff) | |
| download | gvfs-a8e542e4bc0e9672fff7f8f24ea2abb258e6db59.tar.gz | |
Use _g_dbus_oom()
Original git commit by Alexander Larsson <alex@greebo.(none)> at 1170173531 +0100
svn path=/trunk/; revision=288
Diffstat (limited to 'daemon/gvfsdaemon.c')
| -rw-r--r-- | daemon/gvfsdaemon.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/daemon/gvfsdaemon.c b/daemon/gvfsdaemon.c index 156c0193..24ba29ac 100644 --- a/daemon/gvfsdaemon.c +++ b/daemon/gvfsdaemon.c @@ -14,6 +14,7 @@ #include <gvfsdaemonprotocol.h> #include <gvfsdaemonutils.h> #include <gvfsjobopenforread.h> +#include <gdbusutils.h> G_DEFINE_TYPE (GVfsDaemon, g_vfs_daemon, G_TYPE_OBJECT); @@ -138,7 +139,7 @@ g_vfs_daemon_init (GVfsDaemon *daemon) if (!dbus_connection_add_filter (daemon->priv->session_bus, daemon_message_func, daemon, NULL)) - g_error ("Not enough memory to add filter"); + _g_dbus_oom (); } static void @@ -704,13 +705,13 @@ daemon_handle_get_connection (DBusConnection *conn, reply = dbus_message_new_method_return (message); if (reply == NULL) - g_error ("Can't allocate dbus message\n"); + _g_dbus_oom (); if (!dbus_message_append_args (reply, DBUS_TYPE_STRING, &address1, DBUS_TYPE_STRING, &address2, DBUS_TYPE_INVALID)) - g_error ("Can't allocate dbus message\n"); + _g_dbus_oom (); dbus_connection_send (conn, reply, NULL); |