← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gnash/saucy-proposed

« back to all changes in this revision

Viewing changes to libbase/rc.cpp

  • Committer: Package Import Robot
  • Author(s): Micah Gersten
  • Date: 2012-03-04 03:19:06 UTC
  • mfrom: (1.1.18) (3.1.24 sid)
  • Revision ID: package-import@ubuntu.com-20120304031906-p6q5rnb0xhgpof7o
Tags: 0.8.10-3ubuntu1
https://launchpad.net/bugs/940876
* Merge from Debian testing (FFe: LP: #940876), remaining changes:
  - Use mozilla-flashplugin as the alternative for now
  - Change xulrunner-dev build dep to firefox-dev
* Drop the plugin API porting patch, this has been fixed upstream
  - drop debian/patches*
* Drop the following change as we want Adobe's player to take priority
  if it's installed
  - Set alternative priority to 50 so that it matches Adobe Flash's priority

Show diffs side-by-side

added added

removed removed

Lines of Context:
libbase/rc.cpp
1
1
// rc.cpp:  "Run Command" configuration file, for Gnash.
2
2
// 
3
 
//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
4
 
//   Foundation, Inc
 
3
//   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 
4
//   Free Software Foundation, Inc
5
5
// 
6
6
// This program is free software; you can redistribute it and/or modify
7
7
// it under the terms of the GNU General Public License as published by
533
533
                 extractSetting(_localhostOnly, "localhost", variable,
534
534
                           value)
535
535
            || 
 
536
                 extractSetting(_showMouse, "showMouse", variable,
 
537
                           value)
 
538
            || 
536
539
                 extractSetting(_localdomainOnly, "localdomain", variable,
537
540
                           value)
538
541
            ||
750
753
    << endl <<
751
754
    cmd << "splashScreen " << _splashScreen << endl <<
752
755
    cmd << "localHost " << _localhostOnly << endl <<
 
756
    cmd << "showMouse " << _showMouse << endl <<
753
757
    cmd << "localDomain " << _localdomainOnly << endl <<
754
758
    cmd << "insecureSSL " << _insecureSSL << endl <<
755
759
    cmd << "debugger " << _debugger << endl <<