Merge remote branch 'origin/master' into gsoc

2010-08-26 09:18:37 -05:00
parent 6ebc201636 f917852de3
commit 022d8e665c
94 changed files with 15551 additions and 3684 deletions
--- a/src/nm-manager-auth.h
+++ b/src/nm-manager-auth.h
@@ -60,6 +60,11 @@ NMAuthChain *nm_auth_chain_new (PolkitAuthority *authority,
                                NMAuthChainResultFunc done_func,
                                gpointer user_data);

+NMAuthChain *nm_auth_chain_new_raw_message (PolkitAuthority *authority,
+                                            DBusMessage *message,
+                                            NMAuthChainResultFunc done_func,
+                                            gpointer user_data);
+
 gpointer nm_auth_chain_get_data (NMAuthChain *chain, const char *tag);

 void nm_auth_chain_set_data (NMAuthChain *chain,