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
55
56
57
58
59
60
61
62
63
|
Description: Remove deprecated GTK functions
Remove gtk_set_locale() and change gdk_window_lookup() to gdk_x11_window_lookup_for_display().
Fixes "pointer-trouble-at-implicit" and "pointer-from-integer" warnings.
Author: Dmitry Borisyuk <q1werty@i.com.ua>
--- a/eggtrayicon.c
+++ b/eggtrayicon.c
@@ -111,7 +111,7 @@
gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget),
icon->manager_window);
#else
- gdkwin = gdk_window_lookup (icon->manager_window);
+ gdkwin = gdk_x11_window_lookup_for_display (gdk_display_get_default(), icon->manager_window);
#endif
gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
@@ -120,7 +120,7 @@
#if HAVE_GTK_MULTIHEAD
root_window = gdk_screen_get_root_window (gtk_widget_get_screen (widget));
#else
- root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
+ root_window = gdk_x11_window_lookup_for_display (gdk_display_get_default(), gdk_x11_get_default_root_xwindow ());
#endif
gdk_window_remove_filter (root_window, egg_tray_icon_manager_filter, icon);
@@ -192,7 +192,7 @@
gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
icon->manager_window);
#else
- gdkwin = gdk_window_lookup (icon->manager_window);
+ gdkwin = gdk_x11_window_lookup_for_display (gdk_display_get_default(), icon->manager_window);
#endif
gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
@@ -218,7 +218,7 @@
gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
icon->manager_window);
#else
- gdkwin = gdk_window_lookup (icon->manager_window);
+ gdkwin = gdk_x11_window_lookup_for_display (gdk_display_get_default(), icon->manager_window);
#endif
gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon);
@@ -274,7 +274,7 @@
#if HAVE_GTK_MULTIHEAD
root_window = gdk_screen_get_root_window (gtk_widget_get_screen (screen));
#else
- root_window = gdk_window_lookup (gdk_x11_get_default_root_xwindow ());
+ root_window = gdk_x11_window_lookup_for_display (gdk_display_get_default(), gdk_x11_get_default_root_xwindow ());
#endif
/* Add a root window filter so that we get changes on MANAGER */
--- a/fbxkb.c
+++ b/fbxkb.c
@@ -510,8 +510,7 @@
main(int argc, char *argv[], char *env[])
{
ENTER;
- setlocale(LC_CTYPE, "");
- gtk_set_locale();
+ setlocale(LC_ALL, "");
gtk_init(&argc, &argv);
XSetLocaleModifiers("");
XSetErrorHandler((XErrorHandler) Xerror_handler);
|
