pidgin-commits — DO NOT USE. See https://pidgin.im/cgi-bin/mailman/listinfo/commits

[Gaim-commits] CVS: gaim/src core.c,1.16,1.17 gtkimhtml.c,1.57,1.58 util.c,1.107,1.108

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv27558

Modified Files:
	core.c gtkimhtml.c util.c 
Log Message:
cvs commit


Index: core.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- core.c	2001/10/19 02:43:18	1.16
+++ core.c	2001/10/24 08:48:05	1.17
@@ -35,6 +35,7 @@
 #include <signal.h>
 #include <getopt.h>
 #include <stdarg.h>
+#include <string.h>
 
 #include "gaim.h"
 

Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- gtkimhtml.c	2001/10/23 04:59:46	1.57
+++ gtkimhtml.c	2001/10/24 08:48:05	1.58
@@ -86,17 +86,18 @@
 	gchar **image;
 };
 
-static gchar* getcharset()
+static gchar*
+getcharset ()
 {
-	static gchar charset[64];
+	static gchar charset [64];
 #ifdef HAVE_LANGINFO_CODESET
-	gchar *ch = nl_langinfo(CODESET);
-	if (strncasecmp(ch, "iso-", 4) == 0)
-		g_snprintf(charset, sizeof(charset), "iso%s", ch + 4);
+	gchar *ch = nl_langinfo (CODESET);
+	if (!g_strncasecmp (ch, "iso-", 4))
+		g_snprintf (charset, sizeof (charset), "iso%s", ch + 4);
 	else
-		g_snprintf(charset, sizeof(charset), ch);
+		g_snprintf (charset, sizeof (charset), ch);
 #else
-	g_snprintf(charset, sizeof(charset), "iso8859-*");
+	g_snprintf (charset, sizeof (charset), "iso8859-*");
 #endif
 	return charset;
 }

Index: util.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/util.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- util.c	2001/09/30 19:58:48	1.107
+++ util.c	2001/10/24 08:48:05	1.108
@@ -127,7 +127,7 @@
 	while (*c) {
 		if (!g_strncasecmp(c, "<A", 2)) {
 			while (1) {
-				if (!strncasecmp(c, "/A>", 3)) {
+				if (!g_strncasecmp(c, "/A>", 3)) {
 					break;
 				}
 				text[cnt++] = *c;

[Gaim-commits] CVS: gaim/src/protocols/gg libgg.c,1.3,1.4

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/gg
In directory usw-pr-cvs1:/tmp/cvs-serv23615

Modified Files:
	libgg.c 
Log Message:
hi


Index: libgg.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/gg/libgg.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libgg.c	2001/10/10 20:03:17	1.3
+++ libgg.c	2001/10/24 08:35:55	1.4
@@ -353,7 +353,7 @@
 				return NULL;
 			}
 			if (errno != EINTR) {
-//				errno = EINVAL;
+				/* errno = EINVAL; */
 				free(buf);
 				return NULL;
 			}

[Gaim-commits] CVS: gaim/src gtkticker.h,1.3,1.4

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv23437

Modified Files:
	gtkticker.h 
Log Message:
hi


Index: gtkticker.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkticker.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gtkticker.h	2001/09/28 23:45:19	1.3
+++ gtkticker.h	2001/10/24 08:35:05	1.4
@@ -68,8 +68,8 @@
 struct _GtkTickerChild
 {
   GtkWidget *widget;
-  gint x;		// current position
-  gint offset;     	// offset in list
+  gint x;		/* current position */
+  gint offset;     	/* offset in list */
 };
 
 

[Gaim-commits] CVS: gaim/src prefs.c,1.191,1.192

[Rob F. <rob...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv6661

Modified Files:
	prefs.c 
Log Message:
Might as well make the idle times happen immediately, too..



Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -d -r1.191 -r1.192
--- prefs.c	2001/10/24 04:07:56	1.191
+++ prefs.c	2001/10/24 04:56:37	1.192
@@ -2588,6 +2588,9 @@
 
 	if (option == OPT_BLIST_GREY_IDLERS)
 		update_idle_times();
+
+	if (option == OPT_BLIST_SHOW_IDLETIME)
+		update_idle_times();
 }
 
 static void set_convo_option(GtkWidget *w, int option)

[Gaim-commits] CVS: gaim/src prefs.c,1.190,1.191

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv17473

Modified Files:
	prefs.c 
Log Message:
hi


Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -d -r1.190 -r1.191
--- prefs.c	2001/10/24 01:42:48	1.190
+++ prefs.c	2001/10/24 04:07:56	1.191
@@ -2585,6 +2585,9 @@
 
 	if (option == OPT_BLIST_SHOW_PIXMAPS)
 		toggle_buddy_pixmaps();
+
+	if (option == OPT_BLIST_GREY_IDLERS)
+		update_idle_times();
 }
 
 static void set_convo_option(GtkWidget *w, int option)

[Gaim-commits] CVS: gaim/src buddy.c,1.258,1.259 gaim.h,1.287,1.288 gaimrc.c,1.87,1.88 prefs.c,1.189,1.190

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv32728/src

Modified Files:
	buddy.c gaim.h gaimrc.c prefs.c 
Log Message:
hi


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -d -r1.258 -r1.259
--- buddy.c	2001/10/23 08:47:11	1.258
+++ buddy.c	2001/10/24 01:42:47	1.259
@@ -1920,6 +1920,7 @@
 	time_t t;
 	int ihrs, imin;
 	struct buddy *b;
+	GtkStyle *style;
 
 	char infotip[2048];
 	char warn[256];
@@ -1947,6 +1948,20 @@
 		gtk_label_set(GTK_LABEL(bs->idle), "");
 	if (blist_options & OPT_BLIST_SHOW_IDLETIME)
 		gtk_widget_show(bs->idle);
+
+	style = gtk_style_new();
+	gdk_font_unref(style->font);
+	style->font = gdk_font_ref(GTK_WIDGET(bs->label)->style->font);
+	if ((blist_options & OPT_BLIST_GREY_IDLERS) && (b->idle) && (t - b->idle >= 1200)) {
+		style->fg[GTK_STATE_NORMAL].red =
+		  (style->fg[GTK_STATE_NORMAL].red / 3) * 2 + (style->bg[GTK_STATE_NORMAL].red / 3);
+		style->fg[GTK_STATE_NORMAL].green = 
+		  (style->fg[GTK_STATE_NORMAL].green / 3) * 2 + (style->bg[GTK_STATE_NORMAL].green / 3);
+		style->fg[GTK_STATE_NORMAL].blue = 
+		  (style->fg[GTK_STATE_NORMAL].blue / 3) * 2 + (style->bg[GTK_STATE_NORMAL].blue / 3);
+	}
+	gtk_widget_set_style(bs->label, style);
+	gtk_style_unref(style);
 
 	/* now we do the tooltip */
 	if (b->signon) {

Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -d -r1.287 -r1.288
--- gaim.h	2001/10/23 08:06:09	1.287
+++ gaim.h	2001/10/24 01:42:47	1.288
@@ -211,6 +211,7 @@
 #define OPT_BLIST_NO_BUTTONS		0x00000080
 #define OPT_BLIST_NO_MT_GRP		0x00000100
 #define OPT_BLIST_SHOW_WARN		0x00000200
+#define OPT_BLIST_GREY_IDLERS		0x00000400
 
 extern guint convo_options;
 #define OPT_CONVO_ENTER_SENDS		0x00000001

Index: gaimrc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaimrc.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -r1.87 -r1.88
--- gaimrc.c	2001/10/23 04:05:52	1.87
+++ gaimrc.c	2001/10/24 01:42:48	1.88
@@ -769,6 +769,10 @@
 
 	}
 
+	/* this is where we do bugs and compatibility stuff */
+	if (!(sound_options & (OPT_SOUND_BEEP | OPT_SOUND_ESD | OPT_SOUND_NORMAL | OPT_SOUND_NAS | OPT_SOUND_ARTSC)))
+		sound_options |= OPT_SOUND_ESD | OPT_SOUND_NORMAL | OPT_SOUND_NAS | OPT_SOUND_ARTSC;
+
 	if (conv_size.width == 0 &&
 	    conv_size.height == 0 &&
 	    conv_size.entry_height == 0) {

Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- prefs.c	2001/10/23 04:18:07	1.189
+++ prefs.c	2001/10/24 01:42:48	1.190
@@ -611,6 +611,7 @@
 	gtk_widget_show(vbox);
 
 	gaim_button(_("Show idle times"), &blist_options, OPT_BLIST_SHOW_IDLETIME, vbox);
+	gaim_button(_("Grey idle buddies"), &blist_options, OPT_BLIST_GREY_IDLERS, vbox);
 
 	gtk_widget_show(prefdialog);
 }

[Gaim-commits] CVS: gaim ChangeLog,1.342,1.343 TODO,1.123,1.124

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv32728

Modified Files:
	ChangeLog TODO 
Log Message:
hi


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.342
retrieving revision 1.343
diff -u -d -r1.342 -r1.343
--- ChangeLog	2001/10/23 04:54:44	1.342
+++ ChangeLog	2001/10/24 01:42:47	1.343
@@ -20,6 +20,7 @@
 	  (thanks Ben Miller)
 	* When someone adds you to their buddy list, it asks if you want
 	  to add them as well (Yahoo, ICQ, and MSN) (thanks Nathan Walp)
+	* Option to grey idle buddies (thanks Nathan Walp)
 
 version 0.46 (10/18/2001):
 	* New applet icons (courtesy David Raeman)

Index: TODO
===================================================================
RCS file: /cvsroot/gaim/gaim/TODO,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- TODO	2001/10/23 21:39:44	1.123
+++ TODO	2001/10/24 01:42:47	1.124
@@ -79,7 +79,6 @@
 Future Plugins? :
 	ICQ through Oscar plugin (ICQ2000) (requires hacking libfaim :-/)
 		this would allow us to send SMS messages.
-	Hotline (Or is this a waste of time?.  Ill decide soon enough, heh)
 
 ----
 THE UIS:

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.26,1.27

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory usw-pr-cvs1:/tmp/cvs-serv32168/src/protocols/msn

Modified Files:
	msn.c 
Log Message:
spam! glorious spam.


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- msn.c	2001/10/23 10:40:42	1.26
+++ msn.c	2001/10/23 21:39:44	1.27
@@ -53,7 +53,7 @@
 	int trId;
 	int total;
 	char *user;
-	char *txqueue;
+	GSList *txqueue;
 };
 
 struct msn_buddy {
@@ -296,7 +296,7 @@
 	while (m) {
 		struct msn_switchboard *ms = m->data;
 		m = m->next;
-		if ((ms->total == 1) && !g_strcasecmp(ms->user, id))
+		if ((ms->total <= 1) && !g_strcasecmp(ms->user, id))
 			return ms;
 	}
 
@@ -346,8 +346,10 @@
 	g_free(ms->auth);
 	if (ms->user)
 		g_free(ms->user);
-	if (ms->txqueue)
-		g_free(ms->txqueue);
+	while (ms->txqueue) {
+		g_free(ms->txqueue->data);
+		ms->txqueue = g_slist_remove(ms->txqueue, ms->txqueue->data);
+	}
 	if (ms->chat)
 		serv_got_chat_left(gc, ms->chat->id);
 
@@ -422,16 +424,18 @@
 		if (ms->chat)
 			add_chat_buddy(ms->chat, user);
 		ms->total++;
-		if (ms->txqueue) {
-			char *utf8 = str_to_utf8(ms->txqueue);
+		while (ms->txqueue) {
+			char *utf8 = str_to_utf8(ms->txqueue->data);
 			g_snprintf(buf, sizeof(buf), "MSG %d N %d\r\n%s%s", ++ms->trId,
 					strlen(MIME_HEADER) + strlen(utf8),
 					MIME_HEADER, utf8);
 			g_free(utf8);
-			g_free(ms->txqueue);
-			ms->txqueue = NULL;
-			if (msn_write(ms->fd, buf, strlen(buf)) < 0)
+			g_free(ms->txqueue->data);
+			ms->txqueue = g_slist_remove(ms->txqueue, ms->txqueue->data);
+			if (msn_write(ms->fd, buf, strlen(buf)) < 0) {
 				msn_kill_switch(ms);
+				return;
+			}
 			debug_printf("\n");
 		}
 	} else if (!g_strncasecmp(buf, "MSG", 3)) {
@@ -1194,7 +1198,15 @@
 	char buf[MSN_BUF_LEN];
 
 	if (ms) {
-		char *utf8 = str_to_utf8(message);
+		char *utf8;
+
+		if (ms->txqueue) {
+			debug_printf("appending to queue\n");
+			ms->txqueue = g_slist_append(ms->txqueue, g_strdup(message));
+			return 1;
+		}
+
+		utf8 = str_to_utf8(message);
 		g_snprintf(buf, sizeof(buf), "MSG %d N %d\r\n%s%s", ++ms->trId,
 				strlen(MIME_HEADER) + strlen(utf8),
 				MIME_HEADER, utf8);
@@ -1213,7 +1225,7 @@
 		ms = g_new0(struct msn_switchboard, 1);
 		md->switches = g_slist_append(md->switches, ms);
 		ms->user = g_strdup(who);
-		ms->txqueue = g_strdup(message);
+		ms->txqueue = g_slist_append(ms->txqueue, g_strdup(message));
 		ms->gc = gc;
 		ms->fd = -1;
 	} else
@@ -1233,8 +1245,10 @@
 	g_snprintf(buf, sizeof(buf), "MSG %d N %d\r\n%s%s", ++ms->trId,
 			strlen(MIME_HEADER) + strlen(message),
 			MIME_HEADER, message);
-	if (msn_write(ms->fd, buf, strlen(buf)) < 0)
+	if (msn_write(ms->fd, buf, strlen(buf)) < 0) {
 		msn_kill_switch(ms);
+		return 0;
+	}
 	debug_printf("\n");
 	serv_got_chat_in(gc, id, gc->username, 0, message, time(NULL));
 	return 0;
@@ -1457,6 +1471,14 @@
 	return m;
 }
 
+static void msn_convo_closed(struct gaim_connection *gc, char *who)
+{
+	struct msn_switchboard *ms = msn_find_switch(gc, who);
+
+	if (ms)
+		msn_kill_switch(ms);
+}
+
 static struct prpl *my_protocol = NULL;
 
 void msn_init(struct prpl *ret)
@@ -1480,6 +1502,7 @@
 	ret->normalize = msn_normalize;
 	ret->do_action = msn_do_action;
 	ret->actions = msn_actions;
+	ret->convo_closed = msn_convo_closed;
 
 	my_protocol = ret;
 }

[Gaim-commits] CVS: gaim TODO,1.122,1.123

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim
In directory usw-pr-cvs1:/tmp/cvs-serv32168

Modified Files:
	TODO 
Log Message:
spam! glorious spam.


Index: TODO
===================================================================
RCS file: /cvsroot/gaim/gaim/TODO,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- TODO	2001/10/18 20:56:59	1.122
+++ TODO	2001/10/23 21:39:44	1.123
@@ -46,10 +46,6 @@
 	New User Registration
 
 MSN:
-	Need to make it so txqueue is a GSList* of char* instead of char*, so
-		that you can "send" more than one message before you're
-		actually connected. This is actually a bug that it doesn't do
-		this already.
 	Permit/Deny
 	Need some way of indicating "invite" in IM window
 	File Transfer

[Gaim-commits] CVS: gaim/src aim.c,1.170,1.171

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv32168/src

Modified Files:
	aim.c 
Log Message:
spam! glorious spam.


Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.170
retrieving revision 1.171
diff -u -d -r1.170 -r1.171
--- aim.c	2001/10/19 20:34:08	1.170
+++ aim.c	2001/10/23 21:39:44	1.171
@@ -406,6 +406,7 @@
 	default:
 		debug_printf("caught signal %d\n", sig);
 		gtkspell_stop();
+		signoff_all(NULL, NULL);
 #ifdef GAIM_PLUGINS
 		remove_all_plugins();
 #endif

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.48,1.49

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv13975/protocols/oscar

Modified Files:
	oscar.c 
Log Message:
hi.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- oscar.c	2001/10/23 20:29:42	1.48
+++ oscar.c	2001/10/23 20:56:25	1.49
@@ -179,7 +179,6 @@
 static struct chat_connection *find_oscar_chat(struct gaim_connection *gc, int id) {
 	GSList *g = ((struct oscar_data *)gc->proto_data)->oscar_chats;
 	struct chat_connection *c = NULL;
-	if (gc->protocol != PROTO_OSCAR) return NULL;
 
 	while (g) {
 		c = (struct chat_connection *)g->data;
@@ -445,7 +444,8 @@
 		odata->icq = TRUE;
 		/* this is odd but it's necessary for a proper do_import and do_export */
 		gc->protocol = PROTO_ICQ;
-	}
+	} else
+		gc->protocol = PROTO_TOC;
 
 	sess = g_new0(aim_session_t, 1);
 
@@ -488,7 +488,6 @@
 
 static void oscar_close(struct gaim_connection *gc) {
 	struct oscar_data *odata = (struct oscar_data *)gc->proto_data;
-	if (gc->protocol != PROTO_OSCAR) return;
 	
 	while (odata->oscar_chats) {
 		struct chat_connection *n = odata->oscar_chats->data;

[Gaim-commits] CVS: gaim/src list.c,1.5,1.6

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv13975

Modified Files:
	list.c 
Log Message:
hi.


Index: list.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/list.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- list.c	2001/10/23 08:22:48	1.5
+++ list.c	2001/10/23 20:56:24	1.6
@@ -634,8 +634,7 @@
 
 	file = gaim_user_dir();
 	if (file != (char *)NULL) {
-		g_snprintf(path, sizeof path, "%s/%s.%d.blist", file, g_screenname,
-			   (gc->protocol == PROTO_OSCAR) ? PROTO_TOC : gc->protocol);
+		g_snprintf(path, sizeof path, "%s/%s.%d.blist", file, g_screenname, gc->protocol);
 		if (!stat(path, &sbuf)) {
 			debug_printf("%s exists.\n", path);
 			ret = TRUE;
@@ -675,8 +674,7 @@
 
 		file = gaim_user_dir();
 		if (file != (char *)NULL) {
-			sprintf(path, "%s/%s.%d.blist", file, g_screenname,
-				(gc->protocol == PROTO_OSCAR) ? PROTO_TOC : gc->protocol);
+			sprintf(path, "%s/%s.%d.blist", file, g_screenname, gc->protocol);
 			g_free(file);
 			g_free(g_screenname);
 		} else {
@@ -763,8 +761,7 @@
 
 	g_screenname = get_screenname_filename(g->username);
 
-	sprintf(path, "%s/%s.%d.blist", file, g_screenname,
-		(g->protocol == PROTO_OSCAR) ? PROTO_TOC : g->protocol);
+	sprintf(path, "%s/%s.%d.blist", file, g_screenname, g->protocol);
 	if ((f = fopen(path, "w"))) {
 		debug_printf("writing %s\n", path);
 		toc_build_config(g, buf, 8192 - 1, TRUE);

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.47,1.48

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory usw-pr-cvs1:/tmp/cvs-serv3603/protocols/oscar

Modified Files:
	oscar.c 
Log Message:
i don't like some people.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- oscar.c	2001/10/15 03:16:01	1.47
+++ oscar.c	2001/10/23 20:29:42	1.48
@@ -441,8 +441,11 @@
 	odata->create_exchange = 0;
 
 	debug_printf(_("Logging in %s\n"), user->username);
-	if (isdigit(*user->username))
+	if (isdigit(*user->username)) {
 		odata->icq = TRUE;
+		/* this is odd but it's necessary for a proper do_import and do_export */
+		gc->protocol = PROTO_ICQ;
+	}
 
 	sess = g_new0(aim_session_t, 1);
 

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.25,1.26

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory usw-pr-cvs1:/tmp/cvs-serv28480/protocols/msn

Modified Files:
	msn.c 
Log Message:
this should probably be in server.c.... oh well.


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- msn.c	2001/10/23 04:54:45	1.25
+++ msn.c	2001/10/23 10:40:42	1.26
@@ -1390,9 +1390,10 @@
 	return m;
 }
 
-static void msn_add_buddy(struct gaim_connection *gc, char *who)
+static void msn_add_buddy(struct gaim_connection *gc, char *name)
 {
 	struct msn_data *md = gc->proto_data;
+	char *who = msn_normalize(name);
 	char buf[MSN_BUF_LEN];
 	GSList *l = md->fl;
 

[Gaim-commits] CVS: gaim/src buddy.c,1.257,1.258

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv4300

Modified Files:
	buddy.c 
Log Message:
i've wanted this for a long time. it's the only reason i ever turn on the buttons at the bottom. and now i don't have to.


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -d -r1.257 -r1.258
--- buddy.c	2001/10/23 04:54:44	1.257
+++ buddy.c	2001/10/23 08:47:11	1.258
@@ -56,9 +56,7 @@
 #include "pixmaps/plugins_small.xpm"
 #endif
 #include "pixmaps/prefs_small.xpm"
-#ifdef NO_MULTI
 #include "pixmaps/search_small.xpm"
-#endif
 #ifdef USE_APPLET
 #include "pixmaps/close_small.xpm"
 #else
@@ -2361,6 +2359,8 @@
 				  GTK_SIGNAL_FUNC(chat_callback), 'c', GDK_CONTROL_MASK, "Ctl+C");
 	gaim_new_item_with_pixmap(menu, _("New Instant Message"), send_small_xpm,
 				  GTK_SIGNAL_FUNC(show_im_dialog), 'i', GDK_CONTROL_MASK, "Ctl+I");
+	gaim_new_item_with_pixmap(menu, _("Get User Info"), search_small_xpm,
+				  GTK_SIGNAL_FUNC(show_info_dialog), 'j', GDK_CONTROL_MASK, "Ctl+J");
 
 	gaim_separator(menu);
 

[Gaim-commits] CVS: gaim/src list.c,1.4,1.5 server.c,1.202,1.203

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv22190/src

Modified Files:
	list.c server.c 
Log Message:
try to do things more safely. dialogs.c is really what should be changed though.


Index: list.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/list.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- list.c	2001/10/19 09:21:00	1.4
+++ list.c	2001/10/23 08:22:48	1.5
@@ -106,6 +106,9 @@
 	struct group *g;
 	char *good;
 
+	if (!g_slist_find(connections, gc))
+		return NULL;
+
 	if ((b = find_buddy(gc, buddy)) != NULL)
 		return b;
 
@@ -145,6 +148,8 @@
 	struct group *g = find_group(gc, group);
 	if (g)
 		return g;
+	if (!g_slist_find(connections, gc))
+		return NULL;
 	g = (struct group *)g_new0(struct group, 1);
 	if (!g)
 		return NULL;
@@ -170,6 +175,8 @@
 
 	strcpy(grpname, normalize (group));
 	if (gc) {
+		if (!g_slist_find(connections, gc))
+			return NULL;
 		grp = gc->groups;
 		while (grp) {
 			g = (struct group *)grp->data;
@@ -278,6 +285,8 @@
 	char *(*norm)(const char *);
 
 	if (gc) {
+		if (!g_slist_find(connections, gc))
+			return NULL;
 		if (gc->prpl->normalize)
 			norm = gc->prpl->normalize;
 		else

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -d -r1.202 -r1.203
--- server.c	2001/10/19 07:58:07	1.202
+++ server.c	2001/10/23 08:22:48	1.203
@@ -162,21 +162,21 @@
 
 void serv_get_dir(struct gaim_connection *g, char *name)
 {
-	if (g && g->prpl && g->prpl->get_dir)
+	if (g && g_slist_find(connections, g) && g->prpl && g->prpl->get_dir)
 		(*g->prpl->get_dir)(g, name);
 }
 
 void serv_set_dir(struct gaim_connection *g, char *first, char *middle, char *last, char *maiden,
 		  char *city, char *state, char *country, int web)
 {
-	if (g && g->prpl && g->prpl->set_dir)
+	if (g && g_slist_find(connections, g) && g->prpl && g->prpl->set_dir)
 		(*g->prpl->set_dir)(g, first, middle, last, maiden, city, state, country, web);
 }
 
 void serv_dir_search(struct gaim_connection *g, char *first, char *middle, char *last, char *maiden,
 		     char *city, char *state, char *country, char *email)
 {
-	if (g && g->prpl && g->prpl->dir_search)
+	if (g && g_slist_find(connections, g) && g->prpl && g->prpl->dir_search)
 		(*g->prpl->dir_search)(g, first, middle, last, maiden, city, state, country, email);
 }
 
@@ -218,7 +218,7 @@
 
 void serv_set_info(struct gaim_connection *g, char *info)
 {
-	if (g->prpl && g->prpl->set_info) {
+	if (g && g_slist_find(connections, g) && g->prpl && g->prpl->set_info) {
 		plugin_event(event_set_info, g, info, 0, 0);
 		(*g->prpl->set_info)(g, info);
 	}
@@ -226,19 +226,19 @@
 
 void serv_change_passwd(struct gaim_connection *g, char *orig, char *new)
 {
-	if (g->prpl && g->prpl->change_passwd)
+	if (g && g_slist_find(connections, g) && g->prpl && g->prpl->change_passwd)
 		(*g->prpl->change_passwd)(g, orig, new);
 }
 
 void serv_add_buddy(struct gaim_connection *g, char *name)
 {
-	if (g->prpl && g->prpl->add_buddy)
+	if (g && g_slist_find(connections, g) && g->prpl && g->prpl->add_buddy)
 		(*g->prpl->add_buddy)(g, name);
 }
 
 void serv_add_buddies(struct gaim_connection *g, GList *buddies)
 {
-	if (g->prpl) {
+	if (g && g_slist_find(connections, g) && g->prpl) {
 		if (g->prpl->add_buddies)
 			(*g->prpl->add_buddies)(g, buddies);
 		else if (g->prpl->add_buddy)
@@ -252,12 +252,14 @@
 
 void serv_remove_buddy(struct gaim_connection *g, char *name)
 {
-	if (g->prpl && g->prpl->remove_buddy)
+	if (g && g_slist_find(connections, g) && g->prpl && g->prpl->remove_buddy)
 		(*g->prpl->remove_buddy)(g, name);
 }
 
 void serv_remove_buddies(struct gaim_connection *gc, GList *g)
 {
+	if (!g_slist_find(connections, gc))
+		return;
 	if (!gc->prpl)
 		return;		/* how the hell did that happen? */
 	if (gc->prpl->remove_buddies)
@@ -272,25 +274,25 @@
 
 void serv_add_permit(struct gaim_connection *g, char *name)
 {
-	if (g->prpl && g->prpl->add_permit)
+	if (g && g_slist_find(connections, g) && g->prpl && g->prpl->add_permit)
 		(*g->prpl->add_permit)(g, name);
 }
 
 void serv_add_deny(struct gaim_connection *g, char *name)
 {
-	if (g->prpl && g->prpl->add_deny)
+	if (g && g_slist_find(connections, g) && g->prpl && g->prpl->add_deny)
 		(*g->prpl->add_deny)(g, name);
 }
 
 void serv_rem_permit(struct gaim_connection *g, char *name)
 {
-	if (g->prpl && g->prpl->rem_permit)
+	if (g && g_slist_find(connections, g) && g->prpl && g->prpl->rem_permit)
 		(*g->prpl->rem_permit)(g, name);
 }
 
 void serv_rem_deny(struct gaim_connection *g, char *name)
 {
-	if (g->prpl && g->prpl->rem_deny)
+	if (g && g_slist_find(connections, g) && g->prpl && g->prpl->rem_deny)
 		(*g->prpl->rem_deny)(g, name);
 }
 
@@ -299,26 +301,26 @@
 	/* this is called when either you import a buddy list, and make lots of changes that way,
 	 * or when the user toggles the permit/deny mode in the prefs. In either case you should
 	 * probably be resetting and resending the permit/deny info when you get this. */
-	if (g->prpl && g->prpl->set_permit_deny)
+	if (g && g_slist_find(connections, g) && g->prpl && g->prpl->set_permit_deny)
 		(*g->prpl->set_permit_deny)(g);
 }
 
 
 void serv_set_idle(struct gaim_connection *g, int time)
 {
-	if (g->prpl && g->prpl->set_idle)
+	if (g && g_slist_find(connections, g) && g->prpl && g->prpl->set_idle)
 		(*g->prpl->set_idle)(g, time);
 }
 
 void serv_warn(struct gaim_connection *g, char *name, int anon)
 {
-	if (g->prpl && g->prpl->warn)
+	if (g && g_slist_find(connections, g) && g->prpl && g->prpl->warn)
 		(*g->prpl->warn)(g, name, anon);
 }
 
 void serv_join_chat(struct gaim_connection *g, GList *data)
 {
-	if (g->prpl && g->prpl->join_chat)
+	if (g && g_slist_find(connections, g) && g->prpl && g->prpl->join_chat)
 		(*g->prpl->join_chat)(g, data);
 }
 
@@ -326,7 +328,7 @@
 {
 	char *buffy = message && *message ? g_strdup(message) : NULL;
 	plugin_event(event_chat_send_invite, g, (void *)id, name, &buffy);
-	if (g->prpl && g->prpl->chat_invite)
+	if (g && g_slist_find(connections, g) && g->prpl && g->prpl->chat_invite)
 		(*g->prpl->chat_invite)(g, id, buffy, name);
 	if (buffy)
 		g_free(buffy);
@@ -334,8 +336,6 @@
 
 void serv_chat_leave(struct gaim_connection *g, int id)
 {
-	/* i think this is the only one this should be necessary for since this is the
-	 * only thing that could possibly get called after the connection is closed */
 	if (!g_slist_find(connections, g))
 		return;
 

[Gaim-commits] CVS: gaim/src prpl.c,1.43,1.44

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv20613

Modified Files:
	prpl.c 
Log Message:
fine. whatever.


Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- prpl.c	2001/10/23 04:54:45	1.43
+++ prpl.c	2001/10/23 08:15:00	1.44
@@ -546,7 +546,8 @@
 
 static void do_add(gpointer x, struct got_add *ga)
 {
-	show_add_buddy(ga->gc, ga->who, NULL, ga->alias);
+	if (g_slist_find(connections, ga->gc))
+		show_add_buddy(ga->gc, ga->who, NULL, ga->alias);
 }
 
 void show_got_added(struct gaim_connection *gc, const char *id,

[Gaim-commits] CVS: gaim/plugins chatlist.c,1.4,1.5

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/plugins
In directory usw-pr-cvs1:/tmp/cvs-serv18712/plugins

Modified Files:
	chatlist.c 
Log Message:
heh. this was pointless.


Index: chatlist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/chatlist.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- chatlist.c	2001/10/03 09:48:33	1.4
+++ chatlist.c	2001/10/23 08:06:09	1.5
@@ -208,7 +208,7 @@
 
 static void refresh_list(GtkWidget *w, gpointer *m)
 {
-	grab_url("http://www.aol.com/community/chat/allchats.html", ref_list_callback, NULL);
+	grab_url("http://www.aol.com/community/chat/allchats.html", FALSE, ref_list_callback, NULL);
 }
 
 static void add_chat(GtkWidget *w, gpointer *m)

[Gaim-commits] CVS: gaim/src gaim.h,1.286,1.287 html.c,1.22,1.23

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv18712/src

Modified Files:
	gaim.h html.c 
Log Message:
heh. this was pointless.


Index: gaim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gaim.h,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -d -r1.286 -r1.287
--- gaim.h	2001/10/23 04:05:52	1.286
+++ gaim.h	2001/10/23 08:06:09	1.287
@@ -337,7 +337,7 @@
 extern gint sort_awaymsg_list(gconstpointer, gconstpointer);
 
 /* Functions in html.c */
-extern void grab_url(char *, void (*callback)(gpointer, char *), gpointer);
+extern void grab_url(char *, gboolean, void (*callback)(gpointer, char *), gpointer);
 extern gchar *strip_html(gchar *);
 
 /* Functions in idle.c */

Index: html.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/html.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- html.c	2001/10/18 20:56:59	1.22
+++ html.c	2001/10/23 08:06:09	1.23
@@ -117,13 +117,15 @@
 	gpointer data;
 	struct g_url *website;
 	char *url;
+	gboolean full;
 
 	int inpa;
 
 	gboolean sentreq;
+	gboolean newline;
+	gboolean startsaving;
 	char *webdata;
 	int len;
-	gboolean startsaving;
 };
 
 static void grab_url_callback(gpointer dat, gint sock, GaimInputCondition cond)
@@ -141,7 +143,8 @@
 
 	if (!gunk->sentreq) {
 		char buf[256];
-		g_snprintf(buf, sizeof(buf), "GET /%s HTTP/1.0\r\n\r\n", gunk->website->page);
+		g_snprintf(buf, sizeof(buf), "GET %s%s HTTP/1.0\r\n\r\n", gunk->full ? "" : "/",
+			   gunk->full ? gunk->url : gunk->website->page);
 		debug_printf("Request: %s\n", buf);
 		write(sock, buf, strlen(buf));
 		fcntl(sock, F_SETFL, O_NONBLOCK);
@@ -156,17 +159,22 @@
 			return;
 		}
 
-		if (!gunk->startsaving && data == '<') {
-			if (gunk->webdata)
-				g_free(gunk->webdata);
-			gunk->webdata = NULL;
-			gunk->len = 0;
-			gunk->startsaving = 1;
+		if (!gunk->startsaving) {
+			if (data == '\r')
+				return;
+			if (data == '\n') {
+				if (gunk->newline)
+					gunk->startsaving = TRUE;
+				else
+					gunk->newline = TRUE;
+				return;
+			}
+			gunk->newline = FALSE;
+		} else {
+			gunk->len++;
+			gunk->webdata = g_realloc(gunk->webdata, gunk->len);
+			gunk->webdata[gunk->len - 1] = data;
 		}
-
-		gunk->len++;
-		gunk->webdata = g_realloc(gunk->webdata, gunk->len);
-		gunk->webdata[gunk->len - 1] = data;
 	} else if (errno != ETIMEDOUT) {
 
 		gunk->webdata = g_realloc(gunk->webdata, gunk->len + 1);
@@ -194,7 +202,7 @@
 	}
 }
 
-void grab_url(char *url, void (*callback)(gpointer, char *), gpointer data)
+void grab_url(char *url, gboolean full, void (*callback)(gpointer, char *), gpointer data)
 {
 	int sock;
 	struct grab_url_data *gunk = g_new0(struct grab_url_data, 1);
@@ -203,6 +211,7 @@
 	gunk->data = data;
 	gunk->url = g_strdup(url);
 	gunk->website = parse_url(url);
+	gunk->full = full;
 
 	if ((sock = proxy_connect(gunk->website->address, gunk->website->port,
 				  grab_url_callback, gunk)) < 0) {

[Gaim-commits] CVS: gaim/src/protocols/toc toc.c,1.28,1.29

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/toc
In directory usw-pr-cvs1:/tmp/cvs-serv18712/src/protocols/toc

Modified Files:
	toc.c 
Log Message:
heh. this was pointless.


Index: toc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/toc/toc.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- toc.c	2001/10/17 20:24:11	1.28
+++ toc.c	2001/10/23 08:06:09	1.29
@@ -768,7 +768,7 @@
 				gc->user->proto_opt[USEROPT_AUTHPORT][0] ?
 					atoi(gc->user->proto_opt[USEROPT_AUTHPORT]) : TOC_PORT,
 				url);
-		grab_url(tmp, toc_got_info, NULL);
+		grab_url(tmp, FALSE, toc_got_info, NULL);
 	} else if (!strcasecmp(c, "DIR_STATUS")) {
 	} else if (!strcasecmp(c, "ADMIN_NICK_STATUS")) {
 	} else if (!strcasecmp(c, "ADMIN_PASSWD_STATUS")) {

[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.56,1.57

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv22248

Modified Files:
	gtkimhtml.c 
Log Message:
thanks to Dennis Lambe Jr. (malsyned).

Several of you will probably wonder why I put it in gtkimhtml.c instead of conversation.c like the rest of the smilies. (Dennis also put it in gtkimhtml.c.)

gtkimhtml.c strives to be more or less compatible and identical with winaim (though fewer bugs ;) ). winaim parses out :-d. winaim doesn't parse any of the ones in conversation.c though. So if winaim parses it, it goes in gtkimhtml.c.


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- gtkimhtml.c	2001/10/19 20:59:58	1.56
+++ gtkimhtml.c	2001/10/23 04:59:46	1.57
@@ -2016,6 +2016,7 @@
 
 	gtk_imhtml_associate_smiley (imhtml, ":-X", crossedlips_xpm);
 	gtk_imhtml_associate_smiley (imhtml, ":-D", bigsmile_xpm);
+	gtk_imhtml_associate_smiley (imhtml, ":-d", bigsmile_xpm);
 	gtk_imhtml_associate_smiley (imhtml, "O:-)", angel_xpm);
 }
 

[Gaim-commits] CVS: gaim/src/protocols/icq gaim_icq.c,1.16,1.17

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/icq
In directory usw-pr-cvs1:/tmp/cvs-serv21652/src/protocols/icq

Modified Files:
	gaim_icq.c 
Log Message:
add


Index: gaim_icq.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/icq/gaim_icq.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- gaim_icq.c	2001/10/16 18:12:33	1.16
+++ gaim_icq.c	2001/10/23 04:54:45	1.17
@@ -245,19 +245,52 @@
 	return;
 }
 
+static void icq_recv_add(icq_Link *link, unsigned long id, unsigned char hour, unsigned char minute,
+		unsigned char day, unsigned char month, unsigned short year, const char *nick,
+		const char *first, const char *last, const char *email)
+{
+	char uin[16];
+	g_snprintf(uin, sizeof(uin), "%ld", id);
+	show_got_added(link->icq_UserData, NULL, uin, nick, NULL);
+}
+
 struct icq_auth {
 	icq_Link *link;
+	char *nick;
 	unsigned long uin;
+	struct gaim_connection *gc;
 };
 
 static void icq_den_auth(gpointer x, struct icq_auth *iq)
 {
+	g_free(iq->nick);
 	g_free(iq);
 }
 
+static void icq_add_after_auth(gpointer x, struct icq_auth *iq)
+{
+	char uin[16];
+	g_snprintf(uin, sizeof(uin), "%ld", iq->uin);
+	show_add_buddy(iq->gc, uin, NULL, iq->nick);
+}
+
 static void icq_acc_auth(gpointer x, struct icq_auth *iq)
 {
+	char msg[1024];
+	char uin[16];
+	struct icq_auth *iqnew;
+	
 	icq_SendAuthMsg(iq->link, iq->uin);
+
+	g_snprintf(uin, sizeof(uin), "%ld", iq->uin);
+	if (find_buddy(iq->gc, uin))
+		return;
+
+	iqnew = g_memdup(iq, sizeof(struct icq_auth));
+	iqnew->nick = g_strdup(iq->nick);
+
+	g_snprintf(msg, sizeof(msg), "Add %ld to your buddy list?", iq->uin);
+	do_ask_dialog(msg, iqnew, icq_add_after_auth, icq_den_auth);
 }
 
 static void icq_auth_req(icq_Link *link, unsigned long uin, unsigned char hour, unsigned char minute,
@@ -267,7 +300,9 @@
 	char msg[8192];
 	struct icq_auth *iq = g_new0(struct icq_auth, 1);
 	iq->link = link;
+	iq->nick = g_strdup(nick);
 	iq->uin = uin;
+	iq->gc = link->icq_UserData;
 
 	g_snprintf(msg, sizeof(msg), "The user %s (%s%s%s%s%s) wants you to authorize them.",
 			nick, first ? first : "", first && last ? " " : "", last ? last : "",
@@ -295,6 +330,7 @@
 	link->icq_RecvURL = icq_url_incoming;
 	link->icq_RecvWebPager = icq_web_pager;
 	link->icq_RecvMailExpress = icq_mail_express;
+	link->icq_RecvAdded = icq_recv_add;
 	link->icq_RecvAuthReq = icq_auth_req;
 	link->icq_UserOnline = icq_user_online;
 	link->icq_UserOffline = icq_user_offline;

[Gaim-commits] CVS: gaim/src/protocols/yahoo yay.c,1.20,1.21

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/yahoo
In directory usw-pr-cvs1:/tmp/cvs-serv21652/src/protocols/yahoo

Modified Files:
	yay.c 
Log Message:
add


Index: yay.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yay.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- yay.c	2001/10/18 20:56:59	1.20
+++ yay.c	2001/10/23 04:54:45	1.21
@@ -174,7 +174,6 @@
 	char *id;
 	char *who;
 	char *msg;
-	char buf[2048];
 
 	va_start(ap, sess);
 	id = va_arg(ap, char *);
@@ -182,9 +181,7 @@
 	msg = va_arg(ap, char *);
 	va_end(ap);
 
-	g_snprintf(buf, sizeof(buf), _("%s has made %s their buddy%s%s"), who, id,
-			msg ? ": " : "", msg ? msg : "");
-	do_error_dialog(buf, _("Gaim - Buddy"));
+	show_got_added(sess->user_data, id, who, NULL, msg);
 
 	return 1;
 }

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.24,1.25

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory usw-pr-cvs1:/tmp/cvs-serv21652/src/protocols/msn

Modified Files:
	msn.c 
Log Message:
add


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- msn.c	2001/10/18 20:56:59	1.24
+++ msn.c	2001/10/23 04:54:45	1.25
@@ -595,6 +595,8 @@
 		signoff(map->gc);
 		return;
 	}
+
+	show_got_added(map->gc, NULL, map->user, map->friend, NULL);
 }
 
 static void msn_cancel_add(gpointer w, struct msn_add_permit *map)

[Gaim-commits] CVS: gaim/src buddy.c,1.256,1.257 conversation.c,1.284,1.285 dialogs.c,1.269,1.270 prpl.c,1.42,1.43 prpl.h,1.52,1.53 ui.h,1.13,1.14

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv21652/src

Modified Files:
	buddy.c conversation.c dialogs.c prpl.c prpl.h ui.h 
Log Message:
add


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -d -r1.256 -r1.257
--- buddy.c	2001/10/22 00:58:13	1.256
+++ buddy.c	2001/10/23 04:54:44	1.257
@@ -1310,7 +1310,7 @@
 			gc = (struct gaim_connection *)type;
 		}
 	}
-	show_add_buddy(gc, NULL, grp);
+	show_add_buddy(gc, NULL, grp, NULL);
 
 }
 

Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -d -r1.284 -r1.285
--- conversation.c	2001/10/19 08:01:41	1.284
+++ conversation.c	2001/10/23 04:54:45	1.285
@@ -547,7 +547,7 @@
 		update_convo_add_button(c);
 	} else {
 		if (c->gc)
-			show_add_buddy(c->gc, c->name, NULL);
+			show_add_buddy(c->gc, c->name, NULL, NULL);
 	}
 
 	gtk_widget_grab_focus(c->entry);

Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -d -r1.269 -r1.270
--- dialogs.c	2001/10/22 21:05:27	1.269
+++ dialogs.c	2001/10/23 04:54:45	1.270
@@ -869,7 +869,7 @@
 
 }
 
-void show_add_buddy(struct gaim_connection *gc, char *buddy, char *group)
+void show_add_buddy(struct gaim_connection *gc, char *buddy, char *group, char *alias)
 {
 	GtkWidget *mainbox;
 	GtkWidget *frame;
@@ -922,6 +922,8 @@
 
 	a->entry_for_alias = gtk_entry_new();
 	gtk_table_attach_defaults(GTK_TABLE(table), a->entry_for_alias, 1, 2, 1, 2);
+	if (alias != NULL)
+		gtk_entry_set_text(GTK_ENTRY(a->entry_for_alias), alias);
 
 	label = gtk_label_new(_("Group"));
 	gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, 2, 3);

Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- prpl.c	2001/10/19 21:27:07	1.42
+++ prpl.c	2001/10/23 04:54:45	1.43
@@ -529,3 +529,47 @@
 	*len = 0;
 	return NULL;
 }
+
+struct got_add {
+	struct gaim_connection *gc;
+	char *who;
+	char *alias;
+};
+
+static void dont_add(gpointer x, struct got_add *ga)
+{
+	g_free(ga->who);
+	if (ga->alias)
+		g_free(ga->alias);
+	g_free(ga);
+}
+
+static void do_add(gpointer x, struct got_add *ga)
+{
+	show_add_buddy(ga->gc, ga->who, NULL, ga->alias);
+}
+
+void show_got_added(struct gaim_connection *gc, const char *id,
+		    const char *who, const char *alias, const char *msg)
+{
+	char buf[BUF_LONG];
+	struct got_add *ga = g_new0(struct got_add, 1);
+
+	ga->gc = gc;
+	ga->who = g_strdup(who);
+	ga->alias = alias ? g_strdup(alias) : NULL;
+
+	g_snprintf(buf, sizeof(buf), _("%s%s%s%s has made %s their buddy%s%s%s"),
+		   who,
+		   alias ? " (" : "",
+		   alias ? alias : "",
+		   alias ? ")" : "",
+		   id ? id : gc->displayname[0] ? gc->displayname : gc->username,
+		   msg ? ": " : ".",
+		   msg ? msg : "",
+		   find_buddy(gc, ga->who) ? "" : _("\n\nDo you wish to add them to your buddy list?"));
+	if (find_buddy(gc, ga->who))
+		do_error_dialog(buf, "Added to List");
+	else
+		do_ask_dialog(buf, ga, do_add, dont_add);
+}

Index: prpl.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- prpl.h	2001/10/18 20:56:59	1.52
+++ prpl.h	2001/10/23 04:54:45	1.53
@@ -160,6 +160,9 @@
 extern struct prpl *find_prpl(int);
 extern void do_proto_menu();
 
+extern void show_got_added(struct gaim_connection *, const char *,
+			   const char *, const char *, const char *);
+
 extern void do_ask_dialog(const char *, void *, void *, void *);
 extern void do_prompt_dialog(const char *, const char *, void *, void *, void *);
 

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ui.h	2001/10/21 19:01:03	1.13
+++ ui.h	2001/10/23 04:54:45	1.14
@@ -364,7 +364,7 @@
 extern void show_warn_dialog(struct gaim_connection *, char *);
 extern void show_im_dialog();
 extern void show_info_dialog();
-extern void show_add_buddy(struct gaim_connection *, char *, char *);
+extern void show_add_buddy(struct gaim_connection *, char *, char *, char *);
 extern void show_add_group(struct gaim_connection *);
 extern void show_add_perm(struct gaim_connection *, char *, gboolean);
 extern void destroy_all_dialogs();