diff options
| author | Alexander Larsson <alexl@redhat.com> | 2005-11-14 15:16:19 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2005-11-14 15:16:19 +0000 |
| commit | e755aa2092e88b6c851709b03fdf7f9f56e4110b (patch) | |
| tree | 97434af78ee325c7c31b7571b8dbf3d2ad3d8274 | |
| parent | 2d5ebc1b09c10458b76ad0fd45ac171d8f1e1092 (diff) | |
| download | nautilus-e755aa2092e88b6c851709b03fdf7f9f56e4110b.tar.gz | |
Handle the case of missing highlight frame better. Patch from Christian
2005-11-14 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-icon-canvas-item.c: (draw_frame):
Handle the case of missing highlight frame better.
Patch from Christian Neumair
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-icon-canvas-item.c | 8 |
2 files changed, 11 insertions, 3 deletions
@@ -1,5 +1,11 @@ 2005-11-14 Alexander Larsson <alexl@redhat.com> + * libnautilus-private/nautilus-icon-canvas-item.c: (draw_frame): + Handle the case of missing highlight frame better. + Patch from Christian Neumair + +2005-11-14 Alexander Larsson <alexl@redhat.com> + * src/file-manager/fm-properties-window.c: Nicer ui for setting custom icons (#95115) Patch from Christian Neumair diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c index 0e745b8b0..6e7cefa0e 100644 --- a/libnautilus-private/nautilus-icon-canvas-item.c +++ b/libnautilus-private/nautilus-icon-canvas-item.c @@ -898,9 +898,11 @@ draw_frame (NautilusIconCanvasItem *item, eel_gdk_pixbuf_fill_rectangle_with_color (selection_pixbuf, eel_gdk_pixbuf_whole_pixbuf, 0xffffffff); - clear_rounded_corners (selection_pixbuf, - container->details->highlight_frame, - 5); + if (container->details->highlight_frame != NULL) { + clear_rounded_corners (selection_pixbuf, + container->details->highlight_frame, + 5); + } multiply_pixbuf_rgba (selection_pixbuf, color); if (create_mask) { |