Use BONOBO_RET_EX rather than RETURN_IF_EX; remove the definition of the

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

3 files changed, 30 insertions, 22 deletions

diff --git a/capplets/background/ChangeLog b/capplets/background/ChangeLog
index eec4cc3e5..5e5991b8f 100644
--- a/capplets/background/ChangeLog
+++ b/capplets/background/ChangeLog
@@ -1,9 +1,13 @@
 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 GDK_RGB_DITHER_MAX rather than
+	(render_to_screen): Use XLIB_RGB_DITHER_MAX rather than
 	GDK_RGB_DITHER_NORMAL
 
 	* Makefile.am: Change the binary name to
diff --git a/capplets/background/applier.c b/capplets/background/applier.c
index c9dd09744..ad008de3c 100644
--- a/capplets/background/applier.c
+++ b/capplets/background/applier.c
@@ -230,8 +230,7 @@ applier_class_init (ApplierClass *class)
 
 		visual = gdk_window_get_visual (GDK_ROOT_PARENT ());
 
-		gdk_pixbuf_xlib_init_with_depth
-			(GDK_DISPLAY (), gdk_screen, visual->depth);
+		gdk_pixbuf_xlib_init_with_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.width,
 			 applier->p->pixbuf_render_geom.height,
-			 GDK_RGB_DITHER_MAX, 0, 0);
+			 XLIB_RGB_DITHER_MAX, 0, 0);
 	} else {
 		if (applier->p->type == APPLIER_ROOT) {
 			gdk_color_alloc (gdk_window_get_colormap (GDK_ROOT_PARENT()), prefs->color1);
diff --git a/capplets/background/preferences.c b/capplets/background/preferences.c
index 63ad35679..cac931ce8 100644
--- a/capplets/background/preferences.c
+++ b/capplets/background/preferences.c
@@ -33,9 +33,14 @@
 
 #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
  *
@@ -233,11 +238,11 @@ preferences_load_from_bonobo_pbag (Preferences        *prefs,
 		prefs->enabled = TRUE;
 		CORBA_exception_init (ev);
 	} 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_filename = local_bonobo_property_bag_client_get_value_filename (pb, "wallpaper_filename", 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); BONOBO_RET_EX (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)"));
 		CORBA_exception_init (ev);
 	} 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->color2 = local_bonobo_property_bag_client_get_value_color (pb, "color2", 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); 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)
 		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)
 		prefs->gradient_enabled = FALSE;
@@ -298,18 +303,18 @@ preferences_load_from_bonobo_db (Preferences           *prefs,
 		prefs->enabled = TRUE;
 		CORBA_exception_init (ev);
 	} 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)
 		prefs->gradient_enabled = TRUE;
 	else
 		prefs->gradient_enabled = FALSE;
 
-	prefs->wallpaper_type = bonobo_config_get_ulong (db, "/main/wallpaper_type", ev); RETURN_IF_EX (ev);
-	prefs->wallpaper_filename = local_bonobo_config_get_filename (db, "/main/wallpaper_filename", 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); BONOBO_RET_EX (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)"));
 		CORBA_exception_init (ev);
 	} 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->color2 = local_bonobo_config_get_color (db, "/main/color2", 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); 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)
 		prefs->adjust_opacity = FALSE;