From 83277fca72bded0feadebb050614eb5886eb1a9b Mon Sep 17 00:00:00 2001
From: Nikos Kouremenos <kourem@gmail.com>
Date: Sat, 16 Apr 2005 18:25:23 +0000
Subject: [PATCH] changelog removes \n in between and lets word wrapping to GTK

---
 plugins/gtkgui/check_for_new_version.py | 11 +++++++++--
 plugins/gtkgui/gtkgui.glade             | 10 +++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/plugins/gtkgui/check_for_new_version.py b/plugins/gtkgui/check_for_new_version.py
index f8133670b..76622c77e 100644
--- a/plugins/gtkgui/check_for_new_version.py
+++ b/plugins/gtkgui/check_for_new_version.py
@@ -51,11 +51,18 @@ class Check_for_new_version_dialog:
 				info = 'Gajim ' + latest_version + ' was released in ' + date + '!'
 				changes = ''
 				while True:
-					line = changelog.readline()
+					line = changelog.readline().lstrip()
 					if line.startswith('Gajim'):
 						break
 					else:
-						if line != '\n':
+						if line != '\n' or line !='': # line has some content
+							print 'line', repr(line)
+							if not line.startswith('*'):
+								# the is not a new *real* line
+								# but a continuation from previous line.
+								# So remove \n from previous 'line' beforing adding it
+								changes = changes[:-1]
+
 							changes += line
 				
 				self.parse_glade()
diff --git a/plugins/gtkgui/gtkgui.glade b/plugins/gtkgui/gtkgui.glade
index cc65f7937..cb92d747b 100644
--- a/plugins/gtkgui/gtkgui.glade
+++ b/plugins/gtkgui/gtkgui.glade
@@ -10437,7 +10437,7 @@ send a chat message to</property>
 
       <child>
 	<widget class="GtkFrame" id="frame28">
-	  <property name="border_width">5</property>
+	  <property name="border_width">6</property>
 	  <property name="visible">True</property>
 	  <property name="label_xalign">0</property>
 	  <property name="label_yalign">0.5</property>
@@ -10450,10 +10450,10 @@ send a chat message to</property>
 	      <property name="yalign">0.5</property>
 	      <property name="xscale">1</property>
 	      <property name="yscale">1</property>
-	      <property name="top_padding">0</property>
-	      <property name="bottom_padding">0</property>
-	      <property name="left_padding">12</property>
-	      <property name="right_padding">0</property>
+	      <property name="top_padding">5</property>
+	      <property name="bottom_padding">5</property>
+	      <property name="left_padding">5</property>
+	      <property name="right_padding">5</property>
 
 	      <child>
 		<widget class="GtkScrolledWindow" id="scrolledwindow34">