Mercurial > pidgin3 / changeset

--- a/gtk/gtkconv.c	Wed Nov 01 07:32:41 2006 +0000
+++ b/gtk/gtkconv.c	Wed Nov 01 19:23:39 2006 +0000
@@ -488,12 +488,6 @@
 			case GAIM_CMD_STATUS_OK:
 				return TRUE;
 			case GAIM_CMD_STATUS_NOT_FOUND:
-				if (!gaim_prefs_get_bool("/gaim/gtk/conversations/passthrough_unknown_commands")) {
-					gaim_conversation_write(conv, "", _("No such command."),
-							GAIM_MESSAGE_NO_LOG, time(NULL));
-
-					return TRUE;
-				}
 				return FALSE;
 			case GAIM_CMD_STATUS_WRONG_ARGS:
 				gaim_conversation_write(conv, "", _("Syntax Error:  You typed the wrong number of arguments "
@@ -6594,7 +6588,6 @@
 
 	gaim_prefs_add_bool("/gaim/gtk/conversations/show_timestamps", TRUE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/show_formatting_toolbar", TRUE);
-	gaim_prefs_add_bool("/gaim/gtk/conversations/passthrough_unknown_commands", FALSE);
 
 	gaim_prefs_add_string("/gaim/gtk/conversations/placement", "last");
 	gaim_prefs_add_int("/gaim/gtk/conversations/placement_number", 1);

--- a/gtk/gtkprefs.c	Wed Nov 01 07:32:41 2006 +0000
+++ b/gtk/gtkprefs.c	Wed Nov 01 19:23:39 2006 +0000
@@ -828,8 +828,6 @@
 		_("Always"), "always",
 		NULL);
 
-	gaim_gtk_prefs_checkbox(_("Send unknown \"_slash\" commands as messages"),
-	                        "/gaim/gtk/conversations/passthrough_unknown_commands", vbox);
 	gaim_gtk_prefs_checkbox(_("Show _formatting on incoming messages"),
 				"/gaim/gtk/conversations/show_incoming_formatting", vbox);
 
@@ -2079,6 +2077,7 @@
 	gaim_prefs_remove("/gaim/gtk/conversations/chat/raise_on_events");
 	gaim_prefs_remove("/gaim/gtk/conversations/ignore_fonts");
 	gaim_prefs_remove("/gaim/gtk/conversations/ignore_font_sizes");
+	gaim_prefs_remove("/gaim/gtk/conversations/passthrough_unknown_commands");
 	gaim_prefs_remove("/gaim/gtk/idle");
 	gaim_prefs_remove("/gaim/gtk/logging/individual_logs");
 	gaim_prefs_remove("/gaim/gtk/sound/signon");