diff options
| -rw-r--r-- | endless/Makefile.am | 1 | ||||
| -rw-r--r-- | endless/eosinit.c | 65 | ||||
| -rw-r--r-- | endless/eosutil.c | 68 |
3 files changed, 69 insertions, 65 deletions
diff --git a/endless/Makefile.am b/endless/Makefile.am index 4640cde..c49684d 100644 --- a/endless/Makefile.am +++ b/endless/Makefile.am @@ -49,6 +49,7 @@ endless_library_sources = \ endless/eospagemanager.c \ endless/eosresource.c endless/eosresource-private.h \ endless/eostopbar.c endless/eostopbar-private.h \ + endless/eosutil.c \ endless/eoswindow.c \ endless/eosflexygrid.c endless/eosflexygridcell.c endless/eosflexygrid-private.h diff --git a/endless/eosinit.c b/endless/eosinit.c index dec5375..19d6d9b 100644 --- a/endless/eosinit.c +++ b/endless/eosinit.c @@ -52,68 +52,3 @@ eos_is_inited (void) { return _eos_initialized; } - -/** - * eos_get_system_personality: - * - * Retrieves the "personality" of the system. - * - * The personality is a unique string that identifies the installation - * of EndlessOS for a specific country or audience. The availability of - * certain applications, or their content, is determined by this value. - * - * Return value: (transfer none): a string, owned by the Endless SDK, - * with the name of the personality. You should never free or modify - * the returned string. - */ -const gchar * -eos_get_system_personality (void) -{ - static gchar *personality; - - if (g_once_init_enter (&personality)) - { - gchar *tmp; - - tmp = g_strdup (g_getenv ("ENDLESS_OS_PERSONALITY")); - if (tmp != NULL && tmp[0] == '\0') - { - g_free (tmp); - tmp = NULL; - } - - if (tmp == NULL) - { - GKeyFile *personality_file = g_key_file_new (); - char *path = g_build_filename (SYSCONFDIR, - "EndlessOS", - "personality.conf", - NULL); - - GError *error = NULL; - g_key_file_load_from_file (personality_file, path, - G_KEY_FILE_NONE, &error); - - if (error == NULL) - tmp = g_key_file_get_string (personality_file, "Personality", - "PersonalityName", &error); - - if (error != NULL) - { - g_critical ("No personality defined: %s", error->message); - g_error_free (error); - tmp = NULL; - } - - g_key_file_free (personality_file); - g_free (path); - } - - if (tmp == NULL) - tmp = g_strdup ("default"); - - g_once_init_leave (&personality, tmp); - } - - return personality; -} diff --git a/endless/eosutil.c b/endless/eosutil.c new file mode 100644 index 0000000..6ef12bf --- /dev/null +++ b/endless/eosutil.c @@ -0,0 +1,68 @@ +#include <glib.h> + +#include "endless.h" + +/** + * eos_get_system_personality: + * + * Retrieves the "personality" of the system. + * + * The personality is a unique string that identifies the installation + * of EndlessOS for a specific country or audience. The availability of + * certain applications, or their content, is determined by this value. + * + * Return value: (transfer none): a string, owned by the Endless SDK, + * with the name of the personality. You should never free or modify + * the returned string. + */ +const gchar * +eos_get_system_personality (void) +{ + static gchar *personality; + + if (g_once_init_enter (&personality)) + { + gchar *tmp; + + tmp = g_strdup (g_getenv ("ENDLESS_OS_PERSONALITY")); + if (tmp != NULL && tmp[0] == '\0') + { + g_free (tmp); + tmp = NULL; + } + + if (tmp == NULL) + { + GKeyFile *personality_file = g_key_file_new (); + char *path = g_build_filename (SYSCONFDIR, + "EndlessOS", + "personality.conf", + NULL); + + GError *error = NULL; + g_key_file_load_from_file (personality_file, path, + G_KEY_FILE_NONE, &error); + + if (error == NULL) + tmp = g_key_file_get_string (personality_file, "Personality", + "PersonalityName", &error); + + if (error != NULL) + { + g_critical ("No personality defined: %s", error->message); + g_error_free (error); + tmp = NULL; + } + + g_key_file_free (personality_file); + g_free (path); + } + + if (tmp == NULL) + tmp = g_strdup ("default"); + + g_once_init_leave (&personality, tmp); + } + + return personality; +} |