From 1e5fac65aa65ed25c18ead0a13552e5ec98ed53f Mon Sep 17 00:00:00 2001
From: Gediminas Paulauskas <menesis@delfi.lt>
Date: Wed, 4 Jul 2001 20:46:15 +0000
Subject: set "pixname" value only if pixbuf was loaded successfully. Otherwise

2001-07-04  Gediminas Paulauskas <menesis@delfi.lt>

	* evolution-shell-component-utils.c (e_pixmaps_update): set
	"pixname" value only if pixbuf was loaded successfully. Otherwise
	component crashes if image is not found. Should be checked for
	sanity in bonobo_ui_component_set_prop IMHO.

2001-07-04  Gediminas Paulauskas <menesis@delfi.lt>

	* Makefile.am: install apply-filters-16.xpm

2001-07-04  Gediminas Paulauskas <menesis@delfi.lt>

	* evolution-mail-message.xml: MessageApplyFilters now has an icon.

2001-07-04  Gediminas Paulauskas <menesis@delfi.lt>

	* folder-browser-ui.c (message_pixcache): set icon for ApplyFilters
	command.

svn path=/trunk/; revision=10783
---
 shell/evolution-shell-component-utils.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'shell/evolution-shell-component-utils.c')

diff --git a/shell/evolution-shell-component-utils.c b/shell/evolution-shell-component-utils.c
index 5e3504352f..e056fc54b3 100644
--- a/shell/evolution-shell-component-utils.c
+++ b/shell/evolution-shell-component-utils.c
@@ -60,13 +60,18 @@ void e_pixmaps_update (BonoboUIComponent *uic, EPixmap *pixcache)
 			} else {
 				pixcache [i].pixbuf = bonobo_ui_util_pixbuf_to_xml (pixbuf);
 				gdk_pixbuf_unref (pixbuf);
+				bonobo_ui_component_set_prop (uic,
+					pixcache [i].path, "pixname",
+					pixcache [i].pixbuf, NULL);
 			}
 
 			g_free (path);
+		} else {
+			bonobo_ui_component_set_prop (uic, pixcache [i].path,
+						      "pixname",
+						      pixcache [i].pixbuf,
+						      NULL);
 		}
-		bonobo_ui_component_set_prop (uic, pixcache [i].path,
-					      "pixname", pixcache [i].pixbuf,
-					      NULL);
 	}
 }
 
-- 
cgit