rpms/xchat-gnome/F-11 xchat-topic-update.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 xchat-gnome.spec, 1.60, 1.61
Brian Pepple
bpepple at fedoraproject.org
Sun May 10 12:42:29 UTC 2009
Author: bpepple
Update of /cvs/pkgs/rpms/xchat-gnome/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1854
Modified Files:
.cvsignore sources xchat-gnome.spec
Added Files:
xchat-topic-update.patch
Log Message:
* Sun May 10 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.26.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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/F-11/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore 31 Mar 2009 23:17:07 -0000 1.21
+++ .cvsignore 10 May 2009 12:41:55 -0000 1.22
@@ -1 +1 @@
-xchat-gnome-0.26.0.tar.bz2
+xchat-gnome-0.26.1.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/F-11/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources 31 Mar 2009 23:17:07 -0000 1.21
+++ sources 10 May 2009 12:41:56 -0000 1.22
@@ -1 +1 @@
-ef230db0d104faa8dc7e5060c51f7261 xchat-gnome-0.26.0.tar.bz2
+c9ce3d6e549736edfc1a1dc0282fb363 xchat-gnome-0.26.1.tar.bz2
Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/F-11/xchat-gnome.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- xchat-gnome.spec 31 Mar 2009 23:17:07 -0000 1.60
+++ xchat-gnome.spec 10 May 2009 12:41:56 -0000 1.61
@@ -1,6 +1,6 @@
Name: xchat-gnome
-Version: 0.26.0
-Release: 1%{?dist}
+Version: 0.26.1
+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.26/%{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,12 @@ fi
%changelog
+* Sun May 10 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.26.1-2
+- Add patch to fix topic entry bug. (#483839)
+
+* Sat Apr 18 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.26.1-1
+- Update to 0.26.1.
+
* Tue Mar 31 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.26.0-1
- Update to 0.26.0.
More information about the fedora-extras-commits
mailing list