--- a/pidgin/gtkimhtml.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkimhtml.h	Wed Jan 04 00:00:42 2012 +0000
@@ -31,9 +31,7 @@
 
 #include "connection.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 /**************************************************************************
  * @name Structures
@@ -828,8 +826,6 @@
 
 /*@}*/
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _PIDGINIMHTML_H_ */