From b8a089955324ee03a2ed4dc94afb8b1ec3caad9392d73541f0947e23dfa4351b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 4 Jan 2013 09:00:30 +0000 Subject: [PATCH] Accepting request 146271 from home:hpjansson:branches:GNOME:Factory Rebase and re-enable bnc-435722-book-uri-long.patch. OBS-URL: https://build.opensuse.org/request/show/146271 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=190 --- bnc-435722-book-uri-long.patch | 18 ++++++++++-------- evolution.changes | 5 +++++ evolution.spec | 5 ++--- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/bnc-435722-book-uri-long.patch b/bnc-435722-book-uri-long.patch index 162a8e9..b59a865 100644 --- a/bnc-435722-book-uri-long.patch +++ b/bnc-435722-book-uri-long.patch @@ -1,14 +1,15 @@ -Index: addressbook/printing/e-contact-print.c -=================================================================== ---- addressbook/printing/e-contact-print.c.orig -+++ addressbook/printing/e-contact-print.c -@@ -265,8 +265,20 @@ e_contact_print_contact (EContact *conta +diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c +index 290863c..e8e8e1a 100644 +--- a/addressbook/printing/e-contact-print.c ++++ b/addressbook/printing/e-contact-print.c +@@ -326,9 +326,21 @@ e_contact_print_contact (EContact *contact, if (value == NULL || *value == '\0') continue; -- text = g_strdup_printf ("%s: %s", +- text = g_strdup_printf ( +- "%s: %s", - e_contact_pretty_name (field), value); -+ if (field == E_CONTACT_BOOK_URI) { ++ if (field == E_CONTACT_BOOK_UID) { + gchar **tmpv; + tmpv = g_strsplit (value, ";", 2); + /* To translators: While printing contacts display the addressbook @@ -16,7 +17,8 @@ Index: addressbook/printing/e-contact-print.c + Example: "Address Book: Frequent Contacts" + */ + text = g_strdup_printf ("%s: %s", -+ _( "Address Book" ), tmpv[1]); ++ _( "Address Book" ), ++ (tmpv && tmpv [0] && tmpv [1]) ? tmpv[1] : value); + g_strfreev (tmpv); + } + else diff --git a/evolution.changes b/evolution.changes index 0de65d9..8269abe 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Dec 22 06:22:56 CET 2012 - hpj@opensuse.org + +- Rebase and re-enable bnc-435722-book-uri-long.patch. + ------------------------------------------------------------------- Tue Nov 13 11:04:29 UTC 2012 - dimstar@opensuse.org diff --git a/evolution.spec b/evolution.spec index 909b8f7..bb6d360 100644 --- a/evolution.spec +++ b/evolution.spec @@ -33,7 +33,7 @@ Group: Productivity/Networking/Email/Clients # NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859 Url: http://gnome.org/projects/evolution/ Source0: http://download.gnome.org/sources/evolution/3.6/%{name}-%{version}.tar.xz -# PATCH-NEEDS-REBASE bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column. (was PATCH-FIX-UPSTREAM) +# PATCH-FIX-UPSTREAM bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column. Patch19: bnc-435722-book-uri-long.patch BuildRequires: bison BuildRequires: fdupes @@ -126,8 +126,7 @@ to develop applications that require these. %prep %setup -q translation-update-upstream -# needs-rebase -#%%patch19 +%patch19 -p1 %build %if %{need_autogen}