Mercurial > pidgin.yaz
diff pidgin/gtkthemes.c @ 32520:fe75cd926073
Webkit Message views.
This commit is a squashed commit of the series of commits from my git repository which I was using for development.
(git://github.com/tdrhq/pidgin-clone.git, branch webkit)
author | tdrhq@soc.pidgin.im |
---|---|
date | Fri, 24 Jul 2009 01:18:07 +0000 |
parents | 584063555949 |
children | c410e48a31c6 |
line wrap: on
line diff
--- a/pidgin/gtkthemes.c Thu Jul 23 04:05:31 2009 +0000 +++ b/pidgin/gtkthemes.c Fri Jul 24 01:18:07 2009 +0000 @@ -270,6 +270,8 @@ if (*i == '[' && strchr(i, ']') && load) { struct smiley_list *child = g_new0(struct smiley_list, 1); child->sml = g_strndup(i+1, strchr(i, ']') - i - 1); + child->files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + if (theme->list) list->next = child; else @@ -320,6 +322,7 @@ } else { GtkIMHtmlSmiley *smiley = gtk_imhtml_smiley_create(sfile, l, hidden, 0); list->smileys = g_slist_prepend(list->smileys, smiley); + g_hash_table_insert (list->files, g_strdup(l), g_strdup(sfile)); } while (isspace(*i)) i++; @@ -361,7 +364,6 @@ if (PIDGIN_IS_PIDGIN_CONVERSATION(conv)) { /* We want to see our custom smileys on our entry if we write the shortcut */ - pidgin_themes_smiley_themeize(PIDGIN_CONVERSATION(conv)->imhtml); pidgin_themes_smiley_themeize_custom(PIDGIN_CONVERSATION(conv)->entry); } }