← Back to branch summary

~ubuntu-branches/ubuntu/saucy/evolution-data-server/saucy

« back to all changes in this revision

Viewing changes to camel/camel-imapx-command.c

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-10-08 12:58:16 UTC
  • mfrom: (181.1.7 quantal)
  • Revision ID: package-import@ubuntu.com-20121008125816-i3n76e8c0m64e7xp
Tags: 3.6.0-0ubuntu2
https://launchpad.net/bugs/1038047
https://launchpad.net/bugs/1038047
* Fix LP: #1038047 part 1 - Don't abort in e_source_registry_new* when a
  problem occurs connecting to the Dbus service
  - add debian/patches/dont-abort-in-e_source_registry_new.patch
  - update debian/patches/series
* Fix LP: #1038047 part 2 - libedataserver depends on
  evolution-data-server-common to ensure that the GSettings schemas are
  present
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
camel/camel-imapx-command.c
261
261
 
262
262
        g_return_if_fail (CAMEL_IS_IMAPX_COMMAND (ic));
263
263
 
264
 
        c(ic->is->tagprefix, "adding command, format = '%s'\n", format);
 
264
        c (ic->is->tagprefix, "adding command, format = '%s'\n", format);
265
265
 
266
266
        buffer = ((CamelIMAPXRealCommand *) ic)->buffer;
267
267
 
311
311
                                break;
312
312
                        case 'S': /* stream */
313
313
                                S = va_arg (ap, CamelStream *);
314
 
                                c(ic->is->tagprefix, "got stream '%p'\n", S);
 
314
                                c (ic->is->tagprefix, "got stream '%p'\n", S);
315
315
                                camel_imapx_command_add_part (ic, CAMEL_IMAPX_COMMAND_STREAM, S);
316
316
                                break;
317
317
                        case 'D': /* datawrapper */
318
318
                                D = va_arg (ap, CamelDataWrapper *);
319
 
                                c(ic->is->tagprefix, "got data wrapper '%p'\n", D);
 
319
                                c (ic->is->tagprefix, "got data wrapper '%p'\n", D);
320
320
                                camel_imapx_command_add_part (ic, CAMEL_IMAPX_COMMAND_DATAWRAPPER, D);
321
321
                                break;
322
322
                        case 'P': /* filename path */
323
323
                                P = va_arg (ap, gchar *);
324
 
                                c(ic->is->tagprefix, "got file path '%s'\n", P);
 
324
                                c (ic->is->tagprefix, "got file path '%s'\n", P);
325
325
                                camel_imapx_command_add_part (ic, CAMEL_IMAPX_COMMAND_FILE, P);
326
326
                                break;
327
327
                        case 't': /* token */
330
330
                                break;
331
331
                        case 's': /* simple string */
332
332
                                s = va_arg (ap, gchar *);
333
 
                                c(ic->is->tagprefix, "got string '%s'\n", g_str_has_prefix (format, "LOGIN") ? "***" : s);
 
333
                                c (ic->is->tagprefix, "got string '%s'\n", g_str_has_prefix (format, "LOGIN") ? "***" : s);
334
334
                        output_string:
335
335
                                if (s && *s) {
336
336
                                        guchar mask = imapx_is_mask (s);
366
366
                        case 'f': /* imap folder name */
367
367
                                folder = va_arg (ap, CamelFolder *);
368
368
                                full_name = camel_folder_get_full_name (folder);
369
 
                                c(ic->is->tagprefix, "got folder '%s'\n", full_name);
 
369
                                c (ic->is->tagprefix, "got folder '%s'\n", full_name);
370
370
                                parent_store = camel_folder_get_parent_store (folder);
371
371
                                fname = camel_imapx_store_summary_full_from_path (((CamelIMAPXStore *) parent_store)->summary, full_name);
372
372
                                if (fname) {
396
396
                        case 'u':
397
397
                                if (llong == 1) {
398
398
                                        l = va_arg (ap, glong);
399
 
                                        c(ic->is->tagprefix, "got glong '%d'\n", (gint)l);
 
399
                                        c (ic->is->tagprefix, "got glong '%d'\n", (gint) l);
400
400
                                        memcpy (literal_format, start, p - start);
401
401
                                        literal_format[p - start] = 0;
402
402
                                        g_string_append_printf (buffer, literal_format, l);
403
403
                                } else if (llong == 2) {
404
404
                                        guint64 i64 = va_arg (ap, guint64);
405
 
                                        c(ic->is->tagprefix, "got guint64 '%d'\n", (gint)i64);
 
405
                                        c (ic->is->tagprefix, "got guint64 '%d'\n", (gint) i64);
406
406
                                        memcpy (literal_format, start, p - start);
407
407
                                        literal_format[p - start] = 0;
408
408
                                        g_string_append_printf (buffer, literal_format, i64);
409
409
                                } else {
410
410
                                        d = va_arg (ap, gint);
411
 
                                        c(ic->is->tagprefix, "got gint '%d'\n", d);
 
411
                                        c (ic->is->tagprefix, "got gint '%d'\n", d);
412
412
                                        memcpy (literal_format, start, p - start);
413
413
                                        literal_format[p - start] = 0;
414
414
                                        g_string_append_printf (buffer, literal_format, d);
535
535
        buffer = ((CamelIMAPXRealCommand *) ic)->buffer;
536
536
 
537
537
        if (buffer->len > 5 && g_ascii_strncasecmp (buffer->str, "LOGIN", 5) == 0) {
538
 
                c(ic->is->tagprefix, "completing command buffer is [%d] 'LOGIN...'\n", (gint) buffer->len);
 
538
                c (ic->is->tagprefix, "completing command buffer is [%d] 'LOGIN...'\n", (gint) buffer->len);
539
539
        } else {
540
 
                c(ic->is->tagprefix, "completing command buffer is [%d] '%.*s'\n", (gint) buffer->len, (gint) buffer->len, buffer->str);
 
540
                c (ic->is->tagprefix, "completing command buffer is [%d] '%.*s'\n", (gint) buffer->len, (gint) buffer->len, buffer->str);
541
541
        }
542
542
        if (buffer->len > 0)
543
543
                camel_imapx_command_add_part (ic, CAMEL_IMAPX_COMMAND_SIMPLE, NULL);