--- a/ROX-Filer/src/main.c
+++ b/ROX-Filer/src/main.c
@@ -1029,9 +1029,7 @@ static GList *build_make_script(Option *option, xmlNode *node, guchar *label)
g_signal_connect(button, "clicked", G_CALLBACK(make_script_clicked),
NULL);
- tip = _("Click to save a script to run ROX-Filer.\n"
- "If you are using Zero Install you should use 0alias "
- "instead.");
+ tip = _("Click to save a script to run ROX-Filer.");
gtk_tooltips_set_tip(tooltips, button, tip, NULL);
gtk_container_add(GTK_CONTAINER(align), button);
--- a/ROX-Filer/src/filer.c
+++ b/ROX-Filer/src/filer.c
@@ -2931,8 +2931,6 @@ void filer_set_autoscroll(FilerWindow *filer_window, gboolean auto_scroll)
}
}
-#define ZERO_MNT "/uri/0install"
-
static void refresh_done(FilerWindow *filer_window)
{
if (filer_exists(filer_window))
@@ -2941,26 +2939,6 @@ static void refresh_done(FilerWindow *filer_window)
void filer_refresh(FilerWindow *filer_window)
{
- if (!strncmp(ZERO_MNT "/", filer_window->real_path, sizeof(ZERO_MNT)))
- {
- /* Try to run 0refresh */
- gint pid;
- gchar *argv[] = {"0refresh", NULL, NULL};
- const char *host = filer_window->real_path + sizeof(ZERO_MNT);
- const char *slash;
-
- slash = strchr(host, '/');
- if (slash)
- argv[1] = g_strndup(host, slash - host);
- else
- argv[1] = g_strdup(host);
- pid = rox_spawn(filer_window->real_path, (const char **) argv);
- g_free(argv[1]);
- if (pid)
- on_child_death(pid, (CallbackFn) refresh_done,
- filer_window);
- }
-
full_refresh();
}
--- a/ROX-Filer/src/gui_support.c
+++ b/ROX-Filer/src/gui_support.c
@@ -1553,46 +1553,15 @@ void make_heading(GtkWidget *label, double scale_factor)
*/
void launch_uri(GObject *button, const char *uri)
{
- const char *argv[] = {"0launch", NULL, NULL, NULL};
- const char *uri_0launch = "/uri/0install/zero-install.sourceforge.net"
- "/bin/0launch";
-
- if (!available_in_path(argv[0]))
- {
- if (access(uri_0launch, X_OK) == 0)
- argv[0] = uri_0launch;
- else
- {
- const char *appname=g_object_get_data(button,
- "appname");
-
- if (appname)
- {
- gchar *path=find_app(appname);
- if(path)
- {
- run_by_path(path);
- g_free(path);
- return;
- }
- }
-
- delayed_error(_("This program (%s) cannot be run, "
- "as the 0launch command is not available. "
- "It can be downloaded from here:\n\n"
- "http://0install.net/injector.html"),
- uri);
- return;
- }
- }
+ const char *argv[] = {NULL, NULL};
if (current_event_button() == 3)
{
- argv[1] = "-g";
- argv[2] = uri;
+ argv[0] = "-g";
+ argv[1] = uri;
}
else
- argv[1] = uri;
+ argv[0] = uri;
rox_spawn(NULL, argv);
}
--- a/ROX-Filer/src/session.c
+++ b/ROX-Filer/src/session.c
@@ -36,7 +36,6 @@
#define ROX_FILER_URI "http://rox.sourceforge.net/2005/interfaces/ROX-Filer"
-static gboolean use_0launch;
gboolean session_auto_respawn = FALSE; /* If we were started as 'rox -S' */
static void save_state(SmClient *client)
@@ -50,16 +49,8 @@ static void save_state(SmClient *client)
gchar *types[] = { "-t", "-B", "-l", "-r" };
gint i, nvals;
- if (use_0launch)
- {
- g_ptr_array_add(restart_cmd, "0launch");
- g_ptr_array_add(restart_cmd, ROX_FILER_URI);
- }
- else
- {
- sc_get_prop_value(client, SmProgram, &program, &nvals);
- g_ptr_array_add(restart_cmd, program->value);
- }
+ sc_get_prop_value(client, SmProgram, &program, &nvals);
+ g_ptr_array_add(restart_cmd, program->value);
g_ptr_array_add(restart_cmd, "-c");
g_ptr_array_add(restart_cmd, client->id);
@@ -120,31 +111,16 @@ void session_init(const gchar *client_id)
struct passwd *pw;
gchar *bin_path;
gchar *clone_cmd[3];
- gchar *zerolaunch;
if (!sc_session_up())
return;
pw = getpwuid(euid);
- zerolaunch = g_find_program_in_path("0launch");
- use_0launch = (zerolaunch != NULL);
- g_free(zerolaunch);
-
- if (use_0launch)
- {
- bin_path = "0launch";
- clone_cmd[0] = bin_path;
- clone_cmd[1] = ROX_FILER_URI,
- clone_cmd[2] = "-n";
- }
- else
- {
- bin_path = g_strconcat(app_dir, "/AppRun", NULL);
- clone_cmd[0] = bin_path;
- clone_cmd[1] = "-n";
- clone_cmd[2] = NULL;
- }
+ bin_path = g_strconcat(app_dir, "/AppRun", NULL);
+ clone_cmd[0] = bin_path;
+ clone_cmd[1] = "-n";
+ clone_cmd[2] = NULL;
client = sc_new(client_id);
--- a/ROX-Filer/Options.xml
+++ b/ROX-Filer/Options.xml
@@ -111,14 +111,10 @@ indicator'>If this is on then files which have one or more extended attributes s
This is the default setting for new windows. Use the Display menu to turn thumbnails on and off for individual windows.
-
-
-
-
@@ -277,12 +273,7 @@ xterm -e wget $1
-
-
-
-
-
-
+