comparison 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
comparison
equal deleted inserted replaced
28007:ed3184cc557d 32520:fe75cd926073
268 i++; 268 i++;
269 269
270 if (*i == '[' && strchr(i, ']') && load) { 270 if (*i == '[' && strchr(i, ']') && load) {
271 struct smiley_list *child = g_new0(struct smiley_list, 1); 271 struct smiley_list *child = g_new0(struct smiley_list, 1);
272 child->sml = g_strndup(i+1, strchr(i, ']') - i - 1); 272 child->sml = g_strndup(i+1, strchr(i, ']') - i - 1);
273 child->files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
274
273 if (theme->list) 275 if (theme->list)
274 list->next = child; 276 list->next = child;
275 else 277 else
276 theme->list = child; 278 theme->list = child;
277 /* Reverse the Smiley list since it was built in reverse order for efficiency reasons */ 279 /* Reverse the Smiley list since it was built in reverse order for efficiency reasons */
318 if (!sfile) { 320 if (!sfile) {
319 sfile = g_build_filename(dirname, l, NULL); 321 sfile = g_build_filename(dirname, l, NULL);
320 } else { 322 } else {
321 GtkIMHtmlSmiley *smiley = gtk_imhtml_smiley_create(sfile, l, hidden, 0); 323 GtkIMHtmlSmiley *smiley = gtk_imhtml_smiley_create(sfile, l, hidden, 0);
322 list->smileys = g_slist_prepend(list->smileys, smiley); 324 list->smileys = g_slist_prepend(list->smileys, smiley);
325 g_hash_table_insert (list->files, g_strdup(l), g_strdup(sfile));
323 } 326 }
324 while (isspace(*i)) 327 while (isspace(*i))
325 i++; 328 i++;
326 329
327 } 330 }
359 for (cnv = purple_get_conversations(); cnv != NULL; cnv = cnv->next) { 362 for (cnv = purple_get_conversations(); cnv != NULL; cnv = cnv->next) {
360 PurpleConversation *conv = cnv->data; 363 PurpleConversation *conv = cnv->data;
361 364
362 if (PIDGIN_IS_PIDGIN_CONVERSATION(conv)) { 365 if (PIDGIN_IS_PIDGIN_CONVERSATION(conv)) {
363 /* We want to see our custom smileys on our entry if we write the shortcut */ 366 /* We want to see our custom smileys on our entry if we write the shortcut */
364 pidgin_themes_smiley_themeize(PIDGIN_CONVERSATION(conv)->imhtml);
365 pidgin_themes_smiley_themeize_custom(PIDGIN_CONVERSATION(conv)->entry); 367 pidgin_themes_smiley_themeize_custom(PIDGIN_CONVERSATION(conv)->entry);
366 } 368 }
367 } 369 }
368 } 370 }
369 } 371 }