seahorse r2567 - in trunk: . src

[sadam svn gnome org]

Author: sadam
Date: Thu Sep 25 22:41:59 2008
New Revision: 2567
URL: http://svn.gnome.org/viewvc/seahorse?rev=2567&view=rev

Log:
2008-09-25  Adam Schreiber  <sadam clemson edu>

    * src/vala-build.stamp:
    * src/seahorse-keyserver-results.c:
    * src/seahorse-keyserver-results.vala: Fix crasher part of bug 
#553648


Modified:
   trunk/ChangeLog
   trunk/src/seahorse-keyserver-results.c
   trunk/src/seahorse-keyserver-results.vala

Modified: trunk/src/seahorse-keyserver-results.c
==============================================================================
--- trunk/src/seahorse-keyserver-results.c	(original)
+++ trunk/src/seahorse-keyserver-results.c	Thu Sep 25 22:41:59 2008
@@ -164,7 +164,7 @@
 	_tmp1 = NULL;
 	name = (_tmp1 = seahorse_key_get_display_name ((SEAHORSE_KEY (obj))), (_tmp1 == NULL ? NULL : g_strdup (_tmp1)));
 	_tmp2 = NULL;
-	return (_tmp4 = (_tmp3 = (strstr ((_tmp2 = g_utf8_casefold (name, -1)), self->priv->_search_string) != NULL), (_tmp2 = (g_free (_tmp2), NULL)), _tmp3), (name = (g_free (name), NULL)), _tmp4);
+	return (_tmp4 = (_tmp3 = ((name != NULL) && (strstr ((_tmp2 = g_utf8_casefold (name, -1)), self->priv->_search_string) != NULL)), (_tmp2 = (g_free (_tmp2), NULL)), _tmp3), (name = (g_free (name), NULL)), _tmp4);
 }
 
 

Modified: trunk/src/seahorse-keyserver-results.vala
==============================================================================
--- trunk/src/seahorse-keyserver-results.vala	(original)
+++ trunk/src/seahorse-keyserver-results.vala	Thu Sep 25 22:41:59 2008
@@ -164,7 +164,7 @@
 			if (_search_string.len() == 0)
 				return true;
 			string name = ((Key)obj).display_name;
-			return (name.casefold().str(_search_string) != null); 
+			return ((name != null) && (name.casefold().str(_search_string) != null)); 
 		}
 
 		private void on_view_selection_changed (Gtk.TreeSelection selection)