← Back to branch summary

~autark/ubuntu/natty/meld/meld-fix-988296

« back to all changes in this revision

Viewing changes to debian/patches/sourceview-package.patch

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell, Iain Buclaw
  • Date: 2011-01-19 14:50:11 UTC
  • mfrom: (1.3.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20110119145011-86jdurt5p9ovmdsh
Tags: 1.5.0-0ubuntu1
https://launchpad.net/bugs/703603
* New upstream release

[ Iain Buclaw ]
* debian/patches/diff_tree_store.patch:
  - Fix crash trying to insert integers into a text column (LP: #703603)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/sourceview-package.patch
1
1
=== modified file 'preferences.py'
2
 
--- a/meld/preferences.py
3
 
+++ b/meld/preferences.py
4
 
@@ -143,7 +143,7 @@
5
 
             self.checkbutton_show_line_numbers.set_sensitive(False)
6
 
             self.checkbutton_use_syntax_highlighting.set_sensitive(False)
7
 
             if gtk.pygtk_version >= (2, 12, 0):
8
 
-                no_sourceview_text = _("Only available if you have gnome-python-desktop installed")
9
 
+                no_sourceview_text = _("Only available if you have python-gtksourceview2 installed")
10
 
                 self.checkbutton_spaces_instead_of_tabs.set_tooltip_text(no_sourceview_text)
11
 
                 self.checkbutton_show_line_numbers.set_tooltip_text(no_sourceview_text)
12
 
                 self.checkbutton_use_syntax_highlighting.set_tooltip_text(no_sourceview_text)
 
2
Index: meld-1.5.0/meld/preferences.py
 
3
===================================================================
 
4
--- meld-1.5.0.orig/meld/preferences.py 2010-12-27 09:10:50.000000000 +1100
 
5
+++ meld-1.5.0/meld/preferences.py      2011-01-19 14:52:51.510731776 +1100
 
6
@@ -139,7 +139,7 @@
 
7
             self.checkbutton_use_syntax_highlighting.set_active( self.prefs.use_syntax_highlighting )
 
8
         else:
 
9
             no_sourceview_text = \
 
10
-                _("Only available if you have gnome-python-desktop installed")
 
11
+                _("Only available if you have python-gtksourceview2 installed")
 
12
             for w in (self.checkbutton_spaces_instead_of_tabs,
 
13
                       self.checkbutton_show_line_numbers,
 
14
                       self.checkbutton_use_syntax_highlighting,