comparison: finch/libgnt/gntmenu.c
finch/libgnt/gntmenu.c
- changeset 24307
- 3fe8ef8a8c38
- parent 23486
- f18cc53ce96a
- child 28937
- 5f87e66597d9
equal
deleted
inserted
replaced
| 24306:76b41098b1e4 | 24307:3fe8ef8a8c38 |
|---|---|
| 397 } | 397 } |
| 398 | 398 |
| 399 static gboolean | 399 static gboolean |
| 400 gnt_menu_clicked(GntWidget *widget, GntMouseEvent event, int x, int y) | 400 gnt_menu_clicked(GntWidget *widget, GntMouseEvent event, int x, int y) |
| 401 { | 401 { |
| 402 if (!org_clicked || !org_clicked(widget, event, x, y) || | 402 if (GNT_MENU(widget)->type != GNT_MENU_POPUP) |
| 403 !GNT_MENU(widget)->type == GNT_MENU_TOPLEVEL) | 403 return FALSE; |
| 404 return FALSE; | 404 |
| 405 if (org_clicked && org_clicked(widget, event, x, y)) | |
| 406 return TRUE; | |
| 405 gnt_widget_activate(widget); | 407 gnt_widget_activate(widget); |
| 406 return TRUE; | 408 return TRUE; |
| 407 } | 409 } |
| 408 | 410 |
| 409 static void | 411 static void |
