[gnome-keyring] Remove incomplete unlock per application/session support.

[Stefan Walter <stefw src gnome org>]

commit 23194ec9551cc0a04f948bcb61fa59a2855d5a55
Author: Stef Walter <stef memberwebs com>
Date:   Mon Feb 1 02:46:22 2010 +0000

    Remove incomplete unlock per application/session support.

 daemon/prompt/gkd-prompt-tool.c  |   14 ++------------
 daemon/prompt/gkd-prompt.c       |    8 --------
 gcr/gcr-unlock-options-widget.c  |   18 ------------------
 gcr/gcr-unlock-options-widget.ui |   12 ------------
 4 files changed, 2 insertions(+), 50 deletions(-)
---
diff --git a/daemon/prompt/gkd-prompt-tool.c b/daemon/prompt/gkd-prompt-tool.c
index 029704f..ea4e93b 100644
--- a/daemon/prompt/gkd-prompt-tool.c
+++ b/daemon/prompt/gkd-prompt-tool.c
@@ -310,7 +310,7 @@ static void
 prepare_lock (GtkBuilder *builder, GtkDialog *dialog)
 {
 	GtkWidget *unlock, *area;
-	gboolean unlock_auto, unlock_global;
+	gboolean unlock_auto;
 	gint unlock_idle, unlock_timeout;
 
 	unlock = gcr_unlock_options_widget_new ();
@@ -320,19 +320,11 @@ prepare_lock (GtkBuilder *builder, GtkDialog *dialog)
 	gtk_widget_show (unlock);
 
 	unlock_auto = g_key_file_get_boolean (input_data, "unlock-options", "unlock-auto", NULL);
-
-	/* Defaults to TRUE */
-	if (!g_key_file_has_key (input_data, "unlock-options", "unlock-global", NULL))
-		unlock_global = TRUE;
-	else
-		unlock_global = g_key_file_get_boolean (input_data, "unlock-options", "unlock-global", NULL);
-
 	unlock_idle = g_key_file_get_integer (input_data, "unlock-options", "unlock-idle", NULL);
 	unlock_timeout = g_key_file_get_integer (input_data, "unlock-options", "unlock-timeout", NULL);
 
 	g_object_set (unlock,
 	              "unlock-auto", unlock_auto,
-	              "unlock-global", unlock_global,
 	              "unlock-idle", unlock_idle,
 	              "unlock-timeout", unlock_timeout,
 	              NULL);
@@ -552,20 +544,18 @@ gather_response (gint response)
 static void
 gather_unlock_options (GtkBuilder *builder, GtkDialog *dialog)
 {
-	gboolean unlock_auto, unlock_global;
+	gboolean unlock_auto;
 	gint unlock_timeout, unlock_idle;
 
 	GtkWidget *unlock = g_object_get_data (G_OBJECT (dialog), "unlock-options-widget");
 
 	g_object_get (unlock,
 	              "unlock-auto", &unlock_auto,
-	              "unlock-global", &unlock_global,
 	              "unlock-timeout", &unlock_timeout,
 	              "unlock-idle", &unlock_idle,
 	              NULL);
 
 	g_key_file_set_boolean (output_data, "unlock-options", "unlock-auto", unlock_auto);
-	g_key_file_set_boolean (output_data, "unlock-options", "unlock-global", unlock_global);
 	g_key_file_set_integer (output_data, "unlock-options", "unlock-timeout", unlock_timeout);
 	g_key_file_set_integer (output_data, "unlock-options", "unlock-idle", unlock_idle);
 }
diff --git a/daemon/prompt/gkd-prompt.c b/daemon/prompt/gkd-prompt.c
index d62397f..0c1358f 100644
--- a/daemon/prompt/gkd-prompt.c
+++ b/daemon/prompt/gkd-prompt.c
@@ -826,11 +826,6 @@ gkd_prompt_get_unlock_options (GkdPrompt *self, GP11Attributes *attrs)
 	bval = g_key_file_get_boolean (self->pv->output, "unlock-options", "unlock-auto", NULL);
 	gp11_attributes_add_boolean (attrs, CKA_GNOME_TRANSIENT, !bval);
 
-	bval = TRUE;
-	if (g_key_file_has_key (self->pv->output, "unlock-options", "unlock-global", NULL))
-		bval = g_key_file_get_boolean (self->pv->output, "unlock-options", "unlock-global", NULL);
-	gp11_attributes_add_boolean (attrs, CKA_TOKEN, bval);
-
 	ival = g_key_file_get_integer (self->pv->output, "unlock-options", "unlock-idle", NULL);
 	gp11_attributes_add_ulong (attrs, CKA_G_DESTRUCT_IDLE, ival <= 0 ? 0 : ival);
 
@@ -851,9 +846,6 @@ gkd_prompt_set_unlock_options (GkdPrompt *self, GP11Attributes *attrs)
 	if (gp11_attributes_find_boolean (attrs, CKA_GNOME_TRANSIENT, &bval))
 		g_key_file_set_boolean (self->pv->input, "unlock-options", "unlock-auto", !bval);
 
-	if (gp11_attributes_find_boolean (attrs, CKA_TOKEN, &bval))
-		g_key_file_set_boolean (self->pv->input, "unlock-options", "unlock-global", bval);
-
 	if (gp11_attributes_find_ulong (attrs, CKA_G_DESTRUCT_IDLE, &uval))
 		g_key_file_set_boolean (self->pv->input, "unlock-options", "unlock-idle", (int)uval);
 
diff --git a/gcr/gcr-unlock-options-widget.c b/gcr/gcr-unlock-options-widget.c
index 8e5facf..217598a 100644
--- a/gcr/gcr-unlock-options-widget.c
+++ b/gcr/gcr-unlock-options-widget.c
@@ -26,7 +26,6 @@
 enum {
 	PROP_0,
 	PROP_UNLOCK_AUTO,
-	PROP_UNLOCK_GLOBAL,
 	PROP_UNLOCK_TIMEOUT,
 	PROP_UNLOCK_IDLE
 };
@@ -34,7 +33,6 @@ enum {
 struct _GcrUnlockOptionsWidgetPrivate {
 	GtkBuilder *builder;
 	GtkToggleButton *auto_unlock;
-	GtkToggleButton *per_application;
 	GtkToggleButton *lock_logout;
 	GtkToggleButton *lock_after;
 	GtkToggleButton *lock_idle;
@@ -169,10 +167,6 @@ gcr_unlock_options_widget_set_property (GObject *obj, guint prop_id, const GValu
 		button = builder_get_toggle_button (self->pv->builder, "auto_unlock_check");
 		gtk_toggle_button_set_active (button, g_value_get_boolean (value));
 		break;
-	case PROP_UNLOCK_GLOBAL:
-		button = builder_get_toggle_button (self->pv->builder, "per_application_check");
-		gtk_toggle_button_set_active (button, !g_value_get_boolean (value));
-		break;
 	case PROP_UNLOCK_TIMEOUT:
 		button = builder_get_toggle_button (self->pv->builder, "lock_after_choice");
 		seconds = g_value_get_int (value);
@@ -221,14 +215,6 @@ gcr_unlock_options_widget_get_property (GObject *obj, guint prop_id, GValue *val
 	case PROP_UNLOCK_AUTO:
 		g_value_set_boolean (value, auto_unlock);
 		break;
-	case PROP_UNLOCK_GLOBAL:
-		if (auto_unlock) {
-			g_value_set_boolean (value, TRUE);
-		} else {
-			button = builder_get_toggle_button (self->pv->builder, "per_application_check");
-			g_value_set_boolean (value, !gtk_toggle_button_get_active (button));
-		}
-		break;
 	case PROP_UNLOCK_TIMEOUT:
 		if (auto_unlock) {
 			g_value_set_int (value, 0);
@@ -275,10 +261,6 @@ gcr_unlock_options_widget_class_init (GcrUnlockOptionsWidgetClass *klass)
 	               g_param_spec_boolean ("unlock-auto", "Unlock Auto", "Unlock Automatically",
 	                                     FALSE, G_PARAM_READWRITE));
 
-	g_object_class_install_property (gobject_class, PROP_UNLOCK_GLOBAL,
-	               g_param_spec_boolean ("unlock-global", "Unlock Global", "Unlock Globally",
-	                                     TRUE, G_PARAM_READWRITE));
-
 	g_object_class_install_property (gobject_class, PROP_UNLOCK_TIMEOUT,
 	               g_param_spec_int ("unlock-timeout", "Unlock Timeout", "Unlock Timeout",
 	                                 0, G_MAXINT, 0, G_PARAM_READWRITE));
diff --git a/gcr/gcr-unlock-options-widget.ui b/gcr/gcr-unlock-options-widget.ui
index 0fbe17d..cfa8a55 100644
--- a/gcr/gcr-unlock-options-widget.ui
+++ b/gcr/gcr-unlock-options-widget.ui
@@ -101,18 +101,6 @@
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkCheckButton" id="per_application_check">
-                <property name="label" translatable="yes">Prompt me for each application that accesses this keyring.</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
           </object>
         </child>
       </object>