--- a/libpurple/notify.c Fri Dec 31 02:51:49 2021 -0600 +++ b/libpurple/notify.c Fri Dec 31 03:03:12 2021 -0600 @@ -97,93 +97,6 @@ } void * -purple_notify_email(void *handle, const char *subject, const char *from, - const char *to, const char *url, PurpleNotifyCloseCallback cb, - gpointer user_data) -{ - PurpleNotifyUiOps *ops; - - ops = purple_notify_get_ui_ops(); - - if (ops != NULL && ops->notify_email != NULL) { - void *ui_handle; - - purple_signal_emit(purple_notify_get_handle(), "displaying-email-notification", - subject, from, to, url); - - ui_handle = ops->notify_email(handle, subject, from, to, url); - - if (ui_handle != NULL) { - - PurpleNotifyInfo *info = g_new0(PurpleNotifyInfo, 1); - info->type = PURPLE_NOTIFY_EMAIL; - info->handle = handle; - info->ui_handle = ui_handle; - info->cb = cb; - info->cb_user_data = user_data; - - handles = g_list_append(handles, info); - - return info->ui_handle; - } - } - - if (cb != NULL) - cb(user_data); - - return NULL; -} - -void * -purple_notify_emails(void *handle, size_t count, gboolean detailed, - const char **subjects, const char **froms, - const char **tos, const char **urls, - PurpleNotifyCloseCallback cb, gpointer user_data) -{ - PurpleNotifyUiOps *ops; - - if (count == 1) { - return purple_notify_email(handle, - (subjects == NULL ? NULL : *subjects), - (froms == NULL ? NULL : *froms), - (tos == NULL ? NULL : *tos), - (urls == NULL ? NULL : *urls), - cb, user_data); - } - - ops = purple_notify_get_ui_ops(); - - if (ops != NULL && ops->notify_emails != NULL) { - void *ui_handle; - - purple_signal_emit(purple_notify_get_handle(), "displaying-emails-notification", - subjects, froms, tos, urls, count); - - ui_handle = ops->notify_emails(handle, count, detailed, subjects, - froms, tos, urls); - - if (ui_handle != NULL) { - PurpleNotifyInfo *info = g_new0(PurpleNotifyInfo, 1); - info->type = PURPLE_NOTIFY_EMAILS; - info->handle = handle; - info->ui_handle = ui_handle; - info->cb = cb; - info->cb_user_data = user_data; - - handles = g_list_append(handles, info); - - return info->ui_handle; - } - - } - - if (cb != NULL) - cb(user_data); - - return NULL; -} - -void * purple_notify_formatted(void *handle, const char *title, const char *primary, const char *secondary, const char *text, PurpleNotifyCloseCallback cb, gpointer user_data)