/pidgin/main: 9dadde8529a8: Change enum name from PurpleNotifyMs...

Changeset: 9dadde8529a8a93aaebf27c17d5328fc58c954d2
Author:	 Jorge Villase?or <[email protected]>
Date:	 2015-12-09 23:57 -0800
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/9dadde8529a8

Description:

Change enum name from PurpleNotifyMsgType to PurpleNotifyMessageType

diffstat:

 ChangeLog.API      |   1 +
 finch/gntnotify.c  |   4 ++--
 libpurple/notify.c |   2 +-
 libpurple/notify.h |  10 +++++-----
 pidgin/gtknotify.c |   2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diffs (102 lines):

diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -286,6 +286,7 @@ version 3.0.0 (??/??/????):
 		  port mapping as the fifth parameter
 		* purple_network_listen_range now takes the protocol family as the
 		  third parameter
+		* 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
diff --git a/finch/gntnotify.c b/finch/gntnotify.c
--- a/finch/gntnotify.c
+++ b/finch/gntnotify.c
@@ -48,7 +48,7 @@ notify_msg_window_destroy_cb(GntWidget *
 }
 
 static void *
-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 @@ static void finch_close_notify(PurpleNot
 }
 
 static void *
-finch_notify_message(PurpleNotifyMsgType type, const char *title,
+finch_notify_message(PurpleNotifyMessageType type, const char *title,
 	const char *primary, const char *secondary,
 	PurpleRequestCommonParameters *cpar)
 {
diff --git a/libpurple/notify.c b/libpurple/notify.c
--- a/libpurple/notify.c
+++ b/libpurple/notify.c
@@ -62,7 +62,7 @@ struct _PurpleNotifySearchColumn
 };
 
 void *
-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,
 	gpointer user_data)
diff --git a/libpurple/notify.h b/libpurple/notify.h
--- a/libpurple/notify.h
+++ b/libpurple/notify.h
@@ -87,7 +87,7 @@ typedef enum
 
 
 /**
- * PurpleNotifyMsgType:
+ * PurpleNotifyMessageType:
  * @PURPLE_NOTIFY_MSG_ERROR:   Error notification.
  * @PURPLE_NOTIFY_MSG_WARNING: Warning notification.
  * @PURPLE_NOTIFY_MSG_INFO:    Information notification.
@@ -100,7 +100,7 @@ typedef enum
 	PURPLE_NOTIFY_MSG_WARNING,
 	PURPLE_NOTIFY_MSG_INFO
 
-} PurpleNotifyMsgType;
+} PurpleNotifyMessageType;
 
 
 /**
@@ -186,7 +186,7 @@ typedef struct
  */
 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 @@ void purple_notify_searchresults_row_add
  *
  * 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,
 	gpointer user_data);
@@ -866,4 +866,4 @@ void purple_notify_uninit(void);
 
 G_END_DECLS
 
-#endif /* _PURPLE_NOTIFY_H_ */
\ No newline at end of file
+#endif /* _PURPLE_NOTIFY_H_ */
diff --git a/pidgin/gtknotify.c b/pidgin/gtknotify.c
--- a/pidgin/gtknotify.c
+++ b/pidgin/gtknotify.c
@@ -532,7 +532,7 @@ pidgin_widget_decorate_account(GtkWidget
 }
 
 static void *
-pidgin_notify_message(PurpleNotifyMsgType type, const char *title,
+pidgin_notify_message(PurpleNotifyMessageType type, const char *title,
 	const char *primary, const char *secondary,
 	PurpleRequestCommonParameters *cpar)
 {

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits