Attachment #175608 for bug #310273

View | Details | Raw Unified | Return to bug 310273
Collapse All | Expand All




++ applets/brightness/brightness-applet.c

{
	GError  *error = NULL;
	gboolean ret;
	int policy_brightness;

	if (applet->proxy == NULL) {
		printf ("WARNING: not connected\n");

		g_error_free (error);
	}
	if (ret == TRUE) {
		applet->level = (guint)policy_brightness;
	} else {
		/* abort as the DBUS method failed */
		printf ("WARNING: GetBrightness failed!\n");
++ libhal-glib/libhal-gpower.c

	ret = dbus_g_proxy_call (proxy, "SetPowerSave", &error,
				 G_TYPE_BOOLEAN, enable,
				 G_TYPE_INVALID,
				 G_TYPE_INT, &retval,
				 G_TYPE_INVALID);
	if (retval != 0) {
		g_warning ("SetPowerSave failed in a horrible way!");
++ src/gpm-brightness-lcd.c


	ret = dbus_g_proxy_call (proxy, "GetBrightness", &error,
				 G_TYPE_INVALID,
				 G_TYPE_INT, &level,
				 G_TYPE_INVALID);

	if (brightness_level_hw != NULL) {

	ret = dbus_g_proxy_call (proxy, "SetBrightness", &error,
				 G_TYPE_INT, (int)brightness_level_hw,
				 G_TYPE_INVALID,
				 G_TYPE_INT, &retval,
				 G_TYPE_INVALID);
	/* retval is ignored, the HAL API is broken... */


Return to bug 310273

Line Link Here

(-)file_not_specified_in_diff (-8 / +8 lines)
0	-- applets/brightness/brightness-applet.c	0	++ applets/brightness/brightness-applet.c
Lines 117-123 Link Here
117	{	117	{
118	GError *error = NULL;	118	GError *error = NULL;
119	gboolean ret;	119	gboolean ret;
120	guint policy_brightness;	120	int policy_brightness;
121		121
122	if (applet->proxy == NULL) {	122	if (applet->proxy == NULL) {
123	printf ("WARNING: not connected\n");	123	printf ("WARNING: not connected\n");
Lines 133-139 Link Here
133	g_error_free (error);	133	g_error_free (error);
134	}	134	}
135	if (ret == TRUE) {	135	if (ret == TRUE) {
136	applet->level = policy_brightness;	136	applet->level = (guint)policy_brightness;
137	} else {	137	} else {
138	/* abort as the DBUS method failed */	138	/* abort as the DBUS method failed */
139	printf ("WARNING: GetBrightness failed!\n");	139	printf ("WARNING: GetBrightness failed!\n");
140	-- libhal-glib/libhal-gpower.c	140	++ libhal-glib/libhal-gpower.c
Lines 382-388 Link Here
382	ret = dbus_g_proxy_call (proxy, "SetPowerSave", &error,	382	ret = dbus_g_proxy_call (proxy, "SetPowerSave", &error,
383	G_TYPE_BOOLEAN, enable,	383	G_TYPE_BOOLEAN, enable,
384	G_TYPE_INVALID,	384	G_TYPE_INVALID,
385	G_TYPE_UINT, &retval,	385	G_TYPE_INT, &retval,
386	G_TYPE_INVALID);	386	G_TYPE_INVALID);
387	if (retval != 0) {	387	if (retval != 0) {
388	g_warning ("SetPowerSave failed in a horrible way!");	388	g_warning ("SetPowerSave failed in a horrible way!");
389	-- src/gpm-brightness-lcd.c	389	++ src/gpm-brightness-lcd.c
Lines 97-103 Link Here
97		97
98	ret = dbus_g_proxy_call (proxy, "GetBrightness", &error,	98	ret = dbus_g_proxy_call (proxy, "GetBrightness", &error,
99	G_TYPE_INVALID,	99	G_TYPE_INVALID,
100	G_TYPE_UINT, &level,	100	G_TYPE_INT, &level,
101	G_TYPE_INVALID);	101	G_TYPE_INVALID);
102		102
103	if (brightness_level_hw != NULL) {	103	if (brightness_level_hw != NULL) {
Lines 157-163 Link Here
157	ret = dbus_g_proxy_call (proxy, "SetBrightness", &error,	157	ret = dbus_g_proxy_call (proxy, "SetBrightness", &error,
158	G_TYPE_INT, (int)brightness_level_hw,	158	G_TYPE_INT, (int)brightness_level_hw,
159	G_TYPE_INVALID,	159	G_TYPE_INVALID,
160	G_TYPE_UINT, &retval,	160	G_TYPE_INT, &retval,
161	G_TYPE_INVALID);	161	G_TYPE_INVALID);
162	/* retval is ignored, the HAL API is broken... */	162	/* retval is ignored, the HAL API is broken... */
163		163