Mercurial > pidgin

changeset 32436:34f778db624f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add G_BEGIN/END_DECLS to Pidgin public headers, most of which did not have these checks.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Wed, 04 Jan 2012 00:00:42 +0000
parents a6cc3de38233
children 5dea9a26078d
files pidgin/gtkaccount.h pidgin/gtkblist-theme.h pidgin/gtkblist.h pidgin/gtkcellrendererexpander.h pidgin/gtkcertmgr.h pidgin/gtkconn.h pidgin/gtkconv.h pidgin/gtkconvwin.h pidgin/gtkdebug.h pidgin/gtkdialogs.h pidgin/gtkdnd-hints.h pidgin/gtkdocklet.h pidgin/gtkeventloop.h pidgin/gtkft.h pidgin/gtkidle.h pidgin/gtkimhtml.h pidgin/gtkimhtmltoolbar.h pidgin/gtklog.h pidgin/gtknotify.h pidgin/gtkplugin.h pidgin/gtkpluginpref.h pidgin/gtkpounce.h pidgin/gtkprefs.h pidgin/gtkprivacy.h pidgin/gtkrequest.h pidgin/gtkroomlist.h pidgin/gtksavedstatuses.h pidgin/gtksession.h pidgin/gtksmiley.h pidgin/gtksound.h pidgin/gtksourceundomanager.h pidgin/gtkthemes.h pidgin/gtkutils.h pidgin/gtkwebview.h pidgin/gtkwhiteboard.h pidgin/pidgintooltip.h pidgin/smileyparser.h
diffstat 37 files changed, 135 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkaccount.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkaccount.h	Wed Jan 04 00:00:42 2012 +0000
@@ -37,6 +37,8 @@
 } PidginAccountDialogType;
 
 
+G_BEGIN_DECLS
+
 /**
  * Shows the accounts window.
  */
@@ -80,4 +82,6 @@
  */
 void pidgin_account_uninit(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINACCOUNT_H_ */
--- a/pidgin/gtkblist-theme.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkblist-theme.h	Wed Jan 04 00:00:42 2012 +0000
@@ -79,6 +79,8 @@
 
 } PidginBlistLayout;
 
+G_BEGIN_DECLS
+
 /**************************************************************************/
 /** @name PidginThemeFont API                                               */
 /**************************************************************************/
@@ -146,7 +148,6 @@
 /**************************************************************************/
 /** @name Purple Buddy List Theme API                                     */
 /**************************************************************************/
-G_BEGIN_DECLS
 
 /**
  * GObject foo.
@@ -434,4 +435,5 @@
 void pidgin_blist_theme_set_status_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair);
 
 G_END_DECLS
+
 #endif /* PIDGIN_BLIST_THEME_H */
--- a/pidgin/gtkblist.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkblist.h	Wed Jan 04 00:00:42 2012 +0000
@@ -127,6 +127,8 @@
 #define PIDGIN_IS_PIDGIN_BLIST(list) \
 	(purple_blist_get_ui_ops() == pidgin_blist_get_ui_ops())
 
+G_BEGIN_DECLS
+
 /**************************************************************************
  * @name GTK+ Buddy List API
  **************************************************************************/
@@ -397,5 +399,6 @@
  */
 void pidgin_blist_tooltip_destroy(void);
 
+G_END_DECLS
 
 #endif /* _PIDGINBLIST_H_ */
--- a/pidgin/gtkcellrendererexpander.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkcellrendererexpander.h	Wed Jan 04 00:00:42 2012 +0000
@@ -23,11 +23,6 @@
 
 #include <gtk/gtk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
 #define PIDGIN_TYPE_GTK_CELL_RENDERER_EXPANDER         (pidgin_cell_renderer_expander_get_type())
 #define PIDGIN_CELL_RENDERER_EXPANDER(obj)         (G_TYPE_CHECK_INSTANCE_CAST((obj), PIDGIN_TYPE_GTK_CELL_RENDERER_EXPANDER, PidginCellRendererExpander))
 #define PIDGIN_CELL_RENDERER_EXPANDER_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), PURPLE_TYPE_GTK_CELL_RENDERER_EXPANDER, PidginCellRendererExpanderClass))
@@ -48,12 +43,11 @@
 	GtkCellRendererClass parent_class;
 };
 
+G_BEGIN_DECLS
+
 GType            pidgin_cell_renderer_expander_get_type     (void);
 GtkCellRenderer  *pidgin_cell_renderer_expander_new          (void);
 
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _PIDGINCELLRENDEREREXPANDER_H_ */
--- a/pidgin/gtkcertmgr.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkcertmgr.h	Wed Jan 04 00:00:42 2012 +0000
@@ -43,6 +43,8 @@
 	gchar *label;
 };
 
+G_BEGIN_DECLS
+
 /**************************************************************************/
 /** @name Certificate Manager API                                         */
 /**************************************************************************/
@@ -59,4 +61,6 @@
 
 /*@}*/
 
+G_END_DECLS
+
 #endif /* _PIDGINCERTMGR_H_ */
--- a/pidgin/gtkconn.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkconn.h	Wed Jan 04 00:00:42 2012 +0000
@@ -25,6 +25,8 @@
 #ifndef _PIDGINCONN_H_
 #define _PIDGINCONN_H_
 
+G_BEGIN_DECLS
+
 /**************************************************************************/
 /** @name GTK+ Connection API                                             */
 /**************************************************************************/
@@ -56,4 +58,6 @@
  */
 void pidgin_connection_uninit(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINCONN_H_ */
--- a/pidgin/gtkconv.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkconv.h	Wed Jan 04 00:00:42 2012 +0000
@@ -153,6 +153,8 @@
 
 /*@}*/
 
+G_BEGIN_DECLS
+
 /**************************************************************************
  * @name GTK+ Conversation API
  **************************************************************************/
@@ -265,4 +267,6 @@
 
 /*@}*/
 
+G_END_DECLS
+
 #endif /* _PIDGIN_CONVERSATION_H_ */
--- a/pidgin/gtkconvwin.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkconvwin.h	Wed Jan 04 00:00:42 2012 +0000
@@ -106,6 +106,8 @@
 
 /*@}*/
 
+G_BEGIN_DECLS
+
 /**************************************************************************
  * @name GTK+ Conversation Window API
  **************************************************************************/
@@ -152,4 +154,6 @@
 
 /*@}*/
 
+G_END_DECLS
+
 #endif /* _PIDGIN_CONVERSATION_WINDOW_H_ */
--- a/pidgin/gtkdebug.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkdebug.h	Wed Jan 04 00:00:42 2012 +0000
@@ -28,6 +28,8 @@
 
 #include "debug.h"
 
+G_BEGIN_DECLS
+
 /**
  * Initializes the GTK+ debug system.
  */
@@ -62,4 +64,6 @@
  */
 PurpleDebugUiOps *pidgin_debug_get_ui_ops(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINDEBUG_H_ */
--- a/pidgin/gtkdialogs.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkdialogs.h	Wed Jan 04 00:00:42 2012 +0000
@@ -30,6 +30,8 @@
 #include "account.h"
 #include "conversation.h"
 
+G_BEGIN_DECLS
+
 /* Functions in gtkdialogs.c (these should actually stay in this file) */
 void pidgin_dialogs_destroy_all(void);
 void pidgin_dialogs_about(void);
@@ -53,4 +55,6 @@
 /* This macro should probably be moved elsewhere */
 #define PIDGIN_WINDOW_ICONIFIED(x) (gdk_window_get_state(GTK_WIDGET(x)->window) & GDK_WINDOW_STATE_ICONIFIED)
 
+G_END_DECLS
+
 #endif /* _PIDGINDIALOGS_H_ */
--- a/pidgin/gtkdnd-hints.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkdnd-hints.h	Wed Jan 04 00:00:42 2012 +0000
@@ -52,6 +52,8 @@
 
 } DndHintPosition;
 
+G_BEGIN_DECLS
+
 /**
  * Shows a drag-and-drop hint at the specified location.
  *
@@ -84,4 +86,6 @@
 void dnd_hints_show_relative(DndHintWindowId id, GtkWidget *widget,
 							 DndHintPosition horiz, DndHintPosition vert);
 
+G_END_DECLS
+
 #endif /* _PIDGIN_DND_HINTS_H_ */
--- a/pidgin/gtkdocklet.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkdocklet.h	Wed Jan 04 00:00:42 2012 +0000
@@ -25,9 +25,13 @@
 #ifndef _GTKDOCKLET_H_
 #define _GTKDOCKLET_H_
 
+G_BEGIN_DECLS
+
 void pidgin_docklet_init(void);
 void pidgin_docklet_uninit(void);
 void*pidgin_docklet_get_handle(void);
 
+G_END_DECLS
+
 #endif /* _GTKDOCKLET_H_ */
 
--- a/pidgin/gtkeventloop.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkeventloop.h	Wed Jan 04 00:00:42 2012 +0000
@@ -28,6 +28,8 @@
 
 #include "eventloop.h"
 
+G_BEGIN_DECLS
+
 /**
  * Returns the GTK+ event loop UI operations structure.
  *
@@ -35,4 +37,6 @@
  */
 PurpleEventLoopUiOps *pidgin_eventloop_get_ui_ops(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINEVENTLOOP_H_ */
--- a/pidgin/gtkft.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkft.h	Wed Jan 04 00:00:42 2012 +0000
@@ -36,6 +36,8 @@
  */
 typedef struct _PidginXferDialog PidginXferDialog;
 
+G_BEGIN_DECLS
+
 /**************************************************************************/
 /** @name GTK+ File Transfer Dialog API                                   */
 /**************************************************************************/
@@ -145,4 +147,6 @@
 
 /*@}*/
 
+G_END_DECLS
+
 #endif /* _PIDGINFT_H_ */
--- a/pidgin/gtkidle.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkidle.h	Wed Jan 04 00:00:42 2012 +0000
@@ -28,6 +28,8 @@
 
 #include "idle.h"
 
+G_BEGIN_DECLS
+
 /**************************************************************************/
 /** @name GTK+ Idle API                                                  */
 /**************************************************************************/
@@ -42,4 +44,6 @@
 
 /*@}*/
 
+G_END_DECLS
+
 #endif /* _PIDGIN_IDLE_H_ */
--- 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_ */
--- a/pidgin/gtkimhtmltoolbar.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkimhtmltoolbar.h	Wed Jan 04 00:00:42 2012 +0000
@@ -26,9 +26,7 @@
 #include <gtk/gtk.h>
 #include "gtkimhtml.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 #define DEFAULT_FONT_FACE "Helvetica 12"
 
@@ -94,8 +92,6 @@
 void gtk_imhtmltoolbar_switch_active_conversation(GtkIMHtmlToolbar *toolbar,
 	PurpleConversation *conv);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _PIDGINIMHTMLTOOLBAR_H_ */
--- a/pidgin/gtklog.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtklog.h	Wed Jan 04 00:00:42 2012 +0000
@@ -52,6 +52,7 @@
 };
 
 
+G_BEGIN_DECLS
 
 void pidgin_log_show(PurpleLogType type, const char *buddyname, PurpleAccount *account);
 void pidgin_log_show_contact(PurpleContact *contact);
@@ -82,4 +83,6 @@
 
 /*@}*/
 
+G_END_DECLS
+
 #endif
--- a/pidgin/gtknotify.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtknotify.h	Wed Jan 04 00:00:42 2012 +0000
@@ -29,6 +29,8 @@
 #include "notify.h"
 #include "pounce.h"
 
+G_BEGIN_DECLS
+
 /**
  * Adds a buddy pounce to the buddy pounce dialog
  *
@@ -59,4 +61,6 @@
  */
 void pidgin_notify_uninit(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINNOTIFY_H_ */
--- a/pidgin/gtkplugin.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkplugin.h	Wed Jan 04 00:00:42 2012 +0000
@@ -56,6 +56,8 @@
 #define PIDGIN_PLUGIN_UI_INFO(plugin) \
 	((PidginPluginUiInfo *)(plugin)->info->ui_info)
 
+G_BEGIN_DECLS
+
 /**
  * Returns the configuration frame widget for a GTK+ plugin, if one
  * exists.
@@ -77,4 +79,6 @@
  */
 void pidgin_plugin_dialog_show(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINPLUGIN_H_ */
--- a/pidgin/gtkpluginpref.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkpluginpref.h	Wed Jan 04 00:00:42 2012 +0000
@@ -31,9 +31,7 @@
 
 #include "pidgin.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 /**
  * Creates a Gtk Preference frame for a PurplePluginPrefFrame
@@ -43,8 +41,6 @@
  */
 GtkWidget *pidgin_plugin_pref_create_frame(PurplePluginPrefFrame *frame);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _PIDGINPLUGINPREF_H_ */
--- a/pidgin/gtkpounce.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkpounce.h	Wed Jan 04 00:00:42 2012 +0000
@@ -28,6 +28,8 @@
 
 #include "pounce.h"
 
+G_BEGIN_DECLS
+
 /**
  * Displays a New Buddy Pounce or Edit Buddy Pounce dialog.
  *
@@ -60,4 +62,6 @@
  */
 void pidgin_pounces_init(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINPOUNCE_H_ */
--- a/pidgin/gtkprefs.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkprefs.h	Wed Jan 04 00:00:42 2012 +0000
@@ -29,6 +29,8 @@
 
 #include "prefs.h"
 
+G_BEGIN_DECLS
+
 /**
  * Initializes all UI-specific preferences.
  */
@@ -128,4 +130,6 @@
  */
 void pidgin_prefs_update_old(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINPREFS_H_ */
--- a/pidgin/gtkprivacy.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkprivacy.h	Wed Jan 04 00:00:42 2012 +0000
@@ -28,6 +28,8 @@
 
 #include "privacy.h"
 
+G_BEGIN_DECLS
+
 /**
  * Initializes the GTK+ privacy subsystem.
  */
@@ -72,4 +74,6 @@
  */
 PurplePrivacyUiOps *pidgin_privacy_get_ui_ops(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINPRIVACY_H_ */
--- a/pidgin/gtkrequest.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkrequest.h	Wed Jan 04 00:00:42 2012 +0000
@@ -28,6 +28,8 @@
 
 #include "request.h"
 
+G_BEGIN_DECLS
+
 /**
  * Returns the UI operations structure for GTK+ request functions.
  *
@@ -35,4 +37,6 @@
  */
 PurpleRequestUiOps *pidgin_request_get_ui_ops(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINREQUEST_H_ */
--- a/pidgin/gtkroomlist.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkroomlist.h	Wed Jan 04 00:00:42 2012 +0000
@@ -28,6 +28,8 @@
 
 #include "roomlist.h"
 
+G_BEGIN_DECLS
+
 /**
  * Initializes the room list subsystem.
  */
@@ -53,4 +55,6 @@
  */
 void pidgin_roomlist_dialog_show_with_account(PurpleAccount *account);
 
+G_END_DECLS
+
 #endif /* _PIDGINROOMLIST_H_ */
--- a/pidgin/gtksavedstatuses.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtksavedstatuses.h	Wed Jan 04 00:00:42 2012 +0000
@@ -29,6 +29,8 @@
 #include "savedstatuses.h"
 #include "status.h"
 
+G_BEGIN_DECLS
+
 /**
  * Shows the status window.
  */
@@ -85,4 +87,6 @@
  */
 void pidgin_status_uninit(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINSAVEDSTATUSES_H_ */
--- a/pidgin/gtksession.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtksession.h	Wed Jan 04 00:00:42 2012 +0000
@@ -26,6 +26,8 @@
 #ifndef _PIDGINSESSION_H_
 #define _PIDGINSESSION_H_
 
+G_BEGIN_DECLS
+
 /**************************************************************************/
 /** @name X Windows session subsystem                                     */
 /**************************************************************************/
@@ -51,4 +53,6 @@
 
 /*@}*/
 
+G_END_DECLS
+
 #endif /* _PIDGINSESSION_H_ */
--- a/pidgin/gtksmiley.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtksmiley.h	Wed Jan 04 00:00:42 2012 +0000
@@ -31,6 +31,8 @@
 
 typedef struct _PidginSmiley PidginSmiley;
 
+G_BEGIN_DECLS
+
 /**
  * Add a PurpleSmiley to the GtkIMHtmlSmiley's list to be able to use it
  * in pidgin
@@ -108,4 +110,6 @@
  */
 void pidgin_smiley_editor_set_data(PidginSmiley *editor, gpointer data, gsize datasize);
 
+G_END_DECLS
+
 #endif /* PIDGIN_GTKSMILEY_H */
--- a/pidgin/gtksound.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtksound.h	Wed Jan 04 00:00:42 2012 +0000
@@ -28,6 +28,8 @@
 
 #include "sound.h"
 
+G_BEGIN_DECLS
+
 /**************************************************************************/
 /** @name GTK+ Sound API                                                  */
 /**************************************************************************/
@@ -72,4 +74,6 @@
 
 /*@}*/
 
+G_END_DECLS
+
 #endif /* _PIDGINSOUND_H_ */
--- a/pidgin/gtksourceundomanager.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtksourceundomanager.h	Wed Jan 04 00:00:42 2012 +0000
@@ -57,6 +57,8 @@
     	void (*can_redo) (GtkSourceUndoManager *um, gboolean can_redo);
 };
 
+G_BEGIN_DECLS
+
 GType        		gtk_source_undo_manager_get_type	(void) G_GNUC_CONST;
 
 GtkSourceUndoManager* 	gtk_source_undo_manager_new 		(GtkTextBuffer 		*buffer);
@@ -78,6 +80,8 @@
 								(GtkSourceUndoManager 	*um,
 				  	     			 gint		 	 undo_levels);
 
+G_END_DECLS
+
 #endif /* __GTK_SOURCE_UNDO_MANAGER_H__ */
 
 
--- a/pidgin/gtkthemes.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkthemes.h	Wed Jan 04 00:00:42 2012 +0000
@@ -46,6 +46,8 @@
 extern struct smiley_theme *current_smiley_theme;
 extern GSList *smiley_themes;
 
+G_BEGIN_DECLS
+
 void pidgin_themes_init(void);
 
 gboolean pidgin_themes_smileys_disabled(void);
@@ -62,4 +64,6 @@
 
 GSList *pidgin_themes_get_proto_smileys(const char *id);
 
+G_END_DECLS
+
 #endif /* _PIDGINTHEMES_H_ */
--- a/pidgin/gtkutils.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkutils.h	Wed Jan 04 00:00:42 2012 +0000
@@ -31,10 +31,6 @@
 #include "prpl.h"
 #include "util.h"
 
-
-
-
-
 typedef enum
 {
 	PIDGIN_BUTTON_HORIZONTAL,
@@ -80,6 +76,8 @@
 typedef gboolean (*PidginFilterBuddyCompletionEntryFunc) (const PidginBuddyCompletionEntry *completion_entry, gpointer user_data);
 
 
+G_BEGIN_DECLS
+
 /**
  * Sets up a gtkimhtml widget, loads it with smileys, and sets the
  * default signal handlers.
@@ -903,5 +901,7 @@
  */
 void pidgin_utils_uninit(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINUTILS_H_ */
 
--- a/pidgin/gtkwebview.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkwebview.h	Wed Jan 04 00:00:42 2012 +0000
@@ -60,6 +60,7 @@
 
 typedef struct _GtkWebViewClass GtkWebViewClass;
 
+G_BEGIN_DECLS
 
 /**
  * Returns the GType for a GtkWebView widget
@@ -157,5 +158,7 @@
  */
 void gtk_webview_page_down(GtkWebView *webview);
 
+G_END_DECLS
+
 #endif /* _PIDGIN_WEBVIEW_H_ */
 
--- a/pidgin/gtkwhiteboard.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/gtkwhiteboard.h	Wed Jan 04 00:00:42 2012 +0000
@@ -59,9 +59,7 @@
 	int brush_size;          /**< Brush size */
 } PidginWhiteboard;
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*****************************************************************************/
 /** @name PidginWhiteboard API                                              */
@@ -77,8 +75,6 @@
 
 /*@}*/
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _PIDGINWHITEBOARD_H_ */
--- a/pidgin/pidgintooltip.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/pidgintooltip.h	Wed Jan 04 00:00:42 2012 +0000
@@ -59,6 +59,8 @@
  */
 typedef gboolean (*PidginTooltipPaint)(GtkWidget *tipwindow, gpointer userdata);
 
+G_BEGIN_DECLS
+
 /**
  * Setup tooltip drawing functions for a treeview.
  *
@@ -101,4 +103,6 @@
 void pidgin_tooltip_show(GtkWidget *widget, gpointer userdata,
 		PidginTooltipCreate create_cb, PidginTooltipPaint paint_cb);
 
+G_END_DECLS
+
 #endif
--- a/pidgin/smileyparser.h	Tue Jan 03 23:37:11 2012 +0000
+++ b/pidgin/smileyparser.h	Wed Jan 04 00:00:42 2012 +0000
@@ -20,6 +20,10 @@
  *
  */
 
+G_BEGIN_DECLS
+
 char *
 smiley_parse_markup(const char *markup, const char *sml);
 
+G_END_DECLS
+