Home | History | Annotate | Download | only in patches
      1  17760  mattman /jds/bin/diff -uprN bug-buddy-2.25.91.old/src/bug-buddy.c bug-buddy-2.25.91/src/bug-buddy.c
      2  17760  mattman --- bug-buddy-2.25.91.old/src/bug-buddy.c	2009-03-11 11:13:44.516038000 +0000
      3  17760  mattman +++ bug-buddy-2.25.91/src/bug-buddy.c	2009-03-11 11:26:00.127656000 +0000
      4  17760  mattman @@ -1717,13 +1717,18 @@ fill_system_info (GtkBuilder *ui)
      5  17760  mattman  	modules = NULL;
      6  17760  mattman  
      7  17760  mattman  	if (uname (&uts_buf) == 0) {
      8  17760  mattman -		g_string_append_printf (system_info, "System: %s %s %s %s\n", uts_buf.sysname, uts_buf.release, uts_buf.version, uts_buf.machine);
      9  17760  mattman +		g_string_append_printf (system_info, "System: %s %s %s %s\n",
     10  17760  mattman +            (uts_buf.sysname ? uts_buf.sysname : " "),
     11  17760  mattman +            (uts_buf.release ? uts_buf.release : " "),
     12  17760  mattman +            (uts_buf.version ? uts_buf.version : " "),
     13  17760  mattman +            (uts_buf.machine ? uts_buf.machine : " "));
     14  17760  mattman  	}
     15  17760  mattman  
     16  17760  mattman  	/* X server checks */
     17  17760  mattman -	g_string_append_printf (system_info, "X Vendor: %s\n", ServerVendor (gdk_display));
     18  17760  mattman -	g_string_append_printf (system_info, "X Vendor Release: %d\n", VendorRelease (gdk_display));
     19  17760  mattman -	
     20  17760  mattman +	g_string_append_printf (system_info, "X Vendor: %s\n",
     21  17760  mattman +       (ServerVendor(gdk_display) != NULL ? ServerVendor(gdk_display) : " "));
     22  17760  mattman +	g_string_append_printf (system_info, "X Vendor Release: %d\n",
     23  17760  mattman +       (VendorRelease(gdk_display) != NULL ? VendorRelease(gdk_display) : " "));
     24  17760  mattman  	
     25  17760  mattman  	/* Selinux checks */
     26  17760  mattman  	has_selinux = FALSE;
     27  17760  mattman @@ -1747,10 +1752,12 @@ fill_system_info (GtkBuilder *ui)
     28  17760  mattman  	a11y = gconf_client_get_bool (gconf_client, ACCESSIBILITY_KEY, NULL);
     29  17760  mattman  	g_string_append_printf (system_info, "Accessibility: %s\n", a11y?"Enabled":"Disabled");
     30  17760  mattman  	str = gconf_client_get_string (gconf_client, GTK_THEME_KEY, NULL);
     31  17760  mattman -	g_string_append_printf (system_info, "GTK+ Theme: %s\n", str);
     32  17760  mattman +	g_string_append_printf (system_info, "GTK+ Theme: %s\n",
     33  17760  mattman +        (str ? str : " "));
     34  17760  mattman  	g_free (str);
     35  17760  mattman  	str = gconf_client_get_string (gconf_client, ICON_THEME_KEY, NULL);
     36  17760  mattman -	g_string_append_printf (system_info, "Icon Theme: %s\n", str);
     37  17760  mattman +	g_string_append_printf (system_info, "Icon Theme: %s\n",
     38  17760  mattman +        (str ? str : " "));
     39  17760  mattman  	g_free (str);
     40  17760  mattman  
     41  17760  mattman  	/* add the GTK+ loaded modules. to do that, we look both in GConf and
     42  17760  mattman @@ -1783,7 +1790,8 @@ fill_system_info (GtkBuilder *ui)
     43  17760  mattman  				name = gconf_get_key_name_from_path (gconf_entry_get_key (entry));
     44  17760  mattman  
     45  17760  mattman  				if (!g_strstr_len (modules->str, modules->len, name)) {
     46  17760  mattman -					g_string_append_printf (modules, "%s, ", name);
     47  17760  mattman +					g_string_append_printf (modules, "%s, ",
     48  17760  mattman +                        (name ? name : " "));
     49  17760  mattman  				}
     50  17760  mattman  
     51  17760  mattman  				g_free (name);
     52  17760  mattman @@ -1809,7 +1817,8 @@ fill_system_info (GtkBuilder *ui)
     53  17760  mattman  
     54  17760  mattman  		for (i = 0; splitted[i]; i++) {
     55  17760  mattman  			if (!g_strstr_len (modules->str, modules->len, splitted[i])) {
     56  17760  mattman -				g_string_append_printf (modules, "%s, ", splitted[i]);
     57  17760  mattman +				g_string_append_printf (modules, "%s, ",
     58  17760  mattman +                    (splitted[i] ? splitted[i] : " "));
     59  17760  mattman  			}
     60  17760  mattman  		}
     61  17760  mattman  
     62