← Back to branch summary

~ubuntu-branches/ubuntu/hardy/vlc/hardy

« back to all changes in this revision

Viewing changes to modules/gui/macosx/misc.m

  • Committer: Bazaar Package Importer
  • Author(s): Daniel T Chen
  • Date: 2007-06-25 01:53:37 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20070625015337-9jqzr0atij6hzxnp
Tags: 0.8.6.release.c-0ubuntu1
https://launchpad.net/bugs/121511
* SECURITY UPDATE: Format string injection in multiple plugins could
  lead to arbitrary code execution and/or DoS.
* New upstream security and bugfix release, 0.8.6c (LP: #121511).
* References
  CVE-2007-0256
  CVE-2007-3316
* debian/patches/: Remove 020_flac.diff and 030_CVE-2007-0017.diff
  (subsumed by new upstream release).
* debian/vlc-nox.install: Add libtelx_plugin.so (fixes FTBFS).

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/gui/macosx/misc.m
2
2
 * misc.m: code not specific to vlc
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2003-2005 the VideoLAN team
5
 
 * $Id: misc.m 15491 2006-04-30 21:09:16Z bigben $
 
5
 * $Id: misc.m 18962 2007-02-23 13:28:06Z fkuehne $
6
6
 *
7
7
 * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
8
8
 *
47
47
 
48
48
- (BOOL)performKeyEquivalent:(NSEvent *)o_event
49
49
{
 
50
    /* We indeed want to prioritize Cocoa key equivalent against libvlc,
 
51
       so we perform the menu equivalent now. */
 
52
    if([[NSApp mainMenu] performKeyEquivalent:o_event])
 
53
        return TRUE;
 
54
 
50
55
    return [[VLCMain sharedInstance] hasDefinedShortcutKey:o_event] ||
51
56
           [(VLCControls *)[[VLCMain sharedInstance] getControls] keyEvent:o_event];
52
57
}