diff options
author | Rob Bradford <rob@linux.intel.com> | 2011-06-16 14:08:54 +0100 |
---|---|---|
committer | Ross Burton <ross@linux.intel.com> | 2011-06-28 15:25:45 +0100 |
commit | bd491608a31dec52e98491d7a4c9aae4386a227e (patch) | |
tree | 65c0b8d4b65815bc72985ffa955e9f183438621a | |
parent | 9e43d2177537b7cffe4e4cf9f727fb3920d12973 (diff) | |
download | gconf-bd491608a31dec52e98491d7a4c9aae4386a227e.tar.gz |
gconf-internals: Surround CORBA functionality with #ifdef guards
-rw-r--r-- | gconf/gconf-internals.c | 5 | ||||
-rw-r--r-- | gconf/gconf-internals.h | 22 |
2 files changed, 23 insertions, 4 deletions
diff --git a/gconf/gconf-internals.c b/gconf/gconf-internals.c index ed42ca62..9550b1a7 100644 --- a/gconf/gconf-internals.c +++ b/gconf/gconf-internals.c @@ -131,6 +131,7 @@ gconf_key_key (const gchar* key) * Random stuff */ +#if HAVE_CORBA GConfValue* gconf_value_from_corba_value(const ConfigValue* value) { @@ -611,6 +612,7 @@ gconf_schema_from_corba_schema(const ConfigSchema* cs) return sc; } +#endif /* HAVE_CORBA */ const gchar* gconf_value_type_to_string(GConfValueType type) @@ -2140,6 +2142,7 @@ gconf_value_encode (GConfValue* val) return retval; } +#ifdef HAVE_CORBA /* * Locks @@ -2911,6 +2914,8 @@ gconf_CORBA_Object_hash (gconstpointer key) return retval; } +#endif /* HAVE_CORBA */ + void _gconf_init_i18n (void) { diff --git a/gconf/gconf-internals.h b/gconf/gconf-internals.h index b9cbaf0b..0841c8ad 100644 --- a/gconf/gconf-internals.h +++ b/gconf/gconf-internals.h @@ -36,7 +36,10 @@ #include "gconf-value.h" #include "gconf-engine.h" #include "gconf-sources.h" + +#ifdef HAVE_CORBA #include "GConfX.h" +#endif #ifdef G_OS_WIN32 @@ -88,6 +91,7 @@ const char *_gconf_win32_get_home_dir (void); gchar* gconf_key_directory (const gchar* key); const gchar* gconf_key_key (const gchar* key); +#ifdef HAVE_CORBA GConfValue* gconf_value_from_corba_value (const ConfigValue *value); ConfigValue* gconf_corba_value_from_gconf_value (const GConfValue *value); void gconf_fill_corba_value_from_gconf_value (const GConfValue *value, @@ -101,6 +105,7 @@ GConfSchema* gconf_schema_from_corba_schema (const ConfigSchema *cs) gchar* gconf_object_to_string (CORBA_Object obj, GError **err); +#endif char *gconf_address_list_get_persistent_name (GSList *addresses); GSList *gconf_persistent_name_get_address_list (const char *persistent_name); @@ -117,7 +122,9 @@ GSList* gconf_load_source_path (const gchar* filename, GError** err); void gconf_shutdown_daemon (GError **err); gboolean gconf_ping_daemon (void); gboolean gconf_spawn_daemon (GError **err); +#ifdef HAVE_CORBA int gconf_orb_release (void); +#endif /* Returns 0 on failure (or if the string is "0" of course) */ gulong gconf_string_to_gulong (const gchar *str); @@ -207,16 +214,14 @@ void gconf_set_daemon_ior (const gchar *ior); const gchar* gconf_get_daemon_ior (void); /* Returns TRUE if there was an error, frees exception, sets err */ +#ifdef HAVE_CORBA gboolean gconf_handle_oaf_exception (CORBA_Environment* ev, GError** err); +#endif void gconf_nanosleep (gulong useconds); typedef struct _GConfLock GConfLock; -GConfLock* gconf_get_lock (const gchar *lock_directory, - GError **err); -gboolean gconf_release_lock (GConfLock *lock, - GError **err); GError* gconf_error_new (GConfError en, const gchar* format, ...) G_GNUC_PRINTF (2, 3); @@ -227,6 +232,7 @@ void gconf_set_error (GError** err, /* merge two errors into a single message */ GError* gconf_compose_errors (GError* err1, GError* err2); +#ifdef HAVE_CORBA CORBA_ORB gconf_orb_get (void); ConfigServer gconf_activate_server (gboolean start_if_not_found, @@ -235,6 +241,12 @@ ConfigServer gconf_activate_server (gboolean start_if_not_found, char* gconf_get_lock_dir (void); char* gconf_get_daemon_dir (void); +GConfLock* gconf_get_lock (const gchar *lock_directory, + GError **err); +gboolean gconf_release_lock (GConfLock *lock, + GError **err); +#endif + gboolean gconf_schema_validate (const GConfSchema *sc, GError **err); gboolean gconf_value_validate (const GConfValue *value, @@ -253,9 +265,11 @@ gboolean gconf_engine_recursive_unset (GConfEngine *engine, GConfUnsetFlags flags, GError **err); +#ifdef HAVE_CORBA gboolean gconf_CORBA_Object_equal (gconstpointer a, gconstpointer b); guint gconf_CORBA_Object_hash (gconstpointer key); +#endif GConfValue* gconf_schema_steal_default_value (GConfSchema *schema); |