mirror of
https://github.com/swaywm/sway.git
synced 2026-04-18 06:46:56 -04:00
Remove conditionals and old code for locating and loading icons
With libsfdo a hard dependency we can locate and load icons always, regardless of whether we have tray or not. Old locating and loading code can also be removed.
This commit is contained in:
parent
0872673472
commit
6d7c0d52d6
10 changed files with 7 additions and 134 deletions
|
|
@ -8,9 +8,7 @@
|
|||
#include "util.h"
|
||||
#include <pango/pangocairo.h>
|
||||
|
||||
#if HAVE_LIBSFDO
|
||||
#include "sfdo.h"
|
||||
#endif
|
||||
|
||||
struct box_colors {
|
||||
uint32_t border;
|
||||
|
|
@ -77,9 +75,7 @@ struct swaybar_config {
|
|||
struct box_colors binding_mode;
|
||||
} colors;
|
||||
|
||||
#if HAVE_TRAY || HAVE_LIBSFDO
|
||||
char *icon_theme;
|
||||
#endif
|
||||
|
||||
#if HAVE_TRAY
|
||||
struct wl_list tray_bindings; // struct tray_binding::link
|
||||
|
|
@ -88,9 +84,7 @@ struct swaybar_config {
|
|||
int tray_padding;
|
||||
#endif
|
||||
|
||||
#if HAVE_LIBSFDO
|
||||
struct sfdo *sfdo;
|
||||
#endif
|
||||
};
|
||||
|
||||
#if HAVE_TRAY
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue