gnome-keyring r1551 - in trunk: . library

[nnielsen svn gnome org]

Author: nnielsen
Date: Wed Feb 11 00:56:14 2009
New Revision: 1551
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1551&view=rev

Log:
Revert patch for bug# 571194, by Xan Lopez:

Add G_BEGIN_DECLS/G_END_DECLS so the library can be used with a
C++ compiler.

This reverts revision 1549

Modified:
   trunk/ChangeLog
   trunk/library/gnome-keyring-memory.h
   trunk/library/gnome-keyring-result.h
   trunk/library/gnome-keyring.h

Modified: trunk/library/gnome-keyring-memory.h
==============================================================================
--- trunk/library/gnome-keyring-memory.h	(original)
+++ trunk/library/gnome-keyring-memory.h	Wed Feb 11 00:56:14 2009
@@ -26,8 +26,6 @@
 
 #include <glib.h>
 
-G_BEGIN_DECLS
-
 /**
  * gnome-keyring-memory:Short_Description:
  * 
@@ -61,6 +59,4 @@
 
 gchar*    gnome_keyring_memory_strdup         (const gchar* str);
 
-G_END_DECLS
-
 #endif /* GNOME_KEYRING_MEMORY_H */

Modified: trunk/library/gnome-keyring-result.h
==============================================================================
--- trunk/library/gnome-keyring-result.h	(original)
+++ trunk/library/gnome-keyring-result.h	Wed Feb 11 00:56:14 2009
@@ -24,8 +24,6 @@
 #ifndef GNOME_KEYRING_RESULT_H
 #define GNOME_KEYRING_RESULT_H
 
-G_BEGIN_DECLS
-
 typedef enum {
 	GNOME_KEYRING_RESULT_OK,
 	GNOME_KEYRING_RESULT_DENIED,
@@ -42,6 +40,4 @@
 #define GNOME_KEYRING_RESULT_ALREADY_EXISTS \
 	GNOME_KEYRING_RESULT_KEYRING_ALREADY_EXISTS
 
-G_END_DECLS
-
 #endif /* GNOME_KEYRING_RESULT_H */

Modified: trunk/library/gnome-keyring.h
==============================================================================
--- trunk/library/gnome-keyring.h	(original)
+++ trunk/library/gnome-keyring.h	Wed Feb 11 00:56:14 2009
@@ -29,8 +29,6 @@
 
 #include "gnome-keyring-result.h"
 
-G_BEGIN_DECLS
-
 #define GNOME_KEYRING_SESSION   "session"
 #define GNOME_KEYRING_DEFAULT   NULL
 
@@ -518,6 +516,4 @@
 
 GnomeKeyringResult    gnome_keyring_daemon_prepare_environment_sync (void);
 
-G_END_DECLS
-
 #endif /* GNOME_KEYRING_H */