[PolicyKit-gnome] Remove lock down functionality

[David Zeuthen <davidz src gnome org>]

commit d5bee38b20671a823183f7960d384ee181e2cf94
Author: David Zeuthen <davidz redhat com>
Date:   Tue Aug 3 14:14:16 2010 -0400

    Remove lock down functionality
    
    This is to keep up with an impending polkit change, see
    
    http://cgit.freedesktop.org/PolicyKit/commit/?h=gdbus&id=7491b69e86cf7cb813c956307a96f246b386b16c
    
    Signed-off-by: David Zeuthen <davidz redhat com>

 polkitgtk/example.c          |    5 +-
 polkitgtk/polkitlockbutton.c |  120 +----------------------------------------
 2 files changed, 5 insertions(+), 120 deletions(-)
---
diff --git a/polkitgtk/example.c b/polkitgtk/example.c
index 23e2c79..355ba53 100644
--- a/polkitgtk/example.c
+++ b/polkitgtk/example.c
@@ -61,12 +61,11 @@ update_one (PolkitSubject *subject,
   else
     {
       g_string_append_printf (s,
-                              "authorized=%d challenge=%d retains=%d temporary=%d locked_down=%d",
+                              "authorized=%d challenge=%d retains=%d temporary=%d",
                               polkit_authorization_result_get_is_authorized (result),
                               polkit_authorization_result_get_is_challenge (result),
                               polkit_authorization_result_get_retains_authorization (result),
-                              polkit_authorization_result_get_temporary_authorization_id (result) != NULL,
-                              polkit_authorization_result_get_locked_down (result));
+                              polkit_authorization_result_get_temporary_authorization_id (result) != NULL);
       g_object_unref (result);
     }
 
diff --git a/polkitgtk/polkitlockbutton.c b/polkitgtk/polkitlockbutton.c
index 1229d66..3e7ac63 100644
--- a/polkitgtk/polkitlockbutton.c
+++ b/polkitgtk/polkitlockbutton.c
@@ -168,8 +168,6 @@ struct _PolkitLockButtonPrivate
   gboolean retains_after_challenge;
   gboolean authorized;
   gboolean hidden;
-  gboolean locked_down;
-  gboolean can_lock_down;
 
   /* is non-NULL exactly when we are authorized and have a temporary authorization */
   gchar *tmp_authz_id;
@@ -217,10 +215,6 @@ static void on_authority_changed (PolkitAuthority *authority,
 static void on_clicked (GtkButton *button,
                         gpointer   user_data);
 
-static gboolean on_button_press_event (GtkWidget      *widget,
-                                       GdkEventButton *event,
-                                       gpointer        user_data);
-
 G_DEFINE_TYPE (PolkitLockButton, polkit_lock_button, GTK_TYPE_HBOX);
 
 static void
@@ -399,10 +393,6 @@ polkit_lock_button_constructed (GObject *object)
                     "clicked",
                     G_CALLBACK (on_clicked),
                     button);
-  g_signal_connect (button->priv->button,
-                    "button-press-event",
-                    G_CALLBACK (on_button_press_event),
-                    button);
 
   gtk_box_pack_start (GTK_BOX (button),
                       button->priv->button,
@@ -708,15 +698,7 @@ update_state (PolkitLockButton *button)
        */
       if (button->priv->tmp_authz_id == NULL)
         {
-          if (button->priv->can_lock_down && !button->priv->locked_down)
-            {
-              text = button->priv->text_lock_down;
-              tooltip = button->priv->tooltip_lock_down;
-            }
-          else
-            {
-              button->priv->hidden = TRUE;
-            }
+          //button->priv->hidden = TRUE;
         }
     }
   else
@@ -755,25 +737,8 @@ update_state (PolkitLockButton *button)
   gtk_label_set_text (GTK_LABEL (button->priv->label), text);
   gtk_widget_set_sensitive (button->priv->button, sensitive);
 
-  if (button->priv->locked_down)
-    {
-      gchar *s;
-      s = g_strdup_printf ("%s\n"
-                           "\n"
-                           "%s",
-                           tooltip,
-                           /* Translators: this string is appended to the tooltip if the action is
-                            * currently locked down */
-                           _("This button is locked down so only users with administrative privileges can unlock it. Right-click the button to remove the lock down."));
-      gtk_widget_set_tooltip_markup (GTK_WIDGET (button->priv->label), s);
-      gtk_widget_set_tooltip_markup (GTK_WIDGET (button->priv->button), s);
-      g_free (s);
-    }
-  else
-    {
-      gtk_widget_set_tooltip_markup (GTK_WIDGET (button->priv->label), tooltip);
-      gtk_widget_set_tooltip_markup (GTK_WIDGET (button->priv->button), tooltip);
-    }
+  gtk_widget_set_tooltip_markup (GTK_WIDGET (button->priv->label), tooltip);
+  gtk_widget_set_tooltip_markup (GTK_WIDGET (button->priv->button), tooltip);
 
   if (button->priv->hidden)
     {
@@ -809,8 +774,6 @@ process_result (PolkitLockButton          *button,
   old_authorized = button->priv->authorized;
   button->priv->can_obtain = polkit_authorization_result_get_is_challenge (result);
   button->priv->authorized = polkit_authorization_result_get_is_authorized (result);
-  button->priv->can_lock_down = polkit_authority_get_backend_features (button->priv->authority) & POLKIT_AUTHORITY_FEATURES_LOCKDOWN;
-  button->priv->locked_down = polkit_authorization_result_get_locked_down (result);
 
   /* save the temporary authorization id */
   g_free (button->priv->tmp_authz_id);
@@ -969,74 +932,6 @@ interactive_check_cb (GObject       *source_object,
 }
 
 static void
-remove_lockdown_cb (PolkitAuthority *authority,
-                    GAsyncResult    *res,
-                    gpointer         user_data)
-{
-  PolkitLockButton *button = POLKIT_LOCK_BUTTON (user_data);
-  GError *error;
-
-  error = NULL;
-  if (!polkit_authority_remove_lockdown_for_action_finish (button->priv->authority,
-                                                           res,
-                                                           &error))
-    {
-      g_warning ("Error removing lockdown for action %s: %s",
-                 button->priv->action_id,
-                 error->message);
-      g_error_free (error);
-    }
-
-  g_object_unref (button);
-}
-
-static gboolean
-on_button_press_event (GtkWidget      *widget,
-                       GdkEventButton *event,
-                       gpointer        user_data)
-{
-  PolkitLockButton *button = POLKIT_LOCK_BUTTON (user_data);
-  gboolean ret;
-
-  ret = FALSE;
-
-  if (event->button == 3 && button->priv->locked_down)
-    {
-      polkit_authority_remove_lockdown_for_action (button->priv->authority,
-                                                   button->priv->action_id,
-                                                   NULL, /* cancellable */
-                                                   (GAsyncReadyCallback) remove_lockdown_cb,
-                                                   g_object_ref (button));
-      /* eat this event */
-      ret = TRUE;
-    }
-
-  return ret;
-}
-
-static void
-add_lockdown_cb (PolkitAuthority *authority,
-                 GAsyncResult    *res,
-                 gpointer         user_data)
-{
-  PolkitLockButton *button = POLKIT_LOCK_BUTTON (user_data);
-  GError *error;
-
-  error = NULL;
-  if (!polkit_authority_add_lockdown_for_action_finish (button->priv->authority,
-                                                        res,
-                                                        &error))
-    {
-      g_warning ("Error adding lockdown for action %s: %s",
-                 button->priv->action_id,
-                 error->message);
-      g_error_free (error);
-    }
-
-  g_object_unref (button);
-}
-
-static void
 on_clicked (GtkButton *_button,
             gpointer   user_data)
 {
@@ -1067,15 +962,6 @@ on_clicked (GtkButton *_button,
                                                              NULL,  /* callback */
                                                              NULL); /* user_data */
     }
-  else if (button->priv->authorized && button->priv->tmp_authz_id == NULL &&
-           button->priv->can_lock_down && !button->priv->locked_down)
-    {
-      polkit_authority_add_lockdown_for_action (button->priv->authority,
-                                                button->priv->action_id,
-                                                NULL, /* cancellable */
-                                                (GAsyncReadyCallback) add_lockdown_cb,
-                                                g_object_ref (button));
-    }
 
  out: