Commit 84ee79c7 authored by Jehan's avatar Jehan

app: clean out many tabs under app/core/.

parent 31ae4238
......@@ -210,15 +210,15 @@ gimp_user_install_run (GimpUserInstall *install)
if (install->migrate)
user_install_log (install,
_("It seems you have used GIMP %s before. "
"GIMP will now migrate your user settings to '%s'."),
install->migrate, dirname);
_("It seems you have used GIMP %s before. "
"GIMP will now migrate your user settings to '%s'."),
install->migrate, dirname);
else
user_install_log (install,
_("It appears that you are using GIMP for the "
"first time. GIMP will now create a folder "
"named '%s' and copy some files to it."),
dirname);
_("It appears that you are using GIMP for the "
"first time. GIMP will now create a folder "
"named '%s' and copy some files to it."),
dirname);
g_free (dirname);
......@@ -282,7 +282,7 @@ user_install_detect_old (GimpUserInstall *install,
if (migrate)
{
#ifdef GIMP_UNSTABLE
g_printerr ("gimp-user-install: migrating from %s\n", dir);
g_printerr ("gimp-user-install: migrating from %s\n", dir);
#endif
install->old_major = 2;
install->old_minor = i;
......
......@@ -550,7 +550,7 @@ gimp_get_fill_params (GimpContext *context,
if (! *pattern)
{
g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
_("No patterns available for this operation."));
_("No patterns available for this operation."));
/* fall back to BG fill */
gimp_context_get_background (context, color);
......
......@@ -1242,7 +1242,7 @@ gimp_filter_history_changed (Gimp *gimp)
void
gimp_image_opened (Gimp *gimp,
GFile *file)
GFile *file)
{
g_return_if_fail (GIMP_IS_GIMP (gimp));
g_return_if_fail (G_IS_FILE (file));
......
......@@ -838,7 +838,7 @@ gimp_channel_fill (GimpItem *item,
0, 0, 0, 0))
{
g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
_("Cannot fill empty channel."));
_("Cannot fill empty channel."));
return FALSE;
}
......@@ -874,7 +874,7 @@ gimp_channel_stroke (GimpItem *item,
0, 0, 0, 0))
{
g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
_("Cannot stroke empty channel."));
_("Cannot stroke empty channel."));
return FALSE;
}
......
......@@ -286,16 +286,16 @@ gimp_dash_pattern_from_double_array (gint n_dashes,
for (i = 0; i < n_dashes; i++)
{
if (dashes[i] >= 0.0)
{
if (dashes[i] >= 0.0)
{
g_array_append_val (pattern, dashes[i]);
}
else
{
g_array_free (pattern, TRUE);
return NULL;
}
}
}
else
{
g_array_free (pattern, TRUE);
return NULL;
}
}
return pattern;
}
......
......@@ -1180,7 +1180,7 @@ gimp_data_is_internal (GimpData *data)
**/
gint
gimp_data_compare (GimpData *data1,
GimpData *data2)
GimpData *data2)
{
GimpDataPrivate *private1 = GIMP_DATA_GET_PRIVATE (data1);
GimpDataPrivate *private2 = GIMP_DATA_GET_PRIVATE (data2);
......
......@@ -211,10 +211,10 @@ gimp_data_factory_new (Gimp *gimp,
factory->priv->gimp = gimp;
factory->priv->container = gimp_list_new (data_type, TRUE);
gimp_list_set_sort_func (GIMP_LIST (factory->priv->container),
(GCompareFunc) gimp_data_compare);
(GCompareFunc) gimp_data_compare);
factory->priv->container_obsolete = gimp_list_new (data_type, TRUE);
gimp_list_set_sort_func (GIMP_LIST (factory->priv->container_obsolete),
(GCompareFunc) gimp_data_compare);
(GCompareFunc) gimp_data_compare);
factory->priv->path_property_name = g_strdup (path_property_name);
factory->priv->writable_property_name = g_strdup (writable_property_name);
......
......@@ -855,7 +855,7 @@ gimp_histogram_get_threshold (GimpHistogram *histogram,
for (i = 1; i <= maxval; i++)
{
if (hist[i] > hist_max)
hist_max = hist[i];
hist_max = hist[i];
chist[i] = chist[i-1] + hist[i];
cmom[i] = cmom[i-1] + i * hist[i];
......
......@@ -786,7 +786,7 @@ gimp_image_convert_indexed (GimpImage *image,
if (gimp_palette_get_n_colors (custom_palette) == 0)
{
g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
_("Cannot convert image: palette is empty."));
_("Cannot convert image: palette is empty."));
return FALSE;
}
}
......@@ -1261,24 +1261,24 @@ generate_histogram_rgb (CFHistogram histogram,
while (length--)
{
gboolean transparent = FALSE;
gboolean transparent = FALSE;
if (has_alpha)
{
if (dither_alpha)
{
if (data[ALPHA] <
if (has_alpha)
{
if (dither_alpha)
{
if (data[ALPHA] <
DM[col & DM_WIDTHMASK][row & DM_HEIGHTMASK])
transparent = TRUE;
}
else
{
if (data[ALPHA] <= 127)
transparent = TRUE;
}
}
if (! transparent)
transparent = TRUE;
}
else
{
if (data[ALPHA] <= 127)
transparent = TRUE;
}
}
if (! transparent)
{
colfreq = HIST_RGB (histogram,
data[RED],
......
......@@ -405,8 +405,8 @@ gimp_image_merge_visible_vectors (GimpImage *image,
else
{
g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
_("Not enough visible paths for a merge. "
"There must be at least two."));
_("Not enough visible paths for a merge. "
"There must be at least two."));
return NULL;
}
}
......
......@@ -172,9 +172,9 @@ floating_sel_to_layer (GimpLayer *layer,
if (GIMP_IS_CHANNEL (gimp_layer_get_floating_sel_drawable (layer)))
{
g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
_("Cannot create a new layer from the floating "
"selection because it belongs to a layer mask "
"or channel."));
_("Cannot create a new layer from the floating "
"selection because it belongs to a layer mask "
"or channel."));
return FALSE;
}
......
......@@ -155,7 +155,7 @@ gimp_layer_mask_rename (GimpItem *item,
/* reject renaming, layer masks are always named "<layer name> mask" */
g_set_error (error, GIMP_ERROR, GIMP_FAILED,
_("Cannot rename layer masks."));
_("Cannot rename layer masks."));
return FALSE;
}
......
......@@ -450,7 +450,7 @@ gimp_palette_load_aco (GimpContext *context,
if (! g_input_stream_read_all (input, color_info, sizeof (color_info),
&bytes_read, NULL, &my_error) ||
bytes_read != sizeof (color_info))
{
{
if (palette->colors)
{
g_message (_("Reading palette file '%s': "
......@@ -467,7 +467,7 @@ gimp_palette_load_aco (GimpContext *context,
g_object_unref (palette);
return NULL;
}
}
color_space = color_info[1] + (color_info[0] << 8);
......@@ -551,10 +551,10 @@ gimp_palette_load_aco (GimpContext *context,
sizeof (format2_preamble),
&bytes_read, NULL, error) ||
bytes_read != sizeof (format2_preamble))
{
g_object_unref (palette);
return NULL;
}
{
g_object_unref (palette);
return NULL;
}
number_of_chars = format2_preamble[3] + (format2_preamble[2] << 8);
......
......@@ -301,7 +301,7 @@ gimp_selection_fill (GimpItem *item,
0, 0, 0, 0))
{
g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
_("There is no selection to fill."));
_("There is no selection to fill."));
return FALSE;
}
......@@ -337,7 +337,7 @@ gimp_selection_stroke (GimpItem *item,
0, 0, 0, 0))
{
g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
_("There is no selection to stroke."));
_("There is no selection to stroke."));
return FALSE;
}
......@@ -563,7 +563,7 @@ gimp_selection_grow (GimpChannel *channel,
gboolean push_undo)
{
GIMP_CHANNEL_CLASS (parent_class)->grow (channel,
radius_x, radius_y,
radius_x, radius_y,
push_undo);
}
......@@ -575,8 +575,8 @@ gimp_selection_shrink (GimpChannel *channel,
gboolean push_undo)
{
GIMP_CHANNEL_CLASS (parent_class)->shrink (channel,
radius_x, radius_y, edge_lock,
push_undo);
radius_x, radius_y, edge_lock,
push_undo);
}
static void
......@@ -748,8 +748,8 @@ gimp_selection_extract (GimpSelection *selection,
if (non_empty && ((x1 == x2) || (y1 == y2)))
{
g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
_("Unable to cut or copy because the "
"selected region is empty."));
_("Unable to cut or copy because the "
"selected region is empty."));
return NULL;
}
......@@ -866,8 +866,8 @@ gimp_selection_float (GimpSelection *selection,
(x1 == x2 || y1 == y2))
{
g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED,
_("Cannot float selection because the selected "
"region is empty."));
_("Cannot float selection because the selected "
"region is empty."));
return 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