~ubuntu-branches/ubuntu/trusty/grub2/trusty-updates

« back to all changes in this revision

Viewing changes to grub-core/gfxmenu/theme_loader.c

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2012-09-13 18:02:04 UTC
  • mfrom: (1.17.15 upstream)
  • mto: (17.6.27 experimental)
  • mto: This revision was merged to the branch mainline in revision 145.
  • Revision ID: package-import@ubuntu.com-20120913180204-mojnmocbimlom4im
Tags: upstream-2.00
ImportĀ upstreamĀ versionĀ 2.00

Show diffs side-by-side

added added

removed removed

Lines of Context:
135
135
        return grub_errno;
136
136
    }
137
137
  else if (! grub_strcmp ("title-color", name))
138
 
    grub_gui_parse_color (value, &view->title_color);
 
138
    grub_video_parse_color (value, &view->title_color);
139
139
  else if (! grub_strcmp ("message-color", name))
140
 
    grub_gui_parse_color (value, &view->message_color);
 
140
    grub_video_parse_color (value, &view->message_color);
141
141
  else if (! grub_strcmp ("message-bg-color", name))
142
 
    grub_gui_parse_color (value, &view->message_bg_color);
 
142
    grub_video_parse_color (value, &view->message_bg_color);
143
143
  else if (! grub_strcmp ("desktop-image", name))
144
144
    {
145
145
      struct grub_video_bitmap *raw_bitmap;
170
170
      view->desktop_image = scaled_bitmap;
171
171
    }
172
172
  else if (! grub_strcmp ("desktop-color", name))
173
 
     grub_gui_parse_color (value, &view->desktop_color);
 
173
     grub_video_parse_color (value, &view->desktop_color);
174
174
  else if (! grub_strcmp ("terminal-box", name))
175
175
    {
176
176
        grub_err_t err;