diff options
| author | Martin Wehner <martin.wehner@gmail.com> | 2006-04-07 22:47:23 +0000 |
|---|---|---|
| committer | Martin Wehner <mwehner@src.gnome.org> | 2006-04-07 22:47:23 +0000 |
| commit | 72a15dafc31018e570bcf174389cbcc5ce244d06 (patch) | |
| tree | 338f3dee7b1b1bea535ced24c30d51043fc35335 | |
| parent | f8c4d81de60c942c03a8bddc6be210f2235ca35a (diff) | |
| download | nautilus-72a15dafc31018e570bcf174389cbcc5ce244d06.tar.gz | |
Use g_(un)setenv instead of their eel_ counterparts.
2006-04-08 Martin Wehner <martin.wehner@gmail.com>
* src/file-manager/fm-directory-view.c:
(set_script_environment_variables),
(unset_script_environment_variables):
* src/nautilus-main.c: (main):
* src/nautilus-shell.c: (corba_restart):
Use g_(un)setenv instead of their eel_ counterparts.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 16 | ||||
| -rw-r--r-- | src/nautilus-main.c | 2 | ||||
| -rw-r--r-- | src/nautilus-shell.c | 2 |
4 files changed, 19 insertions, 10 deletions
@@ -1,3 +1,12 @@ +2006-04-08 Martin Wehner <martin.wehner@gmail.com> + + * src/file-manager/fm-directory-view.c: + (set_script_environment_variables), + (unset_script_environment_variables): + * src/nautilus-main.c: (main): + * src/nautilus-shell.c: (corba_restart): + Use g_(un)setenv instead of their eel_ counterparts. + 2006-04-07 Martin Wehner <martin.wehner@gmail.com> * src/nautilus-places-sidebar.c: (add_place), (update_places), diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index b07a995f3..6208e1e13 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -5221,11 +5221,11 @@ set_script_environment_variables (FMDirectoryView *view, GList *selected_files) } g_free (directory_uri); - eel_setenv ("NAUTILUS_SCRIPT_SELECTED_FILE_PATHS", file_paths, TRUE); + g_setenv ("NAUTILUS_SCRIPT_SELECTED_FILE_PATHS", file_paths, TRUE); g_free (file_paths); uris = get_file_uris_as_newline_delimited_string (selected_files); - eel_setenv ("NAUTILUS_SCRIPT_SELECTED_URIS", uris, TRUE); + g_setenv ("NAUTILUS_SCRIPT_SELECTED_URIS", uris, TRUE); g_free (uris); uri = nautilus_directory_get_uri (view->details->model); @@ -5233,12 +5233,12 @@ set_script_environment_variables (FMDirectoryView *view, GList *selected_files) g_free (uri); uri = nautilus_get_desktop_directory_uri (); } - eel_setenv ("NAUTILUS_SCRIPT_CURRENT_URI", uri, TRUE); + g_setenv ("NAUTILUS_SCRIPT_CURRENT_URI", uri, TRUE); g_free (uri); geometry_string = eel_gtk_window_get_geometry_string (GTK_WINDOW (fm_directory_view_get_containing_window (view))); - eel_setenv ("NAUTILUS_SCRIPT_WINDOW_GEOMETRY", geometry_string, TRUE); + g_setenv ("NAUTILUS_SCRIPT_WINDOW_GEOMETRY", geometry_string, TRUE); g_free (geometry_string); } @@ -5246,10 +5246,10 @@ set_script_environment_variables (FMDirectoryView *view, GList *selected_files) static void unset_script_environment_variables (void) { - eel_unsetenv ("NAUTILUS_SCRIPT_SELECTED_FILE_PATHS"); - eel_unsetenv ("NAUTILUS_SCRIPT_SELECTED_URIS"); - eel_unsetenv ("NAUTILUS_SCRIPT_CURRENT_URI"); - eel_unsetenv ("NAUTILUS_SCRIPT_WINDOW_GEOMETRY"); + g_unsetenv ("NAUTILUS_SCRIPT_SELECTED_FILE_PATHS"); + g_unsetenv ("NAUTILUS_SCRIPT_SELECTED_URIS"); + g_unsetenv ("NAUTILUS_SCRIPT_CURRENT_URI"); + g_unsetenv ("NAUTILUS_SCRIPT_WINDOW_GEOMETRY"); } static void diff --git a/src/nautilus-main.c b/src/nautilus-main.c index 76a982937..b3980cc35 100644 --- a/src/nautilus-main.c +++ b/src/nautilus-main.c @@ -426,7 +426,7 @@ main (int argc, char *argv[]) */ if (g_getenv ("_NAUTILUS_RESTART") != NULL) { - eel_unsetenv ("_NAUTILUS_RESTART"); + g_unsetenv ("_NAUTILUS_RESTART"); /* Might eventually want to copy all the parameters * from argv into the new exec. For now, though, that diff --git a/src/nautilus-shell.c b/src/nautilus-shell.c index 61fdedd35..47fc457cf 100644 --- a/src/nautilus-shell.c +++ b/src/nautilus-shell.c @@ -392,5 +392,5 @@ corba_restart (PortableServer_Servant servant, save_window_states (); nautilus_main_event_loop_quit (); - eel_setenv ("_NAUTILUS_RESTART", "yes", 1); + g_setenv ("_NAUTILUS_RESTART", "yes", 1); } |