changeset
[gaim-migrate @ 14141]
Thu, 27 Oct 2005 14:40:48 +0000
- author
- Richard Stellingwerff <remenic@gmail.com>
- date
- Thu, 27 Oct 2005 14:40:48 +0000
- changeset 11850
- 794e48f305ab
- parent 11849
- ba32376bdff8
- child 11851
- 32415386832d
[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: Nathan Walp <nwalp@pidgin.im>
| COPYRIGHT | file | annotate | diff | comparison | revisions | |
| src/gtkstatusbox.c | file | annotate | diff | comparison | revisions |
--- a/COPYRIGHT Thu Oct 27 12:00:17 2005 +0000 +++ b/COPYRIGHT Thu Oct 27 14:40:48 2005 +0000 @@ -215,6 +215,7 @@ Mark Spencer Lex Spoon Kevin Stange +Richard Stellingwerff David Stoddard Sun Microsystems Mårten Svantesson (fursten)
--- a/src/gtkstatusbox.c Thu Oct 27 12:00:17 2005 +0000 +++ b/src/gtkstatusbox.c Thu Oct 27 14:40:48 2005 +0000 @@ -405,9 +405,6 @@ status_box->store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_INT, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); 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); -#if GTK_CHECK_VERSION(2,6,0) - gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(status_box), dropdown_store_row_separator_func, NULL, NULL); -#endif gtk_combo_box_set_model(GTK_COMBO_BOX(status_box), GTK_TREE_MODEL(status_box->dropdown_store)); gtk_cell_view_set_model(GTK_CELL_VIEW(status_box->cell_view), GTK_TREE_MODEL(status_box->store)); gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(status_box), 0); @@ -444,6 +441,11 @@ gtk_container_add(GTK_CONTAINER(status_box->sw), status_box->imhtml); gtk_box_pack_start(GTK_BOX(status_box->vbox), status_box->sw, TRUE, TRUE, 0); + +#if GTK_CHECK_VERSION(2,6,0) + gtk_combo_box_set_row_separator_func(GTK_COMBO_BOX(status_box), dropdown_store_row_separator_func, NULL, NULL); +#endif + status_box->error_pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box->vbox), GAIM_STOCK_STATUS_OFFLINE, icon_size, "GtkGaimStatusBox"); status_box->connecting_index = 0;
