comparison src/gtkstatusbox.c @ 11850:0d793b594a23

[gaim-migrate @ 14141] patch from Richard Stellingwerff to fix my CVS crash. I think I might put him up for sainthood. (I could have sworn that I tried this, and it didn't work before, but it works now) committer: Tailor Script <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Thu, 27 Oct 2005 14:40:48 +0000
parents 86cdfd6b32a6
children 678ef9ad7a0d
comparison
equal deleted inserted replaced
11849:dc51cdcb648e 11850:0d793b594a23
403 status_box->cell_view = gtk_cell_view_new(); 403 status_box->cell_view = gtk_cell_view_new();
404 gtk_widget_show (status_box->cell_view); 404 gtk_widget_show (status_box->cell_view);
405 405
406 status_box->store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_INT, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); 406 status_box->store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_INT, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
407 status_box->dropdown_store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_INT, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); 407 status_box->dropdown_store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_INT, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
408 #if GTK_CHECK_VERSION(2,6,0)
409 gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(status_box), dropdown_store_row_separator_func, NULL, NULL);
410 #endif
411 gtk_combo_box_set_model(GTK_COMBO_BOX(status_box), GTK_TREE_MODEL(status_box->dropdown_store)); 408 gtk_combo_box_set_model(GTK_COMBO_BOX(status_box), GTK_TREE_MODEL(status_box->dropdown_store));
412 gtk_cell_view_set_model(GTK_CELL_VIEW(status_box->cell_view), GTK_TREE_MODEL(status_box->store)); 409 gtk_cell_view_set_model(GTK_CELL_VIEW(status_box->cell_view), GTK_TREE_MODEL(status_box->store));
413 gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(status_box), 0); 410 gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(status_box), 0);
414 gtk_list_store_append(status_box->store, &(status_box->iter)); 411 gtk_list_store_append(status_box->store, &(status_box->iter));
415 gtk_gaim_status_box_refresh(status_box); 412 gtk_gaim_status_box_refresh(status_box);
441 status_box->sw = gtk_scrolled_window_new(NULL, NULL); 438 status_box->sw = gtk_scrolled_window_new(NULL, NULL);
442 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(status_box->sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); 439 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(status_box->sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
443 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(status_box->sw), GTK_SHADOW_IN); 440 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(status_box->sw), GTK_SHADOW_IN);
444 gtk_container_add(GTK_CONTAINER(status_box->sw), status_box->imhtml); 441 gtk_container_add(GTK_CONTAINER(status_box->sw), status_box->imhtml);
445 gtk_box_pack_start(GTK_BOX(status_box->vbox), status_box->sw, TRUE, TRUE, 0); 442 gtk_box_pack_start(GTK_BOX(status_box->vbox), status_box->sw, TRUE, TRUE, 0);
443
444
445 #if GTK_CHECK_VERSION(2,6,0)
446 gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(status_box), dropdown_store_row_separator_func, NULL, NULL);
447 #endif
446 448
447 status_box->error_pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_OFFLINE, 449 status_box->error_pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_OFFLINE,
448 icon_size, "GtkGaimStatusBox"); 450 icon_size, "GtkGaimStatusBox");
449 status_box->connecting_index = 0; 451 status_box->connecting_index = 0;
450 status_box->connecting_pixbufs[0] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_CONNECT0, 452 status_box->connecting_pixbufs[0] = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_CONNECT0,