diff --git a/ChangeLog b/ChangeLog index b01835b7e..6a96516ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-10-05 Matthias Clasen + + * glib/gwin32.c: Documentation update. + 2001-10-04 Havoc Pennington * glib/libcharset/Makefile.am (EXTRA_DIST): add config.charset diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index b01835b7e..6a96516ac 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +2001-10-05 Matthias Clasen + + * glib/gwin32.c: Documentation update. + 2001-10-04 Havoc Pennington * glib/libcharset/Makefile.am (EXTRA_DIST): add config.charset diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b01835b7e..6a96516ac 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2001-10-05 Matthias Clasen + + * glib/gwin32.c: Documentation update. + 2001-10-04 Havoc Pennington * glib/libcharset/Makefile.am (EXTRA_DIST): add config.charset diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index b01835b7e..6a96516ac 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,7 @@ +2001-10-05 Matthias Clasen + + * glib/gwin32.c: Documentation update. + 2001-10-04 Havoc Pennington * glib/libcharset/Makefile.am (EXTRA_DIST): add config.charset diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b01835b7e..6a96516ac 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +2001-10-05 Matthias Clasen + + * glib/gwin32.c: Documentation update. + 2001-10-04 Havoc Pennington * glib/libcharset/Makefile.am (EXTRA_DIST): add config.charset diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b01835b7e..6a96516ac 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +2001-10-05 Matthias Clasen + + * glib/gwin32.c: Documentation update. + 2001-10-04 Havoc Pennington * glib/libcharset/Makefile.am (EXTRA_DIST): add config.charset diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b01835b7e..6a96516ac 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +2001-10-05 Matthias Clasen + + * glib/gwin32.c: Documentation update. + 2001-10-04 Havoc Pennington * glib/libcharset/Makefile.am (EXTRA_DIST): add config.charset diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b01835b7e..6a96516ac 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +2001-10-05 Matthias Clasen + + * glib/gwin32.c: Documentation update. + 2001-10-04 Havoc Pennington * glib/libcharset/Makefile.am (EXTRA_DIST): add config.charset diff --git a/glib/gwin32.c b/glib/gwin32.c index 99741e1be..5d22bf719 100644 --- a/glib/gwin32.c +++ b/glib/gwin32.c @@ -666,7 +666,7 @@ get_package_directory_from_module (gchar *module_name) * itself. If that DLL isn't loaded, the function proceeds as if * @dll_name was %NULL. * - * If both @package and @dll_name are NULL, the directory from where + * If both @package and @dll_name are %NULL, the directory from where * the main executable of the process was loaded is uses instead in * the same way as above. * @@ -746,14 +746,17 @@ g_win32_get_package_installation_directory (gchar *package, /** * g_win32_get_package_installation_subdirectory: - * @package: An identifier for a software package, or %NULL - * @dll_name: The name of a DLL that a package provides, or %NULL + * @package: An identifier for a software package, or %NULL. + * @dll_name: The name of a DLL that a package provides, or %NULL. * @subdir: A subdirectory of the package installation directory. * - * Returns: a newly-allocated string containg the path of the + * Returns a newly-allocated string containing the path of the * subdirectory @subdir in the return value from calling * g_win32_get_package_installation_directory() with the @package and - * @dll_name parameters. The return value should be freed with + * @dll_name parameters. + * + * Returns: a string containing the complete path to @subdir inside the + * installation directory of @package. The return value should be freed with * g_free() when no longer needed. **/