16116N/A@@ -1717,13 +1717,18 @@ fill_system_info (GtkBuilder *ui)
16116N/A+ g_string_append_printf (system_info, "System: %s %s %s %s\n",
16116N/A- g_string_append_printf (system_info, "X Vendor: %s\n", ServerVendor (gdk_display));
16116N/A- g_string_append_printf (system_info, "X Vendor Release: %d\n", VendorRelease (gdk_display));
16116N/A+ g_string_append_printf (system_info, "X Vendor: %s\n",
16116N/A+ (ServerVendor(gdk_display) != NULL ? ServerVendor(gdk_display) : " "));
16116N/A+ g_string_append_printf (system_info, "X Vendor Release: %d\n",
16116N/A+ (VendorRelease(gdk_display) != NULL ? VendorRelease(gdk_display) : " "));
16116N/A@@ -1747,10 +1752,12 @@ fill_system_info (GtkBuilder *ui)
16116N/A a11y = gconf_client_get_bool (gconf_client, ACCESSIBILITY_KEY, NULL);
16116N/A g_string_append_printf (system_info, "Accessibility: %s\n", a11y?"Enabled":"Disabled");
16116N/A str = gconf_client_get_string (gconf_client, GTK_THEME_KEY, NULL);
16116N/A- g_string_append_printf (system_info, "GTK+ Theme: %s\n", str);
16116N/A+ g_string_append_printf (system_info, "GTK+ Theme: %s\n",
16116N/A str = gconf_client_get_string (gconf_client, ICON_THEME_KEY, NULL);
16116N/A- g_string_append_printf (system_info, "Icon Theme: %s\n", str);
16116N/A+ g_string_append_printf (system_info, "Icon Theme: %s\n",
16116N/A /* add the GTK+ loaded modules. to do that, we look both in GConf and
16116N/A@@ -1783,7 +1790,8 @@ fill_system_info (GtkBuilder *ui)
16116N/A name = gconf_get_key_name_from_path (gconf_entry_get_key (entry));
16116N/A if (!g_strstr_len (modules->str, modules->len, name)) {
16116N/A- g_string_append_printf (modules, "%s, ", name);
16116N/A+ g_string_append_printf (modules, "%s, ",
16116N/A@@ -1809,7 +1817,8 @@ fill_system_info (GtkBuilder *ui)
16116N/A for (i = 0; splitted[i]; i++) {
16116N/A if (!g_strstr_len (modules->str, modules->len, splitted[i])) {
16116N/A- g_string_append_printf (modules, "%s, ", splitted[i]);
16116N/A+ g_string_append_printf (modules, "%s, ",
16116N/A+ (splitted[i] ? splitted[i] : " "));