Changeset Navigation

Changeset 597

Timestamp:

05/18/04 01:36:05

Author:

chipx86

Message:

galago_gdk_pixbuf_new_from_account() now wraps galago_gdk_pixbuf_new_from_presence() if a presence is set.

Files:

r595	r597
	1	Tue May 18 01:35:34 PDT 2004 Christian Hammond <chipx86@gnupdate.org>
	2
	3	* libgalago-gtk/galago-gdk-pixbuf.c:
	4	- galago_gdk_pixbuf_new_from_account() now wraps
	5	galago_gdk_pixbuf_new_from_presence() if a presence is set.
	6
1	7	Mon May 17 00:51:07 PDT 2004 Christian Hammond <chipx86@gnupdate.org>
2	8

r475	r597
140	140	GdkPixbuf *pixbuf;
141	141	GalagoService *service;
	142	GalagoPresence *presence;
142	143
143	144	g_return_val_if_fail(account != NULL, NULL);
144	145
145		service = galago_account_get_service(account);
146
147		pixbuf = galago_gdk_pixbuf_new_from_service(service, width, height);
148
149		if (pixbuf == NULL)
150		return NULL;
151
152		if (!galago_account_is_connected(account))
153		gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE);
	146	presence = galago_account_get_presence(account, TRUE);
	147
	148	if (presence == NULL)
	149	{
	150	service = galago_account_get_service(account);
	151
	152	pixbuf = galago_gdk_pixbuf_new_from_service(service, width, height);
	153
	154	if (pixbuf != NULL && !galago_account_is_connected(account))
	155	gdk_pixbuf_saturate_and_pixelate(pixbuf, pixbuf, 0.0, FALSE);
	156	}
	157	else
	158	{
	159	pixbuf = galago_gdk_pixbuf_new_from_presence(presence, width, height,
	160	FALSE);
	161	}
154	162
155	163	return pixbuf;