[monkey-bubble: 161/753] Use <bonobo/bonobo-defs.h> and <bonobo/bonobo-i18n.h> instead of the

[Sven Herzberg <herzi src gnome org>]

commit 38aab6940b2fd0cee077490faf5506bdea0f90c9
Author: Martin Baulig <baulig suse de>
Date:   Wed Apr 18 00:49:54 2001 +0000

    Use <bonobo/bonobo-defs.h> and <bonobo/bonobo-i18n.h> instead of the
    
    2001-04-18  Martin Baulig  <baulig suse de>
    
    	* bonobo/*.[ch]: Use <bonobo/bonobo-defs.h> and
    	<bonobo/bonobo-i18n.h> instead of the libgnomebase ones.
    
    	* bonobo/bonobo-main.c (bonobo_setup_x_error_handler):
    	#ifdef'ed this out.
    
    	* bonobo/bonobo-defs.h, bonobo/bonobo-i18n.h: New files.
    
    	* bonobo/libbonobo-init.[ch]: Removed.
    
    	* configure.in: Don't depend on libgnomebase.

 tests/test-storage.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/tests/test-storage.c b/tests/test-storage.c
index d074b79..7e54f24 100644
--- a/tests/test-storage.c
+++ b/tests/test-storage.c
@@ -1,5 +1,8 @@
 #include <config.h>
-#include <libbonobo.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <bonobo/libbonobo.h>
+#include <bonobo/bonobo-i18n.h>
 
 #define TESTSIZE (1024*1)
 
@@ -10,17 +13,17 @@
 	      "file %s: line %d: unexpected exception: (%s)",	        \
 	      __FILE__,						        \
 	      __LINE__,						        \
-	      (ev)->_repo_id);		  }G_STMT_END
+	      (ev)->_id);		  }G_STMT_END
 
 #define CHECK_EXCEPTION(ev, repo_id)	  G_STMT_START{		        \
-     if (!BONOBO_EX (ev) || strcmp ((ev)->_repo_id, repo_id))	        \
+     if (!BONOBO_EX (ev) || strcmp ((ev)->_id, repo_id))	        \
        g_log (G_LOG_DOMAIN,					        \
 	      G_LOG_LEVEL_ERROR,				        \
 	      "file %s: line %d: missing exception %s (got: %s)",	\
 	      __FILE__,						        \
 	      __LINE__,						        \
 	      repo_id,                                                  \
-	      (ev)->_repo_id);		                                \
+	      (ev)->_id);		                                \
      CORBA_exception_free (ev);           }G_STMT_END
 
 
@@ -474,10 +477,8 @@ main (int argc, char *argv [])
 
 	CORBA_exception_init (&ev);
 
-	
-        gnome_init_with_popt_table ("MyShell", "1.0",
-				    argc, argv,
-				    oaf_popt_options, 0, NULL); 
+	g_type_init (G_TYPE_DEBUG_NONE);
+
 	orb = oaf_init (argc, argv);
 	
 	if (bonobo_init (orb, NULL, NULL) == FALSE)