diff -r eef033bae51d -r b6021cd613c5 pidgin/gtkconvwin.h
--- a/pidgin/gtkconvwin.h	Sun Jul 25 23:40:05 2010 +0000
+++ b/pidgin/gtkconvwin.h	Mon Jul 26 04:14:44 2010 +0000
@@ -46,10 +46,8 @@
 
 	struct
 	{
-/* Some necessary functions were only added in 2.6.0 */
 		GtkWidget *menubar;
 
-#if GTK_CHECK_VERSION(2,6,0)
 		GtkAction *view_log;
 
 		GtkAction *send_file;
@@ -70,28 +68,7 @@
 		GtkAction *sounds;
 		GtkAction *show_formatting_toolbar;
 		GtkAction *show_timestamps;
-#else
-		GtkWidget *view_log;
 
-		GtkWidget *send_file;
-		GtkWidget *add_pounce;
-		GtkWidget *get_info;
-		GtkWidget *invite;
-
-		GtkWidget *alias;
-		GtkWidget *block;
-		GtkWidget *unblock;
-		GtkWidget *add;
-		GtkWidget *remove;
-
-		GtkWidget *insert_link;
-		GtkWidget *insert_image;
-
-		GtkWidget *logging;
-		GtkWidget *sounds;
-		GtkWidget *show_formatting_toolbar;
-		GtkWidget *show_timestamps;
-#endif
 		GtkWidget *show_icon;
 
 		GtkWidget *send_to;
@@ -100,11 +77,7 @@
 
 		GtkWidget *typing_icon;
 
-#if GTK_CHECK_VERSION(2,6,0)
 		GtkUIManager *ui;
-#else
-		GtkItemFactory *item_factory;
-#endif
 
 	} menu;
 
@@ -126,15 +99,9 @@
 	gint drag_leave_signal;
 
 	/* Media menu options. */
-#if GTK_CHECK_VERSION(2,6,0)
 	GtkAction *audio_call;
 	GtkAction *video_call;
 	GtkAction *audio_video_call;
-#else
-	GtkWidget *audio_call;
-	GtkWidget *video_call;
-	GtkWidget *audio_video_call;
-#endif
 };
 
 /*@}*/