[gnome-screensaver] Clear the clipboards when cancelling a message

[William Jon McCann <mccann src gnome org>]

commit 7cde59e0d727e60175c1084b2e5676b429847136
Author: Anatoli Sakhnik <sakhnik gmail com>
Date:   Thu Aug 20 23:05:03 2009 -0400

    Clear the clipboards when cancelling a message
    
    Just called the existing function, made it visible.
    Fixes http://bugzilla.gnome.org/show_bug.cgi?id=574896

 src/gs-lock-plug.c |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)
---
diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
index bdb68ae..dbdec42 100644
--- a/src/gs-lock-plug.c
+++ b/src/gs-lock-plug.c
@@ -1050,6 +1050,19 @@ gs_lock_plug_class_init (GSLockPlugClass *klass)
 }
 
 static void
+clear_clipboards (GSLockPlug *plug)
+{
+        GtkClipboard *clipboard;
+
+        clipboard = gtk_widget_get_clipboard (GTK_WIDGET (plug), GDK_SELECTION_PRIMARY);
+        gtk_clipboard_clear (clipboard);
+        gtk_clipboard_set_text (clipboard, "", -1);
+        clipboard = gtk_widget_get_clipboard (GTK_WIDGET (plug), GDK_SELECTION_CLIPBOARD);
+        gtk_clipboard_clear (clipboard);
+        gtk_clipboard_set_text (clipboard, "", -1);
+}
+
+static void
 take_note (GtkButton  *button,
            GSLockPlug *plug)
 {
@@ -1113,6 +1126,8 @@ cancel_note (GtkButton  *button,
         restart_cancel_timeout (plug);
 
         gtk_window_set_default (GTK_WINDOW (plug), plug->priv->auth_unlock_button);
+
+        clear_clipboards (plug);
 }
 
 static void
@@ -1722,19 +1737,6 @@ delete_handler (GSLockPlug  *plug,
 }
 
 static void
-clear_clipboards (GSLockPlug *plug)
-{
-        GtkClipboard *clipboard;
-
-        clipboard = gtk_widget_get_clipboard (GTK_WIDGET (plug), GDK_SELECTION_PRIMARY);
-        gtk_clipboard_clear (clipboard);
-        gtk_clipboard_set_text (clipboard, "", -1);
-        clipboard = gtk_widget_get_clipboard (GTK_WIDGET (plug), GDK_SELECTION_CLIPBOARD);
-        gtk_clipboard_clear (clipboard);
-        gtk_clipboard_set_text (clipboard, "", -1);
-}
-
-static void
 on_note_text_buffer_changed (GtkTextBuffer *buffer,
                              GSLockPlug    *plug)
 {