[gnome-flashback] desktop-background: fix build with clang
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-flashback] desktop-background: fix build with clang
- Date: Tue, 15 Sep 2015 13:19:04 +0000 (UTC)
commit a2c51927ae3d197a71a7d1255e1bc11f52b898ed
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Mon Sep 14 23:27:42 2015 +0300
desktop-background: fix build with clang
.../libdesktop-background/gf-desktop-background.c | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/gnome-flashback/libdesktop-background/gf-desktop-background.c
b/gnome-flashback/libdesktop-background/gf-desktop-background.c
index f29064a..7daf309 100644
--- a/gnome-flashback/libdesktop-background/gf-desktop-background.c
+++ b/gnome-flashback/libdesktop-background/gf-desktop-background.c
@@ -89,27 +89,24 @@ is_desktop_window (Display *display,
int format;
unsigned long items;
unsigned long left;
- unsigned char *data;
window_type = XInternAtom (display, "_NET_WM_WINDOW_TYPE", False);
desktop = XInternAtom (display, "_NET_WM_WINDOW_TYPE_DESKTOP", False);
result = XGetWindowProperty (display, window, window_type,
0L, 1L, False, XA_ATOM, &type, &format,
- &items, &left, &data);
+ &items, &left, (unsigned char **) &atoms);
if (result != Success)
return FALSE;
- atoms = (Atom *) data;
-
if (items && atoms[0] == desktop)
{
- XFree (data);
+ XFree (atoms);
return TRUE;
}
- XFree (data);
+ XFree (atoms);
return FALSE;
}
@@ -126,7 +123,6 @@ get_nautilus_window (GfDesktopBackground *background)
int format;
unsigned long items;
unsigned long left;
- unsigned char *list;
unsigned long i;
Window *windows;
Window nautilus;
@@ -142,7 +138,7 @@ get_nautilus_window (GfDesktopBackground *background)
result = XGetWindowProperty (xdisplay, root, client_list,
0L, 1024L, False, XA_WINDOW, &type, &format,
- &items, &left, &list);
+ &items, &left, (unsigned char **) &windows);
if (result != Success)
{
@@ -153,7 +149,6 @@ get_nautilus_window (GfDesktopBackground *background)
nautilus = None;
background_window = gtk_widget_get_window (background->background);
desktop = GDK_WINDOW_XID (background_window);
- windows = (Window *) list;
for (i = 0; i < items; i++)
{
@@ -164,7 +159,7 @@ get_nautilus_window (GfDesktopBackground *background)
}
}
- XFree (list);
+ XFree (windows);
window = NULL;
if (nautilus != None)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]