~ubuntu-branches/ubuntu/trusty/lxappearance-obconf/trusty

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
#https://sourceforge.net/tracker/?func=detail&aid=3108205&group_id=180858&atid=894871
Index: lxappearance-obconf-0.0.1~git20101112/src/preview.h
===================================================================
--- lxappearance-obconf-0.0.1~git20101112.orig/src/preview.h	2011-02-26 21:06:49.000000000 +0100
+++ lxappearance-obconf-0.0.1~git20101112/src/preview.h	2011-02-26 21:06:52.000000000 +0100
@@ -22,7 +22,7 @@
 #include <glib.h>
 
 #include <openbox/font.h>
-#include <gdk/gdkpixbuf.h>
+#include <gdk/gdk.h>
 
 GdkPixbuf *preview_theme(const gchar *name, const gchar *titlelayout,
                          RrFont *active_window_font,
Index: lxappearance-obconf-0.0.1~git20101112/src/main.c
===================================================================
--- lxappearance-obconf-0.0.1~git20101112.orig/src/main.c	2011-02-26 21:06:49.000000000 +0100
+++ lxappearance-obconf-0.0.1~git20101112/src/main.c	2011-02-26 21:06:52.000000000 +0100
@@ -80,7 +80,7 @@
     gint ret_size;
     gulong ret_items, bytes_left;
 
-    res = XGetWindowProperty(GDK_DISPLAY(), win, prop, 0l, G_MAXLONG,
+    res = XGetWindowProperty(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), win, prop, 0l, G_MAXLONG,
                              FALSE, type, &ret_type, &ret_size,
                              &ret_items, &bytes_left, &xdata);
     if (res == Success) {
@@ -208,7 +208,7 @@
         }
     }
 
-    rrinst = RrInstanceNew(GDK_DISPLAY(), gdk_x11_get_default_screen());
+    rrinst = RrInstanceNew(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), gdk_x11_get_default_screen());
     if (!exit_with_error) {
         theme_setup_tab();
         appearance_setup_tab();
Index: lxappearance-obconf-0.0.1~git20101112/src/tree.c
===================================================================
--- lxappearance-obconf-0.0.1~git20101112.orig/src/tree.c	2011-02-26 21:06:49.000000000 +0100
+++ lxappearance-obconf-0.0.1~git20101112/src/tree.c	2011-02-26 21:06:52.000000000 +0100
@@ -113,7 +113,7 @@
 
         ce.xclient.type = ClientMessage;
         ce.xclient.message_type = gdk_x11_get_xatom_by_name("_OB_CONTROL");
-        ce.xclient.display = GDK_DISPLAY();
+        ce.xclient.display = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
         ce.xclient.window = GDK_ROOT_WINDOW();
         ce.xclient.format = 32;
         ce.xclient.data.l[0] = 1; /* reconfigure */
@@ -121,7 +121,7 @@
         ce.xclient.data.l[2] = 0;
         ce.xclient.data.l[3] = 0;
         ce.xclient.data.l[4] = 0;
-        XSendEvent(GDK_DISPLAY(), GDK_ROOT_WINDOW(), FALSE,
+        XSendEvent(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), GDK_ROOT_WINDOW(), FALSE,
                    SubstructureNotifyMask | SubstructureRedirectMask,
                    &ce);
     }