Commit graph

3 commits

Author SHA1 Message Date
Darin Adler
e7d9f82a0f Merge all changes from gnome-vfs-1 branch to HEAD. 2001-03-06 23:33:19 +00:00
Mathieu Lacage
404ba40351 reviewed by: Sullivan
2000-11-17  Mathieu Lacage  <mathieu@eazel.com>

	reviewed by: Sullivan

	fix Bug 4768. Reported 3 bugs about separate issues: 4796, 4797, 4798.
	* data/mime/gnome-vfs.keys: change icon filenames to relative paths.
	* libgnomevfs/Makefile.am: add GNOME_VFS_PREFIX
	* libgnomevfs/gnome-vfs-mime-info.c: (gnome_vfs_mime_info_reload):
	add initialition code if the mime stuff is not initalized when doing
	a reload. This avoids a segfault.
	* libgnomevfs/gnome-vfs-utils.c: (hack_file_exists): new function
	copied from gnome-libs: prviously named g_file_exists.
	(gnome_vfs_icon_path_from_filename): new API function. It looks
	in GNOME_PATH to find the icons and defaults to the gnome-vfs prefix
	one. It accepts only relative paths and returns an absolute path.
	* libgnomevfs/gnome-vfs-utils.h: add prototype.
	* mime-type-capplet/nautilus-mime-type-capplet.c:
	(really_change_icon), changes the icon used by a mime type.
	(gil_icon_selected_cb): changes the icon when you double-click.
	(change_icon_clicked_cb_real): changes the icon when you click on ok.
	(change_icon_clicked): connect to the clicked and select_icon signals
	to know when the user has made up his mind about hte new icon.
	(nautilus_mime_type_capplet_update_info), spaces.
	(add_mime_clicked): spaces.
	(nautilus_mime_type_capplet_update_mime_list_icon): spaces.
	(capplet_get_icon_pixbuf): spaces.
	(populate_mime_list): spaces.
	* mime-type-capplet/nautilus-mime-type-icon-entry.c:
	(icon_selected_cb): spaces.
	(nautilus_mime_type_show_icon_selection): spaces.
	(nautilus_mime_type_icon_entry_get_relative_filename): new function.
	returns a relative filename instead of an abosulte one.
	* mime-type-capplet/nautilus-mime-type-icon-entry.h: add relative
	function prototype
2000-11-17 23:15:20 +00:00
Gene Z. Ragan
6ebefae27f New API to get and set icon data.
2000-07-14  Gene Z. Ragan  <gzr@eazel.com>

	* libgnomevfs/gnome-vfs-mime-handlers.c:
	* libgnomevfs/gnome-vfs-mime-handlers.h:
	(gnome_vfs_mime_get_icon), (gnome_vfs_mime_set_icon):
	New API to get and set icon data.

	* mime-type-capplet/Makefile.am:
	Added new file
	mime-type-capplet/nautilus-mime-type-icon-entry.c

	* mime-type-capplet/nautilus-mime-type-icon-entry.c:
	* mime-type-capplet/nautilus-mime-type-icon-entry.h:
	(nautilus_mime_type_icon_entry_get_type),
	(nautilus_mime_type_icon_entry_class_init), (entry_changed),
	(entry_activated), (setup_preview), (ientry_destroy),
	(browse_clicked), (icon_selected_cb), (cancel_pressed),
	(gil_icon_selected_cb), (nautilus_mime_type_show_icon_selection),
	(drag_data_received), (drag_data_get),
	(nautilus_mime_type_icon_entry_init),
	(nautilus_mime_type_icon_entry_new),
	(nautilus_mime_type_icon_entry_gnome_file_entry),
	(nautilus_mime_type_icon_entry_gnome_entry),
	(nautilus_mime_type_icon_entry_gtk_entry),
	(nautilus_mime_type_icon_entry_set_pixmap_subdir),
	(nautilus_mime_type_icon_entry_set_icon),
	(nautilus_mime_type_icon_entry_get_filename):
	New file.  This is a new verison of GnomeIconEntry.
	I am customizing it to look and bahve in a way that
	is compatible with Arlo's UI reccomendations.

	* mime-type-capplet/nautilus-mime-type-capplet.c:
	(mime_list_selected_row_callback), (icon_changed),
	(change_icon_clicked), (init_mime_capplet),
	(nautilus_mime_type_capplet_update_info), (populate_mime_list):
	More UI cleanups.  Removed GnomeIconEntry and replaced
	with new NautilusMimeTypeIconEntry.
2000-07-15 01:56:53 +00:00