diff options
| author | Darin Adler <darin@src.gnome.org> | 2000-09-30 00:43:24 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2000-09-30 00:43:24 +0000 |
| commit | d17137ce2283f4da9b89e1fbacbf18a96314a380 (patch) | |
| tree | 6412619cb619902214d76c0149af282f8d65a0a7 /libnautilus-private/nautilus-scalable-font.c | |
| parent | a86194e0ab9160f0a2f571048cc80e841db261e7 (diff) | |
| download | nautilus-d17137ce2283f4da9b89e1fbacbf18a96314a380.tar.gz | |
Add special cases to handle fallback icon. (destroy_fallback_icon): Use
* libnautilus-extensions/nautilus-icon-factory.c: (cache_icon_ref),
(cache_icon_unref): Add special cases to handle fallback icon.
(destroy_fallback_icon): Use unref to free the fallback icon.
(load_icon_for_scaling): Handle the fallback icon more like other
icons.
* libnautilus-extensions/nautilus-scalable-font.c:
(nautilus_text_layout_new): Simplify the logic a bit by using
g_strndup.
Diffstat (limited to 'libnautilus-private/nautilus-scalable-font.c')
| -rw-r--r-- | libnautilus-private/nautilus-scalable-font.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/libnautilus-private/nautilus-scalable-font.c b/libnautilus-private/nautilus-scalable-font.c index 2930abdb6..4117fd96c 100644 --- a/libnautilus-private/nautilus-scalable-font.c +++ b/libnautilus-private/nautilus-scalable-font.c @@ -1555,9 +1555,7 @@ nautilus_text_layout_new (const NautilusScalableFont *font, /* Create sub-row with the chars that fit */ - sub_text = g_new (char, i); - memcpy (sub_text, word_start, (i - 1) * sizeof (char)); - sub_text[i - 1] = 0; + sub_text = g_strndup (word_start, i - 1); row = g_new (NautilusTextLayoutRow, 1); row->text = sub_text; @@ -1565,9 +1563,6 @@ nautilus_text_layout_new (const NautilusScalableFont *font, row->width = nautilus_scalable_font_text_width (font, font_size, font_size, sub_text, strlen (sub_text)); - if (row->text == NULL) { - row->text = g_strdup(""); - } text_layout->rows = g_list_append (text_layout->rows, row); @@ -1612,17 +1607,12 @@ nautilus_text_layout_new (const NautilusScalableFont *font, int sub_len; sub_len = word_end - text_iter; - sub_text = g_new (char, sub_len + 1); - memcpy (sub_text, text_iter, sub_len * sizeof (char)); - sub_text[sub_len] = 0; + sub_text = g_strndup (text_iter, sub_len); row = g_new (NautilusTextLayoutRow, 1); row->text = sub_text; row->text_length = sub_len; row->width = nautilus_scalable_font_text_width (font, font_size, font_size, sub_text, sub_len); - if (row->text == NULL) { - row->text = g_strdup(""); - } text_layout->rows = g_list_append (text_layout->rows, row); |