Pidgin

Update of /cvsroot/gaim/gaim/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29701/doc

Modified Files:
	gaims_funniest_home_convos.txt 
Log Message:
la la la

Index: gaims_funniest_home_convos.txt
===================================================================
RCS file: /cvsroot/gaim/gaim/doc/gaims_funniest_home_convos.txt,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -p -r1.13 -r1.14
--- gaims_funniest_home_convos.txt	1 May 2004 01:31:32 -0000	1.13
+++ gaims_funniest_home_convos.txt	1 May 2004 02:09:46 -0000	1.14
@@ -261,13 +261,15 @@ considered ambiguous.  Why use a large w
 23:40 <SeanEgan> LSchiere, you can try the spelling again, too ;)
 23:40 <@LSchiere> SeanEgan: you know by now that i'm incorigible
 
+---
+
 (20:53:30) idiot1: im havn problems with my sound in gaim can any1 help me
 (20:54:59) LSchiere2: have you read the faq?
 (21:03:35) idiot1: no and im not reading it
 (21:03:45) idiot1: cuz it wont help anyways
 (21:03:47) LSchiere2: then you will have no help
 (21:03:54) LSchiere2: because i wrote it and i know it would help
-(21:04:27) LSchiere2: since you already know everything though, you obviously don't need any help teddien
+(21:04:27) LSchiere2: since you already know everything though, you obviously don't need any help idiot1
 (21:05:38) idiot1: nope
 (21:05:42) idiot1: opps

Update of /cvsroot/gaim/gaim/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24076/doc

Modified Files:
	gaims_funniest_home_convos.txt 
Log Message:
(21:21:08) LSchiere2: i'm tempted to put the top few lines with teddien in the gaim funniest home conversations (up through the "oops")
(21:27:42) Paco-Paco: =do it
(21:27:57) Paco-Paco: don't ask me why that = is there
(21:28:00) Paco-Paco: because I DON'T KNOW
(21:28:17) LSchiere2: lol


Index: gaims_funniest_home_convos.txt
===================================================================
RCS file: /cvsroot/gaim/gaim/doc/gaims_funniest_home_convos.txt,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -p -r1.12 -r1.13
--- gaims_funniest_home_convos.txt	5 Apr 2004 04:30:44 -0000	1.12
+++ gaims_funniest_home_convos.txt	1 May 2004 01:31:32 -0000	1.13
@@ -1,4 +1,4 @@
-All IM names have been changed, so I don't get sued or nothing.  I get some 
+All IM names have been changed, so we don't get sued or nothing.  We get some 
 interesting convos....
 
 17:58:27 Luser: You do any GTK programming?
@@ -260,3 +260,14 @@ considered ambiguous.  Why use a large w
 23:39 <@LSchiere> try the grammer again
 23:40 <SeanEgan> LSchiere, you can try the spelling again, too ;)
 23:40 <@LSchiere> SeanEgan: you know by now that i'm incorigible
+
+(20:53:30) idiot1: im havn problems with my sound in gaim can any1 help me
+(20:54:59) LSchiere2: have you read the faq?
+(21:03:35) idiot1: no and im not reading it
+(21:03:45) idiot1: cuz it wont help anyways
+(21:03:47) LSchiere2: then you will have no help
+(21:03:54) LSchiere2: because i wrote it and i know it would help
+(21:04:27) LSchiere2: since you already know everything though, you obviously don't need any help teddien
+(21:05:38) idiot1: nope
+(21:05:42) idiot1: opps
+

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8756/src

Modified Files:
	gtkblist.c 
Log Message:
Rename Protocol Actions to Account Actions for real.

Also, somebody please come up with a better name for this.

I feel like I'm living in a castle.  A castle without
tapestries.  I might as well be an aluminum can.


Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -p -r1.99 -r1.100
--- gtkblist.c	30 Apr 2004 04:23:38 -0000	1.99
+++ gtkblist.c	30 Apr 2004 04:30:29 -0000	1.100
@@ -2327,7 +2327,7 @@ static GtkItemFactoryEntry blist_menu[] 
 	{ N_("/_Tools"), NULL, NULL, 0, "<Branch>" },
 	{ N_("/Tools/_Away"), NULL, NULL, 0, "<Branch>" },
 	{ N_("/Tools/Buddy _Pounce"), NULL, NULL, 0, "<Branch>" },
-	{ N_("/Tools/P_rotocol Actions"), NULL, NULL, 0, "<Branch>" },
+	{ N_("/Tools/Account Ac_tions"), NULL, NULL, 0, "<Branch>" },
 	{ "/Tools/sep1", NULL, NULL, 0, "<Separator>" },
 	{ N_("/Tools/A_ccounts"), "<CTL>A", gaim_gtk_accounts_window_show, 0, "<StockItem>", GAIM_STOCK_ACCOUNTS },
 	{ N_("/Tools/_File Transfers"), NULL, gaim_show_xfer_dialog, 0, "<StockItem>", GAIM_STOCK_FILE_TRANSFER },

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7874/src

Modified Files:
	gtkblist.c 
Log Message:
someone (i forget who now) suggested this. i like it.


Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -p -r1.98 -r1.99
--- gtkblist.c	26 Apr 2004 16:58:07 -0000	1.98
+++ gtkblist.c	30 Apr 2004 04:23:38 -0000	1.99
@@ -3028,7 +3028,7 @@ static void gaim_gtk_blist_show(GaimBudd
 	gtkblist->bpmenu = gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Buddy Pounce"));
 	gaim_gtkpounce_menu_build(gtkblist->bpmenu);
 
-	protomenu = gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Protocol Actions"));
+	protomenu = gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Account Actions"));
 	gaim_gtk_blist_update_protocol_actions();
 	/****************************** GtkTreeView **********************************/
 	sw = gtk_scrolled_window_new(NULL,NULL);

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26957/src

Modified Files:
	gtkrequest.c request.c request.h 
Log Message:
Pekka Riikonen has provided us with a nice file selector request API.
This is it.


Index: gtkrequest.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkrequest.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -p -r1.66 -r1.67
--- gtkrequest.c	23 Apr 2004 23:09:55 -0000	1.66
+++ gtkrequest.c	30 Apr 2004 03:00:05 -0000	1.67
@@ -1358,12 +1358,77 @@ gaim_gtk_close_request(GaimRequestType t
 	g_free(data);
 }
 
+static void
+file_ok_cb(GtkWidget *button, GaimGtkRequestData *data)
+{
+	const char *name;
+
+	if (!GTK_WIDGET_HAS_FOCUS(button))
+		gtk_widget_grab_focus(button);
+
+	if (data->cbs[0] != NULL) {
+		name = gtk_file_selection_get_filename(GTK_FILE_SELECTION(data->dialog));
+		if (gaim_gtk_check_if_dir(name, GTK_FILE_SELECTION(data->dialog)))
+			name = NULL;
+
+		((GaimRequestInputCb)data->cbs[0])(data->user_data, name);
+	}
+
+	gaim_request_close(GAIM_REQUEST_INPUT, data);
+}
+
+static void
+file_cancel_cb(GtkWidget *button, GaimGtkRequestData *data)
+{
+	if (data->cbs[1] != NULL)
+		((GaimRequestInputCb)data->cbs[1])(data->user_data, NULL);
+
+	gaim_request_close(GAIM_REQUEST_INPUT, data);
+}
+
+static void *
+gaim_gtk_request_file(const char *title, const char *filename,
+		      GCallback ok_cb, GCallback cancel_cb,
+		      void *user_data)
+{
+	GaimGtkRequestData *data;
+	GtkWidget *filesel;
+	char *cur_dir, *init_str, tmp[512];
+
+	data = g_new0(GaimGtkRequestData, 1);
+	data->type = GAIM_REQUEST_INPUT;
+	data->user_data = user_data;
+	data->cb_count = 2;
+	data->cbs = g_new0(GCallback, 2);
+	data->cbs[0] = ok_cb;
+	data->cbs[1] = cancel_cb;
+
+	filesel = gtk_file_selection_new(title ? title : _(""));
+	cur_dir = g_get_current_dir();
+	g_snprintf(tmp, sizeof(tmp), "%s" G_DIR_SEPARATOR_S, cur_dir);
+	init_str = g_build_filename(tmp, filename, NULL);
+	gtk_file_selection_set_filename(GTK_FILE_SELECTION(filesel), init_str);
+	g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(filesel)),
+			 "delete_event", G_CALLBACK(file_cancel_cb), data);
+	g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(filesel)->cancel_button),
+			 "clicked", G_CALLBACK(file_cancel_cb), data);
+	g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(filesel)->ok_button),
+			 "clicked", G_CALLBACK(file_ok_cb), data);
+	gtk_widget_show(filesel);
+	g_free(cur_dir);
+	g_free(init_str);
+
+	data->dialog = filesel;
+	return (void *)data;
+}
+
 static GaimRequestUiOps ops =
 {
 	gaim_gtk_request_input,
 	gaim_gtk_request_choice,
 	gaim_gtk_request_action,
 	gaim_gtk_request_fields,
+	gaim_gtk_request_file,
 	gaim_gtk_close_request
 };
 

Index: request.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/request.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -p -r1.29 -r1.30
--- request.c	18 Apr 2004 06:22:41 -0000	1.29
+++ request.c	30 Apr 2004 03:00:05 -0000	1.30
@@ -1330,6 +1330,31 @@ gaim_request_close_with_handle(void *han
 	}
 }
 
+void *
+gaim_request_file(void *handle,
+		  const char *title, const char *filename,
+		  GCallback ok_cb, GCallback cancel_cb,
+		  void *user_data)
+{
+	GaimRequestUiOps *ops;
+
+	ops = gaim_request_get_ui_ops();
+
+	if (ops != NULL && ops->request_file != NULL) {
+		GaimRequestInfo *info;
+
+		info            = g_new0(GaimRequestInfo, 1);
+		info->type      = GAIM_REQUEST_INPUT;
+		info->handle    = handle;
+		info->ui_handle = ops->request_file(title, filename,
+						    ok_cb, cancel_cb, user_data);
+		handles = g_list_append(handles, info);
+		return info->ui_handle;
+	}
+
+	return NULL;
+}
+
 void
 gaim_request_set_ui_ops(GaimRequestUiOps *ops)
 {

Index: request.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/request.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -p -r1.29 -r1.30
--- request.h	21 Apr 2004 01:34:23 -0000	1.29
+++ request.h	30 Apr 2004 03:00:05 -0000	1.30
@@ -191,8 +191,10 @@ typedef struct
 							const char *cancel_text, GCallback cancel_cb,
 							void *user_data);
 
+	void *(*request_file)(const char *title, const char *filename,
+			      GCallback ok_cb, GCallback cancel_cb,
+			      void *user_data);
 	void (*close_request)(GaimRequestType type, void *ui_handle);
-
 } GaimRequestUiOps;
 
 typedef void (*GaimRequestInputCb)(void *, const char *);
@@ -1251,6 +1253,24 @@ void gaim_request_close_with_handle(void
 
 /*@}*/
 
+/**
+ * Displays file selector request dialog.  Returns the selected filename into
+ * the callback.
+ *
+ * @param handle      The plugin or connection handle.
+ * @param title       The title for the dialog (may be NULL)
+ * @param filename    The default filename (may be NULL)
+ * @param ok_cb       The callback for the OK button.
+ * @param cancel_cb   The callback for the cancel button.
+ * @param user_data   The data to pass to the callback.
+ *
+ * @return A UI-specific handle.
+ */
+void *gaim_request_file(void *handle, const char *title, const char *filename,
+			GCallback ok_cb, GCallback cancel_cb,
+			void *user_data);
+
+
 /**************************************************************************/
 /** @name UI Operations API                                               */
 /**************************************************************************/

Update of /cvsroot/gaim/gaim/src/protocols/rendezvous
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16611

Modified Files:
	mdns.c mdns_cache.c rendezvous.c 
Log Message:
Just clean up one or four things.


Index: mdns.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/rendezvous/mdns.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -p -r1.15 -r1.16
--- mdns.c	28 Apr 2004 04:38:12 -0000	1.15
+++ mdns.c	29 Apr 2004 02:42:30 -0000	1.16
@@ -36,6 +36,14 @@
  * One Eyed Willie.
  */
 
+/*
+ * XXX - Store data for NULL ResourceRecords so that rr->rdata contains
+ * both the length and the data. This length will always be equal to
+ * rr->rdlength... but it fits in more with the rest of the code.
+ * rr->rdata should not need a separate length value to determine
+ * how many bytes it will take.
+ */
+
 #include "internal.h"
 #include "debug.h"
 

Index: mdns_cache.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/rendezvous/mdns_cache.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -p -r1.4 -r1.5
--- mdns_cache.c	28 Apr 2004 04:38:12 -0000	1.4
+++ mdns_cache.c	29 Apr 2004 02:42:31 -0000	1.5
@@ -24,7 +24,6 @@
  */
 
 #include "internal.h"
-#include "debug.h"
 
 #include "mdns.h"
 #include "mdns_cache.h"
@@ -59,7 +58,6 @@ mdns_cache_add(const ResourceRecord *rr)
 
 	mdns_cache_remove(rr->name, rr->type);
 
-	printf("caching %d\n", rr->type);
 	new = mdns_copy_rr(rr);
 	rrs = g_slist_prepend(rrs, new);
 }
@@ -94,12 +92,10 @@ mdns_cache_respond(int fd, const Questio
 	ResourceRecord *cur;
 
 	g_return_if_fail(q != NULL);
-	printf("query for q->type=%d, q->name=%s\n", q->type, q->name);
 
 	for (slist = rrs; slist != NULL; slist = slist->next) {
 		cur = slist->data;
 		if (((q->type == RENDEZVOUS_RRTYPE_ALL) || (q->type == cur->type)) && (!strcmp(q->name, cur->name))) {
-			printf("responding to cur->type=%d, cur->name=%s\n", cur->type, cur->name);
 			mdns_send_rr(fd, cur);
 		}
 	}

Index: rendezvous.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/rendezvous/rendezvous.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -p -r1.20 -r1.21
--- rendezvous.c	28 Apr 2004 04:38:12 -0000	1.20
+++ rendezvous.c	29 Apr 2004 02:42:31 -0000	1.21
@@ -599,60 +599,7 @@ static void rendezvous_prpl_set_away(Gai
 
 static GaimPlugin *my_protocol = NULL;
 
-static GaimPluginProtocolInfo prpl_info =
-{
-	GAIM_PRPL_API_VERSION,
-	OPT_PROTO_NO_PASSWORD | OPT_PROTO_BUDDY_ICON,
-	NULL,
-	NULL,
-	rendezvous_prpl_list_icon,
-	rendezvous_prpl_list_emblems,
-	rendezvous_prpl_status_text,
-	rendezvous_prpl_tooltip_text,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	rendezvous_prpl_login,
-	rendezvous_prpl_close,
-	rendezvous_prpl_send_im,
-	NULL,
-	NULL,
-	NULL,
-	rendezvous_prpl_set_away,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL,
-	NULL
-};
+static GaimPluginProtocolInfo prpl_info;
 
 static GaimPluginInfo info =
 {
@@ -687,20 +634,31 @@ static void init_plugin(GaimPlugin *plug
 	GaimAccountOption *option;
 	char hostname[255];
 
+	prpl_info.api_version	= GAIM_PRPL_API_VERSION;
+	prpl_info.options		= OPT_PROTO_NO_PASSWORD | OPT_PROTO_BUDDY_ICON;
+	prpl_info.list_icon		= rendezvous_prpl_list_icon;
+	prpl_info.list_emblems	= rendezvous_prpl_list_emblems;
+	prpl_info.status_text	= rendezvous_prpl_status_text;
+	prpl_info.tooltip_text	= rendezvous_prpl_tooltip_text;
+	prpl_info.login			= rendezvous_prpl_login;
+	prpl_info.close			= rendezvous_prpl_close;
+	prpl_info.send_im		= rendezvous_prpl_send_im;
+	prpl_info.set_away		= rendezvous_prpl_set_away;
+
 	if (gethostname(hostname, 255) != 0) {
 		gaim_debug_warning("rendezvous", "Error %d when getting host name.  Using \"localhost.\"\n", errno);
 		strcpy(hostname, "localhost");
 	}
 
 	/* Try to avoid making this configurable... */
-	split = gaim_account_user_split_new(_("Host Name"), hostname, '@');
+	split = gaim_account_user_split_new(_("Host name"), hostname, '@');
 	prpl_info.user_splits = g_list_append(prpl_info.user_splits, split);
 
-	option = gaim_account_option_string_new(_("First Name"), "first", "Gaim");
+	option = gaim_account_option_string_new(_("First name"), "first", "Gaim");
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 											   option);
 
-	option = gaim_account_option_string_new(_("Last Name"), "last", _("User"));
+	option = gaim_account_option_string_new(_("Last name"), "last", _("User"));
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 											   option);

Update of /cvsroot/gaim/gaim/pixmaps/smileys/none
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27771

Added Files:
	Makefile.mingw 
Log Message:
stupid win32


--- NEW FILE: Makefile.mingw ---
#
# Makefile.mingw
#
# Description: Makefile for win32 (mingw) version of Gaim pixmaps
#

datadir = ../../../win32-install-dir
include ./Makefile.am

install:
	if test '$(SUBDIRS)'; then \
	  list='$(SUBDIRS)'; for subdir in $$list; do \
	    $(MAKE) -C $$subdir -f Makefile.mingw install; \
	  done; \
	fi;
	if test '$(gaimsmileypix_DATA)'; then \
	  mkdir -p $(gaimsmileypixdir); \
	  cp $(gaimsmileypix_DATA) $(gaimsmileypixdir); \
	fi;

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22054/src

Modified Files:
	network.c 
Log Message:
Some good rendezvous fixes.  Now if I could just find out why iTunes
complains that it can't access my mp3 server when I sign on with Gaim...

And 0 is a valid file descriptor.



Index: network.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/network.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -p -r1.15 -r1.16
--- network.c	28 Apr 2004 03:16:37 -0000	1.15
+++ network.c	28 Apr 2004 04:38:12 -0000	1.16
@@ -83,7 +83,7 @@ gaim_network_get_local_ip_from_fd(int fd
 	static char ip[16];
 	const char *tmp;
 
-	g_return_val_if_fail(fd > 0, NULL);
+	g_return_val_if_fail(fd >= 0, NULL);
 
 	len = sizeof(addr);
 	if (getsockname(fd, (struct sockaddr *) &addr, &len) == -1) {
@@ -106,7 +106,7 @@ gaim_network_get_local_system_ip(int fd)
 	static char ip[46];
 	const char *tmp = NULL;
 
-	if (fd != -1)
+	if (fd >= 0)
 		tmp = gaim_network_get_local_ip_from_fd(fd);
 
 	if (tmp)

Update of /cvsroot/gaim/gaim/pixmaps/smileys/none
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22054/pixmaps/smileys/none

Added Files:
	.cvsignore 
Log Message:
Some good rendezvous fixes.  Now if I could just find out why iTunes
complains that it can't access my mp3 server when I sign on with Gaim...

And 0 is a valid file descriptor.



--- NEW FILE: .cvsignore ---
Makefile.in
Makefile
.xvpics

Update of /cvsroot/gaim/gaim/src/protocols/rendezvous
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22054/src/protocols/rendezvous

Modified Files:
	mdns.c mdns_cache.c rendezvous.c 
Log Message:
Some good rendezvous fixes.  Now if I could just find out why iTunes
complains that it can't access my mp3 server when I sign on with Gaim...

And 0 is a valid file descriptor.



Index: mdns.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/rendezvous/mdns.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -p -r1.14 -r1.15
--- mdns.c	28 Apr 2004 03:16:40 -0000	1.14
+++ mdns.c	28 Apr 2004 04:38:12 -0000	1.15
@@ -514,7 +514,12 @@ mdns_getlength_rr_rdata(unsigned short t
 static int
 mdns_getlength_rr(const ResourceRecord *rr)
 {
-	return mdns_getlength_name(rr->name) + 10 + rr->rdlength;
+	int rdlength = mdns_getlength_rr_rdata(rr->type, rr->rdata);
+
+	if ((rdlength == 0) && (rr->rdata != NULL))
+		rdlength = rr->rdlength;
+
+	return mdns_getlength_name(rr->name) + 10 + rdlength;
 }
 
 /**
@@ -808,9 +813,8 @@ mdns_advertise_null(int fd, const char *
 	int ret;
 	ResourceRecord *rr;
 
-	if ((name == NULL) || (strlen(name) > 255)) {
-		return -EINVAL;
-	}
+	g_return_val_if_fail(name != NULL, -EINVAL);
+	g_return_val_if_fail(strlen(name) <= 255, -EINVAL);
 
 	rr = (ResourceRecord *)g_malloc(sizeof(ResourceRecord));
 	rr->name = g_strdup(name);
@@ -833,9 +837,10 @@ mdns_advertise_ptr(int fd, const char *n
 	int ret;
 	ResourceRecord *rr;
 
-	if ((name == NULL) || (strlen(name) > 255) || (domain == NULL) || (strlen(domain) > 255)) {
-		return -EINVAL;
-	}
+	g_return_val_if_fail(name != NULL, -EINVAL);
+	g_return_val_if_fail(strlen(name) <= 255, -EINVAL);
+	g_return_val_if_fail(domain != NULL, -EINVAL);
+	g_return_val_if_fail(strlen(domain) <= 255, -EINVAL);
 
 	rr = (ResourceRecord *)g_malloc(sizeof(ResourceRecord));
 	rr->name = g_strdup(name);
@@ -858,9 +863,8 @@ mdns_advertise_txt(int fd, const char *n
 	int ret;
 	ResourceRecord *rr;
 
-	if ((name == NULL) || (strlen(name) > 255)) {
-		return -EINVAL;
-	}
+	g_return_val_if_fail(name != NULL, -EINVAL);
+	g_return_val_if_fail(strlen(name) <= 255, -EINVAL);
 
 	rr = (ResourceRecord *)g_malloc(sizeof(ResourceRecord));
 	rr->name = g_strdup(name);
@@ -885,9 +889,8 @@ mdns_advertise_aaaa(int fd, const char *
 	ResourceRecordRDataA *rdata;
 	int i;
 
-	if ((name == NULL) || (strlen(name) > 255)) {
-		return -EINVAL;
-	}
+	g_return_val_if_fail(name != NULL, -EINVAL);
+	g_return_val_if_fail(strlen(name) <= 255, -EINVAL);
 
 	rdata = g_malloc(16);
 	for (i = 0; i < 16; i++)
@@ -915,9 +918,8 @@ mdns_advertise_srv(int fd, const char *n
 	ResourceRecord *rr;
 	ResourceRecordRDataSRV *rdata;
 
-	if ((target == NULL) || (strlen(target) > 255)) {
-		return -EINVAL;
-	}
+	g_return_val_if_fail(name != NULL, -EINVAL);
+	g_return_val_if_fail(strlen(name) <= 255, -EINVAL);
 
 	rdata = g_malloc(sizeof(ResourceRecordRDataSRV));
 	rdata->port = port;

Index: mdns_cache.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/rendezvous/mdns_cache.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- mdns_cache.c	28 Apr 2004 00:48:21 -0000	1.3
+++ mdns_cache.c	28 Apr 2004 04:38:12 -0000	1.4
@@ -84,6 +84,7 @@ void
 mdns_cache_remove_all()
 {
 	mdns_free_rrs(rrs);
+	rrs = NULL;
 }
 
 void
@@ -97,9 +98,9 @@ mdns_cache_respond(int fd, const Questio
 
 	for (slist = rrs; slist != NULL; slist = slist->next) {
 		cur = slist->data;
-		if ((q->type == cur->type) && (!strcmp(q->name, cur->name))) {
+		if (((q->type == RENDEZVOUS_RRTYPE_ALL) || (q->type == cur->type)) && (!strcmp(q->name, cur->name))) {
 			printf("responding to cur->type=%d, cur->name=%s\n", cur->type, cur->name);
-			//mdns_send_rr(fd, cur);
+			mdns_send_rr(fd, cur);
 		}
 	}
 }

Index: rendezvous.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/rendezvous/rendezvous.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -p -r1.19 -r1.20
--- rendezvous.c	28 Apr 2004 03:16:40 -0000	1.19
+++ rendezvous.c	28 Apr 2004 04:38:12 -0000	1.20
@@ -487,12 +487,16 @@ static void rendezvous_send_online(GaimC
 	GaimAccount *account = gaim_connection_get_account(gc);
 	const gchar *me;
 	gchar *myname, *mycomp;
-	const unsigned char *myip;
+	unsigned char myip[4];
 
 	me = gaim_account_get_username(account);
 	myname = g_strdup_printf("%s._presence._tcp.local", me);
 	mycomp = g_strdup_printf("%s.local", strchr(me, '@') + 1);
-	myip = gaim_network_ip_atoi(gaim_network_get_local_system_ip(rd->fd));
+	/* myip = gaim_network_ip_atoi(gaim_network_get_local_system_ip(-1)); */
+	myip[0] = 192;
+	myip[1] = 168;
+	myip[2] = 1;
+	myip[3] = 41;
 
 	mdns_advertise_a(rd->fd, mycomp, myip);
 	mdns_advertise_ptr(rd->fd, "_presence._tcp.local", myname);

Update of /cvsroot/gaim/web/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20253/htdocs

Modified Files:
	gtkrc-2.0 
Log Message:
many many thanks to Etan


Index: gtkrc-2.0
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/gtkrc-2.0,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -p -r1.3 -r1.4
--- gtkrc-2.0	22 Jul 2003 18:08:02 -0000	1.3
+++ gtkrc-2.0	28 Apr 2004 04:25:51 -0000	1.4
@@ -10,3 +10,13 @@ gtk-entry-select-on-focus = 1
 gtk-font-name = "Verdana 9"
 
 gtk-key-theme-name = "Emacs"
+
+#the below will set the font size on only the conversations and entry widget (gaim 0.78 and higher)
+style "imhtml-fix"
+{
+font_name = "Sans 10"
+}
+#widget_class "*.GtkScrolledWindow.GtkIMHtml" style "imhtml-fix"
+widget "*gtkconv_entry" style "imhtml-fix"
+widget "*gtkconv_imhtml" style "imhtml-fix"
+

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16031

Modified Files:
	main.c 
Log Message:
so hard to find my way
now that i'm all on my own


Index: main.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/main.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -p -r1.118 -r1.119
--- main.c	26 Apr 2004 19:19:14 -0000	1.118
+++ main.c	28 Apr 2004 03:57:42 -0000	1.119
@@ -841,11 +841,6 @@ int main(int argc, char *argv[])
 
 	gaim_plugins_probe(NULL);
 
-	gaim_set_blist(gaim_blist_new());
-	gaim_blist_load();
-
-	gaim_prefs_load();
-
 	/* we only read ~/.gaimrc (load_prefs()) if there is no accounts.xml
 	 * since prefs.xml existed alongside ~/.gaim in 0.64 */
 	if (!gaim_accounts_load()) {
@@ -853,6 +848,11 @@ int main(int argc, char *argv[])
 		gaim_prefs_sync();
 	}
 
+	gaim_set_blist(gaim_blist_new());
+	gaim_blist_load();
+
+	gaim_prefs_load();
+
 	gaim_gtk_prefs_rename_old();
 
 	/* load plugins we had when we quit */

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10176/src

Modified Files:
	network.c network.h 
Log Message:
-Fix the compile error in perl that was my fault

-Rename a network.c function and change it's signature (is that work
applicable in c?)

-Make rendezvous crash when trying to sign on


Index: network.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/network.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -p -r1.14 -r1.15
--- network.c	28 Apr 2004 00:48:21 -0000	1.14
+++ network.c	28 Apr 2004 03:16:37 -0000	1.15
@@ -30,11 +30,35 @@
 #include "network.h"
 #include "prefs.h"
 
+const unsigned char *
+gaim_network_ip_atoi(const char *ip)
+{
+	static unsigned char ret[4];
+	gchar delimiter = '.';
+	gchar **split;
+	int i;
+
+	g_return_val_if_fail(ip != NULL, NULL);
+
+	split = g_strsplit(ip, &delimiter, 4);
+	for (i = 0; split[i] != NULL; i++)
+		ret[i] = atoi(split[i]);
+	g_strfreev(split);
+
+	/* i should always be 4 */
+	if (i != 4)
+		return NULL;
+
+	return ret;
+}
+
 void
 gaim_network_set_public_ip(const char *ip)
 {
 	g_return_if_fail(ip != NULL);
 
+	/* XXX - Ensure the IP address is valid */
+
 	gaim_prefs_set_string("/core/network/public_ip", ip);
 }
 
@@ -69,6 +93,7 @@ gaim_network_get_local_ip_from_fd(int fd
 
 	tmp = inet_ntoa(addr.sin_addr);
 	strncpy(ip, tmp, sizeof(ip));
+
 	return ip;
 }
 
@@ -106,7 +131,7 @@ gaim_network_get_local_system_ip(int fd)
 }
 
 const char *
-gaim_network_get_ip_for_account(const GaimAccount *account, int fd)
+gaim_network_get_my_ip(int fd)
 {
 	const char *ip = NULL;
 

Index: network.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/network.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -p -r1.7 -r1.8
--- network.h	28 Apr 2004 00:48:21 -0000	1.7
+++ network.h	28 Apr 2004 03:16:37 -0000	1.8
@@ -35,6 +35,20 @@ extern "C" {
 /*@{*/
 
 /**
+ * Converts a dot-decimal IP address to an array of unsigned
+ * chars.  For example, converts 192.168.0.1 to a 4 byte
+ * array containing 192, 168, 0 and 1.
+ *
+ * @param ip An IP address in dot-decimal notiation.
+ * @return An array of 4 bytes containing an IP addresses
+ *         equivalent to the given parameter, or NULL if
+ *         the given IP address is invalid.  This value
+ *         is statically allocated and should not be
+ *         freed.
+ */
+const unsigned char *gaim_network_ip_atoi(const char *ip);
+
+/**
  * Sets the IP address of the local system in preferences.  This
  * is the IP address that should be used for incoming connections
  * (file transfer, direct IM, etc.) and should therefore be
@@ -48,7 +62,7 @@ void gaim_network_set_public_ip(const ch
  * Returns the IP address of the local system set in preferences.
  *
  * This returns the value set via gaim_network_set_public_ip().
- * You probably want to use gaim_network_get_ip_for_account() instead.
+ * You probably want to use gaim_network_get_my_ip() instead.
  *
  * @return The local IP address set in preferences.
  */
@@ -57,7 +71,7 @@ const char *gaim_network_get_public_ip(v
 /**
  * Returns the IP address of the local system.
  *
- * You probably want to use gaim_network_get_ip_for_account() instead.
+ * You probably want to use gaim_network_get_my_ip() instead.
  *
  * @note The returned string is a pointer to a static buffer. If this
  *       function is called twice, it may be important to make a copy
@@ -87,7 +101,7 @@ const char *gaim_network_get_local_syste
  * @param fd The fd to use to help figure out the IP, or -1.
  * @return The local IP address to be used.
  */
-const char *gaim_network_get_ip_for_account(const GaimAccount *account, int fd);
+const char *gaim_network_get_my_ip(int fd);
 
 /**
  * Attempts to open a listening port ONLY on the specified port number.

Update of /cvsroot/gaim/gaim/plugins/perl/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10176/plugins/perl/common

Modified Files:
	Account.xs 
Log Message:
-Fix the compile error in perl that was my fault

-Rename a network.c function and change it's signature (is that work
applicable in c?)

-Make rendezvous crash when trying to sign on


Index: Account.xs
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/perl/common/Account.xs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -p -r1.5 -r1.6
--- Account.xs	6 Oct 2003 04:36:44 -0000	1.5
+++ Account.xs	28 Apr 2004 03:16:37 -0000	1.6
@@ -60,11 +60,6 @@ gaim_account_set_auto_login(account, ui,
 	const char *ui
 	gboolean value
 
-void
-gaim_account_set_public_ip(account, ip)
-	Gaim::Account account
-	const char *ip
-
 gboolean
 gaim_account_is_connected(account)
 	Gaim::Account account
@@ -110,10 +105,6 @@ gaim_account_get_auto_login(account, ui)
 	Gaim::Account account
 	const char *ui
 
-const char *
-gaim_account_get_public_ip(account)
-	Gaim::Account account
-
 
 MODULE = Gaim::Account  PACKAGE = Gaim::Accounts  PREFIX = gaim_accounts_

Update of /cvsroot/gaim/gaim/src/protocols/rendezvous
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10176/src/protocols/rendezvous

Modified Files:
	mdns.c mdns.h rendezvous.c 
Log Message:
-Fix the compile error in perl that was my fault

-Rename a network.c function and change it's signature (is that work
applicable in c?)

-Make rendezvous crash when trying to sign on


Index: mdns.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/rendezvous/mdns.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -p -r1.13 -r1.14
--- mdns.c	28 Apr 2004 00:48:21 -0000	1.13
+++ mdns.c	28 Apr 2004 03:16:40 -0000	1.14
@@ -772,16 +772,16 @@ mdns_send_rr(int fd, ResourceRecord *rr)
 }
 
 int
-mdns_advertise_a(int fd, const char *name, unsigned char *ip)
+mdns_advertise_a(int fd, const char *name, const unsigned char *ip)
 {
 	int ret;
 	ResourceRecord *rr;
 	ResourceRecordRDataA *rdata;
 	int i;
 
-	if ((name == NULL) || (strlen(name) > 255)) {
-		return -EINVAL;
-	}
+	g_return_val_if_fail(name != NULL, -EINVAL);
+	g_return_val_if_fail(strlen(name) <= 255, -EINVAL);
+	g_return_val_if_fail(ip != NULL, -EINVAL);
 
 	rdata = g_malloc(4);
 	for (i = 0; i < 4; i++)
@@ -878,7 +878,7 @@ mdns_advertise_txt(int fd, const char *n
 }
 
 int
-mdns_advertise_aaaa(int fd, const char *name, unsigned char *ip)
+mdns_advertise_aaaa(int fd, const char *name, const unsigned char *ip)
 {
 	int ret;
 	ResourceRecord *rr;

Index: mdns.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/rendezvous/mdns.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -p -r1.12 -r1.13
--- mdns.h	28 Apr 2004 00:48:21 -0000	1.12
+++ mdns.h	28 Apr 2004 03:16:40 -0000	1.13
@@ -166,11 +166,11 @@ int mdns_send_dns(int fd, const DNSPacke
 int mdns_query(int fd, const char *domain, unsigned short type);
 
 int mdns_send_rr(int fd, ResourceRecord *rr);
-int mdns_advertise_a(int fd, const char *name, unsigned char *ip);
+int mdns_advertise_a(int fd, const char *name, const unsigned char *ip);
 int mdns_advertise_null(int fd, const char *name, const char *data, unsigned short rdlength);
 int mdns_advertise_ptr(int fd, const char *name, const char *domain);
 int mdns_advertise_txt(int fd, const char *name, const GSList *txt);
-int mdns_advertise_aaaa(int fd, const char *name, unsigned char *ip);
+int mdns_advertise_aaaa(int fd, const char *name, const unsigned char *ip);
 int mdns_advertise_srv(int fd, const char *name, unsigned short port, const char *target);
 
 /**

Index: rendezvous.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/rendezvous/rendezvous.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -p -r1.18 -r1.19
--- rendezvous.c	28 Apr 2004 00:48:21 -0000	1.18
+++ rendezvous.c	28 Apr 2004 03:16:40 -0000	1.19
@@ -481,34 +481,18 @@ static void rendezvous_send_icon(GaimCon
 	g_free(rdata);
 }
 
-static int *rendezvous_get_ip_as_int_array(int fd)
-{
-	static int ret[4];
-	const char *ip, *nexttoken;
-	int i = 0;
-
-	ip = gaim_network_get_local_system_ip(fd);
-	nexttoken = strtok((char *)ip, ".");
-	while (nexttoken && i < 4) {
-		ret[i] = atoi(nexttoken);
-		nexttoken = strtok(NULL, ".");
-	}
-
-	return ret;
-}
-
 static void rendezvous_send_online(GaimConnection *gc)
 {
 	RendezvousData *rd = gc->proto_data;
 	GaimAccount *account = gaim_connection_get_account(gc);
 	const gchar *me;
 	gchar *myname, *mycomp;
-	unsigned char *myip;
+	const unsigned char *myip;
 
 	me = gaim_account_get_username(account);
 	myname = g_strdup_printf("%s._presence._tcp.local", me);
 	mycomp = g_strdup_printf("%s.local", strchr(me, '@') + 1);
-	myip = rendezvous_get_ip_as_int_array(rd->fd);
+	myip = gaim_network_ip_atoi(gaim_network_get_local_system_ip(rd->fd));
 
 	mdns_advertise_a(rd->fd, mycomp, myip);
 	mdns_advertise_ptr(rd->fd, "_presence._tcp.local", myname);

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10176/src/protocols/oscar

Modified Files:
	im.c oscar.c 
Log Message:
-Fix the compile error in perl that was my fault

-Rename a network.c function and change it's signature (is that work
applicable in c?)

-Make rendezvous crash when trying to sign on


Index: im.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/im.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -p -r1.55 -r1.56
--- im.c	21 Apr 2004 01:34:25 -0000	1.55
+++ im.c	28 Apr 2004 03:16:39 -0000	1.56
@@ -779,6 +779,7 @@ faim_export int aim_im_sendch2_sendfile_
 /*		aim_tlvlist_add_raw(&subtl, 0x000e, 2, "en");
 		aim_tlvlist_add_raw(&subtl, 0x000d, 8, "us-ascii");
 		aim_tlvlist_add_raw(&subtl, 0x000c, 24, "Please accept this file."); */
+		/* XXX - Change oft_info->clientip to an array of 4 bytes */
 		if (oft_info->clientip) {
 			fu8_t ip[4];
 			char *nexttoken;

Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.582
retrieving revision 1.583
diff -u -d -p -r1.582 -r1.583
--- oscar.c	24 Apr 2004 17:35:17 -0000	1.582
+++ oscar.c	28 Apr 2004 03:16:39 -0000	1.583
@@ -1277,7 +1277,6 @@ static void oscar_xfer_ack_send(GaimXfer
 
 static void oscar_ask_sendfile(GaimConnection *gc, const char *destsn) {
 	OscarData *od = (OscarData *)gc->proto_data;
-	GaimAccount *account = gaim_connection_get_account(gc);
 	GaimXfer *xfer;
 	struct aim_oft_info *oft_info;
 	const char *ip;
@@ -1288,7 +1287,7 @@ static void oscar_ask_sendfile(GaimConne
 	xfer = gaim_xfer_new(gaim_connection_get_account(gc), GAIM_XFER_SEND, destsn);
 
 	/* Create the oscar-specific data */
-	ip = gaim_network_get_ip_for_account(account, od->conn ? od->conn->fd : -1);
+	ip = gaim_network_get_my_ip(od->conn ? od->conn->fd : -1);
 	oft_info = aim_oft_createinfo(od->sess, NULL, destsn, ip, 0, 0, 0, NULL);
 	xfer->data = oft_info;

Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10176/src/protocols/jabber

Modified Files:
	si.c 
Log Message:
-Fix the compile error in perl that was my fault

-Rename a network.c function and change it's signature (is that work
applicable in c?)

-Make rendezvous crash when trying to sign on


Index: si.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/si.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -p -r1.7 -r1.8
--- si.c	26 Feb 2004 13:38:13 -0000	1.7
+++ si.c	28 Apr 2004 03:16:38 -0000	1.8
@@ -281,7 +281,7 @@ jabber_si_xfer_bytestreams_send_read_aga
 		return;
 	}
 
-	host = gaim_network_get_ip_for_account(jsx->js->gc->account, jsx->js->fd);
+	host = gaim_network_get_my_ip(jsx->js->fd);
 
 	buffer[0] = 0x05;
 	buffer[1] = 0x00;
@@ -429,7 +429,7 @@ jabber_si_xfer_bytestreams_send_init(Gai
 		return;
 	}
 
-	xmlnode_set_attrib(streamhost, "host",  gaim_network_get_ip_for_account(jsx->js->gc->account, jsx->js->fd));
+	xmlnode_set_attrib(streamhost, "host",  gaim_network_get_my_ip(jsx->js->fd));
 	xfer->local_port = gaim_network_get_port_from_fd(fd);
 	port = g_strdup_printf("%hu", xfer->local_port);
 	xmlnode_set_attrib(streamhost, "port", port);

Update of /cvsroot/gaim/gaim/src/protocols/novell
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10176/src/protocols/novell

Modified Files:
	novell.c 
Log Message:
-Fix the compile error in perl that was my fault

-Rename a network.c function and change it's signature (is that work
applicable in c?)

-Make rendezvous crash when trying to sign on


Index: novell.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/novell/novell.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -p -r1.11 -r1.12
--- novell.c	23 Apr 2004 23:10:10 -0000	1.11
+++ novell.c	28 Apr 2004 03:16:39 -0000	1.12
@@ -1148,7 +1148,7 @@ novell_ssl_connected_cb(gpointer data, G
 	gaim_connection_update_progress(gc, _("Authenticating..."),
 									2, NOVELL_CONNECT_STEPS);
 
-	my_addr = gaim_network_get_ip_for_account(user->client_data, gsc->fd);
+	my_addr = gaim_network_get_my_ip(gsc->fd);
 	pwd = gaim_account_get_password(user->client_data);
 	ua = _user_agent_string();

Update of /cvsroot/gaim/gaim/src/protocols/irc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10176/src/protocols/irc

Modified Files:
	dcc_send.c 
Log Message:
-Fix the compile error in perl that was my fault

-Rename a network.c function and change it's signature (is that work
applicable in c?)

-Make rendezvous crash when trying to sign on


Index: dcc_send.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/dcc_send.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- dcc_send.c	27 Feb 2004 01:45:26 -0000	1.1
+++ dcc_send.c	28 Apr 2004 03:16:38 -0000	1.2
@@ -285,7 +285,7 @@ static void irc_dccsend_send_init(GaimXf
 
 	/* Send the intended recipient the DCC request */
 	arg[0] = xfer->who;
-	inet_aton(gaim_network_get_ip_for_account(gaim_xfer_get_account(xfer), irc->fd), &addr);
+	inet_aton(gaim_network_get_my_ip(irc->fd), &addr);
 	arg[1] = tmp = g_strdup_printf("\001DCC SEND \"%s\" %u %hu %u\001",
 	                         xfer->filename, ntohl(addr.s_addr),
 	                         port, xfer->size);

Update of /cvsroot/gaim/gaim/pixmaps/smileys/none
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9474

Added Files:
	theme 
Log Message:
I think Sean forgot this?


--- NEW FILE: theme ---
Name=none
Description=Selecting this disables graphical emoticons.
Author=Penguin Pimps

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28069/src

Modified Files:
	gtkprefs.c 
Log Message:
Added the null smiley theme and made the MSN-style font selector read (but
not write) the font prefs.


Index: gtkprefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkprefs.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -p -r1.143 -r1.144
--- gtkprefs.c	28 Apr 2004 00:48:21 -0000	1.143
+++ gtkprefs.c	28 Apr 2004 01:45:06 -0000	1.144
@@ -719,7 +719,7 @@ GtkWidget *font_page() {
 	imhtml = gtk_imhtml_new(NULL, NULL);
 	gtk_imhtml_set_editable(GTK_IMHTML(imhtml), TRUE);
 	gtk_imhtml_set_format_functions(GTK_IMHTML(imhtml), GTK_IMHTML_ALL ^ GTK_IMHTML_IMAGE);
-	gtk_imhtml_set_whole_buffer_formatting_only(imhtml, TRUE);
+	gtk_imhtml_set_whole_buffer_formatting_only(GTK_IMHTML(imhtml), TRUE);
 
 	gtk_imhtml_smiley_shortcuts(GTK_IMHTML(imhtml),
 			gaim_prefs_get_bool("/gaim/gtk/conversations/smiley_shortcuts"));
@@ -731,6 +731,18 @@ GtkWidget *font_page() {
 	gtk_imhtml_append_text(GTK_IMHTML(imhtml), "This is preview text", 0);
 	gtk_container_add(GTK_CONTAINER(sw), imhtml);
 	
+	if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_bold"))
+		gtk_imhtml_toggle_bold(GTK_IMHTML(imhtml));
+	if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_italic"))
+		gtk_imhtml_toggle_italic(GTK_IMHTML(imhtml));
+	if (gaim_prefs_get_bool("/gaim/gtk/conversations/send_underline"))
+		gtk_imhtml_toggle_underline(GTK_IMHTML(imhtml));
+
+	gtk_imhtml_font_set_size(GTK_IMHTML(imhtml), gaim_prefs_get_int("/gaim/gtk/conversations/font_size"));
+	gtk_imhtml_toggle_forecolor(GTK_IMHTML(imhtml), gaim_prefs_get_string("/gaim/gtk/conversations/fgcolor"));
+	gtk_imhtml_toggle_backcolor(GTK_IMHTML(imhtml), gaim_prefs_get_string("/gaim/gtk/conversations/bgcolor"));
+	gtk_imhtml_toggle_fontface(GTK_IMHTML(imhtml), gaim_prefs_get_string("/gaim/gtk/conversations/font_face"));
+
 	gtk_widget_show_all(ret);
 	return ret;
 }

Update of /cvsroot/gaim/gaim/pixmaps/smileys
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28069/pixmaps/smileys

Modified Files:
	Makefile.am 
Log Message:
Added the null smiley theme and made the MSN-style font selector read (but
not write) the font prefs.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/pixmaps/smileys/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -p -r1.1 -r1.2
--- Makefile.am	8 Jan 2003 20:11:15 -0000	1.1
+++ Makefile.am	28 Apr 2004 01:45:05 -0000	1.2
@@ -1,2 +1,2 @@
-SUBDIRS = default 
+SUBDIRS = default none

Update of /cvsroot/gaim/gaim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28069

Modified Files:
	configure.ac 
Log Message:
Added the null smiley theme and made the MSN-style font selector read (but
not write) the font prefs.


Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -p -r1.239 -r1.240
--- configure.ac	25 Apr 2004 13:54:37 -0000	1.239
+++ configure.ac	28 Apr 2004 01:45:05 -0000	1.240
@@ -1080,6 +1080,7 @@ AC_OUTPUT([Makefile
 		   pixmaps/Makefile
 		   pixmaps/smileys/Makefile
 		   pixmaps/smileys/default/Makefile
+		   pixmaps/smileys/none/Makefile
 		   pixmaps/status/Makefile
 		   pixmaps/status/default/Makefile
 		   plugins/Makefile

Update of /cvsroot/gaim/gaim/pixmaps/smileys/none
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28069/pixmaps/smileys/none

Added Files:
	Makefile.am 
Log Message:
Added the null smiley theme and made the MSN-style font selector read (but
not write) the font prefs.


--- NEW FILE: Makefile.am ---
gaimsmileypixdir = $(datadir)/pixmaps/gaim/smileys/none
gaimsmileypix_DATA = theme 

EXTRA_DIST = $(gaimsmileypix_DATA)

Update of /cvsroot/gaim/web/htdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27964

Modified Files:
	themes.php 
Log Message:
Prevent our admins from being arrested by the FBI as often.


Index: themes.php
===================================================================
RCS file: /cvsroot/gaim/web/htdocs/themes.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -p -r1.10 -r1.11
--- themes.php	28 Apr 2004 01:18:50 -0000	1.10
+++ themes.php	28 Apr 2004 01:42:40 -0000	1.11
@@ -550,8 +550,11 @@
 
 		if ($theme == NULL)
 			display_unknown_theme();
-		elseif ($theme["USER_ID"] != $users->get_active_user_id())
+		elseif ($theme["USER_ID"] != $users->get_active_user_id() &&
+		        !$users->is_active_user_admin())
+		{
 			display_permission_denied("edit");
+		}
 
 		$missinginfo = false;
 
@@ -709,8 +712,11 @@
 
 		if ($theme == NULL)
 			display_unknown_theme();
-		elseif ($theme["USER_ID"] != $users->get_active_user_id())
+		elseif ($theme["USER_ID"] != $users->get_active_user_id() &&
+		        !$users->is_active_user_admin())
+		{
 			display_permission_denied("edit");
+		}
 
 		if (isset($confirm))
 		{