Index: applet.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/applet.c,v
retrieving revision 1.231
diff -u -r1.231 applet.c
--- a/applet.c	7 Apr 2004 16:03:18 -0000	1.231
+++ b/applet.c	2 Jun 2004 20:01:07 -0000
@@ -92,20 +92,17 @@
 }
 
 static void
-panel_applet_lock (GtkWidget  *menuitem,
+panel_applet_lock (GtkCheckMenuItem  *checkmenuitem,
 		   AppletInfo *info)
 {
 	gboolean locked;
 
 	locked = panel_applet_toggle_locked (info);
 
-	gtk_label_set_label (GTK_LABEL (GTK_BIN (menuitem)->child),
-			     locked ? _("Un_lock") : _("_Lock"));
-
+	gtk_check_menu_item_set_active(checkmenuitem,locked);
+	
 	if (info->move_item)
 		gtk_widget_set_sensitive (info->move_item, !locked);
-	if (info->remove_item)
-		gtk_widget_set_sensitive (info->remove_item, !locked);
 }
 
 static void
@@ -465,10 +462,9 @@
 		g_object_add_weak_pointer (G_OBJECT (menuitem),
 					   (gpointer *) &info->remove_item);
 
-		menuitem = gtk_image_menu_item_new ();
-		image = gtk_image_new ();
-		setup_menuitem (menuitem, GTK_ICON_SIZE_MENU, image, locked ? _("Un_lock") : _("_Lock"), FALSE);
-		g_signal_connect (menuitem, "activate",
+		menuitem = gtk_check_menu_item_new();
+		setup_menuitem (menuitem, GTK_ICON_SIZE_MENU, NULL,"_Lock To Panel" , FALSE);
+		g_signal_connect (menuitem, "toggled",
 				  G_CALLBACK (panel_applet_lock), info);
 		gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
 		gtk_widget_set_sensitive (menuitem, lockable);
Index: panel-applet-frame.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-applet-frame.c,v
retrieving revision 1.116
diff -u -r1.116 panel-applet-frame.c
--- a/panel-applet-frame.c	21 Jan 2004 13:22:42 -0000	1.116
+++ b/panel-applet-frame.c	2 Jun 2004 20:01:50 -0000
@@ -106,7 +106,7 @@
 	bonobo_ui_component_set_prop (frame->priv->ui_component,
 				      "/popups/button3/placeholder/lock",
 				      "label",
-				      locked ? _("Un_lock") : _("_Lock"),
+					  "_Lock To Panel",
 				      NULL);
 
 	/* First sensitivity */
@@ -117,12 +117,6 @@
 				      NULL);
 
 	bonobo_ui_component_set_prop (frame->priv->ui_component,
-				      "/commands/RemoveAppletFromPanel",
-				      "sensitive",
-				      locked ? "0" : (removable ? "1" : "0"),
-				      NULL);
-
-	bonobo_ui_component_set_prop (frame->priv->ui_component,
 				      "/commands/MoveApplet",
 				      "sensitive",
 				      locked ? "0" : (movable ? "1" : "0"),
@@ -138,12 +132,6 @@
 				      NULL);
 
 	bonobo_ui_component_set_prop (frame->priv->ui_component,
-				      "/commands/RemoveAppletFromPanel",
-				      "hidden",
-				      locked_down ? "1" : "0",
-				      NULL);
-
-	bonobo_ui_component_set_prop (frame->priv->ui_component,
 				      "/commands/MoveApplet",
 				      "hidden",
 				      locked_down ? "1" : "0",
Index: GNOME_Panel_Popup.xml
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/GNOME_Panel_Popup.xml,v
retrieving revision 1.3
diff -u -r1.3 GNOME_Panel_Popup.xml
--- GNOME_Panel_Popup.xml	26 May 2003 13:41:07 -0000	1.3
+++ GNOME_Panel_Popup.xml	2 Jun 2004 20:03:41 -0000
@@ -7,7 +7,7 @@
          <menuitem name="remove" verb="RemoveAppletFromPanel" _label="_Remove From Panel"
                    pixtype="stock" pixname="gtk-remove"/>
 
-         <menuitem name="lock" verb="LockAppletToPanel" _label="_Lock"/>
+         <menuitem name="lock" verb="LockAppletToPanel" _label="_Lock To Panel"/>
    
          <menuitem name="move" verb="MoveApplet" _label="_Move"/>
    
