aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-05-04 22:23:42 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-05-04 22:23:42 +0800
commit76c3e060b79bb6fd90c8800086178b209b89c381 (patch)
tree539e5adf15bca29c98c323869182c8ed9d681361 /shell
parent771096d3e71c7789f060e9ebf99747bb6e5e4aca (diff)
downloadgsoc2013-evolution-76c3e060b79bb6fd90c8800086178b209b89c381.tar
gsoc2013-evolution-76c3e060b79bb6fd90c8800086178b209b89c381.tar.gz
gsoc2013-evolution-76c3e060b79bb6fd90c8800086178b209b89c381.tar.bz2
gsoc2013-evolution-76c3e060b79bb6fd90c8800086178b209b89c381.tar.lz
gsoc2013-evolution-76c3e060b79bb6fd90c8800086178b209b89c381.tar.xz
gsoc2013-evolution-76c3e060b79bb6fd90c8800086178b209b89c381.tar.zst
gsoc2013-evolution-76c3e060b79bb6fd90c8800086178b209b89c381.zip
Change `e_shell_get_icon_path()' to only look up the Evolution image
directory instead of using `gnome_pixmap_file()' which is broken and looks in the current working directory first. (Why?!) svn path=/trunk/; revision=9666
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog7
-rw-r--r--shell/e-shell-utils.c11
2 files changed, 10 insertions, 8 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 1f18ddf749..d09a3cff3d 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-04 Ettore Perazzoli <ettore@ximian.com>
+
+ * e-shell-utils.c (get_icon_path): Don't use
+ `gnome_pixmap_file()', which is broken as it looks in the current
+ working directory first. Instead, if the path is not absolute,
+ just look up the file in the `EVOLUTION_IMAGES' directory.
+
2001-05-03 Ettore Perazzoli <ettore@ximian.com>
* glade/e-active-connection-dialog.c: Change the GtkCList mode to
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
index 0d7119b970..e0b12f42f8 100644
--- a/shell/e-shell-utils.c
+++ b/shell/e-shell-utils.c
@@ -40,15 +40,10 @@ get_icon_path (const char *icon_name)
{
char *icon_path;
- if (g_path_is_absolute (icon_name)) {
+ if (g_path_is_absolute (icon_name))
icon_path = g_strdup (icon_name);
- } else {
- icon_path = gnome_pixmap_file (icon_name);
-
- if (icon_path == NULL)
- icon_path = g_concat_dir_and_file (EVOLUTION_IMAGES,
- icon_name);
- }
+ else
+ icon_path = g_concat_dir_and_file (EVOLUTION_IMAGES, icon_name);
if (g_file_exists (icon_path)) {
return icon_path;