pidgin: libpurple/notify.c comparison

comparison libpurple/notify.c @ 32368:ca4714f51bb1

propagate from branch 'im.pidgin.pidgin.2.x.y' (head 0c3ef8388ce0f274d695767f513518b859889979) to branch 'im.pidgin.pidgin' (head 8ee87bdc7a99e5d58bf700eaf08abe409ae4ede8)

author	Ethan Blanton <elb@pidgin.im>
date	Tue, 29 Nov 2011 03:59:09 +0000
parents	8878ea011fa1
children

comparison

equal deleted inserted replaced

-:00ea5f8ef509
+:ca4714f51bb1
 	PurpleNotifyUserInfoEntryType type;
 };
 struct _PurpleNotifyUserInfo
 {
-	GList *user_info_entries;
+	GQueue entries;
+};
+/**
+* Single column of a search result.
+*/
+struct _PurpleNotifySearchColumn
+{
+	char *title;           /**< Title of the column. */
+	gboolean visible;      /**< Should the column be visible to the user. Defaults to TRUE. */
 };
 void *
 purple_notify_message(void *handle, PurpleNotifyMsgType type,
 					const char *title, const char *primary,
 	g_return_val_if_fail(title != NULL, NULL);
 	sc = g_new0(PurpleNotifySearchColumn, 1);
 	sc->title = g_strdup(title);
+	sc->visible = TRUE;
 	return sc;
 }
-guint
+const char *purple_notify_searchresult_column_get_title(const PurpleNotifySearchColumn *column)
-purple_notify_searchresults_get_columns_count(PurpleNotifySearchResults *results)
+{
-{
+	g_return_val_if_fail(column != NULL, NULL);
-	g_return_val_if_fail(results != NULL, 0);
+	return column->title;
-	return g_list_length(results->columns);
+}
-}
+void purple_notify_searchresult_column_set_visible(PurpleNotifySearchColumn *column, gboolean visible)
-guint
+{
-purple_notify_searchresults_get_rows_count(PurpleNotifySearchResults *results)
+	g_return_if_fail(column != NULL);
-{
-	g_return_val_if_fail(results != NULL, 0);
+	column->visible = visible;
+}
-	return g_list_length(results->rows);
-}
+gboolean
+purple_notify_searchresult_column_is_visible(const PurpleNotifySearchColumn *column)
-char *
+{
-purple_notify_searchresults_column_get_title(PurpleNotifySearchResults *results,
+	g_return_val_if_fail(column != NULL, FALSE);
-										   unsigned int column_id)
-{
+	return column->visible;
-	g_return_val_if_fail(results != NULL, NULL);
-	return ((PurpleNotifySearchColumn *)g_list_nth_data(results->columns, column_id))->title;
-}
-GList *
-purple_notify_searchresults_row_get(PurpleNotifySearchResults *results,
-								  unsigned int row_id)
-{
-	g_return_val_if_fail(results != NULL, NULL);
-	return g_list_nth_data(results->rows, row_id);
 }
 void *
 purple_notify_userinfo(PurpleConnection *gc, const char *who,
 						   PurpleNotifyUserInfo *user_info, PurpleNotifyCloseCallback cb, gpointer user_data)
 {
 	PurpleNotifyUserInfo *user_info;
 	user_info = g_new0(PurpleNotifyUserInfo, 1);
 	PURPLE_DBUS_REGISTER_POINTER(user_info, PurpleNotifyUserInfo);
-	user_info->user_info_entries = NULL;
+	g_queue_init(&user_info->entries);
 	return user_info;
 }
 void
 purple_notify_user_info_destroy(PurpleNotifyUserInfo *user_info)
 {
 	GList *l;
-	for (l = user_info->user_info_entries; 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_list_free(user_info->user_info_entries);
+	g_queue_clear(&user_info->entries);
 	PURPLE_DBUS_UNREGISTER_POINTER(user_info);
 	g_free(user_info);
 }
-GList *
+GQueue *
 purple_notify_user_info_get_entries(PurpleNotifyUserInfo *user_info)
 {
 	g_return_val_if_fail(user_info != NULL, NULL);
-	return user_info->user_info_entries;
+	return &user_info->entries;
 }
 char *
 purple_notify_user_info_get_text_with_newline(PurpleNotifyUserInfo *user_info, const char *newline)
 {
 	GList *l;
 	GString *text;
 	text = g_string_new("");
-	for (l = user_info->user_info_entries; 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)
 			g_string_append(text, newline);
 	user_info_entry->type = type;
 }
 void
-purple_notify_user_info_add_pair(PurpleNotifyUserInfo *user_info, const char *label, const char *value)
+purple_notify_user_info_add_pair_html(PurpleNotifyUserInfo *user_info, const char *label, const char *value)
 {
 	PurpleNotifyUserInfoEntry *entry;
 	entry = purple_notify_user_info_entry_new(label, value);
-	user_info->user_info_entries = g_list_append(user_info->user_info_entries, entry);
+	g_queue_push_tail(&user_info->entries, entry);
 }
 void
 purple_notify_user_info_add_pair_plaintext(PurpleNotifyUserInfo *user_info, const char *label, const char *value)
 {
 	gchar *escaped;
+	escaped = g_markup_escape_text(value, -1);
+	purple_notify_user_info_add_pair_html(user_info, label, escaped);
+	g_free(escaped);
+}
+void
+purple_notify_user_info_prepend_pair_html(PurpleNotifyUserInfo *user_info, const char *label, const char *value)
+{
 	PurpleNotifyUserInfoEntry *entry;
+	entry = purple_notify_user_info_entry_new(label, value);
+	g_queue_push_head(&user_info->entries, entry);
+}
+void
+purple_notify_user_info_prepend_pair_plaintext(PurpleNotifyUserInfo *user_info, const char *label, const char *value)
+{
+	gchar *escaped;
 	escaped = g_markup_escape_text(value, -1);
-	entry = purple_notify_user_info_entry_new(label, escaped);
+	purple_notify_user_info_prepend_pair_html(user_info, label, escaped);
 	g_free(escaped);
-	user_info->user_info_entries = g_list_append(user_info->user_info_entries, entry);
-}
-void
-purple_notify_user_info_prepend_pair(PurpleNotifyUserInfo *user_info, const char *label, const char *value)
-{
-	PurpleNotifyUserInfoEntry *entry;
-	entry = purple_notify_user_info_entry_new(label, value);
-	user_info->user_info_entries = g_list_prepend(user_info->user_info_entries, entry);
 }
 void
 purple_notify_user_info_remove_entry(PurpleNotifyUserInfo *user_info, PurpleNotifyUserInfoEntry *entry)
 {
 	g_return_if_fail(user_info != NULL);
 	g_return_if_fail(entry != NULL);
-	user_info->user_info_entries = g_list_remove(user_info->user_info_entries, entry);
+	g_queue_remove(&user_info->entries, entry);
 }
 void
 purple_notify_user_info_add_section_header(PurpleNotifyUserInfo *user_info, const char *label)
 {
 	PurpleNotifyUserInfoEntry *entry;
 	entry = purple_notify_user_info_entry_new(label, NULL);
 	entry->type = PURPLE_NOTIFY_USER_INFO_ENTRY_SECTION_HEADER;
-	user_info->user_info_entries = g_list_append(user_info->user_info_entries, entry);
+	g_queue_push_tail(&user_info->entries, entry);
 }
 void
 purple_notify_user_info_prepend_section_header(PurpleNotifyUserInfo *user_info, const char *label)
 {
 	PurpleNotifyUserInfoEntry *entry;
 	entry = purple_notify_user_info_entry_new(label, NULL);
 	entry->type = PURPLE_NOTIFY_USER_INFO_ENTRY_SECTION_HEADER;
-	user_info->user_info_entries = g_list_prepend(user_info->user_info_entries, entry);
+	g_queue_push_head(&user_info->entries, entry);
 }
 void
 purple_notify_user_info_add_section_break(PurpleNotifyUserInfo *user_info)
 {
 	PurpleNotifyUserInfoEntry *entry;
 	entry = purple_notify_user_info_entry_new(NULL, NULL);
 	entry->type = PURPLE_NOTIFY_USER_INFO_ENTRY_SECTION_BREAK;
-	user_info->user_info_entries = g_list_append(user_info->user_info_entries, entry);
+	g_queue_push_tail(&user_info->entries, entry);
 }
 void
 purple_notify_user_info_prepend_section_break(PurpleNotifyUserInfo *user_info)
 {
 	PurpleNotifyUserInfoEntry *entry;
 	entry = purple_notify_user_info_entry_new(NULL, NULL);
 	entry->type = PURPLE_NOTIFY_USER_INFO_ENTRY_SECTION_BREAK;
-	user_info->user_info_entries = g_list_prepend(user_info->user_info_entries, entry);
+	g_queue_push_head(&user_info->entries, entry);
 }
 void
 purple_notify_user_info_remove_last_item(PurpleNotifyUserInfo *user_info)
 {
-	GList *last = g_list_last(user_info->user_info_entries);
+	PurpleNotifyUserInfoEntry *entry;
-	if (last) {
-		purple_notify_user_info_entry_destroy(last->data);
+	entry = g_queue_pop_tail(&user_info->entries);
-		user_info->user_info_entries = g_list_delete_link(user_info->user_info_entries, last);
+	if (entry)
-	}
+		purple_notify_user_info_entry_destroy(entry);
 }
 void *
 purple_notify_uri(void *handle, const char *uri)
 {

Mercurial > pidgin

comparison libpurple/notify.c @ 32368:ca4714f51bb1