aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorGediminas Paulauskas <menesis@delfi.lt>2001-07-05 04:46:15 +0800
committerGediminas Paulauskas <menesis@src.gnome.org>2001-07-05 04:46:15 +0800
commit1e5fac65aa65ed25c18ead0a13552e5ec98ed53f (patch)
treef8cdc372582d638564fa0b2123885f5202df3f41 /shell
parentde9d730a34bc18837e49e5da3101852e2ee41325 (diff)
downloadgsoc2013-evolution-1e5fac65aa65ed25c18ead0a13552e5ec98ed53f.tar.gz
gsoc2013-evolution-1e5fac65aa65ed25c18ead0a13552e5ec98ed53f.tar.zst
gsoc2013-evolution-1e5fac65aa65ed25c18ead0a13552e5ec98ed53f.zip
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
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog7
-rw-r--r--shell/evolution-shell-component-utils.c11
2 files changed, 15 insertions, 3 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 5877e2c863..d373b3bfa7 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,10 @@
+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-03 Aaron Weber <aaron@ximian.com>
* main.c (development_warning): Revised to make it less scary.
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);
}
}