diff options
| author | Rob Bradford <rob@linux.intel.com> | 2011-06-16 12:11:54 +0100 |
|---|---|---|
| committer | Ross Burton <ross@linux.intel.com> | 2011-06-28 15:25:45 +0100 |
| commit | 98b04b65a4a4447a7e90554551775a57df53f6ed (patch) | |
| tree | eecb192bae17e27cca9572218b248872ee5be896 | |
| parent | b2523117a166575572c501acbb5f8ff09922f337 (diff) | |
| download | gconf-98b04b65a4a4447a7e90554551775a57df53f6ed.tar.gz | |
gconf-database: Expose locale cache so it can be used by DBUS implementation
| -rw-r--r-- | gconf/gconf-database.c | 16 | ||||
| -rw-r--r-- | gconf/gconf-database.h | 1 |
2 files changed, 8 insertions, 9 deletions
diff --git a/gconf/gconf-database.c b/gconf/gconf-database.c index 7ce2cc01..9f37badc 100644 --- a/gconf/gconf-database.c +++ b/gconf/gconf-database.c @@ -32,8 +32,6 @@ * Forward decls */ -static GConfLocaleList* locale_cache_lookup(const gchar* locale); - typedef struct _Listener Listener; struct _Listener { @@ -95,7 +93,7 @@ impl_ConfigDatabase_lookup_with_locale(PortableServer_Servant servant, if (gconfd_check_in_shutdown (ev)) return gconf_invalid_corba_value (); - locale_list = locale_cache_lookup(locale); + locale_list = gconfd_locale_cache_lookup(locale); val = gconf_database_query_value(db, key, locale_list->list, use_schema_default, @@ -154,7 +152,7 @@ impl_ConfigDatabase_lookup_default_value(PortableServer_Servant servant, if (gconfd_check_in_shutdown (ev)) return gconf_invalid_corba_value (); - locale_list = locale_cache_lookup(locale); + locale_list = gconfd_locale_cache_lookup(locale); val = gconf_database_query_default_value(db, key, locale_list->list, @@ -336,7 +334,7 @@ impl_ConfigDatabase_all_entries(PortableServer_Servant servant, if (gconfd_check_in_shutdown (ev)) return; - locale_list = locale_cache_lookup(locale); + locale_list = gconfd_locale_cache_lookup(locale); pairs = gconf_database_all_entries(db, dir, locale_list->list, &error); @@ -548,7 +546,7 @@ impl_ConfigDatabase2_lookup_with_schema_name(PortableServer_Servant servant, if (gconfd_check_in_shutdown (ev)) return gconf_invalid_corba_value (); - locale_list = locale_cache_lookup(locale); + locale_list = gconfd_locale_cache_lookup(locale); s = NULL; val = gconf_database_query_value(db, key, locale_list->list, @@ -614,7 +612,7 @@ impl_ConfigDatabase2_all_entries_with_schema_name(PortableServer_Servant servant if (gconfd_check_in_shutdown (ev)) return; - locale_list = locale_cache_lookup(locale); + locale_list = gconfd_locale_cache_lookup(locale); pairs = gconf_database_all_entries(db, dir, locale_list->list, &error); @@ -1855,8 +1853,8 @@ gconf_database_log_listeners_to_string (GConfDatabase *db, static GConfLocaleCache* locale_cache = NULL; -static GConfLocaleList* -locale_cache_lookup(const gchar* locale) +GConfLocaleList* +gconfd_locale_cache_lookup (const gchar *locale) { GConfLocaleList* locale_list; diff --git a/gconf/gconf-database.h b/gconf/gconf-database.h index 604b8197..abf7131a 100644 --- a/gconf/gconf-database.h +++ b/gconf/gconf-database.h @@ -137,6 +137,7 @@ void gconf_database_clear_cache_for_sources (GConfDatabase *db, GConfSources *sources, GError **err); +GConfLocaleList* gconfd_locale_cache_lookup (const gchar *locale); void gconfd_locale_cache_expire (void); void gconfd_locale_cache_drop (void); |