blob: 6200ce5ebc71125499de3e0b8b0e043e07d37ba6 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
$NetBSD: patch-client_gtk3_ibusimcontext.c,v 1.2 2017/11/05 04:19:15 tsutsui Exp $
NetBSD 6.99.25's gcc says:
error: #pragma GCC diagnostic not allowed inside functions
--- client/gtk3/ibusimcontext.c.orig 2017-10-22 10:31:49.000000000 +0000
+++ client/gtk3/ibusimcontext.c
@@ -559,6 +559,9 @@ daemon_name_vanished (GDBusConnection *c
_daemon_is_running = FALSE;
}
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
static void
ibus_im_context_class_init (IBusIMContextClass *class)
{
@@ -642,10 +645,7 @@ ibus_im_context_class_init (IBusIMContex
/* always install snooper */
if (_key_snooper_id == 0) {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
_key_snooper_id = gtk_key_snooper_install (_key_snooper_cb, NULL);
-#pragma GCC diagnostic pop
}
_daemon_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
@@ -656,21 +656,22 @@ ibus_im_context_class_init (IBusIMContex
NULL,
NULL);
}
+#pragma GCC diagnostic pop
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
static void
ibus_im_context_class_fini (IBusIMContextClass *class)
{
if (_key_snooper_id != 0) {
IDEBUG ("snooper is terminated.");
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
gtk_key_snooper_remove (_key_snooper_id);
-#pragma GCC diagnostic pop
_key_snooper_id = 0;
}
g_bus_unwatch_name (_daemon_name_watch_id);
}
+#pragma GCC diagnostic pop
/* Copied from gtk+2.0-2.20.1/modules/input/imcedilla.c to fix crosbug.com/11421.
* Overwrite the original Gtk+'s compose table in gtk+-2.x.y/gtk/gtkimcontextsimple.c. */
|
