changeset 6209:dd715b02df41

[gaim-migrate @ 6695] trayicon-*.* -> docklet-*.* committer: Tailor Script <tailor@pidgin.im>
author Herman Bloggs <hermanator12002@yahoo.com>
date Fri, 18 Jul 2003 03:46:42 +0000
parents 3e3ee3cba192
children a5b8abff6461
files plugins/docklet/docklet-win32.c plugins/docklet/docklet-x11.c plugins/docklet/trayicon-win32.c plugins/docklet/trayicon-x11.c
diffstat 4 files changed, 385 insertions(+), 379 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/docklet/docklet-win32.c	Fri Jul 18 03:46:42 2003 +0000
@@ -0,0 +1,219 @@
+/*
+ * System tray icon (aka docklet) plugin for Gaim
+ *
+ * Copyright (C) 2002-3 Robert McQueen <robot101@debian.org>
+ * Copyright (C) 2003 Herman Bloggs <hermanator12002@yahoo.com>
+ * 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.
+ */
+
+#include <windows.h>
+#include <gdk/gdkwin32.h>
+#include <gdk/gdk.h>
+
+#include "internal.h"
+#include "gtkblist.h"
+#include "gtkprefs.h"
+#include "debug.h"
+
+#include "gaim.h"
+#include "ui.h"
+
+#include "resource.h"
+#include "MinimizeToTray.h"
+#include "docklet.h"
+
+/*
+ *  DEFINES, MACROS & DATA TYPES
+ */
+#define GAIM_SYSTRAY_HINT _("Gaim Instant Messenger")
+#define GAIM_SYSTRAY_DISCONN_HINT _("Gaim Instant Messenger - Signed off")
+#define GAIM_SYSTRAY_AWAY_HINT _("Gaim Instant Messenger - Away")
+#define WM_TRAYMESSAGE WM_USER /* User defined WM Message */
+
+/*
+ *  LOCALS
+ */
+static HWND systray_hwnd=0;
+static HICON sysicon_disconn=0;
+static HICON sysicon_conn=0;
+static HICON sysicon_away=0;
+static HICON sysicon_pend=0;
+static HICON sysicon_awypend=0;
+static NOTIFYICONDATA wgaim_nid;
+
+
+static LRESULT CALLBACK systray_mainmsg_handler(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
+	static UINT taskbarRestartMsg; /* static here means value is kept across multiple calls to this func */
+
+	switch(msg) {
+	case WM_CREATE:
+		gaim_debug(GAIM_DEBUG_INFO, "wgaim_systray", "WM_CREATE\n");
+		taskbarRestartMsg = RegisterWindowMessage("TaskbarCreated");
+		break;
+		
+	case WM_TIMER:
+		gaim_debug(GAIM_DEBUG_INFO, "wgaim_systray", "WM_TIMER\n");
+		break;
+
+	case WM_DESTROY:
+		gaim_debug(GAIM_DEBUG_INFO, "wgaim_systray", "WM_DESTROY\n");
+		break;
+
+	case WM_TRAYMESSAGE:
+	{
+		int type = 0;
+
+		/* We'll use Double Click - Single click over on linux */
+		if( lparam == WM_LBUTTONDBLCLK )
+			type = 1;
+		else if( lparam == WM_MBUTTONUP )
+			type = 2;
+		else if( lparam == WM_RBUTTONUP )
+			type = 3;
+		else
+			break;
+
+		docklet_clicked(type);
+		break;
+	}
+	default: 
+		if (msg == taskbarRestartMsg) {
+			/* explorer crashed and left us hanging... 
+			   This will put the systray icon back in it's place, when it restarts */
+			Shell_NotifyIcon(NIM_ADD,&wgaim_nid);
+		}
+		break;
+	}/* end switch */
+
+	return DefWindowProc(hwnd, msg, wparam, lparam);
+}
+
+/* Create hidden window to process systray messages */
+static HWND systray_create_hiddenwin() {
+	WNDCLASSEX wcex;
+	TCHAR wname[32];
+
+	strcpy(wname, "GaimWin");
+
+	wcex.cbSize = sizeof(WNDCLASSEX);
+
+	wcex.style	        = 0;
+	wcex.lpfnWndProc	= (WNDPROC)systray_mainmsg_handler;
+	wcex.cbClsExtra		= 0;
+	wcex.cbWndExtra		= 0;
+	wcex.hInstance		= wgaim_hinstance();
+	wcex.hIcon		= NULL;
+	wcex.hCursor		= NULL,
+	wcex.hbrBackground	= NULL;
+	wcex.lpszMenuName	= NULL;
+	wcex.lpszClassName	= wname;
+	wcex.hIconSm		= NULL;
+
+	RegisterClassEx(&wcex);
+
+	// Create the window
+	return (CreateWindow(wname, "", 0, 0, 0, 0, 0, GetDesktopWindow(), NULL, wgaim_hinstance(), 0));
+}
+
+static void systray_init_icon(HWND hWnd, HICON icon) {
+	char* locenc=NULL;
+
+	ZeroMemory(&wgaim_nid,sizeof(wgaim_nid));
+	wgaim_nid.cbSize=sizeof(NOTIFYICONDATA);
+	wgaim_nid.hWnd=hWnd;
+	wgaim_nid.uID=0;
+	wgaim_nid.uFlags=NIF_ICON | NIF_MESSAGE | NIF_TIP;
+	wgaim_nid.uCallbackMessage=WM_TRAYMESSAGE;
+	wgaim_nid.hIcon=icon;
+	locenc=g_locale_from_utf8(GAIM_SYSTRAY_DISCONN_HINT, -1, NULL, NULL, NULL);
+	strcpy(wgaim_nid.szTip, locenc);
+	g_free(locenc);
+	Shell_NotifyIcon(NIM_ADD,&wgaim_nid);
+	docklet_embedded();
+}
+
+static void systray_change_icon(HICON icon, char* text) {
+	char *locenc=NULL;
+	wgaim_nid.hIcon = icon;
+	locenc = g_locale_from_utf8(text, -1, NULL, NULL, NULL);
+	lstrcpy(wgaim_nid.szTip, locenc);
+	g_free(locenc);
+	Shell_NotifyIcon(NIM_MODIFY,&wgaim_nid);
+}
+
+static void systray_remove_nid(void) {
+	Shell_NotifyIcon(NIM_DELETE,&wgaim_nid);
+}
+
+static void wgaim_tray_update_icon(enum docklet_status icon) {
+	switch (icon) {
+		case offline:
+			systray_change_icon(sysicon_disconn, GAIM_SYSTRAY_DISCONN_HINT);
+			break;
+		case offline_connecting:
+		case online_connecting:
+			break;
+		case online:
+			systray_change_icon(sysicon_conn, GAIM_SYSTRAY_HINT);
+			break;
+		case online_pending:
+			systray_change_icon(sysicon_pend, GAIM_SYSTRAY_HINT);
+			break;
+		case away:
+			systray_change_icon(sysicon_away, GAIM_SYSTRAY_AWAY_HINT);
+			break;
+		case away_pending:
+			systray_change_icon(sysicon_awypend, GAIM_SYSTRAY_AWAY_HINT);
+			break;
+	}
+}
+
+static void wgaim_tray_create() {
+	/* dummy window to process systray messages */
+	systray_hwnd = systray_create_hiddenwin();
+
+	/* Load icons, and init systray notify icon */
+	sysicon_disconn = (HICON)LoadImage(wgaim_hinstance(), MAKEINTRESOURCE(GAIM_OFFLINE_TRAY_ICON), IMAGE_ICON, 16, 16, 0);
+	sysicon_conn = (HICON)LoadImage(wgaim_hinstance(), MAKEINTRESOURCE(GAIM_TRAY_ICON), IMAGE_ICON, 16, 16, 0);
+	sysicon_away = (HICON)LoadImage(wgaim_hinstance(), MAKEINTRESOURCE(GAIM_AWAY_TRAY_ICON), IMAGE_ICON, 16, 16, 0);
+	sysicon_pend = (HICON)LoadImage(wgaim_hinstance(), MAKEINTRESOURCE(GAIM_PEND_TRAY_ICON), IMAGE_ICON, 16, 16, 0);
+	sysicon_awypend = (HICON)LoadImage(wgaim_hinstance(), MAKEINTRESOURCE(GAIM_AWAYPEND_TRAY_ICON), IMAGE_ICON, 16, 16, 0);
+
+	/* Create icon in systray */
+	systray_init_icon(systray_hwnd, sysicon_disconn);
+	gaim_debug(GAIM_DEBUG_INFO, "tray icon", "created\n");
+}
+
+static void wgaim_tray_destroy() {
+	systray_remove_nid();
+	DestroyWindow(systray_hwnd);
+	docklet_remove(TRUE);
+}
+
+static struct docklet_ui_ops wgaim_tray_ops =
+{
+	wgaim_tray_create,
+	wgaim_tray_destroy,
+	wgaim_tray_update_icon
+};
+
+/* Used by docklet's plugin load func */
+void docklet_ui_init() {
+	docklet_set_ui_ops(&wgaim_tray_ops);
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/docklet/docklet-x11.c	Fri Jul 18 03:46:42 2003 +0000
@@ -0,0 +1,166 @@
+/*
+ * System tray icon (aka docklet) plugin for Gaim
+ *
+ * Copyright (C) 2002-3 Robert McQueen <robot101@debian.org>
+ * Copyright (C) 2003 Herman Bloggs <hermanator12002@yahoo.com>
+ * 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.
+ */
+
+#include "internal.h"
+#include "debug.h"
+#include "stock.h"
+
+#include "gaim.h"
+#include "ui.h"
+
+#include "eggtrayicon.h"
+#include "docklet.h"
+
+/* globals */
+static EggTrayIcon *docklet = NULL;
+static GtkWidget *image = NULL;
+
+/* protos */
+static void docklet_x11_create();
+
+static gboolean
+docklet_x11_create_cb()
+{
+	docklet_x11_create();
+
+	return FALSE; /* for when we're called by the glib idle handler */
+}
+
+static void
+docklet_x11_embedded_cb(GtkWidget *widget, void *data)
+{
+	gaim_debug(GAIM_DEBUG_INFO, "tray icon", "embedded\n");
+
+	docklet_embedded();
+}
+
+static void
+docklet_x11_destroyed_cb(GtkWidget *widget, void *data)
+{
+	gaim_debug(GAIM_DEBUG_INFO, "tray icon", "destroyed\n");
+
+	docklet_remove(TRUE);
+
+	g_object_unref(G_OBJECT(docklet));
+	docklet = NULL;
+
+	g_idle_add(docklet_x11_create_cb, &handle);
+}
+
+static void
+docklet_x11_clicked_cb(GtkWidget *button, GdkEventButton *event, void *data)
+{
+	if (event->type != GDK_BUTTON_PRESS)
+		return;
+
+	docklet_clicked(event->button);
+}
+
+static void
+docklet_x11_update_icon(enum docklet_status icon)
+{
+	const gchar *icon_name = NULL;
+
+	switch (icon) {
+		case offline:
+			icon_name = GAIM_STOCK_ICON_OFFLINE;
+			break;
+		case offline_connecting:
+		case online_connecting:
+			icon_name = GAIM_STOCK_ICON_CONNECT;
+			break;
+		case online:
+			icon_name = GAIM_STOCK_ICON_ONLINE;
+			break;
+		case online_pending:
+			icon_name = GAIM_STOCK_ICON_ONLINE_MSG;
+			break;
+		case away:
+			icon_name = GAIM_STOCK_ICON_AWAY;
+			break;
+		case away_pending:
+			icon_name = GAIM_STOCK_ICON_AWAY_MSG;
+			break;
+	}
+
+	gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
+}
+
+static void
+docklet_x11_destroy()
+{
+	docklet_remove(GTK_WIDGET_VISIBLE(docklet));
+
+	g_signal_handlers_disconnect_by_func(G_OBJECT(docklet), G_CALLBACK(docklet_x11_destroyed_cb), NULL);
+	gtk_widget_destroy(GTK_WIDGET(docklet));
+
+	g_object_unref(G_OBJECT(docklet));
+	docklet = NULL;
+
+	gaim_debug(GAIM_DEBUG_INFO, "tray icon", "destroyed\n");
+}
+
+static void
+docklet_x11_create()
+{
+	GtkWidget *box;
+
+	if (docklet) {
+		/* if this is being called when a tray icon exists, it's because
+		   something messed up. try destroying it before we proceed,
+		   although docklet_refcount may be all hosed. hopefully won't happen. */
+		gaim_debug(GAIM_DEBUG_WARNING, "tray icon", "trying to create icon but it already exists?\n");
+		docklet_x11_destroy();
+	}
+
+	docklet = egg_tray_icon_new("Gaim");
+	box = gtk_event_box_new();
+	image = gtk_image_new();
+
+	g_signal_connect(G_OBJECT(docklet), "embedded", G_CALLBACK(docklet_x11_embedded_cb), NULL);
+	g_signal_connect(G_OBJECT(docklet), "destroy", G_CALLBACK(docklet_x11_destroyed_cb), NULL);
+	g_signal_connect(G_OBJECT(box), "button-press-event", G_CALLBACK(docklet_x11_clicked_cb), NULL);
+
+	gtk_container_add(GTK_CONTAINER(box), image);
+	gtk_container_add(GTK_CONTAINER(docklet), box);
+	gtk_widget_show_all(GTK_WIDGET(docklet));
+
+	/* ref the docklet before we bandy it about the place */
+	g_object_ref(G_OBJECT(docklet));
+
+	gaim_debug(GAIM_DEBUG_INFO, "tray icon", "created\n");
+}
+
+static struct docklet_ui_ops ui_ops =
+{
+	docklet_x11_create,
+	docklet_x11_destroy,
+	docklet_x11_update_icon
+};
+
+void
+docklet_ui_init()
+{
+	docklet_set_ui_ops(&ui_ops);
+}
--- a/plugins/docklet/trayicon-win32.c	Fri Jul 18 03:45:39 2003 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,217 +0,0 @@
-/*
- * System tray icon (aka docklet) plugin for Gaim
- *
- * Copyright (C) 2002 Robert McQueen <robot101@debian.org>
- * Copyright (C) 2003 Herman Bloggs <hermanator12002@yahoo.com>
- * 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.
- */
-#include <windows.h>
-#include <gdk/gdkwin32.h>
-#include <gdk/gdk.h>
-
-#include "internal.h"
-#include "gtkblist.h"
-#include "gtkprefs.h"
-#include "debug.h"
-
-#include "gaim.h"
-#include "ui.h"
-
-#include "resource.h"
-#include "MinimizeToTray.h"
-#include "docklet.h"
-
-/*
- *  DEFINES, MACROS & DATA TYPES
- */
-#define GAIM_SYSTRAY_HINT _("Gaim Instant Messenger")
-#define GAIM_SYSTRAY_DISCONN_HINT _("Gaim Instant Messenger - Signed off")
-#define GAIM_SYSTRAY_AWAY_HINT _("Gaim Instant Messenger - Away")
-#define WM_TRAYMESSAGE WM_USER /* User defined WM Message */
-
-/*
- *  LOCALS
- */
-static HWND systray_hwnd=0;
-static HICON sysicon_disconn=0;
-static HICON sysicon_conn=0;
-static HICON sysicon_away=0;
-static HICON sysicon_pend=0;
-static HICON sysicon_awypend=0;
-static NOTIFYICONDATA wgaim_nid;
-
-
-static LRESULT CALLBACK systray_mainmsg_handler(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
-	static UINT taskbarRestartMsg; /* static here means value is kept across multiple calls to this func */
-
-	switch(msg) {
-	case WM_CREATE:
-		gaim_debug(GAIM_DEBUG_INFO, "wgaim_systray", "WM_CREATE\n");
-		taskbarRestartMsg = RegisterWindowMessage("TaskbarCreated");
-		break;
-		
-	case WM_TIMER:
-		gaim_debug(GAIM_DEBUG_INFO, "wgaim_systray", "WM_TIMER\n");
-		break;
-
-	case WM_DESTROY:
-		gaim_debug(GAIM_DEBUG_INFO, "wgaim_systray", "WM_DESTROY\n");
-		break;
-
-	case WM_TRAYMESSAGE:
-	{
-		int type = 0;
-
-		/* We'll use Double Click - Single click over on linux */
-		if( lparam == WM_LBUTTONDBLCLK )
-			type = 1;
-		else if( lparam == WM_MBUTTONUP )
-			type = 2;
-		else if( lparam == WM_RBUTTONUP )
-			type = 3;
-		else
-			break;
-
-		docklet_clicked(type);
-		break;
-	}
-	default: 
-		if (msg == taskbarRestartMsg) {
-			/* explorer crashed and left us hanging... 
-			   This will put the systray icon back in it's place, when it restarts */
-			Shell_NotifyIcon(NIM_ADD,&wgaim_nid);
-		}
-		break;
-	}/* end switch */
-
-	return DefWindowProc(hwnd, msg, wparam, lparam);
-}
-
-/* Create hidden window to process systray messages */
-static HWND systray_create_hiddenwin() {
-	WNDCLASSEX wcex;
-	TCHAR wname[32];
-
-	strcpy(wname, "GaimWin");
-
-	wcex.cbSize = sizeof(WNDCLASSEX);
-
-	wcex.style	        = 0;
-	wcex.lpfnWndProc	= (WNDPROC)systray_mainmsg_handler;
-	wcex.cbClsExtra		= 0;
-	wcex.cbWndExtra		= 0;
-	wcex.hInstance		= wgaim_hinstance();
-	wcex.hIcon		= NULL;
-	wcex.hCursor		= NULL,
-	wcex.hbrBackground	= NULL;
-	wcex.lpszMenuName	= NULL;
-	wcex.lpszClassName	= wname;
-	wcex.hIconSm		= NULL;
-
-	RegisterClassEx(&wcex);
-
-	// Create the window
-	return (CreateWindow(wname, "", 0, 0, 0, 0, 0, GetDesktopWindow(), NULL, wgaim_hinstance(), 0));
-}
-
-static void systray_init_icon(HWND hWnd, HICON icon) {
-	char* locenc=NULL;
-
-	ZeroMemory(&wgaim_nid,sizeof(wgaim_nid));
-	wgaim_nid.cbSize=sizeof(NOTIFYICONDATA);
-	wgaim_nid.hWnd=hWnd;
-	wgaim_nid.uID=0;
-	wgaim_nid.uFlags=NIF_ICON | NIF_MESSAGE | NIF_TIP;
-	wgaim_nid.uCallbackMessage=WM_TRAYMESSAGE;
-	wgaim_nid.hIcon=icon;
-	locenc=g_locale_from_utf8(GAIM_SYSTRAY_DISCONN_HINT, -1, NULL, NULL, NULL);
-	strcpy(wgaim_nid.szTip, locenc);
-	g_free(locenc);
-	Shell_NotifyIcon(NIM_ADD,&wgaim_nid);
-	docklet_embedded();
-}
-
-static void systray_change_icon(HICON icon, char* text) {
-	char *locenc=NULL;
-	wgaim_nid.hIcon = icon;
-	locenc = g_locale_from_utf8(text, -1, NULL, NULL, NULL);
-	lstrcpy(wgaim_nid.szTip, locenc);
-	g_free(locenc);
-	Shell_NotifyIcon(NIM_MODIFY,&wgaim_nid);
-}
-
-static void systray_remove_nid(void) {
-	Shell_NotifyIcon(NIM_DELETE,&wgaim_nid);
-}
-
-static void wgaim_tray_update_icon(enum docklet_status icon) {
-	switch (icon) {
-		case offline:
-			systray_change_icon(sysicon_disconn, GAIM_SYSTRAY_DISCONN_HINT);
-			break;
-		case offline_connecting:
-		case online_connecting:
-			break;
-		case online:
-			systray_change_icon(sysicon_conn, GAIM_SYSTRAY_HINT);
-			break;
-		case online_pending:
-			systray_change_icon(sysicon_pend, GAIM_SYSTRAY_HINT);
-			break;
-		case away:
-			systray_change_icon(sysicon_away, GAIM_SYSTRAY_AWAY_HINT);
-			break;
-		case away_pending:
-			systray_change_icon(sysicon_awypend, GAIM_SYSTRAY_AWAY_HINT);
-			break;
-	}
-}
-
-static void wgaim_tray_create() {
-	/* dummy window to process systray messages */
-	systray_hwnd = systray_create_hiddenwin();
-
-	/* Load icons, and init systray notify icon */
-	sysicon_disconn = (HICON)LoadImage(wgaim_hinstance(), MAKEINTRESOURCE(GAIM_OFFLINE_TRAY_ICON), IMAGE_ICON, 16, 16, 0);
-	sysicon_conn = (HICON)LoadImage(wgaim_hinstance(), MAKEINTRESOURCE(GAIM_TRAY_ICON), IMAGE_ICON, 16, 16, 0);
-	sysicon_away = (HICON)LoadImage(wgaim_hinstance(), MAKEINTRESOURCE(GAIM_AWAY_TRAY_ICON), IMAGE_ICON, 16, 16, 0);
-	sysicon_pend = (HICON)LoadImage(wgaim_hinstance(), MAKEINTRESOURCE(GAIM_PEND_TRAY_ICON), IMAGE_ICON, 16, 16, 0);
-	sysicon_awypend = (HICON)LoadImage(wgaim_hinstance(), MAKEINTRESOURCE(GAIM_AWAYPEND_TRAY_ICON), IMAGE_ICON, 16, 16, 0);
-
-	/* Create icon in systray */
-	systray_init_icon(systray_hwnd, sysicon_disconn);
-	gaim_debug(GAIM_DEBUG_INFO, "docklet", "Tray Icon: created\n");
-}
-
-static void wgaim_tray_destroy() {
-	systray_remove_nid();
-	DestroyWindow(systray_hwnd);
-}
-
-static struct gaim_tray_ops wgaim_tray_ops =
-{
-	wgaim_tray_create,
-	wgaim_tray_destroy,
-	wgaim_tray_update_icon
-};
-
-/* Used by docklet's plugin load func */
-void trayicon_init() {
-	docklet_set_tray_ops(&wgaim_tray_ops);
-}
--- a/plugins/docklet/trayicon-x11.c	Fri Jul 18 03:45:39 2003 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,162 +0,0 @@
-/*
- * System tray icon (aka docklet) plugin for Gaim
- *
- * Copyright (C) 2002 Robert McQueen <robot101@debian.org>
- * Copyright (C) 2003 Herman Bloggs <hermanator12002@yahoo.com>
- * 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.
- */
-#include "internal.h"
-#include "debug.h"
-#include "stock.h"
-
-#include "gaim.h"
-#include "ui.h"
-
-#include "eggtrayicon.h"
-#include "docklet.h"
-
-
-/* globals */
-static EggTrayIcon *docklet = NULL;
-static GtkWidget *image = NULL;
-
-/* protos */
-static void gaim_tray_remove_callbacks();
-static void gaim_tray_create();
-
-static void gaim_tray_embedded_cb(GtkWidget *widget, void *data) {
-        docklet_embedded();
-}
-
-static gboolean gaim_tray_create_cb() {
-        gaim_tray_create();
-	return FALSE; /* for when we're called by the glib idle handler */
-}
-
-static void gaim_tray_clicked_cb(GtkWidget *button, GdkEventButton *event, void *data) {
-	if (event->type != GDK_BUTTON_PRESS)
-		return;
-        docklet_clicked(event->button);
-}
-
-static void gaim_tray_destroyed_cb(GtkWidget *widget, void *data) {
-	gaim_debug(GAIM_DEBUG_INFO, "docklet", "Tray Icon: destroyed\n");
-
-	docklet_flush_queue();
-
-	gaim_tray_remove_callbacks();
-
-	g_object_unref(G_OBJECT(docklet));
-	docklet = NULL;
-
-	g_idle_add(gaim_tray_create_cb, &docklet);
-}
-
-static void gaim_tray_remove_callbacks() {
-	gaim_debug(GAIM_DEBUG_INFO, "docklet", "Tray Icon: removing callbacks");
-
-	while (g_source_remove_by_user_data(&docklet)) {
-		gaim_debug(GAIM_DEBUG_INFO, NULL, ".");
-	}
-
-	gaim_debug(GAIM_DEBUG_INFO, NULL, "\n");
-}
-
-
-static void gaim_tray_update_icon(enum docklet_status icon) {
-	const gchar *icon_name = NULL;
-
-	switch (icon) {
-		case offline:
-			icon_name = GAIM_STOCK_ICON_OFFLINE;
-			break;
-		case offline_connecting:
-		case online_connecting:
-			icon_name = GAIM_STOCK_ICON_CONNECT;
-			break;
-		case online:
-			icon_name = GAIM_STOCK_ICON_ONLINE;
-			break;
-		case online_pending:
-			icon_name = GAIM_STOCK_ICON_ONLINE_MSG;
-			break;
-		case away:
-			icon_name = GAIM_STOCK_ICON_AWAY;
-			break;
-		case away_pending:
-			icon_name = GAIM_STOCK_ICON_AWAY_MSG;
-			break;
-	}
-
-	gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
-}
-
-static void gaim_tray_create() {
-	GtkWidget *box;
-
-	if (docklet) {
-		/* if this is being called when a tray icon exists, it's because
-		   something messed up. try destroying it before we proceed,
-		   although docklet_refcount may be all hosed. hopefully won't happen. */
-		gaim_debug(GAIM_DEBUG_WARNING, "docklet",
-				   "Tray Icon: trying to create icon but it already exists?\n");
-		/*plugin_unload(NULL);*/
-	}
-
-	docklet = egg_tray_icon_new("Gaim");
-	box = gtk_event_box_new();
-	image = gtk_image_new();
-
-	g_signal_connect(G_OBJECT(docklet), "embedded", G_CALLBACK(gaim_tray_embedded_cb), NULL);
-	g_signal_connect(G_OBJECT(docklet), "destroy", G_CALLBACK(gaim_tray_destroyed_cb), NULL);
-	g_signal_connect(G_OBJECT(box), "button-press-event", G_CALLBACK(gaim_tray_clicked_cb), NULL);
-
-	gtk_container_add(GTK_CONTAINER(box), image);
-	gtk_container_add(GTK_CONTAINER(docklet), box);
-	gtk_widget_show_all(GTK_WIDGET(docklet));
-
-	/* ref the docklet before we bandy it about the place */
-	g_object_ref(G_OBJECT(docklet));
-
-	gaim_debug(GAIM_DEBUG_INFO, "docklet", "Tray Icon: created\n");
-}
-
-static void gaim_tray_destroy() {
-	gaim_tray_remove_callbacks();
-
-	g_signal_handlers_disconnect_by_func(G_OBJECT(docklet), G_CALLBACK(gaim_tray_destroyed_cb), NULL);
-	gtk_widget_destroy(GTK_WIDGET(docklet));
-
-	g_object_unref(G_OBJECT(docklet));
-	docklet = NULL;
-
-	gaim_debug(GAIM_DEBUG_INFO, "docklet", "Tray Icon: removed\n");
-}
-
-static struct gaim_tray_ops tray_ops =
-{
-	gaim_tray_create,
-	gaim_tray_destroy,
-	gaim_tray_update_icon
-};
-
-/* Used by docklet's plugin load func */
-void trayicon_init() {
-	docklet_set_tray_ops(&tray_ops);
-}