UPDATE: Pidgin 2.0.1

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: Pidgin 2.0.1

Brad Smith-14
Here is an update to Pidgin 2.0.1.


Index: Makefile
===================================================================
RCS file: /cvs/ports/net/pidgin/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 26 May 2007 19:56:10 -0000 1.4
+++ Makefile 28 May 2007 04:48:02 -0000
@@ -4,8 +4,7 @@ SHARED_ONLY= Yes
 
 COMMENT= "multi-protocol instant messaging client"
 
-DISTNAME= pidgin-2.0.0
-PKGNAME= ${DISTNAME}p2
+DISTNAME= pidgin-2.0.1
 SHARED_LIBS += jabber               0.0      # .0.0
 SHARED_LIBS += oscar                0.0      # .0.0
 SHARED_LIBS += purple               0.0      # .0.0
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/pidgin/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 12 May 2007 15:19:35 -0000 1.1.1.1
+++ distinfo 28 May 2007 04:48:24 -0000
@@ -1,5 +1,5 @@
-MD5 (pidgin-2.0.0.tar.gz) = k2tw6vQOzWx1iCBPat93/A==
-RMD160 (pidgin-2.0.0.tar.gz) = QHZfdNQxuLaWAVJK722O+ElMluc=
-SHA1 (pidgin-2.0.0.tar.gz) = 4TfpbF8SX/2nFx9mHIWj1qqs06c=
-SHA256 (pidgin-2.0.0.tar.gz) = N7Eh7+fEGQy3eTdGmdAnrY29n/hy8uzInLWyd8Zbs78=
-SIZE (pidgin-2.0.0.tar.gz) = 10659544
+MD5 (pidgin-2.0.1.tar.gz) = ZWkTFtgVfLXBEdeG/YVTMg==
+RMD160 (pidgin-2.0.1.tar.gz) = A4EijmDx1lywbq8DE/+56h+FDyc=
+SHA1 (pidgin-2.0.1.tar.gz) = CVTxqnuO5iTha90Ac6yfC2J8Nq0=
+SHA256 (pidgin-2.0.1.tar.gz) = gg+3GoWF8EgVaGa7AGpC9BPe9u0xEFM0gdkvFTOufo4=
+SIZE (pidgin-2.0.1.tar.gz) = 10836164
Index: patches/patch-config_h_in
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-config_h_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-config_h_in
--- patches/patch-config_h_in 12 May 2007 15:19:35 -0000 1.1.1.1
+++ patches/patch-config_h_in 28 May 2007 05:58:41 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-config_h_in,v 1.1.1.1 2007/05/12 15:19:35 alek Exp $
---- config.h.in.orig Mon Apr 30 05:39:14 2007
-+++ config.h.in Tue May  1 23:19:10 2007
-@@ -154,6 +154,12 @@
+--- config.h.in.orig Fri May 25 12:28:50 2007
++++ config.h.in Mon May 28 01:57:22 2007
+@@ -150,6 +150,12 @@
  /* Define to 1 if you have the <nss.h> header file. */
  #undef HAVE_NSS_H
 
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-configure_ac,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure_ac
--- patches/patch-configure_ac 12 May 2007 15:19:36 -0000 1.1.1.1
+++ patches/patch-configure_ac 28 May 2007 05:58:41 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure_ac,v 1.1.1.1 2007/05/12 15:19:36 alek Exp $
---- configure.ac.orig Mon Apr 30 03:26:53 2007
-+++ configure.ac Tue May  1 23:11:26 2007
-@@ -510,6 +510,7 @@ if test "x$enable_consoleui" = "xyes"; then
+--- configure.ac.orig Fri May 25 12:28:21 2007
++++ configure.ac Mon May 28 01:57:22 2007
+@@ -521,6 +521,7 @@ if test "x$enable_consoleui" = "xyes"; then
  # ncursesw was not found. Look for plain old ncurses
  enable_consoleui=yes
  AC_CHECK_LIB(ncurses, initscr, [GNT_LIBS="-lncurses"], [enable_consoleui=no])
@@ -9,7 +9,7 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2
  AC_CHECK_LIB(panel, update_panels, [GNT_LIBS="$GNT_LIBS -lpanel"], [enable_consoleui=no])
  AC_DEFINE(NO_WIDECHAR, 1, [Define to 1 if you don't have wide-character support.])
  if test x"$ac_ncurses_includes" != "x"; then
-@@ -672,7 +673,7 @@ else
+@@ -683,7 +684,7 @@ else
  if test "$ac_silc_libs" != "no"; then
  SILC_LIBS="-L$ac_silc_libs"
  fi
@@ -18,7 +18,7 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2
  AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS)
  fi
  AC_SUBST(SILC_LIBS)
-@@ -1316,8 +1317,13 @@ dnl ##################################################
+@@ -1312,8 +1313,13 @@ dnl ##################################################
 
  dnl These two are inverses of each other <-- stolen from evolution!
 
@@ -33,7 +33,7 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2
  [enable_gnutls="$enableval"],
  [enable_gnutls="yes"])
 
-@@ -1329,6 +1335,90 @@ AC_ARG_ENABLE(nss,
+@@ -1325,6 +1331,90 @@ AC_ARG_ENABLE(nss,
  msg_ssl="None (MSN and Google Talk will not work without SSL!)"
 
  dnl #
@@ -124,7 +124,7 @@ $OpenBSD: patch-configure_ac,v 1.1.1.1 2
  dnl # Check for GnuTLS if it's specified.
  dnl #
  if test "x$enable_gnutls" != "xno"; then
-@@ -1683,12 +1773,20 @@ fi
+@@ -1679,12 +1769,20 @@ fi
 
  AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes")
 
Index: patches/patch-finch_libgnt_Makefile_in
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-finch_libgnt_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-finch_libgnt_Makefile_in
--- patches/patch-finch_libgnt_Makefile_in 12 May 2007 15:19:36 -0000 1.1.1.1
+++ patches/patch-finch_libgnt_Makefile_in 28 May 2007 05:58:41 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-finch_libgnt_Makefile_in,v 1.1.1.1 2007/05/12 15:19:36 alek Exp $
---- finch/libgnt/Makefile.in.orig Mon Apr 30 06:17:52 2007
-+++ finch/libgnt/Makefile.in Tue May  1 23:11:26 2007
-@@ -434,7 +434,7 @@ target_cpu = @target_cpu@
+--- finch/libgnt/Makefile.in.orig Fri May 25 12:29:19 2007
++++ finch/libgnt/Makefile.in Mon May 28 01:57:22 2007
+@@ -429,7 +429,7 @@ target_cpu = @target_cpu@
  target_os = @target_os@
  target_vendor = @target_vendor@
  EXTRA_DIST = genmarshal
Index: patches/patch-finch_plugins_Makefile_in
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-finch_plugins_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-finch_plugins_Makefile_in
--- patches/patch-finch_plugins_Makefile_in 12 May 2007 15:19:36 -0000 1.1.1.1
+++ patches/patch-finch_plugins_Makefile_in 28 May 2007 05:58:41 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-finch_plugins_Makefile_in,v 1.1.1.1 2007/05/12 15:19:36 alek Exp $
---- finch/plugins/Makefile.in.orig Mon Apr 30 06:17:53 2007
-+++ finch/plugins/Makefile.in Tue May  1 23:11:27 2007
+--- finch/plugins/Makefile.in.orig Fri May 25 12:29:19 2007
++++ finch/plugins/Makefile.in Mon May 28 01:57:22 2007
 @@ -76,7 +76,8 @@ am__gnthistory_la_SOURCES_DIST = gnthistory.c
  @PLUGINS_TRUE@am_gnthistory_la_OBJECTS = gnthistory.lo
  gnthistory_la_OBJECTS = $(am_gnthistory_la_OBJECTS)
@@ -11,7 +11,7 @@ $OpenBSD: patch-finch_plugins_Makefile_i
  am__gntlastlog_la_SOURCES_DIST = lastlog.c
  @PLUGINS_TRUE@am_gntlastlog_la_OBJECTS = lastlog.lo
  gntlastlog_la_OBJECTS = $(am_gntlastlog_la_OBJECTS)
-@@ -457,7 +458,7 @@ gntlastlog_la_LDFLAGS = -module -avoid-version
+@@ -452,7 +453,7 @@ gntlastlog_la_LDFLAGS = -module -avoid-version
  @PLUGINS_TRUE@gntclipboard_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS)
  @PLUGINS_TRUE@gntgf_la_LIBADD = $(GLIB_LIBS) $(X11_LIBS) $(top_builddir)/finch/libgnt/libgnt.la
  @PLUGINS_TRUE@gnthistory_la_LIBADD = $(GLIB_LIBS)
Index: patches/patch-libpurple_nat-pmp_c
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-libpurple_nat-pmp_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-libpurple_nat-pmp_c
--- patches/patch-libpurple_nat-pmp_c 12 May 2007 15:19:36 -0000 1.1.1.1
+++ patches/patch-libpurple_nat-pmp_c 28 May 2007 05:58:40 -0000
@@ -1,11 +1,12 @@
 $OpenBSD: patch-libpurple_nat-pmp_c,v 1.1.1.1 2007/05/12 15:19:36 alek Exp $
---- libpurple/nat-pmp.c.orig Sat May  5 14:55:20 2007
-+++ libpurple/nat-pmp.c Sat May  5 14:55:27 2007
-@@ -53,6 +53,7 @@
-
- #include <errno.h>
+--- libpurple/nat-pmp.c.orig Fri May 25 12:28:21 2007
++++ libpurple/nat-pmp.c Mon May 28 01:58:28 2007
+@@ -42,6 +42,8 @@
+ #include <sys/socket.h>
+ #endif
 
 +#undef NET_RT_DUMP
- #ifdef NET_RT_DUMP
-
- #define PMP_DEBUG 1
++
+ /* We will need sysctl() and NET_RT_DUMP, both of which are not present
+  * on all platforms, to continue. */
+ #if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP)
Index: patches/patch-libpurple_plugins_ssl_Makefile_in
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-libpurple_plugins_ssl_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-libpurple_plugins_ssl_Makefile_in
--- patches/patch-libpurple_plugins_ssl_Makefile_in 12 May 2007 15:19:36 -0000 1.1.1.1
+++ patches/patch-libpurple_plugins_ssl_Makefile_in 28 May 2007 05:58:45 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-libpurple_plugins_ssl_Makefile_in,v 1.1.1.1 2007/05/12 15:19:36 alek Exp $
---- libpurple/plugins/ssl/Makefile.in.orig Fri May  4 07:24:29 2007
-+++ libpurple/plugins/ssl/Makefile.in Fri May  4 21:11:16 2007
+--- libpurple/plugins/ssl/Makefile.in.orig Fri May 25 12:29:21 2007
++++ libpurple/plugins/ssl/Makefile.in Mon May 28 01:57:22 2007
 @@ -57,6 +57,12 @@ am__installdirs = "$(DESTDIR)$(plugindir)"
  pluginLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(plugin_LTLIBRARIES)
@@ -31,8 +31,8 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
 +OPENSSL_LIBS = @OPENSSL_LIBS@
  GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
  GNUTLS_LIBS = @GNUTLS_LIBS@
- GREP = @GREP@
-@@ -342,6 +350,8 @@ TCL_LIBS = @TCL_LIBS@
+ GSTREAMER_CFLAGS = @GSTREAMER_CFLAGS@
+@@ -341,6 +349,8 @@ TCL_LIBS = @TCL_LIBS@
  TK_LIBS = @TK_LIBS@
  USE_GCONFTOOL_FALSE = @USE_GCONFTOOL_FALSE@
  USE_GCONFTOOL_TRUE = @USE_GCONFTOOL_TRUE@
@@ -41,7 +41,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
  USE_GNUTLS_FALSE = @USE_GNUTLS_FALSE@
  USE_GNUTLS_TRUE = @USE_GNUTLS_TRUE@
  USE_INTERNAL_LIBGADU_FALSE = @USE_INTERNAL_LIBGADU_FALSE@
-@@ -434,17 +444,21 @@ EXTRA_DIST = \
+@@ -429,17 +439,21 @@ EXTRA_DIST = \
 
  plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
  ssl_la_LDFLAGS = -module -avoid-version
@@ -63,7 +63,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
  @PLUGINS_TRUE@ssl_gnutls_la_LIBADD = $(GLIB_LIBS) $(GNUTLS_LIBS)
  @PLUGINS_TRUE@ssl_nss_la_LIBADD = $(GLIB_LIBS) $(NSS_LIBS)
  AM_CPPFLAGS = \
-@@ -518,6 +532,8 @@ clean-pluginLTLIBRARIES:
+@@ -513,6 +527,8 @@ clean-pluginLTLIBRARIES:
   echo "rm -f \"$${dir}/so_locations\""; \
   rm -f "$${dir}/so_locations"; \
  done
@@ -72,7 +72,7 @@ $OpenBSD: patch-libpurple_plugins_ssl_Ma
  ssl-gnutls.la: $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_DEPENDENCIES)
  $(LINK) $(am_ssl_gnutls_la_rpath) $(ssl_gnutls_la_LDFLAGS) $(ssl_gnutls_la_OBJECTS) $(ssl_gnutls_la_LIBADD) $(LIBS)
  ssl-nss.la: $(ssl_nss_la_OBJECTS) $(ssl_nss_la_DEPENDENCIES)
-@@ -532,6 +548,7 @@ distclean-compile:
+@@ -527,6 +543,7 @@ distclean-compile:
  -rm -f *.tab.c
 
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ssl.Plo@am__quote@
Index: patches/patch-libpurple_protocols_gg_Makefile_in
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-libpurple_protocols_gg_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-libpurple_protocols_gg_Makefile_in
--- patches/patch-libpurple_protocols_gg_Makefile_in 12 May 2007 15:19:36 -0000 1.1.1.1
+++ patches/patch-libpurple_protocols_gg_Makefile_in 28 May 2007 05:58:40 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-libpurple_protocols_gg_Makefile_in,v 1.1.1.1 2007/05/12 15:19:36 alek Exp $
---- libpurple/protocols/gg/Makefile.in.orig Fri May  4 07:24:29 2007
-+++ libpurple/protocols/gg/Makefile.in Fri May  4 21:11:16 2007
-@@ -504,7 +504,7 @@ libgg_la_LDFLAGS = -module -avoid-version
+--- libpurple/protocols/gg/Makefile.in.orig Fri May 25 12:29:22 2007
++++ libpurple/protocols/gg/Makefile.in Mon May 28 01:57:22 2007
+@@ -499,7 +499,7 @@ libgg_la_LDFLAGS = -module -avoid-version
  @STATIC_GG_TRUE@libgg_a_CFLAGS = $(AM_CFLAGS)
  @STATIC_GG_TRUE@libgg_a_LIBADD = $(GADU_LIBS)
  @STATIC_GG_FALSE@libgg_la_SOURCES = $(GGSOURCES)
Index: patches/patch-libpurple_protocols_oscar_Makefile_in
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-libpurple_protocols_oscar_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-libpurple_protocols_oscar_Makefile_in
--- patches/patch-libpurple_protocols_oscar_Makefile_in 12 May 2007 15:19:36 -0000 1.1.1.1
+++ patches/patch-libpurple_protocols_oscar_Makefile_in 28 May 2007 05:58:40 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-libpurple_protocols_oscar_Makefile_in,v 1.1.1.1 2007/05/12 15:19:36 alek Exp $
---- libpurple/protocols/oscar/Makefile.in.orig Fri May  4 07:24:31 2007
-+++ libpurple/protocols/oscar/Makefile.in Fri May  4 21:11:16 2007
-@@ -564,9 +564,9 @@ libicq_la_LDFLAGS = -module -avoid-version
+--- libpurple/protocols/oscar/Makefile.in.orig Fri May 25 12:29:24 2007
++++ libpurple/protocols/oscar/Makefile.in Mon May 28 01:57:22 2007
+@@ -559,9 +559,9 @@ libicq_la_LDFLAGS = -module -avoid-version
  @STATIC_OSCAR_FALSE@liboscar_la_SOURCES = $(OSCARSOURCES)
  @STATIC_OSCAR_FALSE@liboscar_la_LIBADD = $(GLIB_LIBS)
  @STATIC_OSCAR_FALSE@libaim_la_SOURCES = libaim.c
Index: patches/patch-libpurple_prpl_c
===================================================================
RCS file: patches/patch-libpurple_prpl_c
diff -N patches/patch-libpurple_prpl_c
--- patches/patch-libpurple_prpl_c 16 May 2007 13:08:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,89 +0,0 @@
-$OpenBSD: patch-libpurple_prpl_c,v 1.1 2007/05/16 13:08:16 steven Exp $
---- libpurple/prpl.c.orig Mon Mar 19 07:15:49 2007
-+++ libpurple/prpl.c Tue May 15 19:16:42 2007
-@@ -128,7 +128,7 @@ void
- purple_prpl_got_user_status(PurpleAccount *account, const char *name,
- const char *status_id, ...)
- {
-- GSList *list;
-+ GSList *list, *l;
- PurpleBuddy *buddy;
- PurplePresence *presence;
- PurpleStatus *status;
-@@ -140,24 +140,30 @@ purple_prpl_got_user_status(PurpleAccount *account, co
- g_return_if_fail(status_id != NULL);
- g_return_if_fail(purple_account_is_connected(account) || purple_account_is_connecting(account));
-
-- if ((buddy = purple_find_buddy(account, name)) == NULL)
-+ if((list = purple_find_buddies(account, name)) == NULL)
- return;
-
-- presence = purple_buddy_get_presence(buddy);
-- status   = purple_presence_get_status(presence, status_id);
-+ for(l = list; l != NULL; l = l->next) {
-+ buddy = l->data;
-
-- g_return_if_fail(status != NULL);
-+ presence = purple_buddy_get_presence(buddy);
-+ status   = purple_presence_get_status(presence, status_id);
-
-- old_status = purple_presence_get_active_status(presence);
-+ if(NULL == status)
-+ continue;
-
-- va_start(args, status_id);
-- purple_status_set_active_with_attrs(status, TRUE, args);
-- va_end(args);
-+ old_status = purple_presence_get_active_status(presence);
-
-- list = purple_find_buddies(account, name);
-- g_slist_foreach(list, (GFunc)purple_blist_update_buddy_status, old_status);
-+ va_start(args, status_id);
-+ purple_status_set_active_with_attrs(status, TRUE, args);
-+ va_end(args);
-+
-+ purple_blist_update_buddy_status(buddy, old_status);
-+ }
-+
- g_slist_free(list);
-
-+ /* we get to re-use the last status we found */
- if (!purple_status_is_online(status))
- serv_got_typing_stopped(purple_account_get_connection(account), name);
- }
-@@ -165,6 +171,7 @@ purple_prpl_got_user_status(PurpleAccount *account, co
- void purple_prpl_got_user_status_deactive(PurpleAccount *account, const char *name,
- const char *status_id)
- {
-+ GSList *list, *l;
- PurpleBuddy *buddy;
- PurplePresence *presence;
- PurpleStatus *status;
-@@ -174,14 +181,22 @@ void purple_prpl_got_user_status_deactive(PurpleAccoun
- g_return_if_fail(status_id != NULL);
- g_return_if_fail(purple_account_is_connected(account) || purple_account_is_connecting(account));
-
-- if ((buddy = purple_find_buddy(account, name)) == NULL)
-+ if((list = purple_find_buddies(account, name)) == NULL)
- return;
-
-- presence = purple_buddy_get_presence(buddy);
-- status   = purple_presence_get_status(presence, status_id);
-+ for(l = list; l != NULL; l = l->next) {
-+ buddy = l->data;
-
-- g_return_if_fail(status != NULL);
-- purple_status_set_active(status, FALSE);
-+ presence = purple_buddy_get_presence(buddy);
-+ status   = purple_presence_get_status(presence, status_id);
-+
-+ if(NULL == status)
-+ continue;
-+
-+ purple_status_set_active(status, FALSE);
-+ }
-+
-+ g_slist_free(list);
- }
-
- static void
Index: patches/patch-libpurple_status_c
===================================================================
RCS file: patches/patch-libpurple_status_c
diff -N patches/patch-libpurple_status_c
--- patches/patch-libpurple_status_c 16 May 2007 13:08:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,125 +0,0 @@
-$OpenBSD: patch-libpurple_status_c,v 1.1 2007/05/16 13:08:16 steven Exp $
---- libpurple/status.c.orig Thu May  3 20:14:10 2007
-+++ libpurple/status.c Tue May 15 19:16:42 2007
-@@ -134,8 +134,6 @@ static int primitive_scores[] =
- 10      /* Offline messageable      */
- };
-
--static GHashTable *buddy_presences = NULL;
--
- #define SCORE_IDLE      8
- #define SCORE_IDLE_TIME 9
- #define SCORE_OFFLINE_MESSAGE 10
-@@ -1118,32 +1116,17 @@ PurplePresence *
- purple_presence_new_for_buddy(PurpleBuddy *buddy)
- {
- PurplePresence *presence;
-- PurpleStatusBuddyKey *key;
- PurpleAccount *account;
-
- g_return_val_if_fail(buddy != NULL, NULL);
- account = buddy->account;
-
-- key = g_new0(PurpleStatusBuddyKey, 1);
-- key->account = buddy->account;
-- key->name    = g_strdup(buddy->name);
-+ presence = purple_presence_new(PURPLE_PRESENCE_CONTEXT_BUDDY);
-
-- presence = g_hash_table_lookup(buddy_presences, key);
-- if (presence == NULL)
-- {
-- presence = purple_presence_new(PURPLE_PRESENCE_CONTEXT_BUDDY);
-+ presence->u.buddy.name    = g_strdup(buddy->name);
-+ presence->u.buddy.account = buddy->account;
-+ presence->statuses = purple_prpl_get_statuses(buddy->account, presence);
-
-- presence->u.buddy.name    = g_strdup(buddy->name);
-- presence->u.buddy.account = buddy->account;
-- presence->statuses = purple_prpl_get_statuses(buddy->account, presence);
--
-- g_hash_table_insert(buddy_presences, key, presence);
-- }
-- else
-- {
-- g_free(key->name);
-- g_free(key);
-- }
- presence->u.buddy.buddy = buddy;
-
- return presence;
-@@ -1156,13 +1139,6 @@ purple_presence_destroy(PurplePresence *presence)
-
- if (purple_presence_get_context(presence) == PURPLE_PRESENCE_CONTEXT_BUDDY)
- {
-- PurpleStatusBuddyKey key;
--
-- key.account = presence->u.buddy.account;
-- key.name    = presence->u.buddy.name;
--
-- g_hash_table_remove(buddy_presences, &key);
--
- g_free(presence->u.buddy.name);
- }
- else if (purple_presence_get_context(presence) == PURPLE_PRESENCE_CONTEXT_CONV)
-@@ -1639,41 +1615,6 @@ score_pref_changed_cb(const char *name, PurplePrefType
- primitive_scores[index] = GPOINTER_TO_INT(value);
- }
-
--static guint
--purple_buddy_presences_hash(gconstpointer key)
--{
-- const PurpleStatusBuddyKey *me = key;
-- guint ret;
-- char *str;
--
-- str = g_strdup_printf("%p%s", me->account, me->name);
-- ret = g_str_hash(str);
-- g_free(str);
--
-- return ret;
--}
--
--static gboolean
--purple_buddy_presences_equal(gconstpointer a, gconstpointer b)
--{
-- PurpleStatusBuddyKey *key_a = (PurpleStatusBuddyKey *)a;
-- PurpleStatusBuddyKey *key_b = (PurpleStatusBuddyKey *)b;
--
-- if(key_a->account == key_b->account &&
-- !strcmp(key_a->name, key_b->name))
-- return TRUE;
-- else
-- return FALSE;
--}
--
--static void
--purple_buddy_presences_key_free(gpointer a)
--{
-- PurpleStatusBuddyKey *key = (PurpleStatusBuddyKey *)a;
-- g_free(key->name);
-- g_free(key);
--}
--
- void *
- purple_status_get_handle(void) {
- static int handle;
-@@ -1725,19 +1666,9 @@ purple_status_init(void)
- purple_prefs_connect_callback(handle, "/purple/status/scores/offline_msg",
- score_pref_changed_cb,
- GINT_TO_POINTER(SCORE_OFFLINE_MESSAGE));
--
-- buddy_presences = g_hash_table_new_full(purple_buddy_presences_hash,
-- purple_buddy_presences_equal,
-- purple_buddy_presences_key_free, NULL);
- }
-
- void
- purple_status_uninit(void)
- {
-- if (buddy_presences != NULL)
-- {
-- g_hash_table_destroy(buddy_presences);
--
-- buddy_presences = NULL;
-- }
- }
Index: patches/patch-pidgin_gtkdialogs_c
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-pidgin_gtkdialogs_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-pidgin_gtkdialogs_c
--- patches/patch-pidgin_gtkdialogs_c 12 May 2007 15:19:36 -0000 1.1.1.1
+++ patches/patch-pidgin_gtkdialogs_c 28 May 2007 05:58:40 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-pidgin_gtkdialogs_c,v 1.1.1.1 2007/05/12 15:19:36 alek Exp $
---- pidgin/gtkdialogs.c.orig Mon Apr 30 03:26:53 2007
-+++ pidgin/gtkdialogs.c Tue May  1 23:11:28 2007
-@@ -558,6 +558,12 @@ g_string_append(str, "<br/>  <b>Library Support</b><br
+--- pidgin/gtkdialogs.c.orig Fri May 25 12:28:22 2007
++++ pidgin/gtkdialogs.c Mon May 28 01:57:23 2007
+@@ -560,6 +560,12 @@ g_string_append(str, "<br/>  <b>Library Support</b><br
  g_string_append(str, "    <b>GtkSpell:</b> Disabled<br/>");
  #endif
 
Index: patches/patch-pidgin_gtknotify_c
===================================================================
RCS file: /cvs/ports/net/pidgin/patches/patch-pidgin_gtknotify_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-pidgin_gtknotify_c
--- patches/patch-pidgin_gtknotify_c 12 May 2007 15:19:36 -0000 1.1.1.1
+++ patches/patch-pidgin_gtknotify_c 28 May 2007 05:58:41 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-pidgin_gtknotify_c,v 1.1.1.1 2007/05/12 15:19:36 alek Exp $
---- pidgin/gtknotify.c.orig Mon Apr 30 05:14:26 2007
-+++ pidgin/gtknotify.c Tue May  1 23:11:28 2007
-@@ -925,7 +925,16 @@ uri_command(const char *command, gboolean sync)
+--- pidgin/gtknotify.c.orig Fri May 25 12:28:22 2007
++++ pidgin/gtknotify.c Mon May 28 01:57:23 2007
+@@ -967,7 +967,16 @@ uri_command(const char *command, gboolean sync)
  g_error_free(error);
  }
  else
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/pidgin/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 12 May 2007 15:19:36 -0000 1.1.1.1
+++ pkg/PLIST 28 May 2007 05:19:59 -0000
@@ -344,6 +344,7 @@ share/locale/xh/LC_MESSAGES/pidgin.mo
 share/locale/zh_CN/LC_MESSAGES/pidgin.mo
 share/locale/zh_HK/LC_MESSAGES/pidgin.mo
 share/locale/zh_TW/LC_MESSAGES/pidgin.mo
+@comment share/nls/pl_PL.ISO_8859-2/
 share/pixmaps/
 share/pixmaps/pidgin/
 share/pixmaps/pidgin/animations/
@@ -362,6 +363,7 @@ share/pixmaps/pidgin/animations/16/typin
 share/pixmaps/pidgin/animations/16/typing2.png
 share/pixmaps/pidgin/animations/16/typing3.png
 share/pixmaps/pidgin/animations/16/typing4.png
+share/pixmaps/pidgin/animations/16/typing5.png
 share/pixmaps/pidgin/arrow-down.xpm
 share/pixmaps/pidgin/arrow-left.xpm
 share/pixmaps/pidgin/arrow-right.xpm
@@ -589,6 +591,7 @@ share/pixmaps/pidgin/protocols/16/
 share/pixmaps/pidgin/protocols/16/aim.png
 share/pixmaps/pidgin/protocols/16/bonjour.png
 share/pixmaps/pidgin/protocols/16/gadu-gadu.png
+share/pixmaps/pidgin/protocols/16/google-talk.png
 share/pixmaps/pidgin/protocols/16/icq.png
 share/pixmaps/pidgin/protocols/16/irc.png
 share/pixmaps/pidgin/protocols/16/jabber.png
@@ -604,6 +607,7 @@ share/pixmaps/pidgin/protocols/22/
 share/pixmaps/pidgin/protocols/22/aim.png
 share/pixmaps/pidgin/protocols/22/bonjour.png
 share/pixmaps/pidgin/protocols/22/gadu-gadu.png
+share/pixmaps/pidgin/protocols/22/google-talk.png
 share/pixmaps/pidgin/protocols/22/icq.png
 share/pixmaps/pidgin/protocols/22/irc.png
 share/pixmaps/pidgin/protocols/22/jabber.png