Mercurial > pidgin3 / file diff

--- a/pidgin/gtksmiley-theme.c	Fri Apr 04 00:47:41 2014 +0200
+++ b/pidgin/gtksmiley-theme.c	Fri Apr 04 01:06:03 2014 +0200
@@ -420,7 +420,7 @@
 PurpleSmileyList *
 pidgin_smiley_theme_for_conv(PurpleConversation *conv)
 {
-	PurpleAccount *acc;
+	PurpleAccount *acc = NULL;
 	PurpleSmileyTheme *theme;
 	const gchar *proto_name = NULL;
 
@@ -485,6 +485,9 @@
 
 				smiley = purple_smiley_new(
 					shortcut, smiley_path);
+				g_object_set_data(G_OBJECT(smiley),
+					"pidgin-smiley-hidden",
+					GINT_TO_POINTER(smiley_idx->hidden));
 				purple_smiley_list_add(proto_smileys, smiley);
 				g_object_unref(smiley);
 			}
@@ -498,11 +501,12 @@
 pidgin_smiley_theme_get_smileys_impl(PurpleSmileyTheme *theme, gpointer ui_data)
 {
 	PidginSmileyThemePrivate *priv = PIDGIN_SMILEY_THEME_GET_PRIVATE(theme);
-	PurpleSmileyList *smileys;
+	PurpleSmileyList *smileys = NULL;
 
 	pidgin_smiley_theme_activate_impl(theme);
 
-	smileys = g_hash_table_lookup(priv->smiley_lists_map, ui_data);
+	if (ui_data)
+		smileys = g_hash_table_lookup(priv->smiley_lists_map, ui_data);
 	if (smileys != NULL)
 		return smileys;