# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1130101649 0
# Node ID ddb7520d57bdda11bea3168368feece030568806
# Parent  81e26b7f262ee6e1bb916967e0f5ab9f684b97a0
[gaim-migrate @ 14054]
sf patch #1328104, from Will Thompson
His patch actually changed the prpl preference for IRC Quit messages
into an account preference.  I applied his changes... but I commented
out the account preference part (so the IRC quit message is no longer
customizable).

We'll see how this goes

committer: Tailor Script <tailor@pidgin.im>

diff -r 81e26b7f262e -r ddb7520d57bd src/protocols/irc/cmds.c
--- a/src/protocols/irc/cmds.c	Sun Oct 23 21:06:17 2005 +0000
+++ b/src/protocols/irc/cmds.c	Sun Oct 23 21:07:29 2005 +0000
@@ -365,7 +365,12 @@
 	char *buf;
 
 	if (!irc->quitting) {
-		buf = irc_format(irc, "v:", "QUIT", (args && args[0]) ? args[0] : gaim_prefs_get_string("/plugins/prpl/irc/quitmsg"));
+		/*
+		 * Use gaim_account_get_string(irc->account, "quitmsg", IRC_DEFAULT_QUIT)
+		 * and uncomment the appropriate account preference in irc.c if we
+		 * decide we want custom quit messages.
+		 */
+		buf = irc_format(irc, "v:", "QUIT", (args && args[0]) ? args[0] : IRC_DEFAULT_QUIT);
 		irc_send(irc, buf);
 		g_free(buf);
 
diff -r 81e26b7f262e -r ddb7520d57bd src/protocols/irc/irc.c
--- a/src/protocols/irc/irc.c	Sun Oct 23 21:06:17 2005 +0000
+++ b/src/protocols/irc/irc.c	Sun Oct 23 21:07:29 2005 +0000
@@ -720,27 +720,6 @@
 	}
 }
 
-static GaimPluginPrefFrame *
-irc_pref_frame(GaimPlugin *plugin) {
-	GaimPluginPrefFrame *frame;
-	GaimPluginPref *ppref;
-
-	frame = gaim_plugin_pref_frame_new();
-
-	ppref = gaim_plugin_pref_new_with_label(_("IRC"));
-	gaim_plugin_pref_frame_add(frame, ppref);
-
-	ppref = gaim_plugin_pref_new_with_name_and_label("/plugins/prpl/irc/quitmsg",
-													 _("Quit message"));
-	gaim_plugin_pref_frame_add(frame, ppref);
-
-	return frame;
-}
-
-static GaimPluginUiInfo prefs_info = {
-	irc_pref_frame
-};
-
 static GaimPluginProtocolInfo prpl_info =
 {
 	OPT_PROTO_CHAT_TOPIC | OPT_PROTO_PASSWORD_OPTIONAL,
@@ -828,7 +807,7 @@
 
 	NULL,                                             /**< ui_info        */
 	&prpl_info,                                       /**< extra_info     */
-	&prefs_info,                                      /**< prefs_info     */
+	NULL,                                             /**< prefs_info     */
 	irc_actions
 };
 
@@ -852,13 +831,18 @@
 	option = gaim_account_option_string_new(_("Real name"), "realname", "");
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
+	/*
+	option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+	*/
+
 	option = gaim_account_option_bool_new(_("Use SSL"), "ssl", FALSE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
 	_irc_plugin = plugin;
 
-	gaim_prefs_add_none("/plugins/prpl/irc");
-	gaim_prefs_add_string("/plugins/prpl/irc/quitmsg", IRC_DEFAULT_QUIT);
+	gaim_prefs_remove("/plugins/prpl/irc/quitmsg");
+	gaim_prefs_remove("/plugins/prpl/irc");
 
 	irc_register_commands();
 }
diff -r 81e26b7f262e -r ddb7520d57bd src/protocols/irc/irc.h
--- a/src/protocols/irc/irc.h	Sun Oct 23 21:06:17 2005 +0000
+++ b/src/protocols/irc/irc.h	Sun Oct 23 21:07:29 2005 +0000
@@ -35,7 +35,7 @@
 #define IRC_DEFAULT_CHARSET "UTF-8"
 #define IRC_DEFAULT_ALIAS "gaim"
 
-#define IRC_DEFAULT_QUIT "Download Gaim: " GAIM_WEBSITE
+#define IRC_DEFAULT_QUIT "Leaving."
 
 #define IRC_INITIAL_BUFSIZE 1024