gnome-keyring r1136 - in trunk: . common ui

[nnielsen svn gnome org]

Author: nnielsen
Date: Thu Apr 17 01:04:30 2008
New Revision: 1136
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1136&view=rev

Log:
	* common/gkr-location.h:
	* ui/gkr-ask-request.c: Don't show 'Location' in password prompt 
	for objects in the user's home directory.


Modified:
   trunk/ChangeLog
   trunk/common/gkr-location.h
   trunk/ui/gkr-ask-request.c

Modified: trunk/common/gkr-location.h
==============================================================================
--- trunk/common/gkr-location.h	(original)
+++ trunk/common/gkr-location.h	Thu Apr 17 01:04:30 2008
@@ -39,7 +39,7 @@
 
 #define        GKR_LOCATION_NAME_HOME      "HOME"
 #define        GKR_LOCATION_VOLUME_HOME_S  "HOME:"
-#define        GKR_LOCATION_VOLUME_HOME    (gkr_location_from_string (GKR_LOCATION_VOLUME_LOCAL_S))
+#define        GKR_LOCATION_VOLUME_HOME    (gkr_location_from_string (GKR_LOCATION_VOLUME_HOME_S))
 
 #define        GKR_LOCATION_NAME_FILE      "FILE"
 #define        GKR_LOCATION_VOLUME_FILE_S  "FILE:"

Modified: trunk/ui/gkr-ask-request.c
==============================================================================
--- trunk/ui/gkr-ask-request.c	(original)
+++ trunk/ui/gkr-ask-request.c	Thu Apr 17 01:04:30 2008
@@ -428,8 +428,12 @@
 		loc_volume = gkr_location_get_volume (pv->location);
 		
 		/* Suppress local stuff unless displying the selector */ 
-		if (!need_locations && loc_volume == GKR_LOCATION_VOLUME_LOCAL)
-			loc_volume = 0;
+		if (!need_locations && loc_volume) {
+			if(loc_volume == GKR_LOCATION_VOLUME_LOCAL)
+				loc_volume = 0;
+			else if(loc_volume == GKR_LOCATION_VOLUME_HOME)
+				loc_volume = 0;
+		}
 			
 		if (loc_volume) {
 			g_key_file_set_value (key_file, "location", "location",