diff options
author | Gary Kramlich <grim@reaperworld.com> | 2019-05-09 21:48:30 -0500 |
---|---|---|
committer | Gary Kramlich <grim@reaperworld.com> | 2019-05-09 21:48:30 -0500 |
commit | 2e74855502e59fdb71ad968316f97dd9e5ad0b23 (patch) | |
tree | 324cfba7b1c1e9690d13f0236a9bc7f15c620d05 | |
parent | 36a414d14c987b840934bb47cfced9c14d815c41 (diff) | |
download | pidgin-2e74855502e59fdb71ad968316f97dd9e5ad0b23.tar.gz |
Address issues from review:
* Replace new entries from ChangeLog.API with since tags in the doc comments
* Fix gtk min version and border-width in invite_dialog.ui
* Add parameter name to function type
-rw-r--r-- | ChangeLog.API | 9 | ||||
-rw-r--r-- | libpurple/buddylist.h | 6 | ||||
-rw-r--r-- | pidgin/pidgininvitedialog.h | 12 | ||||
-rw-r--r-- | pidgin/resources/Conversations/invite_dialog.ui | 4 |
4 files changed, 19 insertions, 12 deletions
diff --git a/ChangeLog.API b/ChangeLog.API index 5496e05e4c..61a2782df5 100644 --- a/ChangeLog.API +++ b/ChangeLog.API @@ -21,8 +21,6 @@ version 3.0.0 (??/??/????): * purple_account_privacy_get_permitted * PurpleAccountPresence and PurpleBuddyPresence inherit PurplePresence * purple_account_presence_new - * purple_blist_walk - * PurpleBlistWalkFunc * purple_buddy_presence_new * purple_account_register_completed * purple_blist_node_is_transient @@ -565,13 +563,6 @@ version 3.0.0 (??/??/????): * pidgin_create_webview * PidginDockletFlag * pidgin_gdk_pixbuf_new_from_image - * PidginInviteDialog - * pidgin_invite_dialog_new - * pidgin_invite_dialog_set_contact - * pidgin_invite_dialog_get_contact - * pidgin_invite_dialog_set_message - * pidgin_invite_dialog_get_message - * pidgin_invite_dialog_get_conversation * PidginPluginInfo, inherits PurplePluginInfo * Various WebKit-related functions in gtkwebview.h diff --git a/libpurple/buddylist.h b/libpurple/buddylist.h index 9cfabf99f7..4d2a7025dd 100644 --- a/libpurple/buddylist.h +++ b/libpurple/buddylist.h @@ -57,8 +57,10 @@ typedef struct _PurpleBlistUiOps PurpleBlistUiOps; * @data: User supplied data. * * A callback function for purple_blist_walk. + * + * Since: 3.0.0 */ -typedef void (*PurpleBlistWalkFunc)(PurpleBlistNode *node, gpointer); +typedef void (*PurpleBlistWalkFunc)(PurpleBlistNode *node, gpointer data); /**************************************************************************/ /* Data Structures */ @@ -452,6 +454,8 @@ void purple_blist_remove_account(PurpleAccount *account); * * Walks the buddy list and calls the appropriate function for each node. If * a callback function is omitted iteration will continue without it. + * + * Since: 3.0.0 */ void purple_blist_walk(PurpleBlistWalkFunc group_func, PurpleBlistWalkFunc chat_func, PurpleBlistWalkFunc meta_contact_func, PurpleBlistWalkFunc contact_func, gpointer data); diff --git a/pidgin/pidgininvitedialog.h b/pidgin/pidgininvitedialog.h index a063550026..265fad0401 100644 --- a/pidgin/pidgininvitedialog.h +++ b/pidgin/pidgininvitedialog.h @@ -74,6 +74,8 @@ G_DECLARE_FINAL_TYPE(PidginInviteDialog, pidgin_invite_dialog, PIDGIN, * Creates a new #PidginInviteDialog to invite someone to @conversation. * * Returns: (transfer full): The new #PidginInviteDialog instance. + * + * Since: 3.0.0 */ GtkWidget *pidgin_invite_dialog_new(PurpleChatConversation *conversation); @@ -85,6 +87,8 @@ GtkWidget *pidgin_invite_dialog_new(PurpleChatConversation *conversation); * Sets the contact that should be invited. This function is intended to be * used to prepopulate the dialog in cases where you just need to prompt the * user for an invite message. + * + * Since: 3.0.0 */ void pidgin_invite_dialog_set_contact(PidginInviteDialog *dialog, const gchar *contact); @@ -96,6 +100,8 @@ void pidgin_invite_dialog_set_contact(PidginInviteDialog *dialog, const gchar *c * long as @dialog exists. * * Returns: (transfer none): The contact that was entered. + * + * Since: 3.0.0 */ const gchar *pidgin_invite_dialog_get_contact(PidginInviteDialog *dialog); @@ -106,6 +112,8 @@ const gchar *pidgin_invite_dialog_get_contact(PidginInviteDialog *dialog); * * Sets the message to be displayed in @dialog. The main use case is to * prepopulate the message. + * + * Since: 3.0.0 */ void pidgin_invite_dialog_set_message(PidginInviteDialog *dialog, const gchar *message); @@ -117,6 +125,8 @@ void pidgin_invite_dialog_set_message(PidginInviteDialog *dialog, const gchar *m * valid as long as @dialog exists. * * Returns: (transfer none): The message that was entered in @dialog. + * + * Since: 3.0.0 */ const gchar *pidgin_invite_dialog_get_message(PidginInviteDialog *dialog); @@ -128,6 +138,8 @@ const gchar *pidgin_invite_dialog_get_message(PidginInviteDialog *dialog); * * Returns: (transfer none): The #PurpleChatConversation that @dialog was * created with. + * + * Since: 3.0.0 */ PurpleChatConversation *pidgin_invite_dialog_get_conversation(PidginInviteDialog *dialog); diff --git a/pidgin/resources/Conversations/invite_dialog.ui b/pidgin/resources/Conversations/invite_dialog.ui index 57af8f4481..48cf892abf 100644 --- a/pidgin/resources/Conversations/invite_dialog.ui +++ b/pidgin/resources/Conversations/invite_dialog.ui @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.22.1 --> <interface> - <requires lib="gtk+" version="3.20"/> + <requires lib="gtk+" version="3.10"/> <template class="PidginInviteDialog" parent="GtkDialog"> <property name="can_focus">False</property> - <property name="border_width">12</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Invite to conversation...</property> <property name="resizable">False</property> <property name="type_hint">dialog</property> |