Merge branch 'backport' into work

This commit is contained in:
Dana Jansens 2009-11-06 21:02:23 -05:00
commit a170ad7c85

View file

@ -72,7 +72,7 @@ static gboolean logout_func(ObActionsData *data, gpointer options)
prompt_show(p, NULL, FALSE); prompt_show(p, NULL, FALSE);
} }
else else
prompt_cb(NULL, 1, NULL); prompt_cb(NULL, 1, o);
return FALSE; return FALSE;
} }