diff options
| author | Darin Adler <darin@src.gnome.org> | 2002-02-04 18:04:07 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2002-02-04 18:04:07 +0000 |
| commit | 0294dc1f88b70472d4360c15d6d7a23138f714cc (patch) | |
| tree | 4686aed73b35303e9278b76bb7638085de7b6763 | |
| parent | 2043280a282e56dd2e6274e76122b162fc66c811 (diff) | |
| download | nautilus-0294dc1f88b70472d4360c15d6d7a23138f714cc.tar.gz | |
Don't ignore tarballs. Bump version number. Bump version number.NAUTILUS_1_1_4
* .cvsignore: Don't ignore tarballs.
* NEWS: Bump version number.
* configure.in: Bump version number.
* src/file-manager/fm-directory-view.c: (activate_callback):
Clean up code here a bit; patch submitted by David Emory Watson.
* src/file-manager/nautilus-icon-view-ui.xml: Tweak wording as
suggested by Steve Fox <drfickle@k-lug.org>.
| -rw-r--r-- | .cvsignore | 1 | ||||
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 16 | ||||
| -rw-r--r-- | src/file-manager/nautilus-icon-view-ui.xml | 2 |
6 files changed, 20 insertions, 15 deletions
diff --git a/.cvsignore b/.cvsignore index caf4ab63d..5ae336089 100644 --- a/.cvsignore +++ b/.cvsignore @@ -20,7 +20,6 @@ intltool-update.in libtool ltconfig ltmain.sh -nautilus-*.tar.gz nautilus.desktop nautilus.spec obj @@ -1,3 +1,15 @@ +2002-02-04 Darin Adler <darin@bentspoon.com> + + * .cvsignore: Don't ignore tarballs. + * NEWS: Bump version number. + * configure.in: Bump version number. + + * src/file-manager/fm-directory-view.c: (activate_callback): + Clean up code here a bit; patch submitted by David Emory Watson. + + * src/file-manager/nautilus-icon-view-ui.xml: Tweak wording as + suggested by Steve Fox <drfickle@k-lug.org>. + 2002-02-04 Laszlo Peter <laca@ireland.sun.com> * libnautilus/nautilus-clipboard.[ch]: fix licensing info. @@ -1,4 +1,4 @@ -This is nautilus 1.1.3, an interim version in the process of +This is nautilus 1.1.4, an interim version in the process of porting nautilus from the Gnome 1 platform to the Gnome 2 platform. A later release will document the changes since Gnome 1. diff --git a/configure.in b/configure.in index c5910f4e1..673e3c3c2 100644 --- a/configure.in +++ b/configure.in @@ -26,7 +26,7 @@ AC_SUBST(XML_REQUIRED) dnl =========================================================================== -AM_INIT_AUTOMAKE(nautilus, 1.1.3) +AM_INIT_AUTOMAKE(nautilus, 1.1.4) AM_CONFIG_HEADER(config.h) AM_SANITY_CHECK diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 3f9732fe7..8e9ba43e1 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -4652,23 +4652,16 @@ activate_callback (NautilusFile *file, gpointer callback_data) /* As desktop file loader only test gnome vfs result, we have * to also test for a valid desktop file by querying the hash */ - if (df && - nautilus_desktop_file_load (name, &df) == GNOME_VFS_OK && + if (nautilus_desktop_file_load (name, &df) == GNOME_VFS_OK && nautilus_desktop_file_get_string (df, NULL, "Exec", &command)) { - g_free (name); g_free (command); nautilus_desktop_file_launch (df); - nautilus_desktop_file_free (df); } else { - /* desktop file alloc failed or not a desktop file */ - if (df) - { - nautilus_desktop_file_free (df); - } - + /* not a desktop file */ + /* As an additional precaution, only execute * commands without any parameters, which is * enforced by using a call that uses @@ -4680,8 +4673,9 @@ activate_callback (NautilusFile *file, gpointer callback_data) command, NULL, /* param */ FALSE); - g_free (name); } + g_free (name); + nautilus_desktop_file_free (df); action = ACTIVATION_ACTION_DO_NOTHING; } } diff --git a/src/file-manager/nautilus-icon-view-ui.xml b/src/file-manager/nautilus-icon-view-ui.xml index 65f055cbb..28c60acf4 100644 --- a/src/file-manager/nautilus-icon-view-ui.xml +++ b/src/file-manager/nautilus-icon-view-ui.xml @@ -2,7 +2,7 @@ <commands> <cmd name="Rename" _label="Rename" - _tip="Rename selected icon"/> + _tip="Rename selected item"/> <cmd name="Stretch" _label="Stretch Icon" _tip="Make the selected icon stretchable"/> |