diff options
author | Daniel Friesel <derf@finalrewind.org> | 2018-01-27 23:43:24 +0100 |
---|---|---|
committer | Daniel Friesel <derf@finalrewind.org> | 2018-01-27 23:43:24 +0100 |
commit | e04c0720e35885ecff7a540ae76620c3477471d8 (patch) | |
tree | 661e587526cde135a12af58c7435b8bdbc04b0a6 /src/collage.c | |
parent | 32653a52c15431e714358198b44d8bd6699c2367 (diff) | |
parent | 5dc0d6770bc46676b969b60cc81f8ee689aaf829 (diff) |
Merge branch 'ulteq-simplify-title-generation'
Diffstat (limited to 'src/collage.c')
-rw-r--r-- | src/collage.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/collage.c b/src/collage.c index b975136..431d3b6 100644 --- a/src/collage.c +++ b/src/collage.c @@ -41,7 +41,6 @@ void init_collage_mode(void) feh_file *file = NULL; unsigned char trans_bg = 0; gib_list *l, *last = NULL; - char *s; mode = "collage"; @@ -105,15 +104,9 @@ void init_collage_mode(void) gib_imlib_image_fill_rectangle(im_main, 0, 0, w, h, 0, 0, 0, 255); } - /* Create the title string */ - - if (!opt.title) - s = estrdup(PACKAGE " [collage mode]"); - else - s = estrdup(feh_printf(opt.title, NULL, NULL)); - if (opt.display) { - winwid = winwidget_create_from_image(im_main, s, WIN_TYPE_SINGLE); + winwid = winwidget_create_from_image(im_main, WIN_TYPE_SINGLE); + winwidget_rename(winwid, PACKAGE " [collage mode]"); winwidget_show(winwid); } @@ -210,7 +203,6 @@ void init_collage_mode(void) if (!opt.display) gib_imlib_free_image_and_decache(im_main); - free(s); return; } |