gnome-keyring r1141 - in trunk: . common

[nnielsen svn gnome org]

Author: nnielsen
Date: Sun May 18 12:50:34 2008
New Revision: 1141
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1141&view=rev

Log:
	* common/gkr-location.c: Fix crash when HAL location volume
	is not registered for some reason. Fixes bug #530316


Modified:
   trunk/ChangeLog
   trunk/common/gkr-location.c

Modified: trunk/common/gkr-location.c
==============================================================================
--- trunk/common/gkr-location.c	(original)
+++ trunk/common/gkr-location.c	Sun May 18 12:50:34 2008
@@ -320,8 +320,10 @@
 		
 		g_message ("adding removable location: %s at %s", name, mount); 
 		gkr_location_manager_register (locmgr, name, mount, friendly);
+		
 		locvol = g_hash_table_lookup (pv->volumes_by_name, name);
-		locvol->hal_volume = TRUE;
+		if (locvol)
+			locvol->hal_volume = TRUE;
 
 	/* A mount was removed? */		
 	} else if (!is_mounted && g_hash_table_lookup (pv->volumes_by_name, name)) {