diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-11-28 14:15:54 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-11-28 14:15:54 +0000 |
| commit | de18baa285aa28f22a76dbf2ba58e392cf54e58a (patch) | |
| tree | 4a43e01d5b7e3c3591ea066d074939d1b2b1e59e | |
| parent | 431a722cb450c071b1940ed0391590f970a078cd (diff) | |
| download | gdk-pixbuf-de18baa285aa28f22a76dbf2ba58e392cf54e58a.tar.gz | |
Set timer_tag to 0 when the timeout is done. (#322291, Jean-Yves Lefort)
2005-11-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktooltips.c (gtk_tooltips_timeout): Set timer_tag to 0 when
the timeout is done. (#322291, Jean-Yves Lefort)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | gtk/gtktooltips.c | 2 |
3 files changed, 12 insertions, 4 deletions
@@ -1,5 +1,8 @@ 2005-11-28 Matthias Clasen <mclasen@redhat.com> + * gtk/gtktooltips.c (gtk_tooltips_timeout): Set timer_tag to 0 when + the timeout is done. (#322291, Jean-Yves Lefort) + * gtk/gtkfilechooserdefault.c (shortcuts_key_press_event_cb): Make F2 work for renaming bookmarks. (#320822, Jaap A. Haitsma, patch by Paolo Borelli) @@ -95,7 +98,7 @@ * gtk/gtkcombobox.c (gtk_combo_box_set_active_internal): Emit notify::active. -2005-11-18 Matthias Clasen <mclasen@redhat.com> +2005-11-18 Matthias Clasen <Jean-Yves Lefortmclasen@redhat.com> Fix crashes in connection with pathbar scrolling (#321560, Bogdan Nicula) @@ -104,7 +107,7 @@ Stop scrolling when desensitising slider buttons. (gtk_path_bar_scroll_timeout, gtk_path_bar_slider_button_press): And use it here. - +Jean-Yves Lefort * gtk/gtkpathbar.h (struct _GtkPathBar): Add a separate scrolling_down flag. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 08e37ed8c..c51a244d1 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2005-11-28 Matthias Clasen <mclasen@redhat.com> + * gtk/gtktooltips.c (gtk_tooltips_timeout): Set timer_tag to 0 when + the timeout is done. (#322291, Jean-Yves Lefort) + * gtk/gtkfilechooserdefault.c (shortcuts_key_press_event_cb): Make F2 work for renaming bookmarks. (#320822, Jaap A. Haitsma, patch by Paolo Borelli) @@ -95,7 +98,7 @@ * gtk/gtkcombobox.c (gtk_combo_box_set_active_internal): Emit notify::active. -2005-11-18 Matthias Clasen <mclasen@redhat.com> +2005-11-18 Matthias Clasen <Jean-Yves Lefortmclasen@redhat.com> Fix crashes in connection with pathbar scrolling (#321560, Bogdan Nicula) @@ -104,7 +107,7 @@ Stop scrolling when desensitising slider buttons. (gtk_path_bar_scroll_timeout, gtk_path_bar_slider_button_press): And use it here. - +Jean-Yves Lefort * gtk/gtkpathbar.h (struct _GtkPathBar): Add a separate scrolling_down flag. diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c index b63f25575..c3cd22051 100644 --- a/gtk/gtktooltips.c +++ b/gtk/gtktooltips.c @@ -482,6 +482,8 @@ gtk_tooltips_timeout (gpointer data) GTK_WIDGET_DRAWABLE (tooltips->active_tips_data->widget)) gtk_tooltips_draw_tips (tooltips); + tooltips->timer_tag = 0; + GDK_THREADS_LEAVE (); return FALSE; |