rpms/telepathy-haze/devel telepathy-haze-fix-yahoo-apostrophe-escaping.patch, NONE, 1.1 telepathy-haze.spec, 1.5, 1.6
Peter Gordon (pgordon)
fedora-extras-commits at redhat.com
Mon Dec 17 05:18:48 UTC 2007
- Previous message (by thread): rpms/python-pp/EL-5 .cvsignore, 1.2, 1.3 python-pp.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/gnome-power-manager/devel .cvsignore, 1.39, 1.40 gnome-power-manager.spec, 1.107, 1.108 sources, 1.39, 1.40
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pgordon
Update of /cvs/pkgs/rpms/telepathy-haze/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14553
Modified Files:
telepathy-haze.spec
Added Files:
telepathy-haze-fix-yahoo-apostrophe-escaping.patch
Log Message:
Add upstream Darcs patch to fix apostrophe escaping with Yahoo! messages (bug 425870).
telepathy-haze-fix-yahoo-apostrophe-escaping.patch:
--- NEW FILE telepathy-haze-fix-yahoo-apostrophe-escaping.patch ---
diff -up ./src/im-channel.c.old ./src/im-channel.c
--- ./src/im-channel.c.old 2007-12-16 19:59:39.000000000 -0800
+++ ./src/im-channel.c 2007-12-16 20:04:55.000000000 -0800
@@ -267,7 +267,7 @@ haze_im_channel_send (TpSvcChannelTypeTe
HazeIMChannelPrivate *priv = HAZE_IM_CHANNEL_GET_PRIVATE (self);
GError *error = NULL;
PurpleMessageFlags flags = 0;
- char *message, *escaped;
+ char *message, *escaped, *reapostrophised;
if (type >= NUM_TP_CHANNEL_TEXT_MESSAGE_TYPES) {
DEBUG ("invalid message type %u", type);
@@ -290,16 +290,18 @@ haze_im_channel_send (TpSvcChannelTypeTe
}
escaped = g_markup_escape_text (message, -1);
+ reapostrophised = purple_strreplace(escape, "'", "'");
if (type == TP_CHANNEL_TEXT_MESSAGE_TYPE_AUTO_REPLY) {
flags |= PURPLE_MESSAGE_AUTO_RESP;
}
- purple_conv_im_send_with_flags (PURPLE_CONV_IM (priv->conv), escaped,
+ purple_conv_im_send_with_flags (PURPLE_CONV_IM (priv->conv), reapostrophised,
flags);
g_free (escaped);
g_free (message);
+ g_free (reapostrophised);
tp_svc_channel_type_text_return_from_send (context);
}
Index: telepathy-haze.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-haze/devel/telepathy-haze.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- telepathy-haze.spec 23 Nov 2007 08:31:24 -0000 1.5
+++ telepathy-haze.spec 17 Dec 2007 05:18:11 -0000 1.6
@@ -1,6 +1,6 @@
Name: telepathy-haze
Version: 0.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A multi-protocol Libpurple connection manager for Telepathy
Group: Applications/Communications
@@ -14,6 +14,8 @@
Source2: haze-msn.profile
Source3: haze-yahoo.profile
+Patch0: %{name}-fix-yahoo-apostrophe-escaping.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libpurple-devel
@@ -48,6 +50,7 @@
%prep
%setup -q
+%patch0 -b .yahoo-apostrophe-escaping
%build
@@ -58,7 +61,7 @@
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
-## Install the profile and icon for the AIM Mission Control support
+## Install the profile and icon for Mission Control support
## (e.g., for Empathy and others)
install -m 0755 -d %{buildroot}%{_datadir}/mission-control/profiles
install -p -m 0644 -t %{buildroot}%{_datadir}/mission-control/profiles %{SOURCE1}
@@ -87,6 +90,10 @@
%changelog
+* Sun Dec 16 2007 Peter Gordon <peter at thecodergeek.com> - 0.1.4-2
+- Add patch from upstream Darcs to fix bug 425870 (bad apostrophe escaping with
+ Yahoo! messages).
+
* Thu Nov 22 2007 Peter Gordon <peter at thecodergeek.com> - 0.1.4-1
- Update to new upstream build-fix release (0.1.4).
- Add Yahoo! IM support to the mission-control profiles, with default
@@ -123,4 +130,4 @@
- Sync %%description with upstream release announcements.
* Mon Aug 13 2007 Peter Gordon <peter at thecodergeek.com> - 0.1.0-1
-- Initial packaging for Fedora.
\ No newline at end of file
+- Initial packaging for Fedora.
- Previous message (by thread): rpms/python-pp/EL-5 .cvsignore, 1.2, 1.3 python-pp.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/gnome-power-manager/devel .cvsignore, 1.39, 1.40 gnome-power-manager.spec, 1.107, 1.108 sources, 1.39, 1.40
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list