callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't say we'd use MMX if it is disabled.

Browse Source 
2002-11-06  Sven Neumann  <sven@gimp.org>

	* app/base/base.c (base_init): don't say we'd use MMX if it is
	disabled.

	* libgimpmodule/gimpmodule.[ch]
	* app/gui/module-browser.c: changed enum values and user-visible
	strings to saner values.

	* libgimpmodule/gimpmoduledb.c
	* plug-ins/tools/tool-safe-mode.c: made them less verbose.
This commit is contained in:
Sven Neumann
2002-11-06 13:56:37 +00:00
committed by Sven Neumann
parent 368afec46c
commit 2ef9706b1d
24 changed files with 100 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2002-11-06 Sven Neumann <sven@gimp.org>
* app/base/base.c (base_init): don't say we'd use MMX if it is
disabled.
* libgimpmodule/gimpmodule.[ch]
* app/gui/module-browser.c: changed enum values and user-visible
strings to saner values.
* libgimpmodule/gimpmoduledb.c
* plug-ins/tools/tool-safe-mode.c: made them less verbose.
2002-11-06 Dave Neary <bolsh@gimp.org>
* plug-ins/common/png.c: Removed cruft from file,

4
app/base/base.c
View File

@ -57,10 +57,12 @@ base_init (void)
gchar *swapfile;
gchar *path;
#ifdef ENABLE_MMX
#ifdef HAVE_ASM_MMX
use_mmx = use_mmx && (intel_cpu_features() & (1 << 23)) ? 1 : 0;
g_print ("using MMX: %s\n", use_mmx ? "yes" : "no");
#endif
#endif
#endif
toast_old_temp_files ();

6
app/dialogs/module-dialog.c
View File

@ -316,7 +316,7 @@ static void
browser_load_unload_callback (GtkWidget *widget,
ModuleBrowser *browser)
{
if (browser->last_update->state != GIMP_MODULE_STATE_LOADED_OK)
if (browser->last_update->state != GIMP_MODULE_STATE_LOADED)
{
if (browser->last_update->info)
{
@ -471,7 +471,7 @@ browser_info_update (GimpModuleDB *db,
{
case GIMP_MODULE_STATE_ERROR:
case GIMP_MODULE_STATE_LOAD_FAILED:
case GIMP_MODULE_STATE_UNLOADED_OK:
case GIMP_MODULE_STATE_NOT_LOADED:
if (module->info)
gtk_label_set_text (GTK_LABEL (browser->button_label), _("Load"));
else
@ -481,7 +481,7 @@ browser_info_update (GimpModuleDB *db,
module->on_disk);
break;
case GIMP_MODULE_STATE_LOADED_OK:
case GIMP_MODULE_STATE_LOADED:
gtk_label_set_text (GTK_LABEL (browser->button_label), _("Unload"));
gtk_widget_set_sensitive (GTK_WIDGET (browser->button), FALSE);
break;

6
app/gui/module-browser.c
View File

@ -316,7 +316,7 @@ static void
browser_load_unload_callback (GtkWidget *widget,
ModuleBrowser *browser)
{
if (browser->last_update->state != GIMP_MODULE_STATE_LOADED_OK)
if (browser->last_update->state != GIMP_MODULE_STATE_LOADED)
{
if (browser->last_update->info)
{
@ -471,7 +471,7 @@ browser_info_update (GimpModuleDB *db,
{
case GIMP_MODULE_STATE_ERROR:
case GIMP_MODULE_STATE_LOAD_FAILED:
case GIMP_MODULE_STATE_UNLOADED_OK:
case GIMP_MODULE_STATE_NOT_LOADED:
if (module->info)
gtk_label_set_text (GTK_LABEL (browser->button_label), _("Load"));
else
@ -481,7 +481,7 @@ browser_info_update (GimpModuleDB *db,
module->on_disk);
break;
case GIMP_MODULE_STATE_LOADED_OK:
case GIMP_MODULE_STATE_LOADED:
gtk_label_set_text (GTK_LABEL (browser->button_label), _("Unload"));
gtk_widget_set_sensitive (GTK_WIDGET (browser->button), FALSE);
break;

18
devel-docs/ChangeLog
View File

@ -1,3 +1,21 @@
2002-11-06 Sven Neumann <sven@gimp.org>
* libgimpcolor/libgimpcolor-sections.txt
* libgimpcolor/tmpl/gimpadaptivesupersample.sgml
* libgimpcolor/tmpl/gimpbilinear.sgml
* libgimpcolor/tmpl/gimpcolorspace.sgml
* libgimpcolor/tmpl/gimphsv.sgml
* libgimpcolor/tmpl/gimprgb.sgml
* libgimpmath/libgimpmath-sections.txt
* libgimpmath/tmpl/gimpmath.sgml
* libgimpmath/tmpl/gimpmatrix.sgml
* libgimpmath/tmpl/gimpvector.sgml
* libgimpmodule/tmpl/gimpmodule.sgml
* libgimpwidgets/libgimpwidgets-docs.sgml
* libgimpwidgets/tmpl/gimpcolorscales.sgml
* libgimpwidgets/tmpl/gimpcolorselect.sgml: some minor changes to
make the docs more pleasant to look at.
2002-11-05 Michael Natterer <mitch@gimp.org>
* libgimpwidgets/tmpl/gimppickbutton.sgml: added GimpPickButton.

5
devel-docs/libgimpcolor/libgimpcolor-sections.txt
View File

@ -1,5 +1,6 @@
<SECTION>
<FILE>gimpcolorspace</FILE>
<TITLE>GimpColorSpace</TITLE>
gimp_rgb_to_hsv
gimp_rgb_to_hsl
gimp_hsv_to_rgb
@ -19,6 +20,7 @@ gimp_hsv_to_rgb4
<SECTION>
<FILE>gimphsv</FILE>
<TITLE>GimpHSV</TITLE>
GimpHSV
gimp_hsv_set
gimp_hsv_clamp
@ -27,6 +29,7 @@ gimp_hsva_set
<SECTION>
<FILE>gimprgb</FILE>
<TITLE>GimpRGB</TITLE>
GimpRGB
GimpRGBCompositeMode
gimp_rgb_set
@ -59,6 +62,7 @@ INTENSITY
<SECTION>
<FILE>gimpadaptivesupersample</FILE>
<TITLE>GimpAdaptiveSupersample</TITLE>
GimpProgressFunc
GimpPutPixelFunc
GimpRenderFunc
@ -67,6 +71,7 @@ gimp_adaptive_supersample_area
<SECTION>
<FILE>gimpbilinear</FILE>
<TITLE>GimpBilinear</TITLE>
gimp_bilinear
gimp_bilinear_8
gimp_bilinear_16

2
devel-docs/libgimpcolor/tmpl/gimpadaptivesupersample.sgml
View File

@ -1,5 +1,5 @@
<!-- ##### SECTION Title ##### -->
gimpadaptivesupersample
GimpAdaptiveSupersample
<!-- ##### SECTION Short_Description ##### -->

2
devel-docs/libgimpcolor/tmpl/gimpbilinear.sgml
View File

@ -1,5 +1,5 @@
<!-- ##### SECTION Title ##### -->
gimpbilinear
GimpBilinear
<!-- ##### SECTION Short_Description ##### -->

2
devel-docs/libgimpcolor/tmpl/gimpcolorspace.sgml
View File

@ -1,5 +1,5 @@
<!-- ##### SECTION Title ##### -->
gimpcolorspace
GimpColorSpace
<!-- ##### SECTION Short_Description ##### -->
Utility functions which convert colors between different color models.

2
devel-docs/libgimpcolor/tmpl/gimphsv.sgml
View File

@ -1,5 +1,5 @@
<!-- ##### SECTION Title ##### -->
gimphsv
GimpHSV
<!-- ##### SECTION Short_Description ##### -->

2
devel-docs/libgimpcolor/tmpl/gimprgb.sgml
View File

@ -1,5 +1,5 @@
<!-- ##### SECTION Title ##### -->
gimprgb
GimpRGB
<!-- ##### SECTION Short_Description ##### -->

3
devel-docs/libgimpmath/libgimpmath-sections.txt
View File

@ -1,5 +1,6 @@
<SECTION>
<FILE>gimpmath</FILE>
<TITLE>GimpMath</TITLE>
G_MAXRAND
RINT
ROUND
@ -18,6 +19,7 @@ gimp_md5_get_digest
<SECTION>
<FILE>gimpmatrix</FILE>
<TITLE>GimpMatrix</TITLE>
GimpMatrix3[3][3]
GimpMatrix4[4][4]
gimp_matrix3_transform_point
@ -39,6 +41,7 @@ gimp_matrix4_to_deg
<SECTION>
<FILE>gimpvector</FILE>
<TITLE>GimpVector</TITLE>
GimpVector2
GimpVector3
GimpVector4

2
devel-docs/libgimpmath/tmpl/gimpmath.sgml
View File

@ -1,5 +1,5 @@
<!-- ##### SECTION Title ##### -->
gimpmath
GimpMath
<!-- ##### SECTION Short_Description ##### -->
Mathematical definitions and macros.

2
devel-docs/libgimpmath/tmpl/gimpmatrix.sgml
View File

@ -1,5 +1,5 @@
<!-- ##### SECTION Title ##### -->
gimpmatrix
GimpMatrix
<!-- ##### SECTION Short_Description ##### -->
Utilities to set up and manipulate 3x3 transformation matrices.

2
devel-docs/libgimpmath/tmpl/gimpvector.sgml
View File

@ -1,5 +1,5 @@
<!-- ##### SECTION Title ##### -->
gimpvector
GimpVector
<!-- ##### SECTION Short_Description ##### -->
Utilities to set up and manipulate vectors.

4
devel-docs/libgimpmodule/tmpl/gimpmodule.sgml
View File

@ -40,9 +40,9 @@ Common definitions for creating a pluggable GIMP module.
</para>
@GIMP_MODULE_STATE_ERROR:
@GIMP_MODULE_STATE_LOADED_OK:
@GIMP_MODULE_STATE_LOADED:
@GIMP_MODULE_STATE_LOAD_FAILED:
@GIMP_MODULE_STATE_UNLOADED_OK:
@GIMP_MODULE_STATE_NOT_LOADED:
<!-- ##### USER_FUNCTION GimpModuleQueryFunc ##### -->
<para>

2
devel-docs/libgimpwidgets/libgimpwidgets-docs.sgml
View File

@ -35,6 +35,7 @@
&GimpColorScale;
&GimpFileSelection;
&GimpPathEditor;
&GimpPickButton;
&GimpPixmap;
&GimpSizeEntry;
&GimpUnitMenu;
@ -51,7 +52,6 @@
&GimpColorNotebook;
&GimpColorScales;
&GimpColorSelect;
&GimpPickButton;
</chapter>
</part>

2
devel-docs/libgimpwidgets/tmpl/gimpcolorscales.sgml
View File

@ -1,5 +1,5 @@
<!-- ##### SECTION Title ##### -->
gimpcolorscales
GimpColorScales
<!-- ##### SECTION Short_Description ##### -->

2
devel-docs/libgimpwidgets/tmpl/gimpcolorselect.sgml
View File

@ -1,5 +1,5 @@
<!-- ##### SECTION Title ##### -->
gimpcolorselect
GimpColorSelect
<!-- ##### SECTION Short_Description ##### -->

15
libgimpmodule/gimpmodule.c
View File

@ -212,7 +212,7 @@ gimp_module_load (GTypeModule *module)
return FALSE;
}
gimp_module->state = GIMP_MODULE_STATE_LOADED_OK;
gimp_module->state = GIMP_MODULE_STATE_LOADED;
return TRUE;
}
@ -259,7 +259,7 @@ gimp_module_new (const gchar *filename,
if (verbose)
g_print (_("Skipping module: '%s'\n"), filename);
module->state = GIMP_MODULE_STATE_UNLOADED_OK;
module->state = GIMP_MODULE_STATE_NOT_LOADED;
}
return module;
@ -285,7 +285,8 @@ gimp_module_query_module (GimpModule *module)
/* find the gimp_module_query symbol */
if (! g_module_symbol (module->module, "gimp_module_query", &symbol))
{
gimp_module_set_last_error (module, "Missing gimp_module_query() symbol");
gimp_module_set_last_error (module,
"Missing gimp_module_query() symbol");
if (module->verbose)
g_print (_("Module '%s' load error:\n%s"),
@ -360,13 +361,13 @@ gimp_module_state_name (GimpModuleState state)
static const gchar * const statenames[] =
{
N_("Module error"),
N_("Loaded OK"),
N_("Loaded"),
N_("Load failed"),
N_("Unloaded OK")
N_("Not loaded")
};
g_return_val_if_fail (state >= GIMP_MODULE_STATE_ERROR &&
state <= GIMP_MODULE_STATE_UNLOADED_OK, NULL);
state <= GIMP_MODULE_STATE_NOT_LOADED, NULL);
return gettext (statenames[state]);
}
@ -398,7 +399,7 @@ gimp_module_close (GimpModule *module)
module->query_module = NULL;
module->register_module = NULL;
module->state = GIMP_MODULE_STATE_UNLOADED_OK;
module->state = GIMP_MODULE_STATE_NOT_LOADED;
return TRUE;
}

20
libgimpmodule/gimpmodule.h
View File

@ -36,12 +36,12 @@ typedef enum
GIMP_MODULE_STATE_ERROR, /* missing gimp_module_register function
* or other error
*/
GIMP_MODULE_STATE_LOADED_OK, /* an instance of a type implemented by
GIMP_MODULE_STATE_LOADED, /* an instance of a type implemented by
* this module is allocated
*/
GIMP_MODULE_STATE_LOAD_FAILED, /* gimp_module_register returned FALSE
*/
GIMP_MODULE_STATE_UNLOADED_OK /* there are no instances allocated of
GIMP_MODULE_STATE_NOT_LOADED /* there are no instances allocated of
* types implemented by this module
*/
} GimpModuleState;
@ -75,15 +75,15 @@ struct _GimpModule
{
GTypeModule parent_instance;
gchar *filename; /* path to the module */
gboolean verbose; /* verbose error reporting */
GimpModuleState state; /* what's happened to the module */
gboolean on_disk; /* TRUE if file still exists */
gboolean load_inhibit; /* user requests not to load at boot time */
gchar *filename; /* path to the module */
gboolean verbose; /* verbose error reporting */
GimpModuleState state; /* what's happened to the module */
gboolean on_disk; /* TRUE if file still exists */
gboolean load_inhibit; /* user requests not to load at boot time */
/* stuff from now on may be NULL depending on the state the module is in */
GModule *module; /* handle on the module */
GimpModuleInfo *info; /* returned values from module_query */
/* stuff from now on may be NULL depending on the state the module is in */
GModule *module; /* handle on the module */
GimpModuleInfo *info; /* returned values from module_query */
gchar *last_module_error;
GimpModuleQueryFunc query_module;

2
libgimpmodule/gimpmoduledb.c
View File

@ -48,7 +48,7 @@ enum
};
#define DUMP_DB 1
/* #define DUMP_DB 1 */
static void gimp_module_db_class_init (GimpModuleDBClass *klass);

9
plug-ins/tools/tool-safe-mode.c
View File

@ -56,7 +56,9 @@ safe_mode_register_tool ()
void
tool_safe_mode_init (const gchar *tool_plug_in_path)
{
#ifdef VERBOSE
g_message ("tool-safe-mode init called");
#endif
if (g_module_supported () && tool_plug_in_path)
{
@ -78,14 +80,17 @@ tool_safe_mode_init (const gchar *tool_plug_in_path)
}
#endif
#ifdef VERBOSE
g_message ("tool_plug_in_path: %s", tool_plug_in_path);
#endif
path = gimp_path_parse (tool_plug_in_path, 16, TRUE, NULL);
for (list = path; list; list = g_list_next (list))
{
#ifdef VERBOSE
g_message ("reading datafiles directory '%s'", (gchar *) list->data);
#endif
dir = g_dir_open ((gchar *) list->data, 0, NULL);
if (!dir)
@ -121,5 +126,7 @@ tool_safe_mode_init (const gchar *tool_plug_in_path)
gimp_path_free (path);
}
#ifdef VERBOSE
g_message ("tool-safe-mode init done");
#endif
}

24
po-libgimp/de.po
View File

@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: GIMP 1.3.10\n"
"POT-Creation-Date: 2002-11-05 19:08+0100\n"
"POT-Creation-Date: 2002-11-06 14:33+0100\n"
"PO-Revision-Date: 2002-11-05 19:11+0100\n"
"Last-Translator: Christian Neumair <christian-neumair@web.de>\n"
"Language-Team: German <gnome-de@gnome.org>\n"
@ -168,8 +168,8 @@ msgid "Loading module: '%s'\n"
msgstr "Lade Modul: '%s'\n"
#: libgimpmodule/gimpmodule.c:189 libgimpmodule/gimpmodule.c:206
#: libgimpmodule/gimpmodule.c:291 libgimpmodule/gimpmodule.c:315
#: libgimpmodule/gimpmodule.c:385
#: libgimpmodule/gimpmodule.c:292 libgimpmodule/gimpmodule.c:316
#: libgimpmodule/gimpmodule.c:386
#, c-format
msgid ""
"Module '%s' load error:\n"
@ -183,21 +183,21 @@ msgstr ""
msgid "Skipping module: '%s'\n"
msgstr "Ignoriere Modul: '%s'\n"
#: libgimpmodule/gimpmodule.c:362
#: libgimpmodule/gimpmodule.c:363
msgid "Module error"
msgstr "Modul Fehler"
#: libgimpmodule/gimpmodule.c:363
msgid "Loaded OK"
#: libgimpmodule/gimpmodule.c:364
msgid "Loaded"
msgstr "Geladen"
#: libgimpmodule/gimpmodule.c:364
#: libgimpmodule/gimpmodule.c:365
msgid "Load failed"
msgstr "Laden fehlgeschlagen"
#: libgimpmodule/gimpmodule.c:365
msgid "Unloaded OK"
msgstr "Entladen"
#: libgimpmodule/gimpmodule.c:366
msgid "Not loaded"
msgstr "Nicht geladen"
#: libgimpwidgets/gimpcolorbutton.c:85
msgid "/Foreground Color"
@ -291,7 +291,9 @@ msgstr "Datei auswählen"
msgid ""
"Click the eyedropper, then click a color anywhere on your screen to select "
"that color."
msgstr "Klicken Sie die Pipette und dann einen beliebigen Punkt auf dem Schirm um dessen Farbe auszuwählen."
msgstr ""
"Klicken Sie die Pipette und dann einen beliebigen Punkt auf dem Schirm um "
"dessen Farbe auszuwählen."
#: libgimpwidgets/gimpstock.c:88
msgid "Anchor"