Partial compilation fix for Gtk+ 3.0

This commit is contained in:
Pierre Pronchery 2012-01-03 07:41:13 +00:00
parent 9378dede80
commit f02cb115ac

View File

@ -133,8 +133,8 @@ typedef enum _DesktopHows
/* constants */
#define DESKTOP ".desktop"
#define DESKTOPRC ".desktoprc"
#define DESKTOP ".desktop"
#define DESKTOPRC ".desktoprc"
static const char * _desktop_hows[DESKTOP_HOW_COUNT] =
{
@ -197,7 +197,6 @@ static GdkFilterReturn _on_root_event(GdkXEvent * xevent, GdkEvent * event,
Desktop * desktop_new(DesktopPrefs * prefs)
{
Desktop * desktop;
gint depth;
if((desktop = object_new(sizeof(*desktop))) == NULL)
return NULL;
@ -221,9 +220,10 @@ Desktop * desktop_new(DesktopPrefs * prefs)
desktop->home = "/";
desktop_message_register(DESKTOP_CLIENT_MESSAGE, _on_message, desktop);
/* manage root window events */
gdk_window_get_geometry(desktop->root, &desktop->window.x,
&desktop->window.y, &desktop->window.width,
&desktop->window.height, &depth);
gdk_window_get_position(desktop->root, &desktop->window.x,
&desktop->window.y);
desktop->window.width = gdk_window_get_width(desktop->root);
desktop->window.height = gdk_window_get_height(desktop->root);
gdk_window_set_events(desktop->root, gdk_window_get_events(
desktop->root) | GDK_BUTTON_PRESS_MASK
| GDK_PROPERTY_CHANGE_MASK);
@ -1437,7 +1437,7 @@ static int _desktop_get_workarea(Desktop * desktop)
}
atom = gdk_x11_get_xatom_by_name("_NET_WORKAREA");
if(XGetWindowProperty(GDK_DISPLAY_XDISPLAY(desktop->display),
GDK_WINDOW_XWINDOW(desktop->root), atom, 0,
GDK_WINDOW_XID(desktop->root), atom, 0,
G_MAXLONG, False, XA_CARDINAL, &type, &format,
&cnt, &bytes, &p) == Success && cnt >= 4)
{