/pidgin/main: 0c0112fff3d2: We don't need GtkSpell anymore (see:...
Tomasz Wasilczyk
twasilczyk at pidgin.im
Sat Apr 26 07:39:19 EDT 2014
Changeset: 0c0112fff3d280211829e092edc7cc80dd96df7c
Author: Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date: 2014-04-26 13:39 +0200
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/0c0112fff3d2
Description:
We don't need GtkSpell anymore (see: WebKitGtk, Enchant)
diffstat:
INSTALL | 2 -
README | 3 +-
config.h.mingw | 3 -
configure.ac | 30 ---------
doc/reference/pidgin/Makefile.am | 2 -
libpurple/win32/global.mak | 1 -
pidgin.apspec.in | 1 -
pidgin/Makefile.am | 10 +--
pidgin/Makefile.mingw | 4 +-
pidgin/gtkdialogs.c | 6 -
pidgin/gtkrequest.c | 6 -
pidgin/gtkutils.c | 26 --------
pidgin/gtkutils.h | 11 ---
pidgin/win32/gtkwin32dep.c | 6 -
pidgin/win32/nsis/generate_gtk_zip.sh | 3 -
pidgin/win32/nsis/pidgin-installer.nsi | 1 -
pidgin/win32/prepare-workspace.sh | 3 -
pidgin/win32/wspell.c | 107 ---------------------------------
pidgin/win32/wspell.h | 57 -----------------
19 files changed, 4 insertions(+), 278 deletions(-)
diffs (truncated from 546 to 300 lines):
diff --git a/INSTALL b/INSTALL
--- a/INSTALL
+++ b/INSTALL
@@ -138,8 +138,6 @@ when it should mark accounts idle based
Doing so will remove the ability to have pidgin start up with your window
manager.
- `--disable-gtkspell' will remove the ability to highlight misspelled words.
-
`--disable-gevolution' will cause the evolution integration plugin not to
compile.
diff --git a/README b/README
--- a/README
+++ b/README
@@ -29,8 +29,7 @@ well as the development files!). The con
don't. If you don't have GTK+ 2.0 installed, you should install it
using your distribution's package management tools.
-For sound support, you also need gstreamer 0.10 or higher. For
-spellchecking support, you need libgtkspell (http://gtkspell.sf.net/).
+For sound support, you also need gstreamer 0.10 or higher.
Your distro of choice probably already includes these, just be sure to
install the development packages.
diff --git a/config.h.mingw b/config.h.mingw
--- a/config.h.mingw
+++ b/config.h.mingw
@@ -363,9 +363,6 @@
/* It's defined in global.mak. */
/* #undef USE_VV */
-/* Define if we're using GtkSpell */
-#define USE_GTKSPELL 1
-
/* Define if we're using XScreenSaver. */
#define USE_SCREENSAVER 1
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -542,10 +542,6 @@ AC_ARG_ENABLE(startup-notification,
[AS_HELP_STRING([--disable-startup-notification],
[compile without startup notification support])],
enable_startup_notification="$enableval", enable_startup_notification="yes")
-AC_ARG_ENABLE(gtkspell,
- [AS_HELP_STRING([--disable-gtkspell],
- [compile without GtkSpell automatic spell checking])],
- enable_gtkspell="$enableval", enable_gtkspell="yes")
AC_ARG_ENABLE(enchant,
[AS_HELP_STRING([--disable-enchant],
[compile without Enchant spell checking support])],
@@ -784,30 +780,6 @@ Use --disable-sm if you do not need sess
fi
dnl #######################################################################
- dnl # Check for GtkSpell
- dnl #######################################################################
- dnl GtkSpell is not GTK+3 compatible yet
- if test "x$with_gtk" = "x3"; then
- enable_gtkspell="no"
- fi
- if test "x$enable_gtkspell" = "xyes" ; then
- PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.2, , [
- AC_MSG_RESULT(no)
- enable_gtkspell="no"
- if test "x$force_deps" = "xyes" ; then
- AC_MSG_ERROR([
-GtkSpell development headers not found.
-Use --disable-gtkspell if you do not need it.
-])
- fi])
- if test "x$enable_gtkspell" = "xyes" ; then
- AC_DEFINE(USE_GTKSPELL, 1, [Define if we're using GtkSpell])
- AC_SUBST(GTKSPELL_CFLAGS)
- AC_SUBST(GTKSPELL_LIBS)
- fi
- fi
-
- dnl #######################################################################
dnl # Check for stuff needed by the Evolution integration plugin.
dnl #######################################################################
if test "x$enable_gevolution" = "xyes"; then
@@ -878,7 +850,6 @@ else # GTK
enable_gcr=no
enable_cap=no
enable_gevolution=no
- enable_gtkspell=no
enable_screensaver=no
enable_sm=no
enable_startup_notification=no
@@ -3245,7 +3216,6 @@ echo
echo Use XScreenSaver Extension.... : $enable_screensaver
echo Use X Session Management...... : $enable_sm
echo Use startup notification...... : $enable_startup_notification
-echo Build with GtkSpell support... : $enable_gtkspell
echo Build with Enchant support.... : $use_enchant
echo Build with GCR widgets........ : $enable_gcr
echo Build Unity integration plugin.: $enable_unity
diff --git a/doc/reference/pidgin/Makefile.am b/doc/reference/pidgin/Makefile.am
--- a/doc/reference/pidgin/Makefile.am
+++ b/doc/reference/pidgin/Makefile.am
@@ -104,7 +104,6 @@ GTKDOC_CFLAGS = \
$(GTK_CFLAGS) \
$(X11_CFLAGS) \
$(DBUS_CFLAGS) \
- $(GTKSPELL_CFLAGS) \
$(LIBXML_CFLAGS) \
$(WEBKIT_CFLAGS)
@@ -119,7 +118,6 @@ GTKDOC_LIBS = \
$(XSS_LIBS) \
$(SM_LIBS) \
$(INTLLIBS) \
- $(GTKSPELL_LIBS) \
$(LIBXML_LIBS) \
$(WEBKIT_LIBS) \
$(GTK_LIBS) \
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak
--- a/libpurple/win32/global.mak
+++ b/libpurple/win32/global.mak
@@ -17,7 +17,6 @@ PURPLE_API_VERSION := 20
# Locations of our various dependencies
WIN32_DEV_TOP ?= $(PIDGIN_TREE_TOP)/../win32-dev
-GTKSPELL_TOP ?= $(WIN32_DEV_TOP)/gtkspell-2.0
ENCHANT_TOP ?= $(WIN32_DEV_TOP)/enchant-1.6
GNUTLS_TOP ?= $(WIN32_DEV_TOP)/gnutls-3.1
GTK_TOP ?= $(WIN32_DEV_TOP)/gtk2-2.24
diff --git a/pidgin.apspec.in b/pidgin.apspec.in
--- a/pidgin.apspec.in
+++ b/pidgin.apspec.in
@@ -44,7 +44,6 @@ echo '*' | import
require @gtk.org/gtk 2.2
require @68k.org/libaudiofile 0.0
require @xiph.org/libao 2.0
-require @gtkspell.sourceforge.net/gtkspell 0.0
require @gnutls.org/gnutls 11.0 || { require @mozilla.org/nspr 4 && require @mozilla.org/nss 3; }
[Install]
diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am
--- a/pidgin/Makefile.am
+++ b/pidgin/Makefile.am
@@ -19,8 +19,6 @@ EXTRA_DIST = \
win32/untar.c \
win32/untar.h \
win32/winpidgin.c \
- win32/wspell.c \
- win32/wspell.h \
win32/nsis/generate_gtk_zip.sh \
win32/nsis/pixmaps/pidgin-header.bmp \
win32/nsis/pixmaps/pidgin-intro.bmp \
@@ -148,8 +146,7 @@ noinst_HEADERS= gtkinternal.h
if IS_WIN32
libpidgin_la_SOURCES += \
win32/gtkwin32dep.c \
- win32/untar.c \
- win32/wspell.c
+ win32/untar.c
# Files that looks like obsolete (were used in Pidgin2):
# win32/gtkdocklet-win32.c
@@ -163,8 +160,7 @@ pidgin_SOURCES += \
libpidgin_la_headers += \
win32/gtkwin32dep.h \
win32/resource.h \
- win32/untar.h \
- win32/wspell.h
+ win32/untar.h
.rc.o: %.rc
$(AM_V_GEN)$(WINDRES) -I $(srcdir)/win32 -I $(srcdir) -i $< -o $@
@@ -205,7 +201,6 @@ libpidgin_la_LIBADD = \
$(XSS_LIBS) \
$(SM_LIBS) \
$(INTLLIBS) \
- $(GTKSPELL_LIBS) \
$(LIBXML_LIBS) \
$(WEBKIT_LIBS) \
$(GTK_LIBS) \
@@ -236,7 +231,6 @@ AM_CPPFLAGS = \
$(GTK_CFLAGS) \
$(X11_CFLAGS) \
$(DBUS_CFLAGS) \
- $(GTKSPELL_CFLAGS) \
$(LIBXML_CFLAGS) \
$(WEBKIT_CFLAGS)
endif # ENABLE_GTK
diff --git a/pidgin/Makefile.mingw b/pidgin/Makefile.mingw
--- a/pidgin/Makefile.mingw
+++ b/pidgin/Makefile.mingw
@@ -42,7 +42,6 @@ INCLUDE_PATHS += \
-I$(GTK_TOP)/include/cairo \
-I$(GTK_TOP)/include/gdk-pixbuf-2.0 \
-I$(GTK_TOP)/lib/gtk-2.0/include \
- -I$(GTKSPELL_TOP)/include/gtkspell-2.0 \
-I$(LIBSOUP_TOP)/include/libsoup-2.4 \
-I$(LIBGADU_TOP)/include \
-I$(WEBKITGTK_TOP)/include/webkitgtk-1.0
@@ -105,8 +104,7 @@ PIDGIN_C_SRC = \
pidginstock.c \
pidgintooltip.c \
win32/gtkwin32dep.c \
- win32/untar.c \
- win32/wspell.c
+ win32/untar.c
PIDGIN_RC_SRC = win32/pidgin_dll_rc.rc
PIDGIN_OBJECTS = $(PIDGIN_C_SRC:%.c=%.o) $(PIDGIN_RC_SRC:%.rc=%.o)
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -651,12 +651,6 @@ void pidgin_dialogs_buildinfo(void)
g_string_append(str, "<dt>Gadu-Gadu library (libgadu):</dt><dd>Disabled</dd>");
#endif
-#ifdef USE_GTKSPELL
- g_string_append(str, "<dt>GtkSpell:</dt><dd>Enabled</dd>");
-#else
- g_string_append(str, "<dt>GtkSpell:</dt><dd>Disabled</dd>");
-#endif
-
#ifdef HAVE_GNUTLS
g_string_append(str, "<dt>GnuTLS:</dt><dd>Enabled</dd>");
#else
diff --git a/pidgin/gtkrequest.c b/pidgin/gtkrequest.c
--- a/pidgin/gtkrequest.c
+++ b/pidgin/gtkrequest.c
@@ -633,9 +633,6 @@ pidgin_request_input(const char *title,
gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(entry), GTK_WRAP_WORD_CHAR);
- if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/spellcheck"))
- pidgin_setup_gtkspell(GTK_TEXT_VIEW(entry));
-
gtk_box_pack_start(GTK_BOX(vbox),
pidgin_make_scrollable(entry, GTK_POLICY_NEVER, GTK_POLICY_ALWAYS, GTK_SHADOW_IN, 320, 130),
TRUE, TRUE, 0);
@@ -1163,9 +1160,6 @@ create_string_field(PurpleRequestField *
gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview),
GTK_WRAP_WORD_CHAR);
- if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/spellcheck"))
- pidgin_setup_gtkspell(GTK_TEXT_VIEW(textview));
-
gtk_widget_show(textview);
if (value != NULL)
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -29,13 +29,6 @@
# include <shellapi.h>
#endif /*_WIN32*/
-#ifdef USE_GTKSPELL
-# include <gtkspell/gtkspell.h>
-# ifdef _WIN32
-# include "win32/wspell.h"
-# endif
-#endif
-
#include <gdk/gdkkeysyms.h>
#include "conversation.h"
@@ -899,25 +892,6 @@ pidgin_account_option_menu_new(PurpleAcc
}
void
-pidgin_setup_gtkspell(GtkTextView *textview)
-{
-#ifdef USE_GTKSPELL
- GError *error = NULL;
- char *locale = NULL;
-
- g_return_if_fail(textview != NULL);
- g_return_if_fail(GTK_IS_TEXT_VIEW(textview));
-
- if (gtkspell_new_attach(textview, locale, &error) == NULL && error)
- {
- purple_debug_warning("gtkspell", "Failed to setup GtkSpell: %s\n",
- error->message);
- g_error_free(error);
- }
-#endif /* USE_GTKSPELL */
-}
-
-void
pidgin_save_accels_cb(GtkAccelGroup *accel_group, guint arg1,
GdkModifierType arg2, GClosure *arg3,
gpointer data)
diff --git a/pidgin/gtkutils.h b/pidgin/gtkutils.h
--- a/pidgin/gtkutils.h
+++ b/pidgin/gtkutils.h
@@ -400,17 +400,6 @@ void pidgin_setup_screenname_autocomplet
gboolean pidgin_screenname_autocomplete_default_filter(const PidginBuddyCompletionEntry *completion_entry, gpointer all_accounts);
/**
- * pidgin_setup_gtkspell:
- * @textview: The textview widget to setup spellchecking for.
More information about the Commits
mailing list