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