mirror of https://github.com/GNOME/gimp.git
link libgimphelp as not installed .a
2006-11-23 Michael Natterer <mitch@gimp.org> * plug-ins/help/Makefile.am: link libgimphelp as not installed .a * plug-ins/help/gimphelpdomain.[ch] (gimp_help_domain_map): return the GimpHelpLocate the ID was found in. * plug-ins/help/gimp-help-lookup.c * plug-ins/help/help.c: changed accordingly. * plug-ins/help/gimphelp.h: disable debug output.
This commit is contained in:
parent
5fb22c8688
commit
0f64c7e009
12
ChangeLog
12
ChangeLog
|
@ -1,3 +1,15 @@
|
|||
2006-11-23 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* plug-ins/help/Makefile.am: link libgimphelp as not installed .a
|
||||
|
||||
* plug-ins/help/gimphelpdomain.[ch] (gimp_help_domain_map): return
|
||||
the GimpHelpLocate the ID was found in.
|
||||
|
||||
* plug-ins/help/gimp-help-lookup.c
|
||||
* plug-ins/help/help.c: changed accordingly.
|
||||
|
||||
* plug-ins/help/gimphelp.h: disable debug output.
|
||||
|
||||
2006-11-23 Simon Budig <simon@gimp.org>
|
||||
|
||||
* app/display/gimpcanvas.c: Change the color for XOR drawing. This
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
libgimphelp = libgimphelp-$(GIMP_API_VERSION).la
|
||||
libgimphelp = libgimphelp.a
|
||||
libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
|
||||
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
|
||||
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
|
||||
|
@ -14,9 +14,9 @@ AM_CPPFLAGS = -DDATADIR=\""$(gimpdatadir)"\"
|
|||
|
||||
AM_LDFLAGS = $(mwindows)
|
||||
|
||||
lib_LTLIBRARIES = libgimphelp-2.0.la
|
||||
noinst_LIBRARIES = libgimphelp.a
|
||||
|
||||
libgimphelp_2_0_la_SOURCES = \
|
||||
libgimphelp_a_SOURCES = \
|
||||
gimphelptypes.h \
|
||||
gimphelp.c \
|
||||
gimphelp.h \
|
||||
|
|
|
@ -126,7 +126,8 @@ lookup (const gchar *help_domain,
|
|||
if (domain)
|
||||
{
|
||||
GList *locales = gimp_help_parse_locales (help_locales);
|
||||
gchar *full_uri = gimp_help_domain_map (domain, locales, help_id, NULL);
|
||||
gchar *full_uri = gimp_help_domain_map (domain, locales, help_id,
|
||||
NULL, NULL);
|
||||
|
||||
g_list_foreach (locales, (GFunc) g_free, NULL);
|
||||
g_list_free (locales);
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
#define GIMP_HELP_PREFIX "help"
|
||||
#define GIMP_HELP_ENV_URI "GIMP2_HELP_URI"
|
||||
|
||||
#define GIMP_HELP_DEBUG
|
||||
/* #define GIMP_HELP_DEBUG */
|
||||
|
||||
|
||||
gboolean gimp_help_init (gint n_domain_names,
|
||||
|
|
|
@ -114,10 +114,11 @@ gimp_help_domain_lookup_locale (GimpHelpDomain *domain,
|
|||
}
|
||||
|
||||
gchar *
|
||||
gimp_help_domain_map (GimpHelpDomain *domain,
|
||||
GList *help_locales,
|
||||
const gchar *help_id,
|
||||
gboolean *fatal_error)
|
||||
gimp_help_domain_map (GimpHelpDomain *domain,
|
||||
GList *help_locales,
|
||||
const gchar *help_id,
|
||||
GimpHelpLocale **ret_locale,
|
||||
gboolean *fatal_error)
|
||||
{
|
||||
GimpHelpLocale *locale = NULL;
|
||||
const gchar *ref = NULL;
|
||||
|
@ -146,6 +147,9 @@ gimp_help_domain_map (GimpHelpDomain *domain,
|
|||
ref = locale->help_missing;
|
||||
}
|
||||
|
||||
if (ret_locale)
|
||||
*ret_locale = locale;
|
||||
|
||||
if (ref)
|
||||
{
|
||||
return g_strconcat (domain->help_uri, "/",
|
||||
|
|
|
@ -39,12 +39,13 @@ GimpHelpDomain * gimp_help_domain_new (const gchar *domain_name,
|
|||
const gchar *domain_root);
|
||||
void gimp_help_domain_free (GimpHelpDomain *domain);
|
||||
|
||||
GimpHelpLocale * gimp_help_domain_lookup_locale (GimpHelpDomain *domain,
|
||||
const gchar *locale_id);
|
||||
gchar * gimp_help_domain_map (GimpHelpDomain *domain,
|
||||
GList *help_locales,
|
||||
const gchar *help_id,
|
||||
gboolean *fatal_error);
|
||||
GimpHelpLocale * gimp_help_domain_lookup_locale (GimpHelpDomain *domain,
|
||||
const gchar *locale_id);
|
||||
gchar * gimp_help_domain_map (GimpHelpDomain *domain,
|
||||
GList *help_locales,
|
||||
const gchar *help_id,
|
||||
GimpHelpLocale **locale,
|
||||
gboolean *fatal_error);
|
||||
void gimp_help_domain_exit (void);
|
||||
|
||||
|
||||
|
|
|
@ -270,7 +270,7 @@ load_help_idle (gpointer data)
|
|||
gboolean fatal_error;
|
||||
|
||||
full_uri = gimp_help_domain_map (domain, locales, idle_help->help_id,
|
||||
&fatal_error);
|
||||
NULL, &fatal_error);
|
||||
|
||||
g_list_foreach (locales, (GFunc) g_free, NULL);
|
||||
g_list_free (locales);
|
||||
|
|
Loading…
Reference in New Issue