Ticket #126: 0001-modules-use-dbus_watch_get_unix_fd-only-in-dbus.patch

File 0001-modules-use-dbus_watch_get_unix_fd-only-in-dbus.patch, 1.7 kB (added by elmarco, 1 year ago)

use dbus_watch_get_unix_fd() only in dbus >= 1.1.1

  • a/src/modules/dbus-util.c

    old new  
    9696    unsigned int flags = 0; 
    9797    DBusWatch *watch = userdata; 
    9898 
     99#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)  
    99100    pa_assert(fd == dbus_watch_get_unix_fd(watch)); 
     101#else 
     102    pa_assert(fd == dbus_watch_get_fd(watch)); 
     103#endif 
    100104 
    101105    if (!dbus_watch_get_enabled(watch)) { 
    102106        pa_log_warn("Asked to handle disabled watch: %p %i", (void*) watch, fd); 
    …… 
    137141    pa_assert(watch); 
    138142    pa_assert(c); 
    139143 
    140     ev = c->mainloop->io_new(c->mainloop, dbus_watch_get_unix_fd(watch), get_watch_flags(watch), handle_io_event, watch); 
     144    ev = c->mainloop->io_new(c->mainloop,  
     145#if (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MINOR == 1 && DBUS_VERSION_MICRO >= 1) || (DBUS_VERSION_MAJOR == 1 && DBUS_VERSION_MAJOR > 1) || (DBUS_VERSION_MAJOR > 1)  
     146                 dbus_watch_get_unix_fd(watch),  
     147#else 
     148                 dbus_watch_get_fd(watch),  
     149#endif 
     150                 get_watch_flags(watch), handle_io_event, watch); 
    141151 
    142152    dbus_watch_set_data(watch, ev, NULL); 
    143153