- Add patch to shutdown orca

This commit is contained in:
John (J5) Palmieri 2006-09-20 02:20:22 +00:00
parent c13a176769
commit 86a7d39fa6
2 changed files with 50 additions and 3 deletions

View File

@ -0,0 +1,43 @@
--- orca-1.0.0/src/orca/orca.py.add-stop-switch 2006-08-27 19:29:38.000000000 -0400
+++ orca-1.0.0/src/orca/orca.py 2006-09-19 22:12:47.000000000 -0400
@@ -1160,7 +1160,10 @@
"gui-setup",
"text-setup",
"no-setup",
- "version"])
+ "version",
+ "stop"])
+
+ do_shutdown = False
for opt, val in opts:
if opt in ("-s", "--gui-setup", "--setup"):
setupRequested = True
@@ -1176,6 +1179,9 @@
if opt in ("-v", "--version"):
print "Orca %s" % platform.version
os._exit(0)
+ if opt in ("--stop"):
+ do_shutdown = True
+ bypassSetup = True
except:
usage()
os._exit(2)
@@ -1185,7 +1191,7 @@
import commands
a11yEnabled = commands.getoutput(\
"gconftool-2 --get /desktop/gnome/interface/accessibility")
- if a11yEnabled != "true":
+ if a11yEnabled != "true" and not do_shutdown:
_showPreferencesConsole()
abort()
@@ -1205,6 +1211,9 @@
registry = atspi.Registry()
init(registry)
+ if do_shutdown:
+ shutdown()
+
# Check to see if the user wants the configuration GUI. It's
# done here so that the user's existing preferences can be used
# to set the initial GUI state. We'll also force the set to

View File

@ -12,17 +12,18 @@
%define libspi_version 1.7.6
%define brlapi_version 0.4.1
%define brltty_version 3.7.2
%define control_center_verion 2.16.0-4
%define control_center_verion 2.16.0-5
Name: orca
Version: 1.0.0
Release: 2%{?dist}
Release: 3%{?dist}
Summary: Flexible, extensible, and powerful assistive technology
Group: User Interface/Desktops
License: LGPL
URL: http://www.gnome.org/projects/orca/
Source0: ftp://ftp.gnome.org/pub/GNOME/sources/orca/1.0/orca-%{version}.tar.bz2
Patch0: orca-1.0.0-add-stop-switch.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel >= %{python_version}
@ -52,7 +53,7 @@ toolkits that support the AT-SPI (e.g., the GNOME desktop).
%prep
%setup -q
%patch0 -p1 -b .add-stop-switch
%build
%configure
@ -101,6 +102,9 @@ fi
%{_datadir}/orca/glade/orca-setup.glade
%changelog
* Tue Sep 19 2006 John (J5) Palmieri <johnp@redhat.com> - 1.0.0-3
- Add patch to shutdown orca
* Tue Sep 19 2006 John (J5) Palmieri <johnp@redhat.com> - 1.0.0-2
- Add requirements on gnome-mag and newer version of control-center
- remove .desktop file and make control-center start and configure orca