diff options
| author | Rebecca Schulman <rebecka@src.gnome.org> | 2000-09-14 03:46:57 +0000 |
|---|---|---|
| committer | Rebecca Schulman <rebecka@src.gnome.org> | 2000-09-14 03:46:57 +0000 |
| commit | 6cf1569b90152fcc0247274aa7485d9eed966cc5 (patch) | |
| tree | f25eca38624740fe1cadff92af2eab7638d02eaf /src/nautilus-search-bar-criterion.c | |
| parent | ecf2d1c87117b0db289981ac3124b609cbd1baf8 (diff) | |
| download | nautilus-6cf1569b90152fcc0247274aa7485d9eed966cc5.tar.gz | |
Fixed bug 2977, to remove anti-aliased text from the emblm menu
Fixed bug 2977, to remove anti-aliased text from the
emblm menu
* libnautilus-extensions/nautilus-customization-data.c:
(nautilus_customization_data_new),
(nautilus_customization_data_get_next_element_for_display):
* libnautilus-extensions/nautilus-customization-data.h:
Added additional value to customization data to return the
correct label type depending on whether or not antialiased
text and truncation were appropriate
* src/nautilus-complex-search-bar.c:
(load_find_them_pixmap_widget):
indenting fix
* src/nautilus-property-browser.c:
(make_properties_from_directories):
add parameter to customization data call
* src/nautilus-search-bar-criterion.c: (get_emblem_location_for),
(make_emblem_value_menu):
Removed a bug that double freed an emblem value menu name
-----------------
Diffstat (limited to 'src/nautilus-search-bar-criterion.c')
| -rw-r--r-- | src/nautilus-search-bar-criterion.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/nautilus-search-bar-criterion.c b/src/nautilus-search-bar-criterion.c index bf9f8ad80..4c7a5d5bc 100644 --- a/src/nautilus-search-bar-criterion.c +++ b/src/nautilus-search-bar-criterion.c @@ -760,6 +760,7 @@ get_emblem_location_for (int relation_number, relation_number == 1); emblem_text = gtk_object_get_data (GTK_OBJECT (menu_item), "emblem name"); + printf ("%s %s %s", NAUTILUS_SEARCH_URI_TEXT_EMBLEMS, possible_relations[relation_number], emblem_text); return g_strdup_printf ("%s %s %s", NAUTILUS_SEARCH_URI_TEXT_EMBLEMS, possible_relations[relation_number], emblem_text); @@ -836,11 +837,10 @@ make_emblem_value_menu (NautilusSearchBarCriterion *criterion) GtkWidget *value_menu; /* Add the items to the emblems menu here */ - /* FIXME bugzilla.eazel.com 2738: What are the variables for thumbnail icon height and width */ - value_menu = gtk_menu_new (); customization_data = nautilus_customization_data_new ("emblems", TRUE, + TRUE, NAUTILUS_ICON_SIZE_FOR_MENUS, NAUTILUS_ICON_SIZE_FOR_MENUS); while (nautilus_customization_data_get_next_element_for_display (customization_data, @@ -850,7 +850,8 @@ make_emblem_value_menu (NautilusSearchBarCriterion *criterion) - emblem_display_name = nautilus_label_get_text (NAUTILUS_LABEL (emblem_label)); + gtk_label_get (GTK_LABEL (emblem_label), + &emblem_display_name); if (strcmp (emblem_display_name, "Erase") == 0) { gtk_widget_destroy (emblem_pixmap_widget); gtk_widget_destroy (emblem_label); @@ -858,12 +859,12 @@ make_emblem_value_menu (NautilusSearchBarCriterion *criterion) } menu_item = gtk_menu_item_new (); - gtk_object_set_data_full (GTK_OBJECT (menu_item), "emblem name", emblem_display_name, g_free); - + gtk_object_set_data (GTK_OBJECT (menu_item), "emblem name", emblem_display_name); + g_assert (strcmp (emblem_display_name, "Erase") != 0); temp_hbox = gtk_hbox_new (FALSE, GNOME_PAD_SMALL); - gtk_container_add (GTK_CONTAINER (menu_item), temp_hbox); gtk_box_pack_start (GTK_BOX (temp_hbox), emblem_pixmap_widget, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (temp_hbox), emblem_label, FALSE, FALSE, 0); + gtk_container_add (GTK_CONTAINER (menu_item), temp_hbox); gtk_menu_append (GTK_MENU (value_menu), menu_item); } |