pidgin/gtkthemes.c

branch
soc.2013.gobjectification.plugins
changeset 36424
477889a0073c
parent 36361
9e68a23150cf
child 36543
a8c3fecee2d3
equal deleted inserted replaced
36423:22981e338804 36424:477889a0073c
394 pidgin_themes_load_smiley_theme(smile->path, TRUE); 394 pidgin_themes_load_smiley_theme(smile->path, TRUE);
395 } 395 }
396 } 396 }
397 397
398 GSList *pidgin_themes_get_proto_smileys(const char *id) { 398 GSList *pidgin_themes_get_proto_smileys(const char *id) {
399 PurplePlugin *proto; 399 PurplePluginProtocolInfo *prpl_info;
400 struct smiley_list *list, *def; 400 struct smiley_list *list, *def;
401 401
402 if ((current_smiley_theme == NULL) || (current_smiley_theme->list == NULL)) 402 if ((current_smiley_theme == NULL) || (current_smiley_theme->list == NULL))
403 return NULL; 403 return NULL;
404 404
405 def = list = current_smiley_theme->list; 405 def = list = current_smiley_theme->list;
406 406
407 if (id == NULL) 407 if (id == NULL)
408 return def->smileys; 408 return def->smileys;
409 409
410 proto = purple_find_protocol_info(id); 410 prpl_info = purple_find_protocol_info(id);
411 411
412 while (list) { 412 while (list) {
413 if (!strcmp(list->sml, "default")) 413 if (!strcmp(list->sml, "default"))
414 def = list; 414 def = list;
415 else if (proto && !strcmp(proto->info->name, list->sml)) 415 else if (prpl_info && !strcmp(prpl_info->name, list->sml))
416 break; 416 break;
417 417
418 list = list->next; 418 list = list->next;
419 } 419 }
420 420

mercurial