rename GConf.idl to GConfX.idl in order to build on non-case-sensitive

2002-09-09  jacob berkman  <jacob@ximian.com>

	* gconf/GConf.idl:
	* gconf/GConfX.idl:
	* gconf/Makefile.am:
	* gconf/gconf-database.h:
	* gconf/gconf-internals.h:
	* gconf/gconf.c:
	* gconf/gconfd.c:
	* gconf/gconfd.h: rename GConf.idl to GConfX.idl in order to build
	on non-case-sensitive file systems

	* backends/Makefile.am:
	* wrappers/gtk/Makefile.am: link modules against libgconf.la
	(fixes build on OS X)

11 files changed, 30 insertions, 252 deletions

diff --git a/ChangeLog b/ChangeLog
index 2680a282..59561559 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2002-09-09  jacob berkman  <jacob@ximian.com>
+
+	* gconf/GConf.idl:
+	* gconf/GConfX.idl:
+	* gconf/Makefile.am:
+	* gconf/gconf-database.h:
+	* gconf/gconf-internals.h:
+	* gconf/gconf.c:
+	* gconf/gconfd.c:
+	* gconf/gconfd.h: rename GConf.idl to GConfX.idl in order to build
+	on non-case-sensitive file systems
+
+	* backends/Makefile.am:
+	* wrappers/gtk/Makefile.am: link modules against libgconf.la
+	(fixes build on OS X)
+
 2002-07-29  Dave Camp  <dave@ximian.com>
 
 	* gconf/gconf-internals.c: (gconf_activate_server): Use libexecdir
diff --git a/backends/Makefile.am b/backends/Makefile.am
index 69d6160e..b0174df2 100644
--- a/backends/Makefile.am
+++ b/backends/Makefile.am
@@ -24,10 +24,10 @@ libgconfbackend_xml_la_SOURCES = \
 	xml-backend.c
 
 libgconfbackend_xml_la_LDFLAGS = -avoid-version -module
-libgconfbackend_xml_la_LIBADD  = $(GLIB_LIBS) $(XML_LIBS)
+libgconfbackend_xml_la_LIBADD  = $(GLIB_LIBS) $(XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
 
 libgconfbackend_bdb_la_SOURCES = bdb.c bdb.h bdb-backend.c val-encode.c val-encode.h dir-utils.c dir-utils.h
 
 
 libgconfbackend_bdb_la_LDFLAGS = -avoid-version -module
-libgconfbackend_bdb_la_LIBADD = $(GLIB_LIBS) $(BDB_LIBS)
+libgconfbackend_bdb_la_LIBADD = $(GLIB_LIBS) $(BDB_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
diff --git a/gconf/GConf.idl b/gconf/GConf.idl
deleted file mode 100644
index a3bee37a..00000000
--- a/gconf/GConf.idl
+++ /dev/null
@@ -1,240 +0,0 @@
-
-// Really, this whole interface should be used only via the GConf 
-// client library. I reserve the right to change it whenever I feel 
-// like it. So there.
-
-enum ConfigBasicValueType { BInvalidVal, BIntVal, BStringVal, BFloatVal, BBoolVal, BSchemaVal };
-
-enum ConfigValueType { InvalidVal, IntVal, StringVal, FloatVal, BoolVal, SchemaVal, ListVal, PairVal };
-
-struct ConfigSchema {
-  ConfigValueType value_type;
-  ConfigValueType value_list_type;
-  ConfigValueType value_car_type;
-  ConfigValueType value_cdr_type;
-  string locale;
-  string short_desc;
-  string long_desc;
-  string owner;
-  // Work around lack of recursive data types
-  string encoded_default_value;
-};
-
-union ConfigBasicValue switch (ConfigBasicValueType) {
- case BInvalidVal:
-   long dummy;
- case BIntVal: 
-   long int_value;
- case BStringVal:
-   string string_value;
- case BFloatVal:
-   float float_value;
- case BBoolVal:
-   boolean bool_value;
-   // hope this doesn't slow down transmission of smaller types 
- case BSchemaVal:
-   ConfigSchema schema_value;
-};
-
-typedef sequence<ConfigBasicValue> BasicValueList;
-
-struct ConfigList {
-  BasicValueList seq;
-  ConfigBasicValueType list_type;
-};
-
-union ConfigValue switch (ConfigValueType) {
- case InvalidVal:
-   long dummy;
- case IntVal:
-   long int_value;
- case StringVal:
-   string string_value;
- case FloatVal:
-   float float_value;
- case BoolVal:
-   boolean bool_value;
- case SchemaVal:
-   ConfigSchema schema_value;
- case ListVal:
-   ConfigList list_value;
- case PairVal:
-   BasicValueList pair_value;
-};
-
-interface ConfigDatabase;
-
-interface ConfigListener {
-  typedef sequence<string> KeyList;
-  
-  oneway void notify (in ConfigDatabase database,
-                      in unsigned long cnxn,
-                      in string key,
-                      in ConfigValue value,
-                      in boolean is_default,
-                      in boolean is_writable);
-
-  oneway void ping ();
-
-  /// This should conceivably not be oneway.
-  /// I'm worried about the server blocking waiting for
-  /// busy clients.
-
-  oneway void update_listener (in ConfigDatabase database,
-                               in string db_address,
-                               in unsigned long old_cnxn,
-                               in string where,
-                               in unsigned long new_cnxn);
-  
-  oneway void invalidate_cached_values (in ConfigDatabase database,
-                                        in KeyList keys);
-  
-  // Called when a new daemon starts up, and we need to drop caches
-  // in case the new daemon has a different default database
-  oneway void drop_all_caches ();
-};
-
-// Sync this with GConfErrNo in gconf.h, when it makes sense
-// (e.g. G_CONF_NO_SERVER doesn't make sense here)
-
-enum ConfigErrorType {
-  ConfigFailed, ConfigNoPermission,
-  ConfigBadAddress, ConfigBadKey,
-  ConfigParseError, ConfigCorrupt,
-  ConfigTypeMismatch, ConfigIsDir, ConfigIsKey,
-  ConfigOverridden, ConfigLockFailed,
-  ConfigNoWritableDatabase, ConfigInShutdown
-};
-
-exception ConfigException {
-  ConfigErrorType err_no;
-  string message;
-};
-
-interface ConfigDatabase {
-  typedef sequence<string> KeyList;
-  typedef sequence<ConfigValue> ValueList;
-  typedef sequence<boolean> IsDefaultList;
-  typedef sequence<boolean> IsWritableList;
-  
-  // "where" is the portion of the namespace to listen to
-  // Returns a connection ID for removal
-  unsigned long add_listener(in string where,
-                             in ConfigListener who);  
-
-  void remove_listener(in unsigned long cnxn);
-  
-  ConfigValue lookup(in string key)
-    raises (ConfigException);
-
-  // separate from lookup for efficiency
-  ConfigValue lookup_with_locale(in string key,
-                                 in string locale,
-                                 in boolean use_schema_default,
-                                 out boolean value_is_default,
-                                 out boolean value_is_writable)
-    raises (ConfigException);
-
-  // syntactic sugar, semi-hack: should maybe use a get_metainfo()
-  // function (which we should have anyway)
-  ConfigValue lookup_default_value(in string key,
-                                   in string locale)
-    raises (ConfigException);
-
-  // Grab lots of values at once
-  void batch_lookup (in KeyList keys,
-                     in string locale,
-                     out ValueList values,
-                     out IsDefaultList is_defaults,
-                     out IsWritableList is_writables)
-    raises (ConfigException);
-  
-  void set(in string key, in ConfigValue value)
-    raises (ConfigException);
-  
-  void unset(in string key)
-    raises (ConfigException);
-
-  void unset_with_locale(in string key, in string locale)
-    raises (ConfigException);
-
-  // Setting to InvalidVal does an unset
-  void batch_change(in string locale, // only used for unsets 
-                    in KeyList keys,
-                    in ValueList values)
-    raises (ConfigException);
-  
-  boolean dir_exists(in string dir)
-    raises (ConfigException);
-
-  void remove_dir(in string dir)
-    raises (ConfigException);
-
-  void all_entries(in string dir,
-                   in string locale,
-                   out KeyList keys,
-                   out ValueList values,
-                   out IsDefaultList is_defaults,
-                   out IsWritableList is_writables)
-    raises (ConfigException);
-
-  void all_dirs(in string dir,
-                out KeyList subdirs)
-    raises (ConfigException);
-  
-  // if first arg is a key, second arg should be a key pointing
-  //  to a schema. 
-  // if first arg is a dir, second arg should be a key pointing 
-  //  to a dir full of schemas.
-  void set_schema(in string key,
-                  in string schema_key)
-    raises (ConfigException);
-
-  void sync()
-    raises (ConfigException);
-
-  void clear_cache();
-  
-  void synchronous_sync()
-    raises (ConfigException);
-};
-
-interface ConfigDatabase2 : ConfigDatabase {
-
-  typedef sequence<string> SchemaNameList;
-  
-  // Fixed version of lookup_with_locale that gets
-  // all the relevant information
-  ConfigValue lookup_with_schema_name (in string key,
-                                       in string locale,
-                                       in boolean use_schema_default,
-                                       out string  schema_name,
-                                       out boolean value_is_default,
-                                       out boolean value_is_writable)
-    raises (ConfigException);
-  
-  void all_entries_with_schema_name (in string dir,
-                                     in string locale,
-                                     out KeyList keys,
-                                     out ValueList values,
-                                     out SchemaNameList schema_names,
-                                     out IsDefaultList is_defaults,
-                                     out IsWritableList is_writables)
-    raises (ConfigException);  
-};
-
-interface ConfigServer {
-
-  ConfigDatabase get_default_database ();
-
-  // Use a specific address instead of the default database;
-  // invalid_context returned on failure.
-  ConfigDatabase get_database (in string address);
-
-  void add_client (in ConfigListener client);
-  void remove_client (in ConfigListener client);
-  
-  long ping();
-
-  void shutdown();
-};
diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index 358a4bf1..9b6bc7d1 100644
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -30,7 +30,7 @@ lib_LTLIBRARIES = libgconf-1.la
 
 bin_PROGRAMS = gconfd-1 gconftool-1 gconf-sanity-check-1
 
-CORBA_SOURCES = GConf-common.c GConf-skels.c GConf-stubs.c GConf.h
+CORBA_SOURCES = GConfX-common.c GConfX-skels.c GConfX-stubs.c GConfX.h
 
 BUILT_SOURCES = $(CORBA_SOURCES)
 
@@ -75,8 +75,8 @@ gconf_sanity_check_1_SOURCES = \
 
 gconf_sanity_check_1_LDADD = $(EFENCE) $(INTLLIBS) $(OAF_LIBS) $(GLIB_LIBS) $(ORBIT_LIBS) $(POPT_LIBS) $(XML_LIBS) libgconf-$(MAJOR_VERSION).la
 
-$(CORBA_SOURCES): $(srcdir)/GConf.idl
-	orbit-idl $(srcdir)/GConf.idl
+$(CORBA_SOURCES): $(srcdir)/GConfX.idl
+	orbit-idl $(srcdir)/GConfX.idl
 
 libgconf_1_la_SOURCES = \
 	gconf-internals.c	\
@@ -102,7 +102,7 @@ libgconf_1_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF
 
 libgconf_1_la_LIBADD = $(INTLLIBS) $(OAF_LIBS) $(GLIB_LIBS)
 
-EXTRA_DIST=GConf.idl default.path.in
+EXTRA_DIST=GConfX.idl default.path.in
 
 install-exec-local:
 	(cd $(DESTDIR)$(bindir) && $(LN_S) -f gconftool-$(MAJOR_VERSION) gconftool)
diff --git a/gconf/gconf-database.h b/gconf/gconf-database.h
index 37c7c12b..7638a28e 100644
--- a/gconf/gconf-database.h
+++ b/gconf/gconf-database.h
@@ -27,7 +27,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 #include "gconf-error.h"
-#include "GConf.h"
+#include "GConfX.h"
 #include "gconf-listeners.h"
 #include "gconf-sources.h"
 #include "gconf-internals.h"
diff --git a/gconf/gconf-internals.c b/gconf/gconf-internals.c
index 9144bded..c641f66d 100644
--- a/gconf/gconf-internals.c
+++ b/gconf/gconf-internals.c
@@ -2869,6 +2869,8 @@ orb_remove_connection (GIOPConnection * cnx)
 #include <netinet/in.h>
 #include <netdb.h>
 #include <arpa/inet.h>
+#include <sys/socket.h>
+
 const char *
 get_hostname (void)
 {
diff --git a/gconf/gconf-internals.h b/gconf/gconf-internals.h
index cb08f241..f3474af0 100644
--- a/gconf/gconf-internals.h
+++ b/gconf/gconf-internals.h
@@ -29,7 +29,7 @@
 #include <glib.h>
 #include "gconf-error.h"
 #include "gconf-value.h"
-#include "GConf.h"
+#include "GConfX.h"
 
 gchar*       gconf_key_directory  (const gchar* key);
 const gchar* gconf_key_key        (const gchar* key);
diff --git a/gconf/gconf.c b/gconf/gconf.c
index 305b662f..1679dc9a 100644
--- a/gconf/gconf.c
+++ b/gconf/gconf.c
@@ -18,7 +18,7 @@
  */
 
 #include <popt.h>
-#include "GConf.h"
+#include "GConfX.h"
 #include "gconf.h"
 #include "gconf-internals.h"
 #include "gconf-sources.h"
diff --git a/gconf/gconfd.c b/gconf/gconfd.c
index 806d0027..4c5431d6 100644
--- a/gconf/gconfd.c
+++ b/gconf/gconfd.c
@@ -38,7 +38,7 @@
 #include "gconf-database.h"
 #include <orb/orbit.h>
 
-#include "GConf.h"
+#include "GConfX.h"
 
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/gconf/gconfd.h b/gconf/gconfd.h
index 20bbd27a..238a3108 100644
--- a/gconf/gconfd.h
+++ b/gconf/gconfd.h
@@ -27,7 +27,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 #include "gconf-error.h"
-#include "GConf.h"
+#include "GConfX.h"
 #include "gconf-database.h"
 
 PortableServer_POA gconf_get_poa ();
diff --git a/wrappers/gtk/Makefile.am b/wrappers/gtk/Makefile.am
index ef102f40..2c3c3a70 100644
--- a/wrappers/gtk/Makefile.am
+++ b/wrappers/gtk/Makefile.am
@@ -13,7 +13,7 @@ libgconf_gtk_1_la_SOURCES = \
 
 libgconf_gtk_1_la_LDFLAGS=-version-info $(GCONFGTK_CURRENT):$(GCONFGTK_REVISION):$(GCONFGTK_AGE)
 
-libgconf_gtk_1_la_LIBADD= $(INTLLIBS) $(OAF_LIBS) $(GTK_LIBS)
+libgconf_gtk_1_la_LIBADD= $(INTLLIBS) $(OAF_LIBS) $(GTK_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
 
 noinst_PROGRAMS= testgconfclient