Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 72589 | Differences between
and this patch

Collapse All | Expand All

(-)xloadimage.4.1.orig/xloadimage.c (-12 / +12 lines)
Lines 236-253 Link Here
236
    exit(0);
236
    exit(0);
237
  }
237
  }
238
238
239
  /* start talking to the display
240
   */
241
242
  opt= getOption(global_options, DISPLAY);
243
  dname= (opt ? opt->info.display : NULL);
244
  if (! (Disp= disp= XOpenDisplay(dname))) {
245
    printf("%s: Cannot open display\n", XDisplayName(dname));
246
    exit(1);
247
  }
248
  Scrn= scrn= DefaultScreen(disp);
249
  XSetErrorHandler(errorHandler);
250
251
  /* background ourselves if the user asked us to
239
  /* background ourselves if the user asked us to
252
   */
240
   */
253
241
Lines 264-269 Link Here
264
    }
252
    }
265
#endif /* !NO_FORK */
253
#endif /* !NO_FORK */
266
254
255
  /* start talking to the display
256
   */
257
258
  opt= getOption(global_options, DISPLAY);
259
  dname= (opt ? opt->info.display : NULL);
260
  if (! (Disp= disp= XOpenDisplay(dname))) {
261
    printf("%s: Cannot open display\n", XDisplayName(dname));
262
    exit(1);
263
  }
264
  Scrn= scrn= DefaultScreen(disp);
265
  XSetErrorHandler(errorHandler);
266
267
  dispimage= NULL;
267
  dispimage= NULL;
268
268
269
  onroot= (getOption(global_options, ONROOT) != NULL);
269
  onroot= (getOption(global_options, ONROOT) != NULL);

Return to bug 72589