From b430e6322ee11c0e8de073d8532ff36793d49cf9 Mon Sep 17 00:00:00 2001 From: Eric Koegel Date: Sat, 28 Mar 2015 10:10:37 +0300 Subject: [PATCH 2/2] Fix a couple build warnings This just fixes a couple build warnings when compiling xfpm from git master with gcc. compositorHandleRandrNotify isn't called anymore so drop the dead code it was removed in: commit 8fbff6 but got added with the Merge branch 'scale-cursor' commit, bc0355. --- src/client.c | 1 - src/compositor.c | 22 +--------------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/src/client.c b/src/client.c index e3054f5..5eb3a05 100644 --- a/src/client.c +++ b/src/client.c @@ -3414,7 +3414,6 @@ clientTile (Client *c, gint cx, gint cy, tilePositionType tile, gboolean send_co XWindowChanges wc; GdkRectangle rect; unsigned long old_flags; - int mode; g_return_val_if_fail (c != NULL, FALSE); diff --git a/src/compositor.c b/src/compositor.c index ffa9c86..ef0a882 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -1353,7 +1353,7 @@ vblank_init(ScreenInfo *screen_info) version = epoxy_glx_version (myScreenGetXDisplay (screen_info), screen_info->screen); if (version < 13) { - g_warning ("GLX version %d is too old, vsync disabled."); + g_warning ("GLX version %d is too old, vsync disabled.", version); return FALSE; } @@ -1436,7 +1436,6 @@ static void wait_vblank (ScreenInfo *screen_info) { guint32 current_count; - GLXDrawable drawable; if (screen_info->has_glx_sync_control) { @@ -2916,25 +2915,6 @@ compositorHandleCursorNotify (DisplayInfo *display_info, XFixesCursorNotifyEvent } } -#ifdef HAVE_RANDR -static void -compositorHandleRandrNotify (DisplayInfo *display_info, XRRScreenChangeNotifyEvent *ev) -{ - ScreenInfo *screen_info; - - g_return_if_fail (display_info != NULL); - g_return_if_fail (ev != NULL); - TRACE ("entering compositorHandleRandrNotify for 0x%lx", ev->window); - - screen_info = myDisplayGetScreenFromRoot (display_info, ev->window); - if (screen_info) - { - get_refresh_rate (screen_info); - } - /* No need for RRUpdateConfiguration() here, leave that to gtk+ */ -} -#endif /* HAVE_RANDR */ - static gboolean compositorCheckCMSelection (ScreenInfo *screen_info) { -- 2.3.4