diff options
author | Darin Adler <darin@src.gnome.org> | 2000-05-17 00:48:10 +0000 |
---|---|---|
committer | Darin Adler <darin@src.gnome.org> | 2000-05-17 00:48:10 +0000 |
commit | ee19920029abe7e89bee09a109a8c1518a12cc61 (patch) | |
tree | fcbf8388b4ad0124c4bf045478054b790ed0dbe5 /libnautilus-extensions | |
parent | a35bf15d93ab6da319459f407fb814a35e4c19aa (diff) | |
download | nautilus-ee19920029abe7e89bee09a109a8c1518a12cc61.tar.gz |
Maciej helped me refine the find command so it doesn't go into po or CVS
* check-FIXME.pl: Maciej helped me refine the find command so it
doesn't go into po or CVS directories and only looks at files.
* components/music/nautilus-music-view.c:
(nautilus_music_view_background_changed): Turned the metadata saving
code back on. I think I fixed the problem that made Andy turn it off.
* libnautilus-extensions/nautilus-directory-metafile.c:
(set_metadata_eat_value): Fixed a double-delete problem. Oops.
(nautilus_directory_set_metadata): Fixed code that wasn't emitting the
metadata_changed signal enough.
* libnautilus-extensions/nautilus-gdk-extensions.c:
(nautilus_fill_rectangle_with_color): Fixed a crash in Gdk. It turns
out gdk_rgb needs to be initialized, even though I don't think that
was the intent.
Diffstat (limited to 'libnautilus-extensions')
-rw-r--r-- | libnautilus-extensions/nautilus-directory-metafile.c | 3 | ||||
-rw-r--r-- | libnautilus-extensions/nautilus-gdk-extensions.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libnautilus-extensions/nautilus-directory-metafile.c b/libnautilus-extensions/nautilus-directory-metafile.c index 3f441a36c..d2217ad68 100644 --- a/libnautilus-extensions/nautilus-directory-metafile.c +++ b/libnautilus-extensions/nautilus-directory-metafile.c @@ -480,7 +480,6 @@ set_metadata_eat_value (NautilusDirectory *directory, } found = g_hash_table_lookup_extended (file_table, combined_key, &old_key, &old_value); - g_free (combined_key); /* Put the change into the hash. Delete the old change. */ if (!found) { @@ -650,7 +649,7 @@ nautilus_directory_set_metadata (NautilusDirectory *directory, if (directory->details->metafile_read) { if (set_metadata_string_in_metafile (directory, NULL, key, default_metadata, metadata)) { - nautilus_directory_request_write_metafile (directory); + nautilus_directory_emit_metadata_changed (directory); } } else { value = metadata_value_new (default_metadata, metadata); diff --git a/libnautilus-extensions/nautilus-gdk-extensions.c b/libnautilus-extensions/nautilus-gdk-extensions.c index 15bbf8644..ca3c53c0c 100644 --- a/libnautilus-extensions/nautilus-gdk-extensions.c +++ b/libnautilus-extensions/nautilus-gdk-extensions.c @@ -69,6 +69,9 @@ nautilus_fill_rectangle_with_color (GdkDrawable *drawable, { GdkGCValues saved_values; + /* FIXME: Workaround for a bug in gdk_rgb. */ + gdk_rgb_init (); + gdk_gc_get_values (gc, &saved_values); gdk_rgb_gc_set_foreground (gc, rgb); nautilus_fill_rectangle (drawable, gc, rectangle); |