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
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
|
From 30e3d45437b4285818ec016905151390c9604441 Mon Sep 17 00:00:00 2001
From: ShadowKyogre <shadowkyogre@aim.com>
Date: Fri, 05 Nov 2010 01:53:24 +0000
Subject: Fix deprecated symbols and incorrect decoration property setting
---
diff --git a/src/main.c b/src/main.c
index 5f0ec35..150da99 100644
--- a/src/main.c
+++ b/src/main.c
@@ -27,8 +27,8 @@
#include <emerald.h>
#include <engine.h>
-#define BASE_PROP_SIZE 12
-#define QUAD_PROP_SIZE 9
+//#define BASE_PROP_SIZE 12
+//#define QUAD_PROP_SIZE 9
#ifndef DECOR_INTERFACE_VERSION
#define DECOR_INTERFACE_VERSION 0
@@ -2457,7 +2457,7 @@ static gboolean get_window_prop(Window xwindow, Atom atom, Window * val)
gdk_error_trap_push();
type = None;
- result = XGetWindowProperty(gdk_display,
+ result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
xwindow,
atom,
0, G_MAXLONG,
@@ -4246,10 +4246,10 @@ static void force_quit_dialog_realize(GtkWidget * dialog, void *data)
WnckWindow *win = data;
gdk_error_trap_push();
- XSetTransientForHint(gdk_display,
+ XSetTransientForHint(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
GDK_WINDOW_XID(dialog->window),
wnck_window_get_xid(win));
- XSync(gdk_display, FALSE);
+ XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
gdk_error_trap_pop();
}
@@ -4262,11 +4262,11 @@ static char *get_client_machine(Window xwindow)
int format, result;
char *retval;
- atom = XInternAtom(gdk_display, "WM_CLIENT_MACHINE", FALSE);
+ atom = XInternAtom(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLIENT_MACHINE", FALSE);
gdk_error_trap_push();
- result = XGetWindowProperty(gdk_display,
+ result = XGetWindowProperty(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
xwindow, atom,
0, G_MAXLONG,
FALSE, XA_STRING, &type, &format, &nitems,
@@ -4318,8 +4318,8 @@ static void kill_window(WnckWindow * win)
}
gdk_error_trap_push();
- XKillClient(gdk_display, wnck_window_get_xid(win));
- XSync(gdk_display, FALSE);
+ XKillClient(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wnck_window_get_xid(win));
+ XSync(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
gdk_error_trap_pop();
}
@@ -4739,7 +4739,7 @@ static XFixed *create_gaussian_kernel(double radius,
static int update_shadow(frame_settings * fs)
{
- Display *xdisplay = gdk_display;
+ Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
XRenderPictFormat *format;
GdkPixmap *pixmap;
Picture src, dst, tmp;
--
cgit v0.8.3.1-30-gff3a
--- a/src/main.c.old 2010-12-07 19:56:08.633333370 +0100
+++ a/src/main.c 2010-12-07 19:56:39.273333379 +0100
@@ -3757,7 +3757,7 @@
static void hide_tooltip(void)
{
- if (GTK_WIDGET_VISIBLE(tip_window))
+ if (gtk_widget_get_visible (tip_window))
g_get_current_time(&tooltip_last_popdown);
gtk_widget_hide(tip_window);
--- emerald-0.8.4/libengine/themer.c 2009-10-13 20:56:23.000000000 -0400
+++ emerald-0.8.4.new/libengine/themer.c 2010-03-10
01:20:03.046827674 -0500
@@ -461,7 +461,7 @@
}
gdouble get_float(SettingItem * item)
{
- if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
+ if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
return gtk_spin_button_get_value((GtkSpinButton *)item->widget);
}
else {
@@ -647,7 +647,7 @@
}
void set_float(SettingItem * item, gdouble f)
{
- if(!strcmp(GTK_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
+ if(!strcmp(G_OBJECT_TYPE_NAME(item->widget),"GtkSpinButton")) {
gtk_spin_button_set_value((GtkSpinButton *)item->widget, f);
}
else {
|
