This commit was manufactured by cvs2svn to create tag 'RELEASE_5_4_0'.release/5.4.0

6 files changed, 0 insertions, 166 deletions

diff --git a/net-im/gaim-openq/files/patch-intl_Makefile.in b/net-im/gaim-openq/files/patch-intl_Makefile.in
deleted file mode 100644
index ab29275951a6..000000000000
--- a/net-im/gaim-openq/files/patch-intl_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- intl/Makefile.in.orig	Tue Oct 12 22:43:15 2004
-+++ intl/Makefile.in	Tue Oct 12 22:44:57 2004
-@@ -40,7 +40,7 @@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- MKINSTALLDIRS = @MKINSTALLDIRS@
--mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
- l = @INTL_LIBTOOL_SUFFIX_PREFIX@
- 
diff --git a/net-im/gaim-openq/files/patch-src-group_admindlg.c b/net-im/gaim-openq/files/patch-src-group_admindlg.c
deleted file mode 100644
index 2198661f962b..000000000000
--- a/net-im/gaim-openq/files/patch-src-group_admindlg.c
+++ /dev/null
@@ -1,65 +0,0 @@
---- src/group_admindlg.c.orig	Sat Oct  2 17:48:11 2004
-+++ src/group_admindlg.c	Sat Oct 16 17:44:20 2004
-@@ -133,6 +133,17 @@
- 	GaimConnection *gc;
- 	qun_info_window *info_window;
- 
-+	gint page, group_category, i = 0;
-+	qq_group *group;
-+	qq_data *qd;
-+	GtkTextIter start, end;
-+	GtkTreeModel *model;
-+	GtkTreeIter iter;
-+	GValue value = { 0, };
-+	guint32 *new_members;
-+	guint32 uid;
-+	gboolean selected;
-+
- 	g_return_if_fail(data != NULL);
- 	info_window = (qun_info_window *) data;
- 
-@@ -145,17 +156,6 @@
- //                        _("This version of GTK-2 does not support this function"), NULL);
- //        return;
- //#else
--	gint page, group_category, i = 0;
--	qq_group *group;
--	qq_data *qd;
--	GtkTextIter start, end;
--	GtkTreeModel *model;
--	GtkTreeIter iter;
--	GValue value = { 0, };
--	guint32 *new_members;
--	guint32 uid;
--	gboolean selected;
--
- 	qd = (qq_data *) gc->proto_data;
- 
- 	// we assume the modification can succeed
-@@ -253,6 +253,12 @@
- 	GaimConnection *gc;
- 	qq_group *group;
- 
-+	GtkTreeModel *model;
-+	GtkTreeIter iter;
-+	GtkTreePath *path;
-+	gboolean selected;
-+	guint32 uid;
-+
- 	info_window = (qun_info_window *) data;
- 	g_return_if_fail(info_window != NULL);
- 
-@@ -262,11 +268,8 @@
- 	group = qq_group_find_by_internal_group_id(gc, info_window->internal_group_id);
- 	g_return_if_fail(group != NULL);
- 
--	GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(info_window->tre_members));
--	GtkTreeIter iter;
--	GtkTreePath *path = gtk_tree_path_new_from_string(path_str);
--	gboolean selected;
--	guint32 uid;
-+	model = gtk_tree_view_get_model(GTK_TREE_VIEW(info_window->tre_members));
-+	path = gtk_tree_path_new_from_string(path_str);
- 
- 	gtk_tree_model_get_iter(model, &iter, path);
- 	gtk_tree_model_get(model, &iter, COLUMN_SELECTED, &selected, -1);
diff --git a/net-im/gaim-openq/files/patch-src-group_im.c b/net-im/gaim-openq/files/patch-src-group_im.c
deleted file mode 100644
index 6e09b247dc6d..000000000000
--- a/net-im/gaim-openq/files/patch-src-group_im.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/group_im.c.orig	Sat Oct  2 17:48:11 2004
-+++ src/group_im.c	Sat Oct 16 17:59:51 2004
-@@ -59,6 +59,7 @@
- 	guint8 *raw_data, *cursor;
- 	guint16 msg_len;
- 	gchar *msg_filtered;
-+	guint8 *send_im_tail;
- 
- 	g_return_if_fail(gc != NULL && group != NULL && msg != NULL);
- 
-@@ -73,7 +74,7 @@
- 	bytes += create_packet_dw(raw_data, &cursor, group->internal_group_id);
- 	bytes += create_packet_w(raw_data, &cursor, msg_len + QQ_SEND_IM_AFTER_MSG_LEN);
- 	bytes += create_packet_data(raw_data, &cursor, (gchar *) msg_filtered, msg_len);
--	guint8 *send_im_tail = qq_get_send_im_tail(NULL, NULL, NULL,
-+	send_im_tail = qq_get_send_im_tail(NULL, NULL, NULL,
- 						   FALSE, FALSE, FALSE,
- 						   QQ_SEND_IM_AFTER_MSG_LEN);
- 	bytes += create_packet_data(raw_data, &cursor, (gchar *) send_im_tail, QQ_SEND_IM_AFTER_MSG_LEN);
diff --git a/net-im/gaim-openq/files/patch-src-im.c b/net-im/gaim-openq/files/patch-src-im.c
deleted file mode 100644
index 3855b2a6475a..000000000000
--- a/net-im/gaim-openq/files/patch-src-im.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/im.c.orig	Sat Oct  2 17:48:11 2004
-+++ src/im.c	Sat Oct 16 18:06:57 2004
-@@ -435,6 +435,8 @@
- 	gchar *font_size = NULL, *font_color = NULL, *font_name = NULL, *tmp;
- 	gboolean is_bold = FALSE, is_italic = FALSE, is_underline = FALSE;
- 	const gchar *start, *end, *last;
-+	guint font_name_len, tail_len;
-+	guint8 *send_im_tail;
- 
- 	g_return_if_fail(gc != NULL && gc->proto_data != NULL);
- 
-@@ -488,7 +490,6 @@
- 	now = time(NULL);
- 	md5 = _gen_session_md5(qd->uid, qd->session_key);
- 
--	guint font_name_len, tail_len;
- 	font_name_len = (font_name) ? strlen(font_name) : DEFAULT_FONT_NAME_LEN;
- 	tail_len = font_name_len + QQ_SEND_IM_AFTER_MSG_HEADER_LEN + 1;
- 
-@@ -530,7 +531,7 @@
- 	bytes += create_packet_b(raw_data, &cursor, type);
- 	//053-   : msg ends with 0x00
- 	bytes += create_packet_data(raw_data, &cursor, msg_filtered, msg_len);
--	guint8 *send_im_tail = qq_get_send_im_tail(font_color, font_size, font_name, is_bold,
-+	send_im_tail = qq_get_send_im_tail(font_color, font_size, font_name, is_bold,
- 						   is_italic, is_underline, tail_len);
- 	_qq_show_packet("QQ_MESG debug", send_im_tail, tail_len);
- 	bytes += create_packet_data(raw_data, &cursor, (gchar *) send_im_tail, tail_len);
diff --git a/net-im/gaim-openq/files/patch-src-recv_core.c b/net-im/gaim-openq/files/patch-src-recv_core.c
deleted file mode 100644
index 4a61450e90df..000000000000
--- a/net-im/gaim-openq/files/patch-src-recv_core.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/recv_core.c.orig	Sat Oct  2 17:48:12 2004
-+++ src/recv_core.c	Sat Oct 16 18:17:35 2004
-@@ -290,7 +290,7 @@
- void qq_input_pending(gpointer data, gint source, GaimInputCondition cond)
- {
- 	GaimConnection *gc;
--	qq_data *qd;;
-+	qq_data *qd;
- 	guint8 *buf;
- 	gint len;
- 
diff --git a/net-im/gaim-openq/files/patch-src-udp_proxy_s5.c b/net-im/gaim-openq/files/patch-src-udp_proxy_s5.c
deleted file mode 100644
index af25e25f2301..000000000000
--- a/net-im/gaim-openq/files/patch-src-udp_proxy_s5.c
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/udp_proxy_s5.c.orig	Sat Oct  2 17:48:12 2004
-+++ src/udp_proxy_s5.c	Sat Oct 16 18:35:59 2004
-@@ -37,6 +37,7 @@
- 	struct PHB *phb = data;
- 	struct sockaddr_in sin;
- 	int len;
-+	int error = ETIMEDOUT;
- 
- 	gaim_input_remove(phb->inpa);
- 	gaim_debug(GAIM_DEBUG_INFO, "socks5 proxy", "Able to read again.\n");
-@@ -85,7 +86,6 @@
- 		return;
- 	}
- 
--	int error = ETIMEDOUT;
- 	gaim_debug(GAIM_DEBUG_INFO, "QQ", "Connect didn't block\n");
- 	len = sizeof(error);
- 	if (getsockopt(phb->udpsock, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
-@@ -216,11 +216,12 @@
- {
- 	unsigned char buf[512];
- 	struct PHB *phb = data;
-+	int ret;
- 
- 	gaim_input_remove(phb->inpa);
- 	gaim_debug(GAIM_DEBUG_INFO, "socks5 proxy", "Able to read.\n");
- 
--	int ret = read(source, buf, 2);
-+	ret = read(source, buf, 2);
- 	if (ret < 2) {
- 		gaim_debug(GAIM_DEBUG_INFO, "s5_canread", "packet smaller than 2 octet\n");
- 		close(source);