~ubuntu-branches/ubuntu/hardy/texmacs/hardy

« back to all changes in this revision

Viewing changes to src/System/Files/image_files.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Michele Angrisano
  • Date: 2007-06-12 12:50:14 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20070612125014-qifjye1qab4l42gx
Tags: 1:1.0.6.10-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - debian/patches/11-desktop-file.dpatch
    Fix category in desktop file
  - Update maintainer in field debian/control.

Show diffs side-by-side

added added

removed removed

Lines of Context:
32
32
tree
33
33
xpm_load (url u) {
34
34
  string s;
35
 
  load_string ("$TEXMACS_PIXMAPS_PATH" * u, s);
 
35
  load_string ("$TEXMACS_PIXMAP_PATH" * u, s);
36
36
  if (s == "") load_string ("$TEXMACS_PATH/misc/pixmaps/TeXmacs.xpm", s);
37
37
 
38
38
  int i, j;