Attachment #153873 for bug #152606




	char *message;

	/** The timestamp when this saved status was created. This must be unique. */
	unsigned int creation_time;

	unsigned int lastused;

	unsigned int usage_count;


	g_return_if_fail(status != NULL);

	/* Avoid using 0 because it's an invalid hash key */
	status->creation_time = creation_time != 0 ? (unsigned int) creation_time : 1;

	while (g_hash_table_lookup(creation_times, &status->creation_time) != NULL)
		status->creation_time++;

{
	const PurpleSavedStatus *saved_status_a = a;
	const PurpleSavedStatus *saved_status_b = b;
	unsigned int time_a = saved_status_a->lastused +
						(MIN(saved_status_a->usage_count, 10) * 86400);
	unsigned int time_b = saved_status_b->lastused +
						(MIN(saved_status_b->usage_count, 10) * 86400);
	if (time_a > time_b)
		return -1;

{
	GList *l, *next;
	PurpleSavedStatus *saved_status, *current_status;
	unsigned int count, creation_time;
	time_t creation_time;

	current_status = purple_savedstatus_get_current();


		xmlnode_set_attrib(node, "transient", "true");
	}

	snprintf(buf, sizeof(buf), "%u", status->creation_time);
	xmlnode_set_attrib(node, "created", buf);

	snprintf(buf, sizeof(buf), "%u", status->lastused);
	xmlnode_set_attrib(node, "lastused", buf);

	snprintf(buf, sizeof(buf), "%u", status->usage_count);

void
purple_savedstatus_delete_by_status(PurpleSavedStatus *status)
{
	unsigned int creation_time, current, idleaway;

	g_return_if_fail(status != NULL);


}

PurpleSavedStatus *
purple_savedstatus_find_by_creation_time(unsigned int creation_time)
{
	GList *iter;
	PurpleSavedStatus *status;

	return saved_status->message;
}

unsigned int
purple_savedstatus_get_creation_time(const PurpleSavedStatus *saved_status)
{
	g_return_val_if_fail(saved_status != NULL, 0);

Lines 253-259 Link Here

(-)libpurple/savedstatuses.h.bak (-2 / +2 lines)
253	*	253	*
254	* @return The saved status if found, or NULL.	254	* @return The saved status if found, or NULL.
255	*/	255	*/
256	PurpleSavedStatus *purple_savedstatus_find_by_creation_time(time_t creation_time);	256	PurpleSavedStatus *purple_savedstatus_find_by_creation_time(unsigned int creation_time);
257		257
258	/**	258	/**
259	* Finds a saved status with the specified primitive and message.	259	* Finds a saved status with the specified primitive and message.
Lines 334-340 Link Here
334	*	334	*
335	* @return The timestamp when this saved status was created.	335	* @return The timestamp when this saved status was created.
336	*/	336	*/
337	time_t purple_savedstatus_get_creation_time(const PurpleSavedStatus *saved_status);	337	unsigned int purple_savedstatus_get_creation_time(const PurpleSavedStatus *saved_status);
338		338
339	/**	339	/**
340	* Determine if a given saved status has "substatuses,"	340	* Determine if a given saved status has "substatuses,"

Lines 107-113 Link Here

(-)finch/gntprefs.c.bak (-1 / +1 lines)
107	char *str;	107	char *str;
108	if (purple_savedstatus_is_transient(iter->data))	108	if (purple_savedstatus_is_transient(iter->data))
109	continue;	109	continue;
110	str = g_strdup_printf("%ld", purple_savedstatus_get_creation_time(iter->data));	110	str = g_strdup_printf("%u", purple_savedstatus_get_creation_time(iter->data));
111	list = g_list_append(list, (char*)purple_savedstatus_get_title(iter->data));	111	list = g_list_append(list, (char*)purple_savedstatus_get_title(iter->data));
112	list = g_list_append(list, str);	112	list = g_list_append(list, str);
113	pref_request.freestrings = g_list_prepend(pref_request.freestrings, str);	113	pref_request.freestrings = g_list_prepend(pref_request.freestrings, str);

Return to bug 152606

Lines 65-73 Link Here

(-)libpurple/savedstatuses.c.bak (-12 / +11 lines)
65	char *message;	65	char *message;
66		66
67	/** The timestamp when this saved status was created. This must be unique. */	67	/** The timestamp when this saved status was created. This must be unique. */
68	time_t creation_time;	68	unsigned int creation_time;
69		69
70	time_t lastused;	70	unsigned int lastused;
71		71
72	unsigned int usage_count;	72	unsigned int usage_count;
73		73
Lines 146-152 Link Here
146	g_return_if_fail(status != NULL);	146	g_return_if_fail(status != NULL);
147		147
148	/* Avoid using 0 because it's an invalid hash key */	148	/* Avoid using 0 because it's an invalid hash key */
149	status->creation_time = creation_time != 0 ? creation_time : 1;	149	status->creation_time = creation_time != 0 ? (unsigned int) creation_time : 1;
150		150
151	while (g_hash_table_lookup(creation_times, &status->creation_time) != NULL)	151	while (g_hash_table_lookup(creation_times, &status->creation_time) != NULL)
152	status->creation_time++;	152	status->creation_time++;
Lines 172-180 Link Here
172	{	172	{
173	const PurpleSavedStatus *saved_status_a = a;	173	const PurpleSavedStatus *saved_status_a = a;
174	const PurpleSavedStatus *saved_status_b = b;	174	const PurpleSavedStatus *saved_status_b = b;
175	time_t time_a = saved_status_a->lastused +	175	unsigned int time_a = saved_status_a->lastused +
176	(MIN(saved_status_a->usage_count, 10) * 86400);	176	(MIN(saved_status_a->usage_count, 10) * 86400);
177	time_t time_b = saved_status_b->lastused +	177	unsigned int time_b = saved_status_b->lastused +
178	(MIN(saved_status_b->usage_count, 10) * 86400);	178	(MIN(saved_status_b->usage_count, 10) * 86400);
179	if (time_a > time_b)	179	if (time_a > time_b)
180	return -1;	180	return -1;
Lines 194-201 Link Here
194	{	194	{
195	GList l, next;	195	GList l, next;
196	PurpleSavedStatus saved_status, current_status;	196	PurpleSavedStatus saved_status, current_status;
197	int count;	197	unsigned int count, creation_time;
198	time_t creation_time;
199		198
200	current_status = purple_savedstatus_get_current();	199	current_status = purple_savedstatus_get_current();
201		200
Lines 285-294 Link Here
285	xmlnode_set_attrib(node, "transient", "true");	284	xmlnode_set_attrib(node, "transient", "true");
286	}	285	}
287		286
288	snprintf(buf, sizeof(buf), "%lu", status->creation_time);	287	snprintf(buf, sizeof(buf), "%u", status->creation_time);
289	xmlnode_set_attrib(node, "created", buf);	288	xmlnode_set_attrib(node, "created", buf);
290		289
291	snprintf(buf, sizeof(buf), "%lu", status->lastused);	290	snprintf(buf, sizeof(buf), "%u", status->lastused);
292	xmlnode_set_attrib(node, "lastused", buf);	291	xmlnode_set_attrib(node, "lastused", buf);
293		292
294	snprintf(buf, sizeof(buf), "%u", status->usage_count);	293	snprintf(buf, sizeof(buf), "%u", status->usage_count);
Lines 707-713 Link Here
707	void	706	void
708	purple_savedstatus_delete_by_status(PurpleSavedStatus *status)	707	purple_savedstatus_delete_by_status(PurpleSavedStatus *status)
709	{	708	{
710	time_t creation_time, current, idleaway;	709	unsigned int creation_time, current, idleaway;
711		710
712	g_return_if_fail(status != NULL);	711	g_return_if_fail(status != NULL);
713		712
Lines 948-954 Link Here
948	}	947	}
949		948
950	PurpleSavedStatus *	949	PurpleSavedStatus *
951	purple_savedstatus_find_by_creation_time(time_t creation_time)	950	purple_savedstatus_find_by_creation_time(unsigned int creation_time)
952	{	951	{
953	GList *iter;	952	GList *iter;
954	PurpleSavedStatus *status;	953	PurpleSavedStatus *status;
Lines 1048-1054 Link Here
1048	return saved_status->message;	1047	return saved_status->message;
1049	}	1048	}
1050		1049
1051	time_t	1050	unsigned int
1052	purple_savedstatus_get_creation_time(const PurpleSavedStatus *saved_status)	1051	purple_savedstatus_get_creation_time(const PurpleSavedStatus *saved_status)
1053	{	1052	{
1054	g_return_val_if_fail(saved_status != NULL, 0);	1053	g_return_val_if_fail(saved_status != NULL, 0);