summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-06-16 11:41:58 +0200
committerStefano Karapetsas <[email protected]>2012-06-16 11:41:58 +0200
commita8789710c20b11eeae3cabe35ea58f77af5f0617 (patch)
treebd2b22ba877819116191fc1a1411abb522a65fe9
parentcbbe010884fe1e3ad1deabbed7f89a77b0098a2f (diff)
downloadcaja-a8789710c20b11eeae3cabe35ea58f77af5f0617.tar.bz2
caja-a8789710c20b11eeae3cabe35ea58f77af5f0617.tar.xz
use engrampa instead of file-roller
-rw-r--r--libcaja-private/caja-file-dnd.c2
-rw-r--r--libcaja-private/caja-file-utilities.c4
-rw-r--r--libcaja-private/caja-file-utilities.h2
-rw-r--r--src/file-manager/fm-directory-view.c6
4 files changed, 7 insertions, 7 deletions
diff --git a/libcaja-private/caja-file-dnd.c b/libcaja-private/caja-file-dnd.c
index 06a61daf..9996c0c8 100644
--- a/libcaja-private/caja-file-dnd.c
+++ b/libcaja-private/caja-file-dnd.c
@@ -65,7 +65,7 @@ caja_drag_can_accept_files (CajaFile *drop_target_item)
return TRUE;
}
- if (caja_is_file_roller_installed () &&
+ if (caja_is_engrampa_installed () &&
caja_file_is_archive (drop_target_item))
{
return TRUE;
diff --git a/libcaja-private/caja-file-utilities.c b/libcaja-private/caja-file-utilities.c
index 6c9a7de1..bb942c99 100644
--- a/libcaja-private/caja-file-utilities.c
+++ b/libcaja-private/caja-file-utilities.c
@@ -1103,13 +1103,13 @@ caja_find_file_insensitive_next (GFile *parent, const gchar *name)
}
gboolean
-caja_is_file_roller_installed (void)
+caja_is_engrampa_installed (void)
{
static int installed = - 1;
if (installed < 0)
{
- if (g_find_program_in_path ("file-roller"))
+ if (g_find_program_in_path ("engrampa"))
{
installed = 1;
}
diff --git a/libcaja-private/caja-file-utilities.h b/libcaja-private/caja-file-utilities.h
index 2e2a5746..77946eb0 100644
--- a/libcaja-private/caja-file-utilities.h
+++ b/libcaja-private/caja-file-utilities.h
@@ -81,7 +81,7 @@ char * caja_pixmap_file (const char *partial_path);
/* Locate a file in either the uers directory or the datadir. */
char * caja_get_data_file_path (const char *partial_path);
-gboolean caja_is_file_roller_installed (void);
+gboolean caja_is_engrampa_installed (void);
/* Inhibit/Uninhibit MATE Power Manager */
int caja_inhibit_power_manager (const char *message) G_GNUC_WARN_UNUSED_RESULT;
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index a5504893..32905c84 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -10137,19 +10137,19 @@ fm_directory_view_move_copy_items (const GList *item_uris,
fm_directory_view_get_containing_window (view));
return;
} else if (copy_action == GDK_ACTION_COPY &&
- caja_is_file_roller_installed () &&
+ caja_is_engrampa_installed () &&
target_file != NULL &&
caja_file_is_archive (target_file)) {
char *command, *quoted_uri, *tmp;
const GList *l;
GdkScreen *screen;
- /* Handle dropping onto a file-roller archiver file, instead of starting a move/copy */
+ /* Handle dropping onto a engrampa archiver file, instead of starting a move/copy */
caja_file_unref (target_file);
quoted_uri = g_shell_quote (target_uri);
- command = g_strconcat ("file-roller -a ", quoted_uri, NULL);
+ command = g_strconcat ("engrampa -a ", quoted_uri, NULL);
g_free (quoted_uri);
for (l = item_uris; l != NULL; l = l->next) {