← Back to branch summary

~ubuntu-branches/ubuntu/maverick/telepathy-salut/maverick

« back to all changes in this revision

Viewing changes to lib/gibber/gibber-fd-transport.c

  • Committer: Bazaar Package Importer
  • Author(s): Simon McVittie
  • Date: 2009-09-10 10:50:03 UTC
  • mfrom: (1.3.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090910105003-0kn45hhoocf4m37i
* New upstream release
* Bump build-dependency versions to Python 2.5 and telepathy-glib 0.7.36
* Standards-Version: 3.8.3 (no changes)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/gibber/gibber-fd-transport.c
100
100
 
101
101
static void gibber_fd_transport_dispose (GObject *object);
102
102
static void gibber_fd_transport_finalize (GObject *object);
103
 
static GibberFdIOResult gibber_fd_transport_read (GibberFdTransport *transport,
104
 
    GIOChannel *channel, GError **error);
105
103
static GibberFdIOResult gibber_fd_transport_write (
106
104
   GibberFdTransport *fd_transport, GIOChannel *channel, const guint8 *data,
107
105
   int len, gsize *written, GError **error);
386
384
 
387
385
#define BUFSIZE 1024
388
386
 
389
 
static GibberFdIOResult
 
387
GibberFdIOResult
390
388
gibber_fd_transport_read (GibberFdTransport *transport,
391
389
    GIOChannel *channel, GError **error)
392
390
{
519
517
  else if (!block && priv->watch_in == 0)
520
518
    {
521
519
      DEBUG ("unblock receiving from the transport");
522
 
      priv->watch_in = g_io_add_watch (priv->channel, G_IO_IN,
523
 
          _channel_io_in, self);
 
520
      if (priv->channel != NULL)
 
521
        {
 
522
          priv->watch_in = g_io_add_watch (priv->channel, G_IO_IN,
 
523
              _channel_io_in, self);
 
524
        }
 
525
      /* else the transport isn't connected yet */
524
526
    }
525
527
 
526
528
  priv->receiving_blocked = block;