/pidgin/main: 00e61752e21c: Fix build and warnings after merge

[Tomasz Wasilczyk]

Changeset: 00e61752e21cba65b79c48f48c657d1ffeb2154c
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-04-05 03:58 +0200
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/00e61752e21c

Description:

Fix build and warnings after merge

diffstat:

 libpurple/protocols/msn/msg.c |  6 +++++-
 libpurple/protocols/msn/msn.c |  6 +-----
 pidgin/gtkconv.c              |  2 --
 pidgin/gtksmiley-theme.c      |  6 +++---
 pidgin/gtkwebviewtoolbar.c    |  5 +----
 po/POTFILES.in                |  3 +--
 6 files changed, 11 insertions(+), 17 deletions(-)

diffs (140 lines):

diff --git a/libpurple/protocols/msn/msg.c b/libpurple/protocols/msn/msg.c
--- a/libpurple/protocols/msn/msg.c
+++ b/libpurple/protocols/msn/msg.c
@@ -932,7 +932,7 @@ void msn_emoticon_msg(MsnCmdProc *cmdpro
 	MsnObject *obj;
 	char **tokens;
 	char *smile, *body_str;
-	const char *body, *who, *sha1;
+	const char *body, *who; /*, *sha1;*/
 	guint tok;
 	size_t body_len;
 
@@ -971,7 +971,9 @@ void msn_emoticon_msg(MsnCmdProc *cmdpro
 			break;
 
 		who = msn_object_get_creator(obj);
+#if 0
 		sha1 = msn_object_get_sha1(obj);
+#endif
 
 		slplink = msn_session_get_slplink(session, who);
 		if (slplink->swboard != swboard) {
@@ -1009,7 +1011,9 @@ void msn_emoticon_msg(MsnCmdProc *cmdpro
 		msn_object_destroy(obj, FALSE);
 		obj =   NULL;
 		who =   NULL;
+#if 0
 		sha1 = NULL;
+#endif
 	}
 	g_strfreev(tokens);
 }
diff --git a/libpurple/protocols/msn/msn.c b/libpurple/protocols/msn/msn.c
--- a/libpurple/protocols/msn/msn.c
+++ b/libpurple/protocols/msn/msn.c
@@ -1473,9 +1473,6 @@ static GSList* msn_msg_grab_emoticons(co
 	GSList *list = NULL;
 	GList *smileys, *it;
 	MsnEmoticon *emoticon;
-	int length;
-
-	length = strlen(msg);
 
 	smileys = purple_smiley_find(purple_smiley_custom_get_list(),
 		msg, FALSE);
@@ -2055,8 +2052,7 @@ msn_chat_send(PurpleConnection *gc, int 
 	g_free(msgformat);
 	g_free(msgtext);
 
-	purple_serv_got_chat_in(gc, id, purple_account_get_username(account), flags,
-					 message, time(NULL));
+	purple_serv_got_chat_in(gc, id, username, flags, message, time(NULL));
 
 	return 0;
 }
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -2348,7 +2348,6 @@ pidgin_conv_switch_active_conversation(P
 	PidginConversation *gtkconv;
 	PurpleConversation *old_conv;
 	PidginWebView *entry;
-	const char *protocol_name;
 	PurpleConnectionFlags features;
 
 	g_return_if_fail(conv != NULL);
@@ -2373,7 +2372,6 @@ pidgin_conv_switch_active_conversation(P
 		gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(gtkconv->win->menu->logging)));
 
 	entry = PIDGIN_WEBVIEW(gtkconv->entry);
-	protocol_name = purple_account_get_protocol_name(purple_conversation_get_account(conv));
 
 	features = purple_conversation_get_features(conv);
 	if (!(features & PURPLE_CONNECTION_FLAG_HTML))
diff --git a/pidgin/gtksmiley-theme.c b/pidgin/gtksmiley-theme.c
--- a/pidgin/gtksmiley-theme.c
+++ b/pidgin/gtksmiley-theme.c
@@ -157,8 +157,8 @@ pidgin_smiley_theme_index_parse(const gc
 			continue;
 
 		if (!g_utf8_validate(buff, -1, NULL)) {
-			purple_debug_error("gtksmiley-theme", "%s:%"
-				G_GSIZE_FORMAT " is invalid UTF-8",
+			purple_debug_error("gtksmiley-theme",
+				"%s:%d is invalid UTF-8",
 				index_path, line_no);
 			continue;
 		}
@@ -253,7 +253,7 @@ pidgin_smiley_theme_index_parse(const gc
 	fclose(file);
 
 	if (inv_frm) {
-		purple_debug_error("gtksmiley-theme", "%s:%" G_GSIZE_FORMAT
+		purple_debug_error("gtksmiley-theme", "%s:%d"
 			" invalid format", index_path, line_no);
 		pidgin_smiley_theme_index_free(index);
 		index = NULL;
diff --git a/pidgin/gtkwebviewtoolbar.c b/pidgin/gtkwebviewtoolbar.c
--- a/pidgin/gtkwebviewtoolbar.c
+++ b/pidgin/gtkwebviewtoolbar.c
@@ -798,9 +798,8 @@ add_smiley_list(PidginWebViewToolbar *to
 		GtkImage *image;
 		guint width;
 		const gchar *smiley_shortcut;
-		const gchar *smiley_path;
 
-		smiley_path = purple_smiley_get_path(smiley);
+		smiley_shortcut = purple_smiley_get_shortcut(smiley);
 
 		width = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(smiley),
 			"pidgin-webviewtoolbar-button-width"));
@@ -814,8 +813,6 @@ add_smiley_list(PidginWebViewToolbar *to
 
 		image = GTK_IMAGE(gtk_image_new_from_pixbuf(pixbuf));
 
-		smiley_shortcut = purple_smiley_get_shortcut(smiley);
-
 		button = gtk_button_new();
 		gtk_container_add(GTK_CONTAINER(button), GTK_WIDGET(image));
 		g_object_set_data_full(G_OBJECT(button), "smiley_text",
diff --git a/po/POTFILES.in b/po/POTFILES.in
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -226,7 +226,7 @@ pidgin/gtkprivacy.c
 pidgin/gtkrequest.c
 pidgin/gtkroomlist.c
 pidgin/gtksavedstatuses.c
-pidgin/gtksmiley.c
+pidgin/gtksmiley-manager.c
 pidgin/gtksound.c
 pidgin/gtkstatusbox.c
 pidgin/gtkutils.c
@@ -239,7 +239,6 @@ pidgin/pidgin.h
 pidgin/pidginstock.c
 pidgin/pidgintooltip.c
 pidgin/pixmaps/emotes/default/24/default.theme.in
-pidgin/pixmaps/emotes/none/none.theme.in
 pidgin/pixmaps/emotes/small/16/small.theme.in
 pidgin/plugins/cap/cap.c
 pidgin/plugins/contact_priority.c