1.1 --- a/gmyth/src/gui/mmyth_epg_grid_widget.h	Thu Sep 21 00:27:36 2006 +0100
     1.2 +++ b/gmyth/src/gui/mmyth_epg_grid_widget.h	Thu Sep 21 00:33:03 2006 +0100
     1.3 @@ -10,7 +10,7 @@
     1.4  
     1.5  #define MAX_DISPLAY_CHANS 4
     1.6  
     1.7 -#define G_BEGIN_DECLS
     1.8 +G_BEGIN_DECLS
     1.9  
    1.10  #define MMYTH_EPG_GRID_WIDGET_TYPE               (mmyth_epg_grid_widget_get_type ())
    1.11  #define MMYTH_EPG_GRID_WIDGET(obj)               (GTK_CHECK_CAST ((obj), MMYTH_EPG_GRID_WIDGET_TYPE, MMythEpgGridWidget))
    1.12 @@ -69,6 +69,6 @@
    1.13      MMythEpgGridWidget *object;
    1.14  };
    1.15  
    1.16 -#define G_END_DECLS
    1.17 +G_END_DECLS
    1.18  
    1.19  #endif /* __MMYTH_EPG_GRID_WIDGET_H__ */

     2.1 --- a/gmyth/src/libgmyth/gmyth_common.h	Thu Sep 21 00:27:36 2006 +0100
     2.2 +++ b/gmyth/src/libgmyth/gmyth_common.h	Thu Sep 21 00:33:03 2006 +0100
     2.3 @@ -31,6 +31,8 @@
     2.4  #include <glib.h>
     2.5  #include <time.h>
     2.6  
     2.7 +G_BEGIN_DECLS
     2.8 +
     2.9  /**
    2.10   * The GMythChannelInfo structure represents the channel information
    2.11   * stored in the backend database.
    2.12 @@ -152,4 +154,6 @@
    2.13  void gmyth_free_channel_list(GList *list);
    2.14  void gmyth_free_program_list(GList *list);
    2.15  
    2.16 +G_END_DECLS
    2.17 +
    2.18  #endif /* GMYTH_COMMON_H_ */

     3.1 --- a/gmyth/src/libgmyth/gmyth_context.h	Thu Sep 21 00:27:36 2006 +0100
     3.2 +++ b/gmyth/src/libgmyth/gmyth_context.h	Thu Sep 21 00:33:03 2006 +0100
     3.3 @@ -35,7 +35,7 @@
     3.4  #include "gmyth_socket.h"
     3.5  #include "gmyth_stringlist.h"
     3.6  
     3.7 -#define G_BEGIN_DECLS
     3.8 +G_BEGIN_DECLS
     3.9  
    3.10  #define GMYTH_CONTEXT_TYPE               (gmyth_context_get_type ())
    3.11  #define GMYTH_CONTEXT(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_CONTEXT_TYPE, GMythContext))
    3.12 @@ -83,6 +83,6 @@
    3.13  GString* gmyth_context_get_setting_onhost (GString *key, GString *host, GString *default_value);
    3.14  
    3.15  
    3.16 -#define G_END_DECLS
    3.17 +G_END_DECLS
    3.18  
    3.19  #endif /* __GMYTH_CONTEXT_H__ */

     4.1 --- a/gmyth/src/libgmyth/gmyth_epg.c	Thu Sep 21 00:27:36 2006 +0100
     4.2 +++ b/gmyth/src/libgmyth/gmyth_epg.c	Thu Sep 21 00:33:03 2006 +0100
     4.3 @@ -81,7 +81,7 @@
     4.4   * @return a new instance of GMythEPG.
     4.5   */
     4.6  GMythEPG*
     4.7 -gmyth_epg_new ()
     4.8 +gmyth_epg_new (void)
     4.9  {
    4.10      GMythEPG *epg = GMYTH_EPG (g_object_new(GMYTH_EPG_TYPE, NULL));
    4.11  

     5.1 --- a/gmyth/src/libgmyth/gmyth_epg.h	Thu Sep 21 00:27:36 2006 +0100
     5.2 +++ b/gmyth/src/libgmyth/gmyth_epg.h	Thu Sep 21 00:33:03 2006 +0100
     5.3 @@ -34,7 +34,7 @@
     5.4  #include "gmyth_query.h"
     5.5  #include "gmyth_common.h"
     5.6  
     5.7 -#define G_BEGIN_DECLS
     5.8 +G_BEGIN_DECLS
     5.9  
    5.10  #define GMYTH_EPG_TYPE               (gmyth_epg_get_type ())
    5.11  #define GMYTH_EPG(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_EPG_TYPE, GMythEPG))
    5.12 @@ -63,7 +63,7 @@
    5.13  
    5.14  GType          gmyth_epg_get_type (void);
    5.15  
    5.16 -GMythEPG* gmyth_epg_new ();
    5.17 +GMythEPG* gmyth_epg_new (void);
    5.18  
    5.19  gboolean gmyth_epg_connect (GMythEPG *gmyth_epg);
    5.20  gboolean gmyth_epg_disconnect (GMythEPG *gmyth_epg);

     6.1 --- a/gmyth/src/libgmyth/gmyth_query.h	Thu Sep 21 00:27:36 2006 +0100
     6.2 +++ b/gmyth/src/libgmyth/gmyth_query.h	Thu Sep 21 00:33:03 2006 +0100
     6.3 @@ -34,7 +34,7 @@
     6.4  /* MYSQL includes */
     6.5  #include <mysql.h>
     6.6  
     6.7 -#define G_BEGIN_DECLS
     6.8 +G_BEGIN_DECLS
     6.9  
    6.10  #define GMYTH_QUERY_TYPE               (gmyth_query_get_type ())
    6.11  #define GMYTH_QUERY(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_QUERY_TYPE, GMythQuery))
    6.12 @@ -79,6 +79,6 @@
    6.13  gboolean gmyth_query_connect (GMythQuery *gmyth_query);
    6.14  gboolean gmyth_query_disconnect (GMythQuery *gmyth_query);
    6.15  
    6.16 -#define G_END_DECLS
    6.17 +G_END_DECLS
    6.18  
    6.19  #endif /* __GMYTH_QUERY_H__ */

     7.1 --- a/gmyth/src/libgmyth/gmyth_remote_encoder.h	Thu Sep 21 00:27:36 2006 +0100
     7.2 +++ b/gmyth/src/libgmyth/gmyth_remote_encoder.h	Thu Sep 21 00:33:03 2006 +0100
     7.3 @@ -39,7 +39,7 @@
     7.4  #include <sys/socket.h>
     7.5  #include <unistd.h>
     7.6  
     7.7 -#define G_BEGIN_DECLS
     7.8 +G_BEGIN_DECLS
     7.9  
    7.10  #define GMYTH_REMOTE_ENCODER_TYPE               (gmyth_remote_encoder_get_type ())
    7.11  #define GMYTH_REMOTE_ENCODER(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_REMOTE_ENCODER_TYPE, GMythRemoteEncoder))
    7.12 @@ -84,6 +84,6 @@
    7.13                                           GString *tvchain_id);
    7.14  gboolean gmyth_remote_encoder_stop_livetv (GMythRemoteEncoder *remote_encoder);
    7.15  
    7.16 -#define G_END_DECLS
    7.17 +G_END_DECLS
    7.18  
    7.19  #endif /* __GMYTH_REMOTE_ENCODER_H__ */

     8.1 --- a/gmyth/src/libgmyth/gmyth_remote_util.h	Thu Sep 21 00:27:36 2006 +0100
     8.2 +++ b/gmyth/src/libgmyth/gmyth_remote_util.h	Thu Sep 21 00:33:03 2006 +0100
     8.3 @@ -28,8 +28,13 @@
     8.4  #ifndef __REMOTE_UTIL_H__
     8.5  #define __REMOTE_UTIL_H__
     8.6  
     8.7 +#include <glib.h>
     8.8  #include "gmyth_remote_encoder.h"
     8.9  
    8.10 +G_BEGIN_DECLS
    8.11 +
    8.12  GMythRemoteEncoder* remote_request_next_free_recorder (int curr);
    8.13  
    8.14 +G_END_DECLS
    8.15 +
    8.16  #endif

     9.1 --- a/gmyth/src/libgmyth/gmyth_scheduler.h	Thu Sep 21 00:27:36 2006 +0100
     9.2 +++ b/gmyth/src/libgmyth/gmyth_scheduler.h	Thu Sep 21 00:33:03 2006 +0100
     9.3 @@ -35,7 +35,7 @@
     9.4  #include "gmyth_common.h"
     9.5  #include "gmyth_query.h"
     9.6  
     9.7 -#define G_BEGIN_DECLS
     9.8 +G_BEGIN_DECLS
     9.9  
    9.10  #define GMYTH_SCHEDULER_TYPE               (gmyth_scheduler_get_type ())
    9.11  #define GMYTH_SCHEDULER(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_SCHEDULER_TYPE, GMythScheduler))
    9.12 @@ -150,7 +150,7 @@
    9.13  gint            gmyth_scheduler_delete_recorded (GMythScheduler *scheduler, 
    9.14                                                   gint record_id);
    9.15  
    9.16 -#define G_END_DECLS
    9.17 +G_END_DECLS
    9.18  
    9.19  #endif /* __GMYTH_SCHEDULER_H__ */
    9.20  

    10.1 --- a/gmyth/src/libgmyth/gmyth_settings.c	Thu Sep 21 00:27:36 2006 +0100
    10.2 +++ b/gmyth/src/libgmyth/gmyth_settings.c	Thu Sep 21 00:33:03 2006 +0100
    10.3 @@ -112,7 +112,7 @@
    10.4   * @return a new instance of GMythSettings.
    10.5   */
    10.6  GMythSettings*
    10.7 -gmyth_settings_new ()
    10.8 +gmyth_settings_new (void)
    10.9  {
   10.10      GMythSettings *gmyth_settings = GMYTH_SETTINGS (g_object_new(GMYTH_SETTINGS_TYPE, NULL));
   10.11  

    11.1 --- a/gmyth/src/libgmyth/gmyth_settings.h	Thu Sep 21 00:27:36 2006 +0100
    11.2 +++ b/gmyth/src/libgmyth/gmyth_settings.h	Thu Sep 21 00:33:03 2006 +0100
    11.3 @@ -41,7 +41,7 @@
    11.4  //#include <sys/socket.h>
    11.5  //#include <unistd.h>
    11.6  
    11.7 -#define G_BEGIN_DECLS
    11.8 +G_BEGIN_DECLS
    11.9  
   11.10  #define GMYTH_SETTINGS_TYPE               (gmyth_settings_get_type ())
   11.11  #define GMYTH_SETTINGS(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_SETTINGS_TYPE, GMythSettings))
   11.12 @@ -81,7 +81,7 @@
   11.13  
   11.14  GType gmyth_settings_get_type (void);
   11.15  
   11.16 -GMythSettings* gmyth_settings_new ();
   11.17 +GMythSettings* gmyth_settings_new (void);
   11.18  gboolean gmyth_settings_load_from_file (GMythSettings *gmyth_settings, GString *filename);
   11.19  gboolean gmyth_settings_load (GMythSettings *msettings);
   11.20  gboolean gmyth_settings_save (GMythSettings *gmyth_settings);
   11.21 @@ -98,6 +98,6 @@
   11.22  void gmyth_settings_set_backend_port (GMythSettings *gmyth_settings, gint new_port);
   11.23  
   11.24  
   11.25 -#define G_END_DECLS
   11.26 +G_END_DECLS
   11.27  
   11.28  #endif /* __GMYTH_SETTINGS_H__ */

    12.1 --- a/gmyth/src/libgmyth/gmyth_socket.h	Thu Sep 21 00:27:36 2006 +0100
    12.2 +++ b/gmyth/src/libgmyth/gmyth_socket.h	Thu Sep 21 00:33:03 2006 +0100
    12.3 @@ -43,7 +43,7 @@
    12.4  
    12.5  #include "gmyth_stringlist.h"
    12.6  
    12.7 -#define G_BEGIN_DECLS
    12.8 +G_BEGIN_DECLS
    12.9  
   12.10  #define GMYTH_SOCKET_TYPE               (gmyth_socket_get_type ())
   12.11  #define GMYTH_SOCKET(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_SOCKET_TYPE, GMythSocket))
   12.12 @@ -79,7 +79,7 @@
   12.13  
   12.14  GType           gmyth_socket_get_type (void);
   12.15  
   12.16 -GMythSocket *   gmyth_socket_new ();
   12.17 +GMythSocket *   gmyth_socket_new (void);
   12.18  
   12.19  GIOChannel *    gmyth_socket_get_io_channel (GMythSocket *gmyth_socket );
   12.20  
   12.21 @@ -98,7 +98,7 @@
   12.22                                                   gchar *hostname_backend, int port,
   12.23                                            		 gboolean blocking_client);
   12.24  
   12.25 -GString *       gmyth_socket_get_local_hostname ();
   12.26 +GString *       gmyth_socket_get_local_hostname (void);
   12.27  
   12.28  void            gmyth_socket_close_connection (GMythSocket *gmyth_socket);
   12.29  
   12.30 @@ -111,6 +111,6 @@
   12.31  int			    gmyth_socket_read_stringlist(GMythSocket *gmyth_socket, 
   12.32                                               GMythStringList* str_list);
   12.33  
   12.34 -#define G_END_DECLS
   12.35 +G_END_DECLS
   12.36  
   12.37  #endif /* __GMYTH_SOCKET_H__ */

    13.1 --- a/gmyth/src/libgmyth/gmyth_stringlist.h	Thu Sep 21 00:27:36 2006 +0100
    13.2 +++ b/gmyth/src/libgmyth/gmyth_stringlist.h	Thu Sep 21 00:33:03 2006 +0100
    13.3 @@ -38,7 +38,7 @@
    13.4  #include <sys/socket.h>
    13.5  #include <unistd.h>
    13.6  
    13.7 -#define G_BEGIN_DECLS
    13.8 +G_BEGIN_DECLS
    13.9  
   13.10  #define GMYTH_STRING_LIST_TYPE               (gmyth_string_list_get_type ())
   13.11  #define GMYTH_STRING_LIST(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_STRING_LIST_TYPE, GMythStringList))
   13.12 @@ -92,6 +92,6 @@
   13.13  #define gmyth_string_list_get_char_array(strlist, index) \
   13.14              (gmyth_string_list_get_string(strlist, index))->str
   13.15  
   13.16 -#define G_END_DECLS
   13.17 +G_END_DECLS
   13.18  
   13.19  #endif /*GMYTH_STRING_LIST_H_*/

    14.1 --- a/gmyth/src/libgmyth/gmyth_tvchain.h	Thu Sep 21 00:27:36 2006 +0100
    14.2 +++ b/gmyth/src/libgmyth/gmyth_tvchain.h	Thu Sep 21 00:33:03 2006 +0100
    14.3 @@ -34,7 +34,7 @@
    14.4  
    14.5  #include "gmyth_common.h"
    14.6  
    14.7 -#define G_BEGIN_DECLS
    14.8 +G_BEGIN_DECLS
    14.9  
   14.10  #define GMYTH_TVCHAIN_TYPE               (gmyth_tvchain_get_type ())
   14.11  #define GMYTH_TVCHAIN(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_TVCHAIN_TYPE, GMythTVChain))
   14.12 @@ -100,6 +100,6 @@
   14.13                                                      struct LiveTVChainEntry *entry);
   14.14  GMythProgramInfo*   gmyth_tvchain_get_program_at (GMythTVChain *tvchain, gint index);
   14.15  
   14.16 -#define G_END_DECLS
   14.17 +G_END_DECLS
   14.18  
   14.19  #endif /*LIVETVCHAIN_H_*/

    15.1 --- a/gmyth/src/libgmyth/gmyth_tvplayer.h	Thu Sep 21 00:27:36 2006 +0100
    15.2 +++ b/gmyth/src/libgmyth/gmyth_tvplayer.h	Thu Sep 21 00:33:03 2006 +0100
    15.3 @@ -40,7 +40,7 @@
    15.4  #include "gmyth_tvchain.h"
    15.5  #include "gmyth_common.h"
    15.6  
    15.7 -#define G_BEGIN_DECLS
    15.8 +G_BEGIN_DECLS
    15.9  
   15.10  #define GMYTH_TVPLAYER_TYPE               (gmyth_tvplayer_get_type ())
   15.11  #define GMYTH_TVPLAYER(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_TVPLAYER_TYPE, GMythTVPlayer))
   15.12 @@ -107,6 +107,6 @@
   15.13                                              gchar *filename);
   15.14  gboolean       gmyth_tvplayer_livetv_setup (GMythTVPlayer *tvplayer);
   15.15  
   15.16 -#define G_END_DECLS
   15.17 +G_END_DECLS
   15.18  
   15.19  #endif /*GMYTH_TVPLAYER_H_*/

    16.1 --- a/gmyth/src/libgmyth/gmyth_util.h	Thu Sep 21 00:27:36 2006 +0100
    16.2 +++ b/gmyth/src/libgmyth/gmyth_util.h	Thu Sep 21 00:33:03 2006 +0100
    16.3 @@ -33,10 +33,13 @@
    16.4  
    16.5  #include "gmyth_stringlist.h"
    16.6  
    16.7 +G_BEGIN_DECLS
    16.8 +
    16.9  GString *   gmyth_util_time_to_isoformat(time_t time_value);
   16.10  GString *   gmyth_util_time_to_string   (time_t time_value);
   16.11  time_t      gmyth_util_string_to_time   (GString* time_str);
   16.12  guint64     gmyth_util_decode_long_long (GMythStringList *strlist, 
   16.13                                           guint offset);
   16.14 +G_END_DECLS
   16.15  	
   16.16  #endif /*GMYTH_UTIL_H_*/