Mercurial > pidgin
changeset 11400:62db025d3eb0
[gaim-migrate @ 13635]
sf patch #1277824, from Will Thompson (resiak)
Fix C99isms in gtkstatusbox.c
Although, I'm not conviced these ARE C99isms
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 01 Sep 2005 02:22:03 +0000 |
| parents | 48244c196228 |
| children | 69b0378c79e0 |
| files | src/gtkstatusbox.c |
| diffstat | 1 files changed, 14 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkstatusbox.c Thu Sep 01 02:09:56 2005 +0000 +++ b/src/gtkstatusbox.c Thu Sep 01 02:22:03 2005 +0000 @@ -165,11 +165,15 @@ static void gtk_gaim_status_box_init (GtkGaimStatusBox *status_box) { - GtkCellRenderer *text_rend = gtk_cell_renderer_text_new(); - GtkCellRenderer *icon_rend = gtk_cell_renderer_pixbuf_new(); + GtkCellRenderer *text_rend; + GtkCellRenderer *icon_rend; GtkTextBuffer *buffer; GdkPixbuf *pixbuf, *pixbuf2, *pixbuf3, *pixbuf4; - GtkIconSize icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_STATUS); + GtkIconSize icon_size; + + text_rend = gtk_cell_renderer_text_new(); + icon_rend = gtk_cell_renderer_pixbuf_new(); + icon_size = gtk_icon_size_from_name(GAIM_ICON_SIZE_STATUS); status_box->imhtml_visible = FALSE; status_box->error_pixbuf = gtk_widget_render_icon (GTK_WIDGET(status_box), GAIM_STOCK_STATUS_OFFLINE, @@ -278,7 +282,10 @@ GtkAllocation *allocation) { GtkRequisition req = {0,0}; - GtkAllocation parent_alc = *allocation, box_alc = *allocation ; + GtkAllocation parent_alc, box_alc; + + parent_alc = *allocation; + box_alc = *allocation; combo_box_size_request(widget, &req); /* EVIL XXX */ @@ -423,13 +430,15 @@ static void gtk_gaim_status_box_changed(GtkComboBox *box) { - GtkGaimStatusBox *status_box = GTK_GAIM_STATUS_BOX(box); + GtkGaimStatusBox *status_box; GtkTreeIter iter; char *text, *sec_text; GdkPixbuf *pixbuf; gchar *status_type_id; GList *l; + status_box = GTK_GAIM_STATUS_BOX(box); + gtk_combo_box_get_active_iter(GTK_COMBO_BOX(status_box), &iter); gtk_tree_model_get(GTK_TREE_MODEL(status_box->dropdown_store), &iter, TITLE_COLUMN, &text, DESC_COLUMN, &sec_text, ICON_COLUMN, &pixbuf,