--- gg2_cvs_2004.12.24/src/plugins/GUI/gui_main.c	2004-12-24 01:10:56.000000000 +0100
+++ gg2/src/plugins/GUI/gui_main.c	2004-12-24 01:38:46.000000000 +0100
@@ -139,6 +139,7 @@
 	ggadu_config_var_add(gui_handler, "tree", VAR_BOOL);
 	ggadu_config_var_add(gui_handler, "chat_window_auto_raise", VAR_BOOL);
 	ggadu_config_var_add_with_default(gui_handler, "use_xosd_for_new_msgs", VAR_BOOL, (gpointer)TRUE);
+	ggadu_config_var_add_with_default(gui_handler, "use_xosd_for_status_change", VAR_BOOL, (gpointer)TRUE);
 	ggadu_config_var_add(gui_handler, "chat_type", VAR_INT);
 #ifdef USE_GTKSPELL
 	ggadu_config_var_add(gui_handler, "use_spell", VAR_BOOL);
--- gg2/src/plugins/GUI/gui_preferences.c	2004-11-19 18:38:40.000000000 +0100
+++ cvs-2004.12.19/src/plugins/GUI/gui_preferences.c	2004-12-19 01:16:47.000000000 +0100
@@ -949,6 +949,7 @@
 	GtkWidget *tree;
 	GtkWidget *expand;
 	GtkWidget *usexosdfornewmsgs = NULL;
+	GtkWidget *usexosdforstatuschange = NULL;
 	GtkWidget *show_toolbar;
 	GtkWidget *descr_on_list;
 	GtkWidget *tabbox;
@@ -1037,6 +1038,8 @@
 	{
 		usexosdfornewmsgs = gtk_check_button_new_with_label(_("Notify about new messages via XOSD"));
 		gtk_box_pack_start(GTK_BOX(vbox), usexosdfornewmsgs, FALSE, FALSE, 0);
+		usexosdforstatuschange = gtk_check_button_new_with_label(_("Notify about status change via XOSD"));
+		gtk_box_pack_start(GTK_BOX(vbox), usexosdforstatuschange, FALSE, FALSE, 0);
 	}
 
 
@@ -1179,6 +1182,10 @@
 		if (ggadu_config_var_get(gui_handler, "use_xosd_for_new_msgs"))
 			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(usexosdfornewmsgs), TRUE);
 
+	if (usexosdforstatuschange)
+		if (ggadu_config_var_get(gui_handler, "use_xosd_for_status_change"))
+			gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(usexosdforstatuschange), TRUE);
+
 
 	if (ggadu_config_var_get(gui_handler, "show_toolbar"))
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(show_toolbar), TRUE);
@@ -1290,6 +1297,8 @@
 		if (usexosdfornewmsgs)
 			ggadu_config_var_set(gui_handler, "use_xosd_for_new_msgs", (gpointer) gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(usexosdfornewmsgs)));
 
+		if (usexosdforstatuschange)
+			ggadu_config_var_set(gui_handler, "use_xosd_for_status_change", (gpointer) gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(usexosdforstatuschange)));
 
 		ggadu_config_var_set(gui_handler, "show_toolbar", (gpointer) gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(show_toolbar)));
 
--- gg2_cvs_2004.12.24/src/plugins/GUI/gui_userview.c	2004-12-24 01:10:56.000000000 +0100
+++ gg2/src/plugins/GUI/gui_userview.c	2004-12-24 01:11:30.000000000 +0100
@@ -635,7 +635,7 @@
 				descr = g_strdup_printf("(%s)", k->status_descr);
 
 			gtk_tree_sortable_sort_column_changed(GTK_TREE_SORTABLE(model));
-			if (find_plugin_by_name("xosd"))
+if ((gint) ggadu_config_var_get(gui_handler, "use_xosd_for_status_change") == TRUE && find_plugin_by_name("xosd"))
 			{
 				signal_emit("main-gui", "xosd show message",
 					    g_strdup_printf("%s - %s %s", k->nick, sp->description,