gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-10-29 23:47:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix script migration from Nautilus 1.0.x (bug #80704)

Browse source 
* src/file-manager/fm-directory-view.c:
(set_up_scripts_directory_global), (create_scripts_directory),
(open_scripts_folder_callback):
Fix script migration from Nautilus 1.0.x (bug #80704)
This commit is contained in:
Frédéric Crozat 2003-03-18 09:51:15 +00:00
parent 8f08b496a8
commit 14a7911eaf
3 changed files with 41 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.cvsignore
View file

@ -2,6 +2,7 @@ ABOUT-NLS
Makefile
Makefile.in
aclocal.m4
autom4te.cache
confdefs.h
config.cache
config.guess
@ -26,3 +27,4 @@ nautilus-file-management-properties.desktop
obj
stamp-h
stamp-h.in

7
ChangeLog
View file

@ -1,3 +1,10 @@
2003-03-18 Frederic Crozat <fcrozat@mandrakesoft.com>
* src/file-manager/fm-directory-view.c:
(set_up_scripts_directory_global), (create_scripts_directory),
(open_scripts_folder_callback):
Fix script migration from Nautilus 1.0.x (bug #80704)
2003-03-17 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-icon-container.c (record_arrow_key_start):

38
src/file-manager/fm-directory-view.c
View file

@ -60,6 +60,7 @@
#include <libgnomevfs/gnome-vfs-async-ops.h>
#include <libgnomevfs/gnome-vfs-file-info.h>
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
#include <libgnomevfs/gnome-vfs-ops.h>
#include <libgnomevfs/gnome-vfs-result.h>
#include <libgnomevfs/gnome-vfs-uri.h>
#include <libgnomevfs/gnome-vfs-utils.h>
@ -343,6 +344,7 @@ static void fm_directory_view_select_file (FMDirectoryView
NautilusFile *file);
static void monitor_file_for_open_with (FMDirectoryView *view,
NautilusFile *file);
static void create_scripts_directory (void);
EEL_CLASS_BOILERPLATE (FMDirectoryView, fm_directory_view, GTK_TYPE_SCROLLED_WINDOW)
@ -1184,19 +1186,43 @@ set_up_scripts_directory_global (void)
scripts_directory_uri = gnome_vfs_get_uri_from_local_path (scripts_directory_path);
scripts_directory_uri_length = strlen (scripts_directory_uri);
if (!g_file_test (scripts_directory_path, G_FILE_TEST_EXISTS)) {
create_scripts_directory ();
}
g_free (scripts_directory_path);
}
static void
create_scripts_directory (void)
{
char *path;
char *gnome1_path, *gnome1_uri_str;
GnomeVFSURI *gnome1_uri, *scripts_uri;
set_up_scripts_directory_global ();
path = gnome_vfs_get_local_path_from_uri (scripts_directory_uri);
mkdir (path,
scripts_uri = gnome_vfs_uri_new (scripts_directory_uri);
/* try to migrate nautilus 1 scripts */
gnome1_path = g_strconcat (g_get_home_dir(), "/.gnome/nautilus-scripts", NULL);
if (g_file_test (gnome1_path, G_FILE_TEST_EXISTS)) {
gnome1_uri_str = gnome_vfs_get_uri_from_local_path (gnome1_path);
gnome1_uri = gnome_vfs_uri_new (gnome1_uri_str);
g_free (gnome1_uri_str);
if (gnome_vfs_xfer_uri (gnome1_uri, scripts_uri,
GNOME_VFS_XFER_DEFAULT,
GNOME_VFS_XFER_ERROR_MODE_ABORT,
GNOME_VFS_XFER_OVERWRITE_MODE_SKIP,
NULL, NULL) != GNOME_VFS_OK) {
g_warning ("Failed to migrate Nautilus1 scripts\n");
}
gnome_vfs_uri_unref (gnome1_uri);
}
g_free (gnome1_path);
/* make sure scripts directory is created */
gnome_vfs_make_directory_for_uri (scripts_uri,
GNOME_VFS_PERM_USER_ALL | GNOME_VFS_PERM_GROUP_ALL | GNOME_VFS_PERM_OTHER_READ);
g_free (path);
gnome_vfs_uri_unref (scripts_uri);
}
static void
@ -4269,8 +4295,6 @@ open_scripts_folder_callback (BonoboUIComponent *component,
view = FM_DIRECTORY_VIEW (callback_data);
create_scripts_directory ();
open_location (view, scripts_directory_uri, RESPECT_PREFERENCE);
eel_show_info_dialog_with_details