forked from pool/xfce4-session
4eb22ad6d3
the use of the --fast cli option with other options - added xfce4-session-4.8.0-fix-error-popup-on-session-menu-item.patch which fixes the error popup when clicking a session menu item - added xfce4-session-4.8.0-do-not-fall-back-to-system-icons.patch in order to prevent visual inconsistencies in the logout dialog OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=51
61 lines
2.7 KiB
Diff
61 lines
2.7 KiB
Diff
From fd459002e75fc86b4284b1bf806719c1eb290025 Mon Sep 17 00:00:00 2001
|
|
From: Lionel Le Folgoc <mrpouit@gmail.com>
|
|
Date: Mon, 31 Jan 2011 18:23:26 +0000
|
|
Subject: Don't fallback to "system" icon in the logout dialog (bug #7196).
|
|
|
|
GTK_ICON_LOOKUP_GENERIC_FALLBACK caused gtk+ to look for "system" if
|
|
"system-*" was not found and "system" exists in most icon themes so the
|
|
"xfsm-*" fallback icons were never used.
|
|
---
|
|
diff --git a/xfce4-session/shutdown.c b/xfce4-session/shutdown.c
|
|
index 6a97ef5..19fdfde 100644
|
|
--- a/xfce4-session/shutdown.c
|
|
+++ b/xfce4-session/shutdown.c
|
|
@@ -405,7 +405,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea
|
|
icon = gtk_icon_theme_load_icon (icon_theme,
|
|
"system-log-out",
|
|
32,
|
|
- GTK_ICON_LOOKUP_GENERIC_FALLBACK,
|
|
+ 0,
|
|
NULL);
|
|
if (!icon)
|
|
icon = gtk_icon_theme_load_icon (icon_theme,
|
|
@@ -439,7 +439,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea
|
|
icon = gtk_icon_theme_load_icon (icon_theme,
|
|
"system-reboot",
|
|
32,
|
|
- GTK_ICON_LOOKUP_GENERIC_FALLBACK,
|
|
+ 0,
|
|
NULL);
|
|
|
|
if (!icon)
|
|
@@ -481,7 +481,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea
|
|
icon = gtk_icon_theme_load_icon (icon_theme,
|
|
"system-shutdown",
|
|
32,
|
|
- GTK_ICON_LOOKUP_GENERIC_FALLBACK,
|
|
+ 0,
|
|
NULL);
|
|
|
|
if (!icon)
|
|
@@ -543,7 +543,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea
|
|
icon = gtk_icon_theme_load_icon (icon_theme,
|
|
"system-suspend",
|
|
32,
|
|
- GTK_ICON_LOOKUP_GENERIC_FALLBACK,
|
|
+ 0,
|
|
NULL);
|
|
|
|
if (!icon)
|
|
@@ -581,7 +581,7 @@ shutdownDialog(const gchar *sessionName, XfsmShutdownType *shutdownType, gboolea
|
|
icon = gtk_icon_theme_load_icon (icon_theme,
|
|
"system-hibernate",
|
|
32,
|
|
- GTK_ICON_LOOKUP_GENERIC_FALLBACK,
|
|
+ 0,
|
|
NULL);
|
|
|
|
if (!icon)
|
|
--
|
|
cgit v0.8.3.4
|