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

[Gaim-commits] CVS: gaim/src/protocols/irc irc.c,1.55,1.56

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

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

Modified Files:
	irc.c 
Log Message:
this actually doesn't change anything, unless you want to use gtk2.


Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- irc.c	2001/11/07 11:14:33	1.55
+++ irc.c	2001/11/15 22:47:04	1.56
@@ -725,7 +725,7 @@
 				rename_chat_buddy(b, tmp, buf);
 				r = b->in_room;
 				g_free(tmp);
-				break;;
+				break;
 			} else
 				r = r->next;
 		}

[Gaim-commits] CVS: gaim/plugins lagmeter.c,1.19,1.20 spellchk.c,1.20,1.21

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

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

Modified Files:
	lagmeter.c spellchk.c 
Log Message:
this actually doesn't change anything, unless you want to use gtk2.


Index: lagmeter.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/lagmeter.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- lagmeter.c	2001/11/04 10:46:38	1.19
+++ lagmeter.c	2001/11/15 22:47:02	1.20
@@ -206,7 +206,7 @@
 		return;
 	}
 
-	confdlg = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(confdlg);
 	gtk_window_set_title(GTK_WINDOW(confdlg), "Gaim Lag Delay");
 
 	box = gtk_hbox_new(FALSE, 0);

Index: spellchk.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/spellchk.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- spellchk.c	2001/06/02 02:58:03	1.20
+++ spellchk.c	2001/11/15 22:47:03	1.21
@@ -357,7 +357,7 @@
 	char *pair[2] = {"Replace", "With"};
 	
 	if (configwin) return;
-	configwin = gtk_window_new(GTK_WINDOW_DIALOG);
+	GAIM_DIALOG(configwin);
 	gtk_widget_set_usize(configwin, 450, 250);
 	gtk_window_set_title(GTK_WINDOW(configwin), "Spell Check Config");
 

[Gaim-commits] CVS: gaim ChangeLog,1.354,1.355 TODO,1.125,1.126 configure.ac,1.30,1.31

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

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

Modified Files:
	ChangeLog TODO configure.ac 
Log Message:
this actually doesn't change anything, unless you want to use gtk2.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -d -r1.354 -r1.355
--- ChangeLog	2001/11/15 10:12:20	1.354
+++ ChangeLog	2001/11/15 22:47:02	1.355
@@ -1,5 +1,8 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
+version 0.49:
+	* Can compile against GTK+ 2.0 (version 1.3.10)
+
 version 0.48 (11/18/2001):
 	* Right-click on links to open/copy URL
 	* Yahoo changes

Index: TODO
===================================================================
RCS file: /cvsroot/gaim/gaim/TODO,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- TODO	2001/10/24 10:23:48	1.125
+++ TODO	2001/11/15 22:47:02	1.126
@@ -75,10 +75,6 @@
 	There's probably 100 other things but since I've hardly used the Windows
 		client before I'm not sure what any of them are
 
-Future Plugins? :
-	ICQ through Oscar plugin (ICQ2000) (requires hacking libfaim :-/)
-		this would allow us to send SMS messages.
-
 ----
 THE UIS:
 
@@ -111,6 +107,8 @@
 		Have tooltips on the passing buddies on the ticker
 		Have a stock ticker (a plugin could easily make use of
 			GtkTicker)
+
+	Buddy Icons need to be converted to use new gdk-pixbuf (GTK2)
 
 
 Then, of course, are all the Bugs that need to be fixed

Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- configure.ac	2001/11/13 06:30:37	1.30
+++ configure.ac	2001/11/15 22:47:02	1.31
@@ -83,8 +83,9 @@
 AC_SUBST(STATIC_LINK_LIBS)
 AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init void static_proto_init() { $load_proto })
 
+AC_ARG_ENABLE(gtk2,    [  --enable-gtk2           compile using GTK 2 (BROKEN)],,enable_gtk2=no)
 AC_ARG_ENABLE(gnome,   [  --disable-gnome         compile without Gnome bits],,enable_gnome=yes)
-AC_ARG_ENABLE(pixbuf,   [  --disable-pixbuf        compile without GdkPixbuf (needed for Buddy Icons)],,enable_pixbuf=yes)
+AC_ARG_ENABLE(pixbuf,  [  --disable-pixbuf        compile without GdkPixbuf (needed for Buddy Icons)],,enable_pixbuf=yes)
 AC_ARG_ENABLE(panel,   [  --enable-panel          compile as a GNOME applet],,enable_panel=$enable_distrib)
 
 AM_CONDITIONAL(GNOMEAPPLET, test "x$enable_panel" = "xyes")
@@ -104,6 +105,32 @@
 	AC_DEFINE(DEBUG)
 fi
 
+if test "x$enable_gtk2" = "xyes" ; then
+	dnl AM_PATH_GTK_2_0(1.3.10,[
+	dnl		enable_gnome=no
+	dnl		enable_pixbuf=no
+	dnl		CFLAGS="$CFLAGS -DGTK_ENABLE_BROKEN"
+	dnl		UI_LIBS="$UI_LIBS $GTK_LIBS"
+	dnl		],enable_gtk2=no)
+
+	AC_PATH_PROG(pkgcfg, pkg-config)
+	if test "x$pkgcfg" = "x" ; then
+		enable_gtk2=no
+	else
+		GTK_VER=`$pkgcfg gtk+-2.0 --modversion 2>/dev/null`
+		if test "x$GTK_VER" = "x" ; then
+			enable_gtk2=no
+		else
+			GTK_CFLAGS=`$pkgcfg gtk+-2.0 --cflags`
+			CFLAGS="$CFLAGS -DGTK_ENABLE_BROKEN"
+			GTK_LIBS=`$pkgcfg gtk+-2.0 --libs`
+			UI_LIBS="$UI_LIBS $GTK_LIBS"
+			enable_gnome=no
+			enable_pixbuf=no
+		fi
+	fi
+fi
+
 if test "x$enable_gnome" = "xyes" ; then
 	if test "x$enable_panel" = "xyes" ; then
 		GNOME_INIT(applets)
@@ -139,7 +166,7 @@
 	fi
 fi
 
-if test "x$enable_gnome" != "xyes" ; then
+if test "x$enable_gnome" != "xyes" -a "x$enable_gtk2" != "xyes" ; then
 	AM_PATH_GLIB(1.2.3,,AC_MSG_ERROR([
 *** GLib is required to build Gaim; please make sure you have the GLib
 *** development headers installed. The latest version of GLib is
@@ -393,24 +420,35 @@
 echo $PACKAGE $VERSION
 
 echo
-echo Allow Multiple Connections.. : $enable_multi
-echo Build Protocol Plugins...... : $enable_prpls
-echo Protocols to link statically : $STATIC_PRPLS
+echo Allow Multiple Connections.... : $enable_multi
+echo Build Protocol Plugins........ : $enable_prpls
+echo Protocols to link statically.. : $STATIC_PRPLS
 echo
-echo Build with GNOME bits....... : $enable_gnome
-echo Use GdkPixbuf for Icons..... : $use_pixbuf
-echo Build as GNOME applet....... : $enable_panel
+if test "x$enable_panel" = "xyes" ; then
+	echo UI Library.................... : GNOME Panel
+elif test "x$enable_gnome" = "xyes" ; then
+	echo UI Library.................... : GNOME App
+elif test "x$enable_gtk2" = "xyes" ; then
+	echo UI Library.................... : GTK+ 2.0
+else
+	echo UI Library.................... : GTK+ 1.2
+fi
+if test "x$enable_gtk2" = "xyes" ; then
+	echo Use GdkPixbuf for Buddy Icons. : yes
+else
+	echo Use GdkPixbuf for Buddy Icons. : $enable_pixbuf
+fi
 echo
-echo Build with Plugin support... : $enable_plugins
-echo Build with Perl support..... : $enable_perl
+echo Build with Plugin support..... : $enable_plugins
+echo Build with Perl support....... : $enable_perl
 echo
-echo Use XScreenSaver Extension.. : $enable_xss
+echo Use XScreenSaver Extension.... : $enable_xss
 echo
-echo Build with ESD.............. : $enable_esd
-echo Build with NAS.............. : $enable_nas
-echo Build with ArtsC............ : $enable_artsc
+echo Build with ESD................ : $enable_esd
+echo Build with NAS................ : $enable_nas
+echo Build with ArtsC.............. : $enable_artsc
 echo
-echo Print debugging messages.... : $enable_debug
+echo Print debugging messages...... : $enable_debug
 echo
 eval eval echo Gaim will be installed in $bindir.
 if test "x$gaimpath" != "x" ; then

[Gaim-commits] CVS: gaim/src/protocols/yahoo yahoo.c,1.11,1.12

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

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

Modified Files:
	yahoo.c 
Log Message:
this seems... i don't know.


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- yahoo.c	2001/11/15 22:26:13	1.11
+++ yahoo.c	2001/11/15 22:34:47	1.12
@@ -213,11 +213,11 @@
 	int pos = 0;
 
 	while (pos + 1 < len) {
-		char key[64], *value;
+		char key[64], *value = NULL;
+		int accept;
 		int x;
 
 		struct yahoo_pair *pair = g_new0(struct yahoo_pair, 1);
-		pkt->hash = g_slist_append(pkt->hash, pair);
 
 		x = 0;
 		while (pos + 1 < len) {
@@ -228,19 +228,28 @@
 		key[x] = 0;
 		pos += 2;
 		pair->key = strtol(key, NULL, 10);
+		accept = x; /* if x is 0 there was no key, so don't accept it */
 
-		value = g_malloc(len - pos + 1);
+		if (accept)
+			value = g_malloc(len - pos + 1);
 		x = 0;
 		while (pos + 1 < len) {
 			if (data[pos] == 0xc0 && data[pos + 1] == 0x80)
 				break;
-			value[x++] = data[pos++];
+			if (accept)
+				value[x++] = data[pos++];
 		}
-		value[x] = 0;
+		if (accept)
+			value[x] = 0;
 		pos += 2;
-		pair->value = g_strdup(value);
-		g_free(value);
-		debug_printf("Key: %d  \tValue: %s\n", pair->key, pair->value);
+		if (accept) {
+			pair->value = g_strdup(value);
+			g_free(value);
+			pkt->hash = g_slist_append(pkt->hash, pair);
+			debug_printf("Key: %d  \tValue: %s\n", pair->key, pair->value);
+		} else {
+			g_free(pair);
+		}
 	}
 }
 

[Gaim-commits] CVS: gaim/src/protocols/yahoo yahoo.c,1.10,1.11

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

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

Modified Files:
	yahoo.c 
Log Message:
Valdis Kletnieks (sysphrog) suggested this fix. This seems really odd to me. Typical Yahoo.


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- yahoo.c	2001/11/14 06:20:56	1.10
+++ yahoo.c	2001/11/15 22:26:13	1.11
@@ -229,7 +229,7 @@
 		pos += 2;
 		pair->key = strtol(key, NULL, 10);
 
-		value = g_malloc(len - pos);
+		value = g_malloc(len - pos + 1);
 		x = 0;
 		while (pos + 1 < len) {
 			if (data[pos] == 0xc0 && data[pos + 1] == 0x80)

[Gaim-commits] CVS: gaim/src conversation.c,1.292,1.293

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

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

Modified Files:
	conversation.c 
Log Message:
shit


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -d -r1.292 -r1.293
--- conversation.c	2001/11/10 08:02:39	1.292
+++ conversation.c	2001/11/15 20:18:07	1.293
@@ -2018,13 +2018,13 @@
 
 void set_convo_gc(struct conversation *c, struct gaim_connection *gc)
 {
+	if (gc)
+		gtk_option_menu_set_history(GTK_OPTION_MENU(c->menu), g_slist_index(connections, gc));
+
 	if (c->gc == gc)
 		return;
 
 	c->gc = gc;
-
-	if (gc)
-		gtk_option_menu_set_history(GTK_OPTION_MENU(c->menu), g_slist_index(connections, gc));
 
 	update_buttons_by_protocol(c);
 

[Gaim-commits] CVS: gaim NEWS,1.98,1.99

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

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

Modified Files:
	NEWS 
Log Message:
do do do dooo doo


Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- NEWS	2001/11/15 10:12:20	1.98
+++ NEWS	2001/11/15 10:19:01	1.99
@@ -6,6 +6,7 @@
 	too much for me to say in this release. I'd just like to
 	thank Eric for his hard work. :)
 
+	Eric: Everybody mambo!
 
 0.47 (11/01/2001):
 	Rob: Hi. Gaim v0.47 has been released, as you should already

[Gaim-commits] CVS: gaim gaim.spec.in,1.29,1.30 ChangeLog,1.353,1.354 NEWS,1.97,1.98

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

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

Modified Files:
	gaim.spec.in ChangeLog NEWS 
Log Message:
:-)



Index: gaim.spec.in
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.spec.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- gaim.spec.in	2001/11/01 16:55:08	1.29
+++ gaim.spec.in	2001/11/15 10:12:20	1.30
@@ -99,6 +99,11 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Thu Nov 18 2001 Rob Flynn <ro...@ma...> (0.48 release)
+- Right-click on links to open/copy URL
+- Yahoo changes
+- Oscar can send/receive offline messages in ICQ. Since the "real" ICQ protocol isn't working too well it's recommended that you use Oscar for ICQ.
+
 * Thu Nov 01 2001 Rob Flynn <ro...@ma...> (0.47 release)
 - Better font loading (pays attention to charset now) (thanks Arkadiusz Miskiewicz)
 - Better recoding in Gadu-Gadu (thanks Arkadiusz Miskiewicz)

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -d -r1.353 -r1.354
--- ChangeLog	2001/11/10 08:02:39	1.353
+++ ChangeLog	2001/11/15 10:12:20	1.354
@@ -1,6 +1,6 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
-version 0.48:
+version 0.48 (11/18/2001):
 	* Right-click on links to open/copy URL
 	* Yahoo changes
 	* Oscar can send/receive offline messages in ICQ. Since the "real"

Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- NEWS	2001/11/01 21:13:36	1.97
+++ NEWS	2001/11/15 10:12:20	1.98
@@ -1,6 +1,11 @@
 -=[ Gaim ]=-  The Pimpin' Penguin AIM Clone That's Good For The Soul!
 
-0.48:
+0.48 (11/18/2001):
+	Rob: Hi! It's 4:12am! I'm watching The Simpsons. :). 
+	Oh boy, sleep! That's where I'm a viking! :) There's not
+	too much for me to say in this release. I'd just like to
+	thank Eric for his hard work. :)
+
 
 0.47 (11/01/2001):
 	Rob: Hi. Gaim v0.47 has been released, as you should already

[Gaim-commits] CVS: gaim/src/protocols/toc toc.c,1.32,1.33

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

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

Modified Files:
	toc.c 
Log Message:
eh.


Index: toc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/toc/toc.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- toc.c	2001/11/10 08:02:40	1.32
+++ toc.c	2001/11/15 08:19:46	1.33
@@ -1122,7 +1122,8 @@
 static void toc_chat_invite(struct gaim_connection *g, int id, char *message, char *name)
 {
 	char buf[BUF_LONG];
-	g_snprintf(buf, sizeof(buf) / 2, "toc_chat_invite %d \"%s\" %s", id, message, normalize(name));
+	g_snprintf(buf, sizeof(buf) / 2, "toc_chat_invite %d \"%s\" %s", id,
+			message ? message : "", normalize(name));
 	sflap_send(g, buf, -1, TYPE_DATA);
 }
 

[Gaim-commits] CVS: gaim/src prpl.c,1.46,1.47

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

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

Modified Files:
	prpl.c 
Log Message:
eh.


Index: prpl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- prpl.c	2001/11/02 01:41:37	1.46
+++ prpl.c	2001/11/14 23:42:14	1.47
@@ -470,7 +470,7 @@
 
 void set_icon_data(struct gaim_connection *gc, char *who, void *data, int len)
 {
-	struct icon_data tmp = { gc, who, NULL, 0 };
+	struct icon_data tmp = { gc, normalize(who), NULL, 0 };
 	GList *l = g_list_find_custom(icons, &tmp, find_icon_data);
 	struct icon_data *id = l ? l->data : NULL;
 
@@ -486,7 +486,7 @@
 		id = g_new0(struct icon_data, 1);
 		icons = g_list_append(icons, id);
 		id->gc = gc;
-		id->who = g_strdup(who);
+		id->who = g_strdup(normalize(who));
 	} else {
 		return;
 	}
@@ -518,7 +518,7 @@
 
 void *get_icon_data(struct gaim_connection *gc, char *who, int *len)
 {
-	struct icon_data tmp = { gc, who, NULL, 0 };
+	struct icon_data tmp = { gc, normalize(who), NULL, 0 };
 	GList *l = g_list_find_custom(icons, &tmp, find_icon_data);
 	struct icon_data *id = l ? l->data : NULL;
 

[Gaim-commits] CVS: gaim/src/protocols/oscar aim.h,1.18,1.19 aim_internal.h,1.8,1.9 ft.c,1.7,1.8 im.c,1.15,1.16 oscar.c,1.64,1.65

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

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

Modified Files:
	aim.h aim_internal.h ft.c im.c oscar.c 
Log Message:
these are changes i made, all by myself. aren't you impressed.

mid's going to change around im.c here in a minute anyway.


Index: aim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- aim.h	2001/11/10 08:02:39	1.18
+++ aim.h	2001/11/14 19:21:20	1.19
@@ -801,8 +801,10 @@
 faim_export fu16_t aim_iconsum(const fu8_t *buf, int buflen);
 faim_export int aim_send_im_direct(aim_session_t *, aim_conn_t *, const char *msg);
 faim_export const char *aim_directim_getsn(aim_conn_t *conn);
-faim_export aim_conn_t *aim_directim_initiate(aim_session_t *, aim_conn_t *, const char *destsn);
+faim_export aim_conn_t *aim_directim_initiate(aim_session_t *, const char *destsn);
 faim_export aim_conn_t *aim_directim_connect(aim_session_t *, const char *sn, const char *addr, const fu8_t *cookie);
+
+faim_export aim_conn_t *aim_sendfile_initiate(aim_session_t *, const char *destsn, const char *filename, fu16_t numfiles, fu32_t totsize);
 
 faim_export aim_conn_t *aim_getfile_initiate(aim_session_t *sess, aim_conn_t *conn, const char *destsn);
 faim_export int aim_oft_getfile_request(aim_session_t *sess, aim_conn_t *conn, const char *name, int size);

Index: aim_internal.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim_internal.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- aim_internal.h	2001/11/10 08:02:39	1.8
+++ aim_internal.h	2001/11/14 19:21:20	1.9
@@ -203,6 +203,8 @@
 
 faim_internal void faimdprintf(aim_session_t *sess, int dlevel, const char *format, ...);
 
+faim_internal int aim_request_directim(aim_session_t *sess, const char *destsn, fu8_t *ip, fu16_t port, fu8_t *ckret);
+faim_internal int aim_request_sendfile(aim_session_t *sess, const char *sn, const char *filename, fu16_t numfiles, fu32_t totsize, fu8_t *ip, fu16_t port, fu8_t *ckret);
 faim_internal void aim_conn_close_rend(aim_session_t *sess, aim_conn_t *conn);
 faim_internal void aim_conn_kill_rend(aim_session_t *sess, aim_conn_t *conn);
 

Index: ft.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/ft.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ft.c	2001/11/13 06:30:37	1.7
+++ ft.c	2001/11/14 19:21:20	1.8
@@ -190,10 +190,6 @@
 	return 0;
 } 
 
-/* XXX: give the client author the responsibility of setting up a
- * listener, then we no longer have a libfaim problem with broken
- * solaris *innocent smile* -jbm */
-
 static int getlocalip(fu8_t *ip)
 {
 	struct hostent *hptr;
@@ -213,88 +209,75 @@
 	return 0;
 }
 
-/* XXX this should probably go in im.c */
-static int aim_request_directim(aim_session_t *sess, aim_conn_t *conn, const char *destsn, fu8_t *ip, fu16_t port, fu8_t *ckret)
-{
+/**
+ * aim_directim_intitiate - For those times when we want to open up the directim channel ourselves.
+ * @sess: your session,
+ * @conn: the BOS conn,
+ * @priv: a dummy priv value (we'll let it get filled in later) (if you pass a %NULL, we alloc one)
+ * @destsn: the SN to connect to.
+ *
+ */
+faim_export aim_conn_t *aim_directim_initiate(aim_session_t *sess, const char *destsn)
+{ 
+	aim_conn_t *newconn;
+	aim_msgcookie_t *cookie;
+	struct aim_directim_intdata *priv;
+	int listenfd;
+	fu16_t port = 4443;
+	fu8_t localip[4];
 	fu8_t ck[8];
-	aim_frame_t *fr;
-	aim_snacid_t snacid;
-	aim_tlvlist_t *tl = NULL, *itl = NULL;
-	int hdrlen, i;
-	fu8_t *hdr;
-	aim_bstream_t hdrbs;
 
-	if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 256+strlen(destsn))))
-		return -ENOMEM;
-
-	snacid = aim_cachesnac(sess, 0x0004, 0x0006, 0x0000, NULL, 0);
-	aim_putsnac(&fr->data, 0x0004, 0x0006, 0x0000, snacid);
-
-	/* 
-	 * Generate a random message cookie 
-	 *
-	 * This cookie needs to be alphanumeric and NULL-terminated to be 
-	 * TOC-compatible.
-	 *
-	 * XXX have I mentioned these should be generated in msgcookie.c?
-	 *
-	 */
-	for (i = 0; i < 7; i++)
-	       	ck[i] = 0x30 + ((fu8_t) rand() % 10);
-	ck[7] = '\0';
-
-	if (ckret)
-		memcpy(ckret, ck, 8);
-
-	/* Cookie */
-	aimbs_putraw(&fr->data, ck, 8);
+	if (getlocalip(localip) == -1)
+		return NULL;
 
-	/* Channel */
-	aimbs_put16(&fr->data, 0x0002);
+	if ((listenfd = listenestablish(port)) == -1)
+		return NULL;
 
-	/* Destination SN */
-	aimbs_put8(&fr->data, strlen(destsn));
-	aimbs_putraw(&fr->data, destsn, strlen(destsn));
+	aim_request_directim(sess, destsn, localip, port, ck);
 
-	aim_addtlvtochain_noval(&tl, 0x0003);
+	cookie = (aim_msgcookie_t *)calloc(1, sizeof(aim_msgcookie_t));
+	memcpy(cookie->cookie, ck, 8);
+	cookie->type = AIM_COOKIETYPE_OFTIM;
 
-	hdrlen = 2+8+16+6+8+6+4;
-	hdr = malloc(hdrlen);
-	aim_bstream_init(&hdrbs, hdr, hdrlen);
+	/* this one is for the cookie */
+	priv = (struct aim_directim_intdata *)calloc(1, sizeof(struct aim_directim_intdata));
 
-	aimbs_put16(&hdrbs, 0x0000);
-	aimbs_putraw(&hdrbs, ck, 8);
-	aim_putcap(&hdrbs, AIM_CAPS_IMIMAGE);
+	memcpy(priv->cookie, ck, 8);
+	strncpy(priv->sn, destsn, sizeof(priv->sn));
+	cookie->data = priv;
+	aim_cachecookie(sess, cookie);
 
-	aim_addtlvtochain16(&itl, 0x000a, 0x0001);
-	aim_addtlvtochain_raw(&itl, 0x0003, 4, ip);
-	aim_addtlvtochain16(&itl, 0x0005, port);
-	aim_addtlvtochain_noval(&itl, 0x000f);
-	
-	aim_writetlvchain(&hdrbs, &itl);
+	/* XXX switch to aim_cloneconn()? */
+	if (!(newconn = aim_newconn(sess, AIM_CONN_TYPE_RENDEZVOUS_OUT, NULL))) {
+		close(listenfd);
+		return NULL;
+	}
 
-	aim_addtlvtochain_raw(&tl, 0x0005, aim_bstream_curpos(&hdrbs), hdr);
+	/* this one is for the conn */
+	priv = (struct aim_directim_intdata *)calloc(1, sizeof(struct aim_directim_intdata));
 
-	aim_writetlvchain(&fr->data, &tl);
+	memcpy(priv->cookie, ck, 8);
+	strncpy(priv->sn, destsn, sizeof(priv->sn));
 
-	free(hdr);
-	aim_freetlvchain(&itl);
-	aim_freetlvchain(&tl);
+	newconn->fd = listenfd;
+	newconn->subtype = AIM_CONN_SUBTYPE_OFT_DIRECTIM;
+	newconn->internal = priv;
+	newconn->lastactivity = time(NULL);
 
-	aim_tx_enqueue(sess, fr);
+	faimdprintf(sess, 2,"faim: listening (fd = %d, unconnected)\n", newconn->fd);
 
-	return 0;
+	return newconn;
 }
 
 /**
- * aim_directim_intitiate - For those times when we want to open up the directim channel ourselves.
+ * aim_sendfile_intitiate - For those times when we want to send the file ourselves.
  * @sess: your session,
  * @conn: the BOS conn,
- * @priv: a dummy priv value (we'll let it get filled in later) (if you pass a %NULL, we alloc one)
  * @destsn: the SN to connect to.
+ * @filename: the name of the files you want to send
  *
  */
-faim_export aim_conn_t *aim_directim_initiate(aim_session_t *sess, aim_conn_t *conn, const char *destsn)
+faim_export aim_conn_t *aim_sendfile_initiate(aim_session_t *sess, const char *destsn, const char *filename, fu16_t numfiles, fu32_t totsize)
 { 
 	aim_conn_t *newconn;
 	aim_msgcookie_t *cookie;
@@ -310,7 +293,7 @@
 	if ((listenfd = listenestablish(port)) == -1)
 		return NULL;
 
-	aim_request_directim(sess, conn, destsn, localip, port, ck);
+	aim_request_sendfile(sess, destsn, filename, numfiles, totsize, localip, port, ck);
 
 	cookie = (aim_msgcookie_t *)calloc(1, sizeof(aim_msgcookie_t));
 	memcpy(cookie->cookie, ck, 8);
@@ -337,14 +320,14 @@
 	strncpy(priv->sn, destsn, sizeof(priv->sn));
 
 	newconn->fd = listenfd;
-	newconn->subtype = AIM_CONN_SUBTYPE_OFT_DIRECTIM;
+	newconn->subtype = AIM_CONN_SUBTYPE_OFT_SENDFILE;
 	newconn->internal = priv;
 	newconn->lastactivity = time(NULL);
 
 	faimdprintf(sess, 2,"faim: listening (fd = %d, unconnected)\n", newconn->fd);
 
 	return newconn;
-} 
+}
 
 #if 0
 /**
@@ -776,6 +759,9 @@
  *
  * you need to call accept() when it's connected. returns your fd 
  *
+ * XXX: give the client author the responsibility of setting up a
+ * listener, then we no longer have a libfaim problem with broken
+ * solaris *innocent smile* -jbm
  */
 static int listenestablish(fu16_t portnum)
 {

Index: im.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/im.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- im.c	2001/11/10 01:48:17	1.15
+++ im.c	2001/11/14 19:21:20	1.16
@@ -449,6 +449,174 @@
 	return 0;
 }
 
+faim_internal int aim_request_directim(aim_session_t *sess, const char *destsn, fu8_t *ip, fu16_t port, fu8_t *ckret)
+{
+	aim_conn_t *conn;
+	fu8_t ck[8];
+	aim_frame_t *fr;
+	aim_snacid_t snacid;
+	aim_tlvlist_t *tl = NULL, *itl = NULL;
+	int hdrlen, i;
+	fu8_t *hdr;
+	aim_bstream_t hdrbs;
+
+	if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0004)))
+		return -EINVAL;
+
+	if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 256+strlen(destsn))))
+		return -ENOMEM;
+
+	snacid = aim_cachesnac(sess, 0x0004, 0x0006, 0x0000, NULL, 0);
+	aim_putsnac(&fr->data, 0x0004, 0x0006, 0x0000, snacid);
+
+	/* 
+	 * Generate a random message cookie 
+	 *
+	 * This cookie needs to be alphanumeric and NULL-terminated to be 
+	 * TOC-compatible.
+	 *
+	 * XXX have I mentioned these should be generated in msgcookie.c?
+	 *
+	 */
+	for (i = 0; i < 7; i++)
+	       	ck[i] = 0x30 + ((fu8_t) rand() % 10);
+	ck[7] = '\0';
+
+	if (ckret)
+		memcpy(ckret, ck, 8);
+
+	/* Cookie */
+	aimbs_putraw(&fr->data, ck, 8);
+
+	/* Channel */
+	aimbs_put16(&fr->data, 0x0002);
+
+	/* Destination SN */
+	aimbs_put8(&fr->data, strlen(destsn));
+	aimbs_putraw(&fr->data, destsn, strlen(destsn));
+
+	aim_addtlvtochain_noval(&tl, 0x0003);
+
+	hdrlen = 2+8+16+6+8+6+4;
+	hdr = malloc(hdrlen);
+	aim_bstream_init(&hdrbs, hdr, hdrlen);
+
+	aimbs_put16(&hdrbs, 0x0000);
+	aimbs_putraw(&hdrbs, ck, 8);
+	aim_putcap(&hdrbs, AIM_CAPS_IMIMAGE);
+
+	aim_addtlvtochain16(&itl, 0x000a, 0x0001);
+	aim_addtlvtochain_raw(&itl, 0x0003, 4, ip);
+	aim_addtlvtochain16(&itl, 0x0005, port);
+	aim_addtlvtochain_noval(&itl, 0x000f);
+	
+	aim_writetlvchain(&hdrbs, &itl);
+
+	aim_addtlvtochain_raw(&tl, 0x0005, aim_bstream_curpos(&hdrbs), hdr);
+
+	aim_writetlvchain(&fr->data, &tl);
+
+	free(hdr);
+	aim_freetlvchain(&itl);
+	aim_freetlvchain(&tl);
+
+	aim_tx_enqueue(sess, fr);
+
+	return 0;
+}
+
+faim_internal int aim_request_sendfile(aim_session_t *sess, const char *sn, const char *filename, fu16_t numfiles, fu32_t totsize, fu8_t *ip, fu16_t port, fu8_t *ckret)
+{
+	aim_conn_t *conn;
+	int i;
+	fu8_t ck[8];
+	aim_frame_t *fr;
+	aim_snacid_t snacid;
+
+	if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0004)))
+		return -EINVAL;
+
+	if (!sn || !filename)
+		return -EINVAL;
+
+	if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10+8+2+1+strlen(sn)+2+2+2+8+16+6+8+6+4+2+2+2+2+4+strlen(filename)+4)))
+		return -ENOMEM;
+
+	snacid = aim_cachesnac(sess, 0x0004, 0x0006, 0x0000, NULL, 0);
+	aim_putsnac(&fr->data, 0x0004, 0x0006, 0x0000, snacid);
+
+	for (i = 0; i < 7; i++)
+		aimutil_put8(ck+i, 0x30 + ((fu8_t) rand() % 10));
+	ck[7] = '\0';
+
+	if (ckret)
+		memcpy(ckret, ck, 8);
+
+	/*
+	 * Cookie
+	 */
+	aimbs_putraw(&fr->data, ck, 8);
+
+	/*
+	 * Channel (2)
+	 */
+	aimbs_put16(&fr->data, 0x0002);
+
+	/*
+	 * Dest sn
+	 */
+	aimbs_put8(&fr->data, strlen(sn));
+	aimbs_putraw(&fr->data, sn, strlen(sn));
+
+	/*
+	 * TLV t(0005)
+	 *
+	 * Encompasses everything below. Gee.
+	 */
+	aimbs_put16(&fr->data, 0x0005);
+	aimbs_put16(&fr->data, 2+8+16+6+8+6+4+2+2+2+2+4+strlen(filename)+4);
+
+	aimbs_put16(&fr->data, 0x0000);
+	aimbs_putraw(&fr->data, ck, 8);
+	aim_putcap(&fr->data, AIM_CAPS_SENDFILE);
+
+	/* TLV t(000a) */
+	aimbs_put16(&fr->data, 0x000a);
+	aimbs_put16(&fr->data, 0x0002);
+	aimbs_put16(&fr->data, 0x0001);
+
+	/* TLV t(0003) (IP) */
+	aimbs_put16(&fr->data, 0x0003);
+	aimbs_put16(&fr->data, 0x0004);
+	aimbs_putraw(&fr->data, ip, 4);
+
+	/* TLV t(0005) (port) */
+	aimbs_put16(&fr->data, 0x0005);
+	aimbs_put16(&fr->data, 0x0002);
+	aimbs_put16(&fr->data, port);
+
+	/* TLV t(000f) */
+	aimbs_put16(&fr->data, 0x000f);
+	aimbs_put16(&fr->data, 0x0000);
+
+	/* TLV t(2711) */
+	aimbs_put16(&fr->data, 0x2711);
+	aimbs_put16(&fr->data, 2+2+4+strlen(filename)+4);
+
+	/* ? */
+	aimbs_put16(&fr->data, 0x0001);
+	aimbs_put16(&fr->data, numfiles);
+	aimbs_put32(&fr->data, totsize);
+	aimbs_putraw(&fr->data, filename, strlen(filename));
+
+	/* ? */
+	aimbs_put32(&fr->data, 0x00000000);
+
+	aim_tx_enqueue(sess, fr);
+
+	return 0;
+}
+
 static int outgoingim(aim_session_t *sess, aim_module_t *mod, aim_frame_t *rx, aim_modsnac_t *snac, aim_bstream_t *bs)
 {
 	int i, ret = 0;

Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- oscar.c	2001/11/13 06:48:34	1.64
+++ oscar.c	2001/11/14 19:21:20	1.65
@@ -2588,7 +2588,7 @@
 	dim->gc = gc;
 	g_snprintf(dim->name, sizeof dim->name, "%s", data->who);
 
-	dim->conn = aim_directim_initiate(od->sess, od->conn, data->who);
+	dim->conn = aim_directim_initiate(od->sess, data->who);
 	if (dim->conn != NULL) {
 		od->direct_ims = g_slist_append(od->direct_ims, dim);
 		dim->watcher = gaim_input_add(dim->conn->fd, GAIM_INPUT_READ,

[Gaim-commits] CVS: gaim/src applet.c,1.23,1.24

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

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

Modified Files:
	applet.c 
Log Message:
fine


Index: applet.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/applet.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- applet.c	2001/10/27 08:27:40	1.23
+++ applet.c	2001/11/14 10:48:08	1.24
@@ -448,7 +448,11 @@
 		pm = gdk_pixmap_create_from_xpm_d(applet->window, NULL,
 				&applet->style->bg[GTK_WIDGET_STATE(applet)], aimicon_xpm);
 	icon = gtk_pixmap_new(pm, NULL);
-	gtk_widget_set_usize(icon, sizehint, sizehint);
+#ifdef HAVE_PANEL_PIXEL_SIZE
+	gtk_widget_set_usize(icon, 5, 5);
+#else
+	gtk_widget_set_usize(icon, 48, 48);
+#endif
 	gdk_pixmap_unref(pm);
 	applet_widget_add(APPLET_WIDGET(applet), icon);
 

[Gaim-commits] CVS: gaim/src/protocols/yahoo yahoo.c,1.9,1.10

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

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

Modified Files:
	yahoo.c 
Log Message:
this is what the old one did


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- yahoo.c	2001/11/11 18:07:45	1.9
+++ yahoo.c	2001/11/14 06:20:56	1.10
@@ -483,7 +483,18 @@
 	}
 
 	if (pkt->status == 1) {
+		char *m;
+		int i, j;
 		strip_linefeed(msg);
+		m = msg;
+		for (i = 0, j = 0; m[i]; i++) {
+			if (m[i] == 033) {
+				while (m[i] != 'm')
+					i++;
+				continue;
+			}
+			msg[j++] = m[i];
+		}
 		serv_got_im(gc, from, msg, 0, tm);
 	} else if (pkt->status == 2) {
 		do_error_dialog(_("Your message did not get sent."), _("Gaim - Error"));

[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.72,1.73

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

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

Modified Files:
	gtkimhtml.c 
Log Message:
this is better. not good, but better.


Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- gtkimhtml.c	2001/11/10 03:50:52	1.72
+++ gtkimhtml.c	2001/11/14 00:28:07	1.73
@@ -1853,6 +1853,8 @@
 				ret_font = gdk_fontset_load (tmp); \
 			g_free (tmp); \
 			if (ret_font) { \
+				g_free (newvals); \
+				g_strfreev (xnames); \
 				g_strfreev (xflds); \
 				g_strfreev (names); \
 				return ret_font; \
@@ -1868,94 +1870,110 @@
 {
 	GdkFont *default_font = imhtml->default_font;
 	gchar *default_name;
-	gchar **xflds;
-
-	gchar *newvals[16];
-	gint i;
-	gchar **names;
-	gchar fs[10];
-
-	gchar *tmp;
-	GdkFont *ret_font;
+	gchar **xnames;
+	gchar **pos;
 
 	if (!name && !bold && !italics && !fontsize)
 		return gdk_font_ref (default_font);
 
 	default_name = gtk_imhtml_get_font_name (default_font);
-	xflds = g_strsplit (default_name, "-", -1);
+	xnames = g_strsplit (default_name, ",", -1);
+
+	for (pos = xnames; pos && *pos; pos++) {
+		gchar *xname;
+		gchar **xflds;
 
+		gchar **newvals;
+		gint i;
+		gchar **names;
+		gchar fs[10];
+
+		gchar *tmp;
+		GdkFont *ret_font;
+
+		xname = *pos;
+		xname = g_strchomp (xname);
+		xname = g_strchug (xname);
+
+		xflds = g_strsplit (xname, "-", -1);
+
 #define NAME 2
 #define BOLD 3
 #define ITALICS 4
 #define SIZE 6
 #define PTSZ 7
-#define END 15
 
-	if (name)
-		names = g_strsplit (name, ",", -1);
-	else {
-		names = g_new0 (gchar *, 2);
-		names [0] = g_strdup (xflds [NAME]);
-	}
+		for (i = 0; xflds [i]; i++);
+		newvals = g_memdup (xflds, (i + 1) * sizeof (xflds));
 
-	for (i = 0; xflds [i]; i++)
-		newvals [i] = xflds [i];
+		if (bold)
+			newvals [BOLD] = "bold";
+		if (italics)
+			newvals [ITALICS] = "i";
+		if (fontsize) {
+			g_snprintf (fs, sizeof (fs), "%d", font_sizes [MIN (fontsize, MAX_SIZE) - 1]);
+			newvals [SIZE] = fs;
+			newvals [PTSZ] = "";
+		}
 
-	if (bold)
-		newvals [BOLD] = "bold";
-	if (italics)
-		newvals [ITALICS] = "i";
-	if (fontsize) {
-		g_snprintf (fs, sizeof (fs), "%d", font_sizes [MIN (fontsize, MAX_SIZE) - 1]);
-		newvals [SIZE] = fs;
-		newvals [PTSZ] = "";
-	}
-	newvals [END] = NULL;
+		if (name)
+			names = g_strsplit (name, ",", -1);
+		else {
+			names = g_new0 (gchar *, 2);
+			names [0] = g_strdup (xflds [NAME]);
+		}
 
-	TRY_FONT;
+		for (i = 0; names [i]; i++) {
+			newvals [NAME] = names [i];
+			TRY_FONT;
+		}
 
-	for (i = 0; italics && names [i]; i++) {
-		newvals [NAME] = names [i];
+		for (i = 0; italics && names [i]; i++) {
+			newvals [NAME] = names [i];
 
-		newvals [ITALICS] = "o";
-		TRY_FONT;
+			newvals [ITALICS] = "o";
+			TRY_FONT;
 
-		newvals [ITALICS] = xflds [ITALICS];
-		TRY_FONT;
-	}
+			newvals [ITALICS] = xflds [ITALICS];
+			TRY_FONT;
+		}
 
-	for (i = 0; fontsize && names [i]; i++) {
-		newvals [NAME] = names [i];
+		for (i = 0; fontsize && names [i]; i++) {
+			newvals [NAME] = names [i];
 
-		if (xflds [PTSZ][0]) {
-			g_snprintf (fs, sizeof (fs), "%d",
-				    font_sizes [MIN (fontsize, MAX_SIZE) - 1] / 10);
-			newvals [PTSZ] = fs;
-			newvals [SIZE] = "";
-			TRY_FONT;
+			if (xflds [PTSZ][0]) {
+				g_snprintf (fs, sizeof (fs), "%d",
+					    font_sizes [MIN (fontsize, MAX_SIZE) - 1] / 10);
+				newvals [PTSZ] = fs;
+				newvals [SIZE] = "";
+				TRY_FONT;
 
-			newvals [PTSZ] = xflds [PTSZ];
-		} else
-			newvals [SIZE] = xflds [SIZE];
-		TRY_FONT;
-	}
+				newvals [PTSZ] = xflds [PTSZ];
+			} else
+				newvals [SIZE] = xflds [SIZE];
+			TRY_FONT;
+		}
 
-	for (i = 0; bold && names [i]; i++) {
-		newvals [NAME] = names [i];
+		for (i = 0; bold && names [i]; i++) {
+			newvals [NAME] = names [i];
 
-		newvals [BOLD] = xflds [BOLD];
-		TRY_FONT;
-	}
+			newvals [BOLD] = xflds [BOLD];
+			TRY_FONT;
+		}
 
 #undef NAME
 #undef BOLD
 #undef ITALICS
 #undef SIZE
 #undef PTSZ
-#undef END
 
-	g_strfreev (xflds);
-	g_strfreev (names);
+		g_free (newvals);
+		g_strfreev (xflds);
+		g_strfreev (names);
+
+	}
+
+	g_strfreev (xnames);
 
 	return gdk_font_ref (default_font);
 }

[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.63,1.64

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

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

Modified Files:
	oscar.c 
Log Message:
eh


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- oscar.c	2001/11/10 08:02:39	1.63
+++ oscar.c	2001/11/13 06:48:34	1.64
@@ -1087,12 +1087,15 @@
 	struct gaim_connection *gc = sess->aux_data;
 	struct oscar_data *od = gc->proto_data;
 	char *tmp;
+	int caps;
 
 	va_list ap;
 	va_start(ap, fr);
 	info = va_arg(ap, aim_userinfo_t *);
 	va_end(ap);
 
+	caps = info->capabilities;
+
 	if (!od->icq) {
 		if (info->flags & AIM_FLAG_ACTIVEBUDDY)
 			type |= UC_AB;
@@ -1112,6 +1115,8 @@
 			if (!(info->icqinfo.status & AIM_ICQ_STATE_CHAT))
 				type |= UC_UNAVAILABLE;
 		}
+		if (caps & AIM_CAPS_EVERYBUDDY)
+			caps ^= AIM_CAPS_EVERYBUDDY;
 		debug_printf("icq status: %d\n", info->icqinfo.status);
 	}
 
@@ -1127,7 +1132,7 @@
 	g_free(tmp);
 
 	serv_got_update(gc, info->sn, 1, info->warnlevel/10, time(NULL) - info->sessionlen,
-			time_idle, type, info->capabilities);
+			time_idle, type, caps);
 
 	return 1;
 }

[Gaim-commits] CVS: gaim/src perl.c,1.66,1.67

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

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

Modified Files:
	perl.c 
Log Message:
more perl fixes from Dennis Lambe Jr. (malsyned)


Index: perl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/perl.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- perl.c	2001/11/08 08:20:43	1.66
+++ perl.c	2001/11/13 06:36:27	1.67
@@ -612,7 +612,7 @@
 	if (!c)
 		c = new_conversation(nick);
 	set_convo_gc(c, gc);
-	write_to_conv(c, what, WFLAG_SEND, NULL, time((time_t)NULL));
+	write_to_conv(c, what, WFLAG_SEND | (isauto ? WFLAG_AUTO : 0), NULL, time((time_t)NULL));
 	serv_send_im(c->gc, nick, what, isauto ? IM_FLAG_AWAY : 0);
 	XSRETURN(0);
 }

[Gaim-commits] CVS: gaim/src/protocols/yahoo Makefile.am,1.5,1.6

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

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

Modified Files:
	Makefile.am 
Log Message:
eh.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	2001/11/07 08:03:20	1.5
+++ Makefile.am	2001/11/13 06:30:37	1.6
@@ -1,7 +1,7 @@
 pkgdir = $(libdir)/gaim
 
 CFLAGS += -I\$(top_srcdir)/src $(st) $(DEBUG_CFLAGS)
-LIBS = @LIBS@ -lcrypt
+LIBS = @LIBS@ $(CRYPT_LIBS)
 libyahoo_la_LDFLAGS = -avoid-version
 
 if STATIC_YAHOO

[Gaim-commits] CVS: gaim configure.ac,1.29,1.30

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

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

Modified Files:
	configure.ac 
Log Message:
eh.


Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- configure.ac	2001/11/13 06:14:07	1.29
+++ configure.ac	2001/11/13 06:30:37	1.30
@@ -320,6 +320,9 @@
 
 dnl checks for yahoo
 AC_CHECK_HEADERS(crypt.h)
+CRYPT_LIBS=
+AC_CHECK_FUNC(crypt, , CRYPT_LIBS=-lcrypt)
+AC_SUBST(CRYPT_LIBS)
 
 dnl checks for zephyr
 AC_DEFINE(ZEPHYR_INT32, long)

[Gaim-commits] CVS: gaim/src/protocols/oscar ft.c,1.6,1.7

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

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

Modified Files:
	ft.c 
Log Message:
eh.


Index: ft.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/ft.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ft.c	2001/11/05 12:25:22	1.6
+++ ft.c	2001/11/13 06:30:37	1.7
@@ -4,6 +4,9 @@
  */
 
 #define FAIM_INTERNAL
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <aim.h>
 
 
@@ -776,8 +779,7 @@
  */
 static int listenestablish(fu16_t portnum)
 {
-#if defined(__linux__)
-	/* XXX what other OS's support getaddrinfo? */
+#if HAVE_GETADDRINFO
 	int listenfd;
 	const int on = 1;
 	struct addrinfo hints, *res, *ressave;

[Gaim-commits] CVS: gaim configure.ac,1.28,1.29

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

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

Modified Files:
	configure.ac 
Log Message:
gaim requires at least 1.2.3, but it should probably be 1.2.8, since i've seen problems with 1.2.7.


Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- configure.ac	2001/11/11 18:07:45	1.28
+++ configure.ac	2001/11/13 06:14:07	1.29
@@ -140,11 +140,11 @@
 fi
 
 if test "x$enable_gnome" != "xyes" ; then
-	AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR([
+	AM_PATH_GLIB(1.2.3,,AC_MSG_ERROR([
 *** GLib is required to build Gaim; please make sure you have the GLib
 *** development headers installed. The latest version of GLib is
 *** always available at http://www.gtk.org/.]))
-	AM_PATH_GTK(1.2.0,,AC_MSG_ERROR([
+	AM_PATH_GTK(1.2.3,,AC_MSG_ERROR([
 *** GTK+ is required to build Gaim; please make sure you have the GTK+
 *** development headers installed. The latest version of GTK+ is
 *** always available at http://www.gtk.org/.]),gthread)

[Gaim-commits] CVS: gaim/src multi.c,1.104,1.105

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

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

Modified Files:
	multi.c 
Log Message:
why didn't someone mention this before


Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- multi.c	2001/11/10 08:13:22	1.104
+++ multi.c	2001/11/13 06:07:32	1.105
@@ -1229,6 +1229,7 @@
 	k = g_new0(struct kick_dlg, 1);
 	k->user = gc->user;
 	k->dlg = do_error_dialog(buf, _("Signon Error"));
+	kicks = g_slist_append(kicks, k);
 	gtk_signal_connect(GTK_OBJECT(k->dlg), "destroy", GTK_SIGNAL_FUNC(set_kick_null), k);
 	if (meter) {
 		gtk_widget_destroy(meter->window);

[Gaim-commits] CVS: gaim/src/protocols/yahoo yahoo.c,1.8,1.9

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

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

Modified Files:
	yahoo.c 
Log Message:
some people don't have crypt.h, apparently.


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- yahoo.c	2001/11/10 01:30:13	1.8
+++ yahoo.c	2001/11/11 18:07:45	1.9
@@ -37,7 +37,9 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <ctype.h>
+#if HAVE_CRYPT_H
 #include <crypt.h>
+#endif
 #include "multi.h"
 #include "prpl.h"
 #include "gaim.h"

[Gaim-commits] CVS: gaim configure.ac,1.27,1.28

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

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

Modified Files:
	configure.ac 
Log Message:
some people don't have crypt.h, apparently.


Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- configure.ac	2001/11/01 23:07:19	1.27
+++ configure.ac	2001/11/11 18:07:45	1.28
@@ -318,6 +318,9 @@
 AC_CHECK_FUNCS(snprintf connect)
 AC_CHECK_LIB(nsl, gethostent)
 
+dnl checks for yahoo
+AC_CHECK_HEADERS(crypt.h)
+
 dnl checks for zephyr
 AC_DEFINE(ZEPHYR_INT32, long)
 AC_SUBST(KRB4_CFLAGS)

[Gaim-commits] CVS: gaim/src multi.c,1.103,1.104

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

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

Modified Files:
	multi.c 
Log Message:
someone requested this. i agreed.


Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- multi.c	2001/11/02 01:41:37	1.103
+++ multi.c	2001/11/10 08:13:22	1.104
@@ -1156,7 +1156,7 @@
 		gtk_window_set_policy(GTK_WINDOW(meter->window), 0, 0, 1);
 		gtk_window_set_wmclass(GTK_WINDOW(meter->window), "signon", "Gaim");
 		gtk_container_set_border_width(GTK_CONTAINER(meter->window), 5);
-		g_snprintf(buf, sizeof(buf), "%s Signing On", gc->username);
+		g_snprintf(buf, sizeof(buf), "%s Signing On (using %s)", gc->username, gc->prpl->name());
 		gtk_window_set_title(GTK_WINDOW(meter->window), buf);
 		gtk_signal_connect(GTK_OBJECT(meter->window), "delete_event",
 				   GTK_SIGNAL_FUNC(meter_destroy), meter);

[Gaim-commits] CVS: gaim ChangeLog,1.352,1.353

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

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

Modified Files:
	ChangeLog 
Log Message:
oh


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -d -r1.352 -r1.353
--- ChangeLog	2001/11/06 23:58:20	1.352
+++ ChangeLog	2001/11/10 08:02:39	1.353
@@ -3,6 +3,9 @@
 version 0.48:
 	* Right-click on links to open/copy URL
 	* Yahoo changes
+	* Oscar can send/receive offline messages in ICQ. Since the "real"
+	  ICQ protocol isn't working too well it's recommended that you
+	  use Oscar for ICQ.
 
 version 0.47 (11/01/2001):
 	* Better font loading (pays attention to charset now)