changeset 6208:3e3ee3cba192

[gaim-migrate @ 6694] Robot101: I fixed the docklet stuff, little buglet with not redrawing after a redisplay, and I spiffed everything up and moved code around for no reason committer: Tailor Script <[e-mail]>

--- a/plugins/docklet/Makefile.am	Fri Jul 18 03:27:01 2003 +0000
+++ b/plugins/docklet/Makefile.am	Fri Jul 18 03:45:39 2003 +0000
@@ -11,11 +11,11 @@
 plugin_LTLIBRARIES = docklet.la
 
 docklet_la_SOURCES = \
+	eggtrayicon.h \
+	eggtrayicon.c \
 	docklet.h \
 	docklet.c \
-	eggtrayicon.h \
-	eggtrayicon.c \
-	trayicon-x11.c
+	docklet-x11.c
 
 endif
 

--- a/plugins/docklet/Makefile.mingw	Fri Jul 18 03:27:01 2003 +0000
+++ b/plugins/docklet/Makefile.mingw	Fri Jul 18 03:45:39 2003 +0000
@@ -57,7 +57,7 @@
 ##
 
 C_SRC =			docklet.c \
-			trayicon-win32.c
+			docklet-win32.c
 
 
 OBJECTS = $(C_SRC:%.c=%.o)

--- a/plugins/docklet/docklet.c	Fri Jul 18 03:27:01 2003 +0000
+++ b/plugins/docklet/docklet.c	Fri Jul 18 03:45:39 2003 +0000
@@ -1,5 +1,7 @@
-/* System tray icon (aka docklet) plugin for Gaim
- * Copyright (C) 2002 Robert McQueen <[e-mail]>
+/* 
+ * 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]>
@@ -27,7 +29,6 @@
     - dernyi's account status menu in the right click
     - optional pop up notices when GNOME2's system-tray-applet supports it */
 
-/* includes */
 #include "internal.h"
 
 #include "core.h"
@@ -48,12 +49,12 @@
 #include "gaim.h"
 #include "ui.h"
 
-#define DOCKLET_PLUGIN_ID "gtk-docklet"
+/* globals */
 
-/* globals */
-static struct gaim_tray_ops *tray_ops = NULL;
-static enum docklet_status status=offline;
-static enum docklet_status icon=offline;
+GaimPlugin *handle = NULL;
+static struct docklet_ui_ops *ui_ops = NULL;
+static enum docklet_status status = offline;
+static enum docklet_status icon = offline;
 #ifdef _WIN32
 __declspec(dllimport) GSList *unread_message_queue;
 __declspec(dllimport) GSList *away_messages;
@@ -61,20 +62,23 @@
 __declspec(dllimport) GSList *message_queue;
 #endif
 
-/* functions */
-extern void trayicon_init();
-static gboolean docklet_update_status();
-static gboolean plugin_unload(GaimPlugin *plugin);
+/* private functions */
 
-static void docklet_toggle_mute(GtkWidget *toggle, void *data) {
+static void
+docklet_toggle_mute(GtkWidget *toggle, void *data)
+{
 	gaim_gtk_sound_set_mute(GTK_CHECK_MENU_ITEM(toggle)->active);
 }
 
-static void docklet_set_bool(GtkWidget *widget, const char *key) {
+static void
+docklet_set_bool(GtkWidget *widget, const char *key)
+{
 	gaim_prefs_set_bool(key, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)));
 }
 
-static void docklet_auto_login() {
+static void
+docklet_auto_login()
+{
 	gaim_accounts_auto_login(GAIM_GTK_UI);
 }
 
@@ -82,11 +86,11 @@
 /* This is a workaround for a bug in windows GTK+.. Clicking outside of the
    menu does not get rid of it, so instead we get rid of it as soon as the
    pointer leaves the menu. */
-static gboolean menu_leave(GtkWidget *menu,
-			   GdkEventCrossing *event,
-			   gpointer user_data) {
+static gboolean
+docklet_menu_leave(GtkWidget *menu, GdkEventCrossing *event, void *data)
+{
 	if(event->detail == GDK_NOTIFY_ANCESTOR) {
-		gaim_debug(GAIM_DEBUG_INFO, "docklet", "leave-notify-event\n");
+		gaim_debug(GAIM_DEBUG_INFO, "tray icon", "menu leave-notify-event\n");
 		gtk_menu_popdown(GTK_MENU(menu));
 	}
 	return FALSE;
@@ -102,9 +106,7 @@
 	}
 
 	menu = gtk_menu_new();
-#ifdef _WIN32
-	g_signal_connect(menu, "leave-notify-event", G_CALLBACK(menu_leave), NULL);
-#endif
+
 	switch (status) {
 		case offline:
 		case offline_connecting:
@@ -183,11 +185,16 @@
 
 	gaim_new_item_from_stock(menu, _("Quit"), GTK_STOCK_QUIT, G_CALLBACK(gaim_core_quit), NULL, 0, 0, 0);
 
+#ifdef _WIN32
+	g_signal_connect(menu, "leave-notify-event", G_CALLBACK(docklet_menu_leave), NULL);
+#endif
 	gtk_widget_show_all(menu);
 	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
 }
 
-static gboolean docklet_blink_icon() {
+static gboolean
+docklet_blink_icon()
+{
 	if (status == online_pending) {
 		if (status == icon) {
 			/* last icon was the right one... let's change it */
@@ -209,13 +216,15 @@
 		return FALSE;
 	}
 
-	if(tray_ops->update_icon)
-		tray_ops->update_icon(icon);
+	if (ui_ops->update_icon)
+		ui_ops->update_icon(icon);
 
 	return TRUE; /* keep blinking */
 }
 
-static gboolean docklet_update_status() {
+static gboolean
+docklet_update_status()
+{
 	enum docklet_status oldstatus;
 
 	oldstatus = status;
@@ -245,72 +254,48 @@
 	/* update the icon if we changed status */
 	if (status != oldstatus) {
 		icon = status;
-		if(tray_ops->update_icon)
-			tray_ops->update_icon(icon);
+		if (ui_ops->update_icon)
+			ui_ops->update_icon(icon);
 
 		/* and schedule the blinker function if messages are pending */
 		if (status == online_pending || status == away_pending) {
 			g_timeout_add(500, docklet_blink_icon, NULL);
 		}
 	}
+
 	return FALSE; /* for when we're called by the glib idle handler */
 }
 
-static void gaim_signon(GaimConnection *gc, void *data) {
-	docklet_update_status();
-}
-
-static void gaim_signoff(GaimConnection *gc, void *data) {
-	/* do this when idle so that if the prpl was connecting
-	   and was cancelled, we register that connecting_count
-	   has returned to 0 */
-	/* no longer necessary because Chip decided that us plugins
-	 * didn't need to know if an account was connecting or not
-	 * g_idle_add(docklet_update_status, &docklet); */
-	docklet_update_status();
-}
-
-static void gaim_connecting(GaimAccount *account, void *data) {
-	docklet_update_status();
-}
-
-static void gaim_away(GaimConnection *gc, char *state, char *message, void *data) {
-	/* we only support global away. this is the way it is, ok? */
-	docklet_update_status();
+void
+docklet_flush_queue()
+{
+	if (unread_message_queue) {
+		purge_away_queue(&unread_message_queue);
+	}
 }
 
-static void gaim_im_recv(GaimConnection *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.
-	   do this when idle so that all message processing is completed, queuing
-	   etc, before we run. */
-	g_idle_add(docklet_update_status, NULL);
-}
+void
+docklet_remove_callbacks()
+{
+	gaim_debug(GAIM_DEBUG_INFO, "tray icon", "removing callbacks");
 
-/* static void gaim_buddy_signon(GaimConnection *gc, char *who, void *data) {
-}
+	while (g_source_remove_by_user_data(&handle)) {
+		gaim_debug(GAIM_DEBUG_INFO, NULL, ".");
+	}
 
-static void gaim_buddy_signoff(GaimConnection *gc, char *who, void *data) {
+	gaim_debug(GAIM_DEBUG_INFO, NULL, "\n");
 }
 
-static void gaim_buddy_away(GaimConnection *gc, char *who, void *data) {
-}
-
-static void gaim_buddy_back(GaimConnection *gc, char *who, void *data) {
-}
+/* public code */
 
-static void gaim_new_conversation(char *who, void *data) {
-} */
-
-/*
- *  Public Code
- */
-void docklet_clicked(int button_type) {
+void
+docklet_clicked(int button_type)
+{
 	switch (button_type) {
 		case 1:
 			if (unread_message_queue) {
 				docklet_flush_queue();
-				docklet_update_status();
+				g_idle_add(docklet_update_status, &handle);
 			} else {
 				gaim_gtk_blist_docklet_toggle();
 			}
@@ -331,41 +316,103 @@
 	}
 }
 
-void docklet_embedded() {
-	gaim_debug(GAIM_DEBUG_INFO, "docklet", "Tray Icon: embedded\n");
+void
+docklet_embedded()
+{
 	gaim_gtk_blist_docklet_add();
+
+	docklet_update_status();
+	if (ui_ops->update_icon)
+		ui_ops->update_icon(icon);
 }
 
-void docklet_flush_queue() {
-	if (unread_message_queue) {
-		purge_away_queue(&unread_message_queue);
-	}
+void
+docklet_remove(gboolean visible)
+{
+	if (visible)
+		gaim_gtk_blist_docklet_remove();
+
+	docklet_flush_queue();
+}
+
+void
+docklet_set_ui_ops(struct docklet_ui_ops *ops)
+{
+	ui_ops = ops;
+}
+
+/* callbacks */
+
+static void
+gaim_signon(GaimConnection *gc, void *data)
+{
+	docklet_update_status();
 }
 
+static void
+gaim_signoff(GaimConnection *gc, void *data)
+{
+	/* do this when idle so that if the prpl was connecting
+	   and was cancelled, we register that connecting_count
+	   has returned to 0 */
+	/* no longer necessary because Chip decided that us plugins
+	   didn't need to know if an account was connecting or not
+	   g_idle_add(docklet_update_status, &docklet); */
+	docklet_update_status();
+}
 
-/* Set Platform Dependent Code */
-void docklet_set_tray_ops(struct gaim_tray_ops *ops) {
-	tray_ops = ops;
+static void
+gaim_connecting(GaimAccount *account, void *data)
+{
+	docklet_update_status();
+}
+
+static void
+gaim_away(GaimConnection *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(GaimConnection *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.
+	   do this when idle so that all message processing is completed, queuing
+	   etc, before we run. */
+	g_idle_add(docklet_update_status, &handle);
+}
 
-/*
- *  PLUGIN CODE
- */
+/* static void gaim_buddy_signon(GaimConnection *gc, char *who, void *data) {
+}
+
+static void gaim_buddy_signoff(GaimConnection *gc, char *who, void *data) {
+}
+
+static void gaim_buddy_away(GaimConnection *gc, char *who, void *data) {
+}
+
+static void gaim_buddy_back(GaimConnection *gc, char *who, void *data) {
+}
+
+static void gaim_new_conversation(char *who, void *data) {
+} */
+
+/* plugin glue */
+
+#define DOCKLET_PLUGIN_ID "gtk-docklet"
 
 static gboolean
 plugin_load(GaimPlugin *plugin)
 {
-	trayicon_init();
-	if(tray_ops->create)
-		tray_ops->create();
+	gaim_debug(GAIM_DEBUG_INFO, "tray icon", "plugin loaded\n");
+
+	handle = plugin;
 
-	gaim_prefs_add_none("/plugins/gtk/docklet");
-	gaim_prefs_add_bool("/plugins/gtk/docklet/queue_messages", FALSE);
-
-	docklet_update_status();
-	if(tray_ops->update_icon)
-		tray_ops->update_icon(icon);
+	docklet_ui_init();
+	if (ui_ops->create)
+		ui_ops->create();
 
 	gaim_signal_connect(plugin, event_signon, gaim_signon, NULL);
 	gaim_signal_connect(plugin, event_signoff, gaim_signoff, NULL);
@@ -378,7 +425,8 @@
 	gaim_signal_connect(plugin, event_buddy_back, gaim_buddy_back, NULL);
 	gaim_signal_connect(plugin, event_new_conversation, gaim_new_conversation, NULL); */
 
-	gaim_debug(GAIM_DEBUG_INFO, "docklet", "Plugin loaded\n");
+	gaim_prefs_add_none("/plugins/gtk/docklet");
+	gaim_prefs_add_bool("/plugins/gtk/docklet/queue_messages", FALSE);
 
 	return TRUE;
 }
@@ -386,21 +434,20 @@
 static gboolean
 plugin_unload(GaimPlugin *plugin)
 {
-	gaim_gtk_blist_docklet_remove();
-	docklet_flush_queue();
+	if (ui_ops->destroy)
+		ui_ops->destroy();
+
 	/* XXX: do this while gaim has no other way to toggle the global mute */
 	gaim_gtk_sound_set_mute(FALSE);
+	docklet_remove_callbacks();
 
-	if(tray_ops->destroy)
-		tray_ops->destroy();
-		
-	gaim_debug(GAIM_DEBUG_INFO, "docklet", "Plugin unloaded\n");
+	gaim_debug(GAIM_DEBUG_INFO, "tray icon", "plugin unloaded\n");
 
 	return TRUE;
 }
 
 static GtkWidget *
-get_config_frame(GaimPlugin *plugin)
+plugin_config_frame(GaimPlugin *plugin)
 {
 	GtkWidget *frame;
 	GtkWidget *vbox, *hbox;
@@ -425,7 +472,7 @@
 
 static GaimGtkPluginUiInfo ui_info =
 {
-	get_config_frame
+	plugin_config_frame
 };
 
 static GaimPluginInfo info =
@@ -443,11 +490,11 @@
 	                                                  /**  summary        */
 	N_("Displays an icon for Gaim in the system tray."),
 	                                                  /**  description    */
-	N_("Interacts with a Notification Area applet (in GNOME, KDE or "
-	   "Windows 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. Also allows messages to be queued "
-	   "until the icon is clicked, similar to ICQ."),
+	N_("Displays a system tray icon (in GNOME, KDE or Windows for example) "
+	   "to show the current status of Gaim, allow fast access to commonly "
+	   "used functions, and to toggle display of the buddy list or login "
+	   "window. Also allows messages to be queued until the icon is "
+	   "clicked, similar to ICQ."),
 	"Robert McQueen <[e-mail]>",           /**< author         */
 	WEBSITE,                                          /**< homepage       */
 
@@ -460,8 +507,8 @@
 };
 
 static void
-init_plugin(GaimPlugin *plugin)
+plugin_init(GaimPlugin *plugin)
 {
 }
 
-GAIM_INIT_PLUGIN(docklet, init_plugin, info)
+GAIM_INIT_PLUGIN(docklet, plugin_init, info)

--- a/plugins/docklet/docklet.h	Fri Jul 18 03:27:01 2003 +0000
+++ b/plugins/docklet/docklet.h	Fri Jul 18 03:45:39 2003 +0000
@@ -1,5 +1,7 @@
-/* System tray icon (aka docklet) plugin for Gaim
- * Copyright (C) 2002 Robert McQueen <[e-mail]>
+/* 
+ * 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]>
@@ -19,10 +21,12 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
  * 02111-1307, USA.
  */
+
 #ifndef _DOCKLET_H_
 #define _DOCKLET_H_
 
-enum docklet_status {
+enum docklet_status
+{
 	offline,
 	offline_connecting,
 	online,
@@ -32,16 +36,23 @@
 	away_pending
 };
 
-struct gaim_tray_ops
+struct docklet_ui_ops
 {
 	void (*create)();
 	void (*destroy)();
 	void (*update_icon)(enum docklet_status);
 };
 
-void docklet_clicked(int button_type);
-void docklet_embedded();
-void docklet_set_tray_ops(struct gaim_tray_ops *ops);
-void docklet_flush_queue();
+/* useful for setting idle callbacks that will be cleaned up */
+extern GaimPlugin *handle;
+
+/* functions in docklet.c */
+extern void docklet_clicked(int);
+extern void docklet_embedded();
+extern void docklet_remove(gboolean);
+extern void docklet_set_ui_ops(struct docklet_ui_ops *);
+
+/* function in docklet-{x11,win32}.c */
+extern void docklet_ui_init();
 
 #endif /* _DOCKLET_H_ */