Mercurial > pidgin.yaz
changeset 29447:e4cf053a1d7a
merge of '89ba8894c13ce9ad5373009ccf3520f479d18995'
and 'bd1da3489eef317a805524eef94fd4e08719159b'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Tue, 16 Feb 2010 08:38:20 +0000 |
| parents | 47aa24b2247c (diff) d48173c45606 (current diff) |
| children | 5c9c4557fec2 b473cfd0285f |
| files | |
| diffstat | 1 files changed, 5 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkprefs.c Tue Feb 16 02:34:25 2010 +0000 +++ b/pidgin/gtkprefs.c Tue Feb 16 08:38:20 2010 +0000 @@ -223,16 +223,8 @@ g_return_val_if_fail(menuitems != NULL, NULL); -#if 0 /* GTK_CHECK_VERSION(2,4,0) */ - if(type == PURPLE_PREF_INT) - model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT); - else if(type == PURPLE_PREF_STRING) - model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_STRING); - dropdown = gtk_combo_box_new_with_model(model); -#else dropdown = gtk_option_menu_new(); menu = gtk_menu_new(); -#endif if (type == PURPLE_PREF_INT) stored_int = purple_prefs_get_int(key); @@ -910,9 +902,11 @@ cell_rend = gtk_cell_renderer_text_new(); gtk_cell_layout_pack_start(GTK_CELL_LAYOUT (combo_box), cell_rend, FALSE); gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo_box), cell_rend, "markup", 1, NULL); -/*#if GTK_CHECK_VERSION(2,6,0) - g_object_set(cell_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL); -#endif*/ + /* TODO: We need to force a size or something, or each theme dropdown ends + up as just "..." */ +#if 0 && GTK_CHECK_VERSION(2,6,0) + g_object_set(cell_rend, "ellipsize", PANGO_ELLIPSIZE_END, NULL); +#endif gtk_drag_dest_set(combo_box, GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP, te, sizeof(te) / sizeof(GtkTargetEntry) , GDK_ACTION_COPY | GDK_ACTION_MOVE);