← Back to branch summary

~ubuntu-branches/ubuntu/maverick/dbus/maverick-proposed

« back to all changes in this revision

Viewing changes to dbus/dbus-watch.c

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-09-27 13:06:32 UTC
  • mfrom: (1.1.23 upstream)
  • Revision ID: james.westby@ubuntu.com-20100927130632-bqs145trvchd2lmf
Tags: 1.4.0-0ubuntu1
* New upstream release
 - Fixes https://bugs.freedesktop.org/show_bug.cgi?id=17754 Race condition in protected_change_timeout
 - Requested by various upstream KDE developers http://lists.kde.org/?t=128514970000004&r=1&w=2

Show diffs side-by-side

added added

removed removed

Lines of Context:
dbus/dbus-watch.c
21
21
 *
22
22
 */
23
23
 
 
24
#include <config.h>
24
25
#include "dbus-internals.h"
25
26
#include "dbus-watch.h"
26
27
#include "dbus-list.h"
522
523
#ifdef DBUS_UNIX
523
524
  return watch->fd;
524
525
#else
525
 
  return -1;
 
526
  return dbus_watch_get_socket( watch );
526
527
#endif
527
528
}
528
529
 
649
650
#ifndef DBUS_DISABLE_CHECKS
650
651
  if (watch->fd < 0 || watch->flags == 0)
651
652
    {
652
 
      _dbus_warn_check_failed ("%s: Watch is invalid, it should have been removed\n",
653
 
                               _DBUS_FUNCTION_NAME);
 
653
      _dbus_warn_check_failed ("Watch is invalid, it should have been removed\n");
654
654
      return TRUE;
655
655
    }
656
656
#endif