*** /usr/lib64/python2.6/site-packages/tpfanadmin/fan.py	Mon Mar 14 21:24:48 2011
--- /usr/lib64/python2.6/site-packages/tpfanadmin/fan.py.orig	Mon Mar 14 21:19:59 2011
***************
*** 17,31 ****
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #
- # Amended 14-03-2011 - All references to rsvg, svg fan graphic removed, so it 
- # runs on Slackware 13.1 x86_64
- 
  
  import pygtk
  pygtk.require('2.0')
! import gtk, gtk.glade, gobject, cairo
! #removed rsvg from import 14-03-2011
! #rsvg
  from gtk import gdk
  import math, time
  
--- 17,26 ----
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #
  
  import pygtk
  pygtk.require('2.0')
! import gtk, gtk.glade, gobject, cairo, rsvg
  from gtk import gdk
  import math, time
  
***************
*** 51,59 ****
      animate_interval = 33
      
      # graphics 
!     # Removed 2 lines below 14-11-2011
!     #fan_border_svg = None
!     #fan_blades_svg = None
      
      # variables    
      last_animate_time = 0    
--- 46,53 ----
      animate_interval = 33
      
      # graphics 
!     fan_border_svg = None
!     fan_blades_svg = None
      
      # variables    
      last_animate_time = 0    
***************
*** 70,78 ****
          
          self.set_size_request(wanted_width, wanted_height)
  
! 	# 2 lines removed 14-11-2011
!         #self.fan_border_svg = rsvg.Handle(file = build.data_dir +  build.fan_border_filename)
!         #self.fan_blades_svg = rsvg.Handle(file = build.data_dir +  build.fan_blades_filename)
          
          self.set_speed(0)
          
--- 64,71 ----
          
          self.set_size_request(wanted_width, wanted_height)
  
!         self.fan_border_svg = rsvg.Handle(file = build.data_dir +  build.fan_border_filename)
!         self.fan_blades_svg = rsvg.Handle(file = build.data_dir +  build.fan_blades_filename)
          
          self.set_speed(0)
          
***************
*** 152,167 ****
          context.scale(factor, factor)
          
          # draw fan border        
!         # Line below removed 14-11-2011
! 	#self.fan_border_svg.render_cairo(context)
          
          # draw fan blades
! 	# 5 lines below removed 14-11-2011
!         #center_x, center_y = svg_size / 2.0, svg_size / 2.0        
!         #context.translate(center_x, center_y)      
!         #context.rotate(self.rotation)       
!         #context.translate(-self.fan_blades_svg.props.width / 2.0, -self.fan_blades_svg.props.height / 2.0)
!         #self.fan_blades_svg.render_cairo(context)
                  
                  
  # Test case
--- 145,158 ----
          context.scale(factor, factor)
          
          # draw fan border        
!         self.fan_border_svg.render_cairo(context)
          
          # draw fan blades
!         center_x, center_y = svg_size / 2.0, svg_size / 2.0        
!         context.translate(center_x, center_y)      
!         context.rotate(self.rotation)       
!         context.translate(-self.fan_blades_svg.props.width / 2.0, -self.fan_blades_svg.props.height / 2.0)
!         self.fan_blades_svg.render_cairo(context)
                  
                  
  # Test case
***************
*** 182,185 ****
      
  if __name__ == "__main__":
      main()
!     
--- 173,176 ----
      
  if __name__ == "__main__":
      main()
!     
\ No newline at end of file