[balsa/gtk3] Use G_{BEGIN,END}_DECLS
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/gtk3] Use G_{BEGIN,END}_DECLS
- Date: Tue, 24 May 2016 21:44:01 +0000 (UTC)
commit 93a820fe9a3c7852418ea207314d5f583c91672f
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Tue May 24 17:41:57 2016 -0400
Use G_{BEGIN,END}_DECLS
* libbalsa/gmime-application-pkcs7.h:
* libbalsa/gmime-gpgme-signature.h:
* libbalsa/gmime-multipart-crypt.h:
* libbalsa/gmime-part-rfc2440.h:
* libbalsa/identity.h:
* libbalsa/libbalsa-gpgme-cb.h:
* libbalsa/libbalsa-gpgme.h:
* libinit_balsa/assistant_init.h:
* libinit_balsa/assistant_page_defclient.h:
* libinit_balsa/assistant_page_directory.h:
* libinit_balsa/assistant_page_finish.h:
* libinit_balsa/assistant_page_user.h:
* libinit_balsa/assistant_page_welcome.h:
* src/balsa-index.h:
* src/balsa-message.h:
* src/balsa-mime-widget-callbacks.h:
* src/balsa-mime-widget-crypto.h:
* src/balsa-mime-widget-image.h:
* src/balsa-mime-widget-message.h:
* src/balsa-mime-widget-multipart.h:
* src/balsa-mime-widget-text.h:
* src/balsa-mime-widget.h:
* src/filter-run.h:
* src/print.h:
* src/quote-color.h:
* src/sendmsg-window.h:
* src/spell-check.h:
ChangeLog | 32 ++++++++++++++++++++++++++++++
libbalsa/gmime-application-pkcs7.h | 10 ++------
libbalsa/gmime-gpgme-signature.h | 10 +-------
libbalsa/gmime-multipart-crypt.h | 9 ++-----
libbalsa/gmime-part-rfc2440.h | 11 ++++-----
libbalsa/identity.h | 14 ++++++------
libbalsa/libbalsa-gpgme-cb.h | 8 +-----
libbalsa/libbalsa-gpgme.h | 9 ++-----
libinit_balsa/assistant_init.h | 12 ++++------
libinit_balsa/assistant_page_defclient.h | 11 +++------
libinit_balsa/assistant_page_directory.h | 11 +++------
libinit_balsa/assistant_page_finish.h | 11 +++------
libinit_balsa/assistant_page_user.h | 11 +++------
libinit_balsa/assistant_page_welcome.h | 11 +++------
src/balsa-index.h | 9 ++-----
src/balsa-message.h | 9 ++-----
src/balsa-mime-widget-callbacks.h | 9 ++-----
src/balsa-mime-widget-crypto.h | 9 ++-----
src/balsa-mime-widget-image.h | 9 ++-----
src/balsa-mime-widget-message.h | 9 ++-----
src/balsa-mime-widget-multipart.h | 9 ++-----
src/balsa-mime-widget-text.h | 9 ++-----
src/balsa-mime-widget.h | 9 ++-----
src/filter-run.h | 9 ++-----
src/print.h | 9 ++-----
src/quote-color.h | 11 +++------
src/sendmsg-window.h | 11 +++------
src/spell-check.h | 9 ++-----
28 files changed, 126 insertions(+), 174 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b42b8ea..d7603e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2016-05-24 Albrecht Dreß
+
+ Use G_{BEGIN,END}_DECLS
+
+ * libbalsa/gmime-application-pkcs7.h:
+ * libbalsa/gmime-gpgme-signature.h:
+ * libbalsa/gmime-multipart-crypt.h:
+ * libbalsa/gmime-part-rfc2440.h:
+ * libbalsa/identity.h:
+ * libbalsa/libbalsa-gpgme-cb.h:
+ * libbalsa/libbalsa-gpgme.h:
+ * libinit_balsa/assistant_init.h:
+ * libinit_balsa/assistant_page_defclient.h:
+ * libinit_balsa/assistant_page_directory.h:
+ * libinit_balsa/assistant_page_finish.h:
+ * libinit_balsa/assistant_page_user.h:
+ * libinit_balsa/assistant_page_welcome.h:
+ * src/balsa-index.h:
+ * src/balsa-message.h:
+ * src/balsa-mime-widget-callbacks.h:
+ * src/balsa-mime-widget-crypto.h:
+ * src/balsa-mime-widget-image.h:
+ * src/balsa-mime-widget-message.h:
+ * src/balsa-mime-widget-multipart.h:
+ * src/balsa-mime-widget-text.h:
+ * src/balsa-mime-widget.h:
+ * src/filter-run.h:
+ * src/print.h:
+ * src/quote-color.h:
+ * src/sendmsg-window.h:
+ * src/spell-check.h:
+
2016-05-23 Peter Bloomfield <pbloomfield bellsouth net>
* libbalsa/imap/imap_search.c (imap_write_key_date): drop
diff --git a/libbalsa/gmime-application-pkcs7.h b/libbalsa/gmime-application-pkcs7.h
index 6458357..e7b8df0 100644
--- a/libbalsa/gmime-application-pkcs7.h
+++ b/libbalsa/gmime-application-pkcs7.h
@@ -22,10 +22,7 @@
#ifndef __GMIME_APPLICATION_PKCS7_H__
#define __GMIME_APPLICATION_PKCS7_H__
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+G_BEGIN_DECLS
#include <gmime/gmime.h>
@@ -43,7 +40,6 @@ extern "C" {
GtkWindow * parent,
GError ** err);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif /* __GMIME_APPLICATION_PKCS7_H__ */
diff --git a/libbalsa/gmime-gpgme-signature.h b/libbalsa/gmime-gpgme-signature.h
index 948d3c7..0ed8328 100644
--- a/libbalsa/gmime-gpgme-signature.h
+++ b/libbalsa/gmime-gpgme-signature.h
@@ -25,10 +25,7 @@
#include <glib.h>
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+G_BEGIN_DECLS
/* the signature status as returned by gpgme as a GObject */
#define GMIME_TYPE_GPGME_SIGSTAT (g_mime_gpgme_sigstat_get_type())
@@ -69,9 +66,6 @@ GMimeGpgmeSigstat *g_mime_gpgme_sigstat_new_from_gpgme_ctx(gpgme_ctx_t
gchar *libbalsa_cert_subject_readable(const gchar *subject);
-#ifdef __cplusplus
-/* cppcheck-suppress syntaxError */
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* __GMIME_GPGME_SIGNATURE_H__ */
diff --git a/libbalsa/gmime-multipart-crypt.h b/libbalsa/gmime-multipart-crypt.h
index f4a633b..4395f5a 100644
--- a/libbalsa/gmime-multipart-crypt.h
+++ b/libbalsa/gmime-multipart-crypt.h
@@ -39,9 +39,7 @@
#include "gmime-gpgme-signature.h"
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
GMimeGpgmeSigstat *g_mime_gpgme_mps_verify(GMimeMultipartSigned * mps,
@@ -59,8 +57,7 @@ GMimeObject *g_mime_gpgme_mpe_decrypt(GMimeMultipartEncrypted * mpe,
GtkWindow * parent, GError ** err);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif /* __GMIME_MULTIPART_CRYPT_H__ */
diff --git a/libbalsa/gmime-part-rfc2440.h b/libbalsa/gmime-part-rfc2440.h
index 104404d..d0ceb69 100644
--- a/libbalsa/gmime-part-rfc2440.h
+++ b/libbalsa/gmime-part-rfc2440.h
@@ -28,9 +28,9 @@
#include <gmime/gmime.h>
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
+
+
typedef enum _GMimePartRfc2440Mode GMimePartRfc2440Mode;
enum _GMimePartRfc2440Mode {
GMIME_PART_RFC2440_NONE,
@@ -54,8 +54,7 @@ GMimeGpgmeSigstat *g_mime_part_rfc2440_decrypt(GMimePart * part,
GtkWindow * parent,
GError ** err);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif /* __GMIME_PART_RFC2440_H__ */
diff --git a/libbalsa/identity.h b/libbalsa/identity.h
index f0bae34..51d4712 100644
--- a/libbalsa/identity.h
+++ b/libbalsa/identity.h
@@ -32,10 +32,9 @@
#include "libbalsa.h"
-#ifdef __cplusplus
-extern "C"
-{
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
+
GType libbalsa_identity_get_type(void);
@@ -149,7 +148,8 @@ extern "C"
LibBalsaIdentity* libbalsa_identity_new_config(const gchar* name);
void libbalsa_identity_save(LibBalsaIdentity* id, const gchar* prefix);
-#ifdef __cplusplus
-}
-#endif
+
+G_END_DECLS
+
+
#endif /* __LIBBALSA_IDENTITY_H__ */
diff --git a/libbalsa/libbalsa-gpgme-cb.h b/libbalsa/libbalsa-gpgme-cb.h
index c16f59e..a879220 100644
--- a/libbalsa/libbalsa-gpgme-cb.h
+++ b/libbalsa/libbalsa-gpgme-cb.h
@@ -32,9 +32,7 @@
#include <gtk/gtk.h>
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
typedef enum {
@@ -55,9 +53,7 @@ gboolean lb_gpgme_accept_low_trust_key(const gchar * user_name,
GtkWindow * parent);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
#endif /* LIBBALSA_GPGME_CB_H_ */
diff --git a/libbalsa/libbalsa-gpgme.h b/libbalsa/libbalsa-gpgme.h
index 3eccf47..5b6dc29 100644
--- a/libbalsa/libbalsa-gpgme.h
+++ b/libbalsa/libbalsa-gpgme.h
@@ -35,9 +35,7 @@
#include "gmime-gpgme-signature.h"
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
#define GPG_ERR_KEY_SELECTION GPG_ERR_USER_14
@@ -107,8 +105,7 @@ GMimeGpgmeSigstat *libbalsa_gpgme_decrypt(GMimeStream * crypted,
GError ** error);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif /* LIBBALSA_GPGME_H_ */
diff --git a/libinit_balsa/assistant_init.h b/libinit_balsa/assistant_init.h
index 747b1fd..01182e3 100644
--- a/libinit_balsa/assistant_init.h
+++ b/libinit_balsa/assistant_init.h
@@ -23,13 +23,12 @@
#ifndef __BALSA_INITDRUID_H__
#define __BALSA_INITDRUID_H__
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
#include <gtk/gtk.h>
#include "assistant_helper.h"
+
+G_BEGIN_DECLS
+
/*
* Public methods
*/
@@ -37,7 +36,6 @@ extern "C" {
void balsa_init_begin( void );
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif
diff --git a/libinit_balsa/assistant_page_defclient.h b/libinit_balsa/assistant_page_defclient.h
index 55d7ca9..c3b9097 100644
--- a/libinit_balsa/assistant_page_defclient.h
+++ b/libinit_balsa/assistant_page_defclient.h
@@ -28,13 +28,11 @@
# error "Include config.h before this file."
#endif
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
#include "assistant_helper.h"
#include "assistant_init.h"
+G_BEGIN_DECLS
+
/*
* Main object structure
*/
@@ -53,7 +51,6 @@ extern "C" {
void balsa_druid_page_defclient(GtkAssistant * druid);
void balsa_druid_page_defclient_save(BalsaDruidPageDefclient * defclient);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif
diff --git a/libinit_balsa/assistant_page_directory.h b/libinit_balsa/assistant_page_directory.h
index 1e5ed09..652ac70 100644
--- a/libinit_balsa/assistant_page_directory.h
+++ b/libinit_balsa/assistant_page_directory.h
@@ -22,15 +22,13 @@
#ifndef __BALSA_DRUID_PAGE_DIRECTORY_H__
#define __BALSA_DRUID_PAGE_DIRECTORY_H__
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
#include <gtk/gtk.h>
#include "assistant_helper.h"
#include "assistant_init.h"
+G_BEGIN_DECLS
+
/*
* Main object structure
*/
@@ -70,7 +68,6 @@ extern "C" {
#endif /* defined(ENABLE_TOUCH_UI) */
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif
diff --git a/libinit_balsa/assistant_page_finish.h b/libinit_balsa/assistant_page_finish.h
index 92ed075..e9d2422 100644
--- a/libinit_balsa/assistant_page_finish.h
+++ b/libinit_balsa/assistant_page_finish.h
@@ -23,21 +23,18 @@
#ifndef __BALSA_DRUID_PAGE_FINISH_H__
#define __BALSA_DRUID_PAGE_FINISH_H__
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
#include <gtk/gtk.h>
#include "assistant_helper.h"
#include "assistant_init.h"
+G_BEGIN_DECLS
+
/*
* Public methods
*/
void balsa_druid_page_finish(GtkAssistant * druid);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif
diff --git a/libinit_balsa/assistant_page_user.h b/libinit_balsa/assistant_page_user.h
index 5349a0f..31f509a 100644
--- a/libinit_balsa/assistant_page_user.h
+++ b/libinit_balsa/assistant_page_user.h
@@ -22,14 +22,12 @@
#ifndef __BALSA_DRUID_PAGE_USER_H__
#define __BALSA_DRUID_PAGE_USER_H__
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
#include <gtk/gtk.h>
#include "assistant_helper.h"
#include "assistant_init.h"
+G_BEGIN_DECLS
+
/*
* Main object structure
*/
@@ -71,7 +69,6 @@ extern "C" {
*/
void balsa_druid_page_user(GtkAssistant * druid);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif
diff --git a/libinit_balsa/assistant_page_welcome.h b/libinit_balsa/assistant_page_welcome.h
index 197dfe6..cb02a71 100644
--- a/libinit_balsa/assistant_page_welcome.h
+++ b/libinit_balsa/assistant_page_welcome.h
@@ -22,20 +22,17 @@
#ifndef __BALSA_DRUID_PAGE_WELCOME_H__
#define __BALSA_DRUID_PAGE_WELCOME_H__
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
#include <gtk/gtk.h>
#include "assistant_helper.h"
#include "assistant_init.h"
+G_BEGIN_DECLS
+
/*
* Public methods
*/
void balsa_druid_page_welcome(GtkAssistant * druid);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif
diff --git a/src/balsa-index.h b/src/balsa-index.h
index 40a46d7..0f948d0 100644
--- a/src/balsa-index.h
+++ b/src/balsa-index.h
@@ -26,9 +26,7 @@
#include "filter.h"
#include "mailbox-node.h"
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
GType balsa_index_get_type(void);
@@ -188,7 +186,6 @@ extern "C" {
#define BALSA_INDEX_VIEW_ON_OPEN "balsa-index-view-on-open"
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif /* __BALSA_INDEX_H__ */
diff --git a/src/balsa-message.h b/src/balsa-message.h
index 51a0a87..6887f8e 100644
--- a/src/balsa-message.h
+++ b/src/balsa-message.h
@@ -33,9 +33,7 @@
#define BALSA_USE_GTK_STACK
#endif /* GTK_CHECK_VERSION(3, 10, 0) */
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
#define BALSA_TYPE_MESSAGE (balsa_message_get_type ())
@@ -157,7 +155,6 @@ void balsa_message_perform_crypto(LibBalsaMessage * message,
void balsa_message_find_in_message (BalsaMessage * bm);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif /* __BALSA_MESSAGE_H__ */
diff --git a/src/balsa-mime-widget-callbacks.h b/src/balsa-mime-widget-callbacks.h
index 61a97c6..ac52d9a 100644
--- a/src/balsa-mime-widget-callbacks.h
+++ b/src/balsa-mime-widget-callbacks.h
@@ -26,9 +26,7 @@
#include "balsa-message.h"
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
void balsa_mime_widget_ctx_menu_cb(GtkWidget * menu_item, LibBalsaMessageBody * mime_body);
@@ -40,7 +38,6 @@ gint balsa_mime_widget_limit_focus(GtkWidget * widget, GdkEventFocus * event, Ba
gint balsa_mime_widget_unlimit_focus(GtkWidget * widget, GdkEventFocus * event, BalsaMessage * bm);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif /* __BALSA_MIME_WIDGET_CALLBACKS_H__ */
diff --git a/src/balsa-mime-widget-crypto.h b/src/balsa-mime-widget-crypto.h
index a2cf51a..76db87e 100644
--- a/src/balsa-mime-widget-crypto.h
+++ b/src/balsa-mime-widget-crypto.h
@@ -32,9 +32,7 @@
#include "balsa-message.h"
#include "balsa-mime-widget.h"
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
BalsaMimeWidget *balsa_mime_widget_new_signature(BalsaMessage * bm,
@@ -48,8 +46,7 @@ GtkWidget * balsa_mime_widget_crypto_frame(LibBalsaMessageBody * mime_body, GtkW
const gchar *balsa_mime_widget_signature_icon_name(LibBalsaMsgProtectState protect_state);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif /* HAVE_GPGME */
#endif /* __BALSA_MIME_WIDGET_IMAGE_H__ */
diff --git a/src/balsa-mime-widget-image.h b/src/balsa-mime-widget-image.h
index fe8fd8a..c85afd1 100644
--- a/src/balsa-mime-widget-image.h
+++ b/src/balsa-mime-widget-image.h
@@ -24,9 +24,7 @@
#include "balsa-message.h"
#include "balsa-mime-widget.h"
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
/*
* GObject class definitions
@@ -69,7 +67,6 @@ BalsaMimeWidget *balsa_mime_widget_new_image(BalsaMessage * bm,
void balsa_mime_widget_image_resize_all(GtkWidget * widget, gpointer user_data);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif /* __BALSA_MIME_WIDGET_IMAGE_H__ */
diff --git a/src/balsa-mime-widget-message.h b/src/balsa-mime-widget-message.h
index 59d57b7..283c4c6 100644
--- a/src/balsa-mime-widget-message.h
+++ b/src/balsa-mime-widget-message.h
@@ -26,9 +26,7 @@
#include "balsa-message.h"
#include "balsa-mime-widget.h"
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
BalsaMimeWidget *balsa_mime_widget_new_message(BalsaMessage * bm,
@@ -51,7 +49,6 @@ void balsa_mime_widget_message_set_headers_d(BalsaMessage * bm,
const gchar *subject);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif /* __BALSA_MIME_WIDGET_MESSAGE_H__ */
diff --git a/src/balsa-mime-widget-multipart.h b/src/balsa-mime-widget-multipart.h
index 988ae7b..9f16bd9 100644
--- a/src/balsa-mime-widget-multipart.h
+++ b/src/balsa-mime-widget-multipart.h
@@ -26,9 +26,7 @@
#include "balsa-message.h"
#include "balsa-mime-widget.h"
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
BalsaMimeWidget *balsa_mime_widget_new_multipart(BalsaMessage * bm,
@@ -36,7 +34,6 @@ BalsaMimeWidget *balsa_mime_widget_new_multipart(BalsaMessage * bm,
const gchar * content_type, gpointer data);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif /* __BALSA_MIME_WIDGET_IMAGE_H__ */
diff --git a/src/balsa-mime-widget-text.h b/src/balsa-mime-widget-text.h
index 35f8abd..0a68cd7 100644
--- a/src/balsa-mime-widget-text.h
+++ b/src/balsa-mime-widget-text.h
@@ -26,9 +26,7 @@
#include "balsa-message.h"
#include "balsa-mime-widget.h"
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
BalsaMimeWidget *balsa_mime_widget_new_text(BalsaMessage * bm,
@@ -36,7 +34,6 @@ BalsaMimeWidget *balsa_mime_widget_new_text(BalsaMessage * bm,
const gchar * content_type, gpointer data);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif /* __BALSA_MIME_WIDGET_TEXT_H__ */
diff --git a/src/balsa-mime-widget.h b/src/balsa-mime-widget.h
index 8e728dd..dcee4b0 100644
--- a/src/balsa-mime-widget.h
+++ b/src/balsa-mime-widget.h
@@ -25,9 +25,7 @@
#include "libbalsa.h"
#include "balsa-message.h"
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
/* define some constants to simplify the layout */
@@ -76,7 +74,6 @@ void balsa_mime_widget_destroy(GObject * object);
void balsa_mime_widget_schedule_resize(GtkWidget * widget);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif /* __BALSA_MIME_WIDGET_H__ */
diff --git a/src/filter-run.h b/src/filter-run.h
index 5f1a86b..6077dca 100644
--- a/src/filter-run.h
+++ b/src/filter-run.h
@@ -39,9 +39,7 @@
* fr = filter run
*/
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
#define BALSA_TYPE_FILTER_RUN_DIALOG \
@@ -127,7 +125,6 @@ void selected_list_toggled(GtkCellRendererToggle * cellrenderertoggle,
void selected_list_activated(GtkTreeView * treeview, GtkTreePath * path,
GtkTreeViewColumn * column, gpointer data);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif /* __FILTER_RUN_H__ */
diff --git a/src/print.h b/src/print.h
index 883681c..8f31635 100644
--- a/src/print.h
+++ b/src/print.h
@@ -26,14 +26,11 @@
# error "Include config.h before this file."
#endif
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
void message_print(LibBalsaMessage * msg, GtkWindow * parent);
void message_print_page_setup(GtkWindow * parent);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif /* __PRINT_H__ */
diff --git a/src/quote-color.h b/src/quote-color.h
index 5fd8531..659afba 100644
--- a/src/quote-color.h
+++ b/src/quote-color.h
@@ -26,12 +26,10 @@
# error "Include config.h before this file."
#endif
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
#include <gtk/gtk.h>
+G_BEGIN_DECLS
+
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -52,7 +50,6 @@ extern "C" {
extern guint is_a_quote(const gchar *, regex_t * rex);
#endif /* USE_GREGEX */
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif /* __BALSA_QUOTECOLOR_H__ */
diff --git a/src/sendmsg-window.h b/src/sendmsg-window.h
index 78e75f6..f16c748 100644
--- a/src/sendmsg-window.h
+++ b/src/sendmsg-window.h
@@ -26,14 +26,12 @@
# error "Include config.h before this file."
#endif
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
#include "libbalsa.h"
#include "address-view.h"
#include "toolbar-factory.h"
+G_BEGIN_DECLS
+
typedef enum {
SEND_NORMAL, /* initialized by Compose */
SEND_REPLY, /* by Reply */
@@ -151,7 +149,6 @@ extern "C" {
#define SENDMSG_WINDOW_QUIT_ON_CLOSE(bsmsg) ((bsmsg)->quit_on_close=TRUE)
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif /* __BALSA_SENDMSG_H__ */
diff --git a/src/spell-check.h b/src/spell-check.h
index dc9467b..7000547 100644
--- a/src/spell-check.h
+++ b/src/spell-check.h
@@ -26,9 +26,7 @@
#define USE_ORIGINAL_MANAGER_FUNCS
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
#define BALSA_TYPE_SPELL_CHECK \
(balsa_spell_check_get_type ())
@@ -61,7 +59,6 @@ extern "C" {
void balsa_spell_check_start(BalsaSpellCheck * spell_check);
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
+
#endif /* __BALSA_SPELL_CHECK_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
