pidgin: 0117b207: Add G_BEGIN/END_DECLS to Pidgin public h..

qulogic at pidgin.im qulogic at pidgin.im
Wed Jan 4 02:08:20 EST 2012


----------------------------------------------------------------------
Revision: 0117b20729c67d900f774d5dbe6c198f2524d468
Parent:   774dfae438bb1ca6fcf0749d7b88f3f3ee6b495b
Author:   qulogic at pidgin.im
Date:     01/03/12 19:00:42
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0117b20729c67d900f774d5dbe6c198f2524d468

Changelog: 

Add G_BEGIN/END_DECLS to Pidgin public headers, most of which did
not have these checks.

Changes against parent 774dfae438bb1ca6fcf0749d7b88f3f3ee6b495b

  patched  pidgin/gtkaccount.h
  patched  pidgin/gtkblist-theme.h
  patched  pidgin/gtkblist.h
  patched  pidgin/gtkcellrendererexpander.h
  patched  pidgin/gtkcertmgr.h
  patched  pidgin/gtkconn.h
  patched  pidgin/gtkconv.h
  patched  pidgin/gtkconvwin.h
  patched  pidgin/gtkdebug.h
  patched  pidgin/gtkdialogs.h
  patched  pidgin/gtkdnd-hints.h
  patched  pidgin/gtkdocklet.h
  patched  pidgin/gtkeventloop.h
  patched  pidgin/gtkft.h
  patched  pidgin/gtkidle.h
  patched  pidgin/gtkimhtml.h
  patched  pidgin/gtkimhtmltoolbar.h
  patched  pidgin/gtklog.h
  patched  pidgin/gtknotify.h
  patched  pidgin/gtkplugin.h
  patched  pidgin/gtkpluginpref.h
  patched  pidgin/gtkpounce.h
  patched  pidgin/gtkprefs.h
  patched  pidgin/gtkprivacy.h
  patched  pidgin/gtkrequest.h
  patched  pidgin/gtkroomlist.h
  patched  pidgin/gtksavedstatuses.h
  patched  pidgin/gtksession.h
  patched  pidgin/gtksmiley.h
  patched  pidgin/gtksound.h
  patched  pidgin/gtksourceundomanager.h
  patched  pidgin/gtkthemes.h
  patched  pidgin/gtkutils.h
  patched  pidgin/gtkwebview.h
  patched  pidgin/gtkwhiteboard.h
  patched  pidgin/pidgintooltip.h
  patched  pidgin/smileyparser.h

-------------- next part --------------
============================================================
--- pidgin/gtkimhtml.h	6ca6531f1c7563ea5eb7f80a943f4ebd4651cf46
+++ pidgin/gtkimhtml.h	8689ac9014bf865cd6e5d7fd890677bf26815eb1
@@ -31,9 +31,7 @@
 
 #include "connection.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 /**************************************************************************
  * @name Structures
@@ -828,8 +826,6 @@ void gtk_imhtml_set_populate_primary_cli
 
 /*@}*/
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _PIDGINIMHTML_H_ */
============================================================
--- pidgin/gtkconv.h	892208c55c7aa9f5ee2ba2087b93b0ac9174c7d2
+++ pidgin/gtkconv.h	e5df8923930e6958e5af3f20c5934ec9739b7589
@@ -153,6 +153,8 @@ struct _PidginConversation
 
 /*@}*/
 
+G_BEGIN_DECLS
+
 /**************************************************************************
  * @name GTK+ Conversation API
  **************************************************************************/
@@ -265,4 +267,6 @@ void pidgin_conversations_uninit(void);
 
 /*@}*/
 
+G_END_DECLS
+
 #endif /* _PIDGIN_CONVERSATION_H_ */
============================================================
--- pidgin/gtkutils.h	619e6cf7ebfe6cf43fdd22ce4421c5fa7b5c49a5
+++ pidgin/gtkutils.h	4fb6e5ff6a3e59483be93f633c6d7ed89e3eedd8
@@ -31,10 +31,6 @@
 #include "prpl.h"
 #include "util.h"
 
-
-
-
-
 typedef enum
 {
 	PIDGIN_BUTTON_HORIZONTAL,
@@ -80,6 +76,8 @@ typedef gboolean (*PidginFilterBuddyComp
 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);
  */
 void pidgin_utils_uninit(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINUTILS_H_ */
 
============================================================
--- pidgin/gtkft.h	0bc448cfd548120b8c689ab9968f156da81d6a16
+++ pidgin/gtkft.h	cf39ed58e876f5408d721d9dc2b5a8668f23978e
@@ -36,6 +36,8 @@ typedef struct _PidginXferDialog PidginX
  */
 typedef struct _PidginXferDialog PidginXferDialog;
 
+G_BEGIN_DECLS
+
 /**************************************************************************/
 /** @name GTK+ File Transfer Dialog API                                   */
 /**************************************************************************/
@@ -145,4 +147,6 @@ PurpleXferUiOps *pidgin_xfers_get_ui_ops
 
 /*@}*/
 
+G_END_DECLS
+
 #endif /* _PIDGINFT_H_ */
============================================================
--- pidgin/gtkpounce.h	6e83968c47511803d11c1e0e7b4ba01b724d0962
+++ pidgin/gtkpounce.h	f78f5610b487015e0016d1225d4ba56926bf45ed
@@ -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);
  */
 void pidgin_pounces_init(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINPOUNCE_H_ */
============================================================
--- pidgin/gtkplugin.h	d1073df435993f033fe502ad2ede9887e3a2b5f4
+++ pidgin/gtkplugin.h	3d5931f971a9800c482dd2d40786cc6b3fca4cb7
@@ -56,6 +56,8 @@ struct _PidginPluginUiInfo
 #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);
  */
 void pidgin_plugin_dialog_show(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINPLUGIN_H_ */
============================================================
--- pidgin/gtkdebug.h	873ac54850158078a07fdabf531f5dd23cab4d41
+++ pidgin/gtkdebug.h	f134bdb6f7c6ed330faf697a3a3fc8ad881f6087
@@ -28,6 +28,8 @@
 
 #include "debug.h"
 
+G_BEGIN_DECLS
+
 /**
  * Initializes the GTK+ debug system.
  */
@@ -62,4 +64,6 @@ PurpleDebugUiOps *pidgin_debug_get_ui_op
  */
 PurpleDebugUiOps *pidgin_debug_get_ui_ops(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINDEBUG_H_ */
============================================================
--- pidgin/gtkblist.h	9bb46628cbc7031cf54c78c2138b7d578bf51c72
+++ pidgin/gtkblist.h	1e7aa111bb254e0a53f7b2569a440958929c5278
@@ -127,6 +127,8 @@ struct _PidginBuddyList {
 #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);
  */
 void pidgin_blist_tooltip_destroy(void);
 
+G_END_DECLS
 
 #endif /* _PIDGINBLIST_H_ */
============================================================
--- pidgin/gtknotify.h	d8f8bf461bd4c5f2f2288f2fde68851635975c15
+++ pidgin/gtknotify.h	b3332e3c087a7386c08fd3de4c3e28db641a59f6
@@ -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);
  */
 void pidgin_notify_uninit(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINNOTIFY_H_ */
============================================================
--- pidgin/gtkrequest.h	d03476b60abd09c8ddd17ff13b064e692490dc2d
+++ pidgin/gtkrequest.h	0b7b036f8f0447777dd95afa202356d2ab6cf2ab
@@ -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_u
  */
 PurpleRequestUiOps *pidgin_request_get_ui_ops(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINREQUEST_H_ */
============================================================
--- pidgin/gtkprefs.h	06dae34edc2dfc557810f5c2ac1add220a10a363
+++ pidgin/gtkprefs.h	7d3f53e6ad813857f41f5d0d91a1ee7007434e94
@@ -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);
  */
 void pidgin_prefs_update_old(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINPREFS_H_ */
============================================================
--- pidgin/gtkaccount.h	3604490a8faa7fdd05deae265000e2f618b56e7e
+++ pidgin/gtkaccount.h	fcf87fc2419055ccbad2567948aaa5373444d193
@@ -37,6 +37,8 @@ typedef enum
 } PidginAccountDialogType;
 
 
+G_BEGIN_DECLS
+
 /**
  * Shows the accounts window.
  */
@@ -80,4 +82,6 @@ void pidgin_account_uninit(void);
  */
 void pidgin_account_uninit(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINACCOUNT_H_ */
============================================================
--- pidgin/gtksound.h	73e09bda8431971dbabb94604df39a2c10f066c4
+++ pidgin/gtksound.h	df172141877a681a299045fb90f7ed8d9eaf0e07
@@ -28,6 +28,8 @@
 
 #include "sound.h"
 
+G_BEGIN_DECLS
+
 /**************************************************************************/
 /** @name GTK+ Sound API                                                  */
 /**************************************************************************/
@@ -72,4 +74,6 @@ gboolean pidgin_sound_is_customized(void
 
 /*@}*/
 
+G_END_DECLS
+
 #endif /* _PIDGINSOUND_H_ */
============================================================
--- pidgin/gtkconn.h	2050a0a0a6808a3d9b95c2c78dfb00d38960eb64
+++ pidgin/gtkconn.h	c461351925ed9f7ad917d585efa8b4bf82356847
@@ -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);
  */
 void pidgin_connection_uninit(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINCONN_H_ */
============================================================
--- pidgin/gtkdocklet.h	d7d5c58d5738247b75c933e739068ad0c5c491ed
+++ pidgin/gtkdocklet.h	7ac735aae02d9ff0eb008dd4f9c31e04075f2f7c
@@ -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_ */
 
============================================================
--- pidgin/gtkprivacy.h	ee7810d43aee31107090205dc511cd5959f709ce
+++ pidgin/gtkprivacy.h	38f34b395744ddfec305f1de538c8226fb6e8bce
@@ -28,6 +28,8 @@
 
 #include "privacy.h"
 
+G_BEGIN_DECLS
+
 /**
  * Initializes the GTK+ privacy subsystem.
  */
@@ -72,4 +74,6 @@ PurplePrivacyUiOps *pidgin_privacy_get_u
  */
 PurplePrivacyUiOps *pidgin_privacy_get_ui_ops(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINPRIVACY_H_ */
============================================================
--- pidgin/gtklog.h	4d1aba0e2c716bb1bf9d0f489b9d85f9100f7ff2
+++ pidgin/gtklog.h	39d0ea81cb7c10922609fb8564a29875fa52f81b
@@ -52,6 +52,7 @@ struct _PidginLogViewer {
 };
 
 
+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 @@ void pidgin_log_uninit(void);
 
 /*@}*/
 
+G_END_DECLS
+
 #endif
============================================================
--- pidgin/gtkroomlist.h	a7955dc12c37bb57f89d6ca169c96996d70b970a
+++ pidgin/gtkroomlist.h	3e797642accff5a01623bd2c6fe24a5506636416
@@ -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_ac
  */
 void pidgin_roomlist_dialog_show_with_account(PurpleAccount *account);
 
+G_END_DECLS
+
 #endif /* _PIDGINROOMLIST_H_ */
============================================================
--- pidgin/gtkeventloop.h	312249027f250ed69aa05343957705a0386790a4
+++ pidgin/gtkeventloop.h	fd348e3459caf0c77a40cc39658cf178a105cd05
@@ -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_g
  */
 PurpleEventLoopUiOps *pidgin_eventloop_get_ui_ops(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINEVENTLOOP_H_ */
============================================================
--- pidgin/gtkimhtmltoolbar.h	3541ac626d8b91bd93477a87653ed0b7c9877b00
+++ pidgin/gtkimhtmltoolbar.h	5119241570a0c5290dcf6f8662f36ca872f27c94
@@ -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_con
 void gtk_imhtmltoolbar_switch_active_conversation(GtkIMHtmlToolbar *toolbar,
 	PurpleConversation *conv);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _PIDGINIMHTMLTOOLBAR_H_ */
============================================================
--- pidgin/gtkpluginpref.h	4fdf05ffac386acb083dc38e67e8f79f7f084fbd
+++ pidgin/gtkpluginpref.h	8cfce31d92b13c221e75ddb89d421d6cfb93a737
@@ -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_fra
  */
 GtkWidget *pidgin_plugin_pref_create_frame(PurplePluginPrefFrame *frame);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _PIDGINPLUGINPREF_H_ */
============================================================
--- pidgin/gtkdialogs.h	475f600318d4506ecf7339e9cac158edcc3872c3
+++ pidgin/gtkdialogs.h	a18f69dd49f4a9c4c5c1fc056c9272191b3fd887
@@ -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 @@ void pidgin_dialogs_merge_groups(PurpleG
 /* 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_ */
============================================================
--- pidgin/gtkdnd-hints.h	9e819b662ace652bab4053bbff7890a58e46e2eb
+++ pidgin/gtkdnd-hints.h	2bd44797560614b2b46e3e086f7d28603e3b8dae
@@ -52,6 +52,8 @@ typedef enum {
 
 } DndHintPosition;
 
+G_BEGIN_DECLS
+
 /**
  * Shows a drag-and-drop hint at the specified location.
  *
@@ -84,4 +86,6 @@ void dnd_hints_show_relative(DndHintWind
 void dnd_hints_show_relative(DndHintWindowId id, GtkWidget *widget,
 							 DndHintPosition horiz, DndHintPosition vert);
 
+G_END_DECLS
+
 #endif /* _PIDGIN_DND_HINTS_H_ */
============================================================
--- pidgin/gtksavedstatuses.h	53420e1f26d1cbe7278d9c56d234a513ccb6f36b
+++ pidgin/gtksavedstatuses.h	e221f216b08479c717cba047cc5816b0f8a492b1
@@ -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);
  */
 void pidgin_status_uninit(void);
 
+G_END_DECLS
+
 #endif /* _PIDGINSAVEDSTATUSES_H_ */
============================================================
--- pidgin/gtkwhiteboard.h	6cb904c7e3deb11c432b82fa674357d2609befbb
+++ pidgin/gtkwhiteboard.h	ce481fdbf7016361db0a2eb3c0eb2c7a98ed97bf
@@ -59,9 +59,7 @@ typedef struct _PidginWhiteboard
 	int brush_size;          /**< Brush size */
 } PidginWhiteboard;
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 /*****************************************************************************/
 /** @name PidginWhiteboard API                                              */
@@ -77,8 +75,6 @@ PurpleWhiteboardUiOps *pidgin_whiteboard
 
 /*@}*/
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* _PIDGINWHITEBOARD_H_ */
============================================================
--- pidgin/gtkthemes.h	d1facc025da4f4aa42008582aa76ceabea37f855
+++ pidgin/gtkthemes.h	2a94ad191d6b6cfec5ce866d806d50b38a15b865
@@ -46,6 +46,8 @@ extern GSList *smiley_themes;
 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(
 
 GSList *pidgin_themes_get_proto_smileys(const char *id);
 
+G_END_DECLS
+
 #endif /* _PIDGINTHEMES_H_ */
============================================================
--- pidgin/gtkconvwin.h	51291492c83e22094dbf297aabf37a8fd0f92132
+++ pidgin/gtkconvwin.h	3c5f93639906fafcca0512cac716156c61695e2e
@@ -106,6 +106,8 @@ struct _PidginWindow
 
 /*@}*/
 
+G_BEGIN_DECLS
+
 /**************************************************************************
  * @name GTK+ Conversation Window API
  **************************************************************************/
@@ -152,4 +154,6 @@ void pidgin_conv_placement_place(PidginC
 
 /*@}*/
 
+G_END_DECLS
+
 #endif /* _PIDGIN_CONVERSATION_WINDOW_H_ */
============================================================
--- pidgin/gtkidle.h	b6a001d908b45b7cec49d4e16dd8e5004716c850
+++ pidgin/gtkidle.h	f301b110704401c5eb3eec935d5f31d8d86d40ee
@@ -28,6 +28,8 @@
 
 #include "idle.h"
 
+G_BEGIN_DECLS
+
 /**************************************************************************/
 /** @name GTK+ Idle API                                                  */
 /**************************************************************************/
@@ -42,4 +44,6 @@ PurpleIdleUiOps *pidgin_idle_get_ui_ops(
 
 /*@}*/
 
+G_END_DECLS
+
 #endif /* _PIDGIN_IDLE_H_ */
============================================================
--- pidgin/gtksession.h	b7570ffab248790e7c931745a8611675c5d5ee76
+++ pidgin/gtksession.h	d405f8cb29e32e057e46c858186262a80bcda1a3
@@ -26,6 +26,8 @@
 #ifndef _PIDGINSESSION_H_
 #define _PIDGINSESSION_H_
 
+G_BEGIN_DECLS
+
 /**************************************************************************/
 /** @name X Windows session subsystem                                     */
 /**************************************************************************/
@@ -51,4 +53,6 @@ void pidgin_session_end(void);
 
 /*@}*/
 
+G_END_DECLS
+
 #endif /* _PIDGINSESSION_H_ */
============================================================
--- pidgin/gtkcellrendererexpander.h	04112a698158dea2b79b4e31462a78c347d7ceae
+++ pidgin/gtkcellrendererexpander.h	8ee7c43f98a47a1f8232e4d753fa689a52adb99f
@@ -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 @@ struct _PidginCellRendererExpanderClass 
 	GtkCellRendererClass parent_class;
 };
 
+G_BEGIN_DECLS
+
 GType            pidgin_cell_renderer_expander_get_type     (void);
 GtkCellRenderer  *pidgin_cell_renderer_expander_new          (void);
 
+G_END_DECLS
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #endif /* _PIDGINCELLRENDEREREXPANDER_H_ */
============================================================
--- pidgin/gtksourceundomanager.h	04b0160a277201ae273046194d95d09560e95ec5
+++ pidgin/gtksourceundomanager.h	2bd855924bc0c2f7deb473f54eeb4f3db3be19f3
@@ -57,6 +57,8 @@ struct _GtkSourceUndoManagerClass
     	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 @@ void			gtk_source_undo_manager_set_max_u
 								(GtkSourceUndoManager 	*um,
 				  	     			 gint		 	 undo_levels);
 
+G_END_DECLS
+
 #endif /* __GTK_SOURCE_UNDO_MANAGER_H__ */
 
 
============================================================
--- pidgin/gtkcertmgr.h	7c54459029d68e2bd12b2d33154a649c33bf8e52
+++ pidgin/gtkcertmgr.h	7bf1c8b701beda1c0574bf97c0fb91e29b58d0a7
@@ -43,6 +43,8 @@ struct _PidginCertificateManager {
 	gchar *label;
 };
 
+G_BEGIN_DECLS
+
 /**************************************************************************/
 /** @name Certificate Manager API                                         */
 /**************************************************************************/
@@ -59,4 +61,6 @@ void pidgin_certmgr_hide(void);
 
 /*@}*/
 
+G_END_DECLS
+
 #endif /* _PIDGINCERTMGR_H_ */
============================================================
--- pidgin/pidgintooltip.h	180f1bf22356c60435f0999091dc5fc47367d071
+++ pidgin/pidgintooltip.h	b3c0f0529cd91a6e7361c0280e9a6b903d3898e8
@@ -59,6 +59,8 @@ typedef gboolean (*PidginTooltipPaint)(G
  */
 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 *widg
 void pidgin_tooltip_show(GtkWidget *widget, gpointer userdata,
 		PidginTooltipCreate create_cb, PidginTooltipPaint paint_cb);
 
+G_END_DECLS
+
 #endif
============================================================
--- pidgin/gtksmiley.h	cef7b37434fbb6898210da12aa7295b5f790660f
+++ pidgin/gtksmiley.h	eaeb38cbf8ee186902321c633f9e7bf63bae5065
@@ -31,6 +31,8 @@ typedef struct _PidginSmiley PidginSmile
 
 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(Pidgi
  */
 void pidgin_smiley_editor_set_data(PidginSmiley *editor, gpointer data, gsize datasize);
 
+G_END_DECLS
+
 #endif /* PIDGIN_GTKSMILEY_H */
============================================================
--- pidgin/gtkblist-theme.h	93a721824df4dad64ff3a0902767838da1b303a0
+++ pidgin/gtkblist-theme.h	763ed7f2f1cfa91695fa6849e62214dd405a731c
@@ -79,6 +79,8 @@ typedef struct
 
 } PidginBlistLayout;
 
+G_BEGIN_DECLS
+
 /**************************************************************************/
 /** @name PidginThemeFont API                                               */
 /**************************************************************************/
@@ -146,7 +148,6 @@ const gchar * pidgin_theme_font_get_colo
 /**************************************************************************/
 /** @name Purple Buddy List Theme API                                     */
 /**************************************************************************/
-G_BEGIN_DECLS
 
 /**
  * GObject foo.
@@ -434,4 +435,5 @@ G_END_DECLS
 void pidgin_blist_theme_set_status_text_info(PidginBlistTheme *theme, const PidginThemeFont *pair);
 
 G_END_DECLS
+
 #endif /* PIDGIN_BLIST_THEME_H */
============================================================
--- pidgin/gtkwebview.h	957afb32234b1185a6bf176307aa43f62baa194f
+++ pidgin/gtkwebview.h	f57d524a63ce623d9209a79599d3fd52722fb6b3
@@ -60,6 +60,7 @@ typedef struct _GtkWebViewClass GtkWebVi
 
 typedef struct _GtkWebViewClass GtkWebViewClass;
 
+G_BEGIN_DECLS
 
 /**
  * Returns the GType for a GtkWebView widget
@@ -157,5 +158,7 @@ void gtk_webview_page_down(GtkWebView *w
  */
 void gtk_webview_page_down(GtkWebView *webview);
 
+G_END_DECLS
+
 #endif /* _PIDGIN_WEBVIEW_H_ */
 
============================================================
--- pidgin/smileyparser.h	9a8fbab8a1527913561f61677b46d143e5232437
+++ pidgin/smileyparser.h	41be671f2cf7749cf564c8b4e550b85038c26805
@@ -20,6 +20,10 @@
  *
  */
 
+G_BEGIN_DECLS
+
 char *
 smiley_parse_markup(const char *markup, const char *sml);
 
+G_END_DECLS
+


More information about the Commits mailing list