Commit 0c05ec29 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

removed an unused variable and trailing whitespace.

2003-11-16  Sven Neumann  <sven@gimp.org>

	* app/gui/themes.c (themes_apply_theme): removed an unused
	variable and trailing whitespace.

	* app/widgets/gimppropwidgets.c (gimp_prop_adjustment_notify):
	fixed a cut'n'paste error and added a warning which would have
	caught it.

	* app/config/gimpbaseconfig.c
	* app/config/gimpcoreconfig.c
	* app/config/gimpguiconfig.c
	* app/config/gimppluginconfig.c: cosmetics.
parent b23682bf
2003-11-16 Hans Breuer <hans@breuer.org>
2003-11-16 Sven Neumann <sven@gimp.org>
* app/gui/themes.c (themes_apply_theme): removed an unused
variable and trailing whitespace.
 
* app/text/*.c : still unacceptable patched to compile
without FT2, see bug #113681
* app/widgets/gimppropwidgets.c (gimp_prop_adjustment_notify):
fixed a cut'n'paste error and added a warning which would have
caught it.
* app/config/gimpbaseconfig.c
* app/config/gimpcoreconfig.c
* app/config/gimpguiconfig.c
* app/config/gimppluginconfig.c: cosmetics.
2003-11-16 Hans Breuer <hans@breuer.org>
 
* **makefile.msc : updated
* **makefile.msc: updated
 
* app/config/gimpconfig-dump.c : include gimpwin32-io.h
* app/config/gimpconfig-dump.c: include gimpwin32-io.h
 
* app/plug-in/plug-ins.c : don't depend on g_print handling
%s with NULL pointers, it doesn't anymore with glib cvs at
least not on win32
* app/plug-in/plug-ins.c: don't depend on g_print handling %s with
NULL pointers, it doesn't anymore with glib cvs at least not on
win32
 
* app/widgets/gimppropwidgets.c
libgimpbase/gimputils.c
libgimpwidgets/gimpmemsizeentry.c :
sorry about the mess, need to work-around a stupi not able
to cast from guint64 to double
* libgimpbase/gimputils.c
* libgimpwidgets/gimpmemsizeentry.c:
sorry about the mess, need to work-around a stupid compiler not
able to cast from guint64 to double
 
* app/widgets/gimppropwidgets.c (gimp_prop_memsize_entry_new) :
avoid 'overflow in floating-point constant arithmetic' by disabling
an imho alays questionable g_return_val_if_fail() for _MSC_VER only
 
* libgimpmodule/gimpmodule.def : sorted
* libgimpmodule/gimpmodule.def: sorted
 
* libgimpwidgets/gimpfileselection.c : removed unused S_ISDIR
* libgimpwidgets/gimpfileselection.c: removed unused S_ISDIR
definition
 
* app/gui/themes.c : filenames in rc files need to be escaped
* app/gui/themes.c: filenames in rc files need to be escaped
2003-11-16 Michael Natterer <mitch@gimp.org>
 
......@@ -129,9 +129,7 @@ gimp_base_config_class_init (GimpBaseConfigClass *klass)
static void
gimp_base_config_finalize (GObject *object)
{
GimpBaseConfig *base_config;
base_config = GIMP_BASE_CONFIG (object);
GimpBaseConfig *base_config = GIMP_BASE_CONFIG (object);
g_free (base_config->temp_path);
g_free (base_config->swap_path);
......@@ -145,9 +143,7 @@ gimp_base_config_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
GimpBaseConfig *base_config;
base_config = GIMP_BASE_CONFIG (object);
GimpBaseConfig *base_config = GIMP_BASE_CONFIG (object);
switch (property_id)
{
......@@ -180,9 +176,7 @@ gimp_base_config_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
GimpBaseConfig *base_config;
base_config = GIMP_BASE_CONFIG (object);
GimpBaseConfig *base_config = GIMP_BASE_CONFIG (object);
switch (property_id)
{
......
......@@ -272,9 +272,7 @@ gimp_core_config_init (GimpCoreConfig *config)
static void
gimp_core_config_finalize (GObject *object)
{
GimpCoreConfig *core_config;
core_config = GIMP_CORE_CONFIG (object);
GimpCoreConfig *core_config = GIMP_CORE_CONFIG (object);
g_free (core_config->plug_in_path);
g_free (core_config->module_path);
......@@ -306,9 +304,7 @@ gimp_core_config_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
GimpCoreConfig *core_config;
core_config = GIMP_CORE_CONFIG (object);
GimpCoreConfig *core_config = GIMP_CORE_CONFIG (object);
switch (property_id)
{
......@@ -415,9 +411,7 @@ gimp_core_config_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
GimpCoreConfig *core_config;
core_config = GIMP_CORE_CONFIG (object);
GimpCoreConfig *core_config = GIMP_CORE_CONFIG (object);
switch (property_id)
{
......
......@@ -226,9 +226,7 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass)
static void
gimp_gui_config_finalize (GObject *object)
{
GimpGuiConfig *gui_config;
gui_config = GIMP_GUI_CONFIG (object);
GimpGuiConfig *gui_config = GIMP_GUI_CONFIG (object);
g_free (gui_config->theme_path);
g_free (gui_config->theme);
......@@ -243,9 +241,7 @@ gimp_gui_config_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
GimpGuiConfig *gui_config;
gui_config = GIMP_GUI_CONFIG (object);
GimpGuiConfig *gui_config = GIMP_GUI_CONFIG (object);
switch (property_id)
{
......@@ -328,9 +324,7 @@ gimp_gui_config_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
GimpGuiConfig *gui_config;
gui_config = GIMP_GUI_CONFIG (object);
GimpGuiConfig *gui_config = GIMP_GUI_CONFIG (object);
switch (property_id)
{
......
......@@ -59,7 +59,7 @@ enum
static GObjectClass *parent_class = NULL;
GType
GType
gimp_plugin_config_get_type (void)
{
static GType config_type = 0;
......@@ -79,8 +79,8 @@ gimp_plugin_config_get_type (void)
NULL /* instance_init */
};
config_type = g_type_register_static (GIMP_TYPE_GUI_CONFIG,
"GimpPluginConfig",
config_type = g_type_register_static (GIMP_TYPE_GUI_CONFIG,
"GimpPluginConfig",
&config_info, 0);
}
......@@ -138,10 +138,8 @@ gimp_plugin_config_class_init (GimpPluginConfigClass *klass)
static void
gimp_plugin_config_finalize (GObject *object)
{
GimpPluginConfig *plugin_config;
GimpPluginConfig *plugin_config = GIMP_PLUGIN_CONFIG (object);
plugin_config = GIMP_PLUGIN_CONFIG (object);
g_free (plugin_config->fractalexplorer_path);
g_free (plugin_config->gfig_path);
g_free (plugin_config->gflare_path);
......@@ -157,9 +155,7 @@ gimp_plugin_config_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
GimpPluginConfig *plugin_config;
plugin_config = GIMP_PLUGIN_CONFIG (object);
GimpPluginConfig *plugin_config = GIMP_PLUGIN_CONFIG (object);
switch (property_id)
{
......@@ -200,9 +196,7 @@ gimp_plugin_config_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
GimpPluginConfig *plugin_config;
plugin_config = GIMP_PLUGIN_CONFIG (object);
GimpPluginConfig *plugin_config = GIMP_PLUGIN_CONFIG (object);
switch (property_id)
{
......
......@@ -208,7 +208,6 @@ themes_apply_theme (Gimp *gimp,
gchar *gtkrc_user;
gchar *themerc;
FILE *file;
gchar *name;
g_return_if_fail (GIMP_IS_GIMP (gimp));
......@@ -255,8 +254,9 @@ themes_apply_theme (Gimp *gimp,
"include \"%s\"\n"
"\n"
"# end of themerc\n",
gtkrc_user,
esc_gtkrc_theme, esc_gtkrc_user);
gtkrc_user,
esc_gtkrc_theme,
esc_gtkrc_user);
g_free (esc_gtkrc_theme);
g_free (esc_gtkrc_user);
......
......@@ -926,7 +926,7 @@ gimp_prop_adjustment_notify (GObject *config,
value = int64_value;
}
else if (G_IS_PARAM_SPEC_ULONG (param_spec))
else if (G_IS_PARAM_SPEC_UINT64 (param_spec))
{
guint64 uint64_value;
......@@ -948,6 +948,8 @@ gimp_prop_adjustment_notify (GObject *config,
}
else
{
g_warning ("%s: unhandled param spec of type %s",
G_STRLOC, G_PARAM_SPEC_TYPE_NAME (param_spec));
return;
}
......@@ -997,9 +999,9 @@ gimp_prop_memsize_entry_new (GObject *config,
uint64_spec = G_PARAM_SPEC_UINT64 (param_spec);
#ifndef _MSC_VER
/* avoid getting gimppropwidgets.c(999) : warning C4056:
/* avoid getting gimppropwidgets.c(999) : warning C4056:
* overflow in floating-point constant arithmetic
* and runtime failing (the check seems not the useful to me anyway)
* and runtime failing (the check seems not useful to me anyway)
*/
g_return_val_if_fail (uint64_spec->minimum <= (guint64) G_MAXDOUBLE, NULL);
g_return_val_if_fail (uint64_spec->maximum <= (guint64) G_MAXDOUBLE, NULL);
......
......@@ -926,7 +926,7 @@ gimp_prop_adjustment_notify (GObject *config,
value = int64_value;
}
else if (G_IS_PARAM_SPEC_ULONG (param_spec))
else if (G_IS_PARAM_SPEC_UINT64 (param_spec))
{
guint64 uint64_value;
......@@ -948,6 +948,8 @@ gimp_prop_adjustment_notify (GObject *config,
}
else
{
g_warning ("%s: unhandled param spec of type %s",
G_STRLOC, G_PARAM_SPEC_TYPE_NAME (param_spec));
return;
}
......@@ -997,9 +999,9 @@ gimp_prop_memsize_entry_new (GObject *config,
uint64_spec = G_PARAM_SPEC_UINT64 (param_spec);
#ifndef _MSC_VER
/* avoid getting gimppropwidgets.c(999) : warning C4056:
/* avoid getting gimppropwidgets.c(999) : warning C4056:
* overflow in floating-point constant arithmetic
* and runtime failing (the check seems not the useful to me anyway)
* and runtime failing (the check seems not useful to me anyway)
*/
g_return_val_if_fail (uint64_spec->minimum <= (guint64) G_MAXDOUBLE, NULL);
g_return_val_if_fail (uint64_spec->maximum <= (guint64) G_MAXDOUBLE, NULL);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment