Attachment #203829 for bug #262270

Lines 171-176 PKG_CHECK_MODULES(XRANDR, [ Link Here

(-)a/configure.ac (+4 lines)
171	AC_SUBST(XRANDR_CFLAGS)	171	AC_SUBST(XRANDR_CFLAGS)
172	AC_SUBST(XRANDR_LIBS)	172	AC_SUBST(XRANDR_LIBS)
173		173
		174	PKG_CHECK_EXISTS(
		175	[xrandr >= 1.3],
		176	[AC_DEFINE(HAVE_XRANDR_13, 1, [xrandr 1.3 available])])
		177
174	PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)	178	PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
175	AC_SUBST(LIBNOTIFY_CFLAGS)	179	AC_SUBST(LIBNOTIFY_CFLAGS)
176	AC_SUBST(LIBNOTIFY_LIBS)	180	AC_SUBST(LIBNOTIFY_LIBS)




	Display			*dpy;
	guint			 shared_value;
	gboolean		 has_extension;
#ifdef HAVE_XRANDR_13
	gboolean		 has_randr13;
#endif
	gboolean		 hw_changed;

	return TRUE;
}

#ifdef HAVE_XRANDR_13
/**
 * gpm_brightness_xrandr_setup_version: Check whether xserver really supports xrandr-1.3 features.
 **/

		   in RandR 1.3 or higher and of course xserver needs
		   to support it.
		*/
#ifdef HAVE_XRANDR_13
		if (brightness->priv->has_randr13)
			resource = XRRGetScreenResourcesCurrent (brightness->priv->dpy, root);
		else
			resource = XRRGetScreenResources (brightness->priv->dpy, root);
#else
		resource = XRRGetScreenResources (brightness->priv->dpy, root);
#endif
			resource = XRRGetScreenResources (brightness->priv->dpy, root);

		if (resource != NULL) {
			egg_debug ("adding resource %p", resource);
			g_ptr_array_add (brightness->priv->resources, resource);

		egg_debug ("no XRANDR extension, so aborting init");
		return;
	}
#ifdef HAVE_XRANDR_13
	brightness->priv->has_randr13 = gpm_brightness_xrandr_setup_version (brightness);
#endif

- 

Return to bug 262270

Lines 60-66 struct GpmBrightnessXRandRPrivate Link Here

(-)a/src/gpm-brightness-xrandr.c (-8 / +6 lines)
60	Display *dpy;	60	Display *dpy;
61	guint shared_value;	61	guint shared_value;
62	gboolean has_extension;	62	gboolean has_extension;
63	#if (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)	63	#ifdef HAVE_XRANDR_13
64	gboolean has_randr13;	64	gboolean has_randr13;
65	#endif	65	#endif
66	gboolean hw_changed;	66	gboolean hw_changed;
Lines 173-179 gpm_brightness_xrandr_setup_display (GpmBrightnessXRandR *brightness) Link Here
173	return TRUE;	173	return TRUE;
174	}	174	}
175		175
176	#if (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)	176	#ifdef HAVE_XRANDR_13
177	/**	177	/**
178	* gpm_brightness_xrandr_setup_version: Check whether xserver really supports xrandr-1.3 features.	178	* gpm_brightness_xrandr_setup_version: Check whether xserver really supports xrandr-1.3 features.
179	**/	179	**/
Lines 650-663 gpm_brightness_xrandr_update_cache (GpmBrightnessXRandR *brightness) Link Here
650	in RandR 1.3 or higher and of course xserver needs	650	in RandR 1.3 or higher and of course xserver needs
651	to support it.	651	to support it.
652	*/	652	*/
653	#if (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)	653	#ifdef HAVE_XRANDR_13
654	if (brightness->priv->has_randr13)	654	if (brightness->priv->has_randr13)
655	resource = XRRGetScreenResourcesCurrent (brightness->priv->dpy, root);	655	resource = XRRGetScreenResourcesCurrent (brightness->priv->dpy, root);
656	else	656	else
657	resource = XRRGetScreenResources (brightness->priv->dpy, root);
658	#else
659	resource = XRRGetScreenResources (brightness->priv->dpy, root);
660	#endif	657	#endif
		658	resource = XRRGetScreenResources (brightness->priv->dpy, root);
		659
661	if (resource != NULL) {	660	if (resource != NULL) {
662	egg_debug ("adding resource %p", resource);	661	egg_debug ("adding resource %p", resource);
663	g_ptr_array_add (brightness->priv->resources, resource);	662	g_ptr_array_add (brightness->priv->resources, resource);
Lines 724-730 gpm_brightness_xrandr_init (GpmBrightnessXRandR *brightness) Link Here
724	egg_debug ("no XRANDR extension, so aborting init");	723	egg_debug ("no XRANDR extension, so aborting init");
725	return;	724	return;
726	}	725	}
727	#if (RANDR_MAJOR == 1 && RANDR_MINOR >= 3)	726	#ifdef HAVE_XRANDR_13
728	brightness->priv->has_randr13 = gpm_brightness_xrandr_setup_version (brightness);	727	brightness->priv->has_randr13 = gpm_brightness_xrandr_setup_version (brightness);
729	#endif	728	#endif
730		729
731	-