From 56f0f398a96146cae851c1847f656a4ff66964dc Mon Sep 17 00:00:00 2001
From: Joel Klinghed <the_jk@yahoo.com>
Date: Sat, 3 Dec 2011 11:21:57 +0100
Subject: Tooltips uses markup even if column uses text. So change column to
 markup and escape any '&'

---
 gui/viewtorrents.glade | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'gui')

diff --git a/gui/viewtorrents.glade b/gui/viewtorrents.glade
index 7aee1f2..5f95115 100644
--- a/gui/viewtorrents.glade
+++ b/gui/viewtorrents.glade
@@ -5,18 +5,20 @@
   <object class="GtkAccelGroup" id="accelgroup1"/>
   <object class="GtkActionGroup" id="actiongroup">
     <child>
-      <object class="GtkAction" id="connectaction">
-        <property name="label" translatable="yes">Connect</property>
-        <property name="tooltip" translatable="yes">Connect to rTorrent</property>
-        <property name="stock_id">gtk-connect</property>
+      <object class="GtkAction" id="rehashaction">
+        <property name="label" translatable="yes">Rehash</property>
+        <property name="tooltip" translatable="yes">Rehash selected torrent</property>
+        <property name="stock_id">gtk-refresh</property>
       </object>
+      <accelerator key="r" modifiers="GDK_CONTROL_MASK"/>
     </child>
     <child>
-      <object class="GtkAction" id="disconnectaction">
-        <property name="label" translatable="yes">Disconnect</property>
-        <property name="tooltip" translatable="yes">Disconnect from rTorrent</property>
-        <property name="stock_id">gtk-disconnect</property>
+      <object class="GtkAction" id="stopaction">
+        <property name="label" translatable="yes">Stop</property>
+        <property name="tooltip" translatable="yes">Stop selected torrent</property>
+        <property name="stock_id">gtk-media-stop</property>
       </object>
+      <accelerator key="d" modifiers="GDK_CONTROL_MASK"/>
     </child>
     <child>
       <object class="GtkAction" id="startaction">
@@ -27,20 +29,18 @@
       <accelerator key="s" modifiers="GDK_CONTROL_MASK"/>
     </child>
     <child>
-      <object class="GtkAction" id="stopaction">
-        <property name="label" translatable="yes">Stop</property>
-        <property name="tooltip" translatable="yes">Stop selected torrent</property>
-        <property name="stock_id">gtk-media-stop</property>
+      <object class="GtkAction" id="disconnectaction">
+        <property name="label" translatable="yes">Disconnect</property>
+        <property name="tooltip" translatable="yes">Disconnect from rTorrent</property>
+        <property name="stock_id">gtk-disconnect</property>
       </object>
-      <accelerator key="d" modifiers="GDK_CONTROL_MASK"/>
     </child>
     <child>
-      <object class="GtkAction" id="rehashaction">
-        <property name="label" translatable="yes">Rehash</property>
-        <property name="tooltip" translatable="yes">Rehash selected torrent</property>
-        <property name="stock_id">gtk-refresh</property>
+      <object class="GtkAction" id="connectaction">
+        <property name="label" translatable="yes">Connect</property>
+        <property name="tooltip" translatable="yes">Connect to rTorrent</property>
+        <property name="stock_id">gtk-connect</property>
       </object>
-      <accelerator key="r" modifiers="GDK_CONTROL_MASK"/>
     </child>
   </object>
   <object class="GtkAboutDialog" id="aboutdialog">
@@ -568,7 +568,7 @@ If authentication is needed, enter username and password as well.</property>
                     <child>
                       <object class="GtkCellRendererText" id="cellrenderertitle"/>
                       <attributes>
-                        <attribute name="text">1</attribute>
+                        <attribute name="markup">1</attribute>
                       </attributes>
                     </child>
                   </object>
-- 
cgit v1.2.3-70-g09d2