[SCM] jokosher/master: Some fixes, forwarded.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6274cc10ffe10fc9860e2ae639bff7286807bb80
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Apr 29 13:44:10 2011 +0200

    Some fixes, forwarded.

diff --git a/debian/patches/libglade_to_gtkbuilder.patch b/debian/patches/libglade_to_gtkbuilder.patch
index bbe2023..6fa77a1 100644
--- a/debian/patches/libglade_to_gtkbuilder.patch
+++ b/debian/patches/libglade_to_gtkbuilder.patch
@@ -1,9 +1,9 @@
 Description: Port Jokosher to GtkBuilder.
 Author: Alessio Treglia <alessio at debian.org>
 Bug: https://bugs.launchpad.net/jokosher/+bug/353788
-Forwarded: no
+Forwarded: yes
 ---
- Jokosher/AddInstrumentDialog.py         |   16 
+ Jokosher/AddInstrumentDialog.py         |   17 
  Jokosher/Extension.py                   |    2 
  Jokosher/ExtensionManagerDialog.py      |   17 
  Jokosher/Globals.py                     |    4 
@@ -17,8 +17,8 @@ Forwarded: no
  Jokosher/PreferencesDialog.py           |   29 
  Jokosher/ProjectTemplateDialog.py       |   22 
  Jokosher/TimeLineBar.py                 |   13 
- Jokosher/WelcomeDialog.py               |   16 
- 15 files changed, 6848 insertions(+), 193 deletions(-)
+ Jokosher/WelcomeDialog.py               |   17 
+ 15 files changed, 6850 insertions(+), 193 deletions(-)
 
 --- /dev/null
 +++ jokosher/Jokosher/Jokosher.ui
@@ -6684,15 +6684,16 @@ Forwarded: no
  # create a couple dirs to avoid having problems creating a non-existing
 --- jokosher.orig/Jokosher/WelcomeDialog.py
 +++ jokosher/Jokosher/WelcomeDialog.py
-@@ -8,7 +8,6 @@
+@@ -8,7 +8,7 @@
  #
  #-------------------------------------------------------------------------------
  
 -import gtk.glade
++import gtk
  import os
  import Globals
  import PreferencesDialog
-@@ -33,7 +32,8 @@ class WelcomeDialog:
+@@ -33,7 +33,8 @@ class WelcomeDialog:
  		# this points to JokosherApp		
  		self.mainwindow = mainwindow
  				
@@ -6702,7 +6703,7 @@ Forwarded: no
  
  		self.signals = {
  			"on_newproject_clicked" : self.OnNewProject,
-@@ -44,17 +44,17 @@ class WelcomeDialog:
+@@ -44,17 +45,17 @@ class WelcomeDialog:
  			"on_startupcb_toggled" : self.OnStartupToggled,
  		}
  		
@@ -6725,7 +6726,7 @@ Forwarded: no
  		self.openrecentbutton.set_sensitive(False)
  
  		# set up recent projects treeview with a ListStore model. We also
-@@ -221,4 +221,4 @@ class WelcomeDialog:
+@@ -221,4 +222,4 @@ class WelcomeDialog:
  		Globals.settings.write()
  	
  	#_____________________________________________________________________
@@ -6788,15 +6789,16 @@ Forwarded: no
  		self.instrtreemodel = gtk.ListStore(gtk.gdk.Pixbuf, str, str)
 --- jokosher.orig/Jokosher/AddInstrumentDialog.py
 +++ jokosher/Jokosher/AddInstrumentDialog.py
-@@ -10,7 +10,6 @@
+@@ -10,7 +10,7 @@
  #
  #-------------------------------------------------------------------------------
  
 -import gtk.glade
++import gtk
  import Globals
  import textwrap
  import gettext
-@@ -38,7 +37,8 @@ class AddInstrumentDialog:
+@@ -38,7 +38,8 @@ class AddInstrumentDialog:
  		self.project = project
  		self.instr = instr
  
@@ -6806,7 +6808,7 @@ Forwarded: no
  
  		self.signals = {
  			"on_OK_clicked" : self.OnOK,
-@@ -48,20 +48,20 @@ class AddInstrumentDialog:
+@@ -48,20 +49,20 @@ class AddInstrumentDialog:
  			"on_AddInstrument_destroy" : self.OnDestroy,
  		}
  		

-- 
jokosher packaging