app: clean up the text options notify callback

This commit is contained in:
Michael Natterer 2010-02-17 16:05:45 +01:00
parent 8574f4c4e8
commit 2dc577d606

View file

@ -149,6 +149,10 @@ static void gimp_text_tool_select_all (GimpTextTool *text_tool,
static void gimp_text_tool_connect (GimpTextTool *text_tool, static void gimp_text_tool_connect (GimpTextTool *text_tool,
GimpTextLayer *layer, GimpTextLayer *layer,
GimpText *text); GimpText *text);
static void gimp_text_tool_options_notify (GimpTextOptions *options,
GParamSpec *pspec,
GimpTextTool *text_tool);
static void gimp_text_tool_set_dynamic_box (GimpTextTool *text_tool); static void gimp_text_tool_set_dynamic_box (GimpTextTool *text_tool);
static void gimp_text_tool_layer_notify (GimpTextLayer *layer, static void gimp_text_tool_layer_notify (GimpTextLayer *layer,
GParamSpec *pspec, GParamSpec *pspec,
@ -188,9 +192,6 @@ static void gimp_text_tool_text_buffer_mark_set (GtkTextBuffer *text_buffer,
GtkTextIter *location, GtkTextIter *location,
GtkTextMark *mark, GtkTextMark *mark,
GimpTextTool *text_tool); GimpTextTool *text_tool);
static void gimp_text_tool_use_editor_notify (GimpTextOptions *options,
GParamSpec *pspec,
GimpTextTool *text_tool);
static gint gimp_text_tool_xy_to_offset (GimpTextTool *text_tool, static gint gimp_text_tool_xy_to_offset (GimpTextTool *text_tool,
gdouble x, gdouble x,
@ -345,7 +346,7 @@ gimp_text_tool_constructor (GType type,
text_tool, 0); text_tool, 0);
g_signal_connect_object (options, "notify::use-editor", g_signal_connect_object (options, "notify::use-editor",
G_CALLBACK (gimp_text_tool_use_editor_notify), G_CALLBACK (gimp_text_tool_options_notify),
text_tool, 0); text_tool, 0);
g_object_set (options, g_object_set (options,
@ -1887,19 +1888,24 @@ gimp_text_tool_connect (GimpTextTool *text_tool,
} }
static void static void
gimp_text_tool_use_editor_notify (GimpTextOptions *options, gimp_text_tool_options_notify (GimpTextOptions *options,
GParamSpec *pspec, GParamSpec *pspec,
GimpTextTool *text_tool) GimpTextTool *text_tool)
{ {
if (options->use_editor) const gchar *param_name = g_param_spec_get_name (pspec);
if (! strcmp (param_name, "use-editor"))
{ {
if (text_tool->text) if (options->use_editor)
gimp_text_tool_editor_dialog (text_tool); {
} if (text_tool->text)
else gimp_text_tool_editor_dialog (text_tool);
{ }
if (text_tool->editor) else
gtk_widget_destroy (text_tool->editor); {
if (text_tool->editor)
gtk_widget_destroy (text_tool->editor);
}
} }
} }