← Back to branch summary

~ubuntu-branches/ubuntu/lucid/vlc/lucid

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2008-10-12 11:37:03 UTC
  • mfrom: (1.1.19 upstream)
  • Revision ID: james.westby@ubuntu.com-20081012113703-z0kp136a10fcsjqj
Tags: 0.9.4-1ubuntu1
https://launchpad.net/bugs/280081
https://launchpad.net/bugs/280378
* merge from debian/experimental
* New upstream release fixes LP: #280081, #280378
* remaining changes:
  - build against libxul-dev instead of iceape-dev
  - build against libdca-dev, libass-dev and libx264-dev
  - adjust Vcs-Bzr Headers in debian/control
  - add Xb-Npp header to vlc package
  - debian/patches/301_DVD_media.diff: Change %U to %f
     in VLC .desktop file, cf LP #275043

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/gui/macosx/embeddedwindow.m
2
2
 * embeddedwindow.m: MacOS X interface module
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2005-2008 the VideoLAN team
5
 
 * $Id$
 
5
 * $Id: 4a5cc69031af138de2791db21c64e44a22b02e47 $
6
6
 *
7
7
 * Authors: Benjamin Pracht <bigben at videolan dot org>
8
8
 *          Felix Paul Kühne <fkuehne at videolan dot org>
279
279
            [o_fullscreen_window setContentView:o_view];
280
280
 
281
281
            [o_fullscreen_window makeKeyAndOrderFront:self];
282
 
 
283
 
            [o_fullscreen_window makeKeyAndOrderFront:self];
284
282
            [o_fullscreen_window orderFront:self animate:YES];
285
283
 
286
284
            [o_fullscreen_window setFrame:screen_rect display:YES];