Changes 2.2.9:

* Bug fixes

9 files changed, 10 insertions, 146 deletions

diff --git a/chat/gg2/Makefile b/chat/gg2/Makefile
index 07aaade0fa7..fbc8eac4066 100644
--- a/chat/gg2/Makefile
+++ b/chat/gg2/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2006/07/05 05:37:39 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/07/31 09:06:54 adam Exp $
 
-DISTNAME=	gg2-2.2.8
-PKGREVISION=	5
+DISTNAME=	gg2-2.2.9
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ggadu/}
-EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://ggadu.sourceforge.net/
diff --git a/chat/gg2/distinfo b/chat/gg2/distinfo
index 3850db5ad68..4d5c4842742 100644
--- a/chat/gg2/distinfo
+++ b/chat/gg2/distinfo
@@ -1,13 +1,7 @@
-$NetBSD: distinfo,v 1.13 2005/12/18 19:57:24 rillig Exp $
+$NetBSD: distinfo,v 1.14 2006/07/31 09:06:54 adam Exp $
 
-SHA1 (gg2-2.2.8.tar.bz2) = 80d05766be8db8fe11f561c49b283c39f06f01e9
-RMD160 (gg2-2.2.8.tar.bz2) = de32cd6faf3441218aac8add66497fd60d7ab21a
-Size (gg2-2.2.8.tar.bz2) = 1091976 bytes
-SHA1 (patch-aa) = cf6fa7e1bf79dcaf90a10c4bc20b715cca67142e
+SHA1 (gg2-2.2.9.tar.gz) = 7680fbf5d32f2a69e1582642fd6383de0bf1d026
+RMD160 (gg2-2.2.9.tar.gz) = 5495a263aedc37eab90dc4467cd90082db2e6969
+Size (gg2-2.2.9.tar.gz) = 1408525 bytes
+SHA1 (patch-aa) = ccb9aa872c0b58cfab83c3de8fa44b1bc82453f5
 SHA1 (patch-af) = 9e1cc4b53f069e520a165bfed00c8b6692216ce9
-SHA1 (patch-ag) = 9405ef6717919408345c97f09171db9316002b1a
-SHA1 (patch-ah) = bafa1c5f250cbc9a70984a93b7d0214506a375af
-SHA1 (patch-ai) = 39cd62d72007ba875dcb09156d53ab8852328eec
-SHA1 (patch-aj) = 9c3c06016793aadd862bea74f47bad712005a50c
-SHA1 (patch-ak) = 2283ca2ddfbd952a58741a1d021918337135e3b8
-SHA1 (patch-al) = 68d1920fd7b45b578db1cc6249e4aafd9a3cdd7a
diff --git a/chat/gg2/patches/patch-aa b/chat/gg2/patches/patch-aa
index 5e1d4605703..8cc23993ad6 100644
--- a/chat/gg2/patches/patch-aa
+++ b/chat/gg2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2005/05/27 13:47:05 adam Exp $
+$NetBSD: patch-aa,v 1.7 2006/07/31 09:06:54 adam Exp $
 
---- lib/Makefile.in.orig	2005-05-26 14:40:37.000000000 +0000
+--- lib/Makefile.in.orig	2006-07-21 23:48:54.000000000 +0200
 +++ lib/Makefile.in
-@@ -340,7 +340,7 @@ libgg2_core_la_SOURCES = \
+@@ -341,7 +341,7 @@ libgg2_core_la_SOURCES = \
  	perl_embed.h 
  
  libgg2_core_la_HEADERS = gg2_core.h
diff --git a/chat/gg2/patches/patch-ag b/chat/gg2/patches/patch-ag
deleted file mode 100644
index 24bdb1bcaad..00000000000
--- a/chat/gg2/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.4 2005/09/07 12:41:12 adam Exp $
-
---- src/plugins/jabber/jabber_plugin.c.orig	2005-08-12 08:21:27.000000000 +0000
-+++ src/plugins/jabber/jabber_plugin.c
-@@ -1503,9 +1503,10 @@ void start_plugin()
- 
- 	if (ggadu_config_var_get(jabber_handler, "autoconnect"))
- 	{
-+		GGaduStatusPrototype *sp;
- 		gint auto_status = (gint) ggadu_config_var_get(jabber_handler, "auto_status");
- 		print_debug("jabber: autoconneting");
--		GGaduStatusPrototype *sp = ggadu_find_status_prototype(p, auto_status ? auto_status : JABBER_STATUS_AVAILABLE);
-+		sp = ggadu_find_status_prototype(p, auto_status ? auto_status : JABBER_STATUS_AVAILABLE);
- 		jabber_change_status(sp, FALSE);
- 		GGaduStatusPrototype_free(sp);
- 	}
diff --git a/chat/gg2/patches/patch-ah b/chat/gg2/patches/patch-ah
deleted file mode 100644
index 4785fd85a72..00000000000
--- a/chat/gg2/patches/patch-ah
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2005/09/07 12:41:12 adam Exp $
-
---- src/plugins/jabber/jabber_login.c.orig	2005-08-12 08:21:27.000000000 +0000
-+++ src/plugins/jabber/jabber_login.c
-@@ -92,16 +92,16 @@ gpointer jabber_login_connect(gpointer s
- 
- 	if (!jabber_data.connection || !lm_connection_is_open(jabber_data.connection))
- 	{
--		portstr ? print_debug("jabber: Connecting to %s:%s with %s", server, portstr, jid) :
--			print_debug("jabber: Connecting to %s with %s", server, jid);
--		jabber_data.connection = lm_connection_new(server);
--		lm_connection_set_keep_alive_rate(jabber_data.connection,30);
--
- 		/* proxy setting taken from EKG project */
- 		gint jabber_proxy_enabled = 0;
- 		gchar *jabber_proxy_host = NULL;
- 		gint jabber_proxy_port;
- 
-+		portstr ? print_debug("jabber: Connecting to %s:%s with %s", server, portstr, jid) :
-+			print_debug("jabber: Connecting to %s with %s", server, jid);
-+		jabber_data.connection = lm_connection_new(server);
-+		lm_connection_set_keep_alive_rate(jabber_data.connection,30);
-+
- 		if (ggadu_config_var_check(jabber_handler, "proxy"))
- 		{
- 			gchar **auth = array_make((gchar *) ggadu_config_var_get(jabber_handler, "proxy"), "@", 0, 0, 0);
diff --git a/chat/gg2/patches/patch-ai b/chat/gg2/patches/patch-ai
deleted file mode 100644
index ad443bd6cb5..00000000000
--- a/chat/gg2/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2005/04/13 16:31:26 rillig Exp $
-
-Needed for ISO C90 compliance.
-
---- src/plugins/GUI/gui_chat.c.orig	Wed Mar  9 15:02:36 2005
-+++ src/plugins/GUI/gui_chat.c	Tue Apr 12 11:40:12 2005
-@@ -851,6 +851,7 @@ GtkWidget *create_chat(gui_chat_session 
- 	gint percent = 0;
- 	gint number_of_workspaces = 0;
- 	GtkWidget *chat_notebook_paned_size = NULL;
-+	PangoFontDescription *font_desc;
- 
- 	if (!session || !plugin_name || !id)
- 		return NULL;
-@@ -1117,7 +1118,6 @@ GtkWidget *create_chat(gui_chat_session 
- 
-     /* set font of the message editing text_view */
- 
--    PangoFontDescription *font_desc;
-     fontstr = ggadu_config_var_get(gui_handler, "msg_out_edit_font");
-     font_desc = pango_font_description_from_string (fontstr);
-     gtk_widget_modify_font (input, font_desc);
diff --git a/chat/gg2/patches/patch-aj b/chat/gg2/patches/patch-aj
deleted file mode 100644
index f0462a22d04..00000000000
--- a/chat/gg2/patches/patch-aj
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2005/09/07 12:41:12 adam Exp $
-
---- src/plugins/GUI/gui_preferences.c.orig	2005-08-12 08:21:26.000000000 +0000
-+++ src/plugins/GUI/gui_preferences.c
-@@ -1329,6 +1329,7 @@ void gui_preferences(GtkWidget * widget,
- 	{
- 		GSList *combo_theme_slist;
- 		GSList *combo_icons_slist;
-+		GSList *combo_skins_slist;
- 		if (plugins_updated)
- 		{
- 			GIOChannel *ch = g_io_channel_new_file(g_build_filename(config->configdir, "modules.load", NULL), "w",
-@@ -1448,7 +1449,7 @@ void gui_preferences(GtkWidget * widget,
- 		entry = g_object_get_data(G_OBJECT(adv_vbox), "combo_skins");
- 		g_return_if_fail(entry != NULL);
- 
--		GSList *combo_skins_slist = g_object_get_data(G_OBJECT(entry), "combo_skins_slist");
-+		combo_skins_slist = g_object_get_data(G_OBJECT(entry), "combo_skins_slist");
- 
- 		if (gtk_combo_box_get_active(GTK_COMBO_BOX(entry))) {
- 		    ggadu_config_var_set(gui_handler, "skin", (gpointer) g_strdup(g_slist_nth_data(combo_skins_slist, gtk_combo_box_get_active(GTK_COMBO_BOX(entry)))));
diff --git a/chat/gg2/patches/patch-ak b/chat/gg2/patches/patch-ak
deleted file mode 100644
index fafec4ab104..00000000000
--- a/chat/gg2/patches/patch-ak
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2005/06/14 04:49:19 rillig Exp $
-
-Needed for ISO C90 compilers.
-
---- src/plugins/aaway/aaway.c.orig	Tue Jun 14 06:42:58 2005
-+++ src/plugins/aaway/aaway.c	Tue Jun 14 06:42:40 2005
-@@ -250,8 +250,8 @@ static void my_signal_receive(gpointer n
- static gpointer aaway_preferences(gpointer user_data)
- {
- 	GGaduDialog *d = ggadu_dialog_new(GGADU_DIALOG_CONFIG, _("Auto-Away Preferences"), "update config");
--	print_debug("%s: Preferences\n", "aaway");
- 	gchar *utf = NULL;
-+	print_debug("%s: Preferences\n", "aaway");
- 	ggadu_dialog_add_entry(d, GGADU_AAWAY_CONFIG_ENABLE_AUTOAWAY, _("Enable auto-away"), VAR_BOOL, (gpointer) ggadu_config_var_get(handler, "enable"), VAR_FLAG_ADVANCED);
- 	ggadu_dialog_add_entry(d, GGADU_AAWAY_CONFIG_INTERVAL, _("Auto away after time (minutes)"), VAR_INT, (gpointer) ggadu_config_var_get(handler, "interval"), VAR_FLAG_NONE);
- 	ggadu_dialog_add_entry(d, GGADU_AAWAY_CONFIG_ENABLE_AWAY_MSG, _("Enable away message"), VAR_BOOL,
diff --git a/chat/gg2/patches/patch-al b/chat/gg2/patches/patch-al
deleted file mode 100644
index 4b7f0153f8d..00000000000
--- a/chat/gg2/patches/patch-al
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-al,v 1.1 2005/12/18 19:57:24 rillig Exp $
-
-Keywords: c90
-
---- src/plugins/GUI/gui_userview.c.orig	Fri Aug 12 10:21:26 2005
-+++ src/plugins/GUI/gui_userview.c	Sun Dec 18 20:44:51 2005
-@@ -102,6 +102,7 @@ static void on_text_data(GtkTreeViewColu
- 		    gchar *descr = g_strdup(k->status_descr);
- 		    gchar *tmp0 = NULL;
- 		    gchar *tmp1 = NULL;
-+		    gchar *markup_descr, *markup;
- 		    
- 		    if(ggadu_config_var_get(gui_handler, "wrap_descr"))
- 		    {
-@@ -165,10 +166,10 @@ static void on_text_data(GtkTreeViewColu
- 		        }
- 		    } 
- 
--		    gchar *markup_descr = ggadu_config_var_get(gui_handler, "wrap_descr") ?
-+		    markup_descr = ggadu_config_var_get(gui_handler, "wrap_descr") ?
- 		                          g_markup_escape_text(descr, strlen(descr)) :
- 			                  g_markup_escape_text(k->status_descr, strlen(k->status_descr));
--		    gchar *markup = g_strdup_printf("%s\n<small>%s</small>", k->nick, markup_descr);
-+		    markup = g_strdup_printf("%s\n<small>%s</small>", k->nick, markup_descr);
- 		    g_object_set(G_OBJECT(renderer), "text", NULL, "markup", markup, NULL);
- 		    g_free(markup_descr);
- 		    g_free(markup);