Update for libcm API change.

Fri Mar  3 15:31:04 2006  Søren Sandmann  <sandmann@redhat.com>

        * src/c-screen.c (meta_screen_info_new): Update for libcm API
        change.
This commit is contained in:
Søren Sandmann 2006-03-03 20:31:41 +00:00 committed by Søren Sandmann Pedersen
parent 832968ddd6
commit eed6f29b30
2 changed files with 8 additions and 4 deletions

View File

@ -1,3 +1,8 @@
Fri Mar 3 15:31:04 2006 Søren Sandmann <sandmann@redhat.com>
* src/c-screen.c (meta_screen_info_new): Update for libcm API
change.
Wed Mar 3 13:25:03 2006 Søren Sandmann <sandmann@redhat.com> Wed Mar 3 13:25:03 2006 Søren Sandmann <sandmann@redhat.com>
* src/compositor.c, src/c-screen.[ch]: Split the ScreenInfo data * src/compositor.c, src/c-screen.[ch]: Split the ScreenInfo data

View File

@ -17,10 +17,9 @@
* 02111-1307, USA. * 02111-1307, USA.
*/ */
#ifdef HAVE_COMPOSITOR_EXTENSIONS
#include <config.h> #include <config.h>
#ifdef HAVE_COMPOSITE_EXTENSIONS
#include <cm/ws.h> #include <cm/ws.h>
#include <cm/stacker.h> #include <cm/stacker.h>
#include <cm/wsint.h> #include <cm/wsint.h>
@ -160,7 +159,7 @@ meta_screen_info_new (WsDisplay *display,
MetaScreen *screen) MetaScreen *screen)
{ {
MetaScreenInfo *scr_info = g_new0 (MetaScreenInfo, 1); MetaScreenInfo *scr_info = g_new0 (MetaScreenInfo, 1);
WsRegion *region; WsServerRegion *region;
scr_info->screen = ws_display_get_screen_from_number ( scr_info->screen = ws_display_get_screen_from_number (
display, screen->number); display, screen->number);
@ -171,7 +170,7 @@ meta_screen_info_new (WsDisplay *display,
/* FIXME: This should probably happen in libcm */ /* FIXME: This should probably happen in libcm */
ws_window_set_override_redirect (scr_info->gl_window, TRUE); ws_window_set_override_redirect (scr_info->gl_window, TRUE);
region = ws_region_new (scr_info->display); region = ws_server_region_new (scr_info->display);
ws_window_set_input_shape (scr_info->gl_window, region); ws_window_set_input_shape (scr_info->gl_window, region);
g_object_unref (G_OBJECT (region)); g_object_unref (G_OBJECT (region));