deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-17 03:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed the unresolved version-control conflict markers from create_icon_menu and kept the custom_alt_fallback_icon declaration intact so the later fallback icon assignments remain valid for compilation.

Browse Source
This commit is contained in:
deepend
2026-02-17 23:15:51 -07:00
parent 335a8f4d6b
commit b5db1685da
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/fe-gtk/menu.c
View File

@@ -2135,10 +2135,7 @@ create_icon_menu (char *labeltext, void *stock_name, int is_stock)
const char *theme_variant = "light"; const char *theme_variant = "light";
char *resource_path; char *resource_path;
const char *custom_fallback_icon = NULL; const char *custom_fallback_icon = NULL;
<<<<<<< ours
=======
const char *custom_alt_fallback_icon = NULL; const char *custom_alt_fallback_icon = NULL;
>>>>>>> theirs
GdkPixbuf *custom_pixbuf = NULL; GdkPixbuf *custom_pixbuf = NULL;
#endif #endif
#if !HAVE_GTK3 #if !HAVE_GTK3