[daemon-fix] Fixed sending daemon match rules for kdbus broadcasts

[platform/upstream/dbus.git] / dbus / dbus-keyring.h

diff --git a/dbus/dbus-keyring.h b/dbus/dbus-keyring.h
index d353bf4..200e31b 100644 (file)
--- a/dbus/dbus-keyring.h
+++ b/dbus/dbus-keyring.h
@@ -1,4 +1,4 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /* dbus-keyring.h Store secret cookies in your homedir
  *
  * Copyright (C) 2003  Red Hat Inc.
@@ -17,7 +17,7 @@
  * 
  * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
 #ifndef DBUS_KEYRING_H
@@ -26,25 +26,27 @@
 #include <dbus/dbus-macros.h>
 #include <dbus/dbus-errors.h>
 #include <dbus/dbus-string.h>
+#include <dbus/dbus-credentials.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
 typedef struct DBusKeyring DBusKeyring;
 
-DBusKeyring* _dbus_keyring_new_homedir      (const DBusString  *username,
-                                             const DBusString  *context,
-                                             DBusError         *error);
-DBusKeyring* _dbus_keyring_ref              (DBusKeyring       *keyring);
-void         _dbus_keyring_unref            (DBusKeyring       *keyring);
-dbus_bool_t  _dbus_keyring_validate_context (const DBusString  *context);
-int          _dbus_keyring_get_best_key     (DBusKeyring       *keyring,
-                                             DBusError         *error);
-dbus_bool_t  _dbus_keyring_is_for_user      (DBusKeyring       *keyring,
-                                             const DBusString  *username);
-dbus_bool_t  _dbus_keyring_get_hex_key      (DBusKeyring       *keyring,
-                                             int                key_id,
-                                             DBusString        *hex_key);
+DBusKeyring* _dbus_keyring_new_for_credentials (DBusCredentials  *credentials,
+                                                const DBusString *context,
+                                                DBusError        *error);
+DBusKeyring* _dbus_keyring_ref                 (DBusKeyring      *keyring);
+void         _dbus_keyring_unref               (DBusKeyring      *keyring);
+dbus_bool_t  _dbus_keyring_validate_context    (const DBusString *context);
+int          _dbus_keyring_get_best_key        (DBusKeyring      *keyring,
+                                                DBusError        *error);
+dbus_bool_t  _dbus_keyring_is_for_credentials  (DBusKeyring      *keyring,
+                                                DBusCredentials  *credentials);
+dbus_bool_t  _dbus_keyring_get_hex_key         (DBusKeyring      *keyring,
+                                                int               key_id,
+                                                DBusString       *hex_key);
 
-DBUS_END_DECLS;
+
+DBUS_END_DECLS
 
 #endif /* DBUS_KEYRING_H */