graphics/gimp
graphics/gimp
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp synced 2024-10-21 20:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

app/widgets/gimpdataeditor.c (gimp_data_editor_name_activate) strip the

Browse source 
2006-05-30  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpdataeditor.c (gimp_data_editor_name_activate)
	* app/widgets/gimpdatafactoryview.c
	(gimp_data_factory_view_tree_name_edited): strip the newly
	entered name from whitespace and reject empty names.
This commit is contained in:
Michael Natterer 2006-05-30 11:56:42 +00:00 committed by Michael Natterer
parent ed4620dc43
commit 8903c67fb0
3 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-05-30 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpdataeditor.c (gimp_data_editor_name_activate)
* app/widgets/gimpdatafactoryview.c
(gimp_data_factory_view_tree_name_edited): strip the newly
entered name from whitespace and reject empty names.
2006-05-30 Manish Singh <yosh@gimp.org>
* app/batch.c (batch_run): GIMP_BATCH_INTERPRETER can be set in

19
app/widgets/gimpdataeditor.c
View file

@ -488,8 +488,23 @@ gimp_data_editor_name_activate (GtkWidget *widget,
GimpDataEditor *editor)
{
if (editor->data)
gimp_object_set_name (GIMP_OBJECT (editor->data),
gtk_entry_get_text (GTK_ENTRY (widget)));
{
gchar *new_name;
new_name = g_strdup (gtk_entry_get_text (GTK_ENTRY (widget)));
new_name = g_strstrip (new_name);
if (strlen (new_name))
{
gimp_object_take_name (GIMP_OBJECT (editor->data), new_name);
}
else
{
gtk_entry_set_text (GTK_ENTRY (widget),
gimp_object_get_name (GIMP_OBJECT (editor->data)));
g_free (new_name);
}
}
}
static gboolean

16
app/widgets/gimpdatafactoryview.c
View file

@ -262,7 +262,7 @@ gimp_data_factory_view_tree_name_edited (GtkCellRendererText *cell,
{
GimpViewRenderer *renderer;
GimpData *data;
const gchar *old_name;
gchar *name;
gtk_tree_model_get (tree_view->model, &iter,
tree_view->model_column_renderer, &renderer,
@ -270,20 +270,20 @@ gimp_data_factory_view_tree_name_edited (GtkCellRendererText *cell,
data = GIMP_DATA (renderer->viewable);
old_name = gimp_object_get_name (GIMP_OBJECT (data));
if (! new_name)
new_name = "";
if (! old_name) old_name = "";
if (! new_name) new_name = "";
name = g_strstrip (g_strdup (new_name));
if (data->writable && strcmp (old_name, new_name))
if (data->writable && strlen (name))
{
gimp_object_set_name (GIMP_OBJECT (data), new_name);
gimp_object_take_name (GIMP_OBJECT (data), name);
}
else
{
gchar *name = gimp_viewable_get_description (renderer->viewable,
NULL);
g_free (name);
name = gimp_viewable_get_description (renderer->viewable, NULL);
gtk_list_store_set (GTK_LIST_STORE (tree_view->model), &iter,
tree_view->model_column_name, name,
-1);