Bug#625418: pidgin-twitter: ftbfs with gcc-4.6 -Werror

[Stefano Rivera]

tags 625418 + patch
thanks

This appears to be fixed in upstream 0.9.2.1. We applied the following
patch, cherry-picked from upstream in Ubuntu, but it's probably
preferable to simply package the new upstream version.

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  H: +27 21 465 6908 C: +27 72 419 8559  UCT: x3127

# HG changeset patch
# User Yoshiki Yazawa <y...@honeyplanet.jp>
# Date 1305212030 -32400
# Node ID c6392a86839b1d7307dfb94b063a460b2501d003
# Parent  93cab0334b877f066030686051fea00e62d201f4
compilation fix for gcc 4.6. patch by dai <d+pid...@vdr.jp>

diff -r 93cab0334b87 -r c6392a86839b main.c
--- a/main.c	Tue Aug 31 17:43:11 2010 +0900
+++ b/main.c	Thu May 12 23:53:50 2011 +0900
@@ -711,10 +711,8 @@
 {
     PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
     GtkWidget *box, *sep, *counter, *menus;
-    GtkIMHtml *imhtml;
 
     box = gtkconv->toolbar;
-    imhtml = GTK_IMHTML(gtkconv->imhtml);
 
     /* Disable widgets that decorate or add link to composing text
      * because Twitter cannot receive marked up string. For lean-view
diff -r 93cab0334b87 -r c6392a86839b twitter_api.c
--- a/twitter_api.c	Tue Aug 31 17:43:11 2010 +0900
+++ b/twitter_api.c	Thu May 12 23:53:50 2011 +0900
@@ -896,17 +896,12 @@
 {
     char *request, *header;
     const char *url_encoded = g_uri_escape_string(*buffer, "", FALSE);
-    PurpleConversation *conv;
     char *oauth;
     twitter_message_t *tm;
     const char *a_key = NULL;
     const char *a_sec = NULL;
     oauth_request_t oauth_req;
 
-    conv = purple_find_conversation_with_account(
-        PURPLE_CONV_TYPE_ANY, "twit...@twitter.com",
-        account_for_twitter); /* xxx */
-
     a_key = purple_prefs_get_string(OPT_AKEY_TWITTER);
     a_sec = purple_prefs_get_string(OPT_ASEC_TWITTER);
 
@@ -969,14 +964,8 @@
     char *oauth;
     const char *a_key = NULL;
     const char *a_sec = NULL;
-    PurpleConversation *conv;
     oauth_request_t oauth_req;
 
-    conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY,
-                                                 "twit...@twitter.com",
-                                                 account_for_twitter); /* xxx */
-
-
     a_key = purple_prefs_get_string(OPT_AKEY_TWITTER);
     a_sec = purple_prefs_get_string(OPT_ASEC_TWITTER);
 
@@ -1033,13 +1022,8 @@
     char *oauth;
     const char *a_key = NULL;
     const char *a_sec = NULL;
-    PurpleConversation *conv;
     oauth_request_t oauth_req;
 
-    conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY,
-                                                 "twit...@twitter.com",
-                                                 account_for_twitter); /* xxx */
-
     a_key = purple_prefs_get_string(OPT_AKEY_TWITTER);
     a_sec = purple_prefs_get_string(OPT_ASEC_TWITTER);