SOURCES: griffith-env_python.patch, griffith-plugin.patch - up to ...

[teodor]

Author: teodor                       Date: Tue Feb 20 20:40:32 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to 0.9 stable, (brr tried to merge from DEVEL)

---- Files affected:
SOURCES:
   griffith-env_python.patch (1.1 -> 1.2) , griffith-plugin.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/griffith-env_python.patch
diff -u SOURCES/griffith-env_python.patch:1.1 SOURCES/griffith-env_python.patch:1.2
--- SOURCES/griffith-env_python.patch:1.1	Sun May 21 22:01:28 2006
+++ SOURCES/griffith-env_python.patch	Tue Feb 20 21:40:26 2007
@@ -1,9 +1,9 @@
-diff -Nur griffith-0.6.1.org/griffith griffith-0.6.1/griffith
---- griffith-0.6.1.org/griffith	2006-05-13 20:38:30.000000000 +0200
-+++ griffith-0.6.1/griffith	2006-05-13 20:38:41.000000000 +0200
+diff -Nur griffith-0.9.org/griffith griffith-0.9/griffith
+--- griffith-0.9.org/griffith	2007-02-20 21:04:17.000000000 +0100
++++ griffith-0.9/griffith	2007-02-20 21:05:25.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
- # -*- coding: ISO-8859-1 -*-
+ # -*- coding: utf-8 -*-
  
  __revision__ = '$Id$'

================================================================
Index: SOURCES/griffith-plugin.patch
diff -u SOURCES/griffith-plugin.patch:1.1 SOURCES/griffith-plugin.patch:1.2
--- SOURCES/griffith-plugin.patch:1.1	Mon May 29 00:34:08 2006
+++ SOURCES/griffith-plugin.patch	Tue Feb 20 21:40:27 2007
@@ -1,7 +1,7 @@
-diff -Nur griffith-0.6.1.org/lib/gutils.py griffith-0.6.1/lib/gutils.py
---- griffith-0.6.1.org/lib/gutils.py	2006-05-28 23:51:16.000000000 +0200
-+++ griffith-0.6.1/lib/gutils.py	2006-05-28 23:54:34.000000000 +0200
-@@ -353,7 +353,7 @@
+diff -Nur griffith-0.9.org/lib/gutils.py griffith-0.9/lib/gutils.py
+--- griffith-0.9.org/lib/gutils.py	2007-02-20 21:27:11.000000000 +0100
++++ griffith-0.9/lib/gutils.py	2007-02-20 21:29:27.000000000 +0100
+@@ -299,7 +299,7 @@
  def read_plugins(prefix,directory):
  	"""returns available plugins"""
  	import glob
@@ -10,24 +10,24 @@
  
  def findKey(val, dict):
  	for key, value in dict.items():
-diff -Nur griffith-0.6.1.org/lib/initialize.py griffith-0.6.1/lib/initialize.py
---- griffith-0.6.1.org/lib/initialize.py	2006-05-28 23:50:45.000000000 +0200
-+++ griffith-0.6.1/lib/initialize.py	2006-05-28 23:55:57.000000000 +0200
-@@ -203,7 +203,7 @@
+diff -Nur griffith-0.9.org/lib/initialize.py griffith-0.9/lib/initialize.py
+--- griffith-0.9.org/lib/initialize.py	2007-02-20 21:27:11.000000000 +0100
++++ griffith-0.9/lib/initialize.py	2007-02-20 21:29:50.000000000 +0100
+@@ -313,7 +313,7 @@
  	self.d_plugin = 0
  	mcounter = 0
  	for p in self.plugins:
--		plugin_module = os.path.basename(p).replace(".py","")
-+		plugin_module = os.path.basename(p).replace(".pyc","")
- 		plugin_name = plugin_module.replace("PluginMovie","")
- 		self.am_source.append_text(plugin_name)
- 		self.default_plugin.append_text(plugin_name)
-@@ -222,7 +222,7 @@
+-		plugin_module = os.path.basename(p).replace('.py','')
++		plugin_module = os.path.basename(p).replace('.pyc','')
+ 		plugin_name = plugin_module.replace('PluginMovie','')
+ 		self.widgets['add']['source'].append_text(plugin_name)
+ 		self.widgets['preferences']['default_plugin'].append_text(plugin_name)
+@@ -332,7 +332,7 @@
  		self.locations['export_plugins'])
  	plugins.sort()
  	for p in plugins:
--		plugin_module = os.path.basename(p).replace(".py", "")
-+		plugin_module = os.path.basename(p).replace(".pyc", "")
- 		plugin_name = plugin_module.replace("PluginExport", "")
+-		plugin_module = os.path.basename(p).replace('.py', '')
++		plugin_module = os.path.basename(p).replace('.pyc', '')
+ 		plugin_name = plugin_module.replace('PluginExport', '')
  		menu_items = gtk.MenuItem(plugin_name)
- 		self.export_menu.append(menu_items)
+ 		self.widgets['menu']['export'].append(menu_items)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/griffith-env_python.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/griffith-plugin.patch?r1=1.1&r2=1.2&f=u