# HG changeset patch
# User leo_sobral
# Date 1158795183 -3600
# Node ID 051875c9e136c0977069903c639300d25f93c071
# Parent  62b5ba7616f88d0084d36b26d348040d37819d63
[svn r7] Corrected glib macros G_BEGIN_DECLS, G_END_DECLS usage (andrunko's patch)

diff -r 62b5ba7616f8 -r 051875c9e136 gmyth/src/gui/mmyth_epg_grid_widget.h
--- a/gmyth/src/gui/mmyth_epg_grid_widget.h	Thu Sep 21 00:27:36 2006 +0100
+++ b/gmyth/src/gui/mmyth_epg_grid_widget.h	Thu Sep 21 00:33:03 2006 +0100
@@ -10,7 +10,7 @@
 
 #define MAX_DISPLAY_CHANS 4
 
-#define G_BEGIN_DECLS
+G_BEGIN_DECLS
 
 #define MMYTH_EPG_GRID_WIDGET_TYPE               (mmyth_epg_grid_widget_get_type ())
 #define MMYTH_EPG_GRID_WIDGET(obj)               (GTK_CHECK_CAST ((obj), MMYTH_EPG_GRID_WIDGET_TYPE, MMythEpgGridWidget))
@@ -69,6 +69,6 @@
     MMythEpgGridWidget *object;
 };
 
-#define G_END_DECLS
+G_END_DECLS
 
 #endif /* __MMYTH_EPG_GRID_WIDGET_H__ */
diff -r 62b5ba7616f8 -r 051875c9e136 gmyth/src/libgmyth/gmyth_common.h
--- a/gmyth/src/libgmyth/gmyth_common.h	Thu Sep 21 00:27:36 2006 +0100
+++ b/gmyth/src/libgmyth/gmyth_common.h	Thu Sep 21 00:33:03 2006 +0100
@@ -31,6 +31,8 @@
 #include <glib.h>
 #include <time.h>
 
+G_BEGIN_DECLS
+
 /**
  * The GMythChannelInfo structure represents the channel information
  * stored in the backend database.
@@ -152,4 +154,6 @@
 void gmyth_free_channel_list(GList *list);
 void gmyth_free_program_list(GList *list);
 
+G_END_DECLS
+
 #endif /* GMYTH_COMMON_H_ */
diff -r 62b5ba7616f8 -r 051875c9e136 gmyth/src/libgmyth/gmyth_context.h
--- a/gmyth/src/libgmyth/gmyth_context.h	Thu Sep 21 00:27:36 2006 +0100
+++ b/gmyth/src/libgmyth/gmyth_context.h	Thu Sep 21 00:33:03 2006 +0100
@@ -35,7 +35,7 @@
 #include "gmyth_socket.h"
 #include "gmyth_stringlist.h"
 
-#define G_BEGIN_DECLS
+G_BEGIN_DECLS
 
 #define GMYTH_CONTEXT_TYPE               (gmyth_context_get_type ())
 #define GMYTH_CONTEXT(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_CONTEXT_TYPE, GMythContext))
@@ -83,6 +83,6 @@
 GString* gmyth_context_get_setting_onhost (GString *key, GString *host, GString *default_value);
 
 
-#define G_END_DECLS
+G_END_DECLS
 
 #endif /* __GMYTH_CONTEXT_H__ */
diff -r 62b5ba7616f8 -r 051875c9e136 gmyth/src/libgmyth/gmyth_epg.c
--- a/gmyth/src/libgmyth/gmyth_epg.c	Thu Sep 21 00:27:36 2006 +0100
+++ b/gmyth/src/libgmyth/gmyth_epg.c	Thu Sep 21 00:33:03 2006 +0100
@@ -81,7 +81,7 @@
  * @return a new instance of GMythEPG.
  */
 GMythEPG*
-gmyth_epg_new ()
+gmyth_epg_new (void)
 {
     GMythEPG *epg = GMYTH_EPG (g_object_new(GMYTH_EPG_TYPE, NULL));
 
diff -r 62b5ba7616f8 -r 051875c9e136 gmyth/src/libgmyth/gmyth_epg.h
--- a/gmyth/src/libgmyth/gmyth_epg.h	Thu Sep 21 00:27:36 2006 +0100
+++ b/gmyth/src/libgmyth/gmyth_epg.h	Thu Sep 21 00:33:03 2006 +0100
@@ -34,7 +34,7 @@
 #include "gmyth_query.h"
 #include "gmyth_common.h"
 
-#define G_BEGIN_DECLS
+G_BEGIN_DECLS
 
 #define GMYTH_EPG_TYPE               (gmyth_epg_get_type ())
 #define GMYTH_EPG(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_EPG_TYPE, GMythEPG))
@@ -63,7 +63,7 @@
 
 GType          gmyth_epg_get_type (void);
 
-GMythEPG* gmyth_epg_new ();
+GMythEPG* gmyth_epg_new (void);
 
 gboolean gmyth_epg_connect (GMythEPG *gmyth_epg);
 gboolean gmyth_epg_disconnect (GMythEPG *gmyth_epg);
diff -r 62b5ba7616f8 -r 051875c9e136 gmyth/src/libgmyth/gmyth_query.h
--- a/gmyth/src/libgmyth/gmyth_query.h	Thu Sep 21 00:27:36 2006 +0100
+++ b/gmyth/src/libgmyth/gmyth_query.h	Thu Sep 21 00:33:03 2006 +0100
@@ -34,7 +34,7 @@
 /* MYSQL includes */
 #include <mysql.h>
 
-#define G_BEGIN_DECLS
+G_BEGIN_DECLS
 
 #define GMYTH_QUERY_TYPE               (gmyth_query_get_type ())
 #define GMYTH_QUERY(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_QUERY_TYPE, GMythQuery))
@@ -79,6 +79,6 @@
 gboolean gmyth_query_connect (GMythQuery *gmyth_query);
 gboolean gmyth_query_disconnect (GMythQuery *gmyth_query);
 
-#define G_END_DECLS
+G_END_DECLS
 
 #endif /* __GMYTH_QUERY_H__ */
diff -r 62b5ba7616f8 -r 051875c9e136 gmyth/src/libgmyth/gmyth_remote_encoder.h
--- a/gmyth/src/libgmyth/gmyth_remote_encoder.h	Thu Sep 21 00:27:36 2006 +0100
+++ b/gmyth/src/libgmyth/gmyth_remote_encoder.h	Thu Sep 21 00:33:03 2006 +0100
@@ -39,7 +39,7 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#define G_BEGIN_DECLS
+G_BEGIN_DECLS
 
 #define GMYTH_REMOTE_ENCODER_TYPE               (gmyth_remote_encoder_get_type ())
 #define GMYTH_REMOTE_ENCODER(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_REMOTE_ENCODER_TYPE, GMythRemoteEncoder))
@@ -84,6 +84,6 @@
                                          GString *tvchain_id);
 gboolean gmyth_remote_encoder_stop_livetv (GMythRemoteEncoder *remote_encoder);
 
-#define G_END_DECLS
+G_END_DECLS
 
 #endif /* __GMYTH_REMOTE_ENCODER_H__ */
diff -r 62b5ba7616f8 -r 051875c9e136 gmyth/src/libgmyth/gmyth_remote_util.h
--- a/gmyth/src/libgmyth/gmyth_remote_util.h	Thu Sep 21 00:27:36 2006 +0100
+++ b/gmyth/src/libgmyth/gmyth_remote_util.h	Thu Sep 21 00:33:03 2006 +0100
@@ -28,8 +28,13 @@
 #ifndef __REMOTE_UTIL_H__
 #define __REMOTE_UTIL_H__
 
+#include <glib.h>
 #include "gmyth_remote_encoder.h"
 
+G_BEGIN_DECLS
+
 GMythRemoteEncoder* remote_request_next_free_recorder (int curr);
 
+G_END_DECLS
+
 #endif
diff -r 62b5ba7616f8 -r 051875c9e136 gmyth/src/libgmyth/gmyth_scheduler.h
--- a/gmyth/src/libgmyth/gmyth_scheduler.h	Thu Sep 21 00:27:36 2006 +0100
+++ b/gmyth/src/libgmyth/gmyth_scheduler.h	Thu Sep 21 00:33:03 2006 +0100
@@ -35,7 +35,7 @@
 #include "gmyth_common.h"
 #include "gmyth_query.h"
 
-#define G_BEGIN_DECLS
+G_BEGIN_DECLS
 
 #define GMYTH_SCHEDULER_TYPE               (gmyth_scheduler_get_type ())
 #define GMYTH_SCHEDULER(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_SCHEDULER_TYPE, GMythScheduler))
@@ -150,7 +150,7 @@
 gint            gmyth_scheduler_delete_recorded (GMythScheduler *scheduler, 
                                                  gint record_id);
 
-#define G_END_DECLS
+G_END_DECLS
 
 #endif /* __GMYTH_SCHEDULER_H__ */
 
diff -r 62b5ba7616f8 -r 051875c9e136 gmyth/src/libgmyth/gmyth_settings.c
--- a/gmyth/src/libgmyth/gmyth_settings.c	Thu Sep 21 00:27:36 2006 +0100
+++ b/gmyth/src/libgmyth/gmyth_settings.c	Thu Sep 21 00:33:03 2006 +0100
@@ -112,7 +112,7 @@
  * @return a new instance of GMythSettings.
  */
 GMythSettings*
-gmyth_settings_new ()
+gmyth_settings_new (void)
 {
     GMythSettings *gmyth_settings = GMYTH_SETTINGS (g_object_new(GMYTH_SETTINGS_TYPE, NULL));
 
diff -r 62b5ba7616f8 -r 051875c9e136 gmyth/src/libgmyth/gmyth_settings.h
--- a/gmyth/src/libgmyth/gmyth_settings.h	Thu Sep 21 00:27:36 2006 +0100
+++ b/gmyth/src/libgmyth/gmyth_settings.h	Thu Sep 21 00:33:03 2006 +0100
@@ -41,7 +41,7 @@
 //#include <sys/socket.h>
 //#include <unistd.h>
 
-#define G_BEGIN_DECLS
+G_BEGIN_DECLS
 
 #define GMYTH_SETTINGS_TYPE               (gmyth_settings_get_type ())
 #define GMYTH_SETTINGS(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_SETTINGS_TYPE, GMythSettings))
@@ -81,7 +81,7 @@
 
 GType gmyth_settings_get_type (void);
 
-GMythSettings* gmyth_settings_new ();
+GMythSettings* gmyth_settings_new (void);
 gboolean gmyth_settings_load_from_file (GMythSettings *gmyth_settings, GString *filename);
 gboolean gmyth_settings_load (GMythSettings *msettings);
 gboolean gmyth_settings_save (GMythSettings *gmyth_settings);
@@ -98,6 +98,6 @@
 void gmyth_settings_set_backend_port (GMythSettings *gmyth_settings, gint new_port);
 
 
-#define G_END_DECLS
+G_END_DECLS
 
 #endif /* __GMYTH_SETTINGS_H__ */
diff -r 62b5ba7616f8 -r 051875c9e136 gmyth/src/libgmyth/gmyth_socket.h
--- a/gmyth/src/libgmyth/gmyth_socket.h	Thu Sep 21 00:27:36 2006 +0100
+++ b/gmyth/src/libgmyth/gmyth_socket.h	Thu Sep 21 00:33:03 2006 +0100
@@ -43,7 +43,7 @@
 
 #include "gmyth_stringlist.h"
 
-#define G_BEGIN_DECLS
+G_BEGIN_DECLS
 
 #define GMYTH_SOCKET_TYPE               (gmyth_socket_get_type ())
 #define GMYTH_SOCKET(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_SOCKET_TYPE, GMythSocket))
@@ -79,7 +79,7 @@
 
 GType           gmyth_socket_get_type (void);
 
-GMythSocket *   gmyth_socket_new ();
+GMythSocket *   gmyth_socket_new (void);
 
 GIOChannel *    gmyth_socket_get_io_channel (GMythSocket *gmyth_socket );
 
@@ -98,7 +98,7 @@
                                                  gchar *hostname_backend, int port,
                                           		 gboolean blocking_client);
 
-GString *       gmyth_socket_get_local_hostname ();
+GString *       gmyth_socket_get_local_hostname (void);
 
 void            gmyth_socket_close_connection (GMythSocket *gmyth_socket);
 
@@ -111,6 +111,6 @@
 int			    gmyth_socket_read_stringlist(GMythSocket *gmyth_socket, 
                                              GMythStringList* str_list);
 
-#define G_END_DECLS
+G_END_DECLS
 
 #endif /* __GMYTH_SOCKET_H__ */
diff -r 62b5ba7616f8 -r 051875c9e136 gmyth/src/libgmyth/gmyth_stringlist.h
--- a/gmyth/src/libgmyth/gmyth_stringlist.h	Thu Sep 21 00:27:36 2006 +0100
+++ b/gmyth/src/libgmyth/gmyth_stringlist.h	Thu Sep 21 00:33:03 2006 +0100
@@ -38,7 +38,7 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#define G_BEGIN_DECLS
+G_BEGIN_DECLS
 
 #define GMYTH_STRING_LIST_TYPE               (gmyth_string_list_get_type ())
 #define GMYTH_STRING_LIST(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_STRING_LIST_TYPE, GMythStringList))
@@ -92,6 +92,6 @@
 #define gmyth_string_list_get_char_array(strlist, index) \
             (gmyth_string_list_get_string(strlist, index))->str
 
-#define G_END_DECLS
+G_END_DECLS
 
 #endif /*GMYTH_STRING_LIST_H_*/
diff -r 62b5ba7616f8 -r 051875c9e136 gmyth/src/libgmyth/gmyth_tvchain.h
--- a/gmyth/src/libgmyth/gmyth_tvchain.h	Thu Sep 21 00:27:36 2006 +0100
+++ b/gmyth/src/libgmyth/gmyth_tvchain.h	Thu Sep 21 00:33:03 2006 +0100
@@ -34,7 +34,7 @@
 
 #include "gmyth_common.h"
 
-#define G_BEGIN_DECLS
+G_BEGIN_DECLS
 
 #define GMYTH_TVCHAIN_TYPE               (gmyth_tvchain_get_type ())
 #define GMYTH_TVCHAIN(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_TVCHAIN_TYPE, GMythTVChain))
@@ -100,6 +100,6 @@
                                                     struct LiveTVChainEntry *entry);
 GMythProgramInfo*   gmyth_tvchain_get_program_at (GMythTVChain *tvchain, gint index);
 
-#define G_END_DECLS
+G_END_DECLS
 
 #endif /*LIVETVCHAIN_H_*/
diff -r 62b5ba7616f8 -r 051875c9e136 gmyth/src/libgmyth/gmyth_tvplayer.h
--- a/gmyth/src/libgmyth/gmyth_tvplayer.h	Thu Sep 21 00:27:36 2006 +0100
+++ b/gmyth/src/libgmyth/gmyth_tvplayer.h	Thu Sep 21 00:33:03 2006 +0100
@@ -40,7 +40,7 @@
 #include "gmyth_tvchain.h"
 #include "gmyth_common.h"
 
-#define G_BEGIN_DECLS
+G_BEGIN_DECLS
 
 #define GMYTH_TVPLAYER_TYPE               (gmyth_tvplayer_get_type ())
 #define GMYTH_TVPLAYER(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_TVPLAYER_TYPE, GMythTVPlayer))
@@ -107,6 +107,6 @@
                                             gchar *filename);
 gboolean       gmyth_tvplayer_livetv_setup (GMythTVPlayer *tvplayer);
 
-#define G_END_DECLS
+G_END_DECLS
 
 #endif /*GMYTH_TVPLAYER_H_*/
diff -r 62b5ba7616f8 -r 051875c9e136 gmyth/src/libgmyth/gmyth_util.h
--- a/gmyth/src/libgmyth/gmyth_util.h	Thu Sep 21 00:27:36 2006 +0100
+++ b/gmyth/src/libgmyth/gmyth_util.h	Thu Sep 21 00:33:03 2006 +0100
@@ -33,10 +33,13 @@
 
 #include "gmyth_stringlist.h"
 
+G_BEGIN_DECLS
+
 GString *   gmyth_util_time_to_isoformat(time_t time_value);
 GString *   gmyth_util_time_to_string   (time_t time_value);
 time_t      gmyth_util_string_to_time   (GString* time_str);
 guint64     gmyth_util_decode_long_long (GMythStringList *strlist, 
                                          guint offset);
+G_END_DECLS
 	
 #endif /*GMYTH_UTIL_H_*/