[libwnck] core: Add Screen argument to _wnck_get_string_property_latin1()
- From: Vincent Untz <vuntz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libwnck] core: Add Screen argument to _wnck_get_string_property_latin1()
- Date: Thu, 20 Jan 2011 15:35:57 +0000 (UTC)
commit f8002a6afd6f527d9db7f039cccf3212deea648d
Author: Vincent Untz <vuntz gnome org>
Date: Wed Jan 19 22:42:50 2011 +0100
core: Add Screen argument to _wnck_get_string_property_latin1()
libwnck/xutils.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/libwnck/xutils.c b/libwnck/xutils.c
index 9b38163..1a0450c 100644
--- a/libwnck/xutils.c
+++ b/libwnck/xutils.c
@@ -316,9 +316,11 @@ _wnck_get_text_property (Screen *screen,
}
static char*
-_wnck_get_string_property_latin1 (Window xwindow,
+_wnck_get_string_property_latin1 (Screen *screen,
+ Window xwindow,
Atom atom)
{
+ Display *display;
Atom type;
int format;
gulong nitems;
@@ -327,9 +329,11 @@ _wnck_get_string_property_latin1 (Window xwindow,
int err, result;
char *retval;
+ display = DisplayOfScreen (screen);
+
_wnck_error_trap_push ();
str = NULL;
- result = XGetWindowProperty (_wnck_get_default_display(),
+ result = XGetWindowProperty (display,
xwindow, atom,
0, G_MAXLONG,
False, XA_STRING, &type, &format, &nitems,
@@ -1158,7 +1162,7 @@ _wnck_get_session_id (Screen *screen,
if (client_leader == None)
return NULL;
- return _wnck_get_string_property_latin1 (client_leader,
+ return _wnck_get_string_property_latin1 (screen, client_leader,
_wnck_atom_get ("SM_CLIENT_ID"));
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]