- updated for evolution-1.5.90

Changed files:
    evolution-GG-IM.patch -> 1.2
    evolution-locale-names.patch -> 1.4

diff --git a/evolution-GG-IM.patch b/evolution-GG-IM.patch
index 47f0563bc5bb76a4092a15c3791b7b6ce5bc44e0..8fba58aab26dae17bd6bd7a4e04aa0d7e57b821f 100644 (file)
--- a/evolution-GG-IM.patch
+++ b/evolution-GG-IM.patch
@@ -39,19 +39,11 @@ diff -urN evolution.orig/addressbook/gui/widgets/eab-contact-display.c evolution
  #define VIDEOCONF_ICON    "stock_video-conferencing"
  
  #define MAX_COMPACT_IMAGE_DIMENSION 48
-@@ -337,6 +338,7 @@
-       accum_attribute (accum, contact, _("Jabber"), E_CONTACT_IM_JABBER_WORK_1, JABBER_ICON, 0);
-       accum_attribute (accum, contact, _("MSN"), E_CONTACT_IM_MSN_WORK_1, MSN_ICON, 0);
-       accum_attribute (accum, contact, _("Yahoo"), E_CONTACT_IM_YAHOO_WORK_1, YAHOO_ICON, 0);
-+      accum_attribute (accum, contact, _("Gadu-Gadu"), E_CONTACT_IM_GADUGADU_WORK_1, GADUGADU_ICON, 0);
-       accum_attribute (accum, contact, _("Video Conferencing"), E_CONTACT_VIDEO_URL, VIDEOCONF_ICON, E_TEXT_TO_HTML_CONVERT_URLS);
-       accum_attribute (accum, contact, _("Phone"), E_CONTACT_PHONE_BUSINESS, NULL, 0);
-       accum_attribute (accum, contact, _("Fax"), E_CONTACT_PHONE_BUSINESS_FAX, NULL, 0);
 @@ -356,6 +358,7 @@
        accum_attribute (accum, contact, _("Jabber"), E_CONTACT_IM_JABBER_HOME_1, JABBER_ICON, 0);
        accum_attribute (accum, contact, _("MSN"), E_CONTACT_IM_MSN_HOME_1, MSN_ICON, 0);
        accum_attribute (accum, contact, _("Yahoo"), E_CONTACT_IM_YAHOO_HOME_1, YAHOO_ICON, 0);
 +      accum_attribute (accum, contact, _("Gadu-Gadu"), E_CONTACT_IM_GADUGADU_HOME_1, GADUGADU_ICON, 0);
-       accum_attribute (accum, contact, _("WWW"), E_CONTACT_HOMEPAGE_URL, NULL, E_TEXT_TO_HTML_CONVERT_URLS);
-       accum_attribute (accum, contact, _("Blog"), E_CONTACT_BLOG_URL, NULL, E_TEXT_TO_HTML_CONVERT_URLS);
  
+       if (accum->len > 0)
+               gtk_html_stream_printf (html_stream, accum->str);

diff --git a/evolution-locale-names.patch b/evolution-locale-names.patch
index 70573d6fc7f670ebaab007e8d88498b4d8aac1e1..9f646e3f5a3e54dbd2b03a86907353a5b3da0698 100644 (file)
--- a/evolution-locale-names.patch
+++ b/evolution-locale-names.patch
@@ -5,8 +5,8 @@ diff -urN aa/evolution-1.5.4/configure.in evolution-1.5.4/configure.in
  dnl I18N stuff
  AC_PROG_INTLTOOL
  
--ALL_LINGUAS="am az be bg ca cs da de el en_AU en_CA en_GB es et eu fa fi fr ga gl hr hu is it ja ko lt lv mn ms nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tr uk vi zh_CN zh_TW"
-+ALL_LINGUAS="am az be bg ca cs da de el en_AU en_CA en_GB es et eu fa fi fr ga gl hr hu is it ja ko lt lv mn ms nb nl nn pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tr uk vi zh_CN zh_TW"
+-ALL_LINGUAS="am ar az be bg ca cs da de el en_AU en_CA en_GB es et eu fa fi fr ga gl hr hu is it ja ko lt lv mn ms nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tr uk vi wa zh_CN zh_TW"
++ALL_LINGUAS="am ar az be bg ca cs da de el en_AU en_CA en_GB es et eu fa fi fr ga gl hr hu is it ja ko lt lv mn ms nb nl nn pl pt pt_BR ro ru sk sl sq sr sr@Latn sv tr uk vi wa zh_CN zh_TW"
  AM_GLIB_GNU_GETTEXT
  
  GETTEXT_PACKAGE=evolution-1.5