Commit 4e92a6cf authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

no need to get base_config twice in the same function.

2005-04-16  Michael Natterer  <mitch@gimp.org>

	* app/core/gimpcontext.c (gimp_context_real_set_brush)
	(gimp_context_real_set_pattern): no need to get base_config twice
	in the same function.

	* app/widgets/gimpblobeditor.h: include the parent class.

	* app/widgets/gimpdataeditor.c (gimp_data_editor_init): set the
	name entry insensitive.
parent b8e8822c
2005-04-16 Michael Natterer <mitch@gimp.org>
* app/core/gimpcontext.c (gimp_context_real_set_brush)
(gimp_context_real_set_pattern): no need to get base_config twice
in the same function.
* app/widgets/gimpblobeditor.h: include the parent class.
* app/widgets/gimpdataeditor.c (gimp_data_editor_init): set the
name entry insensitive.
2005-04-16 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpdataeditor.[ch]: implement
......
......@@ -2225,6 +2225,8 @@ static void
gimp_context_real_set_brush (GimpContext *context,
GimpBrush *brush)
{
GimpBaseConfig *base_config;
if (! standard_brush)
standard_brush = GIMP_BRUSH (gimp_brush_get_standard ());
......@@ -2237,13 +2239,11 @@ gimp_context_real_set_brush (GimpContext *context,
context->brush_name = NULL;
}
base_config = GIMP_BASE_CONFIG (context->gimp->config);
/* disconnect from the old brush's signals */
if (context->brush)
{
GimpBaseConfig *base_config;
base_config = GIMP_BASE_CONFIG (context->gimp->config);
/* make sure the active brush is swapped before we get a new one... */
if (base_config->stingy_memory_use &&
context->brush->mask &&
......@@ -2263,10 +2263,6 @@ gimp_context_real_set_brush (GimpContext *context,
if (brush)
{
GimpBaseConfig *base_config;
base_config = GIMP_BASE_CONFIG (context->gimp->config);
g_object_ref (brush);
g_signal_connect_object (brush, "name_changed",
......@@ -2409,10 +2405,6 @@ gimp_context_real_set_pattern (GimpContext *context,
if (pattern)
{
GimpBaseConfig *base_config;
base_config = GIMP_BASE_CONFIG (context->gimp->config);
g_object_ref (pattern);
g_signal_connect_object (pattern, "name_changed",
......
......@@ -22,7 +22,7 @@
#define __GIMP_BLOB_EDITOR_H__
#include "gimpdataeditor.h"
#include "gtk/gtkdrawingarea.h"
#define GIMP_TYPE_BLOB_EDITOR (gimp_blob_editor_get_type ())
......
......@@ -173,6 +173,8 @@ gimp_data_editor_init (GimpDataEditor *editor)
gtk_box_pack_start (GTK_BOX (editor), editor->name_entry, FALSE, FALSE, 0);
gtk_widget_show (editor->name_entry);
gtk_widget_set_sensitive (editor->name_entry, FALSE);
g_signal_connect (editor->name_entry, "activate",
G_CALLBACK (gimp_data_editor_name_activate),
editor);
......
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