[Gaim-commits] CVS: gaim/src/protocols/irc cmds.c,1.23,1.24 irc.c,1.259,1.260 irc.h,1.20,1.21

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/irc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16279/src/protocols/irc

Modified Files:
	cmds.c irc.c irc.h 
Log Message:
sf patch #1235304, from Lalo Martins
Allow for custom IRC quit messages.  I hope Ethan doesn't kill me.
Also, I couldn't get quit messages to work for me before OR after
this patch.  I tried using "/quit" and Buddies->Quit in the buddy
list.  What was I doing wrong?


Index: cmds.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/cmds.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -p -r1.23 -r1.24
--- cmds.c	23 May 2005 19:05:11 -0000	1.23
+++ cmds.c	9 Jul 2005 19:19:53 -0000	1.24
@@ -365,7 +365,7 @@ int irc_cmd_quit(struct irc_conn *irc, c
 	char *buf;
 
 	if (!irc->quitting) {
-		buf = irc_format(irc, "v:", "QUIT", (args && args[0]) ? args[0] : "Download Gaim: " GAIM_WEBSITE);
+		buf = irc_format(irc, "v:", "QUIT", (args && args[0]) ? args[0] : gaim_prefs_get_string("/plugins/prpl/irc/quitmsg"));
 		irc_send(irc, buf);
 		g_free(buf);
 

Index: irc.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.c,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -d -p -r1.259 -r1.260
--- irc.c	28 Jun 2005 06:13:02 -0000	1.259
+++ irc.c	9 Jul 2005 19:19:53 -0000	1.260
@@ -715,6 +715,27 @@ static void irc_roomlist_cancel(GaimRoom
 	}
 }
 
+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,
@@ -803,7 +824,7 @@ static GaimPluginInfo info =
 
 	NULL,                                             /**< ui_info        */
 	&prpl_info,                                       /**< extra_info     */
-	NULL,
+	&prefs_info,                                      /**< prefs_info     */
 	irc_actions
 };
 
@@ -834,6 +855,9 @@ static void _init_plugin(GaimPlugin *plu
 
 	_irc_plugin = plugin;
 
+	gaim_prefs_add_none("/plugins/prpl/irc");
+	gaim_prefs_add_string("/plugins/prpl/irc/quitmsg", IRC_DEFAULT_QUIT);
+
 	irc_register_commands();
 }
 

Index: irc.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/irc.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -p -r1.20 -r1.21
--- irc.h	21 Mar 2005 03:37:59 -0000	1.20
+++ irc.h	9 Jul 2005 19:19:53 -0000	1.21
@@ -35,6 +35,8 @@
 #define IRC_DEFAULT_CHARSET "UTF-8"
 #define IRC_DEFAULT_ALIAS "gaim"
 
+#define IRC_DEFAULT_QUIT "Download Gaim: " GAIM_WEBSITE
+
 #define IRC_INITIAL_BUFSIZE 1024