comparison pidgin/gtkrequest.c @ 32156:1693114a2655

applied changes from 6cf1aee8ac5e3c836af832eaf26ccedd611dc70b through e802003adbf0be4496de3de8ac03b47c1e471d00 Original commit message: Start looking at the GError parameter every time we call these functions: - gdk_pixbuf_loader_write - gdk_pixbuf_loader_close - gdk_pixbuf_new_from_file - gdk_pixbuf_new_from_file_at_size - gdk_pixbuf_new_from_file_at_scale There are times when gdkpixbuf returns a semi-invalid GdkPixbuf object and also sets the GError. If this happens we want to discard and ignore the GdkPixbuf object because it can cause problems. For example, calling gdk_pixbuf_scale_simple() causes gdkpixbuf to rapidly consume memory in an infinite loop. And that's bad. This commit adds some helper functions to gtkutils.[c|h] that make it a little easier to check the GError value. We should use them everywhere we call any of the above functions.

32155:5ffd5582f5fe

	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);

	/* Dialog icon. */
	if (icon_data) {
		GdkPixbufLoader *loader = gdk_pixbuf_loader_new();
		GdkPixbuf *pixbuf = NULL;
		if (gdk_pixbuf_loader_write(loader, icon_data, icon_size, NULL)) {
			pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
			if (pixbuf) {
				/* scale the image if it is too large */
				int width = gdk_pixbuf_get_width(pixbuf);
				int height = gdk_pixbuf_get_height(pixbuf);
				if (width > 128 || height > 128) {
					int scaled_width = width > height ? 128 : (128 * width) / height;
					int scaled_height = height > width ? 128 : (128 * height) / width;
					GdkPixbuf *scaled =
							gdk_pixbuf_scale_simple(pixbuf, scaled_width, scaled_height,
							    GDK_INTERP_BILINEAR);

					purple_debug_info("pidgin",
					    "dialog icon was too large, scale it down\n");
					if (scaled) {
						g_object_unref(pixbuf);
						pixbuf = scaled;
					}
				}
				img = gtk_image_new_from_pixbuf(pixbuf);
			}
		} else {
			purple_debug_info("pidgin", "failed to parse dialog icon\n");
		}
		gdk_pixbuf_loader_close(loader, NULL);
		g_object_unref(loader);
	}

	if (!img) {
		img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION,
				       gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE));

static GtkWidget *
create_image_field(PurpleRequestField *field)
{
	GtkWidget *widget;
	GdkPixbuf *buf, *scale;
	GdkPixbufLoader *loader;

	loader = gdk_pixbuf_loader_new();
	gdk_pixbuf_loader_write(loader,
							(const guchar *)purple_request_field_image_get_buffer(field),
							purple_request_field_image_get_size(field),
							NULL);
	gdk_pixbuf_loader_close(loader, NULL);
	buf = gdk_pixbuf_loader_get_pixbuf(loader);

	scale = gdk_pixbuf_scale_simple(buf,
			purple_request_field_image_get_scale_x(field) * gdk_pixbuf_get_width(buf),
			purple_request_field_image_get_scale_y(field) * gdk_pixbuf_get_height(buf),
			GDK_INTERP_BILINEAR);
	widget = gtk_image_new_from_pixbuf(scale);
	g_object_unref(G_OBJECT(loader));
	g_object_unref(G_OBJECT(scale));

	return widget;
}

		{
			const char *icon_path = (const char *)icons->data;
			GdkPixbuf* pixbuf = NULL;

			if (icon_path)
				pixbuf = gdk_pixbuf_new_from_file(icon_path, NULL);

			gtk_list_store_set(store, &iter,
						   0, purple_request_field_list_get_data(field, text),
						   1, text,
						   2, pixbuf,

32156:1693114a2655

	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BORDER);
	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), hbox);

	/* Dialog icon. */
	if (icon_data) {
		GdkPixbuf *pixbuf = pidgin_pixbuf_from_data(icon_data, icon_size);
		if (pixbuf) {
			/* scale the image if it is too large */
			int width = gdk_pixbuf_get_width(pixbuf);
			int height = gdk_pixbuf_get_height(pixbuf);
			if (width > 128 || height > 128) {
				int scaled_width = width > height ? 128 : (128 * width) / height;
				int scaled_height = height > width ? 128 : (128 * height) / width;
				GdkPixbuf *scaled =
						gdk_pixbuf_scale_simple(pixbuf, scaled_width, scaled_height,
						    GDK_INTERP_BILINEAR);

				purple_debug_info("pidgin",
				    "dialog icon was too large, scaled it down\n");
				if (scaled) {
					g_object_unref(pixbuf);
					pixbuf = scaled;
				}
			}
			img = gtk_image_new_from_pixbuf(pixbuf);
			g_object_unref(pixbuf);
		} else {
			purple_debug_info("pidgin", "failed to parse dialog icon\n");
		}
	}

	if (!img) {
		img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION,
				       gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE));

static GtkWidget *
create_image_field(PurpleRequestField *field)
{
	GtkWidget *widget;
	GdkPixbuf *buf, *scale;

	buf = pidgin_pixbuf_from_data(
			(const guchar *)purple_request_field_image_get_buffer(field),
			purple_request_field_image_get_size(field));

	scale = gdk_pixbuf_scale_simple(buf,
			purple_request_field_image_get_scale_x(field) * gdk_pixbuf_get_width(buf),
			purple_request_field_image_get_scale_y(field) * gdk_pixbuf_get_height(buf),
			GDK_INTERP_BILINEAR);
	widget = gtk_image_new_from_pixbuf(scale);
	g_object_unref(G_OBJECT(buf));
	g_object_unref(G_OBJECT(scale));

	return widget;
}

		{
			const char *icon_path = (const char *)icons->data;
			GdkPixbuf* pixbuf = NULL;

			if (icon_path)
				pixbuf = pidgin_pixbuf_new_from_file(icon_path);

			gtk_list_store_set(store, &iter,
						   0, purple_request_field_list_get_data(field, text),
						   1, text,
						   2, pixbuf,