[PATCH] Changes to make the glib-removal-hack branch build on MacOSX

[Dirk Hohndel]

On Sun, 2013-10-06 at 13:43 +0200, subsurface at henrik.synth.no wrote:
> diff --git a/download-dialog.c b/download-dialog.c
> index b985625..b5632d5 100644
> --- a/download-dialog.c
> +++ b/download-dialog.c
> @@ -1,5 +1,3 @@
> -#include <libintl.h>
> -#include <glib/gi18n.h>
>  #include "dive.h"
>  #include "divelist.h"
>  #include "display.h"
> diff --git a/gtk-gui.c b/gtk-gui.c
> index e873fc6..7ec3d88 100644
> --- a/gtk-gui.c
> +++ b/gtk-gui.c
> @@ -8,8 +8,6 @@
>   * functions. It's renamed back to gtk-ui.c to keep the old Gtk code
>   * around for reference in case we still need it... all that has now been
>   * ripped out of qt-gui.cpp */
> -#include <libintl.h>
> -#include <glib/gi18n.h>
>  #include <stdio.h>
>  #include <string.h>
>  #include <stdlib.h>
> diff --git a/webservice.c b/webservice.c
> index f4f8bae..e713e12 100644
> --- a/webservice.c
> +++ b/webservice.c
> @@ -1,4 +1,3 @@
> -#include <libintl.h>
>  #include <glib/gi18n.h>
>  #include <libsoup/soup.h>
>  #include <libxml/tree.h>

None of these should be compiled anymore... why did they break your
build?

> diff --git a/windows.c b/windows.c
> index 823615c..fb28839 100644
> --- a/windows.c
> +++ b/windows.c
> @@ -60,7 +60,7 @@ void subsurface_set_conf_int(const char *name, int value)
>  	RegSetValueEx(hkey, (LPCTSTR)name, 0, REG_DWORD, (const BYTE *)&value, 4);
>  }
>  
> -void subsurface_set_conf_bool(const char *name, int value)
> +void subsurface_set_conf_bool(const char *name, bool value)
>  {
>  	subsurface_set_conf_int(name, value);
>  }
> @@ -305,7 +305,7 @@ void subsurface_command_line_exit(gint *argc, gchar ***argv)
>  	g_free(*argv);
>  }
>  
> -gboolean subsurface_launch_for_uri(const char* uri)
> +bool subsurface_launch_for_uri(const char* uri)
>  {
>  	gboolean ret = FALSE;
>  	wchar_t *wuri = (wchar_t *)g_utf8_to_utf16(uri, -1, NULL, NULL, NULL);
> @@ -320,7 +320,7 @@ gboolean subsurface_launch_for_uri(const char* uri)
>  }
>  
>  /* check if we are running a newer OS version */
> -gboolean subsurface_os_feature_available(os_feature_t f)
> +bool subsurface_os_feature_available(os_feature_t f)
>  {
>  	switch (f) {
>  	case UTF8_FONT_WITH_STARS:

That one DEFINITELY shouldn't be built on Mac :-)


Anyway - pushed out to the glib-removal-hack branch... I think I'll
merge that into master, soon.


/D