From 75d5fce1be45f866d3d1cf394d7b8dbbd5125892a5e52cb859bac1394127f27e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 12 Jun 2007 16:31:24 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=9 --- evolution-stringcompare.patch | 22 ++++++++++++++++++++++ evolution.changes | 5 +++++ evolution.spec | 6 +++++- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 evolution-stringcompare.patch diff --git a/evolution-stringcompare.patch b/evolution-stringcompare.patch new file mode 100644 index 0000000..9b17b12 --- /dev/null +++ b/evolution-stringcompare.patch @@ -0,0 +1,22 @@ +--- composer/e-msg-composer.c ++++ composer/e-msg-composer.c +@@ -5026,7 +5026,7 @@ + { + g_return_if_fail (E_IS_MSG_COMPOSER (composer)); + +- set_editor_text (composer, text, len, TRUE, text == ""); ++ set_editor_text (composer, text, len, TRUE, strlen(text) == 0); + } + + /** +--- shell/e-user-creatable-items-handler.c ++++ shell/e-user-creatable-items-handler.c +@@ -265,7 +265,7 @@ + && strcmp (corba_item->id, "message") == 0) + default_verb = item->verb; + +- if (corba_item->iconName == "") { ++ if (strlen(corba_item->iconName) == 0) { + item->icon = NULL; + } else { + item->icon = e_icon_factory_get_icon (corba_item->iconName, E_ICON_SIZE_MENU); diff --git a/evolution.changes b/evolution.changes index 06f80ac..95d7ac5 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 11 18:38:50 CEST 2007 - ro@suse.de + +- avoid string comparison with string literal + ------------------------------------------------------------------- Thu Jun 7 13:06:39 CEST 2007 - sbrabec@suse.cz diff --git a/evolution.spec b/evolution.spec index 0296960..a9e460b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -19,7 +19,7 @@ Provides: evoltn Autoreqprov: on Obsoletes: bonobo-conf Version: 2.10.1 -Release: 19 +Release: 25 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite #Source: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.10/%{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2 @@ -60,6 +60,7 @@ Patch92: evo-2.8.2-regression-fix.patch Patch100: abuild.patch #Patch101: xsltproc-no-net.patch Patch999: build-fixes.diff +Patch1000: evolution-stringcompare.patch URL: http://gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: yelp @@ -313,6 +314,7 @@ Authors: %patch100 -p1 #%patch101 -p1 %patch999 +%patch1000 %build autoreconf -f -i @@ -433,6 +435,8 @@ fi %{_libdir}/evolution/*/conduits/*.so %changelog +* Mon Jun 11 2007 - ro@suse.de +- avoid string comparison with string literal * Thu Jun 07 2007 - sbrabec@suse.cz - Removed invalid desktop Category "Application" (#254654). * Wed May 09 2007 - mauro@novell.com