xchat-gnome r2661 - in trunk: . plugins/notification plugins/notify-osd plugins/tcl

[chpe svn gnome org]

Author: chpe
Date: Sun Sep  7 14:09:56 2008
New Revision: 2661
URL: http://svn.gnome.org/viewvc/xchat-gnome?rev=2661&view=rev

Log:
	* plugins/notification/notification.c: (got_focus_cb),
	(xchat_gnome_plugin_init):
	* plugins/notify-osd/notify-osd.c: (xchat_plugin_init),
	(xchat_plugin_deinit): Correctly uninit the plugin.

Modified:
   trunk/ChangeLog
   trunk/plugins/notification/notification.c
   trunk/plugins/notify-osd/notify-osd.c
   trunk/plugins/tcl/tclplugin.c

Modified: trunk/plugins/notification/notification.c
==============================================================================
--- trunk/plugins/notification/notification.c	(original)
+++ trunk/plugins/notification/notification.c	Sun Sep  7 14:09:56 2008
@@ -90,6 +90,8 @@
 
 	update_tray ();
 
+	gtk_status_icon_set_tooltip (status_icon, NULL);
+
 	return FALSE;
 }
 
@@ -159,9 +161,6 @@
 	main_window = xg_get_main_window ();
 	g_signal_connect (main_window, "focus-in-event", G_CALLBACK (got_focus_cb), NULL);
 	g_signal_connect (main_window, "focus-out-event", G_CALLBACK (lost_focus_cb), NULL);
-	/* FIXMEchpe: where are those handlers disconnected again?? */
-
-	/* Create the menu. */
 
 	return 1;
 }

Modified: trunk/plugins/notify-osd/notify-osd.c
==============================================================================
--- trunk/plugins/notify-osd/notify-osd.c	(original)
+++ trunk/plugins/notify-osd/notify-osd.c	Sun Sep  7 14:09:56 2008
@@ -198,6 +198,7 @@
 	ph = plugin_handle;
 
 	if (notify_init ("XChat-GNOME OSD")) {
+		/* FIXME: multi-head! */
 		GtkIconTheme *theme = gtk_icon_theme_get_default ();
 		notify_icon = gtk_icon_theme_load_icon (theme, "xchat-gnome", 48, 0, NULL);
 
@@ -218,6 +219,16 @@
 int
 xchat_plugin_deinit (void)
 {
+	got_focus_cb (main_window, NULL, NULL);
+
 	notify_uninit ();
+
+	if (notify_icon) {
+		g_object_unref (notify_icon);
+		notify_icon = NULL;
+	}
+
+	ph = NULL;
+
 	return TRUE;
 }

Modified: trunk/plugins/tcl/tclplugin.c
==============================================================================
--- trunk/plugins/tcl/tclplugin.c	(original)
+++ trunk/plugins/tcl/tclplugin.c	Sun Sep  7 14:09:56 2008
@@ -18,6 +18,7 @@
 static char RCSID[] = "$Id: tclplugin.c,v 1.59 2005/08/11 02:37:55 mooooooo Exp $";
 
 #include <config.h>
+#include <glib/gi18n.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>