Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 2198

Timestamp:

06/18/07 11:35:50

Author:

pvanhoof

Message:

Added a signals marshal list file

Files:

trunk/libtinymail (modified) (1 prop)
trunk/libtinymail-camel/camel-lite/camel/providers/smtp/camel-smtp-transport.c (modified) (19 diffs)
trunk/libtinymail-camel/camel-lite/camel/providers/smtp/camel-smtp-transport.h (modified) (1 diff)
trunk/libtinymail-camel/tny-camel-send-queue.c (modified) (1 diff)
trunk/libtinymail-camel/tny-camel-transport-account.c (modified) (2 diffs)
trunk/libtinymail/.svnignore (modified) (1 diff)
trunk/libtinymail/Makefile.am (modified) (2 diffs)
trunk/libtinymail/tny-send-queue.c (modified) (4 diffs)
trunk/libtinymail/tny-send-queue.h (modified) (1 diff)
trunk/libtinymail/tny-signals-marshal.list (added)
trunk/tests/c-demo/tny-demoui-summary-view.c (modified) (3 diffs)

Legend:

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

trunk/libtinymail
- Property svn:ignore changed from Makefile.in config.h .libs .deps libtinymail-1.0.pc Makefile .svnignore stamp-h2 libtinymail.pc to tny-signals-marshal.c tny-signals-marshal.h Makefile.in config.h .libs .deps libtinymail-1.0.pc Makefile .svnignore stamp-h2 libtinymail.pc

trunk/libtinymail-camel/camel-lite/camel/providers/smtp/camel-smtp-transport.c

r2125	r2198
934	934	cmdbuf = g_strdup_printf("%s %s\r\n", token, name);
935	935	g_free (name);
936
937		~~d(fprintf (stderr, "sending : %s", cmdbuf)~~);
	936
	937	smtp_debug ("-> %s\n", cmdbuf);
938	938	if (camel_stream_write (transport->ostream, cmdbuf, strlen (cmdbuf)) == -1) {
939	939	g_free (cmdbuf);
…	…
953	953	respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
954	954
955		~~d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)")~~);
	955	smtp_debug ("<- %s\n", respbuf ? respbuf : "(null)");
956	956
957	957	if (!respbuf \|\| strncmp (respbuf, "250", 3)) {
…	…
1041	1041	}
1042	1042
1043		~~d(fprintf (stderr, "sending : %s", cmdbuf)~~);
	1043	smtp_debug ("-> %s\n", cmdbuf);
1044	1044	if (camel_stream_write (transport->ostream, cmdbuf, strlen (cmdbuf)) == -1) {
1045	1045	g_free (cmdbuf);
…	…
1051	1051
1052	1052	respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
1053		~~d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)")~~);
1054
	1053	smtp_debug ("<- %s\n", respbuf ? respbuf : "(null)");
	1054
1055	1055	while (!camel_sasl_authenticated (sasl)) {
1056	1056	if (!respbuf) {
…	…
1087	1087	cmdbuf = g_strdup_printf ("%s\r\n", challenge);
1088	1088	g_free (challenge);
1089		~~d(fprintf (stderr, "sending : %s", cmdbuf)~~);
	1089	smtp_debug ("-> %s\n", cmdbuf);
1090	1090	if (camel_stream_write (transport->ostream, cmdbuf, strlen (cmdbuf)) == -1) {
1091	1091	g_free (cmdbuf);
…	…
1096	1096	/* get the server's response */
1097	1097	respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
1098		~~d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)")~~);
	1098	smtp_debug ("<- %s\n", respbuf ? respbuf : "(null)");
1099	1099	}
1100	1100
…	…
1116	1116	break_and_lose:
1117	1117	/* Get the server out of "waiting for continuation data" mode. */
1118		~~d(fprintf (stderr, "sending : *\n")~~);
	1118	smtp_debug ("-> *\n");
1119	1119	camel_stream_write (transport->ostream, "*\r\n", 3);
1120	1120	respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
1121		~~d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)")~~);
	1121	smtp_debug ("<- %s\n", respbuf ? respbuf : "(null)");
1122	1122
1123	1123	lose:
…	…
1144	1144	cmdbuf = g_strdup_printf ("MAIL FROM:<%s>\r\n", sender);
1145	1145
1146		~~d(fprintf (stderr, "sending : %s", cmdbuf)~~);
	1146	smtp_debug ("-> %s\n", cmdbuf);
1147	1147
1148	1148	if (camel_stream_write (transport->ostream, cmdbuf, strlen (cmdbuf)) == -1) {
…	…
1163	1163	respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
1164	1164
1165		~~d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)")~~);
	1165	smtp_debug ("<- %s\n", respbuf ? respbuf : "(null)");
1166	1166
1167	1167	if (!respbuf \|\| strncmp (respbuf, "250", 3)) {
…	…
1185	1185	cmdbuf = g_strdup_printf ("RCPT TO:<%s>\r\n", recipient);
1186	1186
1187		~~d(fprintf (stderr, "sending : %s", cmdbuf)~~);
	1187	smtp_debug ("-> %s", cmdbuf);
1188	1188
1189	1189	if (camel_stream_write (transport->ostream, cmdbuf, strlen (cmdbuf)) == -1) {
…	…
1204	1204	respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
1205	1205
1206		~~d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)")~~);
	1206	smtp_debug ( "<- %s\n", respbuf ? respbuf : "(null)");
1207	1207
1208	1208	if (!respbuf \|\| strncmp (respbuf, "250", 3)) {
…	…
1243	1243	cmdbuf = g_strdup ("DATA\r\n");
1244	1244
1245		~~d(fprintf (stderr, "sending : %s", cmdbuf)~~);
	1245	smtp_debug ("-> %s\n", cmdbuf);
1246	1246
1247	1247	if (camel_stream_write (transport->ostream, cmdbuf, strlen (cmdbuf)) == -1) {
…	…
1259	1259	respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
1260	1260
1261		~~d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)")~~);
	1261	smtp_debug ("<- %s\n", respbuf ? respbuf : "(null)");
1262	1262
1263	1263	if (!respbuf \|\| strncmp (respbuf, "354", 3)) {
…	…
1321	1321	/* terminate the message body */
1322	1322
1323		~~d(fprintf (stderr, "sending : \\r\\n.\\r\\n\n")~~);
	1323	smtp_debug ("-> \\r\\n.\\r\\n\n");
1324	1324
1325	1325	if (camel_stream_write (transport->ostream, "\r\n.\r\n", 5) == -1) {
…	…
1338	1338	respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
1339	1339
1340		~~d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)")~~);
	1340	smtp_debug ("<- %s\n", respbuf ? respbuf : "(null)");
1341	1341
1342	1342	if (!respbuf \|\| strncmp (respbuf, "250", 3)) {
…	…
1359	1359	cmdbuf = g_strdup ("RSET\r\n");
1360	1360
1361		~~d(fprintf (stderr, "sending : %s", cmdbuf)~~);
	1361	smtp_debug ("-> %s", cmdbuf);
1362	1362
1363	1363	if (camel_stream_write (transport->ostream, cmdbuf, strlen (cmdbuf)) == -1) {
…	…
1377	1377	respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
1378	1378
1379		~~d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)")~~);
	1379	smtp_debug ("<- %s\n", respbuf ? respbuf : "(null)");
1380	1380
1381	1381	if (!respbuf \|\| strncmp (respbuf, "250", 3)) {
…	…
1398	1398	cmdbuf = g_strdup ("QUIT\r\n");
1399	1399
1400		~~d(fprintf (stderr, "sending : %s", cmdbuf)~~);
	1400	smtp_debug ("-> %s", cmdbuf);
1401	1401
1402	1402	if (camel_stream_write (transport->ostream, cmdbuf, strlen (cmdbuf)) == -1) {
…	…
1417	1417	respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport->istream));
1418	1418
1419		~~d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)")~~);
	1419	smtp_debug ("<- %s\n", respbuf ? respbuf : "(null)");
1420	1420
1421	1421	if (!respbuf \|\| strncmp (respbuf, "221", 3)) {

trunk/libtinymail-camel/camel-lite/camel/providers/smtp/camel-smtp-transport.h

r1943	r2198
28	28	#include "camel-transport.h"
29	29	#include "camel-tcp-stream.h"
	30
	31	#ifdef DEBUG
	32	#define SMTP_DEBUG 1
	33	#endif
	34
	35	#ifdef SMTP_DEBUG
	36	#define smtp_debug g_print
	37	#else
	38	#define smtp_debug(o, ...)
	39	#endif
30	40
31	41	#define CAMEL_SMTP_TRANSPORT_TYPE (camel_smtp_transport_get_type ())

trunk/libtinymail-camel/tny-camel-send-queue.c

r2194	r2198
58	58	ErrorInfo *info = data;
59	59	g_signal_emit (info->self, tny_send_queue_signals [TNY_SEND_QUEUE_ERROR_HAPPENED],
60		~~0, info->msg, info->error, info->i, info->total~~);
	60	2, info->msg, info->error);
61	61	return FALSE;
62	62	}

trunk/libtinymail-camel/tny-camel-transport-account.c

r2194	r2198
241	241	g_static_rec_mutex_unlock (apriv->service_lock);
242	242
243		~~header = tny_msg_get_header (msg);~~
	243	/header = tny_msg_get_header (msg); /
244	244	message = _tny_camel_msg_get_camel_mime_message (TNY_CAMEL_MSG (msg));
245		from = camel_internet_address_new ();
246		recipients = camel_internet_address_new ();
247
	245	/* from = camel_internet_address_new (); */
	246	from = camel_mime_message_get_from (message);
	247
	248	/*
248	249	str = tny_header_get_from (header);
249		if(str)
250		{
251		_foreach_email_add_to_inet_addr (str, from);
252		~~camel_mime_message_set_from(message,~~from);
253		}
	250	if(str)
	251	{
	252	_foreach_email_add_to_inet_addr (str, from);
	253	camel_mime_message_set_from (message, from);
	254	}
254	255
255	256	str = tny_header_get_to (header);
256		if(str)
257		{
258		_foreach_email_add_to_inet_addr (str, recipients);
259		camel_mime_message_set_recipients(message,CAMEL_RECIPIENT_TYPE_TO,recipients);
260		}
261
	257	if(str)
	258	{
	259	recipients = camel_internet_address_new ();
	260	_foreach_email_add_to_inet_addr (str, recipients);
	261	camel_mime_message_set_recipients (message, CAMEL_RECIPIENT_TYPE_TO, recipients);
	262	g_object_unref (recipients);
	263	}
	264
262	265
263	266	str = tny_header_get_cc (header);
264		if(str)
265		{
266		_foreach_email_add_to_inet_addr (str, recipients);
267		camel_mime_message_set_recipients(message,CAMEL_RECIPIENT_TYPE_CC,recipients);
268		}
269
	267	if(str)
	268	{
	269	recipients = camel_internet_address_new ();
	270	_foreach_email_add_to_inet_addr (str, recipients);
	271	camel_mime_message_set_recipients (message, CAMEL_RECIPIENT_TYPE_CC, recipients);
	272	g_object_unref (recipients);
	273	}
	274
270	275
271	276	str = tny_header_get_bcc (header);
272		if(str)
273		{
274		_foreach_email_add_to_inet_addr (str, recipients);
275		camel_mime_message_set_recipients(message,CAMEL_RECIPIENT_TYPE_BCC,recipients);
276		}
277
278
279		str = tny_header_get_subject (header);
280		if(str)
281		camel_mime_message_set_subject(message,str);
282
	277	if(str)
	278	{
	279	recipients = camel_internet_address_new ();
	280	_foreach_email_add_to_inet_addr (str, recipients);
	281	camel_mime_message_set_recipients(message, CAMEL_RECIPIENT_TYPE_BCC, recipients);
	282	g_object_unref (recipients);
	283	}
	284
	285
	286	str = tny_header_get_subject (header);
	287	if(str)
	288	camel_mime_message_set_subject(message,str);
	289	*/
283	290
284	291	apriv->connected = TRUE;
285	292
	293	recipients = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO);
286	294	camel_transport_send_to (transport, message, (CamelAddress*)from,
287	295	(CamelAddress*)recipients, &ex);
…	…
307	315	}
308	316
309		camel_object_unref (CAMEL_OBJECT (from));
310		camel_object_unref (CAMEL_OBJECT (recipients));
311		g_object_unref (G_OBJECT (header));
	317	/g_object_unref (G_OBJECT (header));/
312	318
313	319	return;

trunk/libtinymail/.svnignore

r307 r2198

1 tny-signals-marshal.c
2 tny-signals-marshal.h
1 3 Makefile.in
2 4 config.h

trunk/libtinymail/Makefile.am

r1890	r2198
3	3	lib_LTLIBRARIES = libtinymail-1.0.la
4	4
	5	tny-signals-marshal.h: tny-signals-marshal.list
	6	glib-genmarshal --header --prefix=$(subst -,_,tny)_marshal $< > tny-signals-marshal.h
	7
	8	tny-signals-marshal.c: tny-signals-marshal.list tny-signals-marshal.h
	9	glib-genmarshal --body --prefix=$(subst -,_,tny)_marshal $< > tny-signals-marshal.c
	10	sed -i "1i#include \"tny-signals-marshal.h\"" tny-signals-marshal.c
	11
	12	CLEANFILES=tny-signals-marshal.c tny-signals-marshal.h
	13
5	14	private_headers = tny-common-priv.h
6	15
7	16	libtinymail_1_0_headers = \
	17	tny-signals-marshal.h \
8	18	tny-shared.h \
9	19	tny-error.h \
…	…
43	53	libtinymail_1_0_la_SOURCES = \
44	54	$(libtinymail_1_0_headers) \
	55	tny-signals-marshal.c \
45	56	tny-error.c \
46	57	tny-status.c \

trunk/libtinymail/tny-send-queue.c

r1856	r2198
146	146	* @self: the object on which the signal is emitted
147	147	* @arg1: The message that got sent
148		* @arg2: The current nth number of the message that got sent
149		* @arg3: The total amount of messages currently being processed
150		*
151		* API WARNING: This API might change
	148	* @arg4: user data
152	149	*
153	150	* Emitted when a message got sent
…	…
160	157	NULL, NULL,
161	158	g_cclosure_marshal_VOID__POINTER,
162		G_TYPE_NONE, ~~3, TNY_TYPE_MSG, G_TYPE_UINT, G_TYPE_UINT~~);
	159	G_TYPE_NONE, 1, TNY_TYPE_MSG);
163	160
164	161	/**
…	…
167	164	* @arg1: The message that was supposed to be sent or NULL
168	165	* @arg2: a GError containing the error that happened
169		* @arg3: The current nth number of the message that was supposed to be sent
170		* @arg4: The total amount of messages currently being processed
171		*
172		* API WARNING: This API might change
	166	* @arg5: user data
	167	*
173	168	*
174	169	* Emitted when a message didn't get sent because of an error
…	…
180	175	G_STRUCT_OFFSET (TnySendQueueIface, error_happened),
181	176	NULL, NULL,
182		~~g_cclosure_marshal_VOID_~~_POINTER,
183		G_TYPE_NONE, ~~3, TNY_TYPE_MSG, G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_UINT~~);
	177	tny_marshal_VOID__POINTER_POINTER,
	178	G_TYPE_NONE, 2, TNY_TYPE_MSG, G_TYPE_POINTER);
184	179
185	180	initialized = TRUE;

trunk/libtinymail/tny-send-queue.h

r1579	r2198
54	54
55	55	/* Signals */
56		void (msg_sent) (TnySendQueue self, TnyMsg *msg, guint nth, guint total);
57		void (error_happened) (TnySendQueue self, TnyMsg *msg, ~~guint nth, guint total~~);
	56	void (msg_sent) (TnySendQueue self, TnyMsg *msg, guint nth, guint total, gpointer user_data);
	57	void (error_happened) (TnySendQueue self, TnyMsg msg, GError err, guint nth, guint total, gpointer user_data);
58	58
59	59	/* methods */

trunk/tests/c-demo/tny-demoui-summary-view.c

r2173	r2198
193	193
194	194	static void
	195	on_send_queue_error_happened (TnySendQueue self, TnyMsg msg, GError *err, guint nth, guint total, gpointer user_data)
	196	{
	197	GtkWidget *dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
	198	GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, err->message);
	199	gtk_dialog_run (GTK_DIALOG (dialog));
	200	gtk_widget_destroy (dialog);
	201
	202	return;
	203	}
	204
	205	static void
195	206	reload_accounts (TnyDemouiSummaryViewPriv *priv)
196	207	{
…	…
249	260	g_object_unref (priv->send_queue);
250	261	priv->send_queue = tny_camel_send_queue_new ((TnyCamelTransportAccount *) tacc);
	262	g_signal_connect (G_OBJECT (priv->send_queue), "error-happened",
	263	G_CALLBACK (on_send_queue_error_happened), priv);
251	264	g_object_unref (tacc);
252	265	g_object_unref (iter);
…	…
487	500
488	501	tny_header_set_to (nheader, to);
489		tny_header_set_to (nheader, from);
	502	tny_header_set_from (nheader, from);
490	503
491	504	g_object_unref (nheader);

r307	r2198
	1	tny-signals-marshal.c
	2	tny-signals-marshal.h
1	3	Makefile.in
2	4	config.h

Changeset Navigation

Changeset 2198

Legend:

Download in other formats: