brasero r1018 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Fri Jul 18 13:33:49 2008
New Revision: 1018
URL: http://svn.gnome.org/viewvc/brasero?rev=1018&view=rev

Log:
	Small cleanup

	* src/brasero-multi-dnd.h:
	* src/brasero-session.h:
	* src/burn-iso-field.h:
	* src/burn-susp.h:
	* src/scsi-dvd-structures.h:
	* src/scsi-mode-pages.h:
	* src/scsi-q-subchannel.h:
	* src/scsi-read-disc-info.h:
	* src/scsi-read-disc-structure.h:
	* src/scsi-sense-data.h:
	* src/scsi-status-page.h:

Modified:
   trunk/ChangeLog
   trunk/src/brasero-multi-dnd.h
   trunk/src/brasero-session.h
   trunk/src/burn-iso-field.h
   trunk/src/burn-susp.h
   trunk/src/scsi-dvd-structures.h
   trunk/src/scsi-mode-pages.h
   trunk/src/scsi-q-subchannel.h
   trunk/src/scsi-read-disc-info.h
   trunk/src/scsi-read-disc-structure.h
   trunk/src/scsi-sense-data.h
   trunk/src/scsi-status-page.h

Modified: trunk/src/brasero-multi-dnd.h
==============================================================================
--- trunk/src/brasero-multi-dnd.h	(original)
+++ trunk/src/brasero-multi-dnd.h	Fri Jul 18 13:33:49 2008
@@ -25,17 +25,15 @@
 #ifndef _MULTI_DND_H
 #define _MULTI_DND_H
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+#include <glib.h>
+
+
+G_BEGIN_DECLS
 
 void
 brasero_enable_multi_DND (void);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _MULTI_DND_H */
 

Modified: trunk/src/brasero-session.h
==============================================================================
--- trunk/src/brasero-session.h	(original)
+++ trunk/src/brasero-session.h	Fri Jul 18 13:33:49 2008
@@ -32,10 +32,7 @@
 
 #include "brasero-app.h"
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+G_BEGIN_DECLS
 
 #define BRASERO_SESSION_TMP_PROJECT_PATH	"brasero-tmp-project"
 #define BRASERO_SESSION_TMP_SESSION_PATH	"brasero.session"
@@ -51,8 +48,6 @@
 gboolean
 brasero_session_load (BraseroApp *app, gboolean load_project);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _BRASERO-SESSION_H */

Modified: trunk/src/burn-iso-field.h
==============================================================================
--- trunk/src/burn-iso-field.h	(original)
+++ trunk/src/burn-iso-field.h	Fri Jul 18 13:33:49 2008
@@ -27,17 +27,12 @@
 #ifndef _BURN_ISO_FIELD_H
 #define _BURN_ISO_FIELD_H
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+G_BEGIN_DECLS
 
 guint32
 brasero_iso9660_get_733_val (guchar *buffer);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _BURN_ISO_FIELD_H */
 

Modified: trunk/src/burn-susp.h
==============================================================================
--- trunk/src/burn-susp.h	(original)
+++ trunk/src/burn-susp.h	Fri Jul 18 13:33:49 2008
@@ -27,10 +27,7 @@
 #ifndef _BURN_SUSP_H
 #define _BURN_SUSP_H
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+G_BEGIN_DECLS
 
 struct _BraseroSuspCtx {
 	gchar *rr_name;
@@ -52,9 +49,7 @@
 gboolean
 brasero_susp_read (BraseroSuspCtx *ctx, gchar *buffer, gint max);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _BURN_SUSP_H */
 

Modified: trunk/src/scsi-dvd-structures.h
==============================================================================
--- trunk/src/scsi-dvd-structures.h	(original)
+++ trunk/src/scsi-dvd-structures.h	Fri Jul 18 13:33:49 2008
@@ -29,10 +29,7 @@
 #ifndef _SCSI_DVD_STRUCTURES_H
 #define _SCSI_DVD_STRUCTURES_H
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+G_BEGIN_DECLS
 
 typedef enum {
 BRASERO_SCSI_NONE				= 0x00,
@@ -314,9 +311,7 @@
 /* typedef struct _BraseroScsiBurstCuttingArea BraseroScsiBurnCuttingArea; */
 typedef struct _BraseroScsiManufacturingInfo BraseroScsiManufacturingInfo;
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _SCSI_DVD_STRUCTURES_H */
 

Modified: trunk/src/scsi-mode-pages.h
==============================================================================
--- trunk/src/scsi-mode-pages.h	(original)
+++ trunk/src/scsi-mode-pages.h	Fri Jul 18 13:33:49 2008
@@ -29,10 +29,7 @@
 #ifndef _SCSI_MODE_PAGES_H
 #define _SCSI_MODE_PAGES_H
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+G_BEGIN_DECLS
 
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
 
@@ -82,9 +79,7 @@
 	BRASERO_SPC_PAGE_STATUS		= 0x2a,
 } BraseroSPCPageType;
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _SCSI_MODE-PAGES_H */
 

Modified: trunk/src/scsi-q-subchannel.h
==============================================================================
--- trunk/src/scsi-q-subchannel.h	(original)
+++ trunk/src/scsi-q-subchannel.h	Fri Jul 18 13:33:49 2008
@@ -25,10 +25,7 @@
 #ifndef _SCSI_Q_SUBCHANNEL_H
 #define _SCSI_Q_SUBCHANNEL_H
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+G_BEGIN_DECLS
 
 /**
  * This is for the program area (1, 2, 3) and the leadout (1, 2)
@@ -185,9 +182,7 @@
 
 } BraseroScsiTrackMode;
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _SCSI_Q_SUBCHANNEL_H */
 

Modified: trunk/src/scsi-read-disc-info.h
==============================================================================
--- trunk/src/scsi-read-disc-info.h	(original)
+++ trunk/src/scsi-read-disc-info.h	Fri Jul 18 13:33:49 2008
@@ -29,10 +29,7 @@
 #ifndef _SCSI_READ_DISC_INFO_H
 #define _SCSI_READ_DISC_INFO_H
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+G_BEGIN_DECLS
 
 typedef enum {
 BRASERO_SCSI_SESSION_EMPTY		= 0x00,
@@ -220,9 +217,7 @@
 typedef struct _BraseroScsiTrackResInfo BraseroScsiTrackResInfo;
 typedef struct _BraseroScsiPOWResInfo BraseroScsiPOWResInfo;
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _SCSI_READ_DISC_INFO_H */
 

Modified: trunk/src/scsi-read-disc-structure.h
==============================================================================
--- trunk/src/scsi-read-disc-structure.h	(original)
+++ trunk/src/scsi-read-disc-structure.h	Fri Jul 18 13:33:49 2008
@@ -27,10 +27,7 @@
 #ifndef _SCSI_READ_DISC_STRUCTURE_H
 #define _SCSI_READ_DISC_STRUCTURE_H
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+G_BEGIN_DECLS
 
 typedef enum {
 	/* structures specific to DVD and HD-DVD */
@@ -108,9 +105,7 @@
 };
 typedef struct _BraseroScsiReadDiscStructureHdr BraseroScsiReadDiscStructureHdr;
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _SCSI_READ_DISC_STRUCTURE_H */
 

Modified: trunk/src/scsi-sense-data.h
==============================================================================
--- trunk/src/scsi-sense-data.h	(original)
+++ trunk/src/scsi-sense-data.h	Fri Jul 18 13:33:49 2008
@@ -28,19 +28,14 @@
 #ifndef _BURN_SENSE_DATA_H
 #define _BURN_SENSE_DATA_H
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+G_BEGIN_DECLS
 
 #define BRASERO_SENSE_DATA_SIZE		19
 
 BraseroScsiResult
 brasero_sense_data_process (uchar *sense_data, BraseroScsiErrCode *err);
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _BURN_SENSE_DATA_H */
 

Modified: trunk/src/scsi-status-page.h
==============================================================================
--- trunk/src/scsi-status-page.h	(original)
+++ trunk/src/scsi-status-page.h	Fri Jul 18 13:33:49 2008
@@ -27,10 +27,7 @@
 #ifndef _BURN_STATUS_PAGE_H
 #define _BURN_STATUS_PAGE_H
 
-#ifdef __cplusplus
-extern "C"
-{
-#endif
+G_BEGIN_DECLS
 
 /**
  * Status page
@@ -236,9 +233,7 @@
 
 typedef struct _BraseroScsiStatusPage BraseroScsiStatusPage;
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif /* _BURN_STATUS_PAGE_H */