[PATCH] Revert prototype change for sn_launchee_context_setup_window()

Julien Cristau jcristau at debian.org
Sat May 14 18:41:50 UTC 2011


A window is 32bit on the wire, but Xlib's Window is an unsigned long,
whereas xcb_window_t is uint32_t, so that change in
1f8260481453cd7632225a3a2ae9c4b090d25241 broke ABI.  Revert back to
using Window in the public API.

Signed-off-by: Julien Cristau <jcristau at debian.org>
---
 libsn/sn-launchee.c |    4 ++--
 libsn/sn-launchee.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libsn/sn-launchee.c b/libsn/sn-launchee.c
index c7aae1f..eed6cef 100644
--- a/libsn/sn-launchee.c
+++ b/libsn/sn-launchee.c
@@ -217,10 +217,10 @@ sn_launchee_context_complete (SnLauncheeContext *context)
  **/
 void
 sn_launchee_context_setup_window (SnLauncheeContext *context,
-                                  xcb_window_t       xwindow)
+                                  Window             xwindow)
 {
   sn_internal_set_utf8_string (context->display,
-                               xwindow,
+                               (xcb_window_t)xwindow,
                                sn_internal_get_net_startup_id_atom(context->display),
                                context->startup_id);
 }
diff --git a/libsn/sn-launchee.h b/libsn/sn-launchee.h
index 3f694d5..a04d0ec 100644
--- a/libsn/sn-launchee.h
+++ b/libsn/sn-launchee.h
@@ -45,7 +45,7 @@ int                sn_launchee_context_get_id_has_timestamp (SnLauncheeContext *
 Time               sn_launchee_context_get_timestamp        (SnLauncheeContext *context);
 void               sn_launchee_context_complete             (SnLauncheeContext *context);
 void               sn_launchee_context_setup_window         (SnLauncheeContext *context,
-                                                             xcb_window_t       xwindow);
+                                                             Window             xwindow);
 
 SN_END_DECLS
 
-- 
1.7.2.5


--9ToWwKEyhugL+MAz--






More information about the pkg-gnome-maintainers mailing list