deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-14 17:50:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove gtkspell support

Browse Source
This commit is contained in:
TingPing
2013-10-01 11:21:28 -04:00
parent d643056ca0
commit eb93130cd3
8 changed files with 12 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/fe-gtk/maingui.c
View File

@@ -50,14 +50,7 @@
#include "pixmaps.h"
#include "plugin-tray.h"
#include "xtext.h"
#ifdef USE_GTKSPELL
#include <gtkspell/gtkspell.h>
#endif
#ifdef USE_LIBSEXY
#include "sexy-spell-entry.h"
#endif
#define GUI_SPACING (3)
#define GUI_BORDER (0)
@@ -99,59 +92,6 @@ static PangoAttrList *nickseen_list;
static PangoAttrList *newmsg_list;
static PangoAttrList *plain_list = NULL;
#ifdef USE_GTKSPELL
/* use these when it's a GtkTextView instead of GtkEntry */
char *
SPELL_ENTRY_GET_TEXT (GtkWidget *entry)
{
static char *last = NULL; /* warning: don't overlap 2 GET_TEXT calls! */
GtkTextBuffer *buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (entry));
GtkTextIter start_iter, end_iter;
gtk_text_buffer_get_iter_at_offset (buf, &start_iter, 0);
gtk_text_buffer_get_end_iter (buf, &end_iter);
g_free (last);
last = gtk_text_buffer_get_text (buf, &start_iter, &end_iter, FALSE);
return last;
}
void
SPELL_ENTRY_SET_POS (GtkWidget *entry, int pos)
{
GtkTextIter iter;
GtkTextBuffer *buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (entry));
gtk_text_buffer_get_iter_at_offset (buf, &iter, pos);
gtk_text_buffer_place_cursor (buf, &iter);
}
int
SPELL_ENTRY_GET_POS (GtkWidget *entry)
{
GtkTextIter cursor;
GtkTextBuffer *buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (entry));
gtk_text_buffer_get_iter_at_mark (buf, &cursor, gtk_text_buffer_get_insert (buf));
return gtk_text_iter_get_offset (&cursor);
}
void
SPELL_ENTRY_INSERT (GtkWidget *entry, const char *text, int len, int *pos)
{
GtkTextIter iter;
GtkTextBuffer *buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (entry));
/* len is bytes. pos is chars. */
gtk_text_buffer_get_iter_at_offset (buf, &iter, *pos);
gtk_text_buffer_insert (buf, &iter, text, len);
*pos += g_utf8_strlen (text, len);
}
#endif
static PangoAttrList *
mg_attr_list_create (GdkColor *col, int size)
{
@@ -2999,9 +2939,6 @@ static void
mg_create_entry (session *sess, GtkWidget *box)
{
GtkWidget *hbox, *but, *entry;
#ifdef USE_GTKSPELL
GtkWidget *sw;
#endif
session_gui *gui = sess->gui;
hbox = gtk_hbox_new (FALSE, 0);
@@ -3017,34 +2954,13 @@ mg_create_entry (session *sess, GtkWidget *box)
g_signal_connect (G_OBJECT (but), "clicked",
G_CALLBACK (mg_nickclick_cb), NULL);
#ifdef USE_GTKSPELL
gui->input_box = entry = gtk_text_view_new ();
gtk_widget_set_size_request (entry, 0, 1);
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (entry), GTK_WRAP_NONE);
gtk_text_view_set_accepts_tab (GTK_TEXT_VIEW (entry), FALSE);
if (prefs.hex_gui_input_spell)
gtkspell_new_attach (GTK_TEXT_VIEW (entry), NULL, NULL);
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
GTK_SHADOW_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
gtk_container_add (GTK_CONTAINER (sw), entry);
gtk_container_add (GTK_CONTAINER (hbox), sw);
#else
#ifdef USE_LIBSEXY
gui->input_box = entry = sexy_spell_entry_new ();
sexy_spell_entry_set_checked ((SexySpellEntry *)entry, prefs.hex_gui_input_spell);
#else
gui->input_box = entry = gtk_entry_new ();
#endif
gtk_entry_set_max_length (GTK_ENTRY (gui->input_box), 0);
g_signal_connect (G_OBJECT (entry), "activate",
G_CALLBACK (mg_inputbox_cb), gui);
gtk_container_add (GTK_CONTAINER (hbox), entry);
#endif
gtk_widget_set_name (entry, "hexchat-inputbox");
g_signal_connect (G_OBJECT (entry), "key_press_event",