← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/Frontends/VBoxHeadless/FramebufferVNC.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-01-30 23:27:25 UTC
  • mfrom: (0.3.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20110130232725-2ouajjd2ggdet0zd
Tags: 4.0.2-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Drop ubuntu-01-fix-build-gcc45.patch, fixed upstream.
* Drop ubuntu-02-as-needed.patch, added to the Debian package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Frontends/VBoxHeadless/FramebufferVNC.cpp
1
 
/* $Id: FramebufferVNC.cpp $ */
 
1
/* $Id: FramebufferVNC.cpp 33540 2010-10-28 09:27:05Z vboxsync $ */
2
2
/** @file
3
3
 * VBoxHeadless - VNC server implementation for VirtualBox.
4
4
 *
92
92
        vncServer->port = mVncPort;
93
93
    char *pszDesktopName;
94
94
    rc = RTStrAPrintf(&pszDesktopName, "%s - VirtualBox", pszName);
95
 
    if (RT_SUCCESS(rc))
96
 
        vncServer->desktopName = (const char*)pszDesktopName;
 
95
    if (rc >= 0)
 
96
        vncServer->desktopName = pszDesktopName;
97
97
    else
98
98
        vncServer->desktopName = "VirtualBox";
99
99
    if (mVncPassword)
514
514
 * Return the colour depth of our frame buffer.  Note that we actually
515
515
 * store the pixel format, not the colour depth internally, since
516
516
 * when display sets FramebufferPixelFormat_Opaque, it
517
 
 * wants to retreive FramebufferPixelFormat_Opaque and
 
517
 * wants to retrieve FramebufferPixelFormat_Opaque and
518
518
 * nothing else.
519
519
 *
520
520
 * @returns            COM status code
615
615
 * @returns          COM status code
616
616
 * @retval  winId Associated window id
617
617
 */
618
 
STDMETHODIMP VNCFB::COMGETTER(WinId) (ULONG64 *winId)
 
618
STDMETHODIMP VNCFB::COMGETTER(WinId) (LONG64 *winId)
619
619
{
620
620
    if (!winId)
621
621
        return E_POINTER;
682
682
NS_DECL_CLASSINFO(VNCFB)
683
683
NS_IMPL_THREADSAFE_ISUPPORTS1_CI(VNCFB, IFramebuffer)
684
684
#endif
685