Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 1477

Timestamp:

01/26/07 08:42:45

Author:

svillar

Message:

* Fixed the implementation of tny_camel_header_get_xxx methods

Files:

trunk/ChangeLog (modified) (1 diff)
trunk/libtinymail-camel/tny-camel-header.c (modified) (15 diffs)
trunk/libtinymail/tny-folder-monitor.c (modified) (2 diffs)
trunk/libtinymail/tny-header.c (modified) (8 diffs)
trunk/libtinymailui-gtk/tny-gtk-header-list-model.c (modified) (3 diffs)
trunk/libtinymailui-gtk/tny-gtk-header-view.c (modified) (1 diff)
trunk/libtinymailui-gtk/tny-gtk-msg-window.c (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/ChangeLog

r1475	r1477
	1	2007-01-26 Sergio Villar Senin <svillar@igalia.com>
	2
	3	* Fixed the implementation of tny_camel_header_get_xxx methods. Now
	4	they return NULL whenever an error happens (or if the attribute hasn't
	5	a value yet) instead of the string "Invalid". The documentation has
	6	been updated also.
	7
1	8	2007-01-26 Philip Van Hoof <pvanhoof@gnome.org>
2	9

trunk/libtinymail-camel/tny-camel-header.c

r1450	r1477
42	42	static GObjectClass *parent_class = NULL;
43	43
44		~~static const gchar *invalid = "Invalid";~~
45
46	44	static void
47	45	destroy_write (TnyCamelHeader *self)
…	…
51	49	camel_object_unref (CAMEL_OBJECT (((WriteInfo*)self->info)->msg));
52	50
53		if (((WriteInfo)self->info)->mime_from && ((WriteInfo)self->info)->mime_from != ~~invalid~~)
	51	if (((WriteInfo)self->info)->mime_from && ((WriteInfo)self->info)->mime_from != NULL)
54	52	g_free (((WriteInfo*)self->info)->mime_from);
55	53
…	…
155	153	{
156	154	TnyCamelHeader *me = TNY_CAMEL_HEADER (self);
157		const gchar *retval;
	155	const gchar *retval = NULL;
158	156
159	157	#ifdef HEALTHY_CHECK
160	158	if (!me->healthy \|\| G_UNLIKELY (!me->info))
161		return ~~invalid~~;
162		#else
163		if (G_UNLIKELY (!me->info))
164		return ~~invalid~~;
	159	return NULL;
	160	#else
	161	if (G_UNLIKELY (!me->info))
	162	return NULL;
165	163	#endif
166	164
…	…
171	169	if (addr)
172	170	retval = camel_address_format (CAMEL_ADDRESS (addr));
173		else
174		retval = invalid;
175		} else
176		retval = invalid;
	171	}
177	172
178	173	return retval;
…	…
294	289	{
295	290	TnyCamelHeader *me = TNY_CAMEL_HEADER (self);
296		const gchar *retval;
	291	const gchar *retval = NULL;
297	292
298	293	#ifdef HEALTHY_CHECK
299	294	if (!me->healthy)
300		return ~~invalid~~;
301		#endif
302
303		if (G_UNLIKELY (!me->info))
304		return ~~invalid~~;
	295	return NULL;
	296	#endif
	297
	298	if (G_UNLIKELY (!me->info))
	299	return NULL;
305	300
306	301	if (G_UNLIKELY (me->write == 1))
…	…
309	304	retval = camel_message_info_cc ((CamelMessageInfo*)me->info);
310	305
311		return retval~~?retval:invalid~~;
	306	return retval;
312	307	}
313	308
…	…
316	311	{
317	312	TnyCamelHeader *me = TNY_CAMEL_HEADER (self);
318		const gchar *retval;
	313	const gchar *retval = NULL;
319	314
320	315	#ifdef HEALTHY_CHECK
321	316	if (!me->healthy)
322		return ~~invalid~~;
323		#endif
324
325		if (G_UNLIKELY (!me->info))
326		return ~~invalid~~;
	317	return NULL;
	318	#endif
	319
	320	if (G_UNLIKELY (!me->info))
	321	return NULL;
327	322
328	323	if (G_UNLIKELY (me->write == 1))
329	324	retval = camel_medium_get_header (CAMEL_MEDIUM (((WriteInfo*)me->info)->msg), "bcc");
330		else
331		retval = invalid;
332
333		return retval?retval:invalid;
	325
	326	return retval;
334	327	}
335	328
…	…
470	463	{
471	464	TnyCamelHeader *me = TNY_CAMEL_HEADER (self);
472		const gchar *retval;
	465	const gchar *retval = NULL;
473	466
474	467	#ifdef HEALTHY_CHECK
475	468	if (!me->healthy \|\| G_UNLIKELY (!me->info))
476		return ~~invalid~~;
477		#else
478		if (G_UNLIKELY (!me->info))
479		return ~~invalid~~;
	469	return NULL;
	470	#else
	471	if (G_UNLIKELY (!me->info))
	472	return NULL;
480	473	#endif
481	474
…	…
488	481	if (addr)
489	482	((WriteInfo*)me->info)->mime_from = camel_address_format (CAMEL_ADDRESS (addr));
490		else ((WriteInfo)me->info)->mime_from = ~~(gchar) invalid~~;
	483	else ((WriteInfo*)me->info)->mime_from = NULL;
491	484	}
492	485
…	…
495	488	retval = camel_message_info_from ((CamelMimeMessage*)me->info);
496	489
497		return retval~~?retval:invalid~~;
	490	return retval;
498	491	}
499	492
…	…
502	495	{
503	496	TnyCamelHeader *me = TNY_CAMEL_HEADER (self);
504		const gchar *retval;
	497	const gchar *retval = NULL;
505	498
506	499	#ifdef HEALTHY_CHECK
507	500	if (!me->healthy \|\| G_UNLIKELY (!me->info))
508		return ~~invalid~~;
509		#else
510		if (G_UNLIKELY (!me->info))
511		return ~~invalid~~;
	501	return NULL;
	502	#else
	503	if (G_UNLIKELY (!me->info))
	504	return NULL;
512	505	#endif
513	506
…	…
517	510	retval = camel_message_info_subject ((CamelMessageInfo*)me->info);
518	511
519		return retval~~?retval:invalid~~;
	512	return retval;
520	513	}
521	514
…	…
525	518	{
526	519	TnyCamelHeader *me = TNY_CAMEL_HEADER (self);
527		~~gchar *retval~~;
	520	const gchar *retval = NULL;
528	521
529	522	#ifdef HEALTHY_CHECK
530	523	if (!me->healthy \|\| G_UNLIKELY (!me->info))
531		return ~~invalid~~;
532		#else
533		if (G_UNLIKELY (!me->info))
534		return ~~invalid~~;
535		#endif
536
537		if (G_UNLIKELY (me->write == 1))
538		retval = ~~(gchar)~~ camel_medium_get_header (CAMEL_MEDIUM (((WriteInfo)me->info)->msg), "to");
	524	return NULL;
	525	#else
	526	if (G_UNLIKELY (!me->info))
	527	return NULL;
	528	#endif
	529
	530	if (G_UNLIKELY (me->write == 1))
	531	retval = camel_medium_get_header (CAMEL_MEDIUM (((WriteInfo*)me->info)->msg), "to");
539	532	else
540		retval = ~~(gchar)~~ camel_message_info_to ((CamelMessageInfo)me->info);
541
542		return retval~~?(const gchar*)retval:invalid~~;
	533	retval = camel_message_info_to ((CamelMessageInfo*)me->info);
	534
	535	return retval;
543	536	}
544	537
…	…
547	540	{
548	541	TnyCamelHeader *me = TNY_CAMEL_HEADER (self);
549		~~gchar *retval~~;
	542	const gchar *retval = NULL;
550	543
551	544	#ifdef HEALTHY_CHECK
552	545	if (!me->healthy \|\| G_UNLIKELY (!me->info))
553		return ~~invalid~~;
554		#else
555		if (G_UNLIKELY (!me->info))
556		return ~~invalid~~;
557		#endif
558
559		if (G_UNLIKELY (me->write == 1))
560		retval = ~~(gchar)~~ camel_mime_message_get_message_id (((WriteInfo)me->info)->msg);
	546	return NULL;
	547	#else
	548	if (G_UNLIKELY (!me->info))
	549	return NULL;
	550	#endif
	551
	552	if (G_UNLIKELY (me->write == 1))
	553	retval = camel_mime_message_get_message_id (((WriteInfo*)me->info)->msg);
561	554	else
562		retval = ~~(gchar)~~ camel_message_info_message_id ((CamelMessageInfo)me->info);
563
564		return retval~~?(const gchar*)retval:invalid~~;
	555	retval = camel_message_info_message_id ((CamelMessageInfo*)me->info);
	556
	557	return retval;
565	558	}
566	559
…	…
599	592	{
600	593	TnyCamelHeader *me = TNY_CAMEL_HEADER (self);
601		const gchar *retval;
	594	const gchar *retval = NULL;
602	595
603	596	#ifdef HEALTHY_CHECK
604	597	if (!me->healthy \|\| G_UNLIKELY (!me->info) \|\| G_UNLIKELY (me->write == 1))
605		return ~~invalid~~;
	598	return NULL;
606	599	#else
607	600	if (G_UNLIKELY (!me->info) \|\| G_UNLIKELY (me->write == 1))
608		return ~~invalid~~;
	601	return NULL;
609	602	#endif
610	603
611	604	retval = camel_message_info_uid ((CamelMessageInfo*)me->info);
612	605
613		return retval~~?retval:invalid~~;
	606	return retval;
614	607	}
615	608

trunk/libtinymail/tny-folder-monitor.c

r1447	r1477
162	162	while (!tny_iterator_is_done (iter))
163	163	{
	164	const gchar *id;
164	165	TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
165		if (!strcmp (tny_header_get_uid (header), uid))
	166	id = tny_header_get_uid (header);
	167	if (id && (!strcmp (id, uid)))
166	168	{ found = TRUE; break; }
167	169	g_object_unref (G_OBJECT (header));
…	…
222	224	while (!tny_iterator_is_done (iter))
223	225	{
	226	const gchar *uid;
224	227	TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
225		foreach_list_remove_header (priv, tny_header_get_uid (header));
	228	uid = tny_header_get_uid (header);
	229	if (uid)
	230	foreach_list_remove_header (priv, uid);
226	231	g_object_unref (G_OBJECT (header));
227	232	tny_iterator_next (iter);

trunk/libtinymail/tny-header.c

r1411	r1477
49	49	* Get the reply-to header
50	50	*
51		* Return value: reply-to header
	51	* Return value: reply-to header, or NULL if not found
52	52	**/
53	53	const gchar*
…	…
174	174	* Get the CC header. The returned value should not be freed.
175	175	*
176		* Return value: cc header as a read-only string
	176	* Return value: cc header as a read-only string, or NULL if not found
177	177	*
178	178	**/
…	…
194	194	* Get the BCC header. The returned value should not be freed.
195	195	*
196		* Return value: bcc header as a read-only string
	196	* Return value: bcc header as a read-only string, or NULL if not found
197	197	*
198	198	**/
…	…
254	254	* returned value should not be freed.
255	255	*
256		* Return value: Unique follow-up uid as a read-only string
	256	* Return value: Unique follow-up uid as a read-only string, or NULL if not found
257	257	*
258	258	**/
…	…
275	275	* returned value should not be freed.
276	276	*
277		* Return value: message-id header as a read-only string
	277	* Return value: message-id header as a read-only string, or NULL if not found
278	278	*
279	279	**/
…	…
317	317	* Get the from header. The returned value should not be freed.
318	318	*
319		* Return value: from header as a read-only string.
	319	* Return value: from header as a read-only string, or NULL if not found
320	320	*
321	321	**/
…	…
337	337	* Get the subject header. The returned value should not be freed.
338	338	*
339		* Return value: subject header as a read-only string.
	339	* Return value: subject header as a read-only string, or NULL if not found
340	340	*
341	341	**/
…	…
358	358	* Get the to header. The returned value should not be freed.
359	359	*
360		* Return value: to header as a read-only string
	360	* Return value: to header as a read-only string, or NULL if not found
361	361	*
362	362	**/

trunk/libtinymailui-gtk/tny-gtk-header-list-model.c

r1419	r1477
326	326	TnyHeader *header = NULL;
327	327	TnyGtkHeaderListModel *list_model = TNY_GTK_HEADER_LIST_MODEL (self);
	328	const gchar *str;
328	329
329	330	g_return_if_fail (iter->stamp == TNY_GTK_HEADER_LIST_MODEL (self)->stamp);
…	…
343	344	case TNY_GTK_HEADER_LIST_MODEL_CC_COLUMN:
344	345	g_value_init (value, G_TYPE_STRING);
345		g_value_set_string (value, tny_header_get_cc (header));
	346	str = tny_header_get_cc (header);
	347	if (str)
	348	g_value_set_string (value, str);
346	349	break;
347	350	case TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_COLUMN:
…	…
376	379	case TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN:
377	380	g_value_init (value, G_TYPE_STRING);
378		g_value_set_string (value, tny_header_get_to (header));
	381	str = tny_header_get_to (header);
	382	if (str)
	383	g_value_set_string (value, str);
379	384	break;
380	385	case TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN:
381	386	g_value_init (value, G_TYPE_STRING);
382		g_value_set_string (value, tny_header_get_subject (header));
	387	str = tny_header_get_subject (header);
	388	if (str)
	389	g_value_set_string (value, str);
383	390	break;
384	391	case TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN:
385	392	g_value_init (value, G_TYPE_STRING);
386		g_value_set_string (value, tny_header_get_from (header));
	393	str = tny_header_get_from (header);
	394	if (str)
	395	g_value_set_string (value, str);
387	396	break;
388	397	case TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN:

trunk/libtinymailui-gtk/tny-gtk-header-view.c

r1198	r1477
79	79	{
80	80	gchar *str;
	81	const gchar to, from, *subject;
81	82	g_object_ref (G_OBJECT (header));
82	83	priv->header = header;
83	84
84		gtk_label_set_text (GTK_LABEL (priv->to_label), tny_header_get_to (header));
85		gtk_label_set_text (GTK_LABEL (priv->from_label), tny_header_get_from (header));
86		gtk_label_set_text (GTK_LABEL (priv->subject_label), tny_header_get_subject (header));
	85	to = tny_header_get_to (header);
	86	from = tny_header_get_from (header);
	87	subject = tny_header_get_subject (header);
	88
	89	if (to)
	90	gtk_label_set_text (GTK_LABEL (priv->to_label), to);
	91	if (from)
	92	gtk_label_set_text (GTK_LABEL (priv->from_label), from);
	93	if (subject)
	94	gtk_label_set_text (GTK_LABEL (priv->subject_label), subject);
87	95
88	96	str = _get_readable_date (tny_header_get_date_sent (header));

trunk/libtinymailui-gtk/tny-gtk-msg-window.c

r1277	r1477
97	97	{
98	98	g_assert (TNY_IS_MSG (msg));
	99	const gchar *subject;
99	100
100	101	header = TNY_HEADER (tny_msg_get_header (msg));
101		gtk_window_set_title (GTK_WINDOW (self),
102		tny_header_get_subject (header));
	102	subject = tny_header_get_subject (header);
	103	if (subject)
	104	gtk_window_set_title (GTK_WINDOW (self), subject);
103	105	g_object_unref (G_OBJECT (header));
104	106	}

Changeset Navigation

Changeset 1477

Legend:

trunk/ChangeLog

trunk/libtinymail-camel/tny-camel-header.c

trunk/libtinymail/tny-folder-monitor.c

trunk/libtinymail/tny-header.c

trunk/libtinymailui-gtk/tny-gtk-header-list-model.c

trunk/libtinymailui-gtk/tny-gtk-header-view.c

trunk/libtinymailui-gtk/tny-gtk-msg-window.c

Download in other formats: