diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Makefile.am | 2 | ||||
| -rw-r--r-- | shell/e-shortcut.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index f7d4476eac..6a5d1cbf7a 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -1,3 +1,4 @@ +imagesdir = $(datadir)/images/evolution bin_PROGRAMS = evolution @@ -5,6 +6,7 @@ INCLUDES = \ -I$(top_srcdir)/widgets \ -I$(top_srcdir) \ $(BONOBO_GNOME_CFLAGS) \ + -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \ -DEVOLUTION_VERSION=\""$(VERSION)"\" \ -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" diff --git a/shell/e-shortcut.c b/shell/e-shortcut.c index 5386efb182..9d6d17893f 100644 --- a/shell/e-shortcut.c +++ b/shell/e-shortcut.c @@ -370,13 +370,14 @@ shell_icon_cb (EShortcutBar *shortcut_bar, gchar *url) if (!shell_icons[i].image) { char *pixmap_path; - pixmap_path = gnome_pixmap_file (shell_icons[i].path); + pixmap_path = g_strconcat (EVOLUTION_IMAGES, shell_icons[i].path, NULL); if (pixmap_path) shell_icons[i].image = gdk_pixbuf_new_from_file (pixmap_path); else { - g_warning ("Couldn't find pixmap: %s", + g_warning ("Couldn't find image: %s", pixmap_path); } + g_free (pixmap_path); } return shell_icons[i].image; } |