Guarded debug messages with #ifdef COLLECTION_DEBUG. Some were so

2001-05-21  Jens Finke <jens@gnome.org>

	* eog-collection-model.c, eog-image-loader.c,
	eog-item-factory-simple.c, eog-wrap-list.c: Guarded debug messages
	with #ifdef COLLECTION_DEBUG. Some were so unneccessary that I
	removed them completely.
This commit is contained in:
Jens Finke 2001-05-21 21:48:14 +00:00 committed by Jens Finke
parent 06519a91dc
commit 236971d26a
5 changed files with 44 additions and 7 deletions

View file

@ -1,4 +1,11 @@
2001-05-21 Jens Finke <jens@gnome.org
2001-05-21 Jens Finke <jens@gnome.org>
* eog-collection-model.c, eog-image-loader.c,
eog-item-factory-simple.c, eog-wrap-list.c: Guarded debug messages
with #ifdef COLLECTION_DEBUG. Some were so unneccessary that I
removed them completely.
2001-05-21 Jens Finke <jens@gnome.org>
* eog-collection-control.c (eog_control_construct): Add property
bag to control.

View file

@ -350,7 +350,9 @@ prepare_context (EogCollectionModel *model, const gchar *uri)
CORBA_exception_init (&ev);
ctx = g_new0 (LoadingContext, 1);
#ifdef COLLECTION_DEBUG
g_message ("Prepare context for URI: %s", uri);
#endif
/* check for BonoboStorage interface */
ctx->storage_stream = bonobo_get_object (uri, "IDL:Bonobo/Storage:1.0", &ev);
@ -404,7 +406,7 @@ eog_collection_model_set_uri (EogCollectionModel *model,
priv->base_uri = g_strdup (uri);
else {
g_free (priv->base_uri);
priv->base_uri = g_strdup("multiple"));
priv->base_uri = g_strdup("multiple");
}
}

View file

@ -203,7 +203,9 @@ loading_canceled (EILContext *ctx)
loader = ctx->loader;
#ifdef COLLECTION_DEBUG
g_message ("Loading canceled\n");
#endif
gtk_signal_emit (GTK_OBJECT (ctx->loader),
eog_image_loader_signals [LOADING_CANCELED],
ctx->cimg);
@ -237,7 +239,9 @@ loading_finished (EILContext *ctx)
if (pbf != NULL) {
thumb = scale_image (loader, pbf);
#ifdef COLLECTION_DEBUG
g_message ("Successfully finished loading for: %s\n", cimage_get_uri (ctx->cimg));
#endif
cimage_set_thumbnail (ctx->cimg, thumb);
@ -253,7 +257,9 @@ loading_finished (EILContext *ctx)
}
if (loading_failed) {
#ifdef COLLECTION_DEBUG
g_message ("Loading failed for: %s\n", cimage_get_uri (ctx->cimg));
#endif
cimage_set_loading_failed (ctx->cimg);
gtk_signal_emit (GTK_OBJECT (ctx->loader),
eog_image_loader_signals [LOADING_FAILED],
@ -362,7 +368,9 @@ setup_next_uri (EogImageLoader *loader)
priv->queue = g_list_remove (priv->queue, ctx->cimg);
#ifdef COLLECTION_DEBUG
g_message ("Open image: %s\n", cimage_get_uri (ctx->cimg));
#endif
priv->idle_handler_id = gtk_idle_add ((GtkFunction) load_uri, ctx);
} else {

View file

@ -304,13 +304,10 @@ create_shaded_background (GdkPixbuf *pbf)
buf = gdk_pixbuf_get_pixels (pbf);
tmp = width*width + height*height;
g_print ("tmp: %f\n", tmp);
dl = sqrt (tmp);
g_print ("dl: %f\n", dl);
n_cols = (light - dark)/cvd;
ppc = dl / n_cols;
g_print ("ppc: %i\n", ppc);
for (y = 0; y < height; y++) {
gint color;
@ -472,7 +469,6 @@ ii_factory_update_item (EogItemFactory *factory,
caption_x = metrics->border + (metrics->twidth - caption_w) / 2;
caption_y = metrics->border + metrics->theight + metrics->cspace;
g_print ("caption_y: %d\n", caption_y);
gnome_canvas_item_set (icon->caption,
"text", caption,

View file

@ -498,7 +498,9 @@ model_interval_changed (EogCollectionModel *model, GList *id_list, gpointer data
g_return_if_fail (data != NULL);
g_return_if_fail (EOG_IS_WRAP_LIST (data));
#ifdef COLLECTION_DEBUG
g_message ("model_interval_changed called\n");
#endif
wlist = EOG_WRAP_LIST (data);
priv = wlist->priv;
@ -534,7 +536,9 @@ model_interval_added (EogCollectionModel *model, GList *id_list, gpointer data)
g_return_if_fail (data != NULL);
g_return_if_fail (EOG_IS_WRAP_LIST (data));
#ifdef COLLECTION_DEBUG
g_message ("model_interval_added called\n");
#endif
wlist = EOG_WRAP_LIST (data);
priv = wlist->priv;
@ -561,7 +565,9 @@ model_interval_removed (EogCollectionModel *model, GList *id_list, gpointer data
g_return_if_fail (data != NULL);
g_return_if_fail (EOG_IS_WRAP_LIST (data));
#ifdef COLLECTION_DEBUG
g_message ("model_interval_removed called\n");
#endif
wlist = EOG_WRAP_LIST (data);
priv = wlist->priv;
@ -765,7 +771,9 @@ request_update (EogWrapList *wlist)
g_return_if_fail (wlist != NULL);
g_return_if_fail (EOG_IS_WRAP_LIST (wlist));
#ifdef COLLECTION_DEBUG
g_message ("request_update called.");
#endif
if ((wlist->priv->idle_handler_id == -1) &&
(!wlist->priv->is_updating))
@ -828,7 +836,9 @@ do_item_changed_update (EogWrapList *wlist,
g_return_if_fail (wlist != NULL);
g_return_if_fail (EOG_IS_WRAP_LIST (wlist));
#ifdef COLLECTION_DEBUG
g_message ("do_item_changed_update called\n");
#endif
if (id_list == NULL) return;
if (wlist->priv->factory == NULL) return;
@ -844,7 +854,9 @@ do_item_changed_update (EogWrapList *wlist,
for (id = id_range_start; id <= id_range_end; id++) {
GnomeCanvasItem *item;
item = get_item_by_unique_id (wlist, id);
#ifdef COLLECTION_DEBUG
g_print ("update item id: %i\n", id);
#endif
eog_item_factory_update_item (wlist->priv->factory,
wlist->priv->model,
item);
@ -870,7 +882,9 @@ do_item_removed_update (EogWrapList *wlist,
g_return_if_fail (wlist != NULL);
g_return_if_fail (EOG_IS_WRAP_LIST (wlist));
#ifdef COLLECTION_DEBUG
g_message ("do_item_removed_update called\n");
#endif
priv = wlist->priv;
@ -914,7 +928,9 @@ do_item_added_update (EogWrapList *wlist,
g_return_if_fail (wlist != NULL);
g_return_if_fail (EOG_IS_WRAP_LIST (wlist));
#ifdef COLLECTION_DEBUG
g_message ("do_item_added_update called\n");
#endif
priv = wlist->priv;
@ -940,7 +956,9 @@ do_item_added_update (EogWrapList *wlist,
GnomeCanvasItem *item;
CImage *img;
for (id = id_range_start; id <= id_range_end; id++) {
#ifdef COLLECTION_DEBUG
g_print ("item_added: %i\n", id);
#endif
item = eog_item_factory_create_item (priv->factory,
GNOME_CANVAS_GROUP (priv->item_group),
id);
@ -985,7 +1003,9 @@ do_layout_check (EogWrapList *wlist)
priv = wlist->priv;
#ifdef COLLECTION_DEBUG
g_message ("do_layout_check called\n");
#endif
/* get canvas width */
cw = GTK_WIDGET (wlist)->allocation.width;
@ -1020,10 +1040,12 @@ do_layout_check (EogWrapList *wlist)
default:
g_assert_not_reached ();
}
#ifdef COLLECTION_DEBUG
g_print (" ** canvas width: %i\n",cw);
g_print (" ** n_cols_new: %i\n", n_cols_new);
g_print (" ** n_rows_new: %i\n", n_rows_new);
#endif
if (n_cols_new == priv->n_cols && n_rows_new == priv->n_rows)
return FALSE;
@ -1091,7 +1113,9 @@ do_item_rearrangement (EogWrapList *wlist)
data.wlist = wlist;
data.n = 0;
#ifdef COLLECTION_DEBUG
g_message ("do_item_rearrangement called\n");
#endif
priv = wlist->priv;