Mercurial > pidgin.yaz

changeset 32369:0ee025d8686e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
user_info->user_info_entries is redundant. Let's call it user_info->entries, instead.
author Mark Doliner <mark@kingant.net>
date Mon, 22 Aug 2011 04:16:28 +0000
parents 6283c0f2b02f
children 8a55048115ab
files libpurple/notify.c
diffstat 1 files changed, 14 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/notify.c	Mon Aug 22 04:14:16 2011 +0000
+++ b/libpurple/notify.c	Mon Aug 22 04:16:28 2011 +0000
@@ -53,7 +53,7 @@
 
 struct _PurpleNotifyUserInfo
 {
-	GQueue user_info_entries;
+	GQueue entries;
 };
 
 void *
@@ -454,7 +454,7 @@
 
 	user_info = g_new0(PurpleNotifyUserInfo, 1);
 	PURPLE_DBUS_REGISTER_POINTER(user_info, PurpleNotifyUserInfo);
-	g_queue_init(&user_info->user_info_entries);
+	g_queue_init(&user_info->entries);
 
 	return user_info;
 }
@@ -464,13 +464,13 @@
 {
 	GList *l;
 
-	for (l = user_info->user_info_entries.head; l != NULL; l = l->next) {
+	for (l = user_info->entries.head; l != NULL; l = l->next) {
 		PurpleNotifyUserInfoEntry *user_info_entry = l->data;
 
 		purple_notify_user_info_entry_destroy(user_info_entry);
 	}
 
-	g_queue_clear(&user_info->user_info_entries);
+	g_queue_clear(&user_info->entries);
 	PURPLE_DBUS_UNREGISTER_POINTER(user_info);
 	g_free(user_info);
 }
@@ -480,7 +480,7 @@
 {
 	g_return_val_if_fail(user_info != NULL, NULL);
 
-	return &user_info->user_info_entries;
+	return &user_info->entries;
 }
 
 char *
@@ -491,7 +491,7 @@
 
 	text = g_string_new("");
 
-	for (l = user_info->user_info_entries.head; l != NULL; l = l->next) {
+	for (l = user_info->entries.head; l != NULL; l = l->next) {
 		PurpleNotifyUserInfoEntry *user_info_entry = l->data;
 		/* Add a newline before a section header */
 		if (user_info_entry->type == PURPLE_NOTIFY_USER_INFO_ENTRY_SECTION_HEADER)
@@ -580,7 +580,7 @@
 	PurpleNotifyUserInfoEntry *entry;
 
 	entry = purple_notify_user_info_entry_new(label, value);
-	g_queue_push_tail(&user_info->user_info_entries, entry);
+	g_queue_push_tail(&user_info->entries, entry);
 }
 
 void
@@ -599,7 +599,7 @@
 	PurpleNotifyUserInfoEntry *entry;
 
 	entry = purple_notify_user_info_entry_new(label, value);
-	g_queue_push_head(&user_info->user_info_entries, entry);
+	g_queue_push_head(&user_info->entries, entry);
 }
 
 void
@@ -608,7 +608,7 @@
 	g_return_if_fail(user_info != NULL);
 	g_return_if_fail(entry != NULL);
 
-	g_queue_remove(&user_info->user_info_entries, entry);
+	g_queue_remove(&user_info->entries, entry);
 }
 
 void
@@ -619,7 +619,7 @@
 	entry = purple_notify_user_info_entry_new(label, NULL);
 	entry->type = PURPLE_NOTIFY_USER_INFO_ENTRY_SECTION_HEADER;
 
-	g_queue_push_tail(&user_info->user_info_entries, entry);
+	g_queue_push_tail(&user_info->entries, entry);
 }
 
 void
@@ -630,7 +630,7 @@
 	entry = purple_notify_user_info_entry_new(label, NULL);
 	entry->type = PURPLE_NOTIFY_USER_INFO_ENTRY_SECTION_HEADER;
 
-	g_queue_push_head(&user_info->user_info_entries, entry);
+	g_queue_push_head(&user_info->entries, entry);
 }
 
 void
@@ -641,7 +641,7 @@
 	entry = purple_notify_user_info_entry_new(NULL, NULL);
 	entry->type = PURPLE_NOTIFY_USER_INFO_ENTRY_SECTION_BREAK;
 
-	g_queue_push_tail(&user_info->user_info_entries, entry);
+	g_queue_push_tail(&user_info->entries, entry);
 }
 
 void
@@ -652,7 +652,7 @@
 	entry = purple_notify_user_info_entry_new(NULL, NULL);
 	entry->type = PURPLE_NOTIFY_USER_INFO_ENTRY_SECTION_BREAK;
 
-	g_queue_push_head(&user_info->user_info_entries, entry);
+	g_queue_push_head(&user_info->entries, entry);
 }
 
 void
@@ -660,7 +660,7 @@
 {
 	PurpleNotifyUserInfoEntry *entry;
 
-	entry = g_queue_pop_tail(&user_info->user_info_entries);
+	entry = g_queue_pop_tail(&user_info->entries);
 	if (entry)
 		purple_notify_user_info_entry_destroy(entry);
 }