Attachment #53431 for bug #80801

View | Details | Raw Unified | Return to bug 80801
Collapse All | Expand All

Lines 33-39 Link Here

(-)gaim/Makefile (-1 / +5 lines)
33		33
34	MAN1= gaim.1 gaim-remote.1	34	MAN1= gaim.1 gaim-remote.1
35		35
36	OPTIONS= SILC "Secure Internet Live Conferencing support" off \	36	OPTIONS= BIG5 "With Big5 Chinese input fix" off \
		37	SILC "Secure Internet Live Conferencing support" off \
37	GTKSPELL "spell checking support" on \	38	GTKSPELL "spell checking support" on \
38	AUDIO "audio support" on \	39	AUDIO "audio support" on \
39	GNUTLS "GNUTLS encryption support" off \	40	GNUTLS "GNUTLS encryption support" off \
Lines 128-132 Link Here
128	-e 's\|TCL_VERSION found but 8.3 required\|TCL_VERSION found but ${TCLTK_VER} required\|g' \	129	-e 's\|TCL_VERSION found but 8.3 required\|TCL_VERSION found but ${TCLTK_VER} required\|g' \
129	-e 's\|TCL_MINOR_VERSION" -ne 3\|TCL_MINOR_VERSION" -ne ${TCLTK_VER:E}\|' \	130	-e 's\|TCL_MINOR_VERSION" -ne 3\|TCL_MINOR_VERSION" -ne ${TCLTK_VER:E}\|' \
130	${WRKSRC}/configure	131	${WRKSRC}/configure
		132	.if defined(WITH_BIG5)
		133	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_gtkconv.c
		134	.endif
131		135
132	.include <bsd.port.post.mk>	136	.include <bsd.port.post.mk>




--- src.orig/gtkconv.c	Mon May  9 08:36:54 2005
+++ src/gtkconv.c	Mon May  9 08:37:32 2005
@@ -6369,8 +6369,8 @@
 	/* Conversations */
 	gaim_prefs_add_none("/gaim/gtk/conversations");
 	gaim_prefs_add_bool("/gaim/gtk/conversations/close_on_tabs", TRUE);
-	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/ctrl_enter_sends", TRUE);
+	gaim_prefs_add_bool("/gaim/gtk/conversations/enter_sends", FALSE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/escape_closes", FALSE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/send_formatting", FALSE);
 	gaim_prefs_add_bool("/gaim/gtk/conversations/send_bold", FALSE);

Return to bug 80801

Line 0 Link Here

(-)gaim/files/extra-patch-src_gtkconv.c (+13 lines)
	1	--- src.orig/gtkconv.c Mon May 9 08:36:54 2005
	2	+++ src/gtkconv.c Mon May 9 08:37:32 2005
	3	@@ -6369,8 +6369,8 @@
	4	/* Conversations */
	5	gaim_prefs_add_none("/gaim/gtk/conversations");
	6	gaim_prefs_add_bool("/gaim/gtk/conversations/close_on_tabs", TRUE);
	7	- gaim_prefs_add_bool("/gaim/gtk/conversations/ctrl_enter_sends", FALSE);
	8	- gaim_prefs_add_bool("/gaim/gtk/conversations/enter_sends", TRUE);
	9	+ gaim_prefs_add_bool("/gaim/gtk/conversations/ctrl_enter_sends", TRUE);
	10	+ gaim_prefs_add_bool("/gaim/gtk/conversations/enter_sends", FALSE);
	11	gaim_prefs_add_bool("/gaim/gtk/conversations/escape_closes", FALSE);
	12	gaim_prefs_add_bool("/gaim/gtk/conversations/send_formatting", FALSE);
	13	gaim_prefs_add_bool("/gaim/gtk/conversations/send_bold", FALSE);