comparison src/gtkconv.c @ 13090:0aa231ebbfd5

[gaim-migrate @ 15452] Changes to some pixbuf stuff. I added a 'gaim_gtk_create_gaim_icon_with_status()' function to util.c, and changed 'gaim_gtk_create_prpl_icon_with_status()' to accept a scale factor because almost everywhere this function was used we would scale the pixbuf to a smaller size as soon as we got it. So there's a bit less code duplication. Also, I think I added some g_object_unref()'s in one or two places where it was missing. committer: Tailor Script <[e-mail]>

13089:b553326bc468

	name = gaim_conversation_get_name(conv);

	g_return_val_if_fail(account != NULL, NULL);
	g_return_val_if_fail(name != NULL, NULL);

	if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) {
		GaimBuddy *b = gaim_find_buddy(account, name);
		if (b != NULL) {
			status = gaim_gtk_blist_get_status_icon((GaimBlistNode*)b,
				(small_icon ? GAIM_STATUS_ICON_SMALL : GAIM_STATUS_ICON_LARGE));
		}
	}

	if (!status) {
		GdkPixbuf *pixbuf;
		pixbuf = gaim_gtk_create_prpl_icon(account);

		if (small_icon && pixbuf != NULL)
		{
			status = gdk_pixbuf_scale_simple(pixbuf, 15, 15,
					GDK_INTERP_BILINEAR);
			g_object_unref(pixbuf);
		}
		else
			status = pixbuf;
	}
	return status;
}

static void
update_tab_icon(GaimConversation *conv)

	/* Create a pixmap for the protocol icon. */
	if (buddy != NULL)
		pixbuf = gaim_gtk_blist_get_status_icon((GaimBlistNode*)buddy, GAIM_STATUS_ICON_SMALL);
	else
	{
		GdkPixbuf *unscaled = gaim_gtk_create_prpl_icon(account);

		/* XXX: 15 is the size for GAIM_STATUS_ICON_SMALL in gtkblist.c */
		pixbuf = gdk_pixbuf_scale_simple(unscaled, 15, 15,
						 GDK_INTERP_BILINEAR);
		g_object_unref(G_OBJECT(unscaled));
	}

	/* Now convert it to GtkImage */
	if (pixbuf == NULL)
		image = gtk_image_new();
	else
		image = gtk_image_new_from_pixbuf(pixbuf);

	gtk_size_group_add_widget(sg, image);

	g_object_unref(G_OBJECT(pixbuf));

	/* Make our menu item */
	text = g_strdup_printf("%s (%s)", name, gaim_account_get_username(account));
	menuitem = gtk_radio_menu_item_new_with_label(*group, text);
	g_free(text);

	if (!gtkconv)
		return;
	win = gaim_gtkconv_get_window(gtkconv);
	if (!win)
		return;
	
	if (fields & GAIM_GTKCONV_SET_TITLE)
	{
		gaim_conversation_autoset_title(conv);
	}

13090:0aa231ebbfd5

	name = gaim_conversation_get_name(conv);

	g_return_val_if_fail(account != NULL, NULL);
	g_return_val_if_fail(name != NULL, NULL);

	/* Use the buddy icon, if possible */
	if (gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) {
		GaimBuddy *b = gaim_find_buddy(account, name);
		if (b != NULL) {
			status = gaim_gtk_blist_get_status_icon((GaimBlistNode*)b,
				(small_icon ? GAIM_STATUS_ICON_SMALL : GAIM_STATUS_ICON_LARGE));
		}
	}

	/* If they don't have a buddy icon, then use the PRPL icon */
	if (status == NULL)
		status = gaim_gtk_create_prpl_icon(account, small_icon ? 0.5 : 1.0);

	return status;
}

static void
update_tab_icon(GaimConversation *conv)

	/* Create a pixmap for the protocol icon. */
	if (buddy != NULL)
		pixbuf = gaim_gtk_blist_get_status_icon((GaimBlistNode*)buddy, GAIM_STATUS_ICON_SMALL);
	else
		pixbuf = gaim_gtk_create_prpl_icon(account, 0.5);

	/* Now convert it to GtkImage */
	if (pixbuf == NULL)
		image = gtk_image_new();
	else
	{
		image = gtk_image_new_from_pixbuf(pixbuf);
		g_object_unref(G_OBJECT(pixbuf));
	}

	gtk_size_group_add_widget(sg, image);

	/* Make our menu item */
	text = g_strdup_printf("%s (%s)", name, gaim_account_get_username(account));
	menuitem = gtk_radio_menu_item_new_with_label(*group, text);
	g_free(text);

	if (!gtkconv)
		return;
	win = gaim_gtkconv_get_window(gtkconv);
	if (!win)
		return;

	if (fields & GAIM_GTKCONV_SET_TITLE)
	{
		gaim_conversation_autoset_title(conv);
	}