applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use BONOBO_RET_EX rather than RETURN_IF_EX; remove the definition of the

Browse source 
2001-09-28  Bradford Hovinen  <hovinen@ximian.com>

	* preferences.c (preferences_load_from_bonobo_db):
	(preferences_load_from_bonobo_pbag): Use BONOBO_RET_EX rather than
	RETURN_IF_EX; remove the definition of the latter macro

	* applier.c (fill_gradient): Copied from control center 1.4.0
	(render_background): Create the pixbuf first and then pass to
	fill_gradient
	(render_to_screen): Use XLIB_RGB_DITHER_MAX rather than
	GDK_RGB_DITHER_NORMAL
This commit is contained in:
Bradford Hovinen 2001-09-28 21:05:16 +00:00 • committed by Bradford Hovinen (Gdict maintainer)
parent 233eec9cca
commit 988e42c227
3 changed files with 30 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
capplets/background/ChangeLog
View file

@ -1,9 +1,13 @@
2001-09-28 Bradford Hovinen <hovinen@ximian.com> 2001-09-28 Bradford Hovinen <hovinen@ximian.com>
* preferences.c (preferences_load_from_bonobo_db):
(preferences_load_from_bonobo_pbag): Use BONOBO_RET_EX rather than
RETURN_IF_EX; remove the definition of the latter macro
* applier.c (fill_gradient): Copied from control center 1.4.0 * applier.c (fill_gradient): Copied from control center 1.4.0
(render_background): Create the pixbuf first and then pass to (render_background): Create the pixbuf first and then pass to
fill_gradient fill_gradient
(render_to_screen): Use GDK_RGB_DITHER_MAX rather than (render_to_screen): Use XLIB_RGB_DITHER_MAX rather than
GDK_RGB_DITHER_NORMAL GDK_RGB_DITHER_NORMAL
* Makefile.am: Change the binary name to * Makefile.am: Change the binary name to

5
capplets/background/applier.c
View file

@ -230,8 +230,7 @@ applier_class_init (ApplierClass *class)
visual = gdk_window_get_visual (GDK_ROOT_PARENT ()); visual = gdk_window_get_visual (GDK_ROOT_PARENT ());
gdk_pixbuf_xlib_init_with_depth gdk_pixbuf_xlib_init_with_depth (GDK_DISPLAY (), gdk_screen, visual->depth);
(GDK_DISPLAY (), gdk_screen, visual->depth);
} }
} }
@ -783,7 +782,7 @@ render_to_screen (Applier *applier, const Preferences *prefs)
applier->p->pixbuf_render_geom.y, applier->p->pixbuf_render_geom.y,
applier->p->pixbuf_render_geom.width, applier->p->pixbuf_render_geom.width,
applier->p->pixbuf_render_geom.height, applier->p->pixbuf_render_geom.height,
GDK_RGB_DITHER_MAX, 0, 0); XLIB_RGB_DITHER_MAX, 0, 0);
} else { } else {
if (applier->p->type == APPLIER_ROOT) { if (applier->p->type == APPLIER_ROOT) {
gdk_color_alloc (gdk_window_get_colormap (GDK_ROOT_PARENT()), prefs->color1); gdk_color_alloc (gdk_window_get_colormap (GDK_ROOT_PARENT()), prefs->color1);

41
capplets/background/preferences.c
View file

@ -33,9 +33,14 @@
#include "preferences.h" #include "preferences.h"
/* Convenience macro to abort if there is an exception set */ /* Note that there is a really bad bug in Bonobo */
#define RETURN_IF_EX(ev) if (BONOBO_EX (ev)) return #undef BONOBO_RET_EX
#define BONOBO_RET_EX(ev) \
G_STMT_START{ \
if (BONOBO_EX (ev)) \
return; \
}G_STMT_END
/* Copied from bonobo-conf bonobo-config-database.c /* Copied from bonobo-conf bonobo-config-database.c
* *
@ -233,11 +238,11 @@ preferences_load_from_bonobo_pbag (Preferences *prefs,
prefs->enabled = TRUE; prefs->enabled = TRUE;
CORBA_exception_init (ev); CORBA_exception_init (ev);
} else { } else {
RETURN_IF_EX (ev); BONOBO_RET_EX (ev);
} }
prefs->wallpaper_type = local_bonobo_property_bag_client_get_value_gulong (pb, "wallpaper_type", ev); RETURN_IF_EX (ev); prefs->wallpaper_type = local_bonobo_property_bag_client_get_value_gulong (pb, "wallpaper_type", ev); BONOBO_RET_EX (ev);
prefs->wallpaper_filename = local_bonobo_property_bag_client_get_value_filename (pb, "wallpaper_filename", ev); RETURN_IF_EX (ev); prefs->wallpaper_filename = local_bonobo_property_bag_client_get_value_filename (pb, "wallpaper_filename", ev); BONOBO_RET_EX (ev);
prefs->wallpaper_enabled = bonobo_property_bag_client_get_value_gboolean (pb, "wallpaper_enabled", ev); prefs->wallpaper_enabled = bonobo_property_bag_client_get_value_gboolean (pb, "wallpaper_enabled", ev);
@ -245,17 +250,17 @@ preferences_load_from_bonobo_pbag (Preferences *prefs,
prefs->wallpaper_enabled = (prefs->wallpaper_filename != NULL && strcmp (prefs->wallpaper_filename, "(none)")); prefs->wallpaper_enabled = (prefs->wallpaper_filename != NULL && strcmp (prefs->wallpaper_filename, "(none)"));
CORBA_exception_init (ev); CORBA_exception_init (ev);
} else { } else {
RETURN_IF_EX (ev); BONOBO_RET_EX (ev);
} }
prefs->color1 = local_bonobo_property_bag_client_get_value_color (pb, "color1", ev); RETURN_IF_EX (ev); prefs->color1 = local_bonobo_property_bag_client_get_value_color (pb, "color1", ev); BONOBO_RET_EX (ev);
prefs->color2 = local_bonobo_property_bag_client_get_value_color (pb, "color2", ev); RETURN_IF_EX (ev); prefs->color2 = local_bonobo_property_bag_client_get_value_color (pb, "color2", ev); BONOBO_RET_EX (ev);
prefs->opacity = bonobo_property_bag_client_get_value_glong (pb, "opacity", ev); RETURN_IF_EX (ev); prefs->opacity = bonobo_property_bag_client_get_value_glong (pb, "opacity", ev); BONOBO_RET_EX (ev);
if (prefs->opacity >= 100 || prefs->opacity < 0) if (prefs->opacity >= 100 || prefs->opacity < 0)
prefs->adjust_opacity = FALSE; prefs->adjust_opacity = FALSE;
prefs->orientation = local_bonobo_property_bag_client_get_value_gulong (pb, "orientation", ev); RETURN_IF_EX (ev); prefs->orientation = local_bonobo_property_bag_client_get_value_gulong (pb, "orientation", ev); BONOBO_RET_EX (ev);
if (prefs->orientation == ORIENTATION_SOLID) if (prefs->orientation == ORIENTATION_SOLID)
prefs->gradient_enabled = FALSE; prefs->gradient_enabled = FALSE;
@ -298,18 +303,18 @@ preferences_load_from_bonobo_db (Preferences *prefs,
prefs->enabled = TRUE; prefs->enabled = TRUE;
CORBA_exception_init (ev); CORBA_exception_init (ev);
} else { } else {
RETURN_IF_EX (ev); BONOBO_RET_EX (ev);
} }
prefs->orientation = bonobo_config_get_ulong (db, "/main/orientation", ev); RETURN_IF_EX (ev); prefs->orientation = bonobo_config_get_ulong (db, "/main/orientation", ev); BONOBO_RET_EX (ev);
if (prefs->orientation != ORIENTATION_SOLID) if (prefs->orientation != ORIENTATION_SOLID)
prefs->gradient_enabled = TRUE; prefs->gradient_enabled = TRUE;
else else
prefs->gradient_enabled = FALSE; prefs->gradient_enabled = FALSE;
prefs->wallpaper_type = bonobo_config_get_ulong (db, "/main/wallpaper_type", ev); RETURN_IF_EX (ev); prefs->wallpaper_type = bonobo_config_get_ulong (db, "/main/wallpaper_type", ev); BONOBO_RET_EX (ev);
prefs->wallpaper_filename = local_bonobo_config_get_filename (db, "/main/wallpaper_filename", ev); RETURN_IF_EX (ev); prefs->wallpaper_filename = local_bonobo_config_get_filename (db, "/main/wallpaper_filename", ev); BONOBO_RET_EX (ev);
prefs->wallpaper_enabled = bonobo_config_get_boolean (db, "/main/wallpaper_enabled", ev); prefs->wallpaper_enabled = bonobo_config_get_boolean (db, "/main/wallpaper_enabled", ev);
@ -317,13 +322,13 @@ preferences_load_from_bonobo_db (Preferences *prefs,
prefs->wallpaper_enabled = (prefs->wallpaper_filename != NULL && strcmp (prefs->wallpaper_filename, "(none)")); prefs->wallpaper_enabled = (prefs->wallpaper_filename != NULL && strcmp (prefs->wallpaper_filename, "(none)"));
CORBA_exception_init (ev); CORBA_exception_init (ev);
} else { } else {
RETURN_IF_EX (ev); BONOBO_RET_EX (ev);
} }
prefs->color1 = local_bonobo_config_get_color (db, "/main/color1", ev); RETURN_IF_EX (ev); prefs->color1 = local_bonobo_config_get_color (db, "/main/color1", ev); BONOBO_RET_EX (ev);
prefs->color2 = local_bonobo_config_get_color (db, "/main/color2", ev); RETURN_IF_EX (ev); prefs->color2 = local_bonobo_config_get_color (db, "/main/color2", ev); BONOBO_RET_EX (ev);
prefs->opacity = bonobo_config_get_long (db, "/main/opacity", ev); RETURN_IF_EX (ev); prefs->opacity = bonobo_config_get_long (db, "/main/opacity", ev); BONOBO_RET_EX (ev);
if (prefs->opacity >= 100 || prefs->opacity < 0) if (prefs->opacity >= 100 || prefs->opacity < 0)
prefs->adjust_opacity = FALSE; prefs->adjust_opacity = FALSE;