[seahorse] Simplify how we access the window.

[Stefan Walter <stefw src gnome org>]

commit 3bb6be0e1b87d41356bbfe9f1af3d9a4024d1231
Author: Stef Walter <stefw collabora co uk>
Date:   Fri Sep 2 11:56:11 2011 +0200

    Simplify how we access the window.
    
     * Use accessor functions in SeahorseCommands and SeahorseViewer

 gkr/seahorse-gkr-item-commands.c    |    6 ++--
 gkr/seahorse-gkr-keyring-commands.c |   46 ++++++++++++++--------------------
 pkcs11/seahorse-pkcs11-commands.c   |    6 ++--
 src/seahorse-viewer.c               |   10 ++++----
 ssh/seahorse-ssh-commands.c         |    2 +-
 5 files changed, 31 insertions(+), 39 deletions(-)
---
diff --git a/gkr/seahorse-gkr-item-commands.c b/gkr/seahorse-gkr-item-commands.c
index e9dfe23..93d6983 100644
--- a/gkr/seahorse-gkr-item-commands.c
+++ b/gkr/seahorse-gkr-item-commands.c
@@ -56,7 +56,7 @@ seahorse_gkr_item_commands_show_properties (SeahorseCommands* base, SeahorseObje
 	g_return_if_fail (SEAHORSE_IS_OBJECT (object));
 	g_return_if_fail (seahorse_object_get_tag (object) == SEAHORSE_GKR_TYPE);
 
-	window = seahorse_view_get_window (seahorse_commands_get_view (base));
+	window = seahorse_commands_get_window (base);
 	if (G_OBJECT_TYPE (object) == SEAHORSE_TYPE_GKR_ITEM) 
 		seahorse_gkr_item_properties_show (SEAHORSE_GKR_ITEM (object), window); 
 	
@@ -74,7 +74,7 @@ on_delete_objects (GObject *source,
 	GtkWidget *parent;
 
 	if (!seahorse_gkr_delete_finish (result, &error)) {
-		parent = GTK_WIDGET (seahorse_view_get_window (seahorse_commands_get_view (commands)));
+		parent = GTK_WIDGET (seahorse_commands_get_window (commands));
 		seahorse_util_show_error (parent, _("Couldn't delete item"), error->message);
 		g_error_free (error);
 	}
@@ -105,7 +105,7 @@ seahorse_gkr_item_commands_delete_objects (SeahorseCommands* commands,
 		                                    num), num);
 	}
 	
-	parent = GTK_WIDGET (seahorse_view_get_window (seahorse_commands_get_view (commands)));
+	parent = GTK_WIDGET (seahorse_commands_get_window (commands));
 	ret = seahorse_util_prompt_delete (prompt, parent);
 
 	if (ret) {
diff --git a/gkr/seahorse-gkr-keyring-commands.c b/gkr/seahorse-gkr-keyring-commands.c
index f425617..e023676 100644
--- a/gkr/seahorse-gkr-keyring-commands.c
+++ b/gkr/seahorse-gkr-keyring-commands.c
@@ -81,11 +81,11 @@ on_refresh_all_keyrings_complete (GObject *source,
 }
 
 static void
-refresh_all_keyrings (SeahorseCommands *self)
+refresh_all_keyrings (SeahorseCommands *commands)
 {
 	seahorse_source_load_async (SEAHORSE_SOURCE (seahorse_gkr_source_default ()),
 	                            NULL, on_refresh_all_keyrings_complete,
-	                            g_object_ref (self));
+	                            g_object_ref (commands));
 }
 
 /**
@@ -119,19 +119,17 @@ static const GtkActionEntry ENTRIES_NEW[] = {
 static void
 on_keyring_unlock_done (GnomeKeyringResult result, gpointer user_data)
 {
-	SeahorseCommands *self = SEAHORSE_COMMANDS (user_data);
-	SeahorseView *view;
+	SeahorseCommands *commands = SEAHORSE_COMMANDS (user_data);
 
 	if (result != GNOME_KEYRING_RESULT_OK &&
 	    result != GNOME_KEYRING_RESULT_DENIED &&
 	    result != GNOME_KEYRING_RESULT_CANCELLED) {
-		view = seahorse_commands_get_view (self);
-		seahorse_util_show_error (GTK_WIDGET (seahorse_view_get_window (view)),
+		seahorse_util_show_error (GTK_WIDGET (seahorse_commands_get_window (commands)),
 		                          _("Couldn't unlock keyring"),
 		                          gnome_keyring_result_to_message (result));
 	}
-	
-	refresh_all_keyrings (self);
+
+	refresh_all_keyrings (commands);
 }
 
 static void 
@@ -158,19 +156,17 @@ on_keyring_unlock (GtkAction *action, SeahorseGkrKeyringCommands *self)
 static void
 on_keyring_lock_done (GnomeKeyringResult result, gpointer user_data)
 {
-	SeahorseCommands *self = SEAHORSE_COMMANDS (user_data);
-	SeahorseView *view;
+	SeahorseCommands *commands = SEAHORSE_COMMANDS (user_data);
 
 	if (result != GNOME_KEYRING_RESULT_OK &&
 	    result != GNOME_KEYRING_RESULT_DENIED &&
 	    result != GNOME_KEYRING_RESULT_CANCELLED) {
-		view = seahorse_commands_get_view (self);
-		seahorse_util_show_error (GTK_WIDGET (seahorse_view_get_window (view)),
+		seahorse_util_show_error (GTK_WIDGET (seahorse_commands_get_window (commands)),
 		                          _("Couldn't lock keyring"),
 		                          gnome_keyring_result_to_message (result));
 	}
 
-	refresh_all_keyrings (self);
+	refresh_all_keyrings (commands);
 }
 
 static void 
@@ -197,19 +193,17 @@ on_keyring_lock (GtkAction *action, SeahorseGkrKeyringCommands *self)
 static void
 on_set_default_keyring_done (GnomeKeyringResult result, gpointer user_data)
 {
-	SeahorseCommands *self = SEAHORSE_COMMANDS (user_data);
-	SeahorseView *view;
+	SeahorseCommands *commands = SEAHORSE_COMMANDS (user_data);
 
 	if (result != GNOME_KEYRING_RESULT_OK &&
 	    result != GNOME_KEYRING_RESULT_DENIED &&
 	    result != GNOME_KEYRING_RESULT_CANCELLED) {
-		view = seahorse_commands_get_view (self);
-		seahorse_util_show_error (GTK_WIDGET (seahorse_view_get_window (view)),
+		seahorse_util_show_error (GTK_WIDGET (seahorse_commands_get_window (commands)),
 		                          _("Couldn't set default keyring"),
 		                          gnome_keyring_result_to_message (result));
 	}
-	
-	refresh_all_keyrings (self);
+
+	refresh_all_keyrings (commands);
 }
 
 static void
@@ -236,19 +230,17 @@ on_keyring_default (GtkAction *action, SeahorseGkrKeyringCommands *self)
 static void
 on_change_password_done (GnomeKeyringResult result, gpointer user_data)
 {
-	SeahorseCommands *self = SEAHORSE_COMMANDS (user_data);
-	SeahorseView *view;
+	SeahorseCommands *commands = SEAHORSE_COMMANDS (user_data);
 
 	if (result != GNOME_KEYRING_RESULT_OK &&
 	    result != GNOME_KEYRING_RESULT_DENIED &&
 	    result != GNOME_KEYRING_RESULT_CANCELLED) {
-		view = seahorse_commands_get_view (self);
-		seahorse_util_show_error (GTK_WIDGET (seahorse_view_get_window (view)),
+		seahorse_util_show_error (GTK_WIDGET (seahorse_commands_get_window (commands)),
 		                          _("Couldn't change keyring password"),
 		                          gnome_keyring_result_to_message (result));
 	}
-	
-	refresh_all_keyrings (self);
+
+	refresh_all_keyrings (commands);
 }
 
 static void
@@ -328,7 +320,7 @@ seahorse_gkr_keyring_commands_show_properties (SeahorseCommands* base, SeahorseO
 	g_return_if_fail (SEAHORSE_IS_OBJECT (object));
 	g_return_if_fail (seahorse_object_get_tag (object) == SEAHORSE_GKR_TYPE);
 
-	window = seahorse_view_get_window (seahorse_commands_get_view (base));
+	window = seahorse_commands_get_window (base);
 	if (G_OBJECT_TYPE (object) == SEAHORSE_TYPE_GKR_KEYRING) 
 		seahorse_gkr_keyring_properties_show (SEAHORSE_GKR_KEYRING (object), window);
 	
@@ -344,7 +336,7 @@ on_delete_objects_complete (GObject *source, GAsyncResult *result, gpointer user
 	GtkWidget *parent;
 
 	if (!seahorse_gkr_delete_finish (result, &error)) {
-		parent = GTK_WIDGET (seahorse_view_get_window (seahorse_commands_get_view (commands)));
+		parent = GTK_WIDGET (seahorse_commands_get_window (commands));
 		seahorse_util_show_error (parent, _("Couldn't delete keyring"), error->message);
 		g_error_free (error);
 	}
diff --git a/pkcs11/seahorse-pkcs11-commands.c b/pkcs11/seahorse-pkcs11-commands.c
index be3f905..c8573b9 100644
--- a/pkcs11/seahorse-pkcs11-commands.c
+++ b/pkcs11/seahorse-pkcs11-commands.c
@@ -85,7 +85,7 @@ seahorse_pkcs11_commands_show_properties (SeahorseCommands *cmds, SeahorseObject
 	
 	/* Create a new dialog for the certificate */
 	window = GTK_WINDOW (seahorse_pkcs11_certificate_props_new (GCR_CERTIFICATE (object)));
-	gtk_window_set_transient_for (window, seahorse_view_get_window (seahorse_commands_get_view (cmds)));
+	gtk_window_set_transient_for (window, seahorse_commands_get_window (cmds));
 	g_object_set_qdata (G_OBJECT (object), slot_certificate_window, window);
 	gtk_widget_show (GTK_WIDGET (window));
 
@@ -102,7 +102,7 @@ on_delete_completed (GObject *source,
 	GError *error = NULL;
 
 	if (!seahorse_pkcs11_delete_finish (result, &error))
-		seahorse_util_handle_error (&error, seahorse_view_get_window (seahorse_commands_get_view (self)),
+		seahorse_util_handle_error (&error, seahorse_commands_get_window (self),
 		                            _("Couldn't delete"));
 
 	g_object_unref (self);
@@ -132,7 +132,7 @@ seahorse_pkcs11_commands_delete_objects (SeahorseCommands *cmds, GList *objects)
 				num), num);
 	}
 
-	parent = GTK_WIDGET (seahorse_view_get_window (seahorse_commands_get_view (cmds)));
+	parent = GTK_WIDGET (seahorse_commands_get_window (cmds));
 	ret = seahorse_util_prompt_delete (prompt, parent);
 	g_free (prompt);
 
diff --git a/src/seahorse-viewer.c b/src/seahorse-viewer.c
index b8761ec..2997fce 100644
--- a/src/seahorse-viewer.c
+++ b/src/seahorse-viewer.c
@@ -102,7 +102,7 @@ on_app_preferences (GtkAction* action, SeahorseViewer* self)
 	g_return_if_fail (SEAHORSE_IS_VIEWER (self));
 	g_return_if_fail (GTK_IS_ACTION (action));
 
-	seahorse_preferences_show (seahorse_view_get_window (SEAHORSE_VIEW (self)), NULL);
+	seahorse_preferences_show (seahorse_viewer_get_window (self), NULL);
 }
 
 static void 
@@ -256,7 +256,7 @@ on_file_export_completed (GObject *source,
 	GError *error = NULL;
 
 	if (!seahorse_source_export_auto_finish (result, &error))
-		seahorse_util_handle_error (&error, seahorse_view_get_window (SEAHORSE_VIEW (self)),
+		seahorse_util_handle_error (&error, seahorse_viewer_get_window (self),
 		                            _("Couldn't export keys"));
 
 	g_object_unref (self);
@@ -279,7 +279,7 @@ on_key_export_file (GtkAction* action, SeahorseViewer* self)
 		return;
 
 	dialog = seahorse_util_chooser_save_new (_("Export public key"), 
-	                                         seahorse_view_get_window (SEAHORSE_VIEW (self)));
+	                                         seahorse_viewer_get_window (self));
 	seahorse_util_chooser_show_key_files (dialog);
 	seahorse_util_chooser_set_filename_full (dialog, objects);
 	uri = seahorse_util_chooser_save_prompt (dialog);
@@ -327,7 +327,7 @@ on_copy_export_complete (GObject *source,
 
 	output = seahorse_source_export_auto_finish (result, &error);
 	if (error != NULL) {
-		seahorse_util_handle_error (&error, seahorse_view_get_window (SEAHORSE_VIEW (self)),
+		seahorse_util_handle_error (&error, seahorse_viewer_get_window (self),
 		                            _("Couldn't retrieve data from key server"));
 		return;
 	}
@@ -422,7 +422,7 @@ on_key_delete (GtkAction* action, SeahorseViewer* self)
 		if (seahorse_object_get_usage (object) == SEAHORSE_USAGE_PRIVATE_KEY) {
 			gchar* prompt = g_strdup_printf (_("%s is a private key. Are you sure you want to proceed?"), 
 			                                 seahorse_object_get_label (object));
-			if (!seahorse_util_prompt_delete (prompt, GTK_WIDGET (seahorse_view_get_window (SEAHORSE_VIEW (self))))) {
+			if (!seahorse_util_prompt_delete (prompt, GTK_WIDGET (seahorse_viewer_get_window (self)))) {
 				g_free (prompt);
 				g_list_free (objects);
 				return;
diff --git a/ssh/seahorse-ssh-commands.c b/ssh/seahorse-ssh-commands.c
index ca055a3..5d806d3 100644
--- a/ssh/seahorse-ssh-commands.c
+++ b/ssh/seahorse-ssh-commands.c
@@ -121,7 +121,7 @@ seahorse_ssh_commands_delete_objects (SeahorseCommands* base, GList* objects)
 		prompt = g_strdup_printf (_("Are you sure you want to delete %d secure shell keys?"), num);
 	}
 
-	parent = GTK_WIDGET (seahorse_view_get_window (seahorse_commands_get_view (base)));
+	parent = GTK_WIDGET (seahorse_commands_get_window (base));
 	if (!seahorse_util_prompt_delete (prompt, NULL)) {
 		g_free (prompt);
 		return FALSE;