Mercurial > pidgin3 / changeset

--- a/src/gaimrc.c	Sat Jul 05 08:15:44 2003 +0000
+++ b/src/gaimrc.c	Sat Jul 05 18:55:07 2003 +0000
@@ -934,8 +934,6 @@
 					convo_options & OPT_CONVO_IGNORE_SIZES);
 			gaim_prefs_set_bool("/core/conversations/combine_chat_im",
 					convo_options & OPT_CONVO_COMBINE);
-			gaim_prefs_set_bool("/gaim/gtk/conversations/ctrl_w_closes",
-					convo_options & OPT_CONVO_CTL_W_CLOSES);
 			gaim_prefs_set_bool("/gaim/gtk/conversations/close_on_tabs",
 					!(convo_options & OPT_CONVO_NO_X_ON_TAB));
 		} else if (!strcmp(p->option, "im_options")) {

--- a/src/gtkconv.c	Sat Jul 05 08:15:44 2003 +0000
+++ b/src/gtkconv.c	Sat Jul 05 18:55:07 2003 +0000
@@ -1142,10 +1142,10 @@
 		if (!(event->state & GDK_CONTROL_MASK))
 			gtk_imhtml_page_down(GTK_IMHTML(gtkconv->imhtml));
 	}
-	else if (event->keyval == GDK_F2 &&
-			 gaim_prefs_get_bool("/gaim/gtk/conversations/f2_toggles_timestamps")) {
-		gtk_imhtml_show_comments(GTK_IMHTML(gtkconv->imhtml),
-								 !GTK_IMHTML(gtkconv->imhtml)->comments);
+	else if (event->keyval == GDK_F2) {
+
+		gaim_prefs_set_bool("/gaim/gtk/conversations/show_timestamps",
+			!gaim_prefs_get_bool("/gaim/gtk/conversations/show_timestamps"));
 	}
 	else if (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter) {
 		if ((event->state & GDK_CONTROL_MASK) &&
@@ -1327,11 +1327,11 @@
 			g_string_free(conv->history, TRUE);
 			conv->history = g_string_new("");
 		}
-		else if (event->keyval == 'w' &&
-				 gaim_prefs_get_bool("/gaim/gtk/conversations/ctrl_w_closes")) {
-
+		else if (event->keyval == 'w') {
 			g_signal_stop_emission_by_name(G_OBJECT(entry), "key_press_event");
+
 			gaim_conversation_destroy(conv);
+
 			return TRUE;
 		}
 		else if (event->keyval == 'n') {
@@ -5689,8 +5689,6 @@
 	gaim_prefs_add_bool("/gaim/gtk/conversations/ctrl_enter_sends", FALSE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/enter_sends", TRUE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/escape_closes", FALSE);
-	gaim_prefs_add_bool("/gaim/gtk/conversations/ctrl_w_closes", FALSE);
-	gaim_prefs_add_bool("/gaim/gtk/conversations/f2_toggles_timestamps", TRUE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/send_bold", FALSE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/send_italic", FALSE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/send_strikethrough", FALSE);

--- a/src/gtkprefs.c	Sat Jul 05 08:15:44 2003 +0000
+++ b/src/gtkprefs.c	Sat Jul 05 18:55:07 2003 +0000
@@ -798,8 +798,6 @@
 	vbox = gaim_gtk_make_frame (ret, _("Window Closing"));
 	prefs_checkbox(_("_Escape closes window"),
 				  "/gaim/gtk/conversations/escape_closes", vbox);
-	prefs_checkbox(_("Control-_W closes window"),
-				  "/gaim/gtk/conversations/ctrl_w_closes", vbox);
 
 	vbox = gaim_gtk_make_frame(ret, _("Insertions"));
 	prefs_checkbox(_("Control-{B/I/U/S} inserts _HTML tags"),
@@ -1424,8 +1422,8 @@
 				   "/core/sound/while_away", vbox);
 
 #ifndef _WIN32
-	vbox = gaim_gtk_make_frame (ret, _("Sound Method:"));
-	dd = prefs_dropdown(vbox, _("_Method"), GAIM_PREF_STRING,
+	vbox = gaim_gtk_make_frame (ret, _("Sound Method"));
+	dd = prefs_dropdown(vbox, _("_Method:"), GAIM_PREF_STRING,
 						"/gaim/gtk/sound/method",
 						_("Console beep"), "beep",
 #ifdef USE_AO