First big sync of my GNOME 2 porting work (incomplete, and still

pretty broken).

Weeeeee!

svn path=/trunk/; revision=18503

14 files changed, 54 insertions, 35 deletions

diff --git a/e-util/ChangeLog b/e-util/ChangeLog
index 93bdab7959..1513ec4426 100644
--- a/e-util/ChangeLog
+++ b/e-util/ChangeLog
@@ -1,3 +1,36 @@
+2002-11-02  Ettore Perazzoli  <ettore@ximian.com>
+
+	* ename/Makefile.am (INCLUDES): Removed -I$(includedir).
+
+	* ename/test-ename-western-gtk.c: #include
+	<libgnomeui/gnome-ui-init.h> instead of <libgnomeui/gnome-init.h>.
+	(create_window): Added GTK_SIGNAL_FUNC() cast.
+	(main): Use gnome_program_init().
+
+	* e-db3-utils.c: Do not #include <libgnome/gnome-defs.h>.
+
+	* e-request.c: Do not #include <libgnomeui/gnome-stock.h>.
+
+	* e-memory.c (e_memchunk_clean): Replace GSearchFunc with
+	GCompareFunc.
+
+	* e-iterator.c (e_iterator_class_init): GTK2-ified.
+	(ECI_CLASS): Likewise.
+
+	* e-html-utils.c: Do not #include <gal/unicode/gunicode.h>.
+
+	* e-gui-utils.c: Don't #include <libgnome/gnome-defs.h>.
+	(e_create_image_widget): Pass NULL to gdk_pixbuf_new_from_file()
+	for the error arg.
+
+	* e-corba-utils.h: #include <orbit/orbit.h> instead of
+	<orb/orbit.h>.
+
+	* Makefile.am: Removed bonobo-factory-util.c,
+	bonobo-factory-util.h, e-categories-master-list-wombat.h,
+	e-categories-master-list-wombat.c, e-dialog-utils.c,
+	e-dialog-utils.h, e-proxy.c e-proxy.h for now.
+
 2002-11-02  Rodrigo Moya <rodrigo@ximian.com>
 
 	* e-config-listener.[ch]: ported to GConf and GObject.
diff --git a/e-util/Makefile.am b/e-util/Makefile.am
index 00b7db92e2..19ff7b0e53 100644
--- a/e-util/Makefile.am
+++ b/e-util/Makefile.am
@@ -19,13 +19,7 @@ privlib_LTLIBRARIES = libeutil.la libedb3util.la libeconduit.la
 noinst_LTLIBRARIES = libeutil-static.la libeconduit-static.la
 
 eutilinclude_HEADERS = 				\
-	e-bonobo-factory-util.h			\
-	e-categories-master-list-wombat.h	\
-	e-categories-config.h			\
-	e-component-listener.h			\
-	e-config-listener.h			\
 	e-corba-utils.h				\
-	e-dialog-utils.h			\
 	e-dialog-widgets.h			\
 	e-gtk-utils.h				\
 	e-gui-utils.h				\
@@ -38,9 +32,7 @@ eutilinclude_HEADERS = 				\
 	e-memory.h				\
 	e-mktemp.h				\
 	e-msgport.h				\
-	e-passwords.h				\
 	e-path.h				\
-	e-proxy.h				\
 	e-request.h				\
 	e-sexp.h				\
 	e-time-utils.h				\
@@ -49,13 +41,7 @@ eutilinclude_HEADERS = 				\
 
 libeutil_la_SOURCES =				\
 	$(eutilinclude_HEADERS)			\
-	e-bonobo-factory-util.c			\
-	e-categories-master-list-wombat.c	\
-	e-categories-config.c			\
-	e-component-listener.c			\
-	e-config-listener.c			\
 	e-corba-utils.c				\
-	e-dialog-utils.c			\
 	e-dialog-widgets.c			\
 	e-gtk-utils.c				\
 	e-gui-utils.c				\
@@ -68,15 +54,23 @@ libeutil_la_SOURCES =				\
 	e-memory.c				\
 	e-mktemp.c				\
 	e-msgport.c				\
-	e-passwords.c				\
 	e-path.c				\
-	e-proxy.c				\
 	e-request.c				\
 	e-sexp.c				\
 	e-time-utils.c				\
 	e-url.c					\
 	md5-utils.c
 
+# FIXME TODO
+#	e-categories-config.c
+#	e-categories-master-list-wombat.[ch]
+#	e-component-listener.c
+#	e-config-listener.c
+#	e-dialog-utils.c
+#	e-passwords.c
+#	e-proxy.c
+#       bonobo-factory-util.[ch]
+
 libeutil_la_LIBADD = $(E_UTIL_LIBS)
 
 libeutil_static_la_SOURCES = $(libeutil_la_SOURCES)
diff --git a/e-util/e-categories-config.h b/e-util/e-categories-config.h
index 99dc02be23..2ec8019044 100644
--- a/e-util/e-categories-config.h
+++ b/e-util/e-categories-config.h
@@ -14,7 +14,6 @@
 #include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtkentry.h>
-#include <libgnome/gnome-defs.h>
 
 BEGIN_GNOME_DECLS
 
diff --git a/e-util/e-categories-master-list-wombat.c b/e-util/e-categories-master-list-wombat.c
index 29318dec04..74fd1047bd 100644
--- a/e-util/e-categories-master-list-wombat.c
+++ b/e-util/e-categories-master-list-wombat.c
@@ -16,7 +16,7 @@
 #include <parser.h>
 #include <gal/util/e-i18n.h>
 #include <gal/util/e-xml-utils.h>
-#include <bonobo-conf/bonobo-config-database.h>
+
 #include <bonobo/bonobo-moniker-util.h>
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-listener.h>
diff --git a/e-util/e-corba-utils.h b/e-util/e-corba-utils.h
index 32cf1df0ee..b48a6e2dab 100644
--- a/e-util/e-corba-utils.h
+++ b/e-util/e-corba-utils.h
@@ -22,7 +22,7 @@
 #ifndef E_CORBA_UTILS_H
 #define E_CORBA_UTILS_H
 
-#include <orb/orbit.h>
+#include <orbit/orbit.h>
 
 const CORBA_char *e_safe_corba_string      (const char *s);
 CORBA_char       *e_safe_corba_string_dup  (const char *s);
diff --git a/e-util/e-db3-utils.c b/e-util/e-db3-utils.c
index c1da265453..3326f32a6e 100644
--- a/e-util/e-db3-utils.c
+++ b/e-util/e-db3-utils.c
@@ -10,7 +10,6 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-util.h>
 
 #if DB_VERSION_MAJOR != 3 || \
diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c
index 70007cf07a..b7be21a6d9 100644
--- a/e-util/e-gui-utils.c
+++ b/e-util/e-gui-utils.c
@@ -15,10 +15,9 @@
 #include <glib.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkalignment.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-util.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gnome-canvas-pixbuf.h>
+#include <libgnomecanvas/gnome-canvas-pixbuf.h>
 
 GtkWidget *e_create_image_widget(gchar *name,
 				 gchar *string1, gchar *string2,
@@ -33,7 +32,7 @@ GtkWidget *e_create_image_widget(gchar *name,
 			filename = g_strdup(string1);
 		else
 			filename = g_concat_dir_and_file(EVOLUTION_IMAGES, string1);
-		pixbuf = gdk_pixbuf_new_from_file(filename);
+		pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
 		width = gdk_pixbuf_get_width(pixbuf);
 		height = gdk_pixbuf_get_height(pixbuf);
 
diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
index 65d455a39a..12aee18d2b 100644
--- a/e-util/e-html-utils.c
+++ b/e-util/e-html-utils.c
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
-#include <gal/unicode/gunicode.h>
 
 #include "e-html-utils.h"
 
diff --git a/e-util/e-iterator.c b/e-util/e-iterator.c
index 8bd14ee6c8..9abf424356 100644
--- a/e-util/e-iterator.c
+++ b/e-util/e-iterator.c
@@ -12,7 +12,7 @@
 #include <gtk/gtksignal.h>
 #include "e-iterator.h"
 
-#define ECI_CLASS(object) (E_ITERATOR_CLASS(GTK_OBJECT((object))->klass))
+#define ECI_CLASS(object) (E_ITERATOR_CLASS(GTK_CLASS_TYPE (object)))
 
 static void e_iterator_init (EIterator *card);
 static void e_iterator_class_init (EIteratorClass *klass);
@@ -72,13 +72,11 @@ e_iterator_class_init (EIteratorClass *klass)
 	e_iterator_signals [INVALIDATE] =
 		gtk_signal_new ("invalidate",
 				GTK_RUN_LAST,
-				object_class->type,
+				GTK_CLASS_TYPE (object_class),
 				GTK_SIGNAL_OFFSET (EIteratorClass, invalidate),
 				gtk_marshal_NONE__NONE,
 				GTK_TYPE_NONE, 0);
 
-	gtk_object_class_add_signals (object_class, e_iterator_signals, LAST_SIGNAL);
-
 	klass->invalidate = NULL;
 	klass->get        = NULL;
 	klass->reset      = NULL;
diff --git a/e-util/e-memory.c b/e-util/e-memory.c
index 17385fa7ba..cf32147d75 100644
--- a/e-util/e-memory.c
+++ b/e-util/e-memory.c
@@ -294,7 +294,7 @@ e_memchunk_clean(MemChunk *m)
 
 	/* now, scan all free nodes, and count them in their tree node */
 	while (f) {
-		ci = g_tree_search(tree, (GSearchFunc)tree_search, f);
+		ci = g_tree_search(tree, (GCompareFunc) tree_search, f);
 		if (ci) {
 			ci->count += f->atoms;
 		} else {
diff --git a/e-util/e-request.c b/e-util/e-request.c
index a54b46bf9d..71fcacc3ea 100644
--- a/e-util/e-request.c
+++ b/e-util/e-request.c
@@ -27,11 +27,11 @@
 #include "e-request.h"
 
 #include <libgnomeui/gnome-dialog.h>
-#include <libgnomeui/gnome-stock.h>
 #include <gal/widgets/e-unicode.h>
 
 #include <gtk/gtklabel.h>
 #include <gtk/gtkentry.h>
+#include <gtk/gtkbox.h>
 
 
 /**
diff --git a/e-util/e-time-utils.c b/e-util/e-time-utils.c
index ecc3fc9602..2161c7addb 100644
--- a/e-util/e-time-utils.c
+++ b/e-util/e-time-utils.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <ctype.h>
 #include <glib.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 #include "e-time-utils.h"
 
diff --git a/e-util/ename/Makefile.am b/e-util/ename/Makefile.am
index 480502141e..aeec2d834f 100644
--- a/e-util/ename/Makefile.am
+++ b/e-util/ename/Makefile.am
@@ -6,7 +6,6 @@ INCLUDES =						\
 	-I. 						\
 	-I.. 						\
 	-I$(top_builddir)				\
-        -I$(includedir)                                 \
 	$(E_NAME_CFLAGS)
 
 ename_libs = 						\
diff --git a/e-util/ename/test-ename-western-gtk.c b/e-util/ename/test-ename-western-gtk.c
index 8ae0ef8770..4ab32c2f92 100644
--- a/e-util/ename/test-ename-western-gtk.c
+++ b/e-util/ename/test-ename-western-gtk.c
@@ -1,7 +1,7 @@
 #include <gtk/gtkmain.h>
 #include <gtk/gtktable.h>
 #include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-init.h>
+#include <libgnomeui/gnome-ui-init.h>
 #include <gal/widgets/e-unicode.h>
 #include "e-name-western.h"
 
@@ -141,13 +141,13 @@ create_window (void)
 	name = e_name_western_parse ("The Honorable Doctor van Jacobsen, Albert Roderick \"The Clenched Fist\" Jr, MD, PhD, Esquire");
 	fill_entries ();
 
-	gtk_signal_connect (GTK_OBJECT (full), "changed", full_changed_cb, NULL);
+	gtk_signal_connect (GTK_OBJECT (full), "changed", GTK_SIGNAL_FUNC (full_changed_cb), NULL);
 }
 
 int
 main (int argc, char **argv)
 {
-	gnome_init ("Test EName", "Test EName", argc, argv);
+	gnome_program_init ("Test EName", "Test EName", LIBGNOMEUI_MODULE, argc, argv, NULL);
 
 	create_window ();