- included in sources

Changed files:
    evolution-GG-IM.patch -> 1.4

diff --git a/evolution-GG-IM.patch b/evolution-GG-IM.patch
deleted file mode 100644 (file)
index b137795..0000000
--- a/evolution-GG-IM.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -urN aa/evolution-2.1.5/addressbook/gui/contact-editor/e-contact-editor.c evolution-2.1.5/addressbook/gui/contact-editor/e-contact-editor.c
---- aa/evolution-2.1.5/addressbook/gui/contact-editor/e-contact-editor.c       2005-01-28 19:40:16.000000000 +0100
-+++ evolution-2.1.5/addressbook/gui/contact-editor/e-contact-editor.c  2005-02-12 22:29:33.797115680 +0100
-@@ -182,6 +182,7 @@
-       { E_CONTACT_IM_AIM,       N_ ("AIM")       },
-       { E_CONTACT_IM_JABBER,    N_ ("Jabber")    },
-       { E_CONTACT_IM_YAHOO,     N_ ("Yahoo")     },
-+      { E_CONTACT_IM_GADUGADU,  N_ ("Gadu-Gadu") },
-       { E_CONTACT_IM_MSN,       N_ ("MSN")       },
-       { E_CONTACT_IM_ICQ,       N_ ("ICQ")       },
-       { E_CONTACT_IM_GROUPWISE, N_ ("GroupWise") }
-@@ -2819,6 +2820,7 @@
-       E_CONTACT_IM_GROUPWISE,
-       E_CONTACT_IM_JABBER,
-       E_CONTACT_IM_YAHOO,
-+      E_CONTACT_IM_GADUGADU,
-       E_CONTACT_IM_MSN,
-       E_CONTACT_IM_ICQ,
-       E_CONTACT_PHOTO,
-diff -urN aa/evolution-2.1.5/addressbook/gui/contact-editor/e-contact-editor-im.c evolution-2.1.5/addressbook/gui/contact-editor/e-contact-editor-im.c
---- aa/evolution-2.1.5/addressbook/gui/contact-editor/e-contact-editor-im.c    2004-11-26 16:51:28.000000000 +0100
-+++ evolution-2.1.5/addressbook/gui/contact-editor/e-contact-editor-im.c       2005-02-12 22:28:24.788606568 +0100
-@@ -63,6 +63,7 @@
-         N_("Novell Groupwise"),
-       N_("Jabber"),
-       N_("Yahoo Messenger"),
-+      N_("Gadu-Gadu Messenger"),
-       N_("MSN Messenger"),
-       N_("ICQ")
- };
-@@ -72,6 +73,7 @@
-       "im-nov",
-       "im-jabber",
-       "im-yahoo",
-+      "im-gadugadu",
-       "im-msn",
-       "im-icq"
- };
-diff -urN aa/evolution-2.1.5/addressbook/gui/widgets/eab-contact-display.c evolution-2.1.5/addressbook/gui/widgets/eab-contact-display.c
---- aa/evolution-2.1.5/addressbook/gui/widgets/eab-contact-display.c   2005-01-24 18:28:37.000000000 +0100
-+++ evolution-2.1.5/addressbook/gui/widgets/eab-contact-display.c      2005-02-12 22:33:05.345955368 +0100
-@@ -57,6 +57,7 @@
- #define JABBER_ICON       "im-jabber"
- #define MSN_ICON          "im-msn"
- #define YAHOO_ICON        "im-yahoo"
-+#define GADUGADU_ICON     "im-gadugadu"
- #define VIDEOCONF_ICON    "stock_video-conferencing"
- 
- #define MAX_COMPACT_IMAGE_DIMENSION 48
-@@ -349,6 +350,7 @@
-       accum_multival_attribute (accum, contact, _("Jabber"), E_CONTACT_IM_JABBER, JABBER_ICON, 0);
-       accum_multival_attribute (accum, contact, _("MSN"), E_CONTACT_IM_MSN, MSN_ICON, 0);
-       accum_multival_attribute (accum, contact, _("Yahoo"), E_CONTACT_IM_YAHOO, YAHOO_ICON, 0);
-+      accum_multival_attribute (accum, contact, _("Gadu-Gadu"), E_CONTACT_IM_GADUGADU, GADUGADU_ICON, 0);
- 
-       if (accum->len > 0)
-               gtk_html_stream_printf (html_stream, accum->str);
-diff -urN aa/evolution-2.1.5/plugins/bbdb/gaimbuddies.c evolution-2.1.5/plugins/bbdb/gaimbuddies.c
---- aa/evolution-2.1.5/plugins/bbdb/gaimbuddies.c      2005-01-31 19:34:41.000000000 +0100
-+++ evolution-2.1.5/plugins/bbdb/gaimbuddies.c 2005-02-12 22:37:40.473129680 +0100
-@@ -286,6 +286,8 @@
-               return E_CONTACT_IM_YAHOO;
-       if (! strcmp (proto, "prpl-jabber"))
-               return E_CONTACT_IM_JABBER;
-+      if (! strcmp (proto, "prpl-gg"))
-+              return E_CONTACT_IM_GADUGADU;
- 
-       return E_CONTACT_IM_AIM;
- }