From bbc6d63ef0aa4b2ae1244f1a7de63b0b86f3ce69 Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Thu, 6 Apr 2000 06:46:20 +0000 Subject: Load the icons from the installation path, not form the GNOME-libs 2000-04-06 Miguel de Icaza * shell/e-shortcut.c (shell_icon_cb): Load the icons from the installation path, not form the GNOME-libs installation prefix. (shell_icon_cb): Memory leak fix. * shell/Makefile.am (imagesdir): Pass the EVOLUTION_IMAGES installation directory here. * art/Makefile.am (images_DATA): Renamed from pixmaps to images. 2000-04-06 Miguel de Icaza * message-list.c: Stick pixmaps here. * mail-display.c (embeddable_destroy_cb): Replaced C++ comments with C comments. * message-list.c (load_internal_images): New function, loads images. (message_list_init_renderers): Load images, fix previous attempt at loading images. * Makefile.am (dist-hook): Added distribution of pixmaps. * pixmaps: New directory, used to hold the XPMs we ship with. * pixmaps/envelope-closed.xpm, pixmaps/envelope-open.xpm: Tigert's envelopes incorporated. 2000-04-06 Miguel de Icaza * e-cell-text.c: Killed ARG_EDITABLE. (ect_event): Updated to new editable setup. (e_cell_text_new): Kill editable argument. * e-cell-toggle.c (etog_event): Handle editability here * e-cell-text.h: Removed editable bit field from here, it is now taken care at the e-cell level. * e-cell.c (e_cell_set_editable): New function. (e_cell_init): Set editable to TRUE by default. * test-check.c (check_test): update to new api * test-table.c (table_browser_test): ditto. (do_e_table_demo): ditto. * test-cols.c (multi_cols_test): ditto svn path=/trunk/; revision=2302 --- shell/Makefile.am | 2 ++ shell/e-shortcut.c | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'shell') 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; } -- cgit v1.2.3