summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2010-01-22 13:50:15 +0100
committerGravatar Martin Szulecki2010-01-22 13:50:15 +0100
commit1d10605fbffd2be498afdd4621f46842b831c23f (patch)
tree7f83d65d5d2ce032825db231636cf6506b6eb608 /include
parentab56c34e17f2f44fd51ff3e890c002215fbe7690 (diff)
parent1999ce8929dcad052e4af48f23daab2264b312e7 (diff)
downloadlibimobiledevice-1d10605fbffd2be498afdd4621f46842b831c23f.tar.gz
libimobiledevice-1d10605fbffd2be498afdd4621f46842b831c23f.tar.bz2
Merge branch 'master' into martin
Diffstat (limited to 'include')
-rw-r--r--include/libiphone/installation_proxy.h30
1 files changed, 13 insertions, 17 deletions
diff --git a/include/libiphone/installation_proxy.h b/include/libiphone/installation_proxy.h
index f796054..b7bbb60 100644
--- a/include/libiphone/installation_proxy.h
+++ b/include/libiphone/installation_proxy.h
@@ -28,6 +28,7 @@ extern "C" {
#endif
#include <libiphone/libiphone.h>
+#include <glib.h>
/* Error Codes */
#define INSTPROXY_E_SUCCESS 0
@@ -41,15 +42,6 @@ extern "C" {
typedef int16_t instproxy_error_t;
-typedef enum {
- INSTPROXY_APPTYPE_ALL = 0,
- INSTPROXY_APPTYPE_SYSTEM = 1,
- INSTPROXY_APPTYPE_USER = 2
-} instproxy_apptype_t;
-
-#define INSTPROXY_ARCHIVE_APP_ONLY (1 << 0)
-#define INSTPROXY_ARCHIVE_SKIP_UNINSTALL (1 << 1)
-
struct instproxy_client_int;
typedef struct instproxy_client_int *instproxy_client_t;
@@ -59,15 +51,19 @@ typedef void (*instproxy_status_cb_t) (const char *operation, plist_t status);
instproxy_error_t instproxy_client_new(iphone_device_t device, uint16_t port, instproxy_client_t *client);
instproxy_error_t instproxy_client_free(instproxy_client_t client);
-instproxy_error_t instproxy_browse(instproxy_client_t client, instproxy_apptype_t apptype, plist_t *result);
-instproxy_error_t instproxy_install(instproxy_client_t client, const char *pkg_path, plist_t sinf, plist_t metadata, instproxy_status_cb_t status_cb);
-instproxy_error_t instproxy_upgrade(instproxy_client_t client, const char *pkg_path, plist_t sinf, plist_t metadata, instproxy_status_cb_t status_cb);
-instproxy_error_t instproxy_uninstall(instproxy_client_t client, const char *appid, instproxy_status_cb_t status_cb);
+instproxy_error_t instproxy_browse(instproxy_client_t client, plist_t client_options, plist_t *result);
+instproxy_error_t instproxy_install(instproxy_client_t client, const char *pkg_path, plist_t client_options, instproxy_status_cb_t status_cb);
+instproxy_error_t instproxy_upgrade(instproxy_client_t client, const char *pkg_path, plist_t client_options, instproxy_status_cb_t status_cb);
+instproxy_error_t instproxy_uninstall(instproxy_client_t client, const char *appid, plist_t client_options, instproxy_status_cb_t status_cb);
+
+instproxy_error_t instproxy_lookup_archives(instproxy_client_t client, plist_t client_options, plist_t *result);
+instproxy_error_t instproxy_archive(instproxy_client_t client, const char *appid, plist_t client_options, instproxy_status_cb_t status_cb);
+instproxy_error_t instproxy_restore(instproxy_client_t client, const char *appid, plist_t client_options, instproxy_status_cb_t status_cb);
+instproxy_error_t instproxy_remove_archive(instproxy_client_t client, const char *appid, plist_t client_options, instproxy_status_cb_t status_cb);
-instproxy_error_t instproxy_lookup_archives(instproxy_client_t client, plist_t *result);
-instproxy_error_t instproxy_archive(instproxy_client_t client, const char *appid, uint32_t options, instproxy_status_cb_t status_cb);
-instproxy_error_t instproxy_restore(instproxy_client_t client, const char *appid, instproxy_status_cb_t status_cb);
-instproxy_error_t instproxy_remove_archive(instproxy_client_t client, const char *appid, instproxy_status_cb_t status_cb);
+plist_t instproxy_client_options_new();
+void instproxy_client_options_add(plist_t client_options, ...) G_GNUC_NULL_TERMINATED;
+void instproxy_client_options_free(plist_t client_options);
#ifdef __cplusplus
}