[file-roller] removed fr_archive_load_local

[Paolo Bacchilega <paobac src gnome org>]

commit 2f4c95584ec790c3a6bd010d42a84697251414d8
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Thu Jun 21 09:30:55 2012 +0200

    removed fr_archive_load_local
    
    it can be safely substituted by fr_archive_load

 src/fr-archive.c |   19 -------------------
 src/fr-archive.h |    3 ---
 src/fr-window.c  |   14 +++++++-------
 3 files changed, 7 insertions(+), 29 deletions(-)
---
diff --git a/src/fr-archive.c b/src/fr-archive.c
index 5486d58..e07dd87 100644
--- a/src/fr-archive.c
+++ b/src/fr-archive.c
@@ -1291,25 +1291,6 @@ fr_archive_load (FrArchive  *archive,
 }
 
 
-gboolean
-fr_archive_load_local (FrArchive  *archive,
-		       const char *uri,
-		       const char *password)
-{
-	g_return_val_if_fail (archive != NULL, FALSE);
-
-	g_signal_emit (G_OBJECT (archive),
-		       fr_archive_signals[START],
-		       0,
-		       FR_ACTION_LOADING_ARCHIVE);
-
-	fr_archive_set_uri (archive, uri);
-	copy_remote_file (archive, password);
-
-	return TRUE;
-}
-
-
 void
 fr_archive_reload (FrArchive  *archive,
 		   const char *password)
diff --git a/src/fr-archive.h b/src/fr-archive.h
index 41e23cf..afeef7e 100644
--- a/src/fr-archive.h
+++ b/src/fr-archive.h
@@ -108,9 +108,6 @@ gboolean    fr_archive_create                    (FrArchive       *archive,
 gboolean    fr_archive_load                      (FrArchive       *archive,
 						  const char      *uri,
 						  const char      *password);
-gboolean    fr_archive_load_local                (FrArchive       *archive,
-		       				  const char      *uri,
-		       				  const char      *password);
 void        fr_archive_reload                    (FrArchive       *archive,
 						  const char      *password);
 
diff --git a/src/fr-window.c b/src/fr-window.c
index 24cc462..7009052 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -170,7 +170,7 @@ typedef enum {
 
 typedef struct {
 	int            refs;
-	char          *archive_filename;
+	char          *archive_uri;
 	char          *archive_password;
 	FRClipboardOp  op;
 	char          *base_dir;
@@ -208,7 +208,7 @@ fr_clipboard_data_unref (FrClipboardData *clipboard_data)
 	if (--clipboard_data->refs > 0)
 		return;
 
-	g_free (clipboard_data->archive_filename);
+	g_free (clipboard_data->archive_uri);
 	g_free (clipboard_data->archive_password);
 	g_free (clipboard_data->base_dir);
 	g_free (clipboard_data->tmp_dir);
@@ -3893,7 +3893,7 @@ get_clipboard_data_from_selection_data (FrWindow   *window,
 
 	uris = g_strsplit (data, "\r\n", -1);
 
-	clipboard_data->archive_filename = g_strdup (uris[0]);
+	clipboard_data->archive_uri = g_strdup (uris[0]);
 	if (window->priv->password_for_paste != NULL)
 		clipboard_data->archive_password = g_strdup (window->priv->password_for_paste);
 	else if (strcmp (uris[1], "") != 0)
@@ -6047,7 +6047,7 @@ fr_window_get_paste_archive_uri (FrWindow *window)
 	g_return_val_if_fail (window != NULL, NULL);
 
 	if (window->priv->clipboard_data != NULL)
-		return window->priv->clipboard_data->archive_filename;
+		return window->priv->clipboard_data->archive_uri;
 	else
 		return NULL;
 }
@@ -7960,9 +7960,9 @@ fr_window_paste_from_clipboard_data (FrWindow        *window,
 				  window);
 		fr_archive_set_fake_load_func (window->priv->copy_from_archive, always_fake_load, NULL);
 	}
-	fr_archive_load_local (window->priv->copy_from_archive,
-			       data->archive_filename,
-			       data->archive_password);
+	fr_archive_load (window->priv->copy_from_archive,
+			 data->archive_uri,
+			 data->archive_password);
 }