dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gimphelplocale: MacOS can get http and https 

(cherry picked from commit cad9feed71)
This commit is contained in:
Lukas Oberhuber 2022-12-27 15:49:25 +00:00 committed by Jehan
parent b54ca06579
commit 15c34716cf
2 changed files with 66 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plug-ins/help/Makefile.am
View File

@ -1,5 +1,12 @@
## Process this file with automake to produce Makefile.in
if PLATFORM_OSX
xobjective_c = "-xobjective-c"
xobjective_cxx = "-xobjective-c++"
xnone = "-xnone"
framework_cocoa = -framework Cocoa
endif
libgimphelp = libgimphelp.a
libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
@ -25,7 +32,16 @@ AM_CPPFLAGS = \
$(GDK_PIXBUF_CFLAGS) \
-I$(includedir)
AM_LDFLAGS = $(mwindows)
AM_CFLAGS = \
$(xobjective_c)
AM_CXXFLAGS = \
$(xobjective_cxx)
AM_LDFLAGS = \
$(mwindows) \
$(framework_cocoa) \
$(xnone)
noinst_LIBRARIES = libgimphelp.a

53
plug-ins/help/gimphelplocale.c
View File

@ -40,6 +40,9 @@
#include "libgimp/stdplugins-intl.h"
#endif
#ifdef PLATFORM_OSX
#include <Foundation/Foundation.h>
#endif
/* local function prototypes */
@ -169,11 +172,18 @@ gimp_help_locale_parse (GimpHelpLocale *locale,
GError **error)
{
GMarkupParseContext *context;
GFile *file;
GFileInputStream *stream;
GFile *file = NULL;
GCancellable *cancellable = NULL;
LocaleParser parser = { NULL, };
#ifdef PLATFORM_OSX
NSURL *fileURL;
NSString *nsUri;
NSData *data;
const gchar *str;
#else
GFileInputStream *stream;
goffset size = 0;
#endif
gboolean success;
g_return_val_if_fail (locale != NULL, FALSE);
@ -207,10 +217,33 @@ gimp_help_locale_parse (GimpHelpLocale *locale,
_gimp_help_progress_start (progress, cancellable,
_("Loading index from '%s'"), name);
g_object_unref (cancellable);
g_clear_object (&cancellable);
g_free (name);
}
#ifdef PLATFORM_OSX
nsUri = [NSString stringWithUTF8String: uri];
fileURL = [NSURL URLWithString: nsUri];
[nsUri release];
if (progress)
_gimp_help_progress_pulse (progress);
/* Load the data from the remote URL into the NSData object */
data = [NSData dataWithContentsOfURL:fileURL];
[fileURL release];
if (! data)
{
locale_set_error (error,
_("Could not load data from '%s': %s"), file);
g_object_unref (file);
return FALSE;
}
if (progress)
_gimp_help_progress_pulse (progress);
#else /* PLATFORM_OSX */
if (progress)
{
GFileInfo *info = g_file_query_info (file,
@ -240,6 +273,7 @@ gimp_help_locale_parse (GimpHelpLocale *locale,
return FALSE;
}
#endif /* ! PLATFORM_OSX */
parser.file = file;
parser.value = g_string_new (NULL);
@ -249,15 +283,26 @@ gimp_help_locale_parse (GimpHelpLocale *locale,
context = g_markup_parse_context_new (&markup_parser, 0, &parser, NULL);
#ifdef PLATFORM_OSX
str = (const char *)[data bytes];
if (! g_markup_parse_context_parse (context, str, [data length], error))
success = FALSE;
else
success = g_markup_parse_context_end_parse (context, error);
[data release];
#else /* PLATFORM_OSX */
success = locale_parser_parse (context, progress,
G_INPUT_STREAM (stream), size,
cancellable, error);
g_object_unref (stream);
#endif /* ! PLATFORM_OSX */
if (progress)
_gimp_help_progress_finish (progress);
g_markup_parse_context_free (context);
g_object_unref (stream);
g_string_free (parser.value, TRUE);
g_free (parser.id_attr_name);