diff options
| author | Leandro A. F. Pereira <leandro@hardinfo.org> | 2006-01-31 23:35:06 +0000 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2006-01-31 23:35:06 +0000 |
| commit | 6ad1c1c257c74c82179a0eb62277ceef1cc4e9e0 (patch) | |
| tree | 73a0657cad8a96c0d0611ec900b95adc4a264be0 /hardinfo2/arch/common | |
| parent | e9906f6d9335ae96cd6afac714646b97edc469a5 (diff) | |
Sync with internal subversion
Diffstat (limited to 'hardinfo2/arch/common')
| -rw-r--r-- | hardinfo2/arch/common/languages.h | 2 | ||||
| -rw-r--r-- | hardinfo2/arch/common/zlib.h | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/hardinfo2/arch/common/languages.h b/hardinfo2/arch/common/languages.h index 12761976..3a31ef7f 100644 --- a/hardinfo2/arch/common/languages.h +++ b/hardinfo2/arch/common/languages.h @@ -63,7 +63,7 @@ scan_languages(OperatingSystem * os) } else { gchar *currlocale; - retval = g_strdup_printf("%s$%s$%s=\n", retval, name, name); + retval = g_strdup_printf("%s$%s$%s=%s\n", retval, name, name, title); currlocale = g_strdup_printf("[Locale Information]\n" "Name=%s (%s)\n" diff --git a/hardinfo2/arch/common/zlib.h b/hardinfo2/arch/common/zlib.h index 74145cae..f68d60f4 100644 --- a/hardinfo2/arch/common/zlib.h +++ b/hardinfo2/arch/common/zlib.h @@ -27,8 +27,12 @@ benchmark_zlib(void) if (!(compress && compressBound)) { libz = g_module_open("libz", G_MODULE_BIND_LAZY); if (!libz) { - return g_strdup("[Error]\n" - "ZLib not found="); + libz = g_module_open("/lib/libz.so", G_MODULE_BIND_LAZY); + if (!libz) { + g_print("%s\n", g_module_error()); + return g_strdup("[Error]\n" + "ZLib not found="); + } } if (!g_module_symbol(libz, "compress", (gpointer) & compress) |