pidgin: 0034db58: Remove the "Flash window when chat messa...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 0034db582346caf9ea549c58c6df3728cccc69ed
Ancestor: dbdaecf659b7d74cd50fad7c3d9bb621d9e8220e
Author: datallah at pidgin.im
Date: 2009-01-30T22:48:21
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0034db582346caf9ea549c58c6df3728cccc69ed

Modified files:
        ChangeLog.win32 pidgin/plugins/win32/winprefs/winprefs.c

ChangeLog: 

Remove the "Flash window when chat messages are received" pref from the winprefs
plugin now that the Message Notification plugin can do that.

-------------- next part --------------
============================================================
--- ChangeLog.win32	c245eee3c2924e81a19a09cb18f80d18f84c06f8
+++ ChangeLog.win32	34ece021b04edd261e3b9217801ce89b87dea20c
@@ -1,3 +1,8 @@
+version 2.5.5 (??/??/2009):
+	* Remove the "Flash window when chat messages are received" pref from
+	  the Windows Pidgin Options plugin - the Message Notification plugin
+	  does this (and much more).
+
 version 2.5.4 (01/12/2009):
 	* Fix the "Hang on Exit" issue that a number of users encountered.
 	* Updated GTK+ to 2.14.6
============================================================
--- pidgin/plugins/win32/winprefs/winprefs.c	1d4cce6d91d5f1bfc67c123f2e47e3b2a41453c3
+++ pidgin/plugins/win32/winprefs/winprefs.c	4805c2403b1161a05489374783d5bcfd7a68644b
@@ -55,9 +55,8 @@ static const char *PREF_BLIST_ON_TOP = "
 static const char *PREF_DBLIST_HEIGHT = "/plugins/gtk/win32/winprefs/dblist_height";
 static const char *PREF_DBLIST_SIDE = "/plugins/gtk/win32/winprefs/dblist_side";
 static const char *PREF_BLIST_ON_TOP = "/plugins/gtk/win32/winprefs/blist_on_top";
+/* Deprecated */
 static const char *PREF_CHAT_BLINK = "/plugins/gtk/win32/winprefs/chat_blink";
-
-/* Deprecated */
 static const char *PREF_DBLIST_ON_TOP = "/plugins/gtk/win32/winprefs/dblist_on_top";
 
 static PurplePlugin *handle = NULL;
@@ -229,17 +228,6 @@ winprefs_set_blist_ontop(const char *pre
 		blist_set_ontop(FALSE);
 }
 
-static gboolean
-winpidgin_conv_chat_blink(PurpleAccount *account, const char *who, char **message,
-		PurpleConversation *conv, PurpleMessageFlags flags, void *data)
-{
-	if(purple_prefs_get_bool(PREF_CHAT_BLINK))
-		winpidgin_conv_blink(conv, flags);
-
-	return FALSE;
-}
-
-
 /*
  *  EXPORTED FUNCTIONS
  */
@@ -258,10 +246,6 @@ static gboolean plugin_load(PurplePlugin
 	purple_signal_connect(pidgin_blist_get_handle(), "gtkblist-created",
 		plugin, PURPLE_CALLBACK(blist_create_cb), NULL);
 
-	purple_signal_connect(pidgin_conversations_get_handle(),
-		"displaying-chat-msg", plugin, PURPLE_CALLBACK(winpidgin_conv_chat_blink),
-		NULL);
-
 	purple_signal_connect((void*)purple_get_core(), "quitting", plugin,
 		PURPLE_CALLBACK(purple_quit_cb), NULL);
 
@@ -336,11 +320,6 @@ static GtkWidget* get_config_frame(Purpl
 		_("Only when docked"), BLIST_TOP_DOCKED,
 		NULL);
 
-	/* Conversations */
-	vbox = pidgin_make_frame(ret, _("Conversations"));
-	pidgin_prefs_checkbox(_("_Flash window when chat messages are received"),
-							PREF_CHAT_BLINK, vbox);
-
 	gtk_widget_show_all(ret);
 	return ret;
 }
@@ -399,7 +378,6 @@ init_plugin(PurplePlugin *plugin)
 	purple_prefs_add_bool(PREF_DBLIST_DOCKED, FALSE);
 	purple_prefs_add_int(PREF_DBLIST_HEIGHT, 0);
 	purple_prefs_add_int(PREF_DBLIST_SIDE, 0);
-	purple_prefs_add_bool(PREF_CHAT_BLINK, FALSE);
 
 	/* Convert old preferences */
 	if(purple_prefs_exists(PREF_DBLIST_ON_TOP)) {
@@ -413,6 +391,7 @@ init_plugin(PurplePlugin *plugin)
 		purple_prefs_add_int(PREF_BLIST_ON_TOP, blist_top);
 	} else
 		purple_prefs_add_int(PREF_BLIST_ON_TOP, BLIST_TOP_NEVER);
+	purple_prefs_remove(PREF_CHAT_BLINK);
 }
 
 PURPLE_INIT_PLUGIN(winprefs, init_plugin, info)