diff options
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkclipboard.c | 10 | ||||
| -rw-r--r-- | gtk/gtkfilesystemunix.c | 2 | ||||
| -rw-r--r-- | gtk/xdgmime/ChangeLog | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c index 74cdf66eb..2a9c79a03 100644 --- a/gtk/gtkclipboard.c +++ b/gtk/gtkclipboard.c @@ -1004,6 +1004,7 @@ request_image_received_func (GtkClipboard *clipboard, { /* If we asked for image/png and didn't get it, try image/jpeg; * if we asked for image/jpeg and didn't get it, try image/gif; + * if we asked for image/gif and didn't get it, try image/bmp; * If we asked for anything else and didn't get it, give up. */ if (selection_data->target == gdk_atom_intern ("image/png", FALSE)) @@ -1017,7 +1018,14 @@ request_image_received_func (GtkClipboard *clipboard, { gtk_clipboard_request_contents (clipboard, gdk_atom_intern ("image/gif", FALSE), - request_text_received_func, info); + request_image_received_func, info); + return; + } + else if (selection_data->target == gdk_atom_intern ("image/gif", FALSE)) + { + gtk_clipboard_request_contents (clipboard, + gdk_atom_intern ("image/bmp", FALSE), + request_image_received_func, info); return; } } diff --git a/gtk/gtkfilesystemunix.c b/gtk/gtkfilesystemunix.c index 274545e5d..403b52129 100644 --- a/gtk/gtkfilesystemunix.c +++ b/gtk/gtkfilesystemunix.c @@ -808,7 +808,7 @@ gtk_file_system_unix_volume_render_icon (GtkFileSystem *file_system, { GdkPixbuf *pixbuf; - pixbuf = get_cached_icon (widget, "gnome-fs-blockdev", pixel_size); + pixbuf = get_cached_icon (widget, "gnome-dev-harddisk", pixel_size); if (pixbuf) return pixbuf; diff --git a/gtk/xdgmime/ChangeLog b/gtk/xdgmime/ChangeLog index 7deb8535f..efaa26cc3 100644 --- a/gtk/xdgmime/ChangeLog +++ b/gtk/xdgmime/ChangeLog @@ -1,5 +1,7 @@ 2005-08-24 Matthias Clasen <mclasen@redhat.com> + * === Released 2.8.2 === + * === Released 2.8.1 === 2005-08-13 Matthias Clasen <mclasen@redhat.com> |