← Back to branch summary

~ubuntu-branches/ubuntu/lucid/xscreensaver/lucid

« back to all changes in this revision

Viewing changes to utils/visual.c

  • Committer: Bazaar Package Importer
  • Author(s): Oliver Grawert
  • Date: 2007-12-06 09:53:12 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20071206095312-fkzcwe4vqm50z208
Tags: 5.04-1ubuntu1
* Merge from debian unstable, remaining changes:
  - split xscreensaver into xscreensaver, xscreensaver-data (hacks we ship),
    xscreensaver-data-extra (hacks in universe). split out gl hacks for
    universe to xscreensaver-gl-extra
  - use fridge for rss screensavers
  - create and install .desktop files for gnome-screensaver

Show diffs side-by-side

added added

removed removed

Lines of Context:
utils/visual.c
1
 
/* xscreensaver, Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2003
 
1
/* xscreensaver, Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2003, 2006
 
2
 * 
2
3
 * 
3
4
 *  by Jamie Zawinski <jwz@jwz.org>
4
5
 *
161
162
get_visual_resource (Screen *screen, char *name, char *class,
162
163
                     Bool prefer_writable_cells)
163
164
{
164
 
  char *string = get_string_resource (name, class);
 
165
  char *string = get_string_resource (DisplayOfScreen (screen), name, class);
165
166
  Visual *v = get_visual (screen, string, prefer_writable_cells, True);
166
167
  if (string)
167
168
    free(string);