changeset 14706:fadfb69e5818

[gaim-migrate @ 17459] These apparently crept in accidentally. committer: Tailor Script <[e-mail]>

--- a/gtk/docklet-x11.c	Wed Oct 11 03:13:33 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,305 +0,0 @@
-/*
- * System tray icon (aka docklet) plugin for Gaim
- *
- * Copyright (C) 2002-3 Robert McQueen <[e-mail]>
- * Copyright (C) 2003 Herman Bloggs <[e-mail]>
- * Inspired by a similar plugin by:
- *  John (J5) Palmieri <[e-mail]>
- * 
- * 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 "gtkgaim.h"
-#include "debug.h"
-#include "gaimstock.h"
-
-#include "gaim.h"
-#include "gtkdialogs.h"
-
-#include "eggtrayicon.h"
-#include "docklet.h"
-
-#define EMBED_TIMEOUT 5000
-
-/* globals */
-static EggTrayIcon *docklet = NULL;
-static GtkWidget *image = NULL;
-static GtkTooltips *tooltips = NULL;
-static GdkPixbuf *blank_icon = NULL;
-static int embed_timeout = 0;
-
-/* protos */
-static void docklet_x11_create(void);
-
-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");
-	
-	g_source_remove(embed_timeout);
-	embed_timeout = 0;
-	docklet_embedded();
-}
-
-static void
-docklet_x11_destroyed_cb(GtkWidget *widget, void *data)
-{
-	gaim_debug(GAIM_DEBUG_INFO, "tray icon", "destroyed\n");
-
-	docklet_remove();
-
-	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(DockletStatus icon)
-{
-	const gchar *icon_name = NULL;
-
-	g_return_if_fail(image != NULL);
-
-	switch (icon) {
-		case DOCKLET_STATUS_OFFLINE:
-			icon_name = GAIM_STOCK_ICON_OFFLINE;
-			break;
-		case DOCKLET_STATUS_CONNECTING:
-			icon_name = GAIM_STOCK_ICON_CONNECT;
-			break;
-		case DOCKLET_STATUS_ONLINE:
-			icon_name = GAIM_STOCK_ICON_ONLINE;
-			break;
-		case DOCKLET_STATUS_ONLINE_PENDING:
-			icon_name = GAIM_STOCK_ICON_ONLINE_MSG;
-			break;
-		case DOCKLET_STATUS_AWAY:
-			icon_name = GAIM_STOCK_ICON_AWAY;
-			break;
-		case DOCKLET_STATUS_AWAY_PENDING:
-			icon_name = GAIM_STOCK_ICON_AWAY_MSG;
-			break;
-	}
-
-	if(icon_name)
-		gtk_image_set_from_stock(GTK_IMAGE(image), icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
-
-#if 0
-	GdkPixbuf *p;
-	GdkBitmap *mask = NULL;
-
-	p = gtk_widget_render_icon(GTK_WIDGET(image), icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR, NULL);
-
-	if (p && (gdk_pixbuf_get_colorspace(p) == GDK_COLORSPACE_RGB) && (gdk_pixbuf_get_bits_per_sample(p) == 8)
-	   && (gdk_pixbuf_get_has_alpha(p)) && (gdk_pixbuf_get_n_channels(p) == 4)) {
-		int len = gdk_pixbuf_get_width(p) * gdk_pixbuf_get_height(p);
-		guchar *data = gdk_pixbuf_get_pixels(p);
-		guchar *bitmap = g_malloc((len / 8) + 1);
-		int i;
-
-		for (i = 0; i < len; i++)
-			if (data[i*4 + 3] > 55)
-				bitmap[i/8] |= 1 << i % 8;
-			else
-				bitmap[i/8] &= ~(1 << i % 8);
-
-		mask = gdk_bitmap_create_from_data(GDK_DRAWABLE(GTK_WIDGET(image)->window), bitmap, gdk_pixbuf_get_width(p), gdk_pixbuf_get_height(p));
-		g_free(bitmap);
-	}
-
-	if (mask)
-		gdk_window_shape_combine_mask(image->window, mask, 0, 0);
-
-	g_object_unref(G_OBJECT(p));
-#endif
-}
-
-static void
-docklet_x11_blank_icon()
-{
-	if (!blank_icon) {
-		gint width, height;
-
-		gtk_icon_size_lookup(GTK_ICON_SIZE_LARGE_TOOLBAR, &width, &height);
-		blank_icon = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, width, height);
-		gdk_pixbuf_fill(blank_icon, 0);
-	}
-
-	gtk_image_set_from_pixbuf(GTK_IMAGE(image), blank_icon);
-}
-
-static void
-docklet_x11_set_tooltip(gchar *tooltip)
-{
-	if (!tooltips)
-		tooltips = gtk_tooltips_new();
-
-	/* image->parent is a GtkEventBox */
-	if (tooltip) {
-		gtk_tooltips_enable(tooltips);
-		gtk_tooltips_set_tip(tooltips, image->parent, tooltip, NULL);
-	} else {
-		gtk_tooltips_set_tip(tooltips, image->parent, "", NULL);
-		gtk_tooltips_disable(tooltips);
-	}
-}
-
-#if GTK_CHECK_VERSION(2,2,0)
-static void
-docklet_x11_position_menu(GtkMenu *menu, int *x, int *y, gboolean *push_in,
-						  gpointer user_data)
-{
-	GtkWidget *widget = GTK_WIDGET(docklet);
-	GtkRequisition req;
-	gint menu_xpos, menu_ypos;
-
-	gtk_widget_size_request(GTK_WIDGET(menu), &req);
-	gdk_window_get_origin(widget->window, &menu_xpos, &menu_ypos);
-
-	menu_xpos += widget->allocation.x;
-	menu_ypos += widget->allocation.y;
-
-	if (menu_ypos > gdk_screen_get_height(gtk_widget_get_screen(widget)) / 2)
-		menu_ypos -= req.height;
-	else
-		menu_ypos += widget->allocation.height;
-
-	*x = menu_xpos;
-	*y = menu_ypos;
-
-	*push_in = TRUE;
-}
-#endif
-
-static void
-docklet_x11_destroy()
-{
-	g_return_if_fail(docklet != NULL);
-
-	docklet_remove();
-
-	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;
-
-	if (blank_icon)
-		g_object_unref(G_OBJECT(blank_icon));
-	blank_icon = NULL;
-
-	image = NULL;
-
-	gaim_debug(GAIM_DEBUG_INFO, "tray icon", "destroyed\n");
-}
-
-static gboolean
-docklet_x11_embed_timeout_cb()
-{
-	/* The docklet was not embedded within the timeout.
-	 * Remove it as a visibility manager, but leave the plugin
-	 * loaded so that it can embed automatically if/when a notification
-	 * area becomes available.
-	 */
-	gaim_debug_info("tray icon", "failed to embed within timeout\n");
-	docklet_remove();
-
-	return FALSE;
-}
-
-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);
-
-	if (!gtk_check_version(2,4,0))
-		g_object_set(G_OBJECT(box), "visible-window", FALSE, NULL);
-
-	gtk_widget_show_all(GTK_WIDGET(docklet));
-
-	/* ref the docklet before we bandy it about the place */
-	g_object_ref(G_OBJECT(docklet));
-
-	/* This is a hack to avoid a race condition between the docklet getting
-	 * embedded in the notification area and the gtkblist restoring its
-	 * previous visibility state.  If the docklet does not get embedded within
-	 * the timeout, it will be removed as a visibility manager until it does
-	 * get embedded.  Ideally, we would only call docklet_embedded() when the
-	 * icon was actually embedded.
-	 */
-	docklet_embedded();
-	embed_timeout = g_timeout_add(EMBED_TIMEOUT, docklet_x11_embed_timeout_cb, NULL);
-
-	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,
-	docklet_x11_blank_icon,
-	docklet_x11_set_tooltip,
-#if GTK_CHECK_VERSION(2,2,0)
-	docklet_x11_position_menu
-#else
-	NULL
-#endif
-};
-
-void
-docklet_ui_init()
-{
-	docklet_set_ui_ops(&ui_ops);
-}

--- a/gtk/docklet.h	Wed Oct 11 03:13:33 2006 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/* 
- * System tray icon (aka docklet) plugin for Gaim
- * 
- * Copyright (C) 2002-3 Robert McQueen <[e-mail]>
- * Copyright (C) 2003 Herman Bloggs <[e-mail]>
- * Inspired by a similar plugin by:
- *  John (J5) Palmieri <[e-mail]>
- * 
- * 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.
- */
-
-#ifndef _DOCKLET_H_
-#define _DOCKLET_H_
-
-typedef enum
-{
-	DOCKLET_STATUS_OFFLINE,
-	DOCKLET_STATUS_ONLINE,
-	DOCKLET_STATUS_ONLINE_PENDING,
-	DOCKLET_STATUS_AWAY,
-	DOCKLET_STATUS_AWAY_PENDING,
-	DOCKLET_STATUS_CONNECTING
-} DockletStatus;
-
-struct docklet_ui_ops
-{
-	void (*create)(void);
-	void (*destroy)(void);
-	void (*update_icon)(DockletStatus);
-	void (*blank_icon)(void);
-	void (*set_tooltip)(gchar *);
-	GtkMenuPositionFunc position_menu;
-};
-
-/* useful for setting idle callbacks that will be cleaned up */
-extern GaimPlugin *handle;
-
-/* functions in docklet.c */
-void docklet_clicked(int);
-void docklet_embedded(void);
-void docklet_remove(void);
-void docklet_set_ui_ops(struct docklet_ui_ops *);
-void docklet_unload(void);
-
-/* function in docklet-{x11,win32}.c */
-void docklet_ui_init(void);
-
-#endif /* _DOCKLET_H_ */