← Back to branch summary

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

« back to all changes in this revision

Viewing changes to camel/camel-net-utils.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-net-utils.c
482
482
                polls[1].fd = cancel_fd;
483
483
                polls[1].events = G_IO_IN;
484
484
 
485
 
                d(printf("waiting for name return/cancellation in main process\n"));
 
485
                d (printf ("waiting for name return/cancellation in main process\n"));
486
486
                do {
487
487
                        polls[0].revents = 0;
488
488
                        polls[1].revents = 0;
524
524
 
525
525
                        /* We cancel so if the thread impl is decent it causes immediate exit.
526
526
                         * We check the reply port incase we had a reply in the mean time, which we free later */
527
 
                        d(printf("Canceling lookup thread and leaving it\n"));
 
527
                        d (printf ("Canceling lookup thread and leaving it\n"));
528
528
                        msg->cancelled = 1;
529
529
                        g_thread_join (thread);
530
530
                        cancel = 1;
531
531
                } else {
532
532
                        struct _addrinfo_msg *reply;
533
533
 
534
 
                        d(printf("waiting for child to exit\n"));
 
534
                        d (printf ("waiting for child to exit\n"));
535
535
                        g_thread_join (thread);
536
 
                        d(printf("child done\n"));
 
536
                        d (printf ("child done\n"));
537
537
 
538
538
                        reply = (struct _addrinfo_msg *) camel_msgport_try_pop (reply_port);
539
539
                        if (reply != msg)
665
665
         * Use the port as the service name directly. */
666
666
        if (info->result && info->service) {
667
667
                if (strcmp (info->service, "http") == 0)
668
 
                        info->result = getaddrinfo(info->name, "80", info->hints, info->res);
 
668
                        info->result = getaddrinfo (info->name, "80", info->hints, info->res);
669
669
                else if (strcmp (info->service, "https") == 0)
670
 
                        info->result = getaddrinfo(info->name, "443", info->hints, info->res);
 
670
                        info->result = getaddrinfo (info->name, "443", info->hints, info->res);
671
671
        }
672
672
 
673
673
        if (!info->cancelled)
800
800
                        guchar *in = (guchar *) &sin->sin_addr;
801
801
 
802
802
                        /* sin_addr is always network order which is big-endian */
803
 
                        msg->host = g_strdup_printf("%u.%u.%u.%u", in[0], in[1], in[2], in[3]);
 
803
                        msg->host = g_strdup_printf ("%u.%u.%u.%u", in[0], in[1], in[2], in[3]);
804
804
                }
805
805
        }
806
806
 
807
807
        /* we never actually use this anyway */
808
808
        if (msg->serv)
809
 
                sprintf(msg->serv, "%d", sin->sin_port);
 
809
                sprintf (msg->serv, "%d", sin->sin_port);
810
810
 
811
811
        if (!msg->cancelled)
812
812
                camel_msgport_reply ((CamelMsg *) msg);