rpms/xchat-gnome/F-10 xchat-topic-update.patch, NONE, 1.1 xchat-gnome.spec, 1.55, 1.56

[Brian Pepple]

Author: bpepple

Update of /cvs/pkgs/rpms/xchat-gnome/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27906

Modified Files:
	xchat-gnome.spec 
Added Files:
	xchat-topic-update.patch 
Log Message:
* Sun May 10 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.24.1-2
- Add patch to fix topic entry bug. (#483839)


xchat-topic-update.patch:

--- NEW FILE xchat-topic-update.patch ---
diff --git a/src/fe-gnome/topic-label.c b/src/fe-gnome/topic-label.c
index a7d1883..334a196 100644
--- a/src/fe-gnome/topic-label.c
+++ b/src/fe-gnome/topic-label.c
@@ -267,8 +267,7 @@ topic_label_change_current (TopicLabel *label)
 	g_free (title);
 
 	gchar *topic = priv->current->topic;
-	GtkTextBuffer *buffer = gtk_text_buffer_new (NULL);
-        gtk_text_view_set_buffer (GTK_TEXT_VIEW (entry), buffer);
+	GtkTextBuffer *buffer = gtk_text_view_get_buffer ( GTK_TEXT_VIEW (entry));
 	g_signal_connect (G_OBJECT (buffer), "insert-text", G_CALLBACK (topic_entry_activate), dialog);
 	if (topic) {
         	gtk_text_buffer_set_text (buffer, topic, -1);
@@ -282,6 +281,12 @@ topic_label_change_current (TopicLabel *label)
 		gtk_widget_hide (dialog);
 		gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (entry), GTK_WRAP_NONE);
 		gchar *newtopic = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+		/* bz:536916 – Pressing "Enter" in the middle of editing channel topic truncates 
+		 * ignore "\n" aka enter key 
+		 */
+		glong i, len = g_utf8_strlen (newtopic, -1);
+	        for (i=0; i< len; i++) 
+			if (newtopic[i]=='\n') newtopic[i]=' ';
 		priv->current->server->p_topic (priv->current->server, priv->current->channel, newtopic);
 		g_free (newtopic);
 	}



Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/F-10/xchat-gnome.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- xchat-gnome.spec	27 Nov 2008 02:46:29 -0000	1.55
+++ xchat-gnome.spec	10 May 2009 12:01:51 -0000	1.56
@@ -1,6 +1,6 @@
 Name:           xchat-gnome
 Version:        0.24.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -9,6 +9,9 @@ URL:            http://%{name}.navi.cx/
 Source0:        http://ftp.acc.umu.se/pub/gnome/sources/%{name}/0.24/%{name}-%{version}.tar.bz2
 # Patch specific to Fedora to use .xchat-gnome, instead of .xchat2
 Patch0:		%{name}-0.23.92-config.patch
+# Patch to fix pressing "enter" in the middle of editing channel topic.
+# RH Bug #483839
+Patch1:		xchat-topic-update.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -48,6 +51,7 @@ common settings will be included in the 
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .config
+%patch1 -p1 -b .topic
 
 
 %build
@@ -136,6 +140,9 @@ fi
 
 
 %changelog
+* Sun May 10 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.24.1-2
+- Add patch to fix topic entry bug. (#483839)
+
 * Wed Nov 26 2008 Brian Pepple <bpepple at fedoraproject.org> - 0.24.1-1
 - Update to 0.24.1.
 - Update Source URL.