From: Nathan W. <fac...@us...> - 2003-10-29 20:09:54
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1:/tmp/cvs-serv16322/src Modified Files: gtkimhtml.c Log Message: some 64bit goodness Index: gtkimhtml.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v retrieving revision 1.209 retrieving revision 1.210 diff -u -d -p -r1.209 -r1.210 --- gtkimhtml.c 28 Oct 2003 00:29:32 -0000 1.209 +++ gtkimhtml.c 29 Oct 2003 20:09:50 -0000 1.210 @@ -693,7 +693,7 @@ gtk_smiley_tree_lookup (GtkSmileyTree *t pos = strchr (t->values->str, *x); if (pos) - t = t->children [(int) pos - GPOINTER_TO_INT(t->values->str)]; + t = t->children [GPOINTER_TO_INT(pos) - GPOINTER_TO_INT(t->values->str)]; else break; @@ -714,7 +714,7 @@ gtk_imhtml_associate_smiley (GtkIMHtml GtkSmileyTree *tree; g_return_if_fail (imhtml != NULL); g_return_if_fail (GTK_IS_IMHTML (imhtml)); - + if (sml == NULL) tree = imhtml->default_smilies; else if ((tree = g_hash_table_lookup(imhtml->smiley_data, sml))) { @@ -748,7 +748,7 @@ gtk_imhtml_is_smiley (GtkIMHtml *imhtm } if (tree == NULL) return FALSE; - + *len = gtk_smiley_tree_lookup (tree, text); return (*len > 0); } @@ -762,9 +762,9 @@ gtk_smiley_tree_image (GtkIMHtml *im const gchar *x = text; if (sml == NULL) t = imhtml->default_smilies; - else + else t = g_hash_table_lookup(imhtml->smiley_data, sml); - + if (t == NULL) return sml ? gtk_smiley_tree_image(imhtml, NULL, text) : NULL; @@ -775,10 +775,10 @@ gtk_smiley_tree_image (GtkIMHtml *im if (!t->values) { return sml ? gtk_smiley_tree_image(imhtml, NULL, text) : NULL; } - + pos = strchr (t->values->str, *x); if (pos) { - t = t->children [(int) pos - GPOINTER_TO_INT(t->values->str)]; + t = t->children [GPOINTER_TO_INT(pos) - GPOINTER_TO_INT(t->values->str)]; } else { return sml ? gtk_smiley_tree_image(imhtml, NULL, text) : NULL; } |