Mercurial > pidgin
diff finch/libgnt/gntmenu.c @ 24298:a4fe2bf0da94
merge of '8a14c1d90381baa3c31adeedee7f673d58d66304'
and 'a466d13b3d95f820b89489b1b33af51c6b71eae5'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 25 Oct 2008 18:33:25 +0000 |
| parents | fe2d4fc77b05 |
| children | a18f421696dc |
line wrap: on
line diff
--- a/finch/libgnt/gntmenu.c Sat Oct 25 18:28:58 2008 +0000 +++ b/finch/libgnt/gntmenu.c Sat Oct 25 18:33:25 2008 +0000 @@ -399,9 +399,11 @@ static gboolean gnt_menu_clicked(GntWidget *widget, GntMouseEvent event, int x, int y) { - if (!org_clicked || !org_clicked(widget, event, x, y) || - !GNT_MENU(widget)->type == GNT_MENU_TOPLEVEL) - return FALSE; + if (GNT_MENU(widget)->type != GNT_MENU_POPUP) + return FALSE; + + if (org_clicked && org_clicked(widget, event, x, y)) + return TRUE; gnt_widget_activate(widget); return TRUE; }