Mercurial > pidgin

--- a/configure.ac	Sat Sep 14 19:37:29 2002 +0000
+++ b/configure.ac	Sat Sep 14 23:27:28 2002 +0000
@@ -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
--- a/configure.in	Sat Sep 14 19:37:29 2002 +0000
+++ b/configure.in	Sat Sep 14 23:27:28 2002 +0000
@@ -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
--- a/plugins/Makefile.am	Sat Sep 14 19:37:29 2002 +0000
+++ b/plugins/Makefile.am	Sat Sep 14 23:27:28 2002 +0000
@@ -1,4 +1,4 @@
-SUBDIRS = ticker
+SUBDIRS = docklet ticker

 CFLAGS += -I\$(top_srcdir) -I\$(top_srcdir)/src -DVERSION=\"$(VERSION)\"
 SUFFIXES = .c .so
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/docklet/Makefile.am	Sat Sep 14 23:27:28 2002 +0000
@@ -0,0 +1,20 @@
+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)\"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/docklet/docklet.c	Sat Sep 14 23:27:28 2002 +0000
@@ -0,0 +1,359 @@
+/* System tray docklet plugin for Gaim
+ * Copyright (C) 2002 Robert McQueen <robot101@debian.org>
+ * Inspired by a similar plugin by:
+ *  John (J5) Palmieri <johnp@martianrock.com>
+ *
+ * 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.");
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/docklet/eggtrayicon.c	Sat Sep 14 23:27:28 2002 +0000
@@ -0,0 +1,343 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* eggtrayicon.c
+ * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
+ *
+ * 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);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/docklet/eggtrayicon.h	Sat Sep 14 23:27:28 2002 +0000
@@ -0,0 +1,76 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/* eggtrayicon.h
+ * Copyright (C) 2002 Anders Carlsson <andersca@gnu.org>
+ *
+ * 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__ */
--- a/src/aim.c	Sat Sep 14 19:37:29 2002 +0000
+++ b/src/aim.c	Sat Sep 14 23:27:28 2002 +0000
@@ -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
--- a/src/buddy.c	Sat Sep 14 19:37:29 2002 +0000
+++ b/src/buddy.c	Sat Sep 14 23:27:28 2002 +0000
@@ -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()
--- a/src/core.h	Sat Sep 14 19:37:29 2002 +0000
+++ b/src/core.h	Sat Sep 14 23:27:28 2002 +0000
@@ -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... */
 };
--- a/src/module.c	Sat Sep 14 19:37:29 2002 +0000
+++ b/src/module.c	Sat Sep 14 23:27:28 2002 +0000
@@ -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;
--- a/src/multi.c	Sat Sep 14 19:37:29 2002 +0000
+++ b/src/multi.c	Sat Sep 14 23:27:28 2002 +0000
@@ -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);
+	/* 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);

-	/* UI stuff */
-	convo_menu_remove(gc);
-	remove_icon_data(gc);
-	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();
 }
--- a/src/perl.c	Sat Sep 14 19:37:29 2002 +0000
+++ b/src/perl.c	Sat Sep 14 23:27:28 2002 +0000
@@ -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;
 	}
--- a/src/server.c	Sat Sep 14 19:37:29 2002 +0000
+++ b/src/server.c	Sat Sep 14 23:27:28 2002 +0000
@@ -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);
 	}
 }
--- a/src/ui.h	Sat Sep 14 19:37:29 2002 +0000
+++ b/src/ui.h	Sat Sep 14 23:27:28 2002 +0000
@@ -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();