Commit 0294dc1f authored by Darin Adler's avatar Darin Adler

Don't ignore tarballs. Bump version number. Bump version number.

	* .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>.
parent 2043280a
......@@ -20,7 +20,6 @@ intltool-update.in
libtool
ltconfig
ltmain.sh
nautilus-*.tar.gz
nautilus.desktop
nautilus.spec
obj
......
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.
......
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.
......
......@@ -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
......
......@@ -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;
}
}
......
......@@ -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"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment