← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/gvfs/jaunty-updates

« back to all changes in this revision

Viewing changes to client/gvfsdaemondbus.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2009-03-02 18:10:40 UTC
  • mfrom: (1.1.37 upstream)
  • Revision ID: james.westby@ubuntu.com-20090302181040-bozliyntjtpd0ozp
Tags: 1.1.7-0ubuntu1
https://launchpad.net/bugs/208750
https://launchpad.net/bugs/317587
https://launchpad.net/bugs/286053
https://launchpad.net/bugs/269159
https://launchpad.net/bugs/332554
https://launchpad.net/bugs/264803
https://launchpad.net/bugs/333791
* New upstream version:
  - Fix build on some platforms
  - ftp: Fix short read errors (lp: #208750)
  - gphoto2: Make it work on iphone
  - sftp: Fix symlink creation
  - fuse: Better support of truncation, fixing OOo save (lp: #317587)
  - proxy monitors: Support mount operations, etc
  - gvfs-mount: add --device commandline support
  - sftp: Fix protocol bug that made some servers not work (lp: #286053)
  - general support for query_info over streams, implemented for smb, sftp
  - Initial support for .xdg-volume-info reading (lp: #269159)
  - fix trash crasher (lp: #332554)
  - use ssh config (lp: #264803)
* debian/patches/02_support_xdg_volume_info.patch:
  - the new version fixes this issue
* debian/patches/91_upstream_change_fix_trash_crasher.patch:
  - upstream change to fix a trash crasher (lp: #333791)
* debian/rules:
  - shlibs version update

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/gvfsdaemondbus.c
29
29
#include <unistd.h>
30
30
#include <stdio.h>
31
31
#include <errno.h>
32
 
#include <poll.h>
33
32
 
34
33
#include <glib/gi18n-lib.h>
35
34
 
301
300
  
302
301
  
303
302
  connection_data->extra_fd_source =
304
 
    __g_fd_source_new (connection_data->extra_fd, POLLIN|POLLERR, NULL);
 
303
    __g_fd_source_new (connection_data->extra_fd, G_IO_IN|G_IO_ERR, NULL);
305
304
  g_source_set_callback (connection_data->extra_fd_source,
306
305
                         (GSourceFunc)async_connection_accept_new_fd,
307
306
                         connection_data, NULL);
745
744
      sent_cancel = (cancel_fd == -1);
746
745
      while (!dbus_pending_call_get_completed (pending))
747
746
        {
748
 
          struct pollfd poll_fds[2];
 
747
          GPollFD poll_fds[2];
749
748
          int poll_ret;
750
749
          
751
750
          do
752
751
            {
753
 
              poll_fds[0].events = POLLIN;
 
752
              poll_fds[0].events = G_IO_IN;
754
753
              poll_fds[0].fd = dbus_fd;
755
 
              poll_fds[1].events = POLLIN;
 
754
              poll_fds[1].events = G_IO_IN;
756
755
              poll_fds[1].fd = cancel_fd;
757
 
              poll_ret = poll (poll_fds, sent_cancel?1:2, -1);
 
756
              poll_ret = g_poll (poll_fds, sent_cancel?1:2, -1);
758
757
            }
759
758
          while (poll_ret == -1 && errno == EINTR);
760
759