[monkey-bubble: 689/753] New file.

[Sven Herzberg <herzi src gnome org>]

commit d245d7b3b33e6e287dc63d2c0d729f8349a9c151
Author: Martin Baulig <baulig suse de>
Date:   Tue Aug 28 10:34:54 2001 +0000

    New file.
    
    2001-08-28  Martin Baulig  <baulig suse de>
    
    	* Bonobo_Moniker_ditem.server.in.in: New file.
    
    	* bonobo-config-ditem.[ch]: Merged some stuff from the
    	gnome-core/gnome-desktop version

 monikers/.cvsignore        |    3 +
 monikers/ChangeLog         |    7 +++
 monikers/Makefile.am-50588 |   34 +++++++---------
 monikers/test-ditem.c      |   97 ++-----------------------------------------
 4 files changed, 30 insertions(+), 111 deletions(-)
---
diff --git a/monikers/.cvsignore b/monikers/.cvsignore
index 160d8ee..52c6f03 100644
--- a/monikers/.cvsignore
+++ b/monikers/.cvsignore
@@ -8,3 +8,6 @@ Makefile
 test-ditem
 desktop-item-boot
 GNOME_Moniker_std.oaf.in
+*.server.in
+*.server
+bonobo-moniker-ditem
diff --git a/monikers/ChangeLog b/monikers/ChangeLog
index 8fb3fe3..106bba1 100644
--- a/monikers/ChangeLog
+++ b/monikers/ChangeLog
@@ -1,5 +1,12 @@
 2001-08-28  Martin Baulig  <baulig suse de>
 
+	* Bonobo_Moniker_ditem.server.in.in: New file.
+
+	* bonobo-config-ditem.[ch]: Merged some stuff from the
+	gnome-core/gnome-desktop version
+
+2001-08-28  Martin Baulig  <baulig suse de>
+
 	* bonobo-config-ditem-utils.[ch], bonobo-config-ditem.[ch],
 	bonobo-moniker-ditem.c, test-ditem.c: Put this back.
 
diff --git a/monikers/Makefile.am-50588 b/monikers/Makefile.am-50588
index 46036f7..01472f7 100644
--- a/monikers/Makefile.am-50588
+++ b/monikers/Makefile.am-50588
@@ -15,47 +15,43 @@ INCLUDES = \
 	-DG_LOG_DOMAIN=\"GnomeMonikers\"
 
 EXTRA_DIST = \
-	Bonobo_Moniker_ditem.oaf.in
+	Bonobo_Moniker_ditem.server.in
 
-moniker_LTLIBRARIES = libmoniker_ditem.la
-monikerdir = $(libdir)/bonobo/monikers
+Bonobo_Moniker_ditem.server.in: Bonobo_Moniker_ditem.server.in.in
+	sed -e "s|\ MONIKER_BINDIR\@|$(bindir)|" $< > $@
 
-# Desktop Item specific bits...
+bin_PROGRAMS = bonobo-moniker-ditem
 
-# Data
-gnomesysconfdir = $(sysconfdir)/gnome-2.0
-gnomesysconf_DATA = gnome-desktop.xmldb
+serverdir = $(libdir)/bonobo/servers
+server_DATA = Bonobo_Moniker_ditem.server
 
-# DItem moniker
+ XML_I18N_MERGE_SERVER_RULE@
 
-Bonobo_Moniker_ditem.oaf : $(srcdir)/Bonobo_Moniker_ditem.oaf.in $(top_builddir)/config.status
-	sed -e "s|\ MONIKER_LIBDIR\@|$(monikerdir)|" \
-	$(srcdir)/Bonobo_Moniker_ditem.oaf.in > Bonobo_Moniker_ditem.oaf 
+# DItem moniker
 
-libmoniker_ditem_la_SOURCES =	 		\
+bonobo_moniker_ditem_SOURCES =	 		\
 	bonobo-moniker-ditem.c 			\
 	bonobo-config-ditem.c			\
 	bonobo-config-ditem.h			\
 	bonobo-config-ditem-utils.c		\
 	bonobo-config-ditem-utils.h
 
-libmoniker_ditem_la_LIBADD = \
+bonobo_moniker_ditem_LDADD =			\
 	../libgnome/libgnome-2.la		\
 	$(MONIKER_LIBS)
 
 # DItem tests ...
 
-noinst_PROGRAMS = test-ditem desktop-item-boot
+noinst_PROGRAMS = test-ditem
 
 test_ditem_SOURCES = \
+	bonobo-config-ditem.c			\
+	bonobo-config-ditem.h			\
+	bonobo-config-ditem-utils.c		\
+	bonobo-config-ditem-utils.h		\
 	test-ditem.c
 
 test_ditem_LDADD = \
 	../libgnome/libgnome-2.la		\
 	$(MONIKER_LIBS)
 
-desktop_item_boot_SOURCES = \
-	desktop-item-boot.c
-
-desktop_item_boot_LDADD = \
-	../libgnome/libgnome-2.la
diff --git a/monikers/test-ditem.c b/monikers/test-ditem.c
index 412af1d..6607ca1 100644
--- a/monikers/test-ditem.c
+++ b/monikers/test-ditem.c
@@ -1,91 +1,13 @@
 /* -*- Mode: C; c-set-style: gnu indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
 #include <libbonobo.h>
 #include <libgnome/Gnome.h>
-#include <libgnome/gnome-ditem.h>
 #include <locale.h>
 #include <stdlib.h>
 
 #include "bonobo-config-ditem.h"
 
-static void G_GNUC_UNUSED
-boot_ditem (Bonobo_ConfigDatabase db)
-{
-	BonoboArg *arg;
-	CORBA_Environment ev;
-
-	arg = bonobo_arg_new (TC_GNOME_DesktopEntry);
-	bonobo_pbclient_set_value (db, "/Desktop Entry", arg, NULL);
-	bonobo_arg_release (arg);
-
-	/* For some strange reason, this function causes the config moniker
-	 * (bonobo-config-xmldb) to crash after successfully writing the file.
-	 * So call this function to initialize the file and the comment it out.
-	 */
-
-	CORBA_exception_init (&ev);
-	Bonobo_ConfigDatabase_sync (db, &ev);
-	CORBA_exception_free (&ev);
-}
-
-static void G_GNUC_UNUSED
-test_ditem (Bonobo_ConfigDatabase db)
-{
-	GnomeDesktopItem *ditem;
-	GNOME_DesktopEntryType type;
-	const gchar *text;
-	GSList *list, *c;
-
-	ditem = gnome_desktop_item_new_from_file ("/tmp/test.desktop",
-						  GNOME_DESKTOP_ITEM_LOAD_ONLY_IF_EXISTS);
-
-	text = gnome_desktop_item_get_location (ditem);
-	g_print ("LOCATION: |%s|\n", text);
-
-	type = gnome_desktop_item_get_type (ditem);
-	g_print ("TYPE: |%d|\n", type);
-
-	text = gnome_desktop_item_get_command (ditem);
-	g_print ("COMMAND: |%s|\n", text);
-
-	text = gnome_desktop_item_get_icon_path (ditem);
-	g_print ("ICON PATH: |%s|\n", text);
-
-	text = gnome_desktop_item_get_name (ditem, NULL);
-	g_print ("NAME: |%s|\n", text);
-
-	text = gnome_desktop_item_get_name (ditem, "de");
-	g_print ("NAME (de): |%s|\n", text);
-
-	text = gnome_desktop_item_get_local_name (ditem);
-	g_print ("LOCAL NAME: |%s|\n", text);
-
-	text = gnome_desktop_item_get_comment (ditem, NULL);
-	g_print ("COMMENT: |%s|\n", text);
-
-	text = gnome_desktop_item_get_comment (ditem, "de");
-	g_print ("COMMENT (de): |%s|\n", text);
-
-	text = gnome_desktop_item_get_local_comment (ditem);
-	g_print ("LOCAL COMMENT: |%s|\n", text);
-
-	list = gnome_desktop_item_get_attributes (ditem);
-	for (c = list; c; c = c->next) {
-		const gchar *attr = c->data;
-
-		g_print ("ATTRIBUTE: |%s|\n", attr);
-	}
-
-#if 1
-	gnome_desktop_item_set_name (ditem, "de", "Neu gesetzt!");
-
-	gnome_desktop_item_save (ditem, NULL);
-#endif
-
-	gnome_desktop_item_save (ditem, "/tmp/foo.desktop");
-}
-
 #if 0
-static void G_GNUC_UNUSED
+static void
 test_builtin (void)
 {
 	Bonobo_ConfigDatabase db, parent_db;
@@ -133,12 +55,14 @@ main (int argc, char **argv)
 
 	// test_builtin ();
 
-	// db = bonobo_config_ditem_new ("/tmp/test.desktop");
-
+#if 1
+	db = bonobo_config_ditem_new ("/tmp/test.desktop");
+#else
         CORBA_exception_init (&ev);
 	db = bonobo_get_object ("ditem:/tmp/test.desktop", "Bonobo/ConfigDatabase", &ev);
 	g_assert (!BONOBO_EX (&ev));
         CORBA_exception_free (&ev);
+#endif
 
         CORBA_exception_init (&ev);
 	default_db = bonobo_get_object ("xmldb:/tmp/foo.xml", "Bonobo/ConfigDatabase", &ev);
@@ -148,14 +72,11 @@ main (int argc, char **argv)
 	g_assert (db != NULL);
 	g_assert (default_db != NULL);
 
-	test_ditem (db);
-
         CORBA_exception_init (&ev);
 	Bonobo_ConfigDatabase_addDatabase (db, default_db, "/gnome-ditem/",
 					   Bonobo_ConfigDatabase_DEFAULT, &ev);
 	g_assert (!BONOBO_EX (&ev));
 
-#if 0
 	dirlist = Bonobo_ConfigDatabase_getDirs (db, "", &ev);
 	g_assert (!BONOBO_EX (&ev));
 
@@ -179,7 +100,6 @@ main (int argc, char **argv)
 	if (keylist)
 		for (j = 0; j < keylist->_length; j++)
 			g_print ("TEST KEY: |%s|\n", keylist->_buffer [j]);
-#endif
 
         CORBA_exception_init (&ev);
 	type = bonobo_pbclient_get_type (db, "/Foo/Test", &ev);
@@ -239,12 +159,5 @@ main (int argc, char **argv)
 	g_assert (!BONOBO_EX (&ev));
         CORBA_exception_free (&ev);
 
-        CORBA_exception_init (&ev);
-	value = bonobo_pbclient_get_value (db, "/Desktop Entry", TC_GNOME_DesktopEntry, &ev);
-	g_message (G_STRLOC ": %p", value);
-	if (value)
-		printf ("got value as GNOME::DesktopEntry\n");
-        CORBA_exception_free (&ev);
-
 	exit (0);
 }