mirror of https://github.com/GNOME/gimp.git
libgimp*: tab cleaning.
This commit is contained in:
parent
6cd91f1fde
commit
7999cfbeef
|
@ -31,11 +31,11 @@
|
||||||
# define bind_textdomain_codeset(Domain, Codeset) (Domain)
|
# define bind_textdomain_codeset(Domain, Codeset) (Domain)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define INIT_I18N() G_STMT_START{ \
|
#define INIT_I18N() G_STMT_START{ \
|
||||||
bindtextdomain (GETTEXT_PACKAGE"-std-plug-ins", \
|
bindtextdomain (GETTEXT_PACKAGE"-std-plug-ins", \
|
||||||
gimp_locale_directory ()); \
|
gimp_locale_directory ()); \
|
||||||
bind_textdomain_codeset (GETTEXT_PACKAGE"-std-plug-ins", "UTF-8"); \
|
bind_textdomain_codeset (GETTEXT_PACKAGE"-std-plug-ins", "UTF-8"); \
|
||||||
textdomain (GETTEXT_PACKAGE"-std-plug-ins"); \
|
textdomain (GETTEXT_PACKAGE"-std-plug-ins"); \
|
||||||
}G_STMT_END
|
}G_STMT_END
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -48,33 +48,33 @@ gimp_base_init (GimpUnitVtable *vtable)
|
||||||
quark = g_quark_from_static_string ("gimp-compat-enum");
|
quark = g_quark_from_static_string ("gimp-compat-enum");
|
||||||
|
|
||||||
g_type_set_qdata (GIMP_TYPE_ADD_MASK_TYPE, quark,
|
g_type_set_qdata (GIMP_TYPE_ADD_MASK_TYPE, quark,
|
||||||
(gpointer) GIMP_TYPE_ADD_MASK_TYPE_COMPAT);
|
(gpointer) GIMP_TYPE_ADD_MASK_TYPE_COMPAT);
|
||||||
g_type_set_qdata (GIMP_TYPE_BLEND_MODE, quark,
|
g_type_set_qdata (GIMP_TYPE_BLEND_MODE, quark,
|
||||||
(gpointer) GIMP_TYPE_BLEND_MODE_COMPAT);
|
(gpointer) GIMP_TYPE_BLEND_MODE_COMPAT);
|
||||||
g_type_set_qdata (GIMP_TYPE_BUCKET_FILL_MODE, quark,
|
g_type_set_qdata (GIMP_TYPE_BUCKET_FILL_MODE, quark,
|
||||||
(gpointer) GIMP_TYPE_BUCKET_FILL_MODE_COMPAT);
|
(gpointer) GIMP_TYPE_BUCKET_FILL_MODE_COMPAT);
|
||||||
g_type_set_qdata (GIMP_TYPE_CHANNEL_TYPE, quark,
|
g_type_set_qdata (GIMP_TYPE_CHANNEL_TYPE, quark,
|
||||||
(gpointer) GIMP_TYPE_CHANNEL_TYPE_COMPAT);
|
(gpointer) GIMP_TYPE_CHANNEL_TYPE_COMPAT);
|
||||||
g_type_set_qdata (GIMP_TYPE_CLONE_TYPE, quark,
|
g_type_set_qdata (GIMP_TYPE_CLONE_TYPE, quark,
|
||||||
(gpointer) GIMP_TYPE_CLONE_TYPE_COMPAT);
|
(gpointer) GIMP_TYPE_CLONE_TYPE_COMPAT);
|
||||||
g_type_set_qdata (GIMP_TYPE_CONVERT_PALETTE_TYPE, quark,
|
g_type_set_qdata (GIMP_TYPE_CONVERT_PALETTE_TYPE, quark,
|
||||||
(gpointer) GIMP_TYPE_CONVERT_PALETTE_TYPE_COMPAT);
|
(gpointer) GIMP_TYPE_CONVERT_PALETTE_TYPE_COMPAT);
|
||||||
g_type_set_qdata (GIMP_TYPE_CONVOLVE_TYPE, quark,
|
g_type_set_qdata (GIMP_TYPE_CONVOLVE_TYPE, quark,
|
||||||
(gpointer) GIMP_TYPE_CONVOLVE_TYPE_COMPAT);
|
(gpointer) GIMP_TYPE_CONVOLVE_TYPE_COMPAT);
|
||||||
g_type_set_qdata (GIMP_TYPE_DESATURATE_MODE, quark,
|
g_type_set_qdata (GIMP_TYPE_DESATURATE_MODE, quark,
|
||||||
(gpointer) GIMP_TYPE_DESATURATE_MODE_COMPAT);
|
(gpointer) GIMP_TYPE_DESATURATE_MODE_COMPAT);
|
||||||
g_type_set_qdata (GIMP_TYPE_DODGE_BURN_TYPE, quark,
|
g_type_set_qdata (GIMP_TYPE_DODGE_BURN_TYPE, quark,
|
||||||
(gpointer) GIMP_TYPE_DODGE_BURN_TYPE_COMPAT);
|
(gpointer) GIMP_TYPE_DODGE_BURN_TYPE_COMPAT);
|
||||||
g_type_set_qdata (GIMP_TYPE_FILL_TYPE, quark,
|
g_type_set_qdata (GIMP_TYPE_FILL_TYPE, quark,
|
||||||
(gpointer) GIMP_TYPE_FILL_TYPE_COMPAT);
|
(gpointer) GIMP_TYPE_FILL_TYPE_COMPAT);
|
||||||
g_type_set_qdata (GIMP_TYPE_HUE_RANGE, quark,
|
g_type_set_qdata (GIMP_TYPE_HUE_RANGE, quark,
|
||||||
(gpointer) GIMP_TYPE_HUE_RANGE_COMPAT);
|
(gpointer) GIMP_TYPE_HUE_RANGE_COMPAT);
|
||||||
g_type_set_qdata (GIMP_TYPE_ICON_TYPE, quark,
|
g_type_set_qdata (GIMP_TYPE_ICON_TYPE, quark,
|
||||||
(gpointer) GIMP_TYPE_ICON_TYPE_COMPAT);
|
(gpointer) GIMP_TYPE_ICON_TYPE_COMPAT);
|
||||||
g_type_set_qdata (GIMP_TYPE_INTERPOLATION_TYPE, quark,
|
g_type_set_qdata (GIMP_TYPE_INTERPOLATION_TYPE, quark,
|
||||||
(gpointer) GIMP_TYPE_INTERPOLATION_TYPE_COMPAT);
|
(gpointer) GIMP_TYPE_INTERPOLATION_TYPE_COMPAT);
|
||||||
g_type_set_qdata (GIMP_TYPE_TRANSFER_MODE, quark,
|
g_type_set_qdata (GIMP_TYPE_TRANSFER_MODE, quark,
|
||||||
(gpointer) GIMP_TYPE_TRANSFER_MODE_COMPAT);
|
(gpointer) GIMP_TYPE_TRANSFER_MODE_COMPAT);
|
||||||
|
|
||||||
gimp_base_initialized = TRUE;
|
gimp_base_initialized = TRUE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1489,17 +1489,17 @@ _gp_params_read (GIOChannel *channel,
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case GIMP_PDB_COLORARRAY:
|
case GIMP_PDB_COLORARRAY:
|
||||||
(*params)[i].data.d_colorarray = g_new (GimpRGB,
|
(*params)[i].data.d_colorarray = g_new (GimpRGB,
|
||||||
(*params)[i-1].data.d_int32);
|
(*params)[i-1].data.d_int32);
|
||||||
if (! _gimp_wire_read_color (channel,
|
if (! _gimp_wire_read_color (channel,
|
||||||
(*params)[i].data.d_colorarray,
|
(*params)[i].data.d_colorarray,
|
||||||
(*params)[i-1].data.d_int32,
|
(*params)[i-1].data.d_int32,
|
||||||
user_data))
|
user_data))
|
||||||
{
|
{
|
||||||
g_free ((*params)[i].data.d_colorarray);
|
g_free ((*params)[i].data.d_colorarray);
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case GIMP_PDB_VECTORS:
|
case GIMP_PDB_VECTORS:
|
||||||
|
|
|
@ -90,8 +90,8 @@ gimp_value_array_index (const GimpValueArray *value_array,
|
||||||
|
|
||||||
static inline void
|
static inline void
|
||||||
value_array_grow (GimpValueArray *value_array,
|
value_array_grow (GimpValueArray *value_array,
|
||||||
gint n_values,
|
gint n_values,
|
||||||
gboolean zero_init)
|
gboolean zero_init)
|
||||||
{
|
{
|
||||||
g_return_if_fail ((guint) n_values >= (guint) value_array->n_values);
|
g_return_if_fail ((guint) n_values >= (guint) value_array->n_values);
|
||||||
|
|
||||||
|
@ -104,10 +104,10 @@ value_array_grow (GimpValueArray *value_array,
|
||||||
value_array->values = g_renew (GValue, value_array->values, value_array->n_prealloced);
|
value_array->values = g_renew (GValue, value_array->values, value_array->n_prealloced);
|
||||||
|
|
||||||
if (!zero_init)
|
if (!zero_init)
|
||||||
i = value_array->n_values;
|
i = value_array->n_values;
|
||||||
|
|
||||||
memset (value_array->values + i, 0,
|
memset (value_array->values + i, 0,
|
||||||
(value_array->n_prealloced - i) * sizeof (value_array->values[0]));
|
(value_array->n_prealloced - i) * sizeof (value_array->values[0]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -563,7 +563,7 @@ gimp_config_path_expand_only (const gchar *path,
|
||||||
if (!s)
|
if (!s)
|
||||||
{
|
{
|
||||||
g_set_error (error, GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_PARSE,
|
g_set_error (error, GIMP_CONFIG_ERROR, GIMP_CONFIG_ERROR_PARSE,
|
||||||
_("Cannot expand ${%s}"), token);
|
_("Cannot expand ${%s}"), token);
|
||||||
g_free (token);
|
g_free (token);
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue