seahorse r2680 - in trunk: . pgp src

[nnielsen svn gnome org]

Author: nnielsen
Date: Tue Dec 16 19:01:02 2008
New Revision: 2680
URL: http://svn.gnome.org/viewvc/seahorse?rev=2680&view=rev

Log:
	* pgp/seahorse-pgp-commands.c: 
	* src/seahorse-key-manager.c:
	* src/seahorse-key-manager.ui:
	* src/seahorse-keyserver-results.ui:
	* src/seahorse-viewer.c: Generalize names for 'delete' and other actions.
	Fix deletion of PGP keys.


Modified:
   trunk/ChangeLog
   trunk/pgp/seahorse-pgp-commands.c
   trunk/src/seahorse-key-manager.c
   trunk/src/seahorse-key-manager.ui
   trunk/src/seahorse-keyserver-results.ui
   trunk/src/seahorse-viewer.c

Modified: trunk/pgp/seahorse-pgp-commands.c
==============================================================================
--- trunk/pgp/seahorse-pgp-commands.c	(original)
+++ trunk/pgp/seahorse-pgp-commands.c	Tue Dec 16 19:01:02 2008
@@ -48,8 +48,8 @@
 static const char* UI_DEFINITION = ""\
 "<ui>"\
 "	<menubar>"\
-"		<menu name='Key' action='key-menu'> "\
-"			<placeholder name='KeyCommands'>"\
+"		<menu name='File' action='file-menu'> "\
+"			<placeholder name='FileCommands'>"\
 "				<menuitem action='key-sign'/>"\
 "			</placeholder>"\
 "		</menu>"\
@@ -166,12 +166,12 @@
 	
 	for (l = objects; l; l = g_list_next (l)) {
 		obj = SEAHORSE_OBJECT (l->data);
-		if (G_OBJECT_TYPE (obj) == SEAHORSE_TYPE_PGP_UID) {
+		if (G_OBJECT_TYPE (obj) == SEAHORSE_TYPE_GPGME_UID) {
 			if (g_list_find (objects, seahorse_object_get_parent (obj)) == NULL) {
 				to_delete = g_list_prepend (to_delete, obj);
 				++num_identities;
 			}
-		} else if (G_OBJECT_TYPE (obj) == SEAHORSE_TYPE_PGP_KEY) {
+		} else if (G_OBJECT_TYPE (obj) == SEAHORSE_TYPE_GPGME_KEY) {
 			to_delete = g_list_prepend (to_delete, obj);
 			++num_keys;
 		}

Modified: trunk/src/seahorse-key-manager.c
==============================================================================
--- trunk/src/seahorse-key-manager.c	(original)
+++ trunk/src/seahorse-key-manager.c	Tue Dec 16 19:01:02 2008
@@ -332,7 +332,7 @@
 }
 
 static void 
-on_key_generate (GtkAction* action, SeahorseKeyManager* self) 
+on_file_new (GtkAction* action, SeahorseKeyManager* self) 
 {
 	g_return_if_fail (SEAHORSE_IS_KEY_MANAGER (self));
 	g_return_if_fail (GTK_IS_ACTION (action));
@@ -745,12 +745,12 @@
 	{ "remote-menu", NULL, N_("_Remote") }, 
 	{ "app-quit", GTK_STOCK_QUIT, N_("_Quit"), "<control>Q", 
 	  N_("Close this program"), G_CALLBACK (on_app_quit) }, 
-	{ "key-generate", GTK_STOCK_NEW, N_("_Create New Key..."), "<control>N", 
-	  N_("Create a new personal key"), G_CALLBACK (on_key_generate) }, 
-	{ "key-import-file", GTK_STOCK_OPEN, N_("_Import..."), "<control>I", 
-	  N_("Import keys into your key ring from a file"), G_CALLBACK (on_key_import_file) }, 
-	{ "key-import-clipboard", GTK_STOCK_PASTE, N_("Paste _Keys"), "<control>V", 
-	  N_("Import keys from the clipboard"), G_CALLBACK (on_key_import_clipboard) }
+	{ "file-new", GTK_STOCK_NEW, N_("_New..."), "<control>N", 
+	  N_("Create a new key or item"), G_CALLBACK (on_file_new) }, 
+	{ "file-import", GTK_STOCK_OPEN, N_("_Import..."), "<control>I", 
+	  N_("Import from a file"), G_CALLBACK (on_key_import_file) }, 
+	{ "edit-import-clipboard", GTK_STOCK_PASTE, N_("_Paste"), "<control>V", 
+	  N_("Import from the clipboard"), G_CALLBACK (on_key_import_clipboard) }
 };
 
 #ifdef WITH_KEYSERVER

Modified: trunk/src/seahorse-key-manager.ui
==============================================================================
--- trunk/src/seahorse-key-manager.ui	(original)
+++ trunk/src/seahorse-key-manager.ui	Tue Dec 16 19:01:02 2008
@@ -1,23 +1,19 @@
 <ui>
 	<menubar>
-		<menu name="Key" action="key-menu">
-			<menuitem action="key-generate"/>
-			<menuitem action="key-import-file"/>
-			<menuitem action="key-export-file"/>
+		<menu name="File" action="file-menu">
+			<menuitem action="file-new"/>
+			<menuitem action="file-import"/>
+			<menuitem action="file-export"/>
 			<separator/>
-			<placeholder name="KeyCommands">
-<!-- TODO: Need to implement properly for different key types
-				<menuitem action="key-backup"/>
-
--->
+			<placeholder name="FileCommands">
 			</placeholder>
 			<separator/>
 			<menuitem action="app-quit"/>
 		</menu>
 		<menu name="Edit" action="edit-menu">
-			<menuitem action="key-export-clipboard"/>
-			<menuitem action="key-import-clipboard"/>
-			<menuitem action="key-delete"/>
+			<menuitem action="edit-export-clipboard"/>
+			<menuitem action="edit-import-clipboard"/>
+			<menuitem action="edit-delete"/>
 			<separator/>
 			<menuitem action="app-preferences"/>
 		</menu>
@@ -40,20 +36,19 @@
   
 	<toolbar name="MainToolbar">
 		<placeholder name="ToolItems">
-			<toolitem action="key-properties"/>
-			<toolitem action="key-export-file"/>
+			<toolitem action="show-properties"/>
+			<toolitem action="file-export"/>
 			<toolitem action="key-sign"/>
 			<toolitem action="remote-find"/>
 		</placeholder>
 	</toolbar>
 	
 	<popup name="KeyPopup">
-		<menuitem action="key-properties"/>
+		<menuitem action="show-properties"/>
 		<separator/>
-		<menuitem action="key-export-file"/>
-		<menuitem action="key-export-clipboard"/>
-		<menuitem action="key-delete"/>
-		<menuitem action="remote-sync"/>
+		<menuitem action="file-export"/>
+		<menuitem action="edit-export-clipboard"/>
+		<menuitem action="edit-delete"/>
 	</popup>
 	
 </ui>

Modified: trunk/src/seahorse-keyserver-results.ui
==============================================================================
--- trunk/src/seahorse-keyserver-results.ui	(original)
+++ trunk/src/seahorse-keyserver-results.ui	Tue Dec 16 19:01:02 2008
@@ -1,19 +1,19 @@
 <ui>
 	<menubar>
-		<menu name="Key" action="key-menu">
+		<menu name="File" action="file-menu">
 			<menuitem action="key-import-keyring"/>
-			<menuitem action="key-export-file"/>
+			<menuitem action="file-export"/>
 			<separator/>
 			<menuitem action="remote-find"/>
 			<separator/>
-			<placeholder name="KeyCommands">
-				<menuitem action="key-properties"/>
+			<placeholder name="FileCommands">
+				<menuitem action="show-properties"/>
 			</placeholder>
 			<separator/>
 			<menuitem action="app-close"/>
 		</menu>
 		<menu name="Edit" action="edit-menu">
-			<menuitem action="key-export-clipboard"/>
+			<menuitem action="edit-export-clipboard"/>
 		</menu>
 		<menu name="Help" action="help-menu">
 			<menuitem action="help-show"/>
@@ -25,18 +25,18 @@
 	<toolbar name="MainToolbar">
 		<placeholder name="ToolItems">
 			<toolitem action="key-import-keyring"/>
-			<toolitem action="key-export-file"/>
-			<toolitem action="key-properties"/>
+			<toolitem action="file-export"/>
+			<toolitem action="show-properties"/>
 		</placeholder>
 	</toolbar>
 
 	<popup name="KeyPopup">
-		<menuitem action="key-export-clipboard"/>
+		<menuitem action="edit-export-clipboard"/>
 		<separator/>
 		<menuitem action="key-import-keyring"/>
-		<menuitem action="key-export-file"/>
+		<menuitem action="file-export"/>
 		<separator/>		
-		<menuitem action="key-properties"/>
+		<menuitem action="show-properties"/>
 	</popup>
 	
 </ui>

Modified: trunk/src/seahorse-viewer.c
==============================================================================
--- trunk/src/seahorse-viewer.c	(original)
+++ trunk/src/seahorse-viewer.c	Tue Dec 16 19:01:02 2008
@@ -156,7 +156,7 @@
 static const GtkActionEntry UI_ENTRIES[] = {
 
 	/* Top menu items */
-	{ "key-menu", NULL, N_("_Key") },
+	{ "file-menu", NULL, N_("_File") },
 	{ "edit-menu", NULL, N_("_Edit") },
 	{ "view-menu", NULL, N_("_View") },
 	{ "help-menu", NULL, N_("_Help") },
@@ -428,17 +428,17 @@
 }
 		
 static const GtkActionEntry KEY_ENTRIES[] = {
-	{ "key-properties", GTK_STOCK_PROPERTIES, N_("P_roperties"), NULL,
-	  N_("Show key properties"), G_CALLBACK (on_key_properties) }, 
-	{ "key-delete", GTK_STOCK_DELETE, N_("_Delete Key"), NULL,
-	  N_("Delete selected keys"), G_CALLBACK (on_key_delete) }
+	{ "show-properties", GTK_STOCK_PROPERTIES, N_("P_roperties"), NULL,
+	  N_("Show properties"), G_CALLBACK (on_key_properties) }, 
+	{ "edit-delete", GTK_STOCK_DELETE, N_("_Delete"), NULL,
+	  N_("Delete selected items"), G_CALLBACK (on_key_delete) }
 };
 
 static const GtkActionEntry EXPORT_ENTRIES[] = {
-	{ "key-export-file", GTK_STOCK_SAVE_AS, N_("E_xport Public Key..."), NULL,
-	  N_("Export public part of key to a file"), G_CALLBACK (on_key_export_file) },
-	{ "key-export-clipboard", GTK_STOCK_COPY, N_("_Copy Public Key"), "<control>C",
-	  N_("Copy public part of selected keys to the clipboard"), G_CALLBACK (on_key_export_clipboard) }
+	{ "file-export", GTK_STOCK_SAVE_AS, N_("E_xport..."), NULL,
+	  N_("Export to a file"), G_CALLBACK (on_key_export_file) },
+	{ "edit-export-clipboard", GTK_STOCK_COPY, N_("_Copy"), "<control>C",
+	  N_("Copy to the clipboard"), G_CALLBACK (on_key_export_clipboard) }
 };
 		
 static void 
@@ -459,7 +459,7 @@
 	gtk_action_group_set_translation_domain (pv->object_actions, GETTEXT_PACKAGE);
 	gtk_action_group_add_actions (pv->object_actions, KEY_ENTRIES, G_N_ELEMENTS (KEY_ENTRIES), self);
 	/* Mark the properties toolbar button as important */
-	g_object_set (gtk_action_group_get_action (pv->object_actions, "key-properties"), "is-important", TRUE, NULL);
+	g_object_set (gtk_action_group_get_action (pv->object_actions, "show-properties"), "is-important", TRUE, NULL);
 	seahorse_viewer_include_actions (self, pv->object_actions);
 	
 	pv->export_actions = gtk_action_group_new ("export");