summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2010-01-08 14:24:50 +0100
committerGravatar Martin Szulecki2010-01-08 14:24:50 +0100
commite87f65f1b17186c6246fce26cdbd05d087ec28b9 (patch)
tree74e72b896c452d03d7abaaa834215a5bdf66c695
parent0e8a77deea7b91de50c0d5ef29eb6c088d4abd37 (diff)
downloadlibimobiledevice-e87f65f1b17186c6246fce26cdbd05d087ec28b9.tar.gz
libimobiledevice-e87f65f1b17186c6246fce26cdbd05d087ec28b9.tar.bz2
Enforce a set of notifications for observing instead of using defaults
We don't need to maintain defaults, applications should know and specifiy which notification ids they want to observe themselfs.
-rw-r--r--src/NotificationProxy.c5
-rw-r--r--src/NotificationProxy.h14
2 files changed, 2 insertions, 17 deletions
diff --git a/src/NotificationProxy.c b/src/NotificationProxy.c
index 5ae59f2..cba12b9 100644
--- a/src/NotificationProxy.c
+++ b/src/NotificationProxy.c
@@ -236,8 +236,7 @@ np_error_t np_observe_notification( np_client_t client, const char *notification
* @param client The client to send to
* @param notification_spec Specification of the notifications that should be
* observed. This is expected to be an array of const char* that MUST have a
- * terminating NULL entry. However this parameter can be NULL; in this case,
- * the default set of notifications will be used.
+ * terminating NULL entry.
*
* @return NP_E_SUCCESS on success, NP_E_INVALID_ARG when client is null,
* or an error returned by np_observe_notification.
@@ -253,7 +252,7 @@ np_error_t np_observe_notifications(np_client_t client, const char **notificatio
}
if (!notifications) {
- notifications = np_default_notifications;
+ return NP_E_INVALID_ARG;
}
while (notifications[i]) {
diff --git a/src/NotificationProxy.h b/src/NotificationProxy.h
index 84f1f89..ea993c5 100644
--- a/src/NotificationProxy.h
+++ b/src/NotificationProxy.h
@@ -31,20 +31,6 @@ struct np_client_int {
GThread *notifier;
};
-static const char *np_default_notifications[11] = {
- NP_SYNC_SUSPEND_REQUEST,
- NP_SYNC_RESUME_REQUEST,
- NP_PHONE_NUMBER_CHANGED,
- NP_SYNC_CANCEL_REQUEST,
- NP_DEVICE_NAME_CHANGED,
- NP_ATTEMPTACTIVATION,
- NP_DS_DOMAIN_CHANGED,
- NP_APP_INSTALLED,
- NP_APP_UNINSTALLED,
- NP_ITDBPREP_DID_END,
- NULL
-};
-
gpointer np_notifier(gpointer arg);
#endif