Mercurial > pidgin.yaz
comparison pidgin/gaimcombobox.c @ 15504:b53b783846a8
merge of '06e221e7ba1b9991d934d6c69e7d29d821d2e567'
and '9a6dfa7a96d203a51ba160ccf94bb19e2e557161'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Sat, 03 Feb 2007 08:13:34 +0000 |
| parents | d75099d2567e |
| children | 7ae72b7c02b1 |
comparison
equal
deleted
inserted
replaced
| 15503:704d40050800 | 15504:b53b783846a8 |
|---|---|
| 412 NULL, | 412 NULL, |
| 413 NULL | 413 NULL |
| 414 }; | 414 }; |
| 415 | 415 |
| 416 combo_box_type = g_type_register_static (GTK_TYPE_BIN, | 416 combo_box_type = g_type_register_static (GTK_TYPE_BIN, |
| 417 "GaimGtkComboBox", | 417 "PidginComboBox", |
| 418 &combo_box_info, | 418 &combo_box_info, |
| 419 0); | 419 0); |
| 420 | 420 |
| 421 g_type_add_interface_static (combo_box_type, | 421 g_type_add_interface_static (combo_box_type, |
| 422 GTK_TYPE_CELL_LAYOUT, | 422 GTK_TYPE_CELL_LAYOUT, |