backport bugfixes

svn path=/branches/gnome-2-24/; revision=6822

3 files changed, 20 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index cf2dbea00..d3dc3d531 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2008-12-28  Jesse van den Kieboom  <jesse@icecrew.nl>
+2009-01-07  Jesse van den Kieboom  <jesse@icecrew.nl>
+
+	* plugins/externaltools/tools: backport a couple of bugfixes.
+
+2008-11-23  Paolo Borelli  <pborelli@katamail.com>
 
 	* plugins/filebrowser/gedit-file-browser-store.c: Merged revision 6735
 	from trunk (fixes #556410)
diff --git a/plugins/externaltools/tools/manager.py b/plugins/externaltools/tools/manager.py
index 0b0b32788..67aaa1636 100644
--- a/plugins/externaltools/tools/manager.py
+++ b/plugins/externaltools/tools/manager.py
@@ -142,7 +142,7 @@ class Manager(object):
         h = self.compute_hash(script)
         if h != self.script_hash:
             # script has changed -> save it
-            self.current_node.save_with_script([line + "\n" for line in script.split("\n")])
+            self.current_node.save_with_script([line + "\n" for line in script.splitlines()])
             self.script_hash = h
         else:
             self.current_node.save()
diff --git a/plugins/externaltools/tools/tools.ui b/plugins/externaltools/tools/tools.ui
index 9648c13b4..7dd42b537 100644
--- a/plugins/externaltools/tools/tools.ui
+++ b/plugins/externaltools/tools/tools.ui
@@ -137,7 +137,7 @@
                   <object class="GtkLabel" id="label20">
                     <property name="visible">True</property>
                     <property name="xalign">0.000000</property>
-                    <property context="yes" name="label" translatable="yes">_Tools:</property>
+                    <property name="label" translatable="yes">_Tools:</property>
                     <property name="use_underline">True</property>
                     <property name="mnemonic_widget">view</property>
                   </object>
@@ -174,7 +174,7 @@
                       <object class="GtkButton" id="new-tool-button">
                         <property name="visible">True</property>
                         <property name="can_default">True</property>
-                        <property context="yes" name="label">gtk-new</property>
+                        <property name="label">gtk-new</property>
                         <property name="use_stock">True</property>
                         <signal handler="on_new_tool_button_clicked" name="clicked"/>
                       </object>
@@ -183,7 +183,7 @@
                       <object class="GtkButton" id="remove-tool-button">
                         <property name="visible">True</property>
                         <property name="can_default">True</property>
-                        <property context="yes" name="label">gtk-remove</property>
+                        <property name="label">gtk-remove</property>
                         <property name="use_stock">True</property>
                         <signal handler="on_remove_tool_button_clicked" name="clicked"/>
                       </object>
@@ -221,7 +221,7 @@
                   <object class="GtkLabel" id="title">
                     <property name="visible">True</property>
                     <property name="xalign">0.000000</property>
-                    <property context="yes" name="label" translatable="yes">Edit tool &lt;i&gt;make&lt;/i&gt;:</property>
+                    <property name="label" translatable="yes">Edit tool &lt;i&gt;make&lt;/i&gt;:</property>
                     <property name="use_markup">True</property>
                     <property name="mnemonic_widget">view</property>
                   </object>
@@ -236,7 +236,7 @@
                     <child>
                       <object class="GtkLabel" id="label22">
                         <property name="visible">True</property>
-                        <property context="yes" name="label" translatable="yes">    </property>
+                        <property name="label" translatable="yes">    </property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -389,7 +389,7 @@
                           <object class="GtkLabel" id="label23">
                             <property name="visible">True</property>
                             <property name="xalign">0.000000</property>
-                            <property context="yes" name="label" translatable="yes">_Applicability:</property>
+                            <property name="label" translatable="yes">_Applicability:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">applicability</property>
                           </object>
@@ -405,7 +405,7 @@
                             <property name="visible">True</property>
                             <property name="xalign">0.000000</property>
                             <property name="yalign">0.000000</property>
-                            <property context="yes" name="label" translatable="yes">Co_mmand(s):</property>
+                            <property name="label" translatable="yes">Co_mmand(s):</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">scrolledwindow3</property>
                           </object>
@@ -420,7 +420,7 @@
                           <object class="GtkLabel" id="label8">
                             <property name="visible">True</property>
                             <property name="xalign">0.000000</property>
-                            <property context="yes" name="label" translatable="yes">_Output:</property>
+                            <property name="label" translatable="yes">_Output:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">output</property>
                           </object>
@@ -435,7 +435,7 @@
                           <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
                             <property name="xalign">0.000000</property>
-                            <property context="yes" name="label" translatable="yes">_Input:</property>
+                            <property name="label" translatable="yes">_Input:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">input</property>
                           </object>
@@ -449,7 +449,7 @@
                         <child>
                           <object class="GtkLabel" id="label6">
                             <property name="xalign">0.000000</property>
-                            <property context="yes" name="label" translatable="yes">_Save:</property>
+                            <property name="label" translatable="yes">_Save:</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
@@ -463,7 +463,7 @@
                           <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
                             <property name="xalign">0.000000</property>
-                            <property context="yes" name="label" translatable="yes">_Shortcut Key:</property>
+                            <property name="label" translatable="yes">_Shortcut Key:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">accelerator</property>
                           </object>
@@ -478,7 +478,7 @@
                           <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
                             <property name="xalign">0.000000</property>
-                            <property context="yes" name="label" translatable="yes">_Description:</property>
+                            <property name="label" translatable="yes">_Description:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">description</property>
                           </object>
@@ -516,7 +516,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property context="yes" name="label">gtk-help</property>
+                <property name="label">gtk-help</property>
                 <property name="use_stock">True</property>
               </object>
             </child>
@@ -525,7 +525,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
-                <property context="yes" name="label">gtk-close</property>
+                <property name="label">gtk-close</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>