Mercurial > pidgin

changeset 26398:04a9e8435bfb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '21bd048f68510f25c5c854a1c7e395e88f530503' and '22ecf5b2d3d8874d498194695cb625a789c0754a'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Wed, 01 Apr 2009 05:24:19 +0000
parents 43dcfcdd6a73 (diff) f5f08111da52 (current diff)
children 341864c1d1f9
files libpurple/protocols/toc/Makefile.am libpurple/protocols/toc/Makefile.mingw libpurple/protocols/toc/PROTOCOL libpurple/protocols/toc/toc.c
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkconvwin.h	Wed Apr 01 04:25:37 2009 +0000
+++ b/pidgin/gtkconvwin.h	Wed Apr 01 05:24:19 2009 +0000
@@ -96,11 +96,10 @@
 	gint drag_motion_signal;
 	gint drag_leave_signal;
 
-#ifdef USE_VV
+	/* Media menu options. */
 	GtkWidget *audio_call;
 	GtkWidget *video_call;
 	GtkWidget *audio_video_call;
-#endif
 };
 
 /*@}*/