Merge branch 'master' into contact_sync

Conflicts:

	configure.ac
	dev/Makefile.am
	include/libiphone/libiphone.h
	src/AFC.c
	src/AFC.h
	src/Makefile.am

1 files changed, 31 insertions, 0 deletions

diff --git a/src/NotificationProxy.h b/src/NotificationProxy.h
new file mode 100644
index 0000000..57ad751
--- /dev/null
+++ b/src/NotificationProxy.h
@@ -0,0 +1,31 @@
+/*
+ * NotificationProxy.h
+ * Notification Proxy header file.
+ *
+ * Copyright (c) 2009 Nikias Bassen, All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ * 
+ * This library 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
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ */
+#include "libiphone/libiphone.h"
+#include "usbmux.h"
+#include "iphone.h"
+
+#include <glib.h>
+
+struct iphone_np_client_int {
+        iphone_umux_client_t connection;
+        GMutex *mutex;
+};
+