From 4f1f10a796d17381a348631bd282828175252250 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Wed, 13 Aug 2008 07:47:50 +0200 Subject: Start consolidating D-Bus errors --- src/Makefile.am | 4 ++-- src/connman.h | 2 ++ src/error.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 src/error.c diff --git a/src/Makefile.am b/src/Makefile.am index ea4a21d5..9c12a8b6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,8 +11,8 @@ DISTCLEANFILES = $(service_DATA) sbin_PROGRAMS = connmand -connmand_SOURCES = main.c connman.h log.c plugin.c profile.c element.c \ - security.c storage.c manager.c agent.c rtnl.c +connmand_SOURCES = main.c connman.h log.c error.c plugin.c profile.c \ + element.c security.c storage.c manager.c agent.c rtnl.c connmand_LDADD = @GDBUS_LIBS@ @GLIB_LIBS@ @GMODULE_LIBS@ @GTHREAD_LIBS@ diff --git a/src/connman.h b/src/connman.h index 19322faf..7bde14e4 100644 --- a/src/connman.h +++ b/src/connman.h @@ -27,6 +27,8 @@ #define NM_PATH "/org/freedesktop/NetworkManager" #define NM_INTERFACE NM_SERVICE +DBusMessage *__connman_error_permission_denied(DBusMessage *msg); + int __connman_storage_init(void); void __connman_storage_cleanup(void); diff --git a/src/error.c b/src/error.c new file mode 100644 index 00000000..627cf3d7 --- /dev/null +++ b/src/error.c @@ -0,0 +1,34 @@ +/* + * + * Connection Manager + * + * Copyright (C) 2007-2008 Intel Corporation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include + +#include "connman.h" + +DBusMessage *__connman_error_permission_denied(DBusMessage *msg) +{ + return g_dbus_create_error(msg, CONNMAN_ERROR_INTERFACE + ".PermissionDenied", NULL); +} -- cgit v1.2.3