summaryrefslogtreecommitdiff
path: root/gtk/gtkmenu.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2004-07-06 13:28:42 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2004-07-06 13:28:42 +0000
commitaa794a664647ddd00b126e77f4b1bfe78d05d39b (patch)
treecf3d32b6ee74abc6537f39e4e2cda00577a4f576 /gtk/gtkmenu.c
parented4707d50588917c9dfc59bdeb8e5e8d34b394ed (diff)
downloadgtk+-aa794a664647ddd00b126e77f4b1bfe78d05d39b.tar.gz
Make sure private->monitor_num is a valid monitor number before using it.
2004-07-06 Matthias Clasen <mclasen@redhat.com> * gtk/gtkmenu.c (gtk_menu_position): Make sure private->monitor_num is a valid monitor number before using it. (#139187, Michael Natterer) 2004-06-25 Matthias Clasen <mclasen@redhat.com> * gtk/gtkfontbutton.c (gtk_font_button_update_font_info): Avoid a crash if the font doesn't exist. (#144967, Yevgen Muntyan)
Diffstat (limited to 'gtk/gtkmenu.c')
-rw-r--r--gtk/gtkmenu.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 0e388120cf..a38adbc974 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -3311,6 +3311,9 @@ gtk_menu_position (GtkMenu *menu)
if (menu->position_func)
{
(* menu->position_func) (menu, &x, &y, &push_in, menu->position_func_data);
+ if (private->monitor_num < 0)
+ private->monitor_num = gdk_screen_get_monitor_at_point (screen, x, y);
+
gdk_screen_get_monitor_geometry (screen, private->monitor_num, &monitor);
}
else