diff options
| author | Leandro A. F. Pereira <leandro@hardinfo.org> | 2008-02-10 17:02:30 +0000 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2008-02-10 17:02:30 +0000 |
| commit | eab4dfc94c17cf685f386c025c6adb7090afcaea (patch) | |
| tree | 6f13d34d96fe746d22f64f16d4d630d6e0b71f4e /hardinfo2/arch/linux/common/os.h | |
| parent | 9cd3afcc20418ebc615de64f1bf76fc340b93f6f (diff) | |
Applied berlios developer patches #2299, #2300, #2286 (all by user esin).
Diffstat (limited to 'hardinfo2/arch/linux/common/os.h')
| -rw-r--r-- | hardinfo2/arch/linux/common/os.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hardinfo2/arch/linux/common/os.h b/hardinfo2/arch/linux/common/os.h index e4f35e95..6606123a 100644 --- a/hardinfo2/arch/linux/common/os.h +++ b/hardinfo2/arch/linux/common/os.h @@ -66,7 +66,7 @@ detect_desktop_environment(OperatingSystem * os) { const gchar *tmp = g_getenv("GNOME_DESKTOP_SESSION_ID"); FILE *version; - int maj, min; + char vers[16]; if (tmp) { /* FIXME: this might not be true, as the gnome-panel in path @@ -77,7 +77,7 @@ detect_desktop_environment(OperatingSystem * os) if (version) { char gnome[10]; - fscanf(version, "%s gnome-panel %d.%d", gnome, &maj, &min); + fscanf(version, "%s gnome-panel %s", gnome, vers); if (pclose(version)) goto unknown; } else { @@ -85,7 +85,7 @@ detect_desktop_environment(OperatingSystem * os) } os->desktop = - g_strdup_printf("GNOME %d.%d (session name: %s)", maj, min, + g_strdup_printf("GNOME %s (session name: %s)", vers, tmp); } else if (g_getenv("KDE_FULL_SESSION")) { version = popen("kcontrol --version", "r"); @@ -94,14 +94,14 @@ detect_desktop_environment(OperatingSystem * os) fgets(buf, 32, version); - fscanf(version, "KDE: %d.%d", &maj, &min); + fscanf(version, "KDE: %s", vers); if (pclose(version)) goto unknown; } else { goto unknown; } - os->desktop = g_strdup_printf("KDE %d.%d", maj, min); + os->desktop = g_strdup_printf("KDE %s", vers); } else { unknown: if (!g_getenv("DISPLAY")) { |