pool/evolution
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 146271 from home:hpjansson:branches:GNOME:Factory

Browse Source 
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
This commit is contained in:
Dominique Leuenberger 2013-01-04 09:00:30 +00:00 committed by Git OBS Bridge
parent d2eca1d6b6
commit b8a0899553
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bnc-435722-book-uri-long.patch
View File

@ -1,14 +1,15 @@
Index: addressbook/printing/e-contact-print.c diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
=================================================================== index 290863c..e8e8e1a 100644
--- addressbook/printing/e-contact-print.c.orig --- a/addressbook/printing/e-contact-print.c
+++ addressbook/printing/e-contact-print.c +++ b/addressbook/printing/e-contact-print.c
@@ -265,8 +265,20 @@ e_contact_print_contact (EContact *conta @@ -326,9 +326,21 @@ e_contact_print_contact (EContact *contact,
if (value == NULL || *value == '\0') if (value == NULL || *value == '\0')
continue; continue;
- text = g_strdup_printf ("%s: %s", - text = g_strdup_printf (
- "%s: %s",
- e_contact_pretty_name (field), value); - e_contact_pretty_name (field), value);
+ if (field == E_CONTACT_BOOK_URI) { + if (field == E_CONTACT_BOOK_UID) {
+ gchar **tmpv; + gchar **tmpv;
+ tmpv = g_strsplit (value, ";", 2); + tmpv = g_strsplit (value, ";", 2);
+ /* To translators: While printing contacts display the addressbook + /* To translators: While printing contacts display the addressbook
@ -16,7 +17,8 @@ Index: addressbook/printing/e-contact-print.c
+ Example: "Address Book: Frequent Contacts" + Example: "Address Book: Frequent Contacts"
+ */ + */
+ text = g_strdup_printf ("%s: %s", + text = g_strdup_printf ("%s: %s",
+ _( "Address Book" ), tmpv[1]); + _( "Address Book" ),
+ (tmpv && tmpv [0] && tmpv [1]) ? tmpv[1] : value);
+ g_strfreev (tmpv); + g_strfreev (tmpv);
+ } + }
+ else + else

5
evolution.changes
View File

@ -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 Tue Nov 13 11:04:29 UTC 2012 - dimstar@opensuse.org

5
evolution.spec
View File

@ -33,7 +33,7 @@ Group: Productivity/Networking/Email/Clients
# NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859 # NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859
Url: http://gnome.org/projects/evolution/ Url: http://gnome.org/projects/evolution/
Source0: http://download.gnome.org/sources/evolution/3.6/%{name}-%{version}.tar.xz 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 Patch19: bnc-435722-book-uri-long.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: fdupes BuildRequires: fdupes
@ -126,8 +126,7 @@ to develop applications that require these.
%prep %prep
%setup -q %setup -q
translation-update-upstream translation-update-upstream
# needs-rebase %patch19 -p1
#%%patch19
%build %build
%if %{need_autogen} %if %{need_autogen}