From d129a4a8fcaf8c5a148402ef572005c947ac4226 Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@src.gnome.org>
Date: Sun, 27 May 2001 18:00:25 +0000
Subject: Remove e_pixmaps_update (moved to libeshell) so libeutil won't depend
 on

	* e-gui-utils.c: Remove e_pixmaps_update (moved to libeshell) so
	libeutil won't depend on bonobo.

svn path=/trunk/; revision=10017
---
 e-util/ChangeLog     |  5 +++++
 e-util/e-gui-utils.c | 55 ----------------------------------------------------
 e-util/e-gui-utils.h | 15 --------------
 3 files changed, 5 insertions(+), 70 deletions(-)

(limited to 'e-util')

diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index cb5df43d2d..8f350ea0f5 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-27  Dan Winship  <danw@ximian.com>
+
+	* e-gui-utils.c: Remove e_pixmaps_update (moved to libeshell) so
+	libeutil won't depend on bonobo.
+
 2001-05-19  Ettore Perazzoli  <ettore@ximian.com>
 
 	* e-host-utils.c (e_gethostbyname_r)
diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c
index d6b72f6b69..2f47a4a613 100644
--- a/e-util/e-gui-utils.c
+++ b/e-util/e-gui-utils.c
@@ -19,7 +19,6 @@
 #include <libgnome/gnome-util.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk-pixbuf/gnome-canvas-pixbuf.h>
-#include <bonobo/bonobo-ui-util.h>
 
 GtkWidget *e_create_image_widget(gchar *name,
 				 gchar *string1, gchar *string2,
@@ -65,57 +64,3 @@ GtkWidget *e_create_image_widget(gchar *name,
 	} else
 		return NULL;
 }
-
-static GSList *inited_arrays=NULL;
-
-static void
-free_pixmaps (void)
-{
-	int i;
-	GSList *li;
-
-	for (li = inited_arrays; li != NULL; li = li->next) {
-		EPixmap *pixcache = li->data;
-		for (i = 0; pixcache [i].path; i++)
-			g_free (pixcache [i].pixbuf);
-	}
-	
-	g_slist_free(inited_arrays);
-}
-
-void e_pixmaps_update (BonoboUIComponent *uic, EPixmap *pixcache)
-{
-	static int done_init = 0;
-	int i;
-
-	if (!done_init) {
-		g_atexit (free_pixmaps);
-		done_init = 1;
-	}
-
-	if (g_slist_find(inited_arrays, pixcache) == NULL)
-		inited_arrays = g_slist_prepend (inited_arrays, pixcache);
-
-	for (i = 0; pixcache [i].path; i++) {
-		if (!pixcache [i].pixbuf) {
-			char *path;
-			GdkPixbuf *pixbuf;
-
-			path = g_concat_dir_and_file (EVOLUTION_IMAGES,
-						      pixcache [i].fname);
-			
-			pixbuf = gdk_pixbuf_new_from_file (path);
-			if (pixbuf == NULL) {
-				g_warning ("Cannot load image -- %s", path);
-			} else {
-				pixcache [i].pixbuf = bonobo_ui_util_pixbuf_to_xml (pixbuf);
-				gdk_pixbuf_unref (pixbuf);
-			}
-			
-			g_free (path);
-		}
-		bonobo_ui_component_set_prop (uic, pixcache [i].path, "pixname",
-					      pixcache [i].pixbuf, NULL);
-	}
-}
-
diff --git a/e-util/e-gui-utils.h b/e-util/e-gui-utils.h
index 95df438915..9cbb64fbf6 100644
--- a/e-util/e-gui-utils.h
+++ b/e-util/e-gui-utils.h
@@ -2,22 +2,7 @@
 #define E_GUI_UTILS_H
 
 #include <gtk/gtkwidget.h>
-#include <bonobo/bonobo-ui-component.h>
 
 GtkWidget *e_create_image_widget     (gchar *name, gchar *string1, gchar *string2, gint int1, gint int2);
 
-typedef struct _EPixmap EPixmap;
-
-struct _EPixmap {
-	const char *path;
-	const char *fname;
-	char       *pixbuf;
-};
-
-#define E_PIXMAP(path,fname)	{ (path), (fname), NULL }
-#define E_PIXMAP_END		{ NULL, NULL, NULL }
-
-/* Takes an array of pixmaps, terminated by (NULL, NULL), and loads into uic */
-void e_pixmaps_update (BonoboUIComponent *uic, EPixmap *pixcache);
-
 #endif /* E_GUI_UTILS_H */
-- 
cgit v1.2.3