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

[Gaim-commits] CVS: gaim gaim.spec.in,1.52.2.4,1.52.2.5

[Sean E. <sea...@us...>]

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

Modified Files:
      Tag: gtk1-stable
	gaim.spec.in 
Log Message:
now it's out.


Index: gaim.spec.in
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.spec.in,v
retrieving revision 1.52.2.4
retrieving revision 1.52.2.5
diff -u -d -r1.52.2.4 -r1.52.2.5
--- gaim.spec.in	15 Sep 2002 02:17:16 -0000	1.52.2.4
+++ gaim.spec.in	15 Sep 2002 02:46:03 -0000	1.52.2.5
@@ -85,7 +85,6 @@
 %{prefix}/man/man1/gaim.1.gz
 %{prefix}/lib/gaim/*
 %{prefix}/share/locale/*/*/*
-%{prefix}/share/pixmaps/gaim.xpm
 %{prefix}/share/pixmaps/gaim/*
 %{prefix}/share/gnome/apps/Internet/gaim.desktop
 %{sysconfdir}/CORBA/servers/*

[Gaim-commits] CVS: gaim gaim.spec.in,1.52.2.3,1.52.2.4

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

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

Modified Files:
      Tag: gtk1-stable
	gaim.spec.in 
Log Message:
ok



Index: gaim.spec.in
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.spec.in,v
retrieving revision 1.52.2.3
retrieving revision 1.52.2.4
diff -u -d -r1.52.2.3 -r1.52.2.4
--- gaim.spec.in	15 Sep 2002 00:52:25 -0000	1.52.2.3
+++ gaim.spec.in	15 Sep 2002 02:17:16 -0000	1.52.2.4
@@ -96,8 +96,10 @@
 
 %changelog
 * Sat Sep 14 2002 Rob Flynn <ro...@ma...> (0.59.3 release)
-- Reversed Arun's patch that accidentally caused Yahoo not to connect--for implimentation reasons
+- Reversed patch that accidentally caused Yahoo not to connect--for implementation reasons
 - Changed "color" binding to Ctrl-K.
+- Unaliaising a person in the "Online" tab will show up in the "Edit" tab as well (Thanks, Jason Willis)
+- Internationalization fixes, esp. with UTF-8 locales (Thanks Matt Wilson and Ethan Blanton)
 
 * Mon Sep 09 2002 Rob Flynn <ro...@ma...> (0.59.2 release)
 - Japanese translation updated (Thanks, Junichi Uekawa)

[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.108.2.4,1.108.2.5

[Sean E. <sea...@us...>]

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

Modified Files:
      Tag: gtk1-stable
	gtkimhtml.c 
Log Message:
Releasetime



Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.108.2.4
retrieving revision 1.108.2.5
diff -u -d -r1.108.2.4 -r1.108.2.5
--- gtkimhtml.c	14 Sep 2002 03:19:22 -0000	1.108.2.4
+++ gtkimhtml.c	15 Sep 2002 02:13:22 -0000	1.108.2.5
@@ -2215,7 +2215,6 @@
 		if (default_font->type == GDK_FONT_FONT) 
 			ret_font = gdk_font_load (tmp); 
 		else {
-			/* For some reason, fontsets must end with a single * as an xlfd */
 			ret_font = gdk_fontset_load (tmp); 
 		}
 		/* If the font didn't load, we change some of the xlfds one by one

[Gaim-commits] CVS: gaim ChangeLog,1.509.2.27,1.509.2.28 NEWS,1.138.2.4,1.138.2.5

[Sean E. <sea...@us...>]

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

Modified Files:
      Tag: gtk1-stable
	ChangeLog NEWS 
Log Message:
Releasetime



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.509.2.27
retrieving revision 1.509.2.28
diff -u -d -r1.509.2.27 -r1.509.2.28
--- ChangeLog	15 Sep 2002 00:51:49 -0000	1.509.2.27
+++ ChangeLog	15 Sep 2002 02:13:22 -0000	1.509.2.28
@@ -1,9 +1,13 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
 version 0.59.3 (09/14/2002):
-	* Reversed Arun's patch that accidentally caused Yahoo
-	  not to connect--for implimentation reasons
+	* Reversed patch that accidentally caused Yahoo
+	  not to connect--for implementation reasons
 	* Changed "color" binding to Ctrl-K.
+	* Unaliaising a person in the "Online" tab will show up
+	  in the "Edit" tab as well (Thanks, Jason Willis)
+	* Internationalization fixes, esp. with UTF-8 locales 
+	  (Thanks Matt Wilson and Ethan Blanton)
 
 version 0.59.2 (09/09/2002):
         * Japanese translation updated (Thanks, Junichi Uekawa)

Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.138.2.4
retrieving revision 1.138.2.5
diff -u -d -r1.138.2.4 -r1.138.2.5
--- NEWS	15 Sep 2002 00:51:49 -0000	1.138.2.4
+++ NEWS	15 Sep 2002 02:13:22 -0000	1.138.2.5
@@ -5,6 +5,12 @@
 	that some of you may like to connect to Yahoo. Sorry about that
 	little blunder. I blame it on George.
 
+	Sean: That was just a silly mistake--there's no need to make George 
+	feel bad!  There's also some nice i18n fixes in there by Matt Wilson
+	from RedHat.
+
+	George: Why doesn't anybody love me?
+
 0.59.2 (09/09/2002):
 	Rob: This time Sean couldn't be with us.  I finally got my linux box
 	some what back in order.  Life has been extremely hectic for both Sean

[Gaim-commits] CVS: gaim gaim.spec.in,1.52.2.2,1.52.2.3

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

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

Modified Files:
      Tag: gtk1-stable
	gaim.spec.in 
Log Message:
Damn you, George.



Index: gaim.spec.in
===================================================================
RCS file: /cvsroot/gaim/gaim/gaim.spec.in,v
retrieving revision 1.52.2.2
retrieving revision 1.52.2.3
diff -u -d -r1.52.2.2 -r1.52.2.3
--- gaim.spec.in	9 Sep 2002 05:51:22 -0000	1.52.2.2
+++ gaim.spec.in	15 Sep 2002 00:52:25 -0000	1.52.2.3
@@ -95,6 +95,10 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Sat Sep 14 2002 Rob Flynn <ro...@ma...> (0.59.3 release)
+- Reversed Arun's patch that accidentally caused Yahoo not to connect--for implimentation reasons
+- Changed "color" binding to Ctrl-K.
+
 * Mon Sep 09 2002 Rob Flynn <ro...@ma...> (0.59.2 release)
 - Japanese translation updated (Thanks, Junichi Uekawa)
 - Won't crash when you set your MSN Friendly name to an empty string.

[Gaim-commits] CVS: gaim NEWS,1.138.2.3,1.138.2.4 ChangeLog,1.509.2.26,1.509.2.27

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

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

Modified Files:
      Tag: gtk1-stable
	NEWS ChangeLog 
Log Message:
yo



Index: NEWS
===================================================================
RCS file: /cvsroot/gaim/gaim/NEWS,v
retrieving revision 1.138.2.3
retrieving revision 1.138.2.4
diff -u -d -r1.138.2.3 -r1.138.2.4
--- NEWS	13 Sep 2002 02:39:29 -0000	1.138.2.3
+++ NEWS	15 Sep 2002 00:51:49 -0000	1.138.2.4
@@ -1,6 +1,9 @@
 -=[ Gaim ]=-  The Pimpin' Penguin IM Client That's Good For The Soul!
 
-0.59.3:
+0.59.3 (09/14/2002):
+	Rob: This really has been made a little early.  Of course, we figured
+	that some of you may like to connect to Yahoo. Sorry about that
+	little blunder. I blame it on George.
 
 0.59.2 (09/09/2002):
 	Rob: This time Sean couldn't be with us.  I finally got my linux box

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.509.2.26
retrieving revision 1.509.2.27
diff -u -d -r1.509.2.26 -r1.509.2.27
--- ChangeLog	14 Sep 2002 16:44:20 -0000	1.509.2.26
+++ ChangeLog	15 Sep 2002 00:51:49 -0000	1.509.2.27
@@ -1,9 +1,8 @@
 Gaim: The Pimpin' Penguin IM Clone thats good for the soul! 
 
-version 0.59.3:
-	* Yahoo can connect again. Oops!
+version 0.59.3 (09/14/2002):
 	* Reversed Arun's patch that accidentally caused Yahoo
-	  not to connect--for implimeentation reasons
+	  not to connect--for implimentation reasons
 	* Changed "color" binding to Ctrl-K.
 
 version 0.59.2 (09/09/2002):

[Gaim-commits] CVS: gaim/src aim.c,1.194,1.195 buddy.c,1.328,1.329 core.h,1.24,1.25 module.c,1.19,1.20 multi.c,1.127,1.128 perl.c,1.75,1.76 server.c,1.234,1.235 ui.h,1.51,1.52

[Sean E. <sea...@us...>]

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

Modified Files:
	aim.c buddy.c core.h module.c multi.c perl.c server.c ui.h 
Log Message:
A GNOME2 docklet.  This follows the opendesktop.org specs used by GNOME2 and
(I think) KDE in Redhat's null (I don't think vanilla KDE supports it yet)

For GNOME--you will need to have the GNOME Panel Notification Area installed.

This replaces the applet--thanks Robert McQueen.
CVS: ----------------------------------------------------------------------
CVS: Enter Log.  Lines beginning with `CVS:' are removed automatically
CVS: 
CVS: Committing in .
CVS: 
CVS: Modified Files:
CVS: 	configure.ac configure.in plugins/Makefile.am src/aim.c 
CVS: 	src/buddy.c src/core.h src/module.c src/multi.c src/perl.c 
CVS: 	src/server.c src/ui.h 
CVS: ----------------------------------------------------------------------


Index: aim.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/aim.c,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -d -r1.194 -r1.195
--- aim.c	12 Sep 2002 15:56:05 -0000	1.194
+++ aim.c	14 Sep 2002 23:27:26 -0000	1.195
@@ -302,8 +302,6 @@
 	gtk_widget_show(bbox);
 
 	cancel = gtk_button_new_with_label(_("Quit"));
-/* fixme: docklet					*
- *	cancel = gtk_button_new_with_label(_("Close"));	*/
 #ifndef NO_MULTI
 	accts = gtk_button_new_with_label(_("Accounts"));
 #endif

Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.328
retrieving revision 1.329
diff -u -d -r1.328 -r1.329
--- buddy.c	14 Sep 2002 18:47:45 -0000	1.328
+++ buddy.c	14 Sep 2002 23:27:26 -0000	1.329
@@ -1995,40 +1995,26 @@
 
 /* used by this file, and by iconaway.so */
 void hide_buddy_list() {
-	if (!blist) return;
-	if (!connections || docklet_refcount) {
-		gtk_widget_hide(blist);
-	} else {
-		gtk_window_iconify(GTK_WINDOW(blist));
-	}
-	blist_hidden = TRUE;
-}
-
-/* shared code... not in lschiere/faceprint tree though. oh well */
-static void move_buddy_list() {
-	if (blist_options & OPT_BLIST_SAVED_WINDOWS) {
-		if (blist_pos.width != 0) {	/* Sanity check! */
-			gtk_widget_set_uposition(blist, blist_pos.x - blist_pos.xoff,
-						 blist_pos.y - blist_pos.yoff);
-			gtk_widget_set_usize(blist, blist_pos.width, blist_pos.height);
+	if (blist) {
+		if (!connections || docklet_refcount) {
+			gtk_widget_hide(blist);
+		} else {
+			gtk_window_iconify(GTK_WINDOW(blist));
 		}
 	}
 }
 
 /* mostly used by code in this file */
 void unhide_buddy_list() {
-	if (!blist) return;
-	gtk_window_present(GTK_WINDOW(blist));
-	move_buddy_list();
-	blist_hidden = FALSE;
-}
-
-/* used by the docklet */
-void toggle_buddy_list() {
-	if (blist_hidden) {
-		unhide_buddy_list();
-	} else {
-		hide_buddy_list();
+	if (blist) {
+		gtk_window_present(GTK_WINDOW(blist));
+		if (blist_options & OPT_BLIST_SAVED_WINDOWS) {
+			if (blist_pos.width != 0) {	/* Sanity check! */
+				gtk_widget_set_uposition(blist, blist_pos.x - blist_pos.xoff,
+							 blist_pos.y - blist_pos.yoff);
+				gtk_widget_set_usize(blist, blist_pos.width, blist_pos.height);
+			}
+		}
 	}
 }
 
@@ -2442,9 +2428,6 @@
 	gdk_window_get_position(blist->window, &x, &y);
 	gdk_window_get_size(blist->window, &width, &height);
 
-/* fixme: docklet		*
- *	if (applet_buddy_show){	*/
-
 	if (e->send_event) {	/* Is a position event */
 		if (blist_pos.x != x || blist_pos.y != y)
 			save = 1;
@@ -2910,8 +2893,9 @@
 
 
 	gtk_window_set_title(GTK_WINDOW(blist), _("Gaim - Buddy List"));
-	move_buddy_list();
-	blist_hidden = FALSE;
+
+	/* this conveniently moves it to the right place and stuff */
+	unhide_buddy_list();
 }
 
 void refresh_buddy_window()

Index: core.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- core.h	31 Aug 2002 02:40:51 -0000	1.24
+++ core.h	14 Sep 2002 23:27:27 -0000	1.25
@@ -64,6 +64,7 @@
 	char iconfile[256];
 
 	struct gaim_connection *gc;
+	gboolean connecting;
 };
 	
 enum gaim_event {
@@ -98,6 +99,7 @@
 	event_chat_send_invite,
 	event_got_typing,
 	event_del_conversation,
+	event_connecting,
 	/* any others? it's easy to add... */
 };
 

Index: module.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/module.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- module.c	29 Aug 2002 01:47:14 -0000	1.19
+++ module.c	14 Sep 2002 23:27:27 -0000	1.20
@@ -363,6 +363,12 @@
 	case event_got_typing:
 		sprintf(buf, "event_got_typing");
 		break;
+	case event_del_conversation:
+		sprintf(buf, "event_del_conversation");
+		break;
+	case event_connecting:
+		sprintf(buf, "event_connecting");
+		break;
 	default:
 		sprintf(buf, "event_unknown");
 		break;
@@ -376,6 +382,12 @@
 		return;
 
 	switch (event) {
+		case event_blist_update:
+			/* this happens *really* often */
+			if (opt_debug) {
+				debug_printf("%s\n", event_name(event));
+			}
+			break;
 	        case event_quit:
 			debug_printf("%s\n", event_name(event));
 			break;
@@ -385,10 +397,10 @@
 					((struct gaim_connection *)arg1)->username);
 			break;
 		case event_new_conversation:
-			debug_printf("event_new_conversation: %s\n", (char *)arg1);
+			debug_printf("%s: %s\n", event_name(event), (char *)arg1);
 			break;
 		case event_error:
-			debug_printf("event_error: %d\n", (int)arg1);
+			debug_printf("%s: %d\n", event_name(event), (int)arg1);
 			break;
 		case event_buddy_signon:
 		case event_buddy_signoff:
@@ -398,11 +410,11 @@
 	        case event_buddy_unidle:
 	        case event_set_info:
 	        case event_got_typing:
-		debug_printf("%s: %s %s\n", event_name(event),
+			debug_printf("%s: %s %s\n", event_name(event),
 					((struct gaim_connection *)arg1)->username, (char *)arg2);
 			break;
 		case event_chat_leave:
-			debug_printf("event_chat_leave: %s %d\n",
+			debug_printf("%s: %s %d\n", event_name(event),
 					((struct gaim_connection *)arg1)->username, (int)arg2);
 			break;
 		case event_im_send:
@@ -464,7 +476,14 @@
 					(char *)arg2, (char *)arg3,
 					(char *)arg4 ? (char *)arg4 : "");
 			break;
+		case event_del_conversation:
+			debug_printf("%s: %s\n", event_name(event), (char *)arg1);
+			break;
+		case event_connecting:
+			debug_printf("%s: %s\n", event_name(event), ((struct aim_user *)arg1)->username);
+			break;
 		default:
+			debug_printf("%s: um, right. yeah.\n", event_name(event));
 			break;
 	}
 }
@@ -503,6 +522,7 @@
 			case event_new_conversation:
 			case event_del_conversation:
 			case event_error:
+			case event_connecting:
 				one = g->function;
 				one(arg1, g->data);
 				break;

Index: multi.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/multi.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- multi.c	30 Aug 2002 03:14:02 -0000	1.127
+++ multi.c	14 Sep 2002 23:27:27 -0000	1.128
@@ -101,7 +101,6 @@
 	GSList *h;
 	struct group *m;
 	struct buddy *n;
-	connections = g_slist_remove(connections, gc);
 	while (g) {
 		m = (struct group *)g->data;
 		g = g_slist_remove(g, m);
@@ -126,7 +125,7 @@
 		g = g_slist_remove(g, g->data);
 	}
 	g_free(gc);
-/* fixme: docklet */
+
 	if (!connections && mainwindow)
 		gtk_widget_show(mainwindow);
 }
@@ -1156,6 +1155,7 @@
 	redo_convo_menus();
 	gaim_setup(gc);
 
+	gc->user->connecting = FALSE;
 	plugin_event(event_signon, gc, 0, 0, 0);
 	system_log(log_signon, gc, NULL, OPT_LOG_BUDDY_SIGNON | OPT_LOG_MY_SIGNON);
 
@@ -1437,15 +1437,23 @@
 
 void signoff(struct gaim_connection *gc)
 {
+	/* UI stuff */
+	convo_menu_remove(gc);
+	remove_icon_data(gc);
+
 	/* core stuff */
+	/* remove this here so plugins get a sensible count of connections */
+	connections = g_slist_remove(connections, gc);
 	debug_printf("date: %s\n", full_date());
 	plugin_event(event_signoff, gc, 0, 0, 0);
 	system_log(log_signoff, gc, NULL, OPT_LOG_BUDDY_SIGNON | OPT_LOG_MY_SIGNON);
-
-	/* UI stuff */
-	convo_menu_remove(gc);
-	remove_icon_data(gc);
+	/* set this in case the plugin died before really connecting.
+	   do it after calling the plugins so they can determine if
+	   this user was ever on-line or not */
+	gc->user->connecting = FALSE;
 	serv_close(gc);
+
+	/* more UI stuff */
 	redo_buddy_list();
 	build_edit_tree();
 	do_away_menu();
@@ -1453,22 +1461,12 @@
 	redo_convo_menus();
 	update_privacy_connections();
 
+	/* in, out, shake it all about */
 	if (connections)
 		return;
 
 	destroy_all_dialogs();
 	destroy_buddy();
-/* fixme: docklet
-	set_user_state(offline);
-	applet_buddy_show = FALSE;
-
-	if (applet) {
-		/* These don't have any purpose if the applet is gone :-P
-		applet_widget_unregister_callback(APPLET_WIDGET(applet), "signoff");
-		applet_widget_register_callback(APPLET_WIDGET(applet),
-						"autologin", _("Auto-login"), (AppletCallbackFunc)auto_login, NULL);
-		remove_applet_away();
-	} */
 
 	show_login();
 }

Index: perl.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/perl.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- perl.c	28 Aug 2002 02:38:18 -0000	1.75
+++ perl.c	14 Sep 2002 23:27:27 -0000	1.76
@@ -757,6 +757,7 @@
 		buf = g_malloc0(1);
 		break;
 	case event_new_conversation:
+	case event_del_conversation:
 		buf = g_strdup_printf("'%s'", escape_quotes(arg1));
 		break;
 	case event_im_displayed_sent:
@@ -780,6 +781,7 @@
 		}
 		break;
 	default:
+		debug_printf("someone forgot to handle %s in the perl binding\n", event_name(event));
 		return 0;
 	}
 

Index: server.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/server.c,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -r1.234 -r1.235
--- server.c	30 Aug 2002 03:14:05 -0000	1.234
+++ server.c	14 Sep 2002 23:27:28 -0000	1.235
@@ -54,6 +54,8 @@
 		}
 
 		debug_printf(PACKAGE " " VERSION " logging in %s using %s\n", user->username, p->name());
+		user->connecting = TRUE;
+		plugin_event(event_connecting, user, 0, 0, 0);
 		p->login(user);
 	}
 }

Index: ui.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/ui.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- ui.h	31 Aug 2002 02:40:51 -0000	1.51
+++ ui.h	14 Sep 2002 23:27:28 -0000	1.52
@@ -269,6 +269,7 @@
 extern int auto_away;
 extern GtkWidget *awaymenu;
 extern GtkWidget *clistqueue; 
+extern GtkWidget *imaway;
 
 /* Globals in buddy.c */
 extern GtkWidget *buddies;
@@ -349,7 +350,6 @@
 extern void set_blist_tab();
 extern void hide_buddy_list();
 extern void unhide_buddy_list();
-extern void toggle_buddy_list();
 extern void docklet_add();
 extern void docklet_remove();
 

[Gaim-commits] CVS: gaim/plugins/docklet Makefile.am,NONE,1.1 docklet.c,NONE,1.1 eggtrayicon.c,NONE,1.1 eggtrayicon.h,NONE,1.1

[Sean E. <sea...@us...>]

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

Added Files:
	Makefile.am docklet.c eggtrayicon.c eggtrayicon.h 
Log Message:
A GNOME2 docklet.  This follows the opendesktop.org specs used by GNOME2 and
(I think) KDE in Redhat's null (I don't think vanilla KDE supports it yet)

For GNOME--you will need to have the GNOME Panel Notification Area installed.

This replaces the applet--thanks Robert McQueen.
CVS: ----------------------------------------------------------------------
CVS: Enter Log.  Lines beginning with `CVS:' are removed automatically
CVS: 
CVS: Committing in .
CVS: 
CVS: Modified Files:
CVS: 	configure.ac configure.in plugins/Makefile.am src/aim.c 
CVS: 	src/buddy.c src/core.h src/module.c src/multi.c src/perl.c 
CVS: 	src/server.c src/ui.h 
CVS: ----------------------------------------------------------------------


--- NEW FILE: Makefile.am ---
plugindir = $(libdir)/gaim

docklet_la_LDFLAGS = -module -avoid-version

if PLUGINS

plugin_LTLIBRARIES = docklet.la

docklet_la_SOURCES = \
	docklet.c \
	eggtrayicon.h \
	eggtrayicon.c

endif

INCLUDES = \
	-I$(top_srcdir) \
	-I$(top_srcdir)/src \
	-DVERSION=\"$(VERSION)\" \
	-DDATADIR=\"$(datadir)\"

--- NEW FILE: docklet.c ---
/* System tray docklet plugin for Gaim
 * Copyright (C) 2002 Robert McQueen <rob...@de...>
 * Inspired by a similar plugin by:
 *  John (J5) Palmieri <jo...@ma...>
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation; either version 2 of the
 * License, or (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful, but
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * General Public License for more details.
 * 
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 * 02111-1307, USA.
 */

/* todo (in order of importance):
    - don't crash when the plugin gets unloaded (it seems to crash after
       the plugin has gone, when gtk updates the button in the plugins
       dialog. backtrace is always useless. weird)
    - have a toggle on the menu to mute all Gaim sounds
    - handle and update tooltips to show your current accounts
    - connecting status support (needs more fruxing with the core)
    - dernyi's account status menu in the right click
    - store icons in gtk2 stock icon thing (needs doing for the whole prog)
    - pop up notices when GNOME2's system-tray-applet supports it, with a
       prefs dialog to choose what to alert for */

/* includes */
#define GAIM_PLUGINS
#include <gtk/gtk.h>
#include "gaim.h"
#include "eggtrayicon.h"

/* macros */
#define DOCKLET_WINDOW_ICONIFIED(x) (gdk_window_get_state(GTK_WIDGET(x)->window) & GDK_WINDOW_STATE_ICONIFIED)

/* types */
enum docklet_status {
	online,
	away,
	away_pending,
	connecting,
	offline
};

/* functions */
static void docklet_create();

/* globals */
static EggTrayIcon *docklet;
static GtkWidget *icon;
static enum docklet_status status;

static void docklet_embedded(GtkWidget *widget, void *data) {
	debug_printf("Docklet: embedded\n");
	docklet_add();
}

static void docklet_destroyed(GtkWidget *widget, void *data) {
	debug_printf("Docklet: destroyed\n");
	docklet_remove();
	docklet_create();
}

static void docklet_toggle() {
	/* this looks bad, but we need to use (un)hide_buddy_list to allow buddy.c to
	   correctly hide/iconify depending on the docklet refcount, and to reposition
	   the blist for us when we unhide. no such constraint for the login window
	   because nothing else needs a unified way to hide/iconify it. otherwise I'd
	   make a function and use it for both. */
	if (connections) {
		if (GTK_WIDGET_VISIBLE(blist)) {
			if (DOCKLET_WINDOW_ICONIFIED(blist)) {
				unhide_buddy_list();
			} else {
				hide_buddy_list();
			}
		} else {
			unhide_buddy_list();
		}
	} else {
		if (GTK_WIDGET_VISIBLE(mainwindow)) {
			if (DOCKLET_WINDOW_ICONIFIED(mainwindow)) {
				gtk_window_present(GTK_WINDOW(mainwindow));
			} else {
				gtk_widget_hide(mainwindow);
			}
		} else {
			gtk_window_present(GTK_WINDOW(mainwindow));
		}
	}
}

static void docklet_menu(GdkEventButton *event) {
	GtkWidget *menu, *entry;

	if (menu) {
		gtk_widget_destroy(menu);
	}

	menu = gtk_menu_new();

	if (status == offline) {
		entry = gtk_menu_item_new_with_label(_("Auto-login"));
		g_signal_connect(GTK_WIDGET(entry), "activate", G_CALLBACK(auto_login), NULL);
		gtk_menu_append(GTK_MENU(menu), entry);
	} else {
		if (status == online) {
			GtkWidget *docklet_awaymenu;
			GSList *awy = NULL;
			struct away_message *a = NULL;

			docklet_awaymenu = gtk_menu_new();
			awy = away_messages;

			while (awy) {
				a = (struct away_message *)awy->data;

				entry = gtk_menu_item_new_with_label(a->name);
				g_signal_connect(GTK_WIDGET(entry), "activate", G_CALLBACK(do_away_message), a);
				gtk_menu_append(GTK_MENU(docklet_awaymenu), entry);

				awy = g_slist_next(awy);
			}

			entry = gtk_separator_menu_item_new();
			gtk_menu_append(GTK_MENU(docklet_awaymenu), entry);

			entry = gtk_menu_item_new_with_label(_("New..."));
			g_signal_connect(GTK_WIDGET(entry), "activate", G_CALLBACK(create_away_mess), NULL);
			gtk_menu_append(GTK_MENU(docklet_awaymenu), entry);

			entry = gtk_menu_item_new_with_label(_("Away"));
			gtk_menu_item_set_submenu(GTK_MENU_ITEM(entry), awaymenu);
			gtk_menu_append(GTK_MENU(menu), entry);
		} else {
			entry = gtk_menu_item_new_with_label(_("Back"));
			g_signal_connect(GTK_WIDGET(entry), "activate", G_CALLBACK(do_im_back), NULL);
			gtk_menu_append(GTK_MENU(menu), entry);
		}

		entry = gtk_menu_item_new_with_label(_("Signoff"));
		g_signal_connect(GTK_WIDGET(entry), "activate", G_CALLBACK(signoff_all), NULL);
		gtk_menu_append(GTK_MENU(menu), entry);
	}

	entry = gtk_separator_menu_item_new();
	gtk_menu_append(GTK_MENU(menu), entry);

	entry = gtk_menu_item_new_with_label(_("Accounts"));
	g_signal_connect(GTK_WIDGET(entry), "activate", G_CALLBACK(account_editor), NULL);
	gtk_menu_append(GTK_MENU(menu), entry);

	entry = gtk_image_menu_item_new_from_stock(GTK_STOCK_PREFERENCES, NULL);
	g_signal_connect(GTK_WIDGET(entry), "activate", G_CALLBACK(show_prefs), NULL);
	gtk_menu_append(GTK_MENU(menu), entry);

	entry = gtk_menu_item_new_with_label(_("Plugins"));
	g_signal_connect(GTK_WIDGET(entry), "activate", G_CALLBACK(show_plugins), NULL);
	gtk_menu_append(GTK_MENU(menu), entry);

	entry = gtk_separator_menu_item_new();
	gtk_menu_append(GTK_MENU(menu), entry);

	entry = gtk_menu_item_new_with_label(_("About"));
	g_signal_connect(GTK_WIDGET(entry), "activate", G_CALLBACK(show_about), NULL);
	gtk_menu_append(GTK_MENU(menu), entry);

	entry = gtk_image_menu_item_new_from_stock(GTK_STOCK_QUIT, NULL);
	g_signal_connect(GTK_WIDGET(entry), "activate", G_CALLBACK(do_quit), NULL);
	gtk_menu_append(GTK_MENU(menu), entry);

	gtk_widget_show_all(menu);
	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time);
}

static void docklet_clicked(GtkWidget *button, GdkEventButton *event, void *data) {
	switch (event->button) {
		case 1:
			docklet_toggle();
			break;
		case 2:
			break;
		case 3:
			docklet_menu(event);
			break;
	}
}

static void docklet_update_icon() {
	gchar *filename;
	GdkPixbuf *unscaled;

	switch (status) {
		case online:
			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "online.png", NULL);
			break;
		case away:
			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "away.png", NULL);
			break;
		case away_pending:
			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "msgpend.png", NULL);
			break;
		case connecting:
			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "connecting.png", NULL);
			break;
		case offline:
			filename = g_build_filename(DATADIR, "pixmaps", "gaim", "offline.png", NULL);
	}

	unscaled = gdk_pixbuf_new_from_file(filename, NULL);

	if (unscaled) {
		GdkPixbuf *scaled;

		scaled = gdk_pixbuf_scale_simple(unscaled, 24, 24, GDK_INTERP_BILINEAR);
		gtk_image_set_from_pixbuf(GTK_IMAGE(icon), scaled);
		g_object_unref(unscaled);
		g_object_unref(scaled);

		debug_printf("Docklet: updated icon to %s\n",filename);
	} else {
		debug_printf("Docklet: failed to load icon from %s\n",filename);
	}

	g_free(filename);
}

static void docklet_update_status() {
	enum docklet_status oldstatus;

	oldstatus = status;

	if (connections) {
		if (imaway) {
			if (message_queue) {
				status = away_pending;
			} else {
				status = away;
			}
		} else {
			status = online;
		}
	} else {
		status = offline;
	}

	if (status != oldstatus) {
		docklet_update_icon();
	}
}

static void docklet_create() {
	GtkWidget *box;

	/* is this necessary/wise? */
	if (docklet) {
		g_signal_handlers_disconnect_by_func(GTK_WIDGET(docklet), G_CALLBACK(docklet_destroyed), NULL);
		gtk_widget_destroy(GTK_WIDGET(docklet));
		debug_printf("Docklet: freed\n");
	}

	docklet = egg_tray_icon_new("Gaim");
	box = gtk_event_box_new();
	icon = gtk_image_new();

	g_signal_connect(GTK_WIDGET(docklet), "embedded", G_CALLBACK(docklet_embedded), NULL);
	g_signal_connect(GTK_WIDGET(docklet), "destroy", G_CALLBACK(docklet_destroyed), NULL);
	g_signal_connect(box, "button-press-event", G_CALLBACK(docklet_clicked), NULL);

	gtk_container_add(GTK_CONTAINER(box), icon);
	gtk_container_add(GTK_CONTAINER(docklet), box);
	gtk_widget_show_all(GTK_WIDGET(docklet));

	docklet_update_status();
	docklet_update_icon();

	debug_printf("Docklet: created\n");
}

static void gaim_signon(struct gaim_connection *gc, void *data) {
	docklet_update_status();
}

static void gaim_signoff(struct gaim_connection *gc, void *data) {
	docklet_update_status();
}

static void gaim_connecting(struct aim_user *user, void *data) {
	docklet_update_status();
}

static void gaim_away(struct gaim_connection *gc, char *state, char *message, void *data) {
	/* we only support global away. this is the way it is, ok? */
	docklet_update_status();
}

static void gaim_im_recv(struct gaim_connection *gc, char **who, char **what, void *data) {
	/* if message queuing while away is enabled, this event could be the first
	   message so we need to see if the status (and hence icon) needs changing */
	docklet_update_status();
}

static void gaim_buddy_signon(struct gaim_connection *gc, char *who, void *data) {
}

static void gaim_buddy_signoff(struct gaim_connection *gc, char *who, void *data) {
}

static void gaim_buddy_away(struct gaim_connection *gc, char *who, void *data) {
}

static void gaim_buddy_back(struct gaim_connection *gc, char *who, void *data) {
}

static void gaim_new_conversation(char *who, void *data) {
}

char *gaim_plugin_init(GModule *handle) {
	docklet_create();

	gaim_signal_connect(handle, event_signon, gaim_signon, NULL);
	gaim_signal_connect(handle, event_signoff, gaim_signoff, NULL);
	gaim_signal_connect(handle, event_connecting, gaim_connecting, NULL);
	gaim_signal_connect(handle, event_away, gaim_away, NULL);
	gaim_signal_connect(handle, event_im_recv, gaim_im_recv, NULL);
	gaim_signal_connect(handle, event_buddy_signon, gaim_buddy_signon, NULL);
	gaim_signal_connect(handle, event_buddy_signoff, gaim_buddy_signoff, NULL);
	gaim_signal_connect(handle, event_buddy_away, gaim_buddy_away, NULL);
	gaim_signal_connect(handle, event_buddy_back, gaim_buddy_back, NULL);
	gaim_signal_connect(handle, event_new_conversation, gaim_new_conversation, NULL);

	return NULL;
}

void gaim_plugin_remove() {
	if (GTK_WIDGET_VISIBLE(docklet)) {
		docklet_remove();
	}

	g_signal_handlers_disconnect_by_func(GTK_WIDGET(docklet), G_CALLBACK(docklet_destroyed), NULL);
	gtk_widget_destroy(GTK_WIDGET(docklet));

	debug_printf("Docklet: removed\n");
}

const char *name() {
	return _("System Tray Docklet");
}

const char *description() {
	return _("Interacts with a System Tray applet (in GNOME or KDE, for example) to display the current status of Gaim, allow fast access to commonly used functions, and to toggle display of the buddy list or login window.");
}

--- NEW FILE: eggtrayicon.c ---
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* eggtrayicon.c
 * Copyright (C) 2002 Anders Carlsson <and...@gn...>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA 02111-1307, USA.
 */

#include <string.h>
#include <gdk/gdkx.h>
#include "eggtrayicon.h"

#define SYSTEM_TRAY_REQUEST_DOCK    0
#define SYSTEM_TRAY_BEGIN_MESSAGE   1
#define SYSTEM_TRAY_CANCEL_MESSAGE  2
         
static GtkPlugClass *parent_class = NULL;

static void egg_tray_icon_init (EggTrayIcon *icon);
static void egg_tray_icon_class_init (EggTrayIconClass *klass);

static void egg_tray_icon_update_manager_window (EggTrayIcon *icon);

GType
egg_tray_icon_get_type (void)
{
  static GType our_type = 0;

  our_type = g_type_from_name("EggTrayIcon");

  if (our_type == 0)
    {
      static const GTypeInfo our_info =
      {
	sizeof (EggTrayIconClass),
	(GBaseInitFunc) NULL,
	(GBaseFinalizeFunc) NULL,
	(GClassInitFunc) egg_tray_icon_class_init,
	NULL, /* class_finalize */
	NULL, /* class_data */
	sizeof (EggTrayIcon),
	0,    /* n_preallocs */
	(GInstanceInitFunc) egg_tray_icon_init
      };

      our_type = g_type_register_static (GTK_TYPE_PLUG, "EggTrayIcon", &our_info, 0);
    }

  return our_type;
}

static void
egg_tray_icon_init (EggTrayIcon *icon)
{
  icon->stamp = 1;
  
  gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK);
}

static void
egg_tray_icon_class_init (EggTrayIconClass *klass)
{
  parent_class = g_type_class_peek_parent (klass);
}

static GdkFilterReturn
egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_data)
{
  EggTrayIcon *icon = user_data;
  XEvent *xev = (XEvent *)xevent;

  if (xev->xany.type == ClientMessage &&
      xev->xclient.message_type == icon->manager_atom &&
      xev->xclient.data.l[1] == icon->selection_atom)
    {
      egg_tray_icon_update_manager_window (icon);
    }
  else if (xev->xany.window == icon->manager_window)
    {
      if (xev->xany.type == DestroyNotify)
	{
	  egg_tray_icon_update_manager_window (icon);
	}
    }
  
  return GDK_FILTER_CONTINUE;
}

static void
egg_tray_icon_send_manager_message (EggTrayIcon *icon,
				    long         message,
				    Window       window,
				    long         data1,
				    long         data2,
				    long         data3)
{
  XClientMessageEvent ev;
  Display *display;
  
  ev.type = ClientMessage;
  ev.window = window;
  ev.message_type = icon->system_tray_opcode_atom;
  ev.format = 32;
  ev.data.l[0] = gdk_x11_get_server_time (GTK_WIDGET (icon)->window);
  ev.data.l[1] = message;
  ev.data.l[2] = data1;
  ev.data.l[3] = data2;
  ev.data.l[4] = data3;

#if HAVE_GTK_MULTIHEAD
  display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
#else
  display = gdk_display;
#endif
  
  gdk_error_trap_push ();
  XSendEvent (display,
	      icon->manager_window, False, NoEventMask, (XEvent *)&ev);
  XSync (display, False);
  gdk_error_trap_pop ();
}

static void
egg_tray_icon_send_dock_request (EggTrayIcon *icon)
{
  egg_tray_icon_send_manager_message (icon,
				      SYSTEM_TRAY_REQUEST_DOCK,
				      icon->manager_window,
				      gtk_plug_get_id (GTK_PLUG (icon)),
				      0, 0);
}

static void
egg_tray_icon_update_manager_window (EggTrayIcon *icon)
{
  Display *xdisplay;
  
#if HAVE_GTK_MULTIHEAD
  xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
#else
  xdisplay = gdk_display;
#endif
  
  if (icon->manager_window != None)
    {
      GdkWindow *gdkwin;

#if HAVE_GTK_MULTIHEAD
      gdkwin = gdk_window_lookup_for_display (display,
					      icon->manager_window);
#else
      gdkwin = gdk_window_lookup (icon->manager_window);
#endif
      
      gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
    }
  
  XGrabServer (xdisplay);
  
  icon->manager_window = XGetSelectionOwner (xdisplay,
					     icon->selection_atom);

  if (icon->manager_window != None)
    XSelectInput (xdisplay,
		  icon->manager_window, StructureNotifyMask);

  XUngrabServer (xdisplay);
  XFlush (xdisplay);
  
  if (icon->manager_window != None)
    {
      GdkWindow *gdkwin;

#if HAVE_GTK_MULTIHEAD
      gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
					      icon->manager_window);
#else
      gdkwin = gdk_window_lookup (icon->manager_window);
#endif
      
      gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon);

      /* Send a request that we'd like to dock */
      egg_tray_icon_send_dock_request (icon);
    }
}

EggTrayIcon *
egg_tray_icon_new_for_xscreen (Screen *xscreen, const char *name)
{
  EggTrayIcon *icon;
  char buffer[256];
  GdkWindow *root_window;

  g_return_val_if_fail (xscreen != NULL, NULL);
  
  icon = g_object_new (EGG_TYPE_TRAY_ICON, NULL);
  gtk_window_set_title (GTK_WINDOW (icon), name);

#if HAVE_GTK_MULTIHEAD
  gtk_plug_construct_for_display (GTK_PLUG (icon),
				  gdk_screen_get_display (screen), 0);
#else
  gtk_plug_construct (GTK_PLUG (icon), 0);
#endif
  
  gtk_widget_realize (GTK_WIDGET (icon));

  /* Now see if there's a manager window around */
  g_snprintf (buffer, sizeof (buffer),
	      "_NET_SYSTEM_TRAY_S%d",
	      XScreenNumberOfScreen (xscreen));
  
  icon->selection_atom = XInternAtom (DisplayOfScreen (xscreen),
				      buffer, False);
  
  icon->manager_atom = XInternAtom (DisplayOfScreen (xscreen),
				    "MANAGER", False);
  
  icon->system_tray_opcode_atom = XInternAtom (DisplayOfScreen (xscreen),
					       "_NET_SYSTEM_TRAY_OPCODE", False);

  egg_tray_icon_update_manager_window (icon);

#if HAVE_GTK_MULTIHEAD
  root_window = gdk_screen_get_root_window (screen);
#else
  root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
#endif
  
  /* Add a root window filter so that we get changes on MANAGER */
  gdk_window_add_filter (root_window,
			 egg_tray_icon_manager_filter, icon);
		      
  return icon;
}

#if HAVE_GTK_MULTIHEAD
EggTrayIcon *
egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name)
{
  EggTrayIcon *icon;
  char buffer[256];

  g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);

  return egg_tray_icon_new_for_xscreen (GDK_SCREEN_XSCREEN (screen), name);
}
#endif

EggTrayIcon*
egg_tray_icon_new (const gchar *name)
{
  return egg_tray_icon_new_for_xscreen (DefaultScreenOfDisplay (gdk_display), name);
}

guint
egg_tray_icon_send_message (EggTrayIcon *icon,
			    gint         timeout,
			    const gchar *message,
			    gint         len)
{
  guint stamp;
  
  g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), 0);
  g_return_val_if_fail (timeout >= 0, 0);
  g_return_val_if_fail (message != NULL, 0);
		     
  if (icon->manager_window == None)
    return 0;

  if (len < 0)
    len = strlen (message);

  stamp = icon->stamp++;
  
  /* Get ready to send the message */
  egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_BEGIN_MESSAGE,
				      (Window)gtk_plug_get_id (GTK_PLUG (icon)),
				      timeout, len, stamp);

  /* Now to send the actual message */
  gdk_error_trap_push ();
  while (len > 0)
    {
      XClientMessageEvent ev;
      Display *xdisplay;

#if HAVE_GTK_MULTIHEAD
      xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
#else
      xdisplay = gdk_display;
#endif
      
      ev.type = ClientMessage;
      ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon));
      ev.format = 8;
      ev.message_type = XInternAtom (xdisplay,
				     "_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
      if (len > 20)
	{
	  memcpy (&ev.data, message, 20);
	  len -= 20;
	  message += 20;
	}
      else
	{
	  memcpy (&ev.data, message, len);
	  len = 0;
	}

      XSendEvent (xdisplay,
		  icon->manager_window, False, StructureNotifyMask, (XEvent *)&ev);
      XSync (xdisplay, False);
    }
  gdk_error_trap_pop ();

  return stamp;
}

void
egg_tray_icon_cancel_message (EggTrayIcon *icon,
			      guint        id)
{
  g_return_if_fail (EGG_IS_TRAY_ICON (icon));
  g_return_if_fail (id > 0);
  
  egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE,
				      (Window)gtk_plug_get_id (GTK_PLUG (icon)),
				      id, 0, 0);
}

--- NEW FILE: eggtrayicon.h ---
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/* eggtrayicon.h
 * Copyright (C) 2002 Anders Carlsson <and...@gn...>
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2 of the License, or (at your option) any later version.
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the
 * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 * Boston, MA 02111-1307, USA.
 */

#ifndef __EGG_TRAY_ICON_H__
#define __EGG_TRAY_ICON_H__

#include <gtk/gtkplug.h>
#include <gdk/gdkx.h>

G_BEGIN_DECLS

#define EGG_TYPE_TRAY_ICON		(egg_tray_icon_get_type ())
#define EGG_TRAY_ICON(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_TRAY_ICON, EggTrayIcon))
#define EGG_TRAY_ICON_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
#define EGG_IS_TRAY_ICON(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_TRAY_ICON))
#define EGG_IS_TRAY_ICON_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TRAY_ICON))
#define EGG_TRAY_ICON_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
	
typedef struct _EggTrayIcon	  EggTrayIcon;
typedef struct _EggTrayIconClass  EggTrayIconClass;

struct _EggTrayIcon
{
  GtkPlug parent_instance;

  guint stamp;
  
  Atom selection_atom;
  Atom manager_atom;
  Atom system_tray_opcode_atom;
  Window manager_window;
};

struct _EggTrayIconClass
{
  GtkPlugClass parent_class;
};

GType        egg_tray_icon_get_type       (void);

#if EGG_TRAY_ENABLE_MULTIHEAD
EggTrayIcon *egg_tray_icon_new_for_screen (GdkScreen   *screen,
					   const gchar *name);
#endif

EggTrayIcon *egg_tray_icon_new            (const gchar *name);

guint        egg_tray_icon_send_message   (EggTrayIcon *icon,
					   gint         timeout,
					   const char  *message,
					   gint         len);
void         egg_tray_icon_cancel_message (EggTrayIcon *icon,
					   guint        id);


					    
G_END_DECLS

#endif /* __EGG_TRAY_ICON_H__ */

[Gaim-commits] CVS: gaim/plugins Makefile.am,1.60,1.61

[Sean E. <sea...@us...>]

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

Modified Files:
	Makefile.am 
Log Message:
A GNOME2 docklet.  This follows the opendesktop.org specs used by GNOME2 and
(I think) KDE in Redhat's null (I don't think vanilla KDE supports it yet)

For GNOME--you will need to have the GNOME Panel Notification Area installed.

This replaces the applet--thanks Robert McQueen.
CVS: ----------------------------------------------------------------------
CVS: Enter Log.  Lines beginning with `CVS:' are removed automatically
CVS: 
CVS: Committing in .
CVS: 
CVS: Modified Files:
CVS: 	configure.ac configure.in plugins/Makefile.am src/aim.c 
CVS: 	src/buddy.c src/core.h src/module.c src/multi.c src/perl.c 
CVS: 	src/server.c src/ui.h 
CVS: ----------------------------------------------------------------------


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/Makefile.am,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- Makefile.am	11 Aug 2002 06:42:16 -0000	1.60
+++ Makefile.am	14 Sep 2002 23:27:26 -0000	1.61
@@ -1,4 +1,4 @@
-SUBDIRS = ticker
+SUBDIRS = docklet ticker
 
 CFLAGS += -I\$(top_srcdir) -I\$(top_srcdir)/src -DVERSION=\"$(VERSION)\"
 SUFFIXES = .c .so

[Gaim-commits] CVS: gaim configure.ac,1.80,1.81 configure.in,1.129,1.130

[Sean E. <sea...@us...>]

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

Modified Files:
	configure.ac configure.in 
Log Message:
A GNOME2 docklet.  This follows the opendesktop.org specs used by GNOME2 and
(I think) KDE in Redhat's null (I don't think vanilla KDE supports it yet)

For GNOME--you will need to have the GNOME Panel Notification Area installed.

This replaces the applet--thanks Robert McQueen.
CVS: ----------------------------------------------------------------------
CVS: Enter Log.  Lines beginning with `CVS:' are removed automatically
CVS: 
CVS: Committing in .
CVS: 
CVS: Modified Files:
CVS: 	configure.ac configure.in plugins/Makefile.am src/aim.c 
CVS: 	src/buddy.c src/core.h src/module.c src/multi.c src/perl.c 
CVS: 	src/server.c src/ui.h 
CVS: ----------------------------------------------------------------------


Index: configure.ac
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.ac,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- configure.ac	8 Sep 2002 15:22:48 -0000	1.80
+++ configure.ac	14 Sep 2002 23:27:25 -0000	1.81
@@ -336,6 +336,7 @@
            pixmaps/protocols/yahoo/Makefile
 	   pixmaps/protocols/oscar/Makefile
 	   plugins/Makefile
+	   plugins/docklet/Makefile
 	   plugins/ticker/Makefile
 	   po/Makefile.in 
            sounds/Makefile

Index: configure.in
===================================================================
RCS file: /cvsroot/gaim/gaim/configure.in,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- configure.in	7 Sep 2002 19:53:13 -0000	1.129
+++ configure.in	14 Sep 2002 23:27:26 -0000	1.130
@@ -334,6 +334,7 @@
            pixmaps/protocols/yahoo/Makefile
 	   pixmaps/protocols/oscar/Makefile
 	   plugins/Makefile
+	   plugins/docklet/Makefile
 	   plugins/ticker/Makefile
 	   po/Makefile.in 
            sounds/Makefile

[Gaim-commits] CVS: gaim/plugins/docklet - New directory

[Sean E. <sea...@us...>]

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

Log Message:
Directory /cvsroot/gaim/gaim/plugins/docklet added to the repository

[Gaim-commits] CVS: gaim/src prefs.c,1.249,1.250

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

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

Modified Files:
	prefs.c 
Log Message:
Geese do not taste like monkeys.



Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -d -r1.249 -r1.250
--- prefs.c	14 Sep 2002 18:15:36 -0000	1.249
+++ prefs.c	14 Sep 2002 19:37:29 -0000	1.250
@@ -1366,6 +1366,11 @@
 	gtk_container_add (GTK_CONTAINER(vbox), hbox);
 	gtk_widget_show (hbox);
 
+	button = gtk_button_new_from_stock (GTK_STOCK_OK);
+	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(ok_cb), prefs);
+	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+	gtk_widget_show(button);
+
 	button = gtk_button_new_from_stock (GTK_STOCK_APPLY);
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(apply_cb), prefs);
 	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
@@ -1373,11 +1378,6 @@
 
 	button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
 	gtk_signal_connect_object(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), prefs);
-	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-	gtk_widget_show(button);
-
-	button = gtk_button_new_from_stock (GTK_STOCK_OK);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(ok_cb), prefs);
 	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_widget_show(button);
 

[Gaim-commits] CVS: gaim/src buddy.c,1.327,1.328 dialogs.c,1.335,1.336

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

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

Modified Files:
	buddy.c dialogs.c 
Log Message:
No changes.













































































































































































Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -d -r1.327 -r1.328
--- buddy.c	12 Sep 2002 14:33:33 -0000	1.327
+++ buddy.c	14 Sep 2002 18:47:45 -0000	1.328
@@ -724,6 +724,8 @@
 			show_ee_dialog(6);
 		else if (!g_strcasecmp("kingant", normalize (b->name)))
 			show_ee_dialog(7);
+		else if (!g_strcasecmp("lschiere", normalize (b->name)))
+			show_ee_dialog(8);
 
 	} else {
 

Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -d -r1.335 -r1.336
--- dialogs.c	7 Sep 2002 18:41:08 -0000	1.335
+++ dialogs.c	14 Sep 2002 18:47:45 -0000	1.336
@@ -680,8 +680,10 @@
 		label = gtk_label_new("Everytime you click my name, an angel gets its wings.");
 	else if (ee == 6)
 		label = gtk_label_new("This sunflower seed taste like pizza.");
-	else 
+	else if (ee == 7)
 		label = gtk_label_new("Hey!  I was in that tumbleweed!");
+	else
+		label = gtk_label_new("I'm not anything.");
 	
 	gtk_widget_show(label);
 	gtk_widget_show(ok);

[Gaim-commits] CVS: gaim/src prefs.c,1.248,1.249

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

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

Modified Files:
	prefs.c 
Log Message:
I think I like this a little bit more.. ? 



Index: prefs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prefs.c,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -d -r1.248 -r1.249
--- prefs.c	14 Sep 2002 03:08:39 -0000	1.248
+++ prefs.c	14 Sep 2002 18:15:36 -0000	1.249
@@ -1366,11 +1366,6 @@
 	gtk_container_add (GTK_CONTAINER(vbox), hbox);
 	gtk_widget_show (hbox);
 
-	button = gtk_button_new_from_stock (GTK_STOCK_OK);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(ok_cb), prefs);
-	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
-	gtk_widget_show(button);
-
 	button = gtk_button_new_from_stock (GTK_STOCK_APPLY);
 	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(apply_cb), prefs);
 	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
@@ -1378,6 +1373,11 @@
 
 	button = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
 	gtk_signal_connect_object(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(gtk_widget_destroy), prefs);
+	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
+	gtk_widget_show(button);
+
+	button = gtk_button_new_from_stock (GTK_STOCK_OK);
+	gtk_signal_connect(GTK_OBJECT(button), "clicked", GTK_SIGNAL_FUNC(ok_cb), prefs);
 	gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0);
 	gtk_widget_show(button);
 

[Gaim-commits] CVS: gaim/src conversation.c,1.358.2.2,1.358.2.3

[Sean E. <sea...@us...>]

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

Modified Files:
      Tag: gtk1-stable
	conversation.c 
Log Message:
This isn't a bug-fix, but a slight change in interface--for the better, I
suppose.


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.358.2.2
retrieving revision 1.358.2.3
diff -u -d -r1.358.2.2 -r1.358.2.3
--- conversation.c	30 Aug 2002 11:54:53 -0000	1.358.2.2
+++ conversation.c	14 Sep 2002 16:44:20 -0000	1.358.2.3
@@ -955,8 +955,8 @@
 				toggle_font(c->font, c);
 				gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
 				break;
-			case 'c':
-			case 'C':
+			case 'k':
+			case 'K':
 				quiet_set(c->fgcolorbtn,
 					  !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(c->fgcolorbtn)));
 				toggle_fg_color(c->fgcolorbtn, c);

[Gaim-commits] CVS: gaim ChangeLog,1.509.2.25,1.509.2.26

[Sean E. <sea...@us...>]

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

Modified Files:
      Tag: gtk1-stable
	ChangeLog 
Log Message:
This isn't a bug-fix, but a slight change in interface--for the better, I
suppose.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.509.2.25
retrieving revision 1.509.2.26
diff -u -d -r1.509.2.25 -r1.509.2.26
--- ChangeLog	14 Sep 2002 07:32:48 -0000	1.509.2.25
+++ ChangeLog	14 Sep 2002 16:44:20 -0000	1.509.2.26
@@ -4,6 +4,7 @@
 	* Yahoo can connect again. Oops!
 	* Reversed Arun's patch that accidentally caused Yahoo
 	  not to connect--for implimeentation reasons
+	* Changed "color" binding to Ctrl-K.
 
 version 0.59.2 (09/09/2002):
         * Japanese translation updated (Thanks, Junichi Uekawa)

[Gaim-commits] CVS: gaim/src conversation.c,1.375,1.376

[Sean E. <sea...@us...>]

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

Modified Files:
	conversation.c 
Log Message:
Changing ctrl-c binding to ctrl-k.  So when people try "copying" with ctrl-c,
the color dialog won't annoy them.



Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -d -r1.375 -r1.376
--- conversation.c	31 Aug 2002 02:40:51 -0000	1.375
+++ conversation.c	14 Sep 2002 16:37:24 -0000	1.376
@@ -949,8 +949,8 @@
 				toggle_font(c->font, c);
 				gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key_press_event");
 				break;
-			case 'c':
-			case 'C':
+			case 'k':
+			case 'K':
 				quiet_set(c->fgcolorbtn,
 					  !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(c->fgcolorbtn)));
 				toggle_fg_color(c->fgcolorbtn, c);

[Gaim-commits] CVS: gaim ChangeLog,1.544,1.545

[Sean E. <sea...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:
Changing ctrl-c binding to ctrl-k.  So when people try "copying" with ctrl-c,
the color dialog won't annoy them.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.544
retrieving revision 1.545
diff -u -d -r1.544 -r1.545
--- ChangeLog	14 Sep 2002 07:28:10 -0000	1.544
+++ ChangeLog	14 Sep 2002 16:37:24 -0000	1.545
@@ -70,6 +70,7 @@
 	* /topic with no argument displays the current topic (Thanks Mark 
 	  Doliner)
 	* i18n fixes (Thanks Matt Wilson)
+	* Changed Ctrl-C color binding to Ctrl-K
 
 version 0.59 (06/24/2002):
 	* Hungarian translation added (Thanks, Sutto Zoltan)

[Gaim-commits] CVS: gaim autogen.sh,1.23,1.24

[Sean E. <sea...@us...>]

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

Modified Files:
	autogen.sh 
Log Message:
This will help aclocal find your gtk2 .m4 files if you have them installed 
in a place autoconf can't find them.

Thanks Ethan.



Index: autogen.sh
===================================================================
RCS file: /cvsroot/gaim/gaim/autogen.sh,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- autogen.sh	26 Aug 2002 04:04:10 -0000	1.23
+++ autogen.sh	14 Sep 2002 07:47:36 -0000	1.24
@@ -57,6 +57,10 @@
 echo "Running libtoolize, please ignore non-fatal messages...."
 echo n | libtoolize --copy --force || exit;
 
+if test -d /usr/local/share/aclocal ; then
+	ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I /usr/local/share/aclocal"
+fi
+
 aclocal -I m4 $ACLOCAL_FLAGS || exit;
 autoheader || exit;
 automake --add-missing --copy;

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.87.2.3,1.87.2.4

[Sean E. <sea...@us...>]

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

Modified Files:
      Tag: gtk1-stable
	msn.c 
Log Message:
http://sourceforge.net/tracker/index.php?func=detail&aid=603364&group_id=235&atid=300235


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.87.2.3
retrieving revision 1.87.2.4
diff -u -d -r1.87.2.3 -r1.87.2.4
--- msn.c	9 Sep 2002 05:46:08 -0000	1.87.2.3
+++ msn.c	14 Sep 2002 07:32:50 -0000	1.87.2.4
@@ -162,10 +162,9 @@
 {
 	static char buf[BUF_LEN];
 
-	gchar * ss = g_strstrip(s);
 	g_return_val_if_fail(s != NULL, NULL);
 
-	g_snprintf(buf, sizeof(buf), "%s%s", ss, strchr(ss, '@') ? "" : "@hotmail.com");
+	g_snprintf(buf, sizeof(buf), "%s%s", s, strchr(s, '@') ? "" : "@hotmail.com");
 
 	return buf;
 }

[Gaim-commits] CVS: gaim/src/protocols/yahoo yahoo.c,1.43.2.3,1.43.2.4

[Sean E. <sea...@us...>]

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

Modified Files:
      Tag: gtk1-stable
	yahoo.c 
Log Message:
http://sourceforge.net/tracker/index.php?func=detail&aid=603364&group_id=235&atid=300235


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.43.2.3
retrieving revision 1.43.2.4
diff -u -d -r1.43.2.3 -r1.43.2.4
--- yahoo.c	11 Sep 2002 01:37:24 -0000	1.43.2.3
+++ yahoo.c	14 Sep 2002 07:32:50 -0000	1.43.2.4
@@ -968,7 +968,6 @@
 	struct gaim_connection *gc = new_gaim_conn(user);
 	struct yahoo_data *yd = gc->proto_data = g_new0(struct yahoo_data, 1);
 
-	g_strstrip(gc->username);
 	set_login_progress(gc, 1, "Connecting");
 
 	yd->fd = -1;

[Gaim-commits] CVS: gaim ChangeLog,1.509.2.24,1.509.2.25

[Sean E. <sea...@us...>]

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

Modified Files:
      Tag: gtk1-stable
	ChangeLog 
Log Message:
http://sourceforge.net/tracker/index.php?func=detail&aid=603364&group_id=235&atid=300235


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.509.2.24
retrieving revision 1.509.2.25
diff -u -d -r1.509.2.24 -r1.509.2.25
--- ChangeLog	13 Sep 2002 02:39:28 -0000	1.509.2.24
+++ ChangeLog	14 Sep 2002 07:32:48 -0000	1.509.2.25
@@ -2,6 +2,8 @@
 
 version 0.59.3:
 	* Yahoo can connect again. Oops!
+	* Reversed Arun's patch that accidentally caused Yahoo
+	  not to connect--for implimeentation reasons
 
 version 0.59.2 (09/09/2002):
         * Japanese translation updated (Thanks, Junichi Uekawa)

[Gaim-commits] CVS: gaim/src/protocols/msn msn.c,1.95,1.96

[Sean E. <sea...@us...>]

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

Modified Files:
	msn.c 
Log Message:

Am I the only one who thought this was kinda stupid?


Index: msn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/msn.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- msn.c	10 Sep 2002 15:31:34 -0000	1.95
+++ msn.c	14 Sep 2002 07:28:10 -0000	1.96
@@ -162,10 +162,9 @@
 {
 	static char buf[BUF_LEN];
 
-	gchar * ss = g_strstrip(s);
 	g_return_val_if_fail(s != NULL, NULL);
 
-	g_snprintf(buf, sizeof(buf), "%s%s", ss, strchr(ss, '@') ? "" : "@hotmail.com");
+	g_snprintf(buf, sizeof(buf), "%s%s", s, strchr(s, '@') ? "" : "@hotmail.com");
 
 	return buf;
 }

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

[Sean E. <sea...@us...>]

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

Modified Files:
	yahoo.c 
Log Message:

Am I the only one who thought this was kinda stupid?


Index: yahoo.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/yahoo/yahoo.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- yahoo.c	11 Sep 2002 01:18:18 -0000	1.48
+++ yahoo.c	14 Sep 2002 07:28:10 -0000	1.49
@@ -970,7 +970,6 @@
 	struct gaim_connection *gc = new_gaim_conn(user);
 	struct yahoo_data *yd = gc->proto_data = g_new0(struct yahoo_data, 1);
 
-	g_strstrip(gc->username);
 	set_login_progress(gc, 1, "Connecting");
 
 	yd->fd = -1;

[Gaim-commits] CVS: gaim ChangeLog,1.543,1.544

[Sean E. <sea...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:

Am I the only one who thought this was kinda stupid?


Index: ChangeLog
===================================================================
RCS file: /cvsroot/gaim/gaim/ChangeLog,v
retrieving revision 1.543
retrieving revision 1.544
diff -u -d -r1.543 -r1.544
--- ChangeLog	14 Sep 2002 05:25:43 -0000	1.543
+++ ChangeLog	14 Sep 2002 07:28:10 -0000	1.544
@@ -67,9 +67,7 @@
 	* Fixed a possible segfault when signing off Jabber (Thanks
 	  Craig Boston)
 	* Word-wrapping on mail notification text (Thanks, Andrew Molloy)
-	* Strip trailing and leading spaces from MSN/Yahoo names (Thanks,
-	  Arun Tharuvai)
-	* /topic when not an op now displays the current topic (Thanks Mark 
+	* /topic with no argument displays the current topic (Thanks Mark 
 	  Doliner)
 	* i18n fixes (Thanks Matt Wilson)