Part of Slepp's ProjectsPastebinTURLImagebinFilebin
Feedback -- English French German Japanese
Create Upload Newest Tools Donate

Advertising

Miscellany
Tuesday, April 15th, 2008 at 12:06:45pm UTC 

  1. === modified file 'bin/ubiquity-dm'
  2. --- bin/ubiquity-dm     2008-03-21 19:09:39 +0000
  3. +++ bin/ubiquity-dm     2008-04-15 12:01:03 +0000
  4. @@ -115,7 +115,28 @@
  5.              timeout -= 1
  6.  
  7.          if self.frontend == 'gtk_ui' or self.frontend == 'mythbuntu_ui':
  8. -            if os.access(background, os.R_OK):
  9. +            # Accessibility infrastructure
  10. +            extras = []
  11. +            gconf_dir = ('xml:readwrite:%s' %
  12. +                os.path.expanduser('~%s/.gconf' %
  13. +                'root'))
  14. +            accessibility = 'false'
  15. +            if osextras.find_on_path('gconftool-2'):
  16. +                subp = subprocess.Popen(
  17. +                    ['gconftool-2', '--config-source', gconf_dir,
  18. +                     '--get', '/desktop/gnome/interface/accessibility'],
  19. +                    stdout=subprocess.PIPE, stderr=subprocess.PIPE)
  20. +                accessibility = subp.communicate()[0].rstrip('\n')
  21. +            if accessibility == 'true':
  22. +                if os.path.exists('/usr/lib/at-spi/at-spi-registryd'):
  23. +                    extras.append(subprocess.Popen(['/usr/lib/at-spi/at-spi-registryd'],
  24. +                        stdin=null, stdout=logfile, stderr=logfile))
  25. +                    os.environ['GTK_MODULES'] = 'gail:atk-bridge'
  26. +
  27. +            # Don't show the background image in v2 accessibility profile. It
  28. +            # is not shown in the GNOME desktop after all.
  29. +            fp = open('/proc/cmdline', 'r')
  30. +            if os.access(background, os.R_OK) and not 'access=v1' in fp.readline():
  31.                  import gtk
  32.                  pixbuf = gtk.gdk.pixbuf_new_from_file(background)
  33.                  root = gtk.gdk.get_default_root_window()
  34. @@ -125,53 +146,34 @@
  35.                  root.set_back_pixmap(pixmap, False)
  36.                  root.clear()
  37.                  gtk.gdk.flush()
  38. +            fp.close()
  39.  
  40. -        extras = []
  41.          if self.frontend in ('gtk_ui', 'mythbuntu_ui'):
  42.              if osextras.find_on_path('metacity'):
  43.                  wm = subprocess.Popen(['metacity', '--sm-disable'],
  44. -                    stdin=null, stdout=logfile, stderr=logfile,
  45. -                    preexec_fn=self.drop_privileges)
  46. +                    stdin=null, stdout=logfile, stderr=logfile)
  47.              elif osextras.find_on_path('xfwm4'):
  48.                  wm = subprocess.Popen('xfwm4',
  49. -                    stdin=null, stdout=logfile, stderr=logfile,
  50. -                    preexec_fn=self.drop_privileges)
  51. +                    stdin=null, stdout=logfile, stderr=logfile)
  52.              else:
  53.                  raise MissingProgramError, \
  54.                      "No window manager found (tried metacity, xfwm4)"
  55.  
  56.              if os.path.exists('/usr/lib/gnome-settings-daemon/gnome-settings-daemon'):
  57.                  extras.append(subprocess.Popen(['/usr/lib/gnome-settings-daemon/gnome-settings-daemon'],
  58. -                    stdin=null, stdout=logfile, stderr=logfile, preexec_fn=self.drop_privileges))
  59. +                    stdin=null, stdout=logfile, stderr=logfile))
  60.  
  61. -            # Accessibility
  62. -            gconf_dir = ('xml:readwrite:%s' %
  63. -                os.path.expanduser('~%s/.gconf' %
  64. -                self.username))
  65. -            accessibility = 'false'
  66. -            if osextras.find_on_path('gconftool-2'):
  67. -                subp = subprocess.Popen(
  68. -                    ['gconftool-2', '--config-source', gconf_dir,
  69. -                     '--get', '/desktop/gnome/interface/accessibility'],
  70. -                    stdout=subprocess.PIPE, stderr=subprocess.PIPE)
  71. -                accessibility = subp.communicate()[0].rstrip('\n')
  72. +            # Accessibility tools
  73.              if accessibility == 'true':
  74. -                if os.path.exists('/usr/lib/at-spi/at-spi-registryd'):
  75. -                    extras.append(subprocess.Popen(['/usr/lib/at-spi/at-spi-registryd'],
  76. -                        stdin=null, stdout=logfile, stderr=logfile,
  77. -                        preexec_fn=self.drop_privileges))
  78. -                    os.environ['GTK_MODULES'] = 'gail:atk-bridge'
  79.                  fp = open('/proc/cmdline', 'r')
  80.                  if 'access=m2' in fp.readline():
  81.                      if osextras.find_on_path('onboard'):
  82.                          extras.append(subprocess.Popen(['onboard'],
  83. -                            stdin=null, stdout=logfile, stderr=logfile,
  84. -                            preexec_fn=self.drop_privileges))
  85. +                            stdin=null, stdout=logfile, stderr=logfile))
  86.                  else:
  87.                      if osextras.find_on_path('orca'):
  88.                          extras.append(subprocess.Popen(['orca', '-n'],
  89. -                            stdin=null, stdout=logfile, stderr=logfile,
  90. -                            preexec_fn=self.drop_privileges))
  91. +                            stdin=null, stdout=logfile, stderr=logfile))
  92.                  fp.close()
  93.          elif self.frontend == 'kde_ui':
  94.              wm = subprocess.Popen('kwin', stdin=null, stdout=logfile,
  95.  
  96. === modified file 'debian/changelog'
  97. --- debian/changelog    2008-04-15 00:49:38 +0000
  98. +++ debian/changelog    2008-04-15 12:01:58 +0000
  99. @@ -1,3 +1,16 @@
  100. +ubiquity (1.8.6) UNRELEASED; urgency=low
  101. +
  102. +  * bin/ubiquity-dm:
  103. +    - Move code relating to at-spi-registryd to ensure that a11y is loaded
  104. +      before the background and window manager. (LP: #197887)
  105. +    - Ensure that orca/onboard are only run if the a11y gconf key is set.
  106. +    - Don't show any background image if the v2 profile is selected, similar to
  107. +      what happens in the GNOME desktop with this profile enabled.
  108. +    - Do not drop privileges when running the window manager,
  109. +      gnome-settings-daemon, or any of the a11y tools.
  110. +
  111. + -- Luke Yelavich <[email protected]>  Tue, 15 Apr 2008 22:01:16 +1000
  112. +
  113.  ubiquity (1.8.5) hardy; urgency=low
  114.  
  115.    [ Evan Dandrea ]

advertising

Update the Post

Either update this post and resubmit it with changes, or make a new post.

You may also comment on this post.

update paste below
details of the post (optional)

Note: Only the paste content is required, though the following information can be useful to others.

Save name / title?

(space separated, optional)



Please note that information posted here will not expire by default. If you do not want it to expire, please set the expiry time above. If it is set to expire, web search engines will not be allowed to index it prior to it expiring. Items that are not marked to expire will be indexable by search engines. Be careful with your passwords. All illegal activities will be reported and any information will be handed over to the authorities, so be good.

comments powered by Disqus
worth-right