← Back to branch summary

~ubuntu-branches/ubuntu/hardy/pidgin/hardy

« back to all changes in this revision

Viewing changes to libpurple/dnsquery.c

  • Committer: Bazaar Package Importer
  • Author(s): Pedro Fragoso
  • Date: 2007-12-21 02:48:06 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20071221024806-pd44a5k9tiyh12mp
Tags: 1:2.3.1-2ubuntu1
https://launchpad.net/bugs/177811
* Sync with Debian, remaining Ubuntu changes; (LP: #177811)
  - Set Maintainer to Ubuntu Core Developers.
  - Add build-deps on liblaunchpad-integration-dev, intltool,
    libnm-glib-dev (for --enable-nm) (Ubuntu #112720).
  - Drop build-deps on libsilc-1.1-2-dev | libsilc-dev (>= 1.1.1) as 
    this library is in universe.
  - Drop the libpurple0 recommends on libpurple-bin.
  - Add a gaim transitionnal package for upgrades.
  - Ship compatibility symlinks via debian/gaim.links.
  - Pass --enable-nm to configure to enable NetworkManager support.
  - Pass --disable-silc to configure to disable silc support even if 
    it's installed in the build environment.
  - Add X-Ubuntu-Gettext-Domain to the desktop file and update the
    translation templates in common-install-impl::.
   - Update debian/prefs.xml to set the notify plugin prefs
    /plugins/gtk/X11/notify/* and set /pidgin/plugins/loaded to load 
    the notify plugin; Ubuntu: #13389.
  - Add LPI integration patch, 02_lpi.
  - Add patch 04_let_crasher_for_apport to stop catching the SIGSEGV signal
    and let apport handle it.
  - Add patch 05_default_to_irc_ubuntu_com to set the default IRC 
    server to irc.ubuntu.com.
  - Add autoconf patch, 70_autoconf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libpurple/dnsquery.c
346
346
        /* Create pipes for communicating with the child process */
347
347
        if (pipe(child_out) || pipe(child_in)) {
348
348
                purple_debug_error("dns",
349
 
                                   "Could not create pipes: %s\n", strerror(errno));
 
349
                                   "Could not create pipes: %s\n", g_strerror(errno));
350
350
                return NULL;
351
351
        }
352
352
 
374
374
        if (resolver->dns_pid == -1) {
375
375
                purple_debug_error("dns",
376
376
                                   "Could not create child process for DNS: %s\n",
377
 
                                   strerror(errno));
 
377
                                   g_strerror(errno));
378
378
                purple_dnsquery_resolver_destroy(resolver);
379
379
                return NULL;
380
380
        }
416
416
                return FALSE;
417
417
        } else if (pid < 0) {
418
418
                purple_debug_warning("dns", "Wait for DNS child %d failed: %s\n",
419
 
                                resolver->dns_pid, strerror(errno));
 
419
                                resolver->dns_pid, g_strerror(errno));
420
420
                purple_dnsquery_resolver_destroy(resolver);
421
421
                return FALSE;
422
422
        }
430
430
        rc = write(resolver->fd_in, &dns_params, sizeof(dns_params));
431
431
        if (rc < 0) {
432
432
                purple_debug_error("dns", "Unable to write to DNS child %d: %d\n",
433
 
                                resolver->dns_pid, strerror(errno));
 
433
                                resolver->dns_pid, g_strerror(errno));
434
434
                purple_dnsquery_resolver_destroy(resolver);
435
435
                return FALSE;
436
436
        }
571
571
                purple_dnsquery_resolved(query_data, hosts);
572
572
 
573
573
        } else if (rc == -1) {
574
 
                g_snprintf(message, sizeof(message), _("Error reading from resolver process:\n%s"), strerror(errno));
 
574
                g_snprintf(message, sizeof(message), _("Error reading from resolver process:\n%s"), g_strerror(errno));
575
575
                purple_dnsquery_failed(query_data, message);
576
576
 
577
577
        } else if (rc == 0) {