← Back to branch summary

~ubuntu-branches/ubuntu/karmic/xscreensaver/karmic

« back to all changes in this revision

Viewing changes to driver/xscreensaver-getimage.c

  • Committer: Bazaar Package Importer
  • Author(s): Ralf Hildebrandt
  • Date: 2006-07-29 23:00:43 UTC
  • mfrom: (1.1.3 upstream)
  • mto: This revision was merged to the branch mainline in revision 15.
  • Revision ID: james.westby@ubuntu.com-20060729230043-3ergkicskbntet5n
Tags: 4.24-5
http://bugs.debian.org/380394
remove /usr/doc/xscreensaver link to finish /usr/doc ->
/usr/share/doc transition (closes: #380394)

Show diffs side-by-side

added added

removed removed

Lines of Context:
driver/xscreensaver-getimage.c
136
136
  return 0;
137
137
}
138
138
 
 
139
#ifndef USE_EXTERNAL_SCREEN_GRABBER
139
140
static int
140
141
ignore_badmatch_ehandler (Display *dpy, XErrorEvent *error)
141
142
{
144
145
  else
145
146
    return x_ehandler (dpy, error);
146
147
}
 
148
#endif /* ! USE_EXTERNAL_SCREEN_GRABBER */
147
149
 
148
150
 
149
151
/* Returns True if the given Drawable is a Window; False if it's a Pixmap.
295
297
   If out of memory, returns False, and the XImage will have been
296
298
   destroyed and freed.
297
299
 */
 
300
#ifndef USE_EXTERNAL_SCREEN_GRABBER
298
301
static Bool
299
302
scale_ximage (Screen *screen, Visual *visual,
300
303
              XImage *ximage, int new_width, int new_height)
342
345
 
343
346
  return True;
344
347
}
 
348
#endif /* ! USE_EXTERNAL_SCREEN_GRABBER */
345
349
 
346
350
 
347
351
#ifdef HAVE_GDK_PIXBUF
1197
1201
 
1198
1202
        close (out);  /* don't need this one */
1199
1203
        *buf = 0;
1200
 
        fgets (buf, sizeof(buf)-1, f);
 
1204
        if (! fgets (buf, sizeof(buf)-1, f))
 
1205
          *buf = 0;
1201
1206
        fclose (f);
1202
1207
 
1203
1208
        /* Wait for the child to die. */