[gimp] app: s/gimp_drawable_is_text_layer/gimp_item_is_text_layer/g
- From: Martin Nordholts <martinn src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: s/gimp_drawable_is_text_layer/gimp_item_is_text_layer/g
- Date: Tue, 5 Oct 2010 05:03:19 +0000 (UTC)
commit 49a0be731e2417f46b7db6291269c4d9effa3765
Author: Martin Nordholts <martinn src gnome org>
Date: Tue Oct 5 07:12:30 2010 +0200
app: s/gimp_drawable_is_text_layer/gimp_item_is_text_layer/g
app/actions/layers-actions.c | 2 +-
app/actions/layers-commands.c | 4 ++--
app/actions/text-tool-actions.c | 2 +-
app/dialogs/layer-options-dialog.c | 4 ++--
app/display/gimpdisplayshell-dnd.c | 2 +-
app/pdb/gimppdb-utils.c | 2 +-
app/pdb/item-cmds.c | 2 +-
app/text/gimptextlayer.c | 4 ++--
app/text/gimptextlayer.h | 2 +-
app/widgets/gimplayertreeview.c | 2 +-
app/widgets/gimpviewrendererlayer.c | 2 +-
11 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/app/actions/layers-actions.c b/app/actions/layers-actions.c
index dcc089c..764c3e6 100644
--- a/app/actions/layers-actions.c
+++ b/app/actions/layers-actions.c
@@ -572,7 +572,7 @@ layers_actions_update (GimpActionGroup *group,
}
}
- text_layer = gimp_drawable_is_text_layer (GIMP_DRAWABLE (layer));
+ text_layer = gimp_item_is_text_layer (GIMP_DRAWABLE (layer));
}
}
diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c
index bad3e1b..82a171b 100644
--- a/app/actions/layers-commands.c
+++ b/app/actions/layers-commands.c
@@ -159,7 +159,7 @@ layers_text_tool_cmd_callback (GtkAction *action,
return_if_no_layer (image, layer, data);
return_if_no_widget (widget, data);
- if (! gimp_drawable_is_text_layer (GIMP_DRAWABLE (layer)))
+ if (! gimp_item_is_text_layer (GIMP_DRAWABLE (layer)))
{
layers_edit_attributes_cmd_callback (action, data);
return;
@@ -1049,7 +1049,7 @@ layers_edit_layer_response (GtkWidget *widget,
}
if (dialog->rename_toggle &&
- gimp_drawable_is_text_layer (GIMP_DRAWABLE (layer)))
+ gimp_item_is_text_layer (GIMP_DRAWABLE (layer)))
{
g_object_set (layer,
"auto-rename",
diff --git a/app/actions/text-tool-actions.c b/app/actions/text-tool-actions.c
index 50b6ed4..952b828 100644
--- a/app/actions/text-tool-actions.c
+++ b/app/actions/text-tool-actions.c
@@ -157,7 +157,7 @@ text_tool_actions_update (GimpActionGroup *group,
layer = gimp_image_get_active_layer (image);
if (layer)
- text_layer = gimp_drawable_is_text_layer (GIMP_DRAWABLE (layer));
+ text_layer = gimp_item_is_text_layer (GIMP_DRAWABLE (layer));
vectors = gimp_image_get_active_vectors (image);
diff --git a/app/dialogs/layer-options-dialog.c b/app/dialogs/layer-options-dialog.c
index 2e0ba8d..aa6e29e 100644
--- a/app/dialogs/layer-options-dialog.c
+++ b/app/dialogs/layer-options-dialog.c
@@ -211,7 +211,7 @@ layer_options_dialog_new (GimpImage *image,
else
{
/* For text layers add a toggle to control "auto-rename" */
- if (gimp_drawable_is_text_layer (GIMP_DRAWABLE (layer)))
+ if (gimp_item_is_text_layer (GIMP_DRAWABLE (layer)))
{
options->rename_toggle =
gtk_check_button_new_with_mnemonic (_("Set name from _text"));
@@ -240,7 +240,7 @@ layer_options_dialog_toggle_rename (GtkWidget *widget,
LayerOptionsDialog *options)
{
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)) &&
- gimp_drawable_is_text_layer (GIMP_DRAWABLE (options->layer)))
+ gimp_item_is_text_layer (GIMP_DRAWABLE (options->layer)))
{
GimpTextLayer *text_layer = GIMP_TEXT_LAYER (options->layer);
GimpText *text = gimp_text_layer_get_text (text_layer);
diff --git a/app/display/gimpdisplayshell-dnd.c b/app/display/gimpdisplayshell-dnd.c
index 6634c5c..abaaf9a 100644
--- a/app/display/gimpdisplayshell-dnd.c
+++ b/app/display/gimpdisplayshell-dnd.c
@@ -359,7 +359,7 @@ gimp_display_shell_dnd_bucket_fill (GimpDisplayShell *shell,
/* FIXME: there should be a virtual method for this that the
* GimpTextLayer can override.
*/
- if (color && gimp_drawable_is_text_layer (drawable))
+ if (color && gimp_item_is_text_layer (drawable))
{
gimp_text_layer_set (GIMP_TEXT_LAYER (drawable), NULL,
"color", color,
diff --git a/app/pdb/gimppdb-utils.c b/app/pdb/gimppdb-utils.c
index cb45070..ee43716 100644
--- a/app/pdb/gimppdb-utils.c
+++ b/app/pdb/gimppdb-utils.c
@@ -516,7 +516,7 @@ gimp_pdb_layer_is_text_layer (GimpLayer *layer,
g_return_val_if_fail (GIMP_IS_LAYER (layer), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- if (! gimp_drawable_is_text_layer (GIMP_DRAWABLE (layer)))
+ if (! gimp_item_is_text_layer (GIMP_DRAWABLE (layer)))
{
g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
_("Layer '%s' (%d) cannot be used because it is not "
diff --git a/app/pdb/item-cmds.c b/app/pdb/item-cmds.c
index 96c2cd5..637824b 100644
--- a/app/pdb/item-cmds.c
+++ b/app/pdb/item-cmds.c
@@ -197,7 +197,7 @@ item_is_text_layer_invoker (GimpProcedure *procedure,
if (success)
{
text_layer = (GIMP_IS_DRAWABLE (item) &&
- gimp_drawable_is_text_layer (GIMP_DRAWABLE (item)));
+ gimp_item_is_text_layer (GIMP_DRAWABLE (item)));
}
return_vals = gimp_procedure_get_return_values (procedure, success,
diff --git a/app/text/gimptextlayer.c b/app/text/gimptextlayer.c
index 4feca03..a7ad2ee 100644
--- a/app/text/gimptextlayer.c
+++ b/app/text/gimptextlayer.c
@@ -446,7 +446,7 @@ gimp_text_layer_set (GimpTextLayer *layer,
GimpText *text;
va_list var_args;
- g_return_if_fail (gimp_drawable_is_text_layer ((GimpDrawable *) layer));
+ g_return_if_fail (gimp_item_is_text_layer ((GimpDrawable *) layer));
g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (layer)));
text = gimp_text_layer_get_text (layer);
@@ -513,7 +513,7 @@ gimp_text_layer_discard (GimpTextLayer *layer)
}
gboolean
-gimp_drawable_is_text_layer (GimpDrawable *drawable)
+gimp_item_is_text_layer (GimpDrawable *drawable)
{
return (GIMP_IS_TEXT_LAYER (drawable) &&
GIMP_TEXT_LAYER (drawable)->text &&
diff --git a/app/text/gimptextlayer.h b/app/text/gimptextlayer.h
index 45db042..876ac59 100644
--- a/app/text/gimptextlayer.h
+++ b/app/text/gimptextlayer.h
@@ -67,7 +67,7 @@ void gimp_text_layer_set (GimpTextLayer *layer,
const gchar *first_property_name,
...) G_GNUC_NULL_TERMINATED;
-gboolean gimp_drawable_is_text_layer (GimpDrawable *drawable);
+gboolean gimp_item_is_text_layer (GimpDrawable *drawable);
#endif /* __GIMP_TEXT_LAYER_H__ */
diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c
index 9a2a1b4..9e33c86 100644
--- a/app/widgets/gimplayertreeview.c
+++ b/app/widgets/gimplayertreeview.c
@@ -680,7 +680,7 @@ gimp_layer_tree_view_drop_color (GimpContainerTreeView *view,
GimpViewable *dest_viewable,
GtkTreeViewDropPosition drop_pos)
{
- if (gimp_drawable_is_text_layer (GIMP_DRAWABLE (dest_viewable)))
+ if (gimp_item_is_text_layer (GIMP_DRAWABLE (dest_viewable)))
{
gimp_text_layer_set (GIMP_TEXT_LAYER (dest_viewable), NULL,
"color", color,
diff --git a/app/widgets/gimpviewrendererlayer.c b/app/widgets/gimpviewrendererlayer.c
index f070d08..155cecb 100644
--- a/app/widgets/gimpviewrendererlayer.c
+++ b/app/widgets/gimpviewrendererlayer.c
@@ -67,7 +67,7 @@ gimp_view_renderer_layer_render (GimpViewRenderer *renderer,
{
stock_id = GIMP_STOCK_FLOATING_SELECTION;
}
- else if (gimp_drawable_is_text_layer (GIMP_DRAWABLE (renderer->viewable)))
+ else if (gimp_item_is_text_layer (GIMP_DRAWABLE (renderer->viewable)))
{
stock_id = gimp_viewable_get_stock_id (renderer->viewable);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]