Merge remote-tracking branch 'upstream/next' into wayland

This commit is contained in:
lbonn
2024-11-06 18:51:32 +01:00
41 changed files with 1600 additions and 1251 deletions

View File

@@ -59,6 +59,12 @@ int rofi_is_in_dmenu_mode = 0;
ThemeWidget *rofi_configuration = NULL;
void rofi_timings_tick(G_GNUC_UNUSED const char *file,
G_GNUC_UNUSED char const *str, G_GNUC_UNUSED int line,
G_GNUC_UNUSED char const *msg);
void rofi_timings_tick(G_GNUC_UNUSED const char *file,
G_GNUC_UNUSED char const *str, G_GNUC_UNUSED int line,
G_GNUC_UNUSED char const *msg) {}
uint32_t rofi_icon_fetcher_query(G_GNUC_UNUSED const char *name,
G_GNUC_UNUSED const int size) {
return 0;

View File

@@ -26,6 +26,7 @@
*/
#include "display.h"
#include "glibconfig.h"
#include "rofi-icon-fetcher.h"
#include "rofi.h"
#include "xrmoptions.h"
@@ -57,6 +58,12 @@ uint32_t rofi_icon_fetcher_query_advanced(G_GNUC_UNUSED const char *name,
G_GNUC_UNUSED const int hsize) {
return 0;
}
void rofi_timings_tick(G_GNUC_UNUSED const char *file,
G_GNUC_UNUSED char const *str, G_GNUC_UNUSED int line,
G_GNUC_UNUSED char const *msg);
void rofi_timings_tick(G_GNUC_UNUSED const char *file,
G_GNUC_UNUSED char const *str, G_GNUC_UNUSED int line,
G_GNUC_UNUSED char const *msg) {}
cairo_surface_t *rofi_icon_fetcher_get(G_GNUC_UNUSED const uint32_t uid) {
return NULL;