eel r2098 - in trunk: . eel
- From: cneumair svn gnome org
- To: svn-commits-list gnome org
- Subject: eel r2098 - in trunk: . eel
- Date: Fri, 28 Mar 2008 14:30:43 +0000 (GMT)
Author: cneumair
Date: Fri Mar 28 14:30:43 2008
New Revision: 2098
URL: http://svn.gnome.org/viewvc/eel?rev=2098&view=rev
Log:
2008-03-28 Christian Neumair <cneumair gnome org>
* eel/eel-accessibility.h:
* eel/eel-background.c (eel_background_set_image_uri_helper),
(eel_background_is_set):
* eel/eel-canvas-rect-ellipse.c (eel_canvas_re_destroy),
(eel_canvas_re_set_property), (eel_canvas_re_get_property):
* eel/eel-canvas.c (eel_canvas_item_set_property),
(eel_canvas_item_get_property), (eel_canvas_item_dispose),
(eel_canvas_item_invoke_update), (eel_canvas_group_set_property),
(eel_canvas_group_get_property), (eel_canvas_group_destroy),
(group_remove), (eel_canvas_accessible_get_n_children),
(eel_canvas_accessible_ref_child), (eel_canvas_accessible_create),
(eel_canvas_accessible_factory_create_accessible),
(eel_canvas_destroy), (eel_canvas_map), (eel_canvas_unmap),
(eel_canvas_realize), (eel_canvas_unrealize),
(eel_canvas_size_allocate), (eel_canvas_button),
(eel_canvas_motion), (eel_canvas_key), (eel_canvas_crossing),
(eel_canvas_expose), (do_update),
(eel_canvas_item_accessible_get_extents),
(eel_canvas_item_accessible_get_mdi_zorder),
(eel_canvas_item_accessible_component_interface_init),
(eel_canvas_item_accessible_create),
(eel_canvas_item_accessible_factory_create_accessible):
* eel/eel-debug-drawing.c (debug_pixbuf_viewer_size_request),
(debug_pixbuf_viewer_expose_event),
(debug_pixbuf_viewer_set_pixbuf):
* eel/eel-editable-label.c (add_move_binding),
(eel_editable_label_finalize), (eel_editable_label_size_request),
(eel_editable_label_style_set), (_eel_draw_insertion_cursor),
(eel_editable_label_expose),
(eel_editable_label_select_region_index), (popup_position_func),
(atk_text_interface_init), (atk_editable_text_interface_init),
(eel_editable_label_accessible_get_name):
* eel/eel-enumeration.c (eel_enumeration_new),
(eel_enumeration_new_from_entries):
* eel/eel-gconf-extensions.c (simple_value_is_equal):
* eel/eel-gdk-extensions.c (eel_gradient_new),
(eel_gradient_set_edge_color), (eel_gradient_set_left_color_spec),
(eel_gradient_set_top_color_spec),
(eel_gradient_set_right_color_spec),
(eel_gradient_set_bottom_color_spec),
(eel_gdk_color_parse_with_white_default):
* eel/eel-gdk-pixbuf-extensions.c (pixbuf_destroy_callback):
* eel/eel-graphic-effects.c (create_new_pixbuf),
(create_new_pixbuf_with_alpha):
* eel/eel-gtk-extensions.c (while_realized_disconnecter):
* eel/eel-image-table.c (eel_image_table_realize),
(eel_image_table_unrealize), (eel_image_table_remove),
(image_table_emit_signal), (image_table_handle_motion),
(ancestor_enter_notify_event), (ancestor_leave_notify_event),
(ancestor_motion_notify_event), (ancestor_button_press_event),
(ancestor_button_release_event):
* eel/eel-labeled-image.c (eel_labeled_image_set_property),
(eel_labeled_image_get_property), (eel_labeled_image_size_request),
(eel_labeled_image_size_allocate),
(eel_labeled_image_expose_event), (eel_labeled_image_map),
(eel_labeled_image_unmap), (eel_labeled_image_add),
(eel_labeled_image_remove), (eel_labeled_image_forall),
(labeled_image_get_image_dimensions),
(labeled_image_get_label_dimensions),
(labeled_image_get_image_bounds_fill),
(labeled_image_get_label_bounds_fill),
(labeled_image_update_alignments),
(labeled_image_get_content_dimensions),
(labeled_image_get_content_bounds), (labeled_image_ensure_label),
(labeled_image_ensure_image), (labeled_image_show_image),
(labeled_image_show_label), (eel_labled_set_mnemonic_widget),
(button_leave_callback), (button_focus_out_event_callback):
* eel/eel-preferences.c (preferences_gconf_value_get_int),
(preferences_gconf_value_get_bool),
(preferences_gconf_value_get_string),
(preferences_gconf_value_get_string_array),
(preferences_peek_storage_path), (preferences_set_storage_path),
(preferences_get_value), (preferences_preference_is_gconf_key),
(preferences_key_make), (preferences_get_default_value),
(eel_preferences_get_is_invisible), (string_array_is_valid),
(preferences_callback_entry_invoke_function),
(preferences_entry_invoke_callbacks), (update_auto_string),
(update_auto_string_array), (update_auto_integer_or_boolean),
(preferences_something_changed_notice),
(preferences_entry_ensure_gconf_connection),
(preferences_entry_add_callback),
(preferences_entry_add_auto_storage),
(preferences_entry_remove_callback),
(preferences_entry_remove_auto_storage),
(preferences_callback_entry_free),
(preferences_callback_entry_free_func), (preferences_entry_free),
(preferences_global_table_lookup),
(preferences_global_table_insert),
(preferences_global_table_lookup_or_insert),
(preferences_set_emergency_fallback_stealing_value):
* eel/eel-wrap-table.c (eel_wrap_table_set_property),
(eel_wrap_table_get_property), (eel_wrap_table_size_request),
(eel_wrap_table_size_allocate), (eel_wrap_table_expose_event),
(eel_wrap_table_map), (eel_wrap_table_unmap),
(eel_wrap_table_realize), (eel_wrap_table_add),
(eel_wrap_table_remove), (eel_wrap_table_forall),
(wrap_table_get_num_fitting), (wrap_table_layout),
(wrap_table_irect_max_dimensions),
(wrap_table_get_max_child_dimensions),
(wrap_table_get_content_dimensions),
(wrap_table_get_content_bounds), (wrap_table_child_focus_in):
g_assert() in static functions instead of using
g_return(_val)_if_fail() (#320246). Thanks to Aaditya Sood.
Modified:
trunk/ChangeLog
trunk/eel/eel-accessibility.h
trunk/eel/eel-background.c
trunk/eel/eel-canvas-rect-ellipse.c
trunk/eel/eel-canvas.c
trunk/eel/eel-debug-drawing.c
trunk/eel/eel-editable-label.c
trunk/eel/eel-enumeration.c
trunk/eel/eel-gconf-extensions.c
trunk/eel/eel-gdk-extensions.c
trunk/eel/eel-gdk-pixbuf-extensions.c
trunk/eel/eel-graphic-effects.c
trunk/eel/eel-gtk-extensions.c
trunk/eel/eel-image-table.c
trunk/eel/eel-labeled-image.c
trunk/eel/eel-preferences.c
trunk/eel/eel-wrap-table.c
Modified: trunk/eel/eel-accessibility.h
==============================================================================
--- trunk/eel/eel-accessibility.h (original)
+++ trunk/eel/eel-accessibility.h Fri Mar 28 14:30:43 2008
@@ -108,7 +108,7 @@
{ \
AtkObject *accessible; \
\
- g_return_val_if_fail (G_IS_OBJECT (obj), NULL); \
+ g_assert (G_IS_OBJECT (obj)); \
\
accessible = opt_create_accessible (obj); \
\
Modified: trunk/eel/eel-background.c
==============================================================================
--- trunk/eel/eel-background.c (original)
+++ trunk/eel/eel-background.c Fri Mar 28 14:30:43 2008
@@ -583,7 +583,7 @@
GFile *f;
GFileInfo *info;
- g_return_val_if_fail (EEL_IS_BACKGROUND (background), FALSE);
+ g_assert (EEL_IS_BACKGROUND (background));
mtime = background->details->image_mtime;
if (image_uri != NULL) {
@@ -683,7 +683,7 @@
gboolean
eel_background_is_set (EelBackground *background)
{
- g_return_val_if_fail (EEL_IS_BACKGROUND (background), FALSE);
+ g_assert (EEL_IS_BACKGROUND (background));
return background->details->color != NULL
|| background->details->image_uri != NULL;
Modified: trunk/eel/eel-canvas-rect-ellipse.c
==============================================================================
--- trunk/eel/eel-canvas-rect-ellipse.c (original)
+++ trunk/eel/eel-canvas-rect-ellipse.c Fri Mar 28 14:30:43 2008
@@ -249,8 +249,8 @@
{
EelCanvasRE *re;
- g_return_if_fail (object != NULL);
- g_return_if_fail (EEL_IS_CANVAS_RE (object));
+ g_assert (object != NULL);
+ g_assert (EEL_IS_CANVAS_RE (object));
re = EEL_CANVAS_RE (object);
@@ -388,8 +388,8 @@
GdkColor *pcolor;
int have_pixel;
- g_return_if_fail (object != NULL);
- g_return_if_fail (EEL_IS_CANVAS_RE (object));
+ g_assert (object != NULL);
+ g_assert (EEL_IS_CANVAS_RE (object));
item = EEL_CANVAS_ITEM (object);
re = EEL_CANVAS_RE (object);
@@ -583,8 +583,8 @@
{
EelCanvasRE *re;
- g_return_if_fail (object != NULL);
- g_return_if_fail (EEL_IS_CANVAS_RE (object));
+ g_assert (object != NULL);
+ g_assert (EEL_IS_CANVAS_RE (object));
re = EEL_CANVAS_RE (object);
Modified: trunk/eel/eel-canvas.c
==============================================================================
--- trunk/eel/eel-canvas.c (original)
+++ trunk/eel/eel-canvas.c Fri Mar 28 14:30:43 2008
@@ -208,7 +208,7 @@
{
EelCanvasItem *item;
- g_return_if_fail (EEL_IS_CANVAS_ITEM (gobject));
+ g_assert (EEL_IS_CANVAS_ITEM (gobject));
item = EEL_CANVAS_ITEM (gobject);
@@ -243,7 +243,7 @@
{
EelCanvasItem *item;
- g_return_if_fail (EEL_IS_CANVAS_ITEM (gobject));
+ g_assert (EEL_IS_CANVAS_ITEM (gobject));
item = EEL_CANVAS_ITEM (gobject);
@@ -298,7 +298,7 @@
{
EelCanvasItem *item;
- g_return_if_fail (EEL_IS_CANVAS_ITEM (object));
+ g_assert (EEL_IS_CANVAS_ITEM (object));
item = EEL_CANVAS_ITEM (object);
@@ -425,7 +425,7 @@
/* If this fail you probably forgot to chain up to
* EelCanvasItem::update from a derived class */
- g_return_if_fail (!(item->object.flags & EEL_CANVAS_ITEM_NEED_UPDATE));
+ g_assert (!(item->object.flags & EEL_CANVAS_ITEM_NEED_UPDATE));
}
/*
@@ -1261,7 +1261,7 @@
double old;
gboolean moved;
- g_return_if_fail (EEL_IS_CANVAS_GROUP (gobject));
+ g_assert (EEL_IS_CANVAS_GROUP (gobject));
item = EEL_CANVAS_ITEM (gobject);
group = EEL_CANVAS_GROUP (gobject);
@@ -1303,7 +1303,7 @@
{
EelCanvasGroup *group;
- g_return_if_fail (EEL_IS_CANVAS_GROUP (gobject));
+ g_assert (EEL_IS_CANVAS_GROUP (gobject));
group = EEL_CANVAS_GROUP (gobject);
@@ -1330,7 +1330,7 @@
EelCanvasItem *child;
GList *list;
- g_return_if_fail (EEL_IS_CANVAS_GROUP (object));
+ g_assert (EEL_IS_CANVAS_GROUP (object));
group = EEL_CANVAS_GROUP (object);
@@ -1658,8 +1658,8 @@
{
GList *children;
- g_return_if_fail (EEL_IS_CANVAS_GROUP (group));
- g_return_if_fail (EEL_IS_CANVAS_ITEM (item));
+ g_assert (EEL_IS_CANVAS_GROUP (group));
+ g_assert (EEL_IS_CANVAS_ITEM (item));
for (children = group->item_list; children; children = children->next)
if (children->data == item) {
@@ -1839,11 +1839,11 @@
return 0;
}
- g_return_val_if_fail (EEL_IS_CANVAS (widget), 0);
+ g_assert (EEL_IS_CANVAS (widget));
canvas = EEL_CANVAS (widget);
root_group = eel_canvas_root (canvas);
- g_return_val_if_fail (root_group, 0);
+ g_assert (root_group != NULL);
return 1;
}
@@ -1871,7 +1871,7 @@
canvas = EEL_CANVAS (widget);
root_group = eel_canvas_root (canvas);
- g_return_val_if_fail (root_group, NULL);
+ g_assert (root_group != NULL);
atk_object = atk_gobject_accessible_for_object (G_OBJECT (root_group));
g_object_ref (atk_object);
@@ -1929,7 +1929,7 @@
EelCanvas *canvas;
canvas = EEL_CANVAS (for_object);
- g_return_val_if_fail (canvas != NULL, NULL);
+ g_assert (canvas != NULL);
type = eel_canvas_accessible_get_type ();
@@ -1953,7 +1953,7 @@
{
AtkObject *accessible;
- g_return_val_if_fail (G_IS_OBJECT (obj), NULL);
+ g_assert (G_IS_OBJECT (obj));
accessible = eel_canvas_accessible_create (obj);
@@ -2132,7 +2132,7 @@
{
EelCanvas *canvas;
- g_return_if_fail (EEL_IS_CANVAS (object));
+ g_assert (EEL_IS_CANVAS (object));
/* remember, destroy can be run multiple times! */
@@ -2176,7 +2176,7 @@
{
EelCanvas *canvas;
- g_return_if_fail (EEL_IS_CANVAS (widget));
+ g_assert (EEL_IS_CANVAS (widget));
/* Normal widget mapping stuff */
@@ -2199,7 +2199,7 @@
{
EelCanvas *canvas;
- g_return_if_fail (EEL_IS_CANVAS (widget));
+ g_assert (EEL_IS_CANVAS (widget));
canvas = EEL_CANVAS (widget);
@@ -2222,7 +2222,7 @@
{
EelCanvas *canvas;
- g_return_if_fail (EEL_IS_CANVAS (widget));
+ g_assert (EEL_IS_CANVAS (widget));
/* Normal widget realization stuff */
@@ -2256,7 +2256,7 @@
{
EelCanvas *canvas;
- g_return_if_fail (EEL_IS_CANVAS (widget));
+ g_assert (EEL_IS_CANVAS (widget));
canvas = EEL_CANVAS (widget);
@@ -2369,8 +2369,8 @@
{
EelCanvas *canvas;
- g_return_if_fail (EEL_IS_CANVAS (widget));
- g_return_if_fail (allocation != NULL);
+ g_assert (EEL_IS_CANVAS (widget));
+ g_assert (allocation != NULL);
if (GTK_WIDGET_CLASS (canvas_parent_class)->size_allocate)
(* GTK_WIDGET_CLASS (canvas_parent_class)->size_allocate) (widget, allocation);
@@ -2677,8 +2677,8 @@
int mask;
int retval;
- g_return_val_if_fail (EEL_IS_CANVAS (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ g_assert (EEL_IS_CANVAS (widget));
+ g_assert (event != NULL);
retval = FALSE;
@@ -2749,8 +2749,8 @@
{
EelCanvas *canvas;
- g_return_val_if_fail (EEL_IS_CANVAS (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ g_assert (EEL_IS_CANVAS (widget));
+ g_assert (event != NULL);
canvas = EEL_CANVAS (widget);
@@ -2768,8 +2768,8 @@
{
EelCanvas *canvas;
- g_return_val_if_fail (EEL_IS_CANVAS (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ g_assert (EEL_IS_CANVAS (widget));
+ g_assert (event != NULL);
canvas = EEL_CANVAS (widget);
@@ -2788,8 +2788,8 @@
{
EelCanvas *canvas;
- g_return_val_if_fail (EEL_IS_CANVAS (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ g_assert (EEL_IS_CANVAS (widget));
+ g_assert (event != NULL);
canvas = EEL_CANVAS (widget);
@@ -2851,12 +2851,12 @@
canvas->idle_id = 0;
}
if (canvas->need_update) {
- g_return_val_if_fail (!canvas->doing_update, FALSE);
+ g_assert (!canvas->doing_update);
canvas->doing_update = TRUE;
eel_canvas_item_invoke_update (canvas->root, 0, 0, 0);
- g_return_val_if_fail (canvas->doing_update, FALSE);
+ g_assert (canvas->doing_update);
canvas->doing_update = FALSE;
@@ -2905,12 +2905,12 @@
update_again:
if (canvas->need_update) {
- g_return_if_fail (!canvas->doing_update);
+ g_assert (!canvas->doing_update);
canvas->doing_update = TRUE;
eel_canvas_item_invoke_update (canvas->root, 0, 0, 0);
- g_return_if_fail (canvas->doing_update);
+ g_assert (canvas->doing_update);
canvas->doing_update = FALSE;
@@ -3667,7 +3667,7 @@
item = EEL_CANVAS_ITEM (obj);
/* If this item has no parent canvas, something's broken */
- g_return_if_fail (GTK_IS_WIDGET (item->canvas));
+ g_assert (GTK_IS_WIDGET (item->canvas));
eel_canvas_item_accessible_get_item_extents (item, &rect);
*width = rect.width;
@@ -3710,7 +3710,7 @@
if (item->parent) {
return g_list_index (EEL_CANVAS_GROUP (item->parent)->item_list, item);
} else {
- g_return_val_if_fail (item->canvas->root == item, -1);
+ g_assert (item->canvas->root == item);
return 0;
}
}
@@ -3751,7 +3751,7 @@
static void
eel_canvas_item_accessible_component_interface_init (AtkComponentIface *iface)
{
- g_return_if_fail (iface != NULL);
+ g_assert (iface != NULL);
iface->add_focus_handler = eel_canvas_item_accessible_add_focus_handler;
iface->get_extents = eel_canvas_item_accessible_get_extents;
@@ -3871,7 +3871,7 @@
EelCanvasItem *item;
item = EEL_CANVAS_ITEM (for_object);
- g_return_val_if_fail (item != NULL, NULL);
+ g_assert (item != NULL);
type = eel_canvas_item_accessible_get_type ();
if (type == G_TYPE_INVALID) {
@@ -3894,7 +3894,7 @@
{
AtkObject *accessible;
- g_return_val_if_fail (G_IS_OBJECT (obj), NULL);
+ g_assert (G_IS_OBJECT (obj));
accessible = eel_canvas_item_accessible_create (obj);
Modified: trunk/eel/eel-debug-drawing.c
==============================================================================
--- trunk/eel/eel-debug-drawing.c (original)
+++ trunk/eel/eel-debug-drawing.c Fri Mar 28 14:30:43 2008
@@ -121,8 +121,8 @@
DebugPixbufViewer *viewer;
EelDimensions dimensions;
- g_return_if_fail (DEBUG_IS_PIXBUF_VIEWER (widget));
- g_return_if_fail (requisition != NULL);
+ g_assert (DEBUG_IS_PIXBUF_VIEWER (widget));
+ g_assert (requisition != NULL);
viewer = DEBUG_PIXBUF_VIEWER (widget);
@@ -144,10 +144,10 @@
EelIRect dirty_area;
EelIRect bounds;
- g_return_val_if_fail (DEBUG_IS_PIXBUF_VIEWER (widget), TRUE);
- g_return_val_if_fail (event != NULL, TRUE);
- g_return_val_if_fail (event->window == widget->window, TRUE);
- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), TRUE);
+ g_assert (DEBUG_IS_PIXBUF_VIEWER (widget));
+ g_assert (event != NULL);
+ g_assert (event->window == widget->window);
+ g_assert (GTK_WIDGET_REALIZED (widget));
viewer = DEBUG_PIXBUF_VIEWER (widget);
@@ -196,7 +196,7 @@
static void
debug_pixbuf_viewer_set_pixbuf (DebugPixbufViewer *viewer, GdkPixbuf *pixbuf)
{
- g_return_if_fail (DEBUG_IS_PIXBUF_VIEWER (viewer));
+ g_assert (DEBUG_IS_PIXBUF_VIEWER (viewer));
if (pixbuf != viewer->pixbuf) {
eel_gdk_pixbuf_unref_if_not_null (viewer->pixbuf);
Modified: trunk/eel/eel-editable-label.c
==============================================================================
--- trunk/eel/eel-editable-label.c (original)
+++ trunk/eel/eel-editable-label.c Fri Mar 28 14:30:43 2008
@@ -239,7 +239,7 @@
GtkMovementStep step,
gint count)
{
- g_return_if_fail ((modmask & GDK_SHIFT_MASK) == 0);
+ g_assert ((modmask & GDK_SHIFT_MASK) == 0);
gtk_binding_entry_add_signal (binding_set, keyval, modmask,
"move_cursor", 3,
@@ -894,7 +894,7 @@
{
EelEditableLabel *label;
- g_return_if_fail (EEL_IS_EDITABLE_LABEL (object));
+ g_assert (EEL_IS_EDITABLE_LABEL (object));
label = EEL_EDITABLE_LABEL (object);
@@ -1146,8 +1146,8 @@
PangoRectangle logical_rect;
gint set_width;
- g_return_if_fail (EEL_IS_EDITABLE_LABEL (widget));
- g_return_if_fail (requisition != NULL);
+ g_assert (EEL_IS_EDITABLE_LABEL (widget));
+ g_assert (requisition != NULL);
label = EEL_EDITABLE_LABEL (widget);
@@ -1214,7 +1214,7 @@
EelEditableLabel *label;
static GdkColor gray = { 0, 0x8888, 0x8888, 0x8888 };
- g_return_if_fail (EEL_IS_EDITABLE_LABEL (widget));
+ g_assert (EEL_IS_EDITABLE_LABEL (widget));
label = EEL_EDITABLE_LABEL (widget);
@@ -1358,7 +1358,7 @@
gfloat cursor_aspect_ratio;
gint offset;
- g_return_if_fail (direction != GTK_TEXT_DIR_NONE);
+ g_assert (direction != GTK_TEXT_DIR_NONE);
gtk_widget_style_get (widget, "cursor-aspect-ratio", &cursor_aspect_ratio, NULL);
@@ -1489,8 +1489,8 @@
EelEditableLabel *label;
gint x, y;
- g_return_val_if_fail (EEL_IS_EDITABLE_LABEL (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ g_assert (EEL_IS_EDITABLE_LABEL (widget));
+ g_assert (event != NULL);
label = EEL_EDITABLE_LABEL (widget);
@@ -1923,7 +1923,7 @@
{
GtkClipboard *clipboard;
- g_return_if_fail (EEL_IS_EDITABLE_LABEL (label));
+ g_assert (EEL_IS_EDITABLE_LABEL (label));
if (label->selection_anchor == anchor_index &&
@@ -2987,7 +2987,7 @@
label = EEL_EDITABLE_LABEL (user_data);
widget = GTK_WIDGET (label);
- g_return_if_fail (GTK_WIDGET_REALIZED (label));
+ g_assert (GTK_WIDGET_REALIZED (label));
gdk_window_get_origin (widget->window, x, y);
@@ -3791,7 +3791,7 @@
static void
atk_text_interface_init (AtkTextIface *iface)
{
- g_return_if_fail (iface != NULL);
+ g_assert (iface != NULL);
iface->get_text = eel_editable_label_accessible_get_text;
iface->get_character_at_offset = eel_editable_label_accessible_get_character_at_offset;
@@ -3954,7 +3954,7 @@
static void
atk_editable_text_interface_init (AtkEditableTextIface *iface)
{
- g_return_if_fail (iface != NULL);
+ g_assert (iface != NULL);
iface->set_text_contents = eel_editable_label_accessible_set_text_contents;
iface->insert_text = eel_editable_label_accessible_insert_text;
@@ -4159,7 +4159,7 @@
/* State is defunct */
return NULL;
- g_return_val_if_fail (EEL_IS_EDITABLE_LABEL (widget), NULL);
+ g_assert (EEL_IS_EDITABLE_LABEL (widget));
return eel_editable_label_get_text (EEL_EDITABLE_LABEL (widget));
}
}
Modified: trunk/eel/eel-enumeration.c
==============================================================================
--- trunk/eel/eel-enumeration.c (original)
+++ trunk/eel/eel-enumeration.c Fri Mar 28 14:30:43 2008
@@ -44,8 +44,8 @@
{
EelEnumeration *enumeration;
- g_return_val_if_fail (id != NULL, NULL);
- g_return_val_if_fail (id[0] != '\0', NULL);
+ g_assert (id != NULL);
+ g_assert (id[0] != '\0');
enumeration = g_new0 (EelEnumeration, 1);
@@ -284,9 +284,9 @@
EelEnumeration *enumeration;
guint i;
- g_return_val_if_fail (id != NULL, NULL);
- g_return_val_if_fail (id[0] != '\0', NULL);
- g_return_val_if_fail (entries != NULL, NULL);
+ g_assert (id != NULL);
+ g_assert (id[0] != '\0');
+ g_assert (entries != NULL);
enumeration = eel_enumeration_new (id);
Modified: trunk/eel/eel-gconf-extensions.c
==============================================================================
--- trunk/eel/eel-gconf-extensions.c (original)
+++ trunk/eel/eel-gconf-extensions.c Fri Mar 28 14:30:43 2008
@@ -443,8 +443,8 @@
simple_value_is_equal (const GConfValue *a,
const GConfValue *b)
{
- g_return_val_if_fail (a != NULL, FALSE);
- g_return_val_if_fail (b != NULL, FALSE);
+ g_assert (a != NULL);
+ g_assert (b != NULL);
switch (a->type) {
case GCONF_VALUE_STRING:
Modified: trunk/eel/eel-gdk-extensions.c
==============================================================================
--- trunk/eel/eel-gdk-extensions.c (original)
+++ trunk/eel/eel-gdk-extensions.c Fri Mar 28 14:30:43 2008
@@ -95,8 +95,6 @@
const char *end_color,
gboolean is_horizontal)
{
- g_return_val_if_fail (is_horizontal == FALSE || is_horizontal == TRUE, NULL);
-
/* Handle the special case where the start and end colors are identical.
Handle the special case where the end color is an empty string.
*/
@@ -248,7 +246,7 @@
char *opposite_color;
char *result;
- g_return_val_if_fail (edge_color != NULL, g_strdup (gradient_spec));
+ g_assert (edge_color != NULL);
/* Get the color from the existing gradient spec. for the opposite
edge. This will parse away all the stuff we don't want from the
@@ -282,6 +280,9 @@
eel_gradient_set_left_color_spec (const char *gradient_spec,
const char *left_color)
{
+ g_return_val_if_fail (gradient_spec != NULL, NULL);
+ g_return_val_if_fail (left_color != NULL, NULL);
+
return eel_gradient_set_edge_color (gradient_spec, left_color, TRUE, FALSE);
}
@@ -297,6 +298,9 @@
eel_gradient_set_top_color_spec (const char *gradient_spec,
const char *top_color)
{
+ g_return_val_if_fail (gradient_spec != NULL, NULL);
+ g_return_val_if_fail (top_color != NULL, NULL);
+
return eel_gradient_set_edge_color (gradient_spec, top_color, FALSE, FALSE);
}
@@ -312,6 +316,9 @@
eel_gradient_set_right_color_spec (const char *gradient_spec,
const char *right_color)
{
+ g_return_val_if_fail (gradient_spec != NULL, NULL);
+ g_return_val_if_fail (right_color != NULL, NULL);
+
return eel_gradient_set_edge_color (gradient_spec, right_color, TRUE, TRUE);
}
@@ -327,16 +334,19 @@
eel_gradient_set_bottom_color_spec (const char *gradient_spec,
const char *bottom_color)
{
+ g_return_val_if_fail (gradient_spec != NULL, NULL);
+ g_return_val_if_fail (bottom_color != NULL, NULL);
+
return eel_gradient_set_edge_color (gradient_spec, bottom_color, FALSE, TRUE);
}
/**
* eel_gdk_color_parse_with_white_default
- * @color_spec: A color spec.
+ * @color_spec: A color spec, or NULL.
* @color: Pointer to place to put resulting color.
*
* The same as gdk_color_parse, except sets the color to white if
- * the spec. can't be parsed instead of returning a boolean flag.
+ * the spec. can't be parsed, instead of returning a boolean flag.
*/
void
eel_gdk_color_parse_with_white_default (const char *color_spec,
@@ -344,6 +354,8 @@
{
gboolean got_color;
+ g_return_if_fail (color != NULL);
+
got_color = FALSE;
if (color_spec != NULL) {
if (eel_gdk_color_parse (color_spec, color)) {
@@ -360,7 +372,7 @@
/**
* eel_parse_rgb_with_white_default
- * @color_spec: A color spec.
+ * @color_spec: A color spec, or NULL.
* Returns: An rgb value.
*
* The same as gdk_color_parse, except sets the color to white if
Modified: trunk/eel/eel-gdk-pixbuf-extensions.c
==============================================================================
--- trunk/eel/eel-gdk-pixbuf-extensions.c (original)
+++ trunk/eel/eel-gdk-pixbuf-extensions.c Fri Mar 28 14:30:43 2008
@@ -845,8 +845,8 @@
pixbuf_destroy_callback (guchar *pixels,
gpointer callback_data)
{
- g_return_if_fail (pixels != NULL);
- g_return_if_fail (callback_data != NULL);
+ g_assert (pixels != NULL);
+ g_assert (callback_data != NULL);
g_object_unref (callback_data);
}
Modified: trunk/eel/eel-graphic-effects.c
==============================================================================
--- trunk/eel/eel-graphic-effects.c (original)
+++ trunk/eel/eel-graphic-effects.c Fri Mar 28 14:30:43 2008
@@ -34,11 +34,11 @@
static GdkPixbuf *
create_new_pixbuf (GdkPixbuf *src)
{
- g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL);
- g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src)
+ g_assert (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB);
+ g_assert ((!gdk_pixbuf_get_has_alpha (src)
&& gdk_pixbuf_get_n_channels (src) == 3)
|| (gdk_pixbuf_get_has_alpha (src)
- && gdk_pixbuf_get_n_channels (src) == 4), NULL);
+ && gdk_pixbuf_get_n_channels (src) == 4));
return gdk_pixbuf_new (gdk_pixbuf_get_colorspace (src),
gdk_pixbuf_get_has_alpha (src),
@@ -50,11 +50,11 @@
static GdkPixbuf *
create_new_pixbuf_with_alpha (GdkPixbuf *src)
{
- g_return_val_if_fail (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB, NULL);
- g_return_val_if_fail ((!gdk_pixbuf_get_has_alpha (src)
+ g_assert (gdk_pixbuf_get_colorspace (src) == GDK_COLORSPACE_RGB);
+ g_assert ((!gdk_pixbuf_get_has_alpha (src)
&& gdk_pixbuf_get_n_channels (src) == 3)
|| (gdk_pixbuf_get_has_alpha (src)
- && gdk_pixbuf_get_n_channels (src) == 4), NULL);
+ && gdk_pixbuf_get_n_channels (src) == 4));
return gdk_pixbuf_new (gdk_pixbuf_get_colorspace (src),
TRUE,
Modified: trunk/eel/eel-gtk-extensions.c
==============================================================================
--- trunk/eel/eel-gtk-extensions.c (original)
+++ trunk/eel/eel-gtk-extensions.c Fri Mar 28 14:30:43 2008
@@ -585,13 +585,13 @@
while_realized_disconnecter (GtkObject *object,
RealizeDisconnectInfo *info)
{
- g_return_if_fail (GTK_IS_OBJECT (object));
- g_return_if_fail (info != NULL);
- g_return_if_fail (GTK_IS_OBJECT (info->object));
- g_return_if_fail (info->object_destroy_handler != 0);
- g_return_if_fail (info->object_destroy_handler != 0);
- g_return_if_fail (info->realized_widget_destroy_handler != 0);
- g_return_if_fail (info->realized_widget_unrealized_handler != 0);
+ g_assert (GTK_IS_OBJECT (object));
+ g_assert (info != NULL);
+ g_assert (GTK_IS_OBJECT (info->object));
+ g_assert (info->object_destroy_handler != 0);
+ g_assert (info->object_destroy_handler != 0);
+ g_assert (info->realized_widget_destroy_handler != 0);
+ g_assert (info->realized_widget_unrealized_handler != 0);
g_signal_handler_disconnect (info->object, info->object_destroy_handler);
g_signal_handler_disconnect (info->object, info->signal_handler);
Modified: trunk/eel/eel-image-table.c
==============================================================================
--- trunk/eel/eel-image-table.c (original)
+++ trunk/eel/eel-image-table.c Fri Mar 28 14:30:43 2008
@@ -205,7 +205,7 @@
{
GtkWidget *windowed_ancestor;
- g_return_if_fail (EEL_IS_IMAGE_TABLE (widget));
+ g_assert (EEL_IS_IMAGE_TABLE (widget));
/* Chain realize */
EEL_CALL_PARENT (GTK_WIDGET_CLASS, realize, (widget));
@@ -257,7 +257,7 @@
{
EelImageTable *image_table;
- g_return_if_fail (EEL_IS_IMAGE_TABLE (widget));
+ g_assert (EEL_IS_IMAGE_TABLE (widget));
image_table = EEL_IMAGE_TABLE (widget);
@@ -277,8 +277,8 @@
{
EelImageTable *image_table;
- g_return_if_fail (EEL_IS_IMAGE_TABLE (container));
- g_return_if_fail (EEL_IS_LABELED_IMAGE (child));
+ g_assert (EEL_IS_IMAGE_TABLE (container));
+ g_assert (EEL_IS_LABELED_IMAGE (child));
image_table = EEL_IMAGE_TABLE (container);
@@ -313,9 +313,9 @@
{
EelImageTableEvent event;
- g_return_if_fail (EEL_IS_IMAGE_TABLE (image_table));
- g_return_if_fail (GTK_IS_WIDGET (child));
- g_return_if_fail (signal_index < LAST_SIGNAL);
+ g_assert (EEL_IS_IMAGE_TABLE (image_table));
+ g_assert (GTK_IS_WIDGET (child));
+ g_assert (signal_index < LAST_SIGNAL);
event.x = x;
event.y = y;
@@ -340,7 +340,7 @@
GtkWidget *leave_emit_child = NULL;
GtkWidget *enter_emit_child = NULL;
- g_return_if_fail (EEL_IS_IMAGE_TABLE (image_table));
+ g_assert (EEL_IS_IMAGE_TABLE (image_table));
child = eel_wrap_table_find_child_at_event_point (EEL_WRAP_TABLE (image_table), x, y);
@@ -395,9 +395,9 @@
GdkEventCrossing *event,
gpointer event_data)
{
- g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
- g_return_val_if_fail (EEL_IS_IMAGE_TABLE (event_data), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ g_assert (GTK_IS_WIDGET (widget));
+ g_assert (EEL_IS_IMAGE_TABLE (event_data));
+ g_assert (event != NULL);
image_table_handle_motion (EEL_IMAGE_TABLE (event_data), event->x, event->y, (GdkEvent *) event);
@@ -413,9 +413,9 @@
int x = -1;
int y = -1;
- g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
- g_return_val_if_fail (EEL_IS_IMAGE_TABLE (event_data), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ g_assert (GTK_IS_WIDGET (widget));
+ g_assert (EEL_IS_IMAGE_TABLE (event_data));
+ g_assert (event != NULL);
bounds = eel_gtk_widget_get_bounds (GTK_WIDGET (event_data));
@@ -434,9 +434,9 @@
GdkEventMotion *event,
gpointer event_data)
{
- g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
- g_return_val_if_fail (EEL_IS_IMAGE_TABLE (event_data), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ g_assert (GTK_IS_WIDGET (widget));
+ g_assert (EEL_IS_IMAGE_TABLE (event_data));
+ g_assert (event != NULL);
image_table_handle_motion (EEL_IMAGE_TABLE (event_data), (int) event->x, (int) event->y, (GdkEvent *) event);
@@ -451,9 +451,9 @@
EelImageTable *image_table;
GtkWidget *child;
- g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
- g_return_val_if_fail (EEL_IS_IMAGE_TABLE (event_data), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ g_assert (GTK_IS_WIDGET (widget));
+ g_assert (EEL_IS_IMAGE_TABLE (event_data));
+ g_assert (event != NULL);
image_table = EEL_IMAGE_TABLE (event_data);
@@ -490,9 +490,9 @@
GtkWidget *released_emit_child = NULL;
GtkWidget *clicked_emit_child = NULL;
- g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
- g_return_val_if_fail (EEL_IS_IMAGE_TABLE (event_data), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ g_assert (GTK_IS_WIDGET (widget));
+ g_assert (EEL_IS_IMAGE_TABLE (event_data));
+ g_assert (event != NULL);
image_table = EEL_IMAGE_TABLE (event_data);
Modified: trunk/eel/eel-labeled-image.c
==============================================================================
--- trunk/eel/eel-labeled-image.c (original)
+++ trunk/eel/eel-labeled-image.c Fri Mar 28 14:30:43 2008
@@ -354,7 +354,7 @@
{
EelLabeledImage *labeled_image;
- g_return_if_fail (EEL_IS_LABELED_IMAGE (object));
+ g_assert (EEL_IS_LABELED_IMAGE (object));
labeled_image = EEL_LABELED_IMAGE (object);
@@ -426,7 +426,7 @@
{
EelLabeledImage *labeled_image;
- g_return_if_fail (EEL_IS_LABELED_IMAGE (object));
+ g_assert (EEL_IS_LABELED_IMAGE (object));
labeled_image = EEL_LABELED_IMAGE (object);
@@ -491,8 +491,8 @@
EelLabeledImage *labeled_image;
EelDimensions content_dimensions;
- g_return_if_fail (EEL_IS_LABELED_IMAGE (widget));
- g_return_if_fail (requisition != NULL);
+ g_assert (EEL_IS_LABELED_IMAGE (widget));
+ g_assert (requisition != NULL);
labeled_image = EEL_LABELED_IMAGE (widget);
@@ -515,8 +515,8 @@
EelIRect image_bounds;
EelIRect label_bounds;
- g_return_if_fail (EEL_IS_LABELED_IMAGE (widget));
- g_return_if_fail (allocation != NULL);
+ g_assert (EEL_IS_LABELED_IMAGE (widget));
+ g_assert (allocation != NULL);
labeled_image = EEL_LABELED_IMAGE (widget);
@@ -540,9 +540,9 @@
EelLabeledImage *labeled_image;
EelIRect label_bounds;
- g_return_val_if_fail (EEL_IS_LABELED_IMAGE (widget), TRUE);
- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), TRUE);
- g_return_val_if_fail (event != NULL, TRUE);
+ g_assert (EEL_IS_LABELED_IMAGE (widget));
+ g_assert (GTK_WIDGET_REALIZED (widget));
+ g_assert (event != NULL);
labeled_image = EEL_LABELED_IMAGE (widget);
@@ -593,7 +593,7 @@
{
EelLabeledImage *labeled_image;
- g_return_if_fail (EEL_IS_LABELED_IMAGE (widget));
+ g_assert (EEL_IS_LABELED_IMAGE (widget));
labeled_image = EEL_LABELED_IMAGE (widget);
@@ -613,7 +613,7 @@
{
EelLabeledImage *labeled_image;
- g_return_if_fail (EEL_IS_LABELED_IMAGE (widget));
+ g_assert (EEL_IS_LABELED_IMAGE (widget));
labeled_image = EEL_LABELED_IMAGE (widget);
@@ -628,7 +628,7 @@
eel_labeled_image_add (GtkContainer *container,
GtkWidget *child)
{
- g_return_if_fail (GTK_IS_LABEL (child) || GTK_IS_IMAGE (child));
+ g_assert (GTK_IS_LABEL (child) || GTK_IS_IMAGE (child));
eel_gtk_container_child_add (container, child);
}
@@ -639,11 +639,11 @@
{
EelLabeledImage *labeled_image;
- g_return_if_fail (GTK_IS_LABEL (child) || GTK_IS_IMAGE (child));
+ g_assert (GTK_IS_LABEL (child) || GTK_IS_IMAGE (child));
labeled_image = EEL_LABELED_IMAGE (container);;
- g_return_if_fail (child == labeled_image->details->image || child == labeled_image->details->label);
+ g_assert (child == labeled_image->details->image || child == labeled_image->details->label);
eel_gtk_container_child_remove (container, child);
@@ -664,8 +664,8 @@
{
EelLabeledImage *labeled_image;
- g_return_if_fail (EEL_IS_LABELED_IMAGE (container));
- g_return_if_fail (callback != NULL);
+ g_assert (EEL_IS_LABELED_IMAGE (container));
+ g_assert (callback != NULL);
labeled_image = EEL_LABELED_IMAGE (container);
@@ -693,7 +693,7 @@
EelDimensions image_dimensions;
GtkRequisition image_requisition;
- g_return_val_if_fail (EEL_IS_LABELED_IMAGE (labeled_image), eel_dimensions_empty);
+ g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
if (!labeled_image_show_image (labeled_image)) {
return eel_dimensions_empty;
@@ -717,7 +717,7 @@
EelDimensions label_dimensions;
GtkRequisition label_requisition;
- g_return_val_if_fail (EEL_IS_LABELED_IMAGE (labeled_image), eel_dimensions_empty);
+ g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
if (!labeled_image_show_label (labeled_image)) {
return eel_dimensions_empty;
@@ -739,7 +739,7 @@
EelIRect content_bounds;
EelIRect bounds;
- g_return_val_if_fail (EEL_IS_LABELED_IMAGE (labeled_image), eel_irect_empty);
+ g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
image_dimensions = labeled_image_get_image_dimensions (labeled_image);
@@ -893,7 +893,7 @@
EelIRect content_bounds;
EelIRect bounds;
- g_return_val_if_fail (EEL_IS_LABELED_IMAGE (labeled_image), eel_irect_empty);
+ g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
label_dimensions = labeled_image_get_label_dimensions (labeled_image);
@@ -1027,7 +1027,7 @@
labeled_image_update_alignments (EelLabeledImage *labeled_image)
{
- g_return_if_fail (EEL_IS_LABELED_IMAGE (labeled_image));
+ g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
if (labeled_image->details->label != NULL) {
float x_alignment;
@@ -1124,7 +1124,7 @@
EelDimensions label_dimensions;
EelDimensions content_dimensions;
- g_return_val_if_fail (EEL_IS_LABELED_IMAGE (labeled_image), eel_dimensions_empty);
+ g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
image_dimensions = labeled_image_get_image_dimensions (labeled_image);
label_dimensions = labeled_image_get_label_dimensions (labeled_image);
@@ -1170,7 +1170,7 @@
EelIRect content_bounds;
EelIRect bounds;
- g_return_val_if_fail (EEL_IS_LABELED_IMAGE (labeled_image), eel_irect_empty);
+ g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
bounds = eel_gtk_widget_get_bounds (GTK_WIDGET (labeled_image));
@@ -1187,7 +1187,7 @@
static void
labeled_image_ensure_label (EelLabeledImage *labeled_image)
{
- g_return_if_fail (EEL_IS_LABELED_IMAGE (labeled_image));
+ g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
if (labeled_image->details->label != NULL) {
return;
@@ -1201,7 +1201,7 @@
static void
labeled_image_ensure_image (EelLabeledImage *labeled_image)
{
- g_return_if_fail (EEL_IS_LABELED_IMAGE (labeled_image));
+ g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
if (labeled_image->details->image != NULL) {
return;
@@ -1215,7 +1215,7 @@
static gboolean
labeled_image_show_image (const EelLabeledImage *labeled_image)
{
- g_return_val_if_fail (EEL_IS_LABELED_IMAGE (labeled_image), FALSE);
+ g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
return labeled_image->details->image != NULL && labeled_image->details->show_image;
}
@@ -1223,7 +1223,7 @@
static gboolean
labeled_image_show_label (const EelLabeledImage *labeled_image)
{
- g_return_val_if_fail (EEL_IS_LABELED_IMAGE (labeled_image), FALSE);
+ g_assert (EEL_IS_LABELED_IMAGE (labeled_image));
return labeled_image->details->label != NULL && labeled_image->details->show_label;
}
@@ -1754,7 +1754,7 @@
{
EelLabeledImage *image;
- g_return_if_fail (EEL_IS_LABELED_IMAGE (image_widget));
+ g_assert (EEL_IS_LABELED_IMAGE (image_widget));
image = EEL_LABELED_IMAGE (image_widget);
@@ -1927,7 +1927,7 @@
button_leave_callback (GtkWidget *widget,
gpointer callback_data)
{
- g_return_if_fail (GTK_IS_WIDGET (widget));
+ g_assert (GTK_IS_WIDGET (widget));
if (GTK_WIDGET_DRAWABLE (widget)) {
const int fudge = 4;
@@ -1953,7 +1953,7 @@
GdkEventFocus *event,
gpointer callback_data)
{
- g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+ g_assert (GTK_IS_WIDGET (widget));
button_leave_callback (widget, callback_data);
Modified: trunk/eel/eel-preferences.c
==============================================================================
--- trunk/eel/eel-preferences.c (original)
+++ trunk/eel/eel-preferences.c Fri Mar 28 14:30:43 2008
@@ -93,7 +93,7 @@
if (value == NULL) {
return 0;
}
- g_return_val_if_fail (value->type == GCONF_VALUE_INT, 0);
+ g_assert (value->type == GCONF_VALUE_INT);
return gconf_value_get_int (value);
}
@@ -103,7 +103,7 @@
if (value == NULL) {
return FALSE;
}
- g_return_val_if_fail (value->type == GCONF_VALUE_BOOL, FALSE);
+ g_assert (value->type == GCONF_VALUE_BOOL);
return gconf_value_get_bool (value);
}
@@ -113,7 +113,7 @@
if (value == NULL) {
return g_strdup ("");
}
- g_return_val_if_fail (value->type == GCONF_VALUE_STRING, g_strdup (""));
+ g_assert (value->type == GCONF_VALUE_STRING);
return g_strdup (gconf_value_get_string (value));
}
@@ -127,8 +127,8 @@
return NULL;
}
- g_return_val_if_fail (value->type == GCONF_VALUE_LIST, NULL);
- g_return_val_if_fail (gconf_value_get_list_type (value) == GCONF_VALUE_STRING, NULL);
+ g_assert (value->type == GCONF_VALUE_LIST);
+ g_assert (gconf_value_get_list_type (value) == GCONF_VALUE_STRING);
slist = eel_gconf_value_get_string_list (value);
@@ -145,7 +145,7 @@
static const char *
preferences_peek_storage_path (void)
{
- g_return_val_if_fail (storage_path != NULL, NULL);
+ g_assert (storage_path != NULL);
return storage_path;
}
@@ -153,7 +153,7 @@
static void
preferences_set_storage_path (const char *new_storage_path)
{
- g_return_if_fail (eel_strlen (new_storage_path) > 0);
+ g_assert (eel_strlen (new_storage_path) > 0);
/* Make sure the path is indeed different */
if (eel_str_is_equal (new_storage_path, storage_path)) {
@@ -186,8 +186,8 @@
char *key;
PreferencesEntry *entry;
- g_return_val_if_fail (name != NULL, NULL);
- g_return_val_if_fail (preferences_is_initialized (), NULL);
+ g_assert (name != NULL);
+ g_assert (preferences_is_initialized ());
key = preferences_key_make (name);
result = eel_gconf_get_value (key);
@@ -208,7 +208,7 @@
static gboolean
preferences_preference_is_gconf_key (const char *name)
{
- g_return_val_if_fail (name != NULL, FALSE);
+ g_assert (name != NULL);
if (eel_str_has_prefix (name, "/")) {
return FALSE;
@@ -220,7 +220,7 @@
static char *
preferences_key_make (const char *name)
{
- g_return_val_if_fail (name != NULL, NULL);
+ g_assert (name != NULL);
if (!preferences_preference_is_gconf_key (name)) {
return g_strdup (name);
@@ -239,7 +239,7 @@
PreferencesEntry *entry;
char *key;
- g_return_val_if_fail (name != NULL, NULL);
+ g_assert (name != NULL);
key = preferences_key_make (name);
@@ -287,8 +287,8 @@
gboolean
eel_preferences_get_is_invisible (const char *name)
{
- g_return_val_if_fail (name != NULL, FALSE);
- g_return_val_if_fail (preferences_is_initialized (), FALSE);
+ g_assert (name != NULL);
+ g_assert (preferences_is_initialized ());
return preferences_global_table_lookup_or_insert (name)->invisible;
}
@@ -515,8 +515,8 @@
guint i;
gboolean res;
- g_return_val_if_fail (strv != NULL, FALSE);
- g_return_val_if_fail (enumeration_id != NULL, FALSE);
+ g_assert (strv != NULL);
+ g_assert (enumeration_id != NULL);
res = TRUE;
for (i = 0; strv[i] != NULL; i++) {
@@ -622,7 +622,7 @@
{
PreferencesCallbackEntry *callback_entry;
- g_return_if_fail (data != NULL);
+ g_assert (data != NULL);
callback_entry = data;
@@ -632,7 +632,7 @@
static void
preferences_entry_invoke_callbacks (PreferencesEntry *entry)
{
- g_return_if_fail (entry != NULL);
+ g_assert (entry != NULL);
/* Update the auto storage preferences */
if (entry->auto_storage_list != NULL) {
@@ -653,8 +653,8 @@
char **storage;
const char *value;
- g_return_if_fail (data != NULL);
- g_return_if_fail (callback_data != NULL);
+ g_assert (data != NULL);
+ g_assert (callback_data != NULL);
storage = (char **)data;
value = (const char *)callback_data;
@@ -669,8 +669,8 @@
char ***storage;
char **value;
- g_return_if_fail (data != NULL);
- g_return_if_fail (callback_data != NULL);
+ g_assert (data != NULL);
+ g_assert (callback_data != NULL);
storage = (char ***)data;
value = (char **)callback_data;
@@ -682,7 +682,7 @@
static void
update_auto_integer_or_boolean (gpointer data, gpointer callback_data)
{
- g_return_if_fail (data != NULL);
+ g_assert (data != NULL);
*(int *)data = GPOINTER_TO_INT (callback_data);
}
@@ -740,9 +740,9 @@
GConfEntry *entry,
gpointer notice_data)
{
- g_return_if_fail (entry != NULL);
- g_return_if_fail (entry->key != NULL);
- g_return_if_fail (notice_data != NULL);
+ g_assert (entry != NULL);
+ g_assert (entry->key != NULL);
+ g_assert (notice_data != NULL);
preferences_entry_invoke_callbacks (notice_data);
}
@@ -761,7 +761,7 @@
return;
}
- g_return_if_fail (entry->name != NULL);
+ g_assert (entry->name != NULL);
key = preferences_key_make (entry->name);
@@ -770,7 +770,7 @@
entry);
g_free (key);
- g_return_if_fail (entry->gconf_connection_id != EEL_GCONF_UNDEFINED_CONNECTION);
+ g_assert (entry->gconf_connection_id != EEL_GCONF_UNDEFINED_CONNECTION);
}
/**
@@ -790,8 +790,8 @@
PreferencesCallbackEntry *callback_entry;
GList *l;
- g_return_if_fail (entry != NULL);
- g_return_if_fail (callback != NULL);
+ g_assert (entry != NULL);
+ g_assert (callback != NULL);
callback_entry = g_new0 (PreferencesCallbackEntry, 1);
callback_entry->callback = callback;
@@ -821,9 +821,9 @@
gpointer storage,
PreferenceType type)
{
- g_return_if_fail (entry != NULL);
- g_return_if_fail (storage != NULL);
- g_return_if_fail (entry->type == 0 || entry->type == type);
+ g_assert (entry != NULL);
+ g_assert (storage != NULL);
+ g_assert (entry->type == 0 || entry->type == type);
if (g_list_find (entry->auto_storage_list, storage) != NULL) {
g_warning ("Trying to add an auto storage for %s that already exists.", entry->name);
return;
@@ -868,8 +868,8 @@
PreferencesCallbackEntry cb_entry;
GList *l;
- g_return_if_fail (entry != NULL);
- g_return_if_fail (callback != NULL);
+ g_assert (entry != NULL);
+ g_assert (callback != NULL);
cb_entry.callback = callback;
cb_entry.callback_data = callback_data;
@@ -901,16 +901,16 @@
const GList *node;
gpointer storage_in_entry;
- g_return_if_fail (entry != NULL);
- g_return_if_fail (storage != NULL);
- g_return_if_fail (entry->auto_storage_list != NULL);
+ g_assert (entry != NULL);
+ g_assert (storage != NULL);
+ g_assert (entry->auto_storage_list != NULL);
new_list = g_list_copy (entry->auto_storage_list);
for (node = new_list; node != NULL; node = node->next) {
storage_in_entry = node->data;
- g_return_if_fail (storage_in_entry != NULL);
+ g_assert (storage_in_entry != NULL);
if (storage_in_entry == storage) {
entry->auto_storage_list = g_list_remove (entry->auto_storage_list,
@@ -947,7 +947,7 @@
static void
preferences_callback_entry_free (PreferencesCallbackEntry *callback_entry)
{
- g_return_if_fail (callback_entry != NULL);
+ g_assert (callback_entry != NULL);
callback_entry->callback = NULL;
callback_entry->callback_data = NULL;
@@ -967,7 +967,7 @@
preferences_callback_entry_free_func (gpointer data,
gpointer callback_data)
{
- g_return_if_fail (data != NULL);
+ g_assert (data != NULL);
preferences_callback_entry_free (data);
}
@@ -981,7 +981,7 @@
static void
preferences_entry_free (PreferencesEntry *entry)
{
- g_return_if_fail (entry != NULL);
+ g_assert (entry != NULL);
eel_gconf_notification_remove (entry->gconf_connection_id);
entry->gconf_connection_id = EEL_GCONF_UNDEFINED_CONNECTION;
@@ -1065,8 +1065,8 @@
static PreferencesEntry *
preferences_global_table_lookup (const char *name)
{
- g_return_val_if_fail (name != NULL, NULL);
- g_return_val_if_fail (preferences_global_table_get_global () != NULL, NULL);
+ g_assert (name != NULL);
+ g_assert (preferences_global_table_get_global () != NULL);
return g_hash_table_lookup (preferences_global_table_get_global (), name);
}
@@ -1076,16 +1076,16 @@
{
PreferencesEntry *entry;
- g_return_val_if_fail (name != NULL, NULL);
- g_return_val_if_fail (preferences_global_table_get_global () != NULL, NULL);
- g_return_val_if_fail (preferences_global_table_lookup (name) == NULL, NULL);
+ g_assert (name != NULL);
+ g_assert (preferences_global_table_get_global () != NULL);
+ g_assert (preferences_global_table_lookup (name) == NULL);
entry = g_new0 (PreferencesEntry, 1);
entry->name = g_strdup (name);
g_hash_table_insert (preferences_global_table_get_global (), entry->name, entry);
- g_return_val_if_fail (entry == preferences_global_table_lookup (name), NULL);
+ g_assert (entry == preferences_global_table_lookup (name));
return entry;
}
@@ -1095,7 +1095,7 @@
{
PreferencesEntry *entry;
- g_return_val_if_fail (name != NULL, NULL);
+ g_assert (name != NULL);
entry = preferences_global_table_lookup (name);
@@ -1446,8 +1446,8 @@
{
PreferencesEntry *entry;
- g_return_if_fail (name != NULL);
- g_return_if_fail (preferences_is_initialized ());
+ g_assert (name != NULL);
+ g_assert (preferences_is_initialized ());
entry = preferences_global_table_lookup_or_insert (name);
g_assert (entry != NULL);
Modified: trunk/eel/eel-wrap-table.c
==============================================================================
--- trunk/eel/eel-wrap-table.c (original)
+++ trunk/eel/eel-wrap-table.c Fri Mar 28 14:30:43 2008
@@ -208,7 +208,7 @@
{
EelWrapTable *wrap_table;
- g_return_if_fail (EEL_IS_WRAP_TABLE (object));
+ g_assert (EEL_IS_WRAP_TABLE (object));
wrap_table = EEL_WRAP_TABLE (object);
@@ -247,7 +247,7 @@
{
EelWrapTable *wrap_table;
- g_return_if_fail (EEL_IS_WRAP_TABLE (object));
+ g_assert (EEL_IS_WRAP_TABLE (object));
wrap_table = EEL_WRAP_TABLE (object);
@@ -286,8 +286,8 @@
EelWrapTable *wrap_table;
EelDimensions content_dimensions;
- g_return_if_fail (EEL_IS_WRAP_TABLE (widget));
- g_return_if_fail (requisition != NULL);
+ g_assert (EEL_IS_WRAP_TABLE (widget));
+ g_assert (requisition != NULL);
wrap_table = EEL_WRAP_TABLE (widget);
@@ -304,8 +304,8 @@
{
EelWrapTable *wrap_table;
- g_return_if_fail (EEL_IS_WRAP_TABLE (widget));
- g_return_if_fail (allocation != NULL);
+ g_assert (EEL_IS_WRAP_TABLE (widget));
+ g_assert (allocation != NULL);
wrap_table = EEL_WRAP_TABLE (widget);
@@ -321,9 +321,9 @@
EelWrapTable *wrap_table;
GList *iterator;
- g_return_val_if_fail (EEL_IS_WRAP_TABLE (widget), TRUE);
- g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), TRUE);
- g_return_val_if_fail (event != NULL, TRUE);
+ g_assert (EEL_IS_WRAP_TABLE (widget));
+ g_assert (GTK_WIDGET_REALIZED (widget));
+ g_assert (event != NULL);
wrap_table = EEL_WRAP_TABLE (widget);
@@ -343,7 +343,7 @@
EelWrapTable *wrap_table;
GList *iterator;
- g_return_if_fail (EEL_IS_WRAP_TABLE (widget));
+ g_assert (EEL_IS_WRAP_TABLE (widget));
wrap_table = EEL_WRAP_TABLE (widget);
@@ -366,7 +366,7 @@
EelWrapTable *wrap_table;
GList *iterator;
- g_return_if_fail (EEL_IS_WRAP_TABLE (widget));
+ g_assert (EEL_IS_WRAP_TABLE (widget));
wrap_table = EEL_WRAP_TABLE (widget);
@@ -386,7 +386,7 @@
static void
eel_wrap_table_realize (GtkWidget *widget)
{
- g_return_if_fail (EEL_IS_WRAP_TABLE (widget));
+ g_assert (EEL_IS_WRAP_TABLE (widget));
GTK_WIDGET_CLASS (parent_class)->realize (widget);
@@ -400,9 +400,9 @@
{
EelWrapTable *wrap_table;
- g_return_if_fail (container != NULL);
- g_return_if_fail (EEL_IS_WRAP_TABLE (container));
- g_return_if_fail (GTK_IS_WIDGET (child));
+ g_assert (container != NULL);
+ g_assert (EEL_IS_WRAP_TABLE (container));
+ g_assert (GTK_IS_WIDGET (child));
wrap_table = EEL_WRAP_TABLE (container);
@@ -436,8 +436,8 @@
EelWrapTable *wrap_table;
gboolean child_was_visible;
- g_return_if_fail (EEL_IS_WRAP_TABLE (container));
- g_return_if_fail (GTK_IS_WIDGET (child));
+ g_assert (EEL_IS_WRAP_TABLE (container));
+ g_assert (GTK_IS_WIDGET (child));
wrap_table = EEL_WRAP_TABLE (container);;
@@ -467,8 +467,8 @@
GList *node;
GList *next;
- g_return_if_fail (EEL_IS_WRAP_TABLE (container));
- g_return_if_fail (callback != NULL);
+ g_assert (EEL_IS_WRAP_TABLE (container));
+ g_assert (callback != NULL);
wrap_table = EEL_WRAP_TABLE (container);;
@@ -493,8 +493,8 @@
{
int num;
- g_return_val_if_fail (max_child_size > 0, 0);
- g_return_val_if_fail (spacing >= 0, 0);
+ g_assert (max_child_size > 0);
+ g_assert (spacing >= 0);
available = MAX (available, 0);
@@ -513,7 +513,7 @@
EelIRect content_bounds;
guint num_cols;
- g_return_if_fail (EEL_IS_WRAP_TABLE (wrap_table));
+ g_assert (EEL_IS_WRAP_TABLE (wrap_table));
max_child_dimensions = wrap_table_get_max_child_dimensions (wrap_table);
content_bounds = wrap_table_get_content_bounds (wrap_table);
@@ -608,8 +608,8 @@
{
EelDimensions max_dimensions;
- g_return_val_if_fail (one != NULL, eel_dimensions_empty);
- g_return_val_if_fail (two != NULL, eel_dimensions_empty);
+ g_assert (one != NULL);
+ g_assert (two != NULL);
max_dimensions.width = MAX (one->width, two->width);
max_dimensions.height = MAX (one->height, two->height);
@@ -623,7 +623,7 @@
EelDimensions max_dimensions;
GList *iterator;
- g_return_val_if_fail (EEL_IS_WRAP_TABLE (wrap_table), eel_dimensions_empty);
+ g_assert (EEL_IS_WRAP_TABLE (wrap_table));
max_dimensions = eel_dimensions_empty;
@@ -654,7 +654,7 @@
EelDimensions content_dimensions;
guint num_children;
- g_return_val_if_fail (EEL_IS_WRAP_TABLE (wrap_table), eel_dimensions_empty);
+ g_assert (EEL_IS_WRAP_TABLE (wrap_table));
content_dimensions = eel_dimensions_empty;
@@ -698,7 +698,7 @@
{
EelIRect content_bounds;
- g_return_val_if_fail (EEL_IS_WRAP_TABLE (wrap_table), eel_irect_empty);
+ g_assert (EEL_IS_WRAP_TABLE (wrap_table));
content_bounds = eel_gtk_widget_get_bounds (GTK_WIDGET (wrap_table));
@@ -715,8 +715,8 @@
GdkEventFocus *event,
gpointer data)
{
- g_return_val_if_fail (widget->parent && widget->parent->parent, FALSE);
- g_return_val_if_fail (GTK_IS_VIEWPORT (widget->parent->parent), FALSE);
+ g_assert (widget->parent && widget->parent->parent);
+ g_assert (GTK_IS_VIEWPORT (widget->parent->parent));
eel_gtk_viewport_scroll_to_rect (GTK_VIEWPORT (widget->parent->parent),
&widget->allocation);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
