Re: [PATCH] Remove Open with dialog from properties page of Trash



On Thu, 2005-02-17 at 11:41 +0100, Jaap Haitsma wrote:
> > On Wed, 2005-02-16 at 23:55 +0100, Jaap Haitsma wrote:
> >> Currently when you decide to show the properties page of the trash you
> >> get the following console messages
> >>
> >> (nautilus:4657): libgnomevfs-CRITICAL **:
> >> gnome_vfs_uri_extract_short_path_name: assertion `uri != NULL' failed
> >>
> >> (nautilus:4657): libgnomevfs-CRITICAL **: gnome_vfs_uri_get_host_name:
> >> assertion `uri != NULL' failed
> >>
> >> (nautilus:4657): libgnomevfs-CRITICAL **: gnome_vfs_uri_get_path:
> >> assertion `uri != NULL' failed
> >>
> >> (nautilus:4657): Eel-WARNING **: No extension, not implemented yet
> >>
> >> This is caused by the Open With tab in the properties page. Furthermore
> >> the open with functionality also does not work for the trash and to me
> >> it doesn't make much sense either.
> >>
> >> Attached patch removes Open With Dialog when properties of the Trash are
> >> shown.
> >
> >    if (!is_multi_file_window (window)
> > +           && nautilus_file_is_symbolic_link (get_target_file (window)))
> > {
> > +               return TRUE;
> > +       }
> >
> >
> > Doesn't this only display it for symbolic links? Its certainly not
> > something that only affects trash:///.
> 
> Sorry I made a copy paste mistake :-( should_show_open_with should
> look like this.
> 
> static gboolean
> should_show_open_with (FMPropertiesWindow *window)
> {
> 	/* The trash on the desktop is one-of-a-kind */
> 	if (!is_multi_file_window (window)
> 	    && is_merged_trash_directory (get_target_file (window))) {
> 		return FALSE;
> 	}
> 
> 	return TRUE;
> }

Thats not really right either. 
You should use, in addition to the old multi file check do something
like:

file = get_original_file (window);
if (file == NULL ||
    NAUTILUS_IS_DESKTOP_ICON_FILE (file) ||
    nautilus_file_is_nautilus_link (file))
   return FALSE

=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 Alexander Larsson                                            Red Hat, Inc 
                   alexl redhat com    alla lysator liu se 
He's an otherworldly Catholic cat burglar fleeing from a secret government 
programme. She's a transdimensional thirtysomething bounty hunter in the 
witness protection program. They fight crime! 




[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]