--- a/ChangeLog.API Wed Dec 09 23:56:23 2015 -0800
+++ b/ChangeLog.API Wed Dec 09 23:57:54 2015 -0800
@@ -286,6 +286,7 @@
port mapping as the fifth parameter
* purple_network_listen_range now takes the protocol family as the
+ * PurpleNotifyMsgType renamed to PurpleNotifyMessageType * purple_notify_user_info_add_pair renamed to
purple_notify_user_info_add_pair_html
* purple_notify_user_info_get_entries returns a GQueue instead of
--- a/finch/gntnotify.c Wed Dec 09 23:56:23 2015 -0800
+++ b/finch/gntnotify.c Wed Dec 09 23:57:54 2015 -0800
@@ -48,7 +48,7 @@
-finch_notify_common(PurpleNotifyType ntype, PurpleNotifyMsgType msgtype,
+finch_notify_common(PurpleNotifyType ntype, PurpleNotifyMessageType msgtype, const char *title, const char *primary, const char *secondary,
PurpleRequestCommonParameters *cpar)
@@ -136,7 +136,7 @@
-finch_notify_message(PurpleNotifyMsgType type, const char *title,
+finch_notify_message(PurpleNotifyMessageType type, const char *title, const char *primary, const char *secondary,
PurpleRequestCommonParameters *cpar)
--- a/libpurple/notify.c Wed Dec 09 23:56:23 2015 -0800
+++ b/libpurple/notify.c Wed Dec 09 23:57:54 2015 -0800
@@ -62,7 +62,7 @@
-purple_notify_message(void *handle, PurpleNotifyMsgType type, const char *title,
+purple_notify_message(void *handle, PurpleNotifyMessageType type, const char *title, const char *primary, const char *secondary,
PurpleRequestCommonParameters *cpar, PurpleNotifyCloseCallback cb,
--- a/libpurple/notify.h Wed Dec 09 23:56:23 2015 -0800
+++ b/libpurple/notify.h Wed Dec 09 23:57:54 2015 -0800
@@ -87,7 +87,7 @@
+ * PurpleNotifyMessageType: * @PURPLE_NOTIFY_MSG_ERROR: Error notification.
* @PURPLE_NOTIFY_MSG_WARNING: Warning notification.
* @PURPLE_NOTIFY_MSG_INFO: Information notification.
@@ -100,7 +100,7 @@
PURPLE_NOTIFY_MSG_WARNING,
+} PurpleNotifyMessageType; @@ -186,7 +186,7 @@
struct _PurpleNotifyUiOps
- void *(*notify_message)(PurpleNotifyMsgType type, const char *title,
+ void *(*notify_message)(PurpleNotifyMessageType type, const char *title, const char *primary, const char *secondary,
PurpleRequestCommonParameters *cpar);
@@ -395,7 +395,7 @@
* Returns: A UI-specific handle.
-void *purple_notify_message(void *handle, PurpleNotifyMsgType type,
+void *purple_notify_message(void *handle, PurpleNotifyMessageType type, const char *title, const char *primary, const char *secondary,
PurpleRequestCommonParameters *cpar, PurpleNotifyCloseCallback cb,
@@ -866,4 +866,4 @@
-#endif /* _PURPLE_NOTIFY_H_ */
\ No newline at end of file
+#endif /* _PURPLE_NOTIFY_H_ */ --- a/pidgin/gtknotify.c Wed Dec 09 23:56:23 2015 -0800
+++ b/pidgin/gtknotify.c Wed Dec 09 23:57:54 2015 -0800
@@ -532,7 +532,7 @@
-pidgin_notify_message(PurpleNotifyMsgType type, const char *title,
+pidgin_notify_message(PurpleNotifyMessageType type, const char *title, const char *primary, const char *secondary,
PurpleRequestCommonParameters *cpar)