]> git.mdlowis.com Git - proto/labwc.git/commitdiff
desktop-entry.c: don't demote error messages with LABWC_DEBUG_LIBSFDO
authorConsolatis <35009135+Consolatis@users.noreply.github.com>
Wed, 8 Oct 2025 17:47:57 +0000 (19:47 +0200)
committerJohan Malm <johanmalm@users.noreply.github.com>
Wed, 8 Oct 2025 19:23:12 +0000 (20:23 +0100)
Also add additional logging to tell users how to get
more information about failures to load the icon theme.

src/desktop-entry.c

index 4d61a9dca203162097ef938f9482d5b7b597b21a..79b015f2c7fbc75357ff5b802078de4a4937fd54 100644 (file)
@@ -37,9 +37,10 @@ log_handler(enum sfdo_log_level level, const char *fmt, va_list args, void *tag)
 
        /*
         * To avoid logging issues with .desktop files as errors, all libsfdo
-        * error-logging is demoted to info level.
+        * error-logging is demoted to info level unless running with
+        * LABWC_DEBUG_LIBSFDO.
         */
-       if (level == SFDO_LOG_LEVEL_ERROR) {
+       if (!debug_libsfdo && level == SFDO_LOG_LEVEL_ERROR) {
                level = SFDO_LOG_LEVEL_INFO;
        }
 
@@ -117,6 +118,12 @@ desktop_entry_init(struct server *server)
                 */
                wlr_log(WLR_ERROR, "Failed to load icon theme %s, falling back to 'hicolor'",
                        rc.icon_theme_name);
+
+               if (!debug_libsfdo) {
+                       wlr_log(WLR_ERROR, "Further information is available by setting "
+                               "the LABWC_DEBUG_LIBSFDO=1 env var before starting labwc");
+               }
+
                sfdo->icon_theme = sfdo_icon_theme_load(
                        sfdo->icon_ctx, "hicolor", load_options);
        }
@@ -141,6 +148,10 @@ err_desktop_ctx:
 err_basedir_ctx:
        free(sfdo);
        wlr_log(WLR_ERROR, "Failed to initialize icon loader");
+       if (!debug_libsfdo) {
+               wlr_log(WLR_ERROR, "Further information is available by setting "
+                       "the LABWC_DEBUG_LIBSFDO=1 env var before starting labwc");
+       }
 }
 
 void