Mercurial > pidgin.yaz
changeset 9696:a57fa78e5752
[gaim-migrate @ 10555]
gtk 2.0 fixes from nosnilmot
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sat, 07 Aug 2004 03:22:47 +0000 |
| parents | 89110d3665df |
| children | f568b6655331 |
| files | src/gtkconv.c src/gtkimhtml.c src/util.c |
| diffstat | 3 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkconv.c Fri Aug 06 04:30:45 2004 +0000 +++ b/src/gtkconv.c Sat Aug 07 03:22:47 2004 +0000 @@ -5391,8 +5391,14 @@ gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, CHAT_USERS_NAME_COLUMN, &val, -1); - if (!gaim_utf8_strcasecmp((char *)l->data, val)) + if (!gaim_utf8_strcasecmp((char *)l->data, val)) { +#if GTK_CHECK_VERSION(2,2,0) f = gtk_list_store_remove(GTK_LIST_STORE(model), &iter); +#else + gtk_list_store_remove(GTK_LIST_STORE(model), &iter); + f = gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter); +#endif + } else f = gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter);
--- a/src/gtkimhtml.c Fri Aug 06 04:30:45 2004 +0000 +++ b/src/gtkimhtml.c Sat Aug 07 03:22:47 2004 +0000 @@ -2402,6 +2402,9 @@ font->face = g_strdup(oldfont->face); if (font->face && (atoi(font->face) > 100)) { /* WTF is this? */ + /* Maybe it sets a max size on the font face? I seem to + * remember bad things happening if the font size was + * 2 billion */ g_free(font->face); font->face = g_strdup("100"); } @@ -2748,7 +2751,6 @@ #if GTK_CHECK_VERSION(2,2,0) GSList *formats = gdk_pixbuf_get_formats(); #else - GtkIMHtmlImage *image = g_object_get_data(G_OBJECT(sel), "GtkIMHtmlImage"); char *basename = g_path_get_basename(filename); char *ext = strrchr(basename, '.'); #endif