Author: kelnos
Date: 2007-10-20 16:46:39 +0000 (Sat, 20 Oct 2007)
New Revision: 26154
Modified:
xfdesktop/trunk/src/xfdesktop-file-icon-manager.c
xfdesktop/trunk/src/xfdesktop-file-utils.c
Log:
* semi-fix a problem with loading file icons
* fix a spurious warning that gcc 4.2 generates for no apparent reason
Modified: xfdesktop/trunk/src/xfdesktop-file-icon-manager.c
===================================================================
--- xfdesktop/trunk/src/xfdesktop-file-icon-manager.c 2007-10-20 13:45:39 UTC
(rev 26153)
+++ xfdesktop/trunk/src/xfdesktop-file-icon-manager.c 2007-10-20 16:46:39 UTC
(rev 26154)
@@ -1629,12 +1629,13 @@
if(!g_ascii_strcasecmp("application/x-desktop",
thunar_vfs_mime_info_get_name(info->mime_info)))
{
+ ThunarVfsInfo *tmpinfo = (ThunarVfsInfo *)info;
img = gtk_image_new_from_stock(GTK_STOCK_EDIT,
GTK_ICON_SIZE_MENU);
gtk_widget_show(img);
mi = gtk_image_menu_item_new_with_mnemonic(_("_Edit
Launcher"));
gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi),
img);
g_object_set_data_full(G_OBJECT(mi), "thunar-vfs-info",
-
thunar_vfs_info_ref((ThunarVfsInfo *)info),
+ thunar_vfs_info_ref(tmpinfo),
(GDestroyNotify)thunar_vfs_info_unref);
gtk_widget_show(mi);
gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
Modified: xfdesktop/trunk/src/xfdesktop-file-utils.c
===================================================================
--- xfdesktop/trunk/src/xfdesktop-file-utils.c 2007-10-20 13:45:39 UTC (rev
26153)
+++ xfdesktop/trunk/src/xfdesktop-file-utils.c 2007-10-20 16:46:39 UTC (rev
26154)
@@ -228,19 +228,20 @@
if(custom_icon_name)
pix_theme = xfce_themed_icon_load(custom_icon_name, size);
+ if(!pix_theme && info && info->mime_info) {
+ icon_name = thunar_vfs_mime_info_lookup_icon_name(info->mime_info,
+
gtk_icon_theme_get_default());
+ DBG("got mime info icon name: %s", icon_name);
+ if(icon_name)
+ pix_theme = xfce_themed_icon_load(icon_name, size);
+ }
+
if(!pix_theme && info) {
icon_name = thunar_vfs_info_get_custom_icon(info);
if(icon_name)
pix_theme = xfce_themed_icon_load(icon_name, size);
}
- if(G_UNLIKELY(!pix_theme) && info) {
- icon_name = thunar_vfs_mime_info_lookup_icon_name(info->mime_info,
-
gtk_icon_theme_get_default());
- if(icon_name)
- pix_theme = xfce_themed_icon_load(icon_name, size);
- }
-
if(G_LIKELY(pix_theme)) {
/* we can't edit thsese icons */
pix = gdk_pixbuf_copy(pix_theme);
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
