--- ../original/gnome-screensaver/src/gs-lock-plug.c	2010-05-27 16:08:54.693949253 +0300
+++ ./src/gs-lock-plug.c	2010-05-27 16:29:07.137951554 +0300
@@ -1626,6 +1626,15 @@
         return name;
 }
 
+static void 
+gs_lock_plug_set_widget_name (GtkWidget *widget, 
+                              const char *name)
+{
+        if (widget != NULL) {
+                gtk_widget_set_name(widget, name);
+        }
+}
+
 static gboolean
 load_theme (GSLockPlug *plug)
 {
@@ -1672,33 +1681,75 @@
         g_free (gtkbuilder);
 
         lock_dialog = GTK_WIDGET (gtk_builder_get_object(builder, "lock-dialog"));
+        gs_lock_plug_set_widget_name(lock_dialog, "lock-dialog");
+
         gtk_container_add (GTK_CONTAINER (plug), lock_dialog);
 
         plug->priv->vbox = NULL;
+
         plug->priv->notebook = GTK_WIDGET (gtk_builder_get_object(builder, "notebook"));
+        gs_lock_plug_set_widget_name(plug->priv->notebook, "notebook");
 
         plug->priv->auth_face_image = GTK_WIDGET (gtk_builder_get_object(builder, "auth-face-image"));
+        gs_lock_plug_set_widget_name(plug->priv->auth_face_image, "auth-face-image");
+
         plug->priv->auth_action_area = GTK_WIDGET (gtk_builder_get_object(builder, "auth-action-area"));
+
         plug->priv->auth_realname_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-realname-label"));
+        gs_lock_plug_set_widget_name(plug->priv->auth_realname_label, "auth-realname-label");
+
         plug->priv->auth_username_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-username-label"));
+        gs_lock_plug_set_widget_name(plug->priv->auth_username_label, "auth-username-label");
+
         plug->priv->auth_prompt_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-label"));
+        gs_lock_plug_set_widget_name(plug->priv->auth_prompt_label, "auth-prompt-label");
+
         plug->priv->auth_prompt_entry = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-entry"));
+        gs_lock_plug_set_widget_name(plug->priv->auth_prompt_entry, "auth-prompt-entry");
+
         plug->priv->auth_prompt_box = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-box"));
+        gs_lock_plug_set_widget_name(plug->priv->auth_prompt_box, "auth-prompt-box");
+
         plug->priv->auth_capslock_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-capslock-label"));
+        gs_lock_plug_set_widget_name(plug->priv->auth_capslock_label, "auth-capslock-label");
+
         plug->priv->auth_message_label = GTK_WIDGET (gtk_builder_get_object(builder, "auth-status-label"));
+        gs_lock_plug_set_widget_name(plug->priv->auth_message_label, "auth-status-label");
+
         plug->priv->auth_unlock_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-unlock-button"));
+        gs_lock_plug_set_widget_name(plug->priv->auth_unlock_button, "auth-unlock-button");
+
         plug->priv->auth_cancel_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-cancel-button"));
+        gs_lock_plug_set_widget_name(plug->priv->auth_cancel_button, "auth-cancel-button");
+
         plug->priv->auth_logout_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-logout-button"));
+        gs_lock_plug_set_widget_name(plug->priv->auth_logout_button, "auth-logout-button");
+
         plug->priv->auth_switch_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-switch-button"));
+        gs_lock_plug_set_widget_name(plug->priv->auth_switch_button, "auth-switch-button");
+
         plug->priv->auth_note_button = GTK_WIDGET (gtk_builder_get_object(builder, "auth-note-button"));
+        gs_lock_plug_set_widget_name(plug->priv->auth_note_button, "auth-note-button");
+
         plug->priv->note_tab = GTK_WIDGET (gtk_builder_get_object(builder, "note-tab"));
+        gs_lock_plug_set_widget_name(plug->priv->note_tab, "note-tab");
+
         plug->priv->note_tab_label = GTK_WIDGET (gtk_builder_get_object(builder, "note-tab-label"));
+        gs_lock_plug_set_widget_name(plug->priv->note_tab_label, "note-tab-label");
+
         plug->priv->note_ok_button = GTK_WIDGET (gtk_builder_get_object(builder, "note-ok-button"));
+        gs_lock_plug_set_widget_name(plug->priv->note_ok_button, "note-ok-button");
+
         plug->priv->note_text_view = GTK_WIDGET (gtk_builder_get_object(builder, "note-text-view"));
+        gs_lock_plug_set_widget_name(plug->priv->note_text_view, "note-text-view");
+
         plug->priv->note_cancel_button = GTK_WIDGET (gtk_builder_get_object(builder, "note-cancel-button"));
+        gs_lock_plug_set_widget_name(plug->priv->note_cancel_button, "note-cancel-button");
 
         /* Placeholder for the keyboard indicator */
         plug->priv->auth_prompt_kbd_layout_indicator = GTK_WIDGET (gtk_builder_get_object(builder, "auth-prompt-kbd-layout-indicator"));
+        gs_lock_plug_set_widget_name(plug->priv->auth_prompt_kbd_layout_indicator, "auth-prompt-kbd-layout-indicator");
+
         if (plug->priv->auth_logout_button != NULL) {
                 gtk_widget_set_no_show_all (plug->priv->auth_logout_button, TRUE);
         }
@@ -1712,6 +1763,7 @@
         gtk_widget_show_all (lock_dialog);
 
         plug->priv->status_message_label = GTK_WIDGET (gtk_builder_get_object(builder, "status-message-label"));
+        gs_lock_plug_set_widget_name(plug->priv->status_message_label, "status-message-label");
 
         return TRUE;
 }
