[libwnck] core: Use G_BEGIN_DECLS/G_END_DECLS where not used before



commit 6822d5ff15dd7e042715675a51fc85c77b587e90
Author: Vincent Untz <vuntz gnome org>
Date:   Thu Jan 20 01:19:24 2011 +0100

    core: Use G_BEGIN_DECLS/G_END_DECLS where not used before

 libwnck/pager-accessible-factory.h     |    9 ++-------
 libwnck/pager-accessible.h             |    9 ++-------
 libwnck/util.h                         |    4 ++++
 libwnck/workspace-accessible-factory.h |    9 ++-------
 libwnck/workspace-accessible.h         |    9 ++-------
 5 files changed, 12 insertions(+), 28 deletions(-)
---
diff --git a/libwnck/pager-accessible-factory.h b/libwnck/pager-accessible-factory.h
index 9dfef36..56e1065 100644
--- a/libwnck/pager-accessible-factory.h
+++ b/libwnck/pager-accessible-factory.h
@@ -23,9 +23,7 @@
 
 #include <atk/atk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define WNCK_TYPE_PAGER_ACCESSIBLE_FACTORY               (wnck_pager_accessible_factory_get_type())
 #define WNCK_PAGER_ACCESSIBLE_FACTORY(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), WNCK_TYPE_PAGER_ACCESSIBLE_FACTORY, WnckpagerAccessibleFactory))
@@ -51,9 +49,6 @@ GType wnck_pager_accessible_factory_get_type (void) G_GNUC_CONST;
 
 AtkObjectFactory* wnck_pager_accessible_factory_new (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __WNCK_PAGER_ACCESSIBLE_FACTORY_H__ */
diff --git a/libwnck/pager-accessible.h b/libwnck/pager-accessible.h
index ef0356a..08f8090 100644
--- a/libwnck/pager-accessible.h
+++ b/libwnck/pager-accessible.h
@@ -26,9 +26,7 @@
 #include "pager.h"
 #include "screen.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define WNCK_PAGER_TYPE_ACCESSIBLE                     (wnck_pager_accessible_get_type ())
 #define WNCK_PAGER_ACCESSIBLE(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), WNCK_PAGER_TYPE_ACCESSIBLE, WnckPagerAccessible))
@@ -54,9 +52,6 @@ GType wnck_pager_accessible_get_type (void) G_GNUC_CONST;
 
 AtkObject* wnck_pager_accessible_new (GtkWidget *widget); 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __WNCK_PAGER_ACCESSIBLE_H__ */
diff --git a/libwnck/util.h b/libwnck/util.h
index 68517e3..eda722b 100644
--- a/libwnck/util.h
+++ b/libwnck/util.h
@@ -31,6 +31,8 @@
 
 #include <gtk/gtk.h>
 
+G_BEGIN_DECLS
+
 typedef struct _WnckResourceUsage WnckResourceUsage;
 
 /**
@@ -110,4 +112,6 @@ void wnck_pid_read_resource_usage (GdkDisplay        *gdk_display,
                                    gulong             pid,
                                    WnckResourceUsage *usage);
 
+G_END_DECLS
+
 #endif /* WNCK_UTIL_H */
diff --git a/libwnck/workspace-accessible-factory.h b/libwnck/workspace-accessible-factory.h
index c73f660..0f0fa6b 100644
--- a/libwnck/workspace-accessible-factory.h
+++ b/libwnck/workspace-accessible-factory.h
@@ -23,9 +23,7 @@
 
 #include <atk/atk.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define WNCK_TYPE_WORKSPACE_ACCESSIBLE_FACTORY               (wnck_workspace_accessible_factory_get_type())
 #define WNCK_WORKSPACE_ACCESSIBLE_FACTORY(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), WNCK_TYPE_WORKSPACE_ACCESSIBLE_FACTORY, WnckWorkspaceAccessibleFactory))
@@ -51,9 +49,6 @@ GType wnck_workspace_accessible_factory_get_type (void) G_GNUC_CONST;
 
 AtkObjectFactory* wnck_workspace_accessible_factory_new (void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __WNCK_WORKSPACE_ACCESSIBLE_FACTORY_H__ */
diff --git a/libwnck/workspace-accessible.h b/libwnck/workspace-accessible.h
index 6aaa6e5..ef92824 100644
--- a/libwnck/workspace-accessible.h
+++ b/libwnck/workspace-accessible.h
@@ -26,9 +26,7 @@
 #include "workspace.h"
 #include "pager-accessible.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+G_BEGIN_DECLS
 
 #define WNCK_WORKSPACE_TYPE_ACCESSIBLE                     (wnck_workspace_accessible_get_type ())
 #define WNCK_WORKSPACE_ACCESSIBLE(obj)                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), WNCK_WORKSPACE_TYPE_ACCESSIBLE, WnckWorkspaceAccessible))
@@ -56,9 +54,6 @@ GType wnck_workspace_accessible_get_type (void) G_GNUC_CONST;
 
 AtkObject* wnck_workspace_accessible_new (GObject *obj); 
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
+G_END_DECLS
 
 #endif /* __WNCK_WORKSPACE_ACCESSIBLE_H__ */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]