Re: Compile error in eel

[Gediminas Paulauskas <menesis delfi lt>]

Pr, 2001-11-19 08:57, Miles Lane rašė:
> 
> eel-debug.c: In function `eel_make_warnings_and_criticals_stop_in_debugger':
> eel-debug.c:183: `g_log_domain_glib' undeclared (first use in this function)
> eel-debug.c:183: (Each undeclared identifier is reported only once
> eel-debug.c:183: for each function it appears in.)
> make[2]: *** [eel-debug.lo] Error 1

Here is a patch that fixes breakage done by recent glib changes.

-- 
Gediminas Paulauskas
Kaunas, Lithuania

? eel_fixes_for_glib_changes.diff
? menesis.diff
? po/po2tbl.sed
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/eel/ChangeLog,v
retrieving revision 1.200
diff -u -p -r1.200 ChangeLog
--- ChangeLog	2001/11/10 04:57:04	1.200
+++ ChangeLog	2001/11/19 13:02:39
@@ -1,3 +1,10 @@
+2001-11-19  Gediminas Paulauskas <menesis delfi lt>
+
+	* eel/check-program.c, eel/eel-debug.c, test/test.c: replace
+	g_log_domain_glib with "Glib"
+	* eel/eel-gobject-extensions.h: replace #include <gobject/gobject.h>
+	with glib-object.h
+
 2001-11-09  Darin Adler  <darin bentspoon com>
 
 	* eel/eel-stock-dialogs.c: (show_ok_dialog),
Index: eel/check-program.c
===================================================================
RCS file: /cvs/gnome/eel/eel/check-program.c,v
retrieving revision 1.12
diff -u -p -r1.12 check-program.c
--- eel/check-program.c	2001/09/04 03:18:02	1.12
+++ eel/check-program.c	2001/11/19 13:02:42
@@ -46,9 +46,10 @@ main (int argc, char *argv[])
 	 */
 	if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
 		eel_make_warnings_and_criticals_stop_in_debugger
-			(G_LOG_DOMAIN, g_log_domain_glib,
+			(G_LOG_DOMAIN,
 			 "Bonobo",
 			 "Gdk",
+			 "Glib",
 			 "GnomeUI",
 			 "GnomeVFS",
 			 "GnomeVFS-CORBA",
Index: eel/eel-debug.c
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-debug.c,v
retrieving revision 1.9
diff -u -p -r1.9 eel-debug.c
--- eel/eel-debug.c	2001/08/16 00:06:37	1.9
+++ eel/eel-debug.c	2001/11/19 13:02:42
@@ -148,6 +148,7 @@ eel_make_warnings_and_criticals_stop_in_
 		"Eel",
 		"Gdk",
 		"Gdk-Pixbuf",
+		"Glib",
 		"Gnome",
 		"GnomeUI",
 		"GnomeVFS",
@@ -180,7 +181,6 @@ eel_make_warnings_and_criticals_stop_in_
 	}
 	va_end (domains);
 
-	set_log_handler (g_log_domain_glib);
 	for (i = 0; i < G_N_ELEMENTS (standard_log_domains); i++) {
 		set_log_handler (standard_log_domains[i]);
 	}
Index: eel/eel-gobject-extensions.h
===================================================================
RCS file: /cvs/gnome/eel/eel/eel-gobject-extensions.h,v
retrieving revision 1.1
diff -u -p -r1.1 eel-gobject-extensions.h
--- eel/eel-gobject-extensions.h	2001/11/06 19:08:24	1.1
+++ eel/eel-gobject-extensions.h	2001/11/19 13:02:42
@@ -27,7 +27,7 @@
 #ifndef EEL_GOBJECT_EXTENSIONS_H
 #define EEL_GOBJECT_EXTENSIONS_H
 
-#include <gobject/gobject.h>
+#include <glib-object.h>
 
 void eel_signal_connect_object_while_alive (GObject     *object,
 					    const char  *signal,
Index: test/test.c
===================================================================
RCS file: /cvs/gnome/eel/test/test.c,v
retrieving revision 1.12
diff -u -p -r1.12 test.c
--- test/test.c	2001/11/09 01:43:50	1.12
+++ test/test.c	2001/11/19 13:02:42
@@ -23,9 +23,10 @@ test_init (int *argc,
 	gnome_vfs_init ();
 
 	eel_make_warnings_and_criticals_stop_in_debugger
-		(G_LOG_DOMAIN, g_log_domain_glib,
+		(G_LOG_DOMAIN,
 		 "Bonobo",
 		 "Gdk",
+		 "Glib",
 		 "GnomeUI",
 		 "GnomeVFS",
 		 "GnomeVFS-CORBA",