[gnome-user-share] Remove "Bonded and trusted" ObexPush option

[Bastien Nocera <hadess src gnome org>]

commit 94bfb171578589b64309229228bc457fed6bd313
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Oct 21 13:47:11 2009 +0100

    Remove "Bonded and trusted" ObexPush option
    
    https://bugzilla.gnome.org/show_bug.cgi?id=588625

 data/desktop_gnome_file_sharing.schemas.in |    2 +-
 src/file-share-properties.c                |    3 ---
 src/obexpush.c                             |   16 ++--------------
 src/user_share-private.c                   |    7 ++-----
 src/user_share-private.h                   |    1 -
 5 files changed, 5 insertions(+), 24 deletions(-)
---
diff --git a/data/desktop_gnome_file_sharing.schemas.in b/data/desktop_gnome_file_sharing.schemas.in
index 3ee6d1a..3549da5 100644
--- a/data/desktop_gnome_file_sharing.schemas.in
+++ b/data/desktop_gnome_file_sharing.schemas.in
@@ -75,7 +75,7 @@
       <default>bonded</default>
       <locale name="C">
         <short>When to accept files sent over Bluetooth</short>
-	<long>When to accept files sent over Bluetooth. Possible values are "always", "bonded", "bonded_trusted" and "ask".</long>
+	<long>When to accept files sent over Bluetooth. Possible values are "always", "bonded" and "ask".</long>
       </locale>
     </schema>
     <schema>
diff --git a/src/file-share-properties.c b/src/file-share-properties.c
index 4d69a62..e5ecc25 100644
--- a/src/file-share-properties.c
+++ b/src/file-share-properties.c
@@ -573,9 +573,6 @@ main (int argc, char *argv[])
     gtk_list_store_append (store, &iter);
     gtk_list_store_set (store, &iter, 0,
 			_("Only for Bonded devices"), -1);
-    gtk_list_store_append (store, &iter);
-    gtk_list_store_set (store, &iter, 0,
-			_("Only for Bonded and Trusted devices"), -1);
     //FIXME implement
 #if 0
     gtk_list_store_append (store, &iter);
diff --git a/src/obexpush.c b/src/obexpush.c
index 71d6839..5889719 100644
--- a/src/obexpush.c
+++ b/src/obexpush.c
@@ -238,7 +238,7 @@ device_is_authorised (const char *bdaddr)
 				       &props, G_TYPE_INVALID) != FALSE)
 		{
 			GValue *value;
-			gboolean bonded, trusted;
+			gboolean bonded;
 
 			value = g_hash_table_lookup (props, "Paired");
 			bonded = g_value_get_boolean (value);
@@ -251,18 +251,6 @@ device_is_authorised (const char *bdaddr)
 				retval = TRUE;
 				break;
 			}
-			value = g_hash_table_lookup (props, "Trusted");
-			trusted = g_value_get_boolean (value);
-			g_message ("%s is %s", bdaddr, trusted ? "trusted" : "not trusted");
-
-			if (accept_setting == ACCEPT_BONDED_AND_TRUSTED
-			    && trusted) {
-				g_hash_table_destroy (props);
-				g_object_unref (device);
-				g_object_unref (adapter);
-				retval = TRUE;
-				break;
-			}
 		}
 		g_object_unref(adapter);
 	}
@@ -325,7 +313,7 @@ transfer_started_cb (DBusGProxy *session,
 			authorise = FALSE;
 		} else if (accept_setting == ACCEPT_ALWAYS) {
 			authorise = TRUE;
-		} else if (accept_setting == ACCEPT_BONDED || accept_setting == ACCEPT_BONDED_AND_TRUSTED) {
+		} else if (accept_setting == ACCEPT_BONDED) {
 			authorise = device_is_authorised (bdaddr);
 		} else {
 			//FIXME implement
diff --git a/src/user_share-private.c b/src/user_share-private.c
index bb0fc0d..98623d8 100644
--- a/src/user_share-private.c
+++ b/src/user_share-private.c
@@ -37,7 +37,6 @@ static char *password_setting_strings[] = {
 static char *accept_file_strings[] = {
     "always",
     "bonded",
-    "bonded_and_trusted",
     "ask"
 };
 
@@ -89,12 +88,10 @@ accept_setting_from_string (const char *str)
 	if (strcmp (str, "always") == 0) {
 	    return ACCEPT_ALWAYS;
 	}
-	if (strcmp (str, "bonded") == 0) {
+	if (strcmp (str, "bonded") == 0 ||
+	    strcmp (str, "bonded_and_trusted") == 0) {
 	    return ACCEPT_BONDED;
 	}
-	if (strcmp (str, "bonded_and_trusted") == 0) {
-	    return ACCEPT_BONDED_AND_TRUSTED;
-	}
 	if (strcmp (str, "ask") == 0) {
 	    return ACCEPT_ASK;
 	}
diff --git a/src/user_share-private.h b/src/user_share-private.h
index b733280..508dce2 100644
--- a/src/user_share-private.h
+++ b/src/user_share-private.h
@@ -45,7 +45,6 @@ typedef enum {
 typedef enum {
 	ACCEPT_ALWAYS,
 	ACCEPT_BONDED,
-	ACCEPT_BONDED_AND_TRUSTED,
 	ACCEPT_ASK
 } AcceptSetting;