applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed bug 1837, The icon in the action list item should represent the item

Browse source 
2000-08-02  Gene Z. Ragan  <gzr@eazel.com>

	Fixed bug 1837, The icon in the action list item
	should represent the item in the list.

	* mime-type-capplet/nautilus-mime-type-capplet.c:
	(populate_mime_list):
	Load icon and display based on action.
This commit is contained in:
Gene Z. Ragan 2000-08-02 22:10:17 +00:00 • committed by Gene Ragan
parent f88e8d52b4
commit f515abc9a8
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
capplets/file-types/file-types-capplet.c
View file

@ -1028,6 +1028,7 @@ populate_mime_list (GList *type_list, GtkCList *clist)
} }
/* Set up action column */ /* Set up action column */
pixbuf = NULL;
action = gnome_vfs_mime_get_default_action (mime_string); action = gnome_vfs_mime_get_default_action (mime_string);
if (action != NULL) { if (action != NULL) {
switch (action->action_type) { switch (action->action_type) {
@ -1035,12 +1036,23 @@ populate_mime_list (GList *type_list, GtkCList *clist)
/* Get the default application */ /* Get the default application */
default_app = gnome_vfs_mime_get_default_application (mime_string); default_app = gnome_vfs_mime_get_default_application (mime_string);
text[3] = default_app->name; text[3] = default_app->name;
action_icon_name = gnome_vfs_mime_get_icon (mime_string);
if (action_icon_name != NULL) {
/* Get custom icon */
action_icon_path = pixmap_file (action_icon_name);
pixbuf = gdk_pixbuf_new_from_file (action_icon_path);
} else {
/* Use default icon */
pixbuf = gdk_pixbuf_new_from_file ("/gnome/share/pixmaps/nautilus/i-executable.png");
}
break; break;
case GNOME_VFS_MIME_ACTION_TYPE_COMPONENT: case GNOME_VFS_MIME_ACTION_TYPE_COMPONENT:
/* Get the default component */ /* Get the default component */
default_component = gnome_vfs_mime_get_default_component (mime_string); default_component = gnome_vfs_mime_get_default_component (mime_string);
text[3] = name_from_oaf_server_info (default_component); text[3] = name_from_oaf_server_info (default_component);
pixbuf = gdk_pixbuf_new_from_file ("/gnome/share/pixmaps/nautilus/gnome-library.png");
break; break;
default: default:
@ -1048,18 +1060,7 @@ populate_mime_list (GList *type_list, GtkCList *clist)
break; break;
} }
} }
action_icon_name = gnome_vfs_mime_get_icon (mime_string);
if (action_icon_name != NULL) {
/* Get custom icon */
action_icon_path = pixmap_file (action_icon_name);
pixbuf = gdk_pixbuf_new_from_file (action_icon_path);
} else {
/* Use default icon */
pixbuf = gdk_pixbuf_new_from_file ("/gnome/share/pixmaps/nautilus/i-regular-24.png");
}
/* Set column icon */ /* Set column icon */
if (pixbuf != NULL) { if (pixbuf != NULL) {
pixbuf = capplet_gdk_pixbuf_scale_to_fit (pixbuf, 18, 18); pixbuf = capplet_gdk_pixbuf_scale_to_fit (pixbuf, 18, 18);