comparison src/gtkstatusbox.c @ 13079:896d6c305429

[gaim-migrate @ 15441] Fix the bug where available and other stuff in the status box had the disk icon on it. Also, if the user selected a status that is not in the status box, then don't select anything in the status menu committer: Tailor Script <[e-mail]>

13078:55c1e5cec4dc

		 (primitive == GAIM_STATUS_INVISIBLE) || (primitive == GAIM_STATUS_OFFLINE)) &&
		(!gaim_savedstatus_has_substatuses(saved_status)))
	{
		index = get_statusbox_index(status_box, saved_status);
		gtk_combo_box_set_active(GTK_COMBO_BOX(status_box), index);

	}
	else
	{
		GtkTreeIter iter;
			gpointer data;

static void
add_popular_statuses(GtkGaimStatusBox *statusbox)
{
	GList *list, *cur;
	GtkIconSize icon_size;
	GdkPixbuf *pixbuf, *emblem;
	int width, height;

	list = gaim_savedstatuses_get_popular(6);
	if (list == NULL)

		icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_STATUS);
	else
		icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_STATUS_SMALL);

	/* Create the icon to use for non-transient saved-statuses */
	pixbuf = gtk_widget_render_icon(GTK_WIDGET(statusbox->vbox),
				GAIM_STOCK_STATUS_ONLINE, icon_size, "GtkGaimStatusBox");

	emblem = gtk_widget_render_icon(GTK_WIDGET(statusbox->vbox),
				GTK_STOCK_SAVE, icon_size, "GtkGaimStatusBox");
	width = gdk_pixbuf_get_width(pixbuf) / 2;
	height = gdk_pixbuf_get_height(pixbuf) / 2;

			message = gaim_savedstatus_get_message(saved);
			stripped = gaim_markup_strip_html(message);
			gaim_util_chrreplace(stripped, '\n', ' ');
		}
		gtk_gaim_status_box_add(statusbox, GTK_GAIM_STATUS_BOX_TYPE_POPULAR,
				pixbuf,	gaim_savedstatus_get_title(saved), stripped,
				GINT_TO_POINTER(gaim_savedstatus_get_creation_time(saved)));
		g_free(stripped);
	}

	g_list_free(list);

			break;
		case GAIM_STATUS_OFFLINE:
			index = 3;
			break;
		default:
			/*
			 * TODO: This is very bad!  I believe it's causing the infinite
			 *       windows bug.  Need to do something better here.
			 */
			/* index = GTK_LIST_STORE(box->dropdown_store)->length - 2; */
			index = 0;
			break;
	}

	return index;
}

13079:896d6c305429

		 (primitive == GAIM_STATUS_INVISIBLE) || (primitive == GAIM_STATUS_OFFLINE)) &&
		(!gaim_savedstatus_has_substatuses(saved_status)))
	{
		index = get_statusbox_index(status_box, saved_status);
		gtk_combo_box_set_active(GTK_COMBO_BOX(status_box), index);
	}
	else
	{
		GtkTreeIter iter;
			gpointer data;

static void
add_popular_statuses(GtkGaimStatusBox *statusbox)
{
	GList *list, *cur;
	GtkIconSize icon_size;
	const GdkPixbuf *orig;
	GdkPixbuf *pixbuf, *emblem;
	int width, height;

	list = gaim_savedstatuses_get_popular(6);
	if (list == NULL)

		icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_STATUS);
	else
		icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_STATUS_SMALL);

	/* Create the icon to use for non-transient saved-statuses */
	orig = gtk_widget_render_icon(GTK_WIDGET(statusbox->vbox),
				GAIM_STOCK_STATUS_ONLINE, icon_size, "GtkGaimStatusBox");
	pixbuf = gdk_pixbuf_copy(orig);
	g_object_unref(G_OBJECT(orig));

	emblem = gtk_widget_render_icon(GTK_WIDGET(statusbox->vbox),
				GTK_STOCK_SAVE, icon_size, "GtkGaimStatusBox");
	width = gdk_pixbuf_get_width(pixbuf) / 2;
	height = gdk_pixbuf_get_height(pixbuf) / 2;

			message = gaim_savedstatus_get_message(saved);
			stripped = gaim_markup_strip_html(message);
			gaim_util_chrreplace(stripped, '\n', ' ');
		}
		gtk_gaim_status_box_add(statusbox, GTK_GAIM_STATUS_BOX_TYPE_POPULAR,
				pixbuf, gaim_savedstatus_get_title(saved), stripped,
				GINT_TO_POINTER(gaim_savedstatus_get_creation_time(saved)));
		g_free(stripped);
	}

	g_list_free(list);

			break;
		case GAIM_STATUS_OFFLINE:
			index = 3;
			break;
		default:
			index = -1;
			break;
	}

	return index;
}