diff options
| author | Leandro A. F. Pereira <leandro@hardinfo.org> | 2006-12-26 15:18:24 +0000 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2006-12-26 15:18:24 +0000 |
| commit | 2ca2315a3b06f17e65aca09e828ad1448eb84689 (patch) | |
| tree | e2761378bc11e2c7b0c32a8d5a20295529065bb0 | |
| parent | 8b3968f8511d1e8d51ff9fb78d9288a1e88e4b56 (diff) | |
More fixes.
| -rw-r--r-- | hardinfo2/arch/common/display.h | 2 | ||||
| -rw-r--r-- | hardinfo2/arch/linux/common/os.h | 23 | ||||
| -rw-r--r-- | hardinfo2/vendor.c | 1 |
3 files changed, 16 insertions, 10 deletions
diff --git a/hardinfo2/arch/common/display.h b/hardinfo2/arch/common/display.h index 7bab4b50..5c1ed849 100644 --- a/hardinfo2/arch/common/display.h +++ b/hardinfo2/arch/common/display.h @@ -127,7 +127,7 @@ computer_get_display(void) GdkScreen *screen = gdk_screen_get_default(); - if (screen) { + if (screen && GDK_IS_SCREEN(screen)) { di->width = gdk_screen_get_width(screen); di->height = gdk_screen_get_height(screen); } else { diff --git a/hardinfo2/arch/linux/common/os.h b/hardinfo2/arch/linux/common/os.h index 0f7b59e3..b4404925 100644 --- a/hardinfo2/arch/linux/common/os.h +++ b/hardinfo2/arch/linux/common/os.h @@ -105,18 +105,23 @@ detect_desktop_environment(OperatingSystem * os) if (!g_getenv("DISPLAY")) { os->desktop = g_strdup("Terminal"); } else { - const gchar *windowman; GdkScreen *screen = gdk_screen_get_default(); - - windowman = gdk_x11_screen_get_window_manager_name(screen); - if (g_str_equal(windowman, "Xfwm4")) { - /* FIXME: check if xprop -root | grep XFCE_DESKTOP_WINDOW - is defined */ - os->desktop = g_strdup("XFCE 4"); + if (screen && GDK_IS_SCREEN(screen)) { + const gchar *windowman; + + windowman = gdk_x11_screen_get_window_manager_name(screen); + + if (g_str_equal(windowman, "Xfwm4")) { + /* FIXME: check if xprop -root | grep XFCE_DESKTOP_WINDOW + is defined */ + os->desktop = g_strdup("XFCE 4"); + } else { + os->desktop = g_strdup_printf("Unknown (Window Manager: %s)", + windowman); + } } else { - os->desktop = g_strdup_printf("Unknown (Window Manager: %s)", - windowman); + os->desktop = g_strdup("Unknown"); } } } diff --git a/hardinfo2/vendor.c b/hardinfo2/vendor.c index 74f56847..b476f327 100644 --- a/hardinfo2/vendor.c +++ b/hardinfo2/vendor.c @@ -56,6 +56,7 @@ static const Vendor vendors[] = { { "Dell", "Dell Computer Corp.", "www.dell.com" }, { "Logitech", "Logitech International SA", "www.logitech.com" }, { "FUJITSU", "Fujitsu", "www.fujitsu.com" }, + { "CDU", "Sony", "www.sony.com" }, { NULL, NULL, NULL }, }; |