← Back to branch summary

~ubuntu-branches/ubuntu/trusty/me-tv/trusty

« back to all changes in this revision

Viewing changes to src/preferences_dialog.cc

  • Committer: Bazaar Package Importer
  • Author(s): Teis Dreijer
  • Date: 2010-02-14 11:29:00 UTC
  • mfrom: (1.1.11 upstream) (3.1.10 sid)
  • Revision ID: james.westby@ubuntu.com-20100214112900-krutrmpz248vz1ji
Tags: 1.1.6-2
http://bugs.debian.org/568782
* Updated debian/control
  - Removed libgnomem-2.6-dev and libgnomeuimm-2.6-dev
    from Build-Depends (Closes: #568782)
  - Added libgconfmm-2.6-dev to Build-Depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/preferences_dialog.cc
83
83
        combo_box_entry_preferred_language->append_text("fre");
84
84
 
85
85
        combo_box_entry_xine_video_driver->clear_items();
86
 
        combo_box_entry_xine_video_driver->append_text("dxr3");
87
86
        combo_box_entry_xine_video_driver->append_text("aadxr3");
88
 
        combo_box_entry_xine_video_driver->append_text("xv");
89
 
        combo_box_entry_xine_video_driver->append_text("XDirectFB");
90
87
        combo_box_entry_xine_video_driver->append_text("DirectFB");
 
88
        combo_box_entry_xine_video_driver->append_text("dxr3");
 
89
        combo_box_entry_xine_video_driver->append_text("fb");
 
90
        combo_box_entry_xine_video_driver->append_text("none");
 
91
        combo_box_entry_xine_video_driver->append_text("opengl");
 
92
        combo_box_entry_xine_video_driver->append_text("sdl");
91
93
        combo_box_entry_xine_video_driver->append_text("SyncFB");
92
 
        combo_box_entry_xine_video_driver->append_text("opengl");
 
94
        combo_box_entry_xine_video_driver->append_text("vdpau");
 
95
        combo_box_entry_xine_video_driver->append_text("XDirectFB");
93
96
        combo_box_entry_xine_video_driver->append_text("xshm");
94
 
        combo_box_entry_xine_video_driver->append_text("none");
 
97
        combo_box_entry_xine_video_driver->append_text("xv");
 
98
        combo_box_entry_xine_video_driver->append_text("xvmc");
95
99
        combo_box_entry_xine_video_driver->append_text("xxmc");
96
 
        combo_box_entry_xine_video_driver->append_text("sdl");
97
 
        combo_box_entry_xine_video_driver->append_text("fb");
98
 
        combo_box_entry_xine_video_driver->append_text("xvmc");
99
100
 
100
101
        combo_box_entry_xine_audio_driver->clear_items();
101
102
        combo_box_entry_xine_audio_driver->append_text("null");