Commit 049872b3 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

app/*.[ch] converted tabs to spaces.

2006-04-12  Sven Neumann  <sven@gimp.org>

	* app/*.[ch]
	* app/*/*.[ch]: converted tabs to spaces.
parent f2df31a5
2006-04-12 Sven Neumann <sven@gimp.org>
* app/*.[ch]
* app/*/*.[ch]: converted tabs to spaces.
2006-04-12 Sven Neumann <sven@gimp.org>
* libgimp*/gimp*.[ch]: converted tabs to spaces.
......@@ -19,8 +24,7 @@
2006-04-11 Carol Spears <carol@gimp.org>
* data/images/gimp-splash.png: new splash, nicknamed "Where's
bolsh?".
* data/images/gimp-splash.png: new splash, nicknamed "Where's bolsh?".
2006-04-11 Manish Singh <yosh@gimp.org>
......@@ -19865,7 +19869,7 @@
as described on dev mailing list.
* plug-ins/common/decompose.c: add "decompose-data" parasite
when decoposing, to support Recompose. Also add missing
when decomposing, to support Recompose. Also add missing
alpha channels to newly produced layers
2004-12-28 Sven Neumann <sven@gimp.org>
......@@ -19892,7 +19896,7 @@
* app/paint/gimpbrushcore.c (gimp_brush_core_subsample_mask):
don't set array outside its bounds. Should fix bug #161323.
Credit to Robert Ögren for figuring out what was wrong.
Credit to Robert Ögren for figuring out what was wrong.
2004-12-27 Sven Neumann <sven@gimp.org>
......
......@@ -143,7 +143,7 @@ buffers_paste (GimpBufferView *view,
gint height = -1;
if (display)
{
{
GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (display->shell);
gimp_display_shell_untransform_viewport (shell,
......@@ -158,10 +158,10 @@ buffers_paste (GimpBufferView *view,
if (image)
{
gimp_edit_paste (image, gimp_image_active_drawable (image),
buffer, paste_into, x, y, width, height);
gimp_edit_paste (image, gimp_image_active_drawable (image),
buffer, paste_into, x, y, width, height);
gimp_image_flush (image);
}
gimp_image_flush (image);
}
}
}
......@@ -90,7 +90,7 @@ channels_edit_attributes_cmd_callback (GtkAction *action,
GIMP_HELP_CHANNEL_EDIT,
_("Edit Channel Color"),
_("_Fill opacity:"),
FALSE);
FALSE);
g_signal_connect (options->dialog, "response",
G_CALLBACK (channels_edit_channel_response),
......@@ -123,7 +123,7 @@ channels_new_cmd_callback (GtkAction *action,
GIMP_HELP_CHANNEL_NEW,
_("New Channel Color"),
_("_Fill opacity:"),
TRUE);
TRUE);
g_signal_connect (options->dialog, "response",
G_CALLBACK (channels_new_channel_response),
......@@ -336,17 +336,17 @@ channels_new_channel_response (GtkWidget *widget,
&channel_color);
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (options->save_sel_checkbutton)))
{
GimpChannel *selection = gimp_image_get_mask (options->image);
{
GimpChannel *selection = gimp_image_get_mask (options->image);
new_channel =
new_channel =
GIMP_CHANNEL (gimp_item_duplicate (GIMP_ITEM (selection),
GIMP_TYPE_CHANNEL,
FALSE));
gimp_object_set_name (GIMP_OBJECT (new_channel), channel_name);
gimp_object_set_name (GIMP_OBJECT (new_channel), channel_name);
gimp_channel_set_color (new_channel, &channel_color, FALSE);
}
}
else
{
new_channel = gimp_channel_new (options->image,
......
......@@ -79,7 +79,7 @@ data_open_as_image_cmd_callback (GtkAction *action,
data = (GimpData *)
gimp_context_get_by_type (context,
view->factory->container->children_type);
view->factory->container->children_type);
if (data && data->filename)
{
......@@ -128,13 +128,13 @@ data_new_cmd_callback (GtkAction *action,
data = gimp_data_factory_data_new (view->factory, _("Untitled"));
if (data)
{
gimp_context_set_by_type (context,
view->factory->container->children_type,
GIMP_OBJECT (data));
{
gimp_context_set_by_type (context,
view->factory->container->children_type,
GIMP_OBJECT (data));
gtk_button_clicked (GTK_BUTTON (view->edit_button));
}
gtk_button_clicked (GTK_BUTTON (view->edit_button));
}
}
}
......@@ -150,23 +150,23 @@ data_duplicate_cmd_callback (GtkAction *action,
data = (GimpData *)
gimp_context_get_by_type (context,
view->factory->container->children_type);
view->factory->container->children_type);
if (data && gimp_container_have (view->factory->container,
GIMP_OBJECT (data)))
GIMP_OBJECT (data)))
{
GimpData *new_data;
new_data = gimp_data_factory_data_duplicate (view->factory, data);
if (new_data)
{
gimp_context_set_by_type (context,
view->factory->container->children_type,
GIMP_OBJECT (new_data));
{
gimp_context_set_by_type (context,
view->factory->container->children_type,
GIMP_OBJECT (new_data));
gtk_button_clicked (GTK_BUTTON (view->edit_button));
}
gtk_button_clicked (GTK_BUTTON (view->edit_button));
}
}
}
......@@ -208,7 +208,7 @@ data_delete_cmd_callback (GtkAction *action,
data = (GimpData *)
gimp_context_get_by_type (context,
view->factory->container->children_type);
view->factory->container->children_type);
if (data && data->deletable && gimp_container_have (view->factory->container,
GIMP_OBJECT (data)))
......@@ -277,7 +277,7 @@ data_edit_cmd_callback (GtkAction *action,
data = (GimpData *)
gimp_context_get_by_type (context,
view->factory->container->children_type);
view->factory->container->children_type);
if (data && gimp_container_have (view->factory->container,
GIMP_OBJECT (data)))
......
......@@ -150,26 +150,26 @@ debug_dump_menus_recurse_menu (GtkWidget *menu,
menu_item = GTK_WIDGET (list->data);
if (GTK_IS_LABEL (GTK_BIN (menu_item)->child))
{
label = gtk_label_get_text (GTK_LABEL (GTK_BIN (menu_item)->child));
full_path = g_strconcat (path, "/", label, NULL);
{
label = gtk_label_get_text (GTK_LABEL (GTK_BIN (menu_item)->child));
full_path = g_strconcat (path, "/", label, NULL);
help_page = g_object_get_data (G_OBJECT (menu_item), "gimp-help-id");
help_page = g_strdup (help_page);
format_str = g_strdup_printf ("%%%ds%%%ds %%-20s %%s\n",
depth * 2, depth * 2 - 40);
g_print (format_str,
"", label, "", help_page ? help_page : "");
g_free (format_str);
g_free (help_page);
format_str = g_strdup_printf ("%%%ds%%%ds %%-20s %%s\n",
depth * 2, depth * 2 - 40);
g_print (format_str,
"", label, "", help_page ? help_page : "");
g_free (format_str);
g_free (help_page);
if (GTK_MENU_ITEM (menu_item)->submenu)
debug_dump_menus_recurse_menu (GTK_MENU_ITEM (menu_item)->submenu,
if (GTK_MENU_ITEM (menu_item)->submenu)
debug_dump_menus_recurse_menu (GTK_MENU_ITEM (menu_item)->submenu,
depth + 1, full_path);
g_free (full_path);
}
g_free (full_path);
}
}
}
......
......@@ -59,7 +59,7 @@ dialogs_show_toolbox_cmd_callback (GtkAction *action,
void
dialogs_create_toplevel_cmd_callback (GtkAction *action,
const gchar *value,
gpointer data)
gpointer data)
{
GtkWidget *widget;
return_if_no_widget (widget, data);
......@@ -73,7 +73,7 @@ dialogs_create_toplevel_cmd_callback (GtkAction *action,
void
dialogs_create_dockable_cmd_callback (GtkAction *action,
const gchar *value,
gpointer data)
gpointer data)
{
GtkWidget *widget;
return_if_no_widget (widget, data);
......
......@@ -189,7 +189,7 @@ dockable_actions_update (GimpActionGroup *group,
page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook));
dockable = (GimpDockable *)
gtk_notebook_get_nth_page (GTK_NOTEBOOK (dockbook), page_num);
gtk_notebook_get_nth_page (GTK_NOTEBOOK (dockbook), page_num);
}
else if (GIMP_IS_DOCKABLE (data))
{
......
......@@ -421,8 +421,8 @@ cut_named_buffer_callback (GtkWidget *widget,
static void
copy_named_buffer_callback (GtkWidget *widget,
const gchar *name,
gpointer data)
const gchar *name,
gpointer data)
{
GimpImage *image = GIMP_IMAGE (data);
GimpDrawable *drawable;
......
......@@ -104,14 +104,14 @@ error_console_save_cmd_callback (GtkAction *action,
gtk_window_set_role (GTK_WINDOW (chooser), "gimp-save-errors");
g_signal_connect (chooser, "response",
G_CALLBACK (error_console_save_response),
console);
G_CALLBACK (error_console_save_response),
console);
g_signal_connect (chooser, "delete-event",
G_CALLBACK (gtk_true),
NULL);
G_CALLBACK (gtk_true),
NULL);
gimp_help_connect (GTK_WIDGET (chooser), gimp_standard_help_func,
GIMP_HELP_ERRORS_DIALOG, NULL);
GIMP_HELP_ERRORS_DIALOG, NULL);
gtk_widget_show (GTK_WIDGET (chooser));
}
......
......@@ -126,9 +126,9 @@ gradient_editor_load_left_cmd_callback (GtkAction *action,
{
case GRADIENT_EDITOR_COLOR_NEIGHBOR_ENDPOINT:
if (editor->control_sel_l->prev != NULL)
seg = editor->control_sel_l->prev;
seg = editor->control_sel_l->prev;
else
seg = gimp_gradient_segment_get_last (editor->control_sel_l);
seg = gimp_gradient_segment_get_last (editor->control_sel_l);
color = seg->right_color;
break;
......@@ -230,9 +230,9 @@ gradient_editor_load_right_cmd_callback (GtkAction *action,
{
case GRADIENT_EDITOR_COLOR_NEIGHBOR_ENDPOINT:
if (editor->control_sel_r->next != NULL)
seg = editor->control_sel_r->next;
seg = editor->control_sel_r->next;
else
seg = gimp_gradient_segment_get_first (editor->control_sel_r);
seg = gimp_gradient_segment_get_first (editor->control_sel_r);
color = seg->left_color;
break;
......@@ -413,8 +413,8 @@ gradient_editor_replicate_cmd_callback (GtkAction *action,
gtk_widget_show (scale);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&editor->replicate_times);
G_CALLBACK (gimp_int_adjustment_update),
&editor->replicate_times);
gtk_widget_set_sensitive (GTK_WIDGET (editor), FALSE);
gimp_ui_manager_update (GIMP_EDITOR (editor)->ui_manager,
......@@ -513,8 +513,8 @@ gradient_editor_split_uniformly_cmd_callback (GtkAction *action,
gtk_widget_show (scale);
g_signal_connect (scale_data, "value-changed",
G_CALLBACK (gimp_int_adjustment_update),
&editor->split_parts);
G_CALLBACK (gimp_int_adjustment_update),
&editor->split_parts);
gtk_widget_set_sensitive (GTK_WIDGET (editor), FALSE);
gimp_ui_manager_update (GIMP_EDITOR (editor)->ui_manager,
......@@ -725,9 +725,9 @@ gradient_editor_save_selection (GimpGradientEditor *editor)
*seg = *oseg; /* Copy everything */
if (prev == NULL)
tmp = seg; /* Remember first segment */
tmp = seg; /* Remember first segment */
else
prev->next = seg;
prev->next = seg;
seg->prev = prev;
seg->next = NULL;
......
......@@ -47,7 +47,7 @@ static void gradients_save_as_pov_ray_response (GtkWidget *dialog,
void
gradients_save_as_pov_ray_cmd_callback (GtkAction *action,
gpointer data)
gpointer data)
{
GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
GimpContext *context;
......@@ -63,7 +63,7 @@ gradients_save_as_pov_ray_cmd_callback (GtkAction *action,
return;
title = g_strdup_printf (_("Save '%s' as POV-Ray"),
GIMP_OBJECT (gradient)->name);
GIMP_OBJECT (gradient)->name);
chooser = GTK_FILE_CHOOSER
(gtk_file_chooser_dialog_new (title, NULL,
......@@ -102,7 +102,7 @@ gradients_save_as_pov_ray_cmd_callback (GtkAction *action,
G_CONNECT_SWAPPED);
gimp_help_connect (GTK_WIDGET (chooser), gimp_standard_help_func,
GIMP_HELP_GRADIENT_SAVE_AS_POV, NULL);
GIMP_HELP_GRADIENT_SAVE_AS_POV, NULL);
gtk_widget_show (GTK_WIDGET (chooser));
}
......
......@@ -21,7 +21,7 @@
void gradients_save_as_pov_ray_cmd_callback (GtkAction *action,
gpointer data);
gpointer data);
#endif /* __GRADIENTS_COMMANDS_H__ */
......@@ -30,14 +30,14 @@
void
help_help_cmd_callback (GtkAction *action,
gpointer data)
gpointer data)
{
gimp_standard_help_func (NULL, NULL);
}
void
help_context_help_cmd_callback (GtkAction *action,
gpointer data)
gpointer data)
{
GtkWidget *widget;
return_if_no_widget (widget, data);
......
......@@ -21,9 +21,9 @@
void help_help_cmd_callback (GtkAction *action,
gpointer data);
gpointer data);
void help_context_help_cmd_callback (GtkAction *action,
gpointer data);
gpointer data);
#endif /* __HELP_COMMANDS_H__ */
......@@ -176,7 +176,7 @@ image_convert_cmd_callback (GtkAction *action,
void
image_resize_cmd_callback (GtkAction *action,
gpointer data)
gpointer data)
{
ImageResizeOptions *options;
GimpImage *image;
......@@ -211,7 +211,7 @@ image_resize_cmd_callback (GtkAction *action,
dialog, G_CONNECT_SWAPPED);
g_object_weak_ref (G_OBJECT (dialog),
(GWeakNotify) g_free, options);
(GWeakNotify) g_free, options);
gtk_widget_show (dialog);
}
......@@ -265,7 +265,7 @@ image_print_size_cmd_callback (GtkAction *action,
void
image_scale_cmd_callback (GtkAction *action,
gpointer data)
gpointer data)
{
ImageScaleDialog *dialog;
GimpDisplay *display;
......@@ -349,7 +349,7 @@ image_crop_cmd_callback (GtkAction *action,
void
image_duplicate_cmd_callback (GtkAction *action,
gpointer data)
gpointer data)
{
GimpDisplay *display;
GimpDisplayShell *shell;
......
......@@ -182,7 +182,7 @@ layers_text_tool_cmd_callback (GtkAction *action,
void
layers_edit_attributes_cmd_callback (GtkAction *action,
gpointer data)
gpointer data)
{
LayerOptionsDialog *dialog;
GimpImage *image;
......@@ -211,7 +211,7 @@ layers_edit_attributes_cmd_callback (GtkAction *action,
void
layers_new_cmd_callback (GtkAction *action,
gpointer data)
gpointer data)
{
LayerOptionsDialog *dialog;
GimpImage *image;
......@@ -335,7 +335,7 @@ layers_select_cmd_callback (GtkAction *action,
void
layers_raise_cmd_callback (GtkAction *action,
gpointer data)
gpointer data)
{
GimpImage *image;
GimpLayer *layer;
......@@ -347,7 +347,7 @@ layers_raise_cmd_callback (GtkAction *action,
void
layers_raise_to_top_cmd_callback (GtkAction *action,
gpointer data)
gpointer data)
{
GimpImage *image;
GimpLayer *layer;
......@@ -359,7 +359,7 @@ layers_raise_to_top_cmd_callback (GtkAction *action,
void
layers_lower_cmd_callback (GtkAction *action,
gpointer data)
gpointer data)
{
GimpImage *image;
GimpLayer *layer;
......@@ -371,7 +371,7 @@ layers_lower_cmd_callback (GtkAction *action,
void
layers_lower_to_bottom_cmd_callback (GtkAction *action,
gpointer data)
gpointer data)
{
GimpImage *image;
GimpLayer *layer;
......@@ -383,7 +383,7 @@ layers_lower_to_bottom_cmd_callback (GtkAction *action,
void
layers_duplicate_cmd_callback (GtkAction *action,
gpointer data)
gpointer data)
{
GimpImage *image;
GimpLayer *layer;
......@@ -401,7 +401,7 @@ layers_duplicate_cmd_callback (GtkAction *action,
void
layers_anchor_cmd_callback (GtkAction *action,
gpointer data)
gpointer data)
{
GimpImage *image;
GimpLayer *layer;
......@@ -416,7 +416,7 @@ layers_anchor_cmd_callback (GtkAction *action,
void
layers_merge_down_cmd_callback (GtkAction *action,
gpointer data)
gpointer data)
{
GimpImage *image;
GimpLayer *layer;
......@@ -429,7 +429,7 @@ layers_merge_down_cmd_callback (GtkAction *action,
void
layers_delete_cmd_callback (GtkAction *action,
gpointer data)
gpointer data)
{
GimpImage *image;
GimpLayer *layer;
......@@ -457,7 +457,7 @@ layers_text_discard_cmd_callback (GtkAction *action,
void
layers_resize_cmd_callback (GtkAction *action,
gpointer data)
gpointer data)
{
GimpDisplay *display;
GimpImage *image;
......@@ -488,7 +488,7 @@ layers_resize_cmd_callback (GtkAction *action,
void
layers_resize_to_image_cmd_callback (GtkAction *action,
gpointer data)
gpointer data)
{
GimpImage *image;
GimpLayer *layer;
......@@ -500,7 +500,7 @@ layers_resize_to_image_cmd_callback (GtkAction *action,
void
layers_scale_cmd_callback (GtkAction *action,
gpointer data)
gpointer data)
{
GimpImage *image;
GimpLayer *layer;
......
......@@ -64,7 +64,7 @@ palette_editor_edit_color_cmd_callback (GtkAction *action,
if (! editor->color_dialog)
{
editor->color_dialog =
gimp_color_dialog_new (GIMP_VIEWABLE (palette),
gimp_color_dialog_new (GIMP_VIEWABLE (palette),
_("Edit Palette Color"),
GIMP_STOCK_PALETTE,
_("Edit Color Palette Entry"),
......@@ -161,10 +161,10 @@ palette_editor_edit_color_update (GimpColorDialog *dialog,
case GIMP_COLOR_DIALOG_OK:
if (editor->color)
{
editor->color->color = *color;
gimp_data_dirty (GIMP_DATA (palette));
}
{
editor->color->color = *color;
gimp_data_dirty (GIMP_DATA (palette));
}
/* Fallthrough */
case GIMP_COLOR_DIALOG_CANCEL:
......
......@@ -121,21 +121,21 @@ palettes_merge_callback (GtkWidget *widget,
palette = (GimpPalette *) GIMP_VIEW (list_item->preview)->viewable;
if (palette)
{
for (cols = palette->colors; cols; cols = g_list_next (cols))
{
entry = (GimpPaletteEntry *) cols->data;
{
for (cols = palette->colors; cols; cols = g_list_next (cols))