diff options
| author | Tor Lillqvist <tml@iki.fi> | 2001-01-17 21:37:32 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2001-01-17 21:37:32 +0000 |
| commit | 69dbd6eb03a0abe5d0f889c670a467e74e256ef7 (patch) | |
| tree | 42e19cb11c2963abe86650d005a1fc4ffd561a4b /testglib.c | |
| parent | ff51072d5054060dd1b4550b6fe56f4a2cbfc9bf (diff) | |
| download | glib-69dbd6eb03a0abe5d0f889c670a467e74e256ef7.tar.gz | |
Add doc comments. (g_win32_get_package_installation_directory): Add one
2001-01-17 Tor Lillqvist <tml@iki.fi>
* gwin32.c (g_win32_getlocale, g_win32_error_message): Add doc
comments.
(g_win32_get_package_installation_directory): Add one parameter,
the name of a DLL in the package. Add possibility to use that to
deduce the installation directory if not entered into the
Registry. Make the return value dynamically allocated.
(g_win32_get_package_installation_subdirectory): New convenience
function.
* gutils.c (GLIB_LOCALE_DIR)
* gwin32.h: Adapt accordingly.
* testglib.c (main): Adapt tests accordingly.
Diffstat (limited to 'testglib.c')
| -rw-r--r-- | testglib.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/testglib.c b/testglib.c index 05dd7d5ac..7cbd93971 100644 --- a/testglib.c +++ b/testglib.c @@ -388,6 +388,11 @@ main (int argc, GError *error; char *name_used; gchar *p; +#ifdef G_OS_WIN32 + gchar *glib_dll = g_strdup_printf ("glib-%d.%d.dll", + GLIB_MAJOR_VERSION, + GLIB_MINOR_VERSION); +#endif g_print ("TestGLib v%u.%u.%u (i:%u b:%u)\n", glib_major_version, @@ -1145,10 +1150,17 @@ main (int argc, #ifdef G_OS_WIN32 g_print ("current locale: %s\n", g_win32_getlocale ()); - g_print ("GLib installation directory (used for message catalogs): %s\n", - g_win32_get_package_installation_directory (GETTEXT_PACKAGE)); + g_print ("GLib installation directory, from Registry entry for %s if available: %s\n", + GETTEXT_PACKAGE, + g_win32_get_package_installation_directory (GETTEXT_PACKAGE, NULL)); + g_print ("Ditto, or from GLib DLL name: %s\n", + g_win32_get_package_installation_directory (GETTEXT_PACKAGE, glib_dll)); + g_print ("Ditto, only from GLib DLL name: %s\n", + g_win32_get_package_installation_directory (NULL, glib_dll)); + g_print ("locale subdirectory of GLib installation directory: %s\n", + g_win32_get_package_installation_subdirectory (NULL, glib_dll, "locale")); g_print ("GTK+ 2.0 installation directory, if available: %s\n", - g_win32_get_package_installation_directory ("gtk20")); + g_win32_get_package_installation_directory ("gtk20", NULL)); #endif g_print ("checking file functions...\n"); |