diff options
| author | Jeff Garzik <jgarzik@src.gnome.org> | 1999-01-21 03:46:32 +0000 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@src.gnome.org> | 1999-01-21 03:46:32 +0000 |
| commit | a646da3f1e144a46508c23299518e1eb12fd9b9c (patch) | |
| tree | 9a6232d4132898f8b7ea287a2ff5a3918d00f037 /gtk/gtktooltips.c | |
| parent | 1a58d9b3cfc2da2338de37e05990e8456ef08e2d (diff) | |
| download | gtk+-a646da3f1e144a46508c23299518e1eb12fd9b9c.tar.gz | |
Don't search entire row list twice for element being removed.
* gtk/gtkclist.c (real_remove_row):
Don't search entire row list twice for element being removed.
* gtk/gtkmenushell.c (gtk_menu_shell_insert):
Replaced hand-coded implementation of g_list_insert with
call to g_list_insert.
* gtk/gtktooltips.c
(gtk_tooltips_destroy_data, gtk_tooltips_layout_text):
tooltipsdata->row test not-null test now properly encompasses
both g_list_* calls.
Diffstat (limited to 'gtk/gtktooltips.c')
| -rw-r--r-- | gtk/gtktooltips.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c index 2450398329..d7ae69eabd 100644 --- a/gtk/gtktooltips.c +++ b/gtk/gtktooltips.c @@ -120,9 +120,10 @@ gtk_tooltips_destroy_data (GtkTooltipsData *tooltipsdata) { g_free (tooltipsdata->tip_text); g_free (tooltipsdata->tip_private); - g_list_foreach (tooltipsdata->row, gtk_tooltips_free_string, 0); - if (tooltipsdata->row) + if (tooltipsdata->row) { + g_list_foreach (tooltipsdata->row, gtk_tooltips_free_string, 0); g_list_free (tooltipsdata->row); + } gtk_signal_disconnect_by_data (GTK_OBJECT (tooltipsdata->widget), (gpointer) tooltipsdata); gtk_object_remove_data (GTK_OBJECT (tooltipsdata->widget), tooltips_data_key); @@ -200,9 +201,10 @@ gtk_tooltips_layout_text (GtkTooltips *tooltips, GtkTooltipsData *data) if (!tooltips->tip_window) gtk_tooltips_force_window (tooltips); - g_list_foreach (data->row, gtk_tooltips_free_string, 0); - if (data->row) + if (data->row) { + g_list_foreach (data->row, gtk_tooltips_free_string, 0); g_list_free (data->row); + } data->row = 0; data->font = tooltips->tip_window->style->font; data->width = 0; |