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

removed (wrong) definition of LOCALEDIR. 

2002-05-07  Sven Neumann  <sven@gimp.org>

	* libgimp/gimpintl.h: removed (wrong) definition of LOCALEDIR.

	* libgimp/stdplugins-intl.h: fixed typo in domainname that broke i18n
	of plug-ins.

	* app/gui/Makefile.am: define LOCALEDIR.

	* app/gui/plug-in-menus.c
	* app/plug-in/plug-in.h
	* app/plug-in/plug-ins.[ch]: declared translation domain and help path
	as const strings.

	* plug-ins/print/print.c
	* plug-ins/print/print_gimp.h: minor cleanups.
This commit is contained in:
Sven Neumann 2002-05-07 11:33:58 +00:00 committed by Sven Neumann
parent 7ac0926d18
commit f8de6fe33f
15 changed files with 54 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,3 +1,20 @@
2002-05-07 Sven Neumann <sven@gimp.org>
* libgimp/gimpintl.h: removed (wrong) definition of LOCALEDIR.
* libgimp/stdplugins-intl.h: fixed typo in domainname that broke i18n
of plug-ins.
* app/gui/Makefile.am: define LOCALEDIR.
* app/gui/plug-in-menus.c
* app/plug-in/plug-in.h
* app/plug-in/plug-ins.[ch]: declared translation domain and help path
as const strings.
* plug-ins/print/print.c
* plug-ins/print/print_gimp.h: minor cleanups.
2002-05-07 David Monniaux <david@picsou.chatons>
* app/arch/i386/mmx/paint_funcs_mmx.S.m4: original source of

1
app/gui/Makefile.am
View File

@ -130,6 +130,7 @@ EXTRA_DIST = @STRIP_BEGIN@ \
@STRIP_END@
AM_CPPFLAGS = @STRIP_BEGIN@ \
-DLOCALEDIR=\""$(localedir)"\" \
-DG_LOG_DOMAIN=\"Gimp-GUI\" \
@GIMP_THREAD_FLAGS@ \
@GIMP_MP_FLAGS@ \

5
app/gui/plug-in-menus.c
View File

@ -186,10 +186,11 @@ plug_in_make_menu_entry (gpointer foo,
{
GimpItemFactory *item_factory;
item_factory = gimp_item_factory_from_path (menu_entry->proc_def->menu_path);
item_factory =
gimp_item_factory_from_path (menu_entry->proc_def->menu_path);
g_object_set_data (G_OBJECT (item_factory), "textdomain",
menu_entry->domain);
(gpointer) menu_entry->domain);
gimp_item_factory_create_item (item_factory,
&entry,

5
app/menus/plug-in-menus.c
View File

@ -186,10 +186,11 @@ plug_in_make_menu_entry (gpointer foo,
{
GimpItemFactory *item_factory;
item_factory = gimp_item_factory_from_path (menu_entry->proc_def->menu_path);
item_factory =
gimp_item_factory_from_path (menu_entry->proc_def->menu_path);
g_object_set_data (G_OBJECT (item_factory), "textdomain",
menu_entry->domain);
(gpointer) menu_entry->domain);
gimp_item_factory_create_item (item_factory,
&entry,

4
app/plug-in/gimpplugin.h
View File

@ -64,8 +64,8 @@ struct _PlugIn
struct _PlugInMenuEntry
{
PlugInProcDef *proc_def;
gchar *domain;
gchar *help_path;
const gchar *domain;
const gchar *help_path;
};

4
app/plug-in/gimppluginmanager.c
View File

@ -65,8 +65,8 @@ static void plug_ins_proc_def_insert (PlugInProcDef *proc_def,
static void plug_ins_proc_def_dead (void *freed_proc_def);
GSList *proc_defs = NULL;
gchar *std_plugins_domain = "gimp14-std-plug-ins";
GSList *proc_defs = NULL;
const gchar *std_plugins_domain = "gimp14-std-plug-ins";
static GSList *plug_in_defs = NULL;
static GSList *gimprc_proc_defs = NULL;

4
app/plug-in/gimppluginmanager.h
View File

@ -55,8 +55,8 @@ GSList * plug_ins_extensions_parse (gchar *extensions);
PlugInImageType plug_ins_image_types_parse (gchar *image_types);
extern GSList *proc_defs;
extern gchar *std_plugins_domain;
extern GSList *proc_defs;
extern const gchar *std_plugins_domain;
#endif /* __PLUG_INS_H__ */

4
app/plug-in/plug-in.h
View File

@ -64,8 +64,8 @@ struct _PlugIn
struct _PlugInMenuEntry
{
PlugInProcDef *proc_def;
gchar *domain;
gchar *help_path;
const gchar *domain;
const gchar *help_path;
};

4
app/plug-in/plug-ins.c
View File

@ -65,8 +65,8 @@ static void plug_ins_proc_def_insert (PlugInProcDef *proc_def,
static void plug_ins_proc_def_dead (void *freed_proc_def);
GSList *proc_defs = NULL;
gchar *std_plugins_domain = "gimp14-std-plug-ins";
GSList *proc_defs = NULL;
const gchar *std_plugins_domain = "gimp14-std-plug-ins";
static GSList *plug_in_defs = NULL;
static GSList *gimprc_proc_defs = NULL;

4
app/plug-in/plug-ins.h
View File

@ -55,8 +55,8 @@ GSList * plug_ins_extensions_parse (gchar *extensions);
PlugInImageType plug_ins_image_types_parse (gchar *image_types);
extern GSList *proc_defs;
extern gchar *std_plugins_domain;
extern GSList *proc_defs;
extern const gchar *std_plugins_domain;
#endif /* __PLUG_INS_H__ */

11
libgimp/gimpintl.h
View File

@ -28,17 +28,6 @@
#include <locale.h>
/* Copied from gnome-i18n.h by Tom Tromey <tromey@creche.cygnus.com>
* Modified by Daniel Egger <Daniel.Egger@t-online.de> and others.
*/
#ifndef LOCALEDIR
#define LOCALEDIR g_strconcat (gimp_data_directory (), \
G_DIR_SEPARATOR_S, \
"locale", \
NULL)
#endif
#ifdef ENABLE_NLS
# include <libintl.h>
# define _(String) gettext (String)

6
libgimp/stdplugins-intl.h
View File

@ -29,9 +29,9 @@
setlocale (LC_ALL, ""); \
bindtextdomain(GETTEXT_PACKAGE"-libgimp", LOCALEDIR); \
bind_textdomain_codeset (GETTEXT_PACKAGE"-libgimp", "UTF-8"); \
bindtextdomain(GETTEXT_PACKAGE"-std-plugins", LOCALEDIR); \
bind_textdomain_codeset (GETTEXT_PACKAGE"-std-plugins", "UTF-8"); \
textdomain(GETTEXT_PACKAGE"-std-plugins"); \
bindtextdomain(GETTEXT_PACKAGE"-std-plug-ins", LOCALEDIR); \
bind_textdomain_codeset (GETTEXT_PACKAGE"-std-plug-ins", "UTF-8"); \
textdomain(GETTEXT_PACKAGE"-std-plug-ins"); \
}G_STMT_END
#define INIT_I18N_UI() INIT_I18N()

18
plug-ins/print/print.c
View File

@ -83,9 +83,9 @@ int runme = FALSE; /* True if print should proceed */
stp_printer_t current_printer = 0; /* Current printer index */
gint32 image_ID; /* image ID */
const char *image_filename;
int image_width;
int image_height;
gchar *image_filename;
gint image_width;
gint image_height;
static void
check_plist(int count)
@ -153,7 +153,6 @@ query (void)
{ GIMP_PDB_STRING, "dither_algorithm", "Dither algorithm" },
{ GIMP_PDB_INT32, "unit", "Unit 0=Inches 1=Metric" },
};
static gint nargs = sizeof(args) / sizeof(args[0]);
static gchar *blurb = "This plug-in prints images from The GIMP.";
static gchar *help = "Prints images to PostScript, PCL, or ESC/P2 printers.";
@ -167,7 +166,7 @@ query (void)
N_("<Image>/File/Print..."),
types,
GIMP_PLUGIN,
nargs, 0,
G_N_ELEMENTS (args), 0,
args, NULL);
}
@ -231,7 +230,7 @@ run (gchar *name, /* I - Name of print program. */
GimpRunMode run_mode; /* Current run mode */
FILE *prn = NULL; /* Print file/command */
int ncolors; /* Number of colors in colormap */
GimpParam *values; /* Return values */
GimpParam values[1]; /* Return values */
#ifdef __EMX__
char *tmpfile; /* temp filename */
#endif
@ -265,8 +264,6 @@ run (gchar *name, /* I - Name of print program. */
current_printer = stp_get_printer_by_index (0);
run_mode = (GimpRunMode) param[0].data.d_int32;
values = g_new (GimpParam, 1);
values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = GIMP_PDB_SUCCESS;
@ -277,7 +274,8 @@ run (gchar *name, /* I - Name of print program. */
drawable_ID = param[2].data.d_int32;
image_filename = gimp_image_get_filename (image_ID);
if (strchr(image_filename, '/'))
if (strchr (image_filename, '/'))
image_filename = strrchr(image_filename, '/') + 1;
/* eventually export the image */
@ -574,8 +572,10 @@ run (gchar *name, /* I - Name of print program. */
gimp_drawable_detach (drawable);
cleanup:
if (export == GIMP_EXPORT_EXPORT)
gimp_image_delete (image_ID);
stp_free_vars(vars);
}

12
plug-ins/print/print_gimp.h
View File

@ -56,20 +56,20 @@ extern guchar *thumbnail_data;
extern gint adjusted_thumbnail_bpp;
extern guchar *adjusted_thumbnail_data;
extern stp_vars_t vars;
extern stp_vars_t vars;
extern gint plist_count; /* Number of system printers */
extern gint plist_current; /* Current system printer */
extern gp_plist_t *plist; /* System printers */
extern gp_plist_t *plist; /* System printers */
extern gint32 image_ID;
extern const gchar *image_filename;
extern gchar *image_filename;
extern gint image_width;
extern gint image_height;
extern stp_printer_t current_printer;
extern stp_printer_t current_printer;
extern gint runme;
extern gint saveme;
extern GtkWidget *gimp_color_adjust_dialog;
extern GtkWidget *dither_algo_combo;
extern GtkWidget *gimp_color_adjust_dialog;
extern GtkWidget *dither_algo_combo;
extern stp_vars_t *pv;
/*

1
po-plug-ins/de.po
View File

@ -10448,7 +10448,6 @@ msgstr ""
#. * The "image size" button
#.
#: plug-ins/print/gimp_main_window.c:1275
#, fuzzy
msgid ""
"Use Original\n"
"Image Size"