From e10cfb8f8c70bb8f63af60a292812aae9eaa3d94 Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Tue, 28 Feb 2012 19:18:42 +0000
Subject: Fix #1976 : Text entry with trailing newline characters causes issues
 for Move Storage

Changed most GtkEntry truncate-mutliline properties to True for all single line
entries to prevent similar issues.
---
 deluge/ui/gtkui/glade/add_torrent_dialog.glade    |  3 +++
 deluge/ui/gtkui/glade/connection_manager.glade    |  3 +++
 deluge/ui/gtkui/glade/create_torrent_dialog.glade |  3 +++
 deluge/ui/gtkui/glade/dgtkpopups.glade            |  1 +
 deluge/ui/gtkui/glade/edit_trackers.glade         |  1 +
 deluge/ui/gtkui/glade/main_window.glade           |  1 +
 deluge/ui/gtkui/glade/move_storage_dialog.glade   |  1 +
 deluge/ui/gtkui/glade/preferences_dialog.glade    | 20 ++++++++++++++++++++
 8 files changed, 33 insertions(+)

diff --git a/deluge/ui/gtkui/glade/add_torrent_dialog.glade b/deluge/ui/gtkui/glade/add_torrent_dialog.glade
index d6ade5079..8273340c6 100644
--- a/deluge/ui/gtkui/glade/add_torrent_dialog.glade
+++ b/deluge/ui/gtkui/glade/add_torrent_dialog.glade
@@ -375,6 +375,7 @@
                                 <child>
                                   <widget class="GtkEntry" id="entry_download_path">
                                     <property name="can_focus">True</property>
+                                    <property name="truncate_multiline">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                   </widget>
                                   <packing>
@@ -1021,6 +1022,7 @@
                     <property name="can_focus">True</property>
                     <property name="has_focus">True</property>
                     <property name="is_focus">True</property>
+                    <property name="truncate_multiline">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="activates_default">True</property>
                   </widget>
@@ -1179,6 +1181,7 @@
                     <property name="can_focus">True</property>
                     <property name="has_focus">True</property>
                     <property name="is_focus">True</property>
+                    <property name="truncate_multiline">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="activates_default">True</property>
                   </widget>
diff --git a/deluge/ui/gtkui/glade/connection_manager.glade b/deluge/ui/gtkui/glade/connection_manager.glade
index 3104bee81..cfe390602 100644
--- a/deluge/ui/gtkui/glade/connection_manager.glade
+++ b/deluge/ui/gtkui/glade/connection_manager.glade
@@ -40,6 +40,7 @@
                   <widget class="GtkEntry" id="entry_hostname">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="truncate_multiline">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="activates_default">True</property>
                   </widget>
@@ -100,6 +101,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="visibility">False</property>
+                    <property name="truncate_multiline">True</property>
                   </widget>
                 </child>
               </widget>
@@ -118,6 +120,7 @@
                   <widget class="GtkEntry" id="entry_username">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="truncate_multiline">True</property>
                   </widget>
                 </child>
               </widget>
diff --git a/deluge/ui/gtkui/glade/create_torrent_dialog.glade b/deluge/ui/gtkui/glade/create_torrent_dialog.glade
index 47664a16b..396bb6308 100644
--- a/deluge/ui/gtkui/glade/create_torrent_dialog.glade
+++ b/deluge/ui/gtkui/glade/create_torrent_dialog.glade
@@ -272,6 +272,7 @@
                           <widget class="GtkEntry" id="entry_author">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="truncate_multiline">True</property>
                           </widget>
                           <packing>
                             <property name="position">1</property>
@@ -773,6 +774,7 @@
                     <property name="can_focus">True</property>
                     <property name="has_focus">True</property>
                     <property name="is_focus">True</property>
+                    <property name="truncate_multiline">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="activates_default">True</property>
                   </widget>
@@ -955,6 +957,7 @@
                     <property name="can_focus">True</property>
                     <property name="has_focus">True</property>
                     <property name="is_focus">True</property>
+                    <property name="truncate_multiline">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="activates_default">True</property>
                   </widget>
diff --git a/deluge/ui/gtkui/glade/dgtkpopups.glade b/deluge/ui/gtkui/glade/dgtkpopups.glade
index 68f2c4b0a..9e0213f12 100644
--- a/deluge/ui/gtkui/glade/dgtkpopups.glade
+++ b/deluge/ui/gtkui/glade/dgtkpopups.glade
@@ -208,6 +208,7 @@
                 <property name="can_focus">True</property>
                 <property name="activates_default">True</property>
                 <property name="width_chars">39</property>
+                <property name="truncate_multiline">True</property>
                 <property name="text" translatable="yes">hostname:port</property>
               </widget>
               <packing>
diff --git a/deluge/ui/gtkui/glade/edit_trackers.glade b/deluge/ui/gtkui/glade/edit_trackers.glade
index 587f2980e..1ad16a9c7 100644
--- a/deluge/ui/gtkui/glade/edit_trackers.glade
+++ b/deluge/ui/gtkui/glade/edit_trackers.glade
@@ -460,6 +460,7 @@
                     <property name="can_focus">True</property>
                     <property name="has_focus">True</property>
                     <property name="is_focus">True</property>
+                    <property name="truncate_multiline">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="activates_default">True</property>
                   </widget>
diff --git a/deluge/ui/gtkui/glade/main_window.glade b/deluge/ui/gtkui/glade/main_window.glade
index 467260871..15a990615 100644
--- a/deluge/ui/gtkui/glade/main_window.glade
+++ b/deluge/ui/gtkui/glade/main_window.glade
@@ -2035,6 +2035,7 @@
                                           <widget class="GtkEntry" id="entry_move_completed">
                                             <property name="sensitive">False</property>
                                             <property name="can_focus">True</property>
+                                            <property name="truncate_multiline">True</property>
                                           </widget>
                                           <packing>
                                             <property name="expand">False</property>
diff --git a/deluge/ui/gtkui/glade/move_storage_dialog.glade b/deluge/ui/gtkui/glade/move_storage_dialog.glade
index fc26ed1e8..21715cab9 100644
--- a/deluge/ui/gtkui/glade/move_storage_dialog.glade
+++ b/deluge/ui/gtkui/glade/move_storage_dialog.glade
@@ -88,6 +88,7 @@
                     <property name="can_focus">True</property>
                     <property name="has_focus">True</property>
                     <property name="is_focus">True</property>
+                    <property name="truncate_multiline">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="activates_default">True</property>
                   </widget>
diff --git a/deluge/ui/gtkui/glade/preferences_dialog.glade b/deluge/ui/gtkui/glade/preferences_dialog.glade
index 2694db728..9fd34fa71 100644
--- a/deluge/ui/gtkui/glade/preferences_dialog.glade
+++ b/deluge/ui/gtkui/glade/preferences_dialog.glade
@@ -129,6 +129,7 @@
                                                 <child>
                                                   <widget class="GtkEntry" id="entry_autoadd">
                                                     <property name="can_focus">True</property>
+                                                    <property name="truncate_multiline">True</property>
                                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                                   </widget>
                                                   <packing>
@@ -166,6 +167,7 @@
                                                 <child>
                                                   <widget class="GtkEntry" id="entry_move_completed_path">
                                                     <property name="can_focus">True</property>
+                                                    <property name="truncate_multiline">True</property>
                                                   </widget>
                                                   <packing>
                                                     <property name="position">1</property>
@@ -232,6 +234,7 @@
                                             <child>
                                               <widget class="GtkEntry" id="entry_download_path">
                                                 <property name="can_focus">True</property>
+                                                <property name="truncate_multiline">True</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                               </widget>
                                               <packing>
@@ -292,6 +295,7 @@
                                                 <child>
                                                   <widget class="GtkEntry" id="entry_torrents_path">
                                                     <property name="can_focus">True</property>
+                                                    <property name="truncate_multiline">True</property>
                                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                                     <property name="invisible_char">&#x25CF;</property>
                                                   </widget>
@@ -874,6 +878,7 @@
                                           <widget class="GtkEntry" id="entry_interface">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
+                                            <property name="truncate_multiline">True</property>
                                             <property name="tooltip" translatable="yes">Enter the IP address of the interface to listen for incoming bittorrent connections on.  Leave this empty if you want to use the default.</property>
                                             <property name="max_length">60</property>
                                             <property name="invisible_char">&#x25CF;</property>
@@ -944,6 +949,7 @@
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
                                                 <property name="width_chars">4</property>
+                                                <property name="truncate_multiline">True</property>
                                                 <property name="text" translatable="no">0x00</property>
                                               </widget>
                                               <packing>
@@ -2123,6 +2129,7 @@ Disabled</property>
                                                     <property name="visible">True</property>
                                                     <property name="sensitive">False</property>
                                                     <property name="can_focus">True</property>
+                                                    <property name="truncate_multiline">True</property>
                                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                                     <property name="visibility">False</property>
                                                     <property name="width_chars">16</property>
@@ -2398,6 +2405,7 @@ Disabled</property>
                                                   <widget class="GtkEntry" id="entry_geoip">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
+                                                    <property name="truncate_multiline">True</property>
                                                     <property name="tooltip" translatable="yes">If Deluge cannot find the database file at this location it will fallback to using DNS to resolve the peer's country.</property>
                                                     <property name="invisible_char">&#x25CF;</property>
                                                   </widget>
@@ -3287,6 +3295,7 @@ Disabled</property>
                                               <widget class="GtkEntry" id="txt_proxy_password_peer">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
+                                                <property name="truncate_multiline">True</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                                 <property name="visibility">False</property>
                                               </widget>
@@ -3314,6 +3323,7 @@ Disabled</property>
                                               <widget class="GtkEntry" id="txt_proxy_server_peer">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
+                                                <property name="truncate_multiline">True</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                               </widget>
                                               <packing>
@@ -3362,6 +3372,7 @@ Disabled</property>
                                               <widget class="GtkEntry" id="txt_proxy_username_peer">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
+                                                <property name="truncate_multiline">True</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                               </widget>
                                               <packing>
@@ -3471,6 +3482,7 @@ HTTP W/ Auth</property>
                                               <widget class="GtkEntry" id="txt_proxy_password_web_seed">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
+                                                <property name="truncate_multiline">True</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                                 <property name="visibility">False</property>
                                               </widget>
@@ -3498,6 +3510,7 @@ HTTP W/ Auth</property>
                                               <widget class="GtkEntry" id="txt_proxy_server_web_seed">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
+                                                <property name="truncate_multiline">True</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                               </widget>
                                               <packing>
@@ -3546,6 +3559,7 @@ HTTP W/ Auth</property>
                                               <widget class="GtkEntry" id="txt_proxy_username_web_seed">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
+                                                <property name="truncate_multiline">True</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                               </widget>
                                               <packing>
@@ -3655,6 +3669,7 @@ HTTP W/ Auth</property>
                                               <widget class="GtkEntry" id="txt_proxy_password_tracker">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
+                                                <property name="truncate_multiline">True</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                                 <property name="visibility">False</property>
                                               </widget>
@@ -3682,6 +3697,7 @@ HTTP W/ Auth</property>
                                               <widget class="GtkEntry" id="txt_proxy_server_tracker">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
+                                                <property name="truncate_multiline">True</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                               </widget>
                                               <packing>
@@ -3730,6 +3746,7 @@ HTTP W/ Auth</property>
                                               <widget class="GtkEntry" id="txt_proxy_username_tracker">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
+                                                <property name="truncate_multiline">True</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                               </widget>
                                               <packing>
@@ -3840,6 +3857,7 @@ HTTP W/ Auth</property>
                                               <widget class="GtkEntry" id="txt_proxy_password_dht">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
+                                                <property name="truncate_multiline">True</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                                 <property name="visibility">False</property>
                                               </widget>
@@ -3868,6 +3886,7 @@ HTTP W/ Auth</property>
                                               <widget class="GtkEntry" id="txt_proxy_server_dht">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
+                                                <property name="truncate_multiline">True</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                               </widget>
                                               <packing>
@@ -3917,6 +3936,7 @@ HTTP W/ Auth</property>
                                               <widget class="GtkEntry" id="txt_proxy_username_dht">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
+                                                <property name="truncate_multiline">True</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                               </widget>
                                               <packing>
-- 
cgit