rpms/xchat-gnome/F-10 xchat-gnome.spec, 1.56, 1.57 xchat-topic-update.patch, 1.1, 1.2

[Brian Pepple]

Author: bpepple

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

Modified Files:
	xchat-gnome.spec xchat-topic-update.patch 
Log Message:
* Sun Jun 21 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.24.1-3
- Fix topic patch.



Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/F-10/xchat-gnome.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- xchat-gnome.spec	10 May 2009 12:01:51 -0000	1.56
+++ xchat-gnome.spec	22 Jun 2009 00:03:58 -0000	1.57
@@ -1,6 +1,6 @@
 Name:           xchat-gnome
 Version:        0.24.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -140,6 +140,9 @@ fi
 
 
 %changelog
+* Sun Jun 21 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.24.1-3
+- Fix topic patch.
+
 * 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:

Index: xchat-topic-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/F-10/xchat-topic-update.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xchat-topic-update.patch	10 May 2009 12:01:51 -0000	1.1
+++ xchat-topic-update.patch	22 Jun 2009 00:03:59 -0000	1.2
@@ -1,28 +1,20 @@
+From 6d1a939a14de918de4a79c010d82796f8035bcfa Mon Sep 17 00:00:00 2001
+From: Josselin Mouette <^Css at malsain.org>
+Date: Thu, 18 Jun 2009 09:41:33 +0000
+Subject: Bug 536916 – Pressing "Enter" in the middle of editing channel topic truncates it.
+
+---
 diff --git a/src/fe-gnome/topic-label.c b/src/fe-gnome/topic-label.c
-index a7d1883..334a196 100644
+index a7d1883..977d29c 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);
+@@ -315,6 +315,7 @@ static void
+ topic_entry_activate (GtkTextBuffer *textbuffer, GtkTextIter *arg1, gchar *text, gint len, GtkDialog *dialog)
+ {
+ 	if (strncmp (text, "\n", len) == 0) {
++		g_signal_stop_emission_by_name (G_OBJECT (textbuffer), "insert-text");
+ 		gtk_dialog_response (dialog, GTK_RESPONSE_OK);
  	}
-
+ }
+--
+cgit v0.8.2