diff options
| author | Darin Adler <darin@src.gnome.org> | 2002-02-27 18:05:45 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2002-02-27 18:05:45 +0000 |
| commit | 3035a35267191a40a6c7245e69a662037e31dcbc (patch) | |
| tree | df634fd7a071160c4b4a08488a0d4735d98eb1c0 /libnautilus-private/nautilus-icon-factory.c | |
| parent | 57a1da0b53449fa54aae6863a0d6334de16d3877 (diff) | |
| download | nautilus-3035a35267191a40a6c7245e69a662037e31dcbc.tar.gz | |
Just release, don't unref. (get_metafile): Don't keep a ref. Also fix
* libnautilus-private/nautilus-directory-metafile.c:
(free_factory): Just release, don't unref.
(get_metafile): Don't keep a ref. Also fix CORBA objref leak.
* libnautilus-private/nautilus-icon-factory.c:
(get_icon_from_cache):
* libnautilus-private/nautilus-metafile-factory.c:
(nautilus_metafile_factory_get_instance): Return the same
instance each time, don't ref, since lifetime is not managed
by ref counting.
* libnautilus/nautilus-clipboard.c:
(initialize_clipboard_component_with_callback_data):
Get rid of BonoboUIComponent leak.
* src/nautilus-application.c: Formatting tweaks.
* libnautilus-private/nautilus-bookmark.c: Minor cleanup.
* test/Makefile.am:
* test/test-nautilus-async-activation.c: Remove.
Diffstat (limited to 'libnautilus-private/nautilus-icon-factory.c')
| -rw-r--r-- | libnautilus-private/nautilus-icon-factory.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c index cff46fc8d..fd6f1198e 100644 --- a/libnautilus-private/nautilus-icon-factory.c +++ b/libnautilus-private/nautilus-icon-factory.c @@ -1950,8 +1950,9 @@ get_icon_from_cache (NautilusScalableIcon *scalable_icon, key->scalable_icon = scalable_icon; key->size = *size; - /* recursive get_icon_from_cache might already have placed icon - * in hash table if there was an exact match */ + /* Recursive get_icon_from_cache might already have placed icon + * in hash table if there was an exact match. + */ if (g_hash_table_lookup (hash_table, key) != NULL) { g_free (key); return icon; @@ -1960,7 +1961,6 @@ get_icon_from_cache (NautilusScalableIcon *scalable_icon, /* Add the item to the hash table. */ nautilus_scalable_icon_ref (scalable_icon); g_hash_table_insert (hash_table, key, icon); - } /* Hand back a ref to the caller. */ |