callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: remove the "shell" parameter from gimp_tool_dialog_new() and gui_new()

Browse Source
This commit is contained in:
Michael Natterer
2013-06-07 12:19:42 +02:00
parent 3def3a1ade
commit 88387d6e8d
8 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/display/gimptooldialog.c
View File

@ -90,7 +90,6 @@ gimp_tool_dialog_dispose (GObject *object)
/**
* gimp_tool_dialog_new:
* @tool_info: a #GimpToolInfo
* @shell: the parent display shell this dialog
* @desc: a string to use in the dialog header or %NULL to use the help
* field from #GimpToolInfo
* @...: a %NULL-terminated valist of button parameters as described in
@ -104,7 +103,6 @@ gimp_tool_dialog_dispose (GObject *object)
**/
GtkWidget *
gimp_tool_dialog_new (GimpToolInfo *tool_info,
GimpDisplayShell *shell,
const gchar *desc,
...)
{
@ -114,7 +112,6 @@ gimp_tool_dialog_new (GimpToolInfo *tool_info,
va_list args;
g_return_val_if_fail (GIMP_IS_TOOL_INFO (tool_info), NULL);
g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
stock_id = gimp_viewable_get_stock_id (GIMP_VIEWABLE (tool_info));
@ -127,8 +124,6 @@ gimp_tool_dialog_new (GimpToolInfo *tool_info,
"description", desc ? desc : tool_info->help,
NULL);
gimp_tool_dialog_set_shell (GIMP_TOOL_DIALOG (dialog), shell);
va_start (args, desc);
gimp_dialog_add_buttons_valist (GIMP_DIALOG (dialog), args);
va_end (args);

1
app/display/gimptooldialog.h
View File

@ -43,7 +43,6 @@ struct _GimpToolDialog
GType gimp_tool_dialog_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_tool_dialog_new (GimpToolInfo *tool_info,
GimpDisplayShell *shell,
const gchar *desc,
...) G_GNUC_NULL_TERMINATED;

9
app/display/gimptoolgui.c
View File

@ -121,7 +121,6 @@ gimp_tool_gui_finalize (GObject *object)
/**
* gimp_tool_gui_new:
* @tool_info: a #GimpToolInfo
* @shell: the parent display shell this gui
* @desc: a string to use in the gui header or %NULL to use the help
* field from #GimpToolInfo
* @...: a %NULL-terminated valist of button parameters as described in
@ -134,7 +133,6 @@ gimp_tool_gui_finalize (GObject *object)
**/
GimpToolGui *
gimp_tool_gui_new (GimpToolInfo *tool_info,
GimpDisplayShell *shell,
const gchar *desc,
gboolean overlay,
...)
@ -144,7 +142,6 @@ gimp_tool_gui_new (GimpToolInfo *tool_info,
va_list args;
g_return_val_if_fail (GIMP_IS_TOOL_INFO (tool_info), NULL);
g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
gui = g_object_new (GIMP_TYPE_TOOL_GUI, NULL);
@ -173,7 +170,7 @@ gimp_tool_gui_new (GimpToolInfo *tool_info,
}
else
{
private->dialog = gimp_tool_dialog_new (tool_info, shell, desc, NULL);
private->dialog = gimp_tool_dialog_new (tool_info, desc, NULL);
va_start (args, overlay);
gimp_dialog_add_buttons_valist (GIMP_DIALOG (private->dialog), args);
@ -186,8 +183,6 @@ gimp_tool_gui_new (GimpToolInfo *tool_info,
gtk_widget_show (private->vbox);
}
gimp_tool_gui_set_shell (GIMP_TOOL_GUI (gui), shell);
return gui;
}
@ -257,6 +252,8 @@ gimp_tool_gui_show (GimpToolGui *gui)
private = GET_PRIVATE (gui);
g_return_if_fail (private->shell != NULL);
if (private->overlay)
{
if (! gtk_widget_get_parent (private->dialog))

1
app/display/gimptoolgui.h
View File

@ -49,7 +49,6 @@ struct _GimpToolGuiClass
GType gimp_tool_gui_get_type (void) G_GNUC_CONST;
GimpToolGui * gimp_tool_gui_new (GimpToolInfo *tool_info,
GimpDisplayShell *shell,
const gchar *desc,
gboolean overlay,
...) G_GNUC_NULL_TERMINATED;

1
app/tools/gimpcolorpickertool.c
View File

@ -310,7 +310,6 @@ gimp_color_picker_tool_info_create (GimpColorPickerTool *picker_tool)
g_return_if_fail (tool->drawable != NULL);
picker_tool->gui = gimp_tool_gui_new (tool->tool_info,
gimp_display_get_shell (tool->display),
_("Color Picker Information"),
FALSE,

1
app/tools/gimpimagemaptool.c
View File

@ -327,7 +327,6 @@ gimp_image_map_tool_initialize (GimpTool *tool,
image_map_tool->gui =
gimp_tool_gui_new (tool_info,
display_shell,
klass->dialog_desc,
image_map_tool->overlay,

1
app/tools/gimpmeasuretool.c
View File

@ -1045,7 +1045,6 @@ gimp_measure_tool_dialog_new (GimpMeasureTool *measure)
GtkWidget *label;
gui = gimp_tool_gui_new (tool->tool_info,
gimp_display_get_shell (tool->display),
_("Measure Distances and Angles"),
FALSE,

1
app/tools/gimptransformtool.c
View File

@ -1692,7 +1692,6 @@ gimp_transform_tool_dialog (GimpTransformTool *tr_tool)
tr_tool->overlay = FALSE;
tr_tool->gui = gimp_tool_gui_new (tool_info,
gimp_display_get_shell (tool->display),
tool_info->blurb,
tr_tool->overlay,