[Xfce4-commits] <xfce4-session:xfce-4.8> Don't fallback to "system" icon in the logout dialog (bug #7196).

[Jérôme Guelfucci]

Updating branch refs/heads/xfce-4.8
         to 0dc712a14c3ba814606868653b7430b3c7b84b5e (commit)
       from 30d17cd5eb7443b6bc75842cec2af7bf6d502f57 (commit)

commit 0dc712a14c3ba814606868653b7430b3c7b84b5e
Author: Lionel Le Folgoc <mrpouit at gmail.com>
Date:   Mon Jan 31 19:23:26 2011 +0100

    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.

 xfce4-session/shutdown.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xfce4-session/shutdown.c b/xfce4-session/shutdown.c
index fb2bd04..fa4115e 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)