# HG changeset patch # User Gary Kramlich # Date 1602035073 18000 # Node ID 8079731c8ef9909fe3750a969eb81221ba9ee01f # Parent 9ceb8d25d4d92249d8137311ee618f0cdb807197 Remove the spell checking preference as it's a talkatu feature and most are unlikely to disable it Testing Done: Compiled, verified the preference window still works, and sent some messages via bonjour. Reviewed at https://reviews.imfreedom.org/r/143/ diff -r 9ceb8d25d4d9 -r 8079731c8ef9 pidgin/gtkconv.c --- a/pidgin/gtkconv.c Sat Oct 03 05:58:21 2020 -0500 +++ b/pidgin/gtkconv.c Tue Oct 06 20:44:33 2020 -0500 @@ -5646,27 +5646,6 @@ } static void -spellcheck_pref_cb(const char *name, PurplePrefType type, - gconstpointer value, gpointer data) -{ - GList *cl; - PurpleConversation *conv; - - for (cl = purple_conversations_get_all(); cl != NULL; cl = cl->next) { - PidginConversation *gtkconv = NULL; - - conv = (PurpleConversation *)cl->data; - - if (!PIDGIN_IS_PIDGIN_CONVERSATION(conv)) - continue; - - gtkconv = PIDGIN_CONVERSATION(conv); - -# warning toggle spell checking when talkatu #60 is done. - } -} - -static void tab_side_pref_cb(const char *name, PurplePrefType type, gconstpointer value, gpointer data) { @@ -6199,7 +6178,6 @@ purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/send_italic", FALSE); purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/send_underline", FALSE); purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/send_strike", FALSE); - purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/spellcheck", TRUE); purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting", TRUE); /* TODO: it's about *remote* smileys, not local ones */ purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/resize_custom_smileys", TRUE); @@ -6254,8 +6232,6 @@ close_on_tabs_pref_cb, NULL); purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/show_formatting_toolbar", show_formatting_toolbar_pref_cb, NULL); - purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/spellcheck", - spellcheck_pref_cb, NULL); purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/tab_side", tab_side_pref_cb, NULL); diff -r 9ceb8d25d4d9 -r 8079731c8ef9 pidgin/gtkprefs.c --- a/pidgin/gtkprefs.c Sat Oct 03 05:58:21 2020 -0500 +++ b/pidgin/gtkprefs.c Tue Oct 06 20:44:33 2020 -0500 @@ -121,7 +121,6 @@ GtkWidget *animate_buddy_icons; GtkWidget *send_typing; } im; - GtkWidget *spellcheck; GtkWidget *use_smooth_scrolling; struct { GtkWidget *blink_im; @@ -1606,8 +1605,6 @@ pidgin_prefs_bind_checkbox("/purple/conversations/im/send_typing", win->conversations.im.send_typing); - pidgin_prefs_bind_checkbox(PIDGIN_PREFS_ROOT "/conversations/spellcheck", - win->conversations.spellcheck); pidgin_prefs_bind_checkbox(PIDGIN_PREFS_ROOT "/conversations/use_smooth_scrolling", win->conversations.use_smooth_scrolling); @@ -2876,9 +2873,6 @@ conversations.im.send_typing); gtk_widget_class_bind_template_child( widget_class, PidginPrefsWindow, - conversations.spellcheck); - gtk_widget_class_bind_template_child( - widget_class, PidginPrefsWindow, conversations.use_smooth_scrolling); gtk_widget_class_bind_template_child( widget_class, PidginPrefsWindow, diff -r 9ceb8d25d4d9 -r 8079731c8ef9 pidgin/resources/Prefs/prefs.ui --- a/pidgin/resources/Prefs/prefs.ui Sat Oct 03 05:58:21 2020 -0500 +++ b/pidgin/resources/Prefs/prefs.ui Tue Oct 06 20:44:33 2020 -0500 @@ -718,21 +718,6 @@ - - Highlight _misspelled words - True - True - False - True - True - - - False - True - 6 - - - Use smooth-scrolling True @@ -743,7 +728,7 @@ False True - 7 + 6 @@ -758,7 +743,7 @@ False True - 8 + 7 @@ -809,7 +794,7 @@ False True - 9 + 8 @@ -847,7 +832,7 @@ False True - 10 + 9