nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-29 19:30:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

gnome-shell: refresh icons after profile switches (#561029)

Browse Source
This commit is contained in:
Jan Tojnar
2026-09-27 14:16:08 +00:00
committed by GitHub
parent c04bfcc043 0658011fdb
commit b5812ab110
2 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
pkgs/by-name/gn/gnome-shell/icon-theme-directory-identity.patch Normal file
View File

@@ -0,0 +1,44 @@
diff --git a/src/st/st-icon-theme.c b/src/st/st-icon-theme.c
--- a/src/st/st-icon-theme.c
+++ b/src/st/st-icon-theme.c
@@ -220,6 +220,8 @@ typedef struct
{
char *dir;
time_t mtime;
+ dev_t device;
+ ino_t inode;
StIconCache *cache;
gboolean exists;
} IconThemeDirMtime;
@@ -792,6 +794,8 @@ insert_theme (StIconTheme *icon_theme,
dir_mtime->dir = path;
if (g_stat (path, &stat_buf) == 0 && S_ISDIR (stat_buf.st_mode)) {
dir_mtime->mtime = stat_buf.st_mtime;
+ dir_mtime->device = stat_buf.st_dev;
+ dir_mtime->inode = stat_buf.st_ino;
dir_mtime->exists = TRUE;
} else {
dir_mtime->mtime = 0;
@@ -1029,6 +1033,8 @@ load_themes (StIconTheme *icon_theme)
if (g_stat (dir, &stat_buf) != 0 || !S_ISDIR (stat_buf.st_mode))
continue;
dir_mtime->mtime = stat_buf.st_mtime;
+ dir_mtime->device = stat_buf.st_dev;
+ dir_mtime->inode = stat_buf.st_ino;
dir_mtime->exists = TRUE;
dir_mtime->cache = st_icon_cache_new_for_path (dir);
@@ -2120,10 +2126,12 @@ rescan_themes (StIconTheme *icon_theme)
- /* dir mtime didn't change */
+ /* dir identity and mtime didn't change. */
if (stat_res == 0 && dir_mtime->exists &&
S_ISDIR (stat_buf.st_mode) &&
+ dir_mtime->device == stat_buf.st_dev &&
+ dir_mtime->inode == stat_buf.st_ino &&
dir_mtime->mtime == stat_buf.st_mtime)
continue;
/* didn't exist before, and still doesn't */
if (!dir_mtime->exists &&
(stat_res != 0 || !S_ISDIR (stat_buf.st_mode)))
continue;

3
pkgs/by-name/gn/gnome-shell/package.nix
View File

@@ -100,6 +100,9 @@ stdenv.mkDerivation (finalAttrs: {
# Make D-Bus services wrappable.
./wrap-services.patch
# Detect profile switches even when icon directory mtimes are unchanged.
./icon-theme-directory-identity.patch
# Fix greeter logo being too big.
# https://gitlab.gnome.org/GNOME/gnome-shell/issues/2591
# Reverts https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1101