diff options
| author | Gene Z. Ragan <gzr@eazel.com> | 2001-02-15 02:09:16 +0000 |
|---|---|---|
| committer | Gene Ragan <gzr@src.gnome.org> | 2001-02-15 02:09:16 +0000 |
| commit | 694815ad592aaf477a6c976c527adf4b60493915 (patch) | |
| tree | 69f5ed34fab00b7b74811837fe7f3edcbfc4cf1a | |
| parent | ccfe3a4abfe1f25d2e74ecc301f75c5f5a141b09 (diff) | |
| download | gnome-control-center-694815ad592aaf477a6c976c527adf4b60493915.tar.gz | |
Fixed bug 6629, Default action icon disappears when switching from
2001-02-14 Gene Z. Ragan <gzr@eazel.com>
Fixed bug 6629, Default action icon disappears when switching
from application->viewer->application
Fixed bug 6630, Default action icon not drawn when changing
the default application
* mime-type-capplet/nautilus-mime-type-capplet.c:
(init_mime_capplet), (update_mime_list_action):
Call handy utility function to get custom or default
action icon based on mime tpye and type of action.
(column_clicked):
Remove some debugging cruft.
| -rw-r--r-- | capplets/file-types/file-types-capplet.c | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/capplets/file-types/file-types-capplet.c b/capplets/file-types/file-types-capplet.c index d2ada9783..1401fd10b 100644 --- a/capplets/file-types/file-types-capplet.c +++ b/capplets/file-types/file-types-capplet.c @@ -750,12 +750,6 @@ init_mime_capplet (const char *scroll_to_mime_type) } - - /* FIXME bugzilla.eazel.com 2765: this call generates a - Gtk-WARNING **: gtk_signal_disconnect_by_data(): could not find handler containing data (0x80FA6F8) - I think it is a bug in the control-center... - */ - /* Yes, show all widgets */ gtk_widget_show_all (capplet); @@ -1453,9 +1447,7 @@ update_mime_list_action (const char *mime_string) GnomeVFSMimeAction *action; GnomeVFSMimeApplication *default_app; OAF_ServerInfo *default_component; - const char *action_icon_name; char *text, *tmp_text; - char *action_icon_path; int row; pixbuf = NULL; @@ -1470,19 +1462,8 @@ update_mime_list_action (const char *mime_string) /* Get the default application */ default_app = gnome_vfs_mime_get_default_application (mime_string); g_free (text); - text = g_strdup (default_app->name); - action_icon_name = gnome_vfs_mime_get_icon (mime_string); - if (action_icon_name != NULL) { - /* Get custom icon */ - action_icon_path = gnome_pixmap_file (action_icon_name); - if (action_icon_path != NULL) { - pixbuf = gdk_pixbuf_new_from_file (action_icon_path); - g_free (action_icon_path); - } - } else { - /* Use default icon */ - pixbuf = gdk_pixbuf_new_from_file (DEFAULT_ACTION_ICON); - } + text = g_strdup (default_app->name); + pixbuf = capplet_get_icon_pixbuf (mime_string, TRUE); gnome_vfs_mime_application_free (default_app); break; @@ -1702,7 +1683,6 @@ column_clicked (GtkCList *clist, gint column, gpointer user_data) * that the sort type is descending the first time. */ if (!sort_column_clicked [column]) { - g_message ("Setting flag"); clist->sort_type = GTK_SORT_DESCENDING; sort_column_clicked [column] = TRUE; } |