← Back to branch summary

~ubuntu-desktop/xchat-gnome/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/add_spell_checking.patch

  • Committer: jbicha at ubuntu
  • Date: 2017-12-25 00:29:31 UTC
  • Revision ID: jbicha@ubuntu.com-20171225002931-f4yybxkp4p1qmj8x
Switch from cdbs to dh

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/add_spell_checking.patch
4
4
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=739901
5
5
Updated: 2014-11-12
6
6
 
7
 
Index: xchat-gnome-0.30.0~git20141005.816798/src/fe-gnome/Makefile.am
8
 
===================================================================
9
 
--- xchat-gnome-0.30.0~git20141005.816798.orig/src/fe-gnome/Makefile.am 2014-11-12 14:42:49.234742381 -0500
10
 
+++ xchat-gnome-0.30.0~git20141005.816798/src/fe-gnome/Makefile.am      2014-11-12 14:42:49.234742381 -0500
11
 
@@ -68,6 +68,8 @@
 
7
---
 
8
 po/POTFILES.in                             |    1 
 
9
 src/fe-gnome/Makefile.am                   |   23 
 
10
 src/fe-gnome/preferences-page-spellcheck.c |   18 
 
11
 src/fe-gnome/sexy-marshal.list             |    2 
 
12
 src/fe-gnome/sexy-spell-entry.c            | 1321 +++++++++++++++++++++++++++++
 
13
 src/fe-gnome/sexy-spell-entry.h            |   87 +
 
14
 src/fe-gnome/text-entry.c                  |  103 ++
 
15
 src/fe-gnome/text-entry.h                  |    9 
 
16
 8 files changed, 1550 insertions(+), 14 deletions(-)
 
17
 
 
18
--- a/po/POTFILES.in
 
19
+++ b/po/POTFILES.in
 
20
@@ -58,6 +58,7 @@ src/fe-gnome/preferences-page-irc.c
 
21
 src/fe-gnome/preferences-page-networks.c
 
22
 src/fe-gnome/preferences-page-plugins.c
 
23
 src/fe-gnome/preferences-page-spellcheck.c
 
24
+src/fe-gnome/sexy-spell-entry.c
 
25
 src/fe-gnome/status-bar.c
 
26
 src/fe-gnome/text-entry.c
 
27
 src/fe-gnome/topic-label.c
 
28
--- a/src/fe-gnome/Makefile.am
 
29
+++ b/src/fe-gnome/Makefile.am
 
30
@@ -68,6 +68,8 @@ xchat_gnome_SOURCES =                         \
12
31
        preferences.h                           \
13
32
        setup-dialog.c                          \
14
33
        setup-dialog.h                          \
17
36
        status-bar.h                            \
18
37
        status-bar.c                            \
19
38
        text-entry.c                            \
20
 
@@ -119,7 +121,9 @@
 
39
@@ -119,7 +121,9 @@ xchat_gnome_LDADD = \
21
40
 
22
41
 BUILT_SOURCES =        \
23
42
        xg-marshal.h    \
28
47
 
29
48
 CLEANFILES = $(stamp_files) $(BUILT_SOURCES)
30
49
 DISTCLEANFILES = $(stamp_files) apps_xchat.schemas $(BUILT_SOURCES)
31
 
@@ -127,7 +131,9 @@
 
50
@@ -127,7 +131,9 @@ MAINTAINERCLEANFILES = $(stamp_files) $(
32
51
 
33
52
 stamp_files = \
34
53
        stamp-xg-marshal.c              \
39
58
 
40
59
 xg-marshal.c: stamp-xg-marshal.c
41
60
        @true
42
 
@@ -141,7 +147,20 @@
 
61
@@ -141,7 +147,20 @@ stamp-xg-marshal.h: xg-marshal.list
43
62
        $(GLIB_GENMARSHAL) --prefix=xg_marshal $(srcdir)/xg-marshal.list --header > xg-marshal.h \
44
63
        && echo timestamp > $(@F)
45
64
 
60
79
        xg-marshal.list                         \
61
80
+       sexy-marshal.list                       \
62
81
        apps_xchat.schemas.in
63
 
Index: xchat-gnome-0.30.0~git20141005.816798/src/fe-gnome/sexy-spell-entry.c
64
 
===================================================================
65
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
66
 
+++ xchat-gnome-0.30.0~git20141005.816798/src/fe-gnome/sexy-spell-entry.c       2014-11-12 14:42:49.234742381 -0500
 
82
--- a/src/fe-gnome/preferences-page-spellcheck.c
 
83
+++ b/src/fe-gnome/preferences-page-spellcheck.c
 
84
@@ -28,6 +28,12 @@
 
85
 #include "util.h"
 
86
 #include "gui.h"
 
87
 
 
88
+#warning "temporary hack until sexy-spell-entry is removed"
 
89
+#undef GTK_DISABLE_SINGLE_INCLUDES
 
90
+#include "sexy-spell-entry.h"
 
91
+#define GTK_DISABLE_SINGLE_INCLUDES
 
92
+
 
93
+
 
94
 G_DEFINE_TYPE(PreferencesPageSpellcheck, preferences_page_spellcheck, PREFERENCES_PAGE_TYPE)
 
95
 
 
96
 enum
 
97
@@ -62,7 +68,7 @@ language_changed (GtkCellRendererToggle
 
98
        GSList *languages;
 
99
        GConfClient *client;
 
100
        GError *err = NULL;
 
101
-#if 0
 
102
+
 
103
        result = TRUE;
 
104
        path = gtk_tree_path_new_from_string (pathstr);
 
105
        if (gtk_tree_model_get_iter (GTK_TREE_MODEL (page->spellcheck_store), &iter, path)) {
 
106
@@ -100,7 +106,6 @@ language_changed (GtkCellRendererToggle
 
107
        }
 
108
 
 
109
        gtk_tree_path_free (path);
 
110
-#endif
 
111
 }
 
112
 
 
113
 static void
 
114
@@ -122,7 +127,7 @@ gconf_languages_changed (GConfClient *cl
 
115
        gboolean active;
 
116
        GError *err = NULL;
 
117
        GSList *new_languages, *old_languages;
 
118
-#if 0
 
119
+
 
120
        /* First we use the new languages list
 
121
         *
 
122
         * FIXME: This suck because it should be done in text-entry.c
 
123
@@ -161,7 +166,6 @@ gconf_languages_changed (GConfClient *cl
 
124
 
 
125
        g_slist_foreach (new_languages, (GFunc) g_free, NULL);
 
126
        g_slist_free (new_languages);
 
127
-#endif
 
128
 }
 
129
 
 
130
 PreferencesPageSpellcheck *
 
131
@@ -180,8 +184,7 @@ preferences_page_spellcheck_new (gpointe
 
132
        gtk_list_store_append (p->page_store, &iter);
 
133
        gtk_list_store_set (p->page_store, &iter, 0, PREFERENCES_PAGE (page)->icon, 1, _("Spell checking"), 2, 7, -1);
 
134
 
 
135
-       /*languages = sexy_spell_entry_get_languages (SEXY_SPELL_ENTRY (gui.text_entry));*/
 
136
-       languages == NULL;
 
137
+       languages = sexy_spell_entry_get_languages (SEXY_SPELL_ENTRY (gui.text_entry));
 
138
        if (languages == NULL) {
 
139
                label = gtk_label_new (_("In order to get spell-checking, you need to have libenchant installed with at least one dictionary."));
 
140
                gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
 
141
@@ -231,7 +234,7 @@ preferences_page_spellcheck_new (gpointe
 
142
 
 
143
        page->nh[0] = gconf_client_notify_add (p->gconf, "/apps/xchat/spellcheck/enabled", (GConfClientNotifyFunc) gconf_enabled_changed, page->enable_spellcheck, NULL, NULL);
 
144
        page->nh[1] = gconf_client_notify_add (p->gconf, "/apps/xchat/spellcheck/languages", (GConfClientNotifyFunc) gconf_languages_changed, page->spellcheck_store, NULL, NULL);
 
145
-#if 0
 
146
+
 
147
        /* Populate the model */
 
148
        for (l = languages; l != NULL; l = l->next) {
 
149
                gboolean active;
 
150
@@ -255,7 +258,6 @@ preferences_page_spellcheck_new (gpointe
 
151
                                            -1);
 
152
                }
 
153
        }
 
154
-#endif
 
155
        g_slist_free (languages);
 
156
 
 
157
        enabled = gconf_client_get_bool (p->gconf, "/apps/xchat/spellcheck/enabled", NULL);
 
158
--- /dev/null
 
159
+++ b/src/fe-gnome/sexy-marshal.list
 
160
@@ -0,0 +1,2 @@
 
161
+BOOLEAN:STRING
 
162
+OBJECT:OBJECT,OBJECT
 
163
--- /dev/null
 
164
+++ b/src/fe-gnome/sexy-spell-entry.c
67
165
@@ -0,0 +1,1321 @@
68
166
+/*
69
167
+ * @file libsexy/sexy-icon-entry.c Entry widget
1386
1484
+               sexy_spell_entry_recheck_all(entry);
1387
1485
+       }
1388
1486
+}
1389
 
Index: xchat-gnome-0.30.0~git20141005.816798/src/fe-gnome/sexy-spell-entry.h
1390
 
===================================================================
1391
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1392
 
+++ xchat-gnome-0.30.0~git20141005.816798/src/fe-gnome/sexy-spell-entry.h       2014-11-12 14:42:49.234742381 -0500
 
1487
--- /dev/null
 
1488
+++ b/src/fe-gnome/sexy-spell-entry.h
1393
1489
@@ -0,0 +1,87 @@
1394
1490
+/*
1395
1491
+ * @file libsexy/sexy-spell-entry.h Entry widget
1478
1574
+G_END_DECLS
1479
1575
+
1480
1576
+#endif
1481
 
Index: xchat-gnome-0.30.0~git20141005.816798/src/fe-gnome/text-entry.c
1482
 
===================================================================
1483
 
--- xchat-gnome-0.30.0~git20141005.816798.orig/src/fe-gnome/text-entry.c        2014-11-12 14:42:49.234742381 -0500
1484
 
+++ xchat-gnome-0.30.0~git20141005.816798/src/fe-gnome/text-entry.c     2014-11-12 14:42:49.234742381 -0500
 
1577
--- a/src/fe-gnome/text-entry.c
 
1578
+++ b/src/fe-gnome/text-entry.c
1485
1579
@@ -28,6 +28,7 @@
1486
1580
 #include "palette.h"
1487
1581
 #include "text-entry.h"
1490
1584
 #include "../common/outbound.h"
1491
1585
 #include "../common/xchatc.h"
1492
1586
 
1493
 
@@ -37,6 +38,13 @@
 
1587
@@ -37,6 +38,13 @@ static void       text_entry_finalize
1494
1588
 static gboolean   text_entry_key_press         (GtkWidget      *widget,
1495
1589
                                                 GdkEventKey    *event,
1496
1590
                                                 gpointer        data);
1504
1598
 static void       text_entry_activate          (GtkWidget      *widget,
1505
1599
                                                 gpointer        data);
1506
1600
 static void       text_entry_history_up        (GtkEntry       *entry);
1507
 
@@ -53,8 +61,10 @@
 
1601
@@ -53,8 +61,10 @@ static GtkWidget *get_color_icon
1508
1602
 static void       color_code_activate          (GtkMenuItem    *item,
1509
1603
                                                 gpointer        data);
1510
1604
 
1517
1611
 
1518
1612
 struct _TextEntryPriv
1519
1613
 {
1520
 
@@ -94,11 +104,16 @@
 
1614
@@ -94,11 +104,16 @@ text_entry_init (TextEntry *entry)
1521
1615
 {
1522
1616
        GList *items = NULL;
1523
1617
        int i;
1534
1628
 
1535
1629
        entry->priv = g_new0 (TextEntryPriv, 1);
1536
1630
 
1537
 
@@ -114,6 +129,41 @@
 
1631
@@ -114,6 +129,41 @@ text_entry_init (TextEntry *entry)
1538
1632
        g_completion_add_items (entry->priv->command_completion, items);
1539
1633
        g_list_free (items);
1540
1634
 
1576
1670
        /* Save the current input for each session */
1577
1671
        entry->priv->current_text = g_hash_table_new (NULL, NULL);
1578
1672
 
1579
 
@@ -159,6 +209,32 @@
 
1673
@@ -159,6 +209,32 @@ text_entry_key_press (GtkWidget *widget,
1580
1674
        }
1581
1675
 }
1582
1676
 
1609
1703
 static void
1610
1704
 text_entry_activate (GtkWidget *widget, gpointer data)
1611
1705
 {
1612
 
@@ -624,3 +700,26 @@
 
1706
@@ -624,3 +700,26 @@ text_entry_remove_session (TextEntry *en
1613
1707
        }
1614
1708
 }
1615
1709
 
1636
1730
+               g_slist_free (langs);
1637
1731
+       }
1638
1732
+}
1639
 
Index: xchat-gnome-0.30.0~git20141005.816798/src/fe-gnome/sexy-marshal.list
1640
 
===================================================================
1641
 
--- /dev/null   1970-01-01 00:00:00.000000000 +0000
1642
 
+++ xchat-gnome-0.30.0~git20141005.816798/src/fe-gnome/sexy-marshal.list        2014-11-12 14:42:49.234742381 -0500
1643
 
@@ -0,0 +1,2 @@
1644
 
+BOOLEAN:STRING
1645
 
+OBJECT:OBJECT,OBJECT
1646
 
Index: xchat-gnome-0.30.0~git20141005.816798/src/fe-gnome/text-entry.h
1647
 
===================================================================
1648
 
--- xchat-gnome-0.30.0~git20141005.816798.orig/src/fe-gnome/text-entry.h        2014-11-12 14:42:49.234742381 -0500
1649
 
+++ xchat-gnome-0.30.0~git20141005.816798/src/fe-gnome/text-entry.h     2014-11-12 14:43:47.575220200 -0500
 
1733
--- a/src/fe-gnome/text-entry.h
 
1734
+++ b/src/fe-gnome/text-entry.h
1650
1735
@@ -21,6 +21,11 @@
1651
1736
 #ifndef XCHAT_GNOME_TEXTENTRY_H
1652
1737
 #define XCHAT_GNOME_TEXTENTRY_H
1659
1744
 #include "../common/xchat.h"
1660
1745
 
1661
1746
 G_BEGIN_DECLS
1662
 
@@ -37,14 +42,14 @@
 
1747
@@ -37,14 +42,14 @@ typedef struct _TextEntryPriv  TextEntry
1663
1748
 
1664
1749
 struct _TextEntry
1665
1750
 {
1676
1761
 };
1677
1762
 
1678
1763
 GType      text_entry_get_type       (void) G_GNUC_CONST;
1679
 
Index: xchat-gnome-0.30.0~git20141005.816798/src/fe-gnome/preferences-page-spellcheck.c
1680
 
===================================================================
1681
 
--- xchat-gnome-0.30.0~git20141005.816798.orig/src/fe-gnome/preferences-page-spellcheck.c       2014-11-12 14:42:49.234742381 -0500
1682
 
+++ xchat-gnome-0.30.0~git20141005.816798/src/fe-gnome/preferences-page-spellcheck.c    2014-11-12 14:43:56.675294380 -0500
1683
 
@@ -28,6 +28,12 @@
1684
 
 #include "util.h"
1685
 
 #include "gui.h"
1686
 
 
1687
 
+#warning "temporary hack until sexy-spell-entry is removed"
1688
 
+#undef GTK_DISABLE_SINGLE_INCLUDES
1689
 
+#include "sexy-spell-entry.h"
1690
 
+#define GTK_DISABLE_SINGLE_INCLUDES
1691
 
+
1692
 
+
1693
 
 G_DEFINE_TYPE(PreferencesPageSpellcheck, preferences_page_spellcheck, PREFERENCES_PAGE_TYPE)
1694
 
 
1695
 
 enum
1696
 
@@ -62,7 +68,7 @@
1697
 
        GSList *languages;
1698
 
        GConfClient *client;
1699
 
        GError *err = NULL;
1700
 
-#if 0
1701
 
+
1702
 
        result = TRUE;
1703
 
        path = gtk_tree_path_new_from_string (pathstr);
1704
 
        if (gtk_tree_model_get_iter (GTK_TREE_MODEL (page->spellcheck_store), &iter, path)) {
1705
 
@@ -100,7 +106,6 @@
1706
 
        }
1707
 
 
1708
 
        gtk_tree_path_free (path);
1709
 
-#endif
1710
 
 }
1711
 
 
1712
 
 static void
1713
 
@@ -122,7 +127,7 @@
1714
 
        gboolean active;
1715
 
        GError *err = NULL;
1716
 
        GSList *new_languages, *old_languages;
1717
 
-#if 0
1718
 
+
1719
 
        /* First we use the new languages list
1720
 
         *
1721
 
         * FIXME: This suck because it should be done in text-entry.c
1722
 
@@ -161,7 +166,6 @@
1723
 
 
1724
 
        g_slist_foreach (new_languages, (GFunc) g_free, NULL);
1725
 
        g_slist_free (new_languages);
1726
 
-#endif
1727
 
 }
1728
 
 
1729
 
 PreferencesPageSpellcheck *
1730
 
@@ -180,8 +184,7 @@
1731
 
        gtk_list_store_append (p->page_store, &iter);
1732
 
        gtk_list_store_set (p->page_store, &iter, 0, PREFERENCES_PAGE (page)->icon, 1, _("Spell checking"), 2, 7, -1);
1733
 
 
1734
 
-       /*languages = sexy_spell_entry_get_languages (SEXY_SPELL_ENTRY (gui.text_entry));*/
1735
 
-       languages == NULL;
1736
 
+       languages = sexy_spell_entry_get_languages (SEXY_SPELL_ENTRY (gui.text_entry));
1737
 
        if (languages == NULL) {
1738
 
                label = gtk_label_new (_("In order to get spell-checking, you need to have libenchant installed with at least one dictionary."));
1739
 
                gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
1740
 
@@ -231,7 +234,7 @@
1741
 
 
1742
 
        page->nh[0] = gconf_client_notify_add (p->gconf, "/apps/xchat/spellcheck/enabled", (GConfClientNotifyFunc) gconf_enabled_changed, page->enable_spellcheck, NULL, NULL);
1743
 
        page->nh[1] = gconf_client_notify_add (p->gconf, "/apps/xchat/spellcheck/languages", (GConfClientNotifyFunc) gconf_languages_changed, page->spellcheck_store, NULL, NULL);
1744
 
-#if 0
1745
 
+
1746
 
        /* Populate the model */
1747
 
        for (l = languages; l != NULL; l = l->next) {
1748
 
                gboolean active;
1749
 
@@ -255,7 +258,6 @@
1750
 
                                            -1);
1751
 
                }
1752
 
        }
1753
 
-#endif
1754
 
        g_slist_free (languages);
1755
 
 
1756
 
        enabled = gconf_client_get_bool (p->gconf, "/apps/xchat/spellcheck/enabled", NULL);