← Back to branch summary

~ubuntu-branches/debian/sid/feh/sid

« back to all changes in this revision

Viewing changes to src/main.c

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Tille
  • Date: 2011-10-11 14:44:42 UTC
  • mfrom: (1.3.16 upstream)
  • Revision ID: james.westby@ubuntu.com-20111011144442-ekq8fa2huypnswm3
Tags: 2.0-1
http://bugs.debian.org/475481
New upstream version
Closes: #475481

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main.c
47
47
        if (opt.display) {
48
48
                init_x_and_imlib();
49
49
                init_keyevents();
 
50
                init_buttonbindings();
50
51
        }
51
52
 
52
53
        feh_event_init();
66
67
        else if (opt.thumbs)
67
68
                init_thumbnail_mode();
68
69
        else if (opt.bgmode) {
69
 
                feh_wm_set_bg_file(opt.output_file, opt.bgmode);
 
70
                feh_wm_set_bg_filelist(opt.bgmode);
70
71
                exit(0);
71
72
        }
72
73
        else {