comparison: pidgin/gtksmiley-theme.c
pidgin/gtksmiley-theme.c
- changeset 35739
- cb9acfd6fa1e
- parent 35738
- 030ce6840163
- child 35757
- 05981ff3fb7b
equal
deleted
inserted
replaced
| 35738:030ce6840163 | 35739:cb9acfd6fa1e |
|---|---|
| 418 } | 418 } |
| 419 | 419 |
| 420 PurpleSmileyList * | 420 PurpleSmileyList * |
| 421 pidgin_smiley_theme_for_conv(PurpleConversation *conv) | 421 pidgin_smiley_theme_for_conv(PurpleConversation *conv) |
| 422 { | 422 { |
| 423 PurpleAccount *acc; | 423 PurpleAccount *acc = NULL; |
| 424 PurpleSmileyTheme *theme; | 424 PurpleSmileyTheme *theme; |
| 425 const gchar *proto_name = NULL; | 425 const gchar *proto_name = NULL; |
| 426 | 426 |
| 427 theme = purple_smiley_theme_get_current(); | 427 theme = purple_smiley_theme_get_current(); |
| 428 if (theme == NULL) | 428 if (theme == NULL) |
| 483 PurpleSmiley *smiley; | 483 PurpleSmiley *smiley; |
| 484 gchar *shortcut = it3->data; | 484 gchar *shortcut = it3->data; |
| 485 | 485 |
| 486 smiley = purple_smiley_new( | 486 smiley = purple_smiley_new( |
| 487 shortcut, smiley_path); | 487 shortcut, smiley_path); |
| 488 g_object_set_data(G_OBJECT(smiley), | |
| 489 "pidgin-smiley-hidden", | |
| 490 GINT_TO_POINTER(smiley_idx->hidden)); | |
| 488 purple_smiley_list_add(proto_smileys, smiley); | 491 purple_smiley_list_add(proto_smileys, smiley); |
| 489 g_object_unref(smiley); | 492 g_object_unref(smiley); |
| 490 } | 493 } |
| 491 } | 494 } |
| 492 } | 495 } |
| 496 | 499 |
| 497 static PurpleSmileyList * | 500 static PurpleSmileyList * |
| 498 pidgin_smiley_theme_get_smileys_impl(PurpleSmileyTheme *theme, gpointer ui_data) | 501 pidgin_smiley_theme_get_smileys_impl(PurpleSmileyTheme *theme, gpointer ui_data) |
| 499 { | 502 { |
| 500 PidginSmileyThemePrivate *priv = PIDGIN_SMILEY_THEME_GET_PRIVATE(theme); | 503 PidginSmileyThemePrivate *priv = PIDGIN_SMILEY_THEME_GET_PRIVATE(theme); |
| 501 PurpleSmileyList *smileys; | 504 PurpleSmileyList *smileys = NULL; |
| 502 | 505 |
| 503 pidgin_smiley_theme_activate_impl(theme); | 506 pidgin_smiley_theme_activate_impl(theme); |
| 504 | 507 |
| 505 smileys = g_hash_table_lookup(priv->smiley_lists_map, ui_data); | 508 if (ui_data) |
| 509 smileys = g_hash_table_lookup(priv->smiley_lists_map, ui_data); | |
| 506 if (smileys != NULL) | 510 if (smileys != NULL) |
| 507 return smileys; | 511 return smileys; |
| 508 | 512 |
| 509 return g_hash_table_lookup(priv->smiley_lists_map, "default"); | 513 return g_hash_table_lookup(priv->smiley_lists_map, "default"); |
| 510 } | 514 } |
