# HG changeset patch
# User mikanbako <maoutwo@gmail.com>
# Date 1215771955 -32400
# Node ID ceabb8099bf34a09734f34e0978f4a61b1ec1357
# Parent  86772af940ce81e0ff389ab03165d0049d8b58b9# Parent  f207cc8da6cdd43f112962dfdec113a5e06f2b23
merged

diff -r 86772af940ce -r ceabb8099bf3 pidgin-twitter.c
--- a/pidgin-twitter.c	Fri Jul 11 14:01:20 2008 +0900
+++ b/pidgin-twitter.c	Fri Jul 11 19:25:55 2008 +0900
@@ -1232,7 +1232,9 @@
     }
 
     /* insert icon actually */
-    gtk_imhtml_insert_image_at_iter(target_imhtml, icon_id, &insertion_point);
+    if(purple_prefs_get_bool(OPT_SHOW_ICON))
+        gtk_imhtml_insert_image_at_iter(target_imhtml,
+                                        icon_id, &insertion_point);
     gtk_text_buffer_delete_mark(target_buffer, requested_mark);
     requested_mark = NULL;
 }
@@ -1661,7 +1663,8 @@
     }
 
     /* if we have icon for this user, insert icon immediately */
-    gtk_imhtml_insert_image_at_iter(imhtml, icon_id, &insertion_point);
+    if(purple_prefs_get_bool(OPT_SHOW_ICON))
+        gtk_imhtml_insert_image_at_iter(imhtml, icon_id, &insertion_point);
     g_free(user_name); user_name = NULL;
 
     twitter_debug("reach end of function\n");
@@ -1865,6 +1868,11 @@
                                                       "Suppress oops message");
     purple_plugin_pref_frame_add(frame, pref);
 
+    /* show icon */
+    pref = purple_plugin_pref_new_with_name_and_label(OPT_SHOW_ICON,
+                                                      "Show icon");
+    purple_plugin_pref_frame_add(frame, pref);
+
 
     /*****************/
     /* sound heading */
@@ -2022,8 +2030,10 @@
 
     purple_prefs_add_bool(OPT_COUNTER, TRUE);
     purple_prefs_add_bool(OPT_SUPPRESS_OOPS, TRUE);
+    purple_prefs_add_bool(OPT_PREVENT_NOTIFICATION, FALSE);
+    purple_prefs_add_bool(OPT_SHOW_ICON, TRUE);
 
-    purple_prefs_add_bool(OPT_PREVENT_NOTIFICATION, FALSE);
+
 
     purple_prefs_add_bool(OPT_API_BASE_POST, FALSE);
     purple_prefs_add_string(OPT_SCREEN_NAME, EMPTY);
diff -r 86772af940ce -r ceabb8099bf3 pidgin-twitter.h
--- a/pidgin-twitter.h	Fri Jul 11 14:01:20 2008 +0900
+++ b/pidgin-twitter.h	Fri Jul 11 19:25:55 2008 +0900
@@ -48,6 +48,7 @@
 #define OPT_API_BASE_POST       OPT_PIDGINTWITTER "/api_base_post"
 #define OPT_SCREEN_NAME         OPT_PIDGINTWITTER "/screen_name"
 #define OPT_PASSWORD            OPT_PIDGINTWITTER "/password"
+#define OPT_SHOW_ICON           OPT_PIDGINTWITTER "/show_icon"
 
 /* formats and templates */
 #define RECIPIENT_FORMAT_TWITTER "@<a href='http://twitter.com/%s'>%s</a>"