# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1133414030 0
# Node ID 970fec1d70623d2466be4fa5c5fe26917ec36a5c
# Parent  45aa1d86428ec3f06a27135388f098dd878ff36d
[gaim-migrate @ 14585]
Get rid of some old code and fully remove 2 deprecated prefs

committer: Tailor Script <tailor@pidgin.im>

diff -r 45aa1d86428e -r 970fec1d7062 src/gtkprefs.c
--- a/src/gtkprefs.c	Thu Dec 01 05:03:45 2005 +0000
+++ b/src/gtkprefs.c	Thu Dec 01 05:13:50 2005 +0000
@@ -1947,5 +1947,7 @@
 	gaim_prefs_remove("/gaim/gtk/sound/signon");
 	gaim_prefs_remove("/gaim/gtk/sound/silent_signon");
 	gaim_prefs_remove("/gaim/gtk/away/queue_messages");
+	gaim_prefs_remove("/gaim/gtk/away");
 	gaim_prefs_remove("/plugins/gtk/docklet/queue_messages");
+	gaim_prefs_remove("/plugins/gtk/docklet");
 }
diff -r 45aa1d86428e -r 970fec1d7062 src/server.c
--- a/src/server.c	Thu Dec 01 05:03:45 2005 +0000
+++ b/src/server.c	Thu Dec 01 05:13:50 2005 +0000
@@ -559,27 +559,9 @@
 		buffy = gaim_str_sub_away_formatters(away_msg, alias);
 		serv_send_im(gc, name, buffy, GAIM_MESSAGE_AUTO_RESP);
 
-#if 0
-		if (!cnv && awayqueue &&
-			gaim_prefs_get_bool("/gaim/gtk/away/queue_messages")) {
-
-			struct queued_message *qm;
-
-			qm = g_new0(struct queued_message, 1);
-			g_snprintf(qm->name, sizeof(qm->name), "%s", name);
-			qm->message = g_strdup(buffy);
-			qm->account = gc->account;
-			qm->tm = mtime;
-			qm->flags = GAIM_MESSAGE_SEND | GAIM_MESSAGE_AUTO_RESP;
-			message_queue = g_slist_append(message_queue, qm);
-		}
-		else if (cnv != NULL)
-#endif
-		{
-			gaim_conv_im_write(GAIM_CONV_IM(cnv), NULL, buffy,
-							   GAIM_MESSAGE_SEND | GAIM_MESSAGE_AUTO_RESP,
-							   mtime);
-		}
+		gaim_conv_im_write(GAIM_CONV_IM(cnv), NULL, buffy,
+						   GAIM_MESSAGE_SEND | GAIM_MESSAGE_AUTO_RESP,
+						   mtime);
 
 		g_free(buffy);
 	}