dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/nav_window.c app/user_install.c app/pdb/color_cmds.c 

2001-07-25  Sven Neumann  <sven@gimp.org>

	* app/nav_window.c
	* app/user_install.c
	* app/pdb/color_cmds.c
	* app/pdb/selection_cmds.c
	* app/tools/gimpbezierselecttool.c
	* app/tools/gimpblendtool.c
	* app/tools/gimpbucketfilltool.c
	* app/tools/gimpbycolorselecttool.c
	* app/tools/gimpclonetool.c
	* app/tools/gimpcolorpickertool.c
	* app/tools/gimpdrawtool.c
	* app/tools/gimpeditselectiontool.c
	* app/tools/gimpellipseselecttool.c
	* app/tools/gimpfreeselecttool.c
	* app/tools/gimpfuzzyselecttool.c
	* app/tools/gimphuesaturationtool.c
	* app/tools/gimpiscissorstool.c
	* app/tools/gimppainttool.c
	* app/tools/gimprectselecttool.c
	* app/tools/gimptexttool.c
	* app/tools/gimptool.c
	* app/tools/paint_options.c
	* app/tools/selection_options.c
	* app/tools/tool_manager.c
	* app/tools/transform_options.c
	* app/widgets/gimpdnd.c
	* tools/pdbgen/pdb/color.pdb
	* tools/pdbgen/pdb/selection.pdb: use GObject functions.
This commit is contained in:
Sven Neumann 2001-07-25 00:27:41 +00:00 committed by Sven Neumann
parent fd97c49813
commit f5cfbd50da
45 changed files with 289 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ChangeLog
View File

@ -1,3 +1,34 @@
2001-07-25 Sven Neumann <sven@gimp.org>
* app/nav_window.c
* app/user_install.c
* app/pdb/color_cmds.c
* app/pdb/selection_cmds.c
* app/tools/gimpbezierselecttool.c
* app/tools/gimpblendtool.c
* app/tools/gimpbucketfilltool.c
* app/tools/gimpbycolorselecttool.c
* app/tools/gimpclonetool.c
* app/tools/gimpcolorpickertool.c
* app/tools/gimpdrawtool.c
* app/tools/gimpeditselectiontool.c
* app/tools/gimpellipseselecttool.c
* app/tools/gimpfreeselecttool.c
* app/tools/gimpfuzzyselecttool.c
* app/tools/gimphuesaturationtool.c
* app/tools/gimpiscissorstool.c
* app/tools/gimppainttool.c
* app/tools/gimprectselecttool.c
* app/tools/gimptexttool.c
* app/tools/gimptool.c
* app/tools/paint_options.c
* app/tools/selection_options.c
* app/tools/tool_manager.c
* app/tools/transform_options.c
* app/widgets/gimpdnd.c
* tools/pdbgen/pdb/color.pdb
* tools/pdbgen/pdb/selection.pdb: use GObject functions.
2001-07-25 Sven Neumann <sven@gimp.org>
* app/gximage.c: replaced some deprecated gdk functions.

4
app/base/hue-saturation.c
View File

@ -490,7 +490,7 @@ hue_saturation_dialog_new (void)
{
radio_button = gtk_radio_button_new_with_label (group, gettext (hue_partition_names[i]));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio_button));
gtk_object_set_data (GTK_OBJECT (radio_button), "hue_partition",
g_object_set_data (G_OBJECT (radio_button), "hue_partition",
(gpointer) i);
if (!i)
@ -827,7 +827,7 @@ hue_saturation_partition_callback (GtkWidget *widget,
hsd = (HueSaturationDialog *) data;
partition = (HueRange) gtk_object_get_data (GTK_OBJECT (widget),
partition = (HueRange) g_object_get_data (G_OBJECT (widget),
"hue_partition");
hsd->hue_partition = partition;

2
app/core/gimpdrawable-blend.c
View File

@ -801,7 +801,7 @@ blend_options_new (void)
/* automatically set the sensitive state of the table */
gtk_widget_set_sensitive (table, options->supersample_d);
gtk_object_set_data (GTK_OBJECT (options->supersample_w), "set_sensitive",
g_object_set_data (G_OBJECT (options->supersample_w), "set_sensitive",
table);
/* max depth scale */

4
app/core/gimpimage-pick-color.c
View File

@ -340,10 +340,10 @@ gimp_color_picker_tool_options_new (void)
gtk_scale_set_digits (GTK_SCALE (scale), 0);
gtk_container_add (GTK_CONTAINER (abox), scale);
gtk_widget_set_sensitive (scale, options->sample_average_d);
gtk_object_set_data (GTK_OBJECT (options->sample_average_w), "set_sensitive",
g_object_set_data (G_OBJECT (options->sample_average_w), "set_sensitive",
scale);
gtk_widget_set_sensitive (label, options->sample_average_d);
gtk_object_set_data (GTK_OBJECT (scale), "set_sensitive",
g_object_set_data (G_OBJECT (scale), "set_sensitive",
label);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);

40
app/dialogs/user-install-dialog.c
View File

@ -298,8 +298,8 @@ user_install_notebook_set_page (GtkNotebook *notebook,
page = gtk_notebook_get_nth_page (notebook, index);
title = gtk_object_get_data (GTK_OBJECT (page), "title");
footer = gtk_object_get_data (GTK_OBJECT (page), "footer");
title = g_object_get_data (G_OBJECT (page), "title");
footer = g_object_get_data (G_OBJECT (page), "footer");
gtk_label_set_text (GTK_LABEL (title_label), title);
gtk_label_set_text (GTK_LABEL (footer_label), footer);
@ -466,8 +466,8 @@ user_install_notebook_append_page (GtkNotebook *notebook,
GtkWidget *page;
page = gtk_vbox_new (FALSE, 6);
gtk_object_set_data (GTK_OBJECT (page), "title", title);
gtk_object_set_data (GTK_OBJECT (page), "footer", footer);
g_object_set_data (G_OBJECT (page), "title", title);
g_object_set_data (G_OBJECT (page), "footer", footer);
gtk_notebook_append_page (notebook, page, NULL);
gtk_widget_show (page);
@ -763,9 +763,9 @@ user_install_dialog_create (Gimp *gimp)
NULL, NULL, NULL, NULL,
FALSE, TRUE);
gtk_signal_connect (GTK_OBJECT (ctree), "select_row",
GTK_SIGNAL_FUNC (user_install_ctree_select_row),
notebook2);
g_signal_connect (G_OBJECT (ctree), "select_row",
G_CALLBACK (user_install_ctree_select_row),
notebook2);
file_pixmap = gdk_pixmap_create_from_xpm_d (dialog->window,
&file_mask,
@ -1058,8 +1058,8 @@ user_install_run (void)
if (executable)
{
gtk_object_set_data (GTK_OBJECT (log_page), "footer",
_("Click \"Continue\" to complete GIMP installation."));
g_object_set_data (G_OBJECT (log_page), "footer",
_("Click \"Continue\" to complete GIMP installation."));
}
else
{
@ -1211,7 +1211,7 @@ user_install_resolution (void)
chain = GIMP_COORDINATES_CHAINBUTTON (resolution_entry);
PAGE_STYLE (GTK_WIDGET (chain->line1));
PAGE_STYLE (GTK_WIDGET (chain->line2));
gtk_object_set_data (GTK_OBJECT (resolution_entry), "chain_button", chain);
g_object_set_data (G_OBJECT (resolution_entry), "chain_button", chain);
for (list = GTK_TABLE (resolution_entry)->children;
list;
@ -1241,18 +1241,18 @@ user_install_resolution (void)
button = gtk_button_new_with_label (_("Calibrate"));
gtk_misc_set_padding (GTK_MISC (GTK_BIN (button)->child), 4, 0);
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (user_install_resolution_calibrate),
NULL);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (user_install_resolution_calibrate),
NULL);
gtk_widget_show (button);
gtk_object_set_data (GTK_OBJECT (xserver_toggle), "inverse_sensitive",
resolution_entry);
gtk_object_set_data (GTK_OBJECT (resolution_entry), "inverse_sensitive",
button);
gtk_signal_connect (GTK_OBJECT (xserver_toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_sensitive_update),
NULL);
g_object_set_data (G_OBJECT (xserver_toggle), "inverse_sensitive",
resolution_entry);
g_object_set_data (G_OBJECT (resolution_entry), "inverse_sensitive",
button);
g_signal_connect (G_OBJECT (xserver_toggle), "toggled",
G_CALLBACK (gimp_toggle_button_sensitive_update),
NULL);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (xserver_toggle),
gimprc.using_xserver_resolution);
}

20
app/display/gimpnavigationeditor.c
View File

@ -258,8 +258,7 @@ nav_dialog_create (GDisplay *gdisp)
button_area, FALSE, FALSE, 0);
gtk_widget_show (button_area);
if (! gtk_object_get_data (GTK_OBJECT (gdisp->gimage),
"nav_handlers_installed"))
if (! g_object_get_data (G_OBJECT (gdisp->gimage), "nav_handlers_installed"))
{
gtk_signal_connect_after (GTK_OBJECT (gdisp->gimage), "dirty",
GTK_SIGNAL_FUNC (nav_image_need_update),
@ -268,9 +267,9 @@ nav_dialog_create (GDisplay *gdisp)
GTK_SIGNAL_FUNC (nav_image_need_update),
nav_dialog);
gtk_object_set_data (GTK_OBJECT (gdisp->gimage),
"nav_handlers_installed",
nav_dialog);
g_object_set_data (G_OBJECT (gdisp->gimage),
"nav_handlers_installed",
nav_dialog);
}
return nav_dialog;
@ -590,7 +589,7 @@ nav_dialog_new (GDisplay *gdisp,
static gchar *
nav_dialog_title (GDisplay *gdisp)
{
gchar *basename;
const gchar *basename;
gchar *title;
basename = g_basename (gimp_image_filename (gdisp->gimage));
@ -1646,8 +1645,7 @@ nav_dialog_display_changed (GimpContext *context,
/* Tie into the dirty signal so we can update the preview
* provided we haven't already
*/
if (! gtk_object_get_data (GTK_OBJECT (gimage),
"nav_handlers_installed"))
if (! g_object_get_data (G_OBJECT (gimage), "nav_handlers_installed"))
{
gtk_signal_connect_after (GTK_OBJECT (gimage), "dirty",
GTK_SIGNAL_FUNC (nav_image_need_update),
@ -1656,9 +1654,9 @@ nav_dialog_display_changed (GimpContext *context,
GTK_SIGNAL_FUNC (nav_image_need_update),
nav_dialog);
gtk_object_set_data (GTK_OBJECT (gimage),
"nav_handlers_installed",
nav_dialog);
g_object_set_data (G_OBJECT (gimage),
"nav_handlers_installed",
nav_dialog);
}
}
}

20
app/display/gimpnavigationview.c
View File

@ -258,8 +258,7 @@ nav_dialog_create (GDisplay *gdisp)
button_area, FALSE, FALSE, 0);
gtk_widget_show (button_area);
if (! gtk_object_get_data (GTK_OBJECT (gdisp->gimage),
"nav_handlers_installed"))
if (! g_object_get_data (G_OBJECT (gdisp->gimage), "nav_handlers_installed"))
{
gtk_signal_connect_after (GTK_OBJECT (gdisp->gimage), "dirty",
GTK_SIGNAL_FUNC (nav_image_need_update),
@ -268,9 +267,9 @@ nav_dialog_create (GDisplay *gdisp)
GTK_SIGNAL_FUNC (nav_image_need_update),
nav_dialog);
gtk_object_set_data (GTK_OBJECT (gdisp->gimage),
"nav_handlers_installed",
nav_dialog);
g_object_set_data (G_OBJECT (gdisp->gimage),
"nav_handlers_installed",
nav_dialog);
}
return nav_dialog;
@ -590,7 +589,7 @@ nav_dialog_new (GDisplay *gdisp,
static gchar *
nav_dialog_title (GDisplay *gdisp)
{
gchar *basename;
const gchar *basename;
gchar *title;
basename = g_basename (gimp_image_filename (gdisp->gimage));
@ -1646,8 +1645,7 @@ nav_dialog_display_changed (GimpContext *context,
/* Tie into the dirty signal so we can update the preview
* provided we haven't already
*/
if (! gtk_object_get_data (GTK_OBJECT (gimage),
"nav_handlers_installed"))
if (! g_object_get_data (G_OBJECT (gimage), "nav_handlers_installed"))
{
gtk_signal_connect_after (GTK_OBJECT (gimage), "dirty",
GTK_SIGNAL_FUNC (nav_image_need_update),
@ -1656,9 +1654,9 @@ nav_dialog_display_changed (GimpContext *context,
GTK_SIGNAL_FUNC (nav_image_need_update),
nav_dialog);
gtk_object_set_data (GTK_OBJECT (gimage),
"nav_handlers_installed",
nav_dialog);
g_object_set_data (G_OBJECT (gimage),
"nav_handlers_installed",
nav_dialog);
}
}
}

40
app/gui/user-install-dialog.c
View File

@ -298,8 +298,8 @@ user_install_notebook_set_page (GtkNotebook *notebook,
page = gtk_notebook_get_nth_page (notebook, index);
title = gtk_object_get_data (GTK_OBJECT (page), "title");
footer = gtk_object_get_data (GTK_OBJECT (page), "footer");
title = g_object_get_data (G_OBJECT (page), "title");
footer = g_object_get_data (G_OBJECT (page), "footer");
gtk_label_set_text (GTK_LABEL (title_label), title);
gtk_label_set_text (GTK_LABEL (footer_label), footer);
@ -466,8 +466,8 @@ user_install_notebook_append_page (GtkNotebook *notebook,
GtkWidget *page;
page = gtk_vbox_new (FALSE, 6);
gtk_object_set_data (GTK_OBJECT (page), "title", title);
gtk_object_set_data (GTK_OBJECT (page), "footer", footer);
g_object_set_data (G_OBJECT (page), "title", title);
g_object_set_data (G_OBJECT (page), "footer", footer);
gtk_notebook_append_page (notebook, page, NULL);
gtk_widget_show (page);
@ -763,9 +763,9 @@ user_install_dialog_create (Gimp *gimp)
NULL, NULL, NULL, NULL,
FALSE, TRUE);
gtk_signal_connect (GTK_OBJECT (ctree), "select_row",
GTK_SIGNAL_FUNC (user_install_ctree_select_row),
notebook2);
g_signal_connect (G_OBJECT (ctree), "select_row",
G_CALLBACK (user_install_ctree_select_row),
notebook2);
file_pixmap = gdk_pixmap_create_from_xpm_d (dialog->window,
&file_mask,
@ -1058,8 +1058,8 @@ user_install_run (void)
if (executable)
{
gtk_object_set_data (GTK_OBJECT (log_page), "footer",
_("Click \"Continue\" to complete GIMP installation."));
g_object_set_data (G_OBJECT (log_page), "footer",
_("Click \"Continue\" to complete GIMP installation."));
}
else
{
@ -1211,7 +1211,7 @@ user_install_resolution (void)
chain = GIMP_COORDINATES_CHAINBUTTON (resolution_entry);
PAGE_STYLE (GTK_WIDGET (chain->line1));
PAGE_STYLE (GTK_WIDGET (chain->line2));
gtk_object_set_data (GTK_OBJECT (resolution_entry), "chain_button", chain);
g_object_set_data (G_OBJECT (resolution_entry), "chain_button", chain);
for (list = GTK_TABLE (resolution_entry)->children;
list;
@ -1241,18 +1241,18 @@ user_install_resolution (void)
button = gtk_button_new_with_label (_("Calibrate"));
gtk_misc_set_padding (GTK_MISC (GTK_BIN (button)->child), 4, 0);
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (user_install_resolution_calibrate),
NULL);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (user_install_resolution_calibrate),
NULL);
gtk_widget_show (button);
gtk_object_set_data (GTK_OBJECT (xserver_toggle), "inverse_sensitive",
resolution_entry);
gtk_object_set_data (GTK_OBJECT (resolution_entry), "inverse_sensitive",
button);
gtk_signal_connect (GTK_OBJECT (xserver_toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_sensitive_update),
NULL);
g_object_set_data (G_OBJECT (xserver_toggle), "inverse_sensitive",
resolution_entry);
g_object_set_data (G_OBJECT (resolution_entry), "inverse_sensitive",
button);
g_signal_connect (G_OBJECT (xserver_toggle), "toggled",
G_CALLBACK (gimp_toggle_button_sensitive_update),
NULL);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (xserver_toggle),
gimprc.using_xserver_resolution);
}

20
app/nav_window.c
View File

@ -258,8 +258,7 @@ nav_dialog_create (GDisplay *gdisp)
button_area, FALSE, FALSE, 0);
gtk_widget_show (button_area);
if (! gtk_object_get_data (GTK_OBJECT (gdisp->gimage),
"nav_handlers_installed"))
if (! g_object_get_data (G_OBJECT (gdisp->gimage), "nav_handlers_installed"))
{
gtk_signal_connect_after (GTK_OBJECT (gdisp->gimage), "dirty",
GTK_SIGNAL_FUNC (nav_image_need_update),
@ -268,9 +267,9 @@ nav_dialog_create (GDisplay *gdisp)
GTK_SIGNAL_FUNC (nav_image_need_update),
nav_dialog);
gtk_object_set_data (GTK_OBJECT (gdisp->gimage),
"nav_handlers_installed",
nav_dialog);
g_object_set_data (G_OBJECT (gdisp->gimage),
"nav_handlers_installed",
nav_dialog);
}
return nav_dialog;
@ -590,7 +589,7 @@ nav_dialog_new (GDisplay *gdisp,
static gchar *
nav_dialog_title (GDisplay *gdisp)
{
gchar *basename;
const gchar *basename;
gchar *title;
basename = g_basename (gimp_image_filename (gdisp->gimage));
@ -1646,8 +1645,7 @@ nav_dialog_display_changed (GimpContext *context,
/* Tie into the dirty signal so we can update the preview
* provided we haven't already
*/
if (! gtk_object_get_data (GTK_OBJECT (gimage),
"nav_handlers_installed"))
if (! g_object_get_data (G_OBJECT (gimage), "nav_handlers_installed"))
{
gtk_signal_connect_after (GTK_OBJECT (gimage), "dirty",
GTK_SIGNAL_FUNC (nav_image_need_update),
@ -1656,9 +1654,9 @@ nav_dialog_display_changed (GimpContext *context,
GTK_SIGNAL_FUNC (nav_image_need_update),
nav_dialog);
gtk_object_set_data (GTK_OBJECT (gimage),
"nav_handlers_installed",
nav_dialog);
g_object_set_data (G_OBJECT (gimage),
"nav_handlers_installed",
nav_dialog);
}
}
}

12
app/paint/gimpclone.c
View File

@ -254,14 +254,18 @@ clone_set_src_drawable (GimpDrawable *drawable)
{
if (src_drawable_ == drawable)
return;
if (src_drawable_)
gtk_signal_disconnect_by_data (GTK_OBJECT (src_drawable_), &src_drawable_);
g_signal_handlers_disconnect_by_func (G_OBJECT (src_drawable_),
G_CALLBACK (clone_src_drawable_destroyed_cb),
&src_drawable_);
src_drawable_ = drawable;
if (drawable)
{
gtk_signal_connect (GTK_OBJECT (drawable), "destroy",
GTK_SIGNAL_FUNC (clone_src_drawable_destroyed_cb),
&src_drawable_);
g_signal_connect (G_OBJECT (drawable), "destroy",
G_CALLBACK (clone_src_drawable_destroyed_cb),
&src_drawable_);
}
}

20
app/paint/gimppaintcore.c
View File

@ -863,8 +863,8 @@ gimp_paint_tool_paint (GimpPaintTool *tool,
GimpDrawable *drawable,
PaintState state)
{
gtk_signal_emit (GTK_OBJECT(tool), gimp_paint_tool_signals[PAINT],
drawable, state);
g_signal_emit (G_OBJECT(tool), gimp_paint_tool_signals[PAINT], 0,
drawable, state);
}
gboolean
@ -898,10 +898,10 @@ gimp_paint_tool_start (GimpPaintTool *paint_tool,
/* Each buffer is the same size as the maximum bounds of the active brush... */
if (brush && brush != gimp_context_get_brush (context))
{
gtk_signal_disconnect_by_func (GTK_OBJECT (brush),
GTK_SIGNAL_FUNC (gimp_paint_tool_invalidate_cache),
NULL);
gtk_object_unref (GTK_OBJECT (brush));
g_signal_handlers_disconnect_by_func (G_OBJECT (brush),
G_CALLBACK (gimp_paint_tool_invalidate_cache),
NULL);
g_object_unref (G_OBJECT (brush));
}
if (!(brush = gimp_context_get_brush (context)))
{
@ -909,10 +909,10 @@ gimp_paint_tool_start (GimpPaintTool *paint_tool,
return FALSE;
}
gtk_object_ref (GTK_OBJECT (brush));
gtk_signal_connect (GTK_OBJECT (brush), "invalidate_preview",
GTK_SIGNAL_FUNC (gimp_paint_tool_invalidate_cache),
NULL);
g_object_ref (G_OBJECT (brush));
g_signal_connect (G_OBJECT (brush), "invalidate_preview",
G_CALLBACK (gimp_paint_tool_invalidate_cache),
NULL);
paint_tool->spacing = (double) gimp_brush_get_spacing (brush) / 100.0;

12
app/paint/gimpsourcecore.c
View File

@ -254,14 +254,18 @@ clone_set_src_drawable (GimpDrawable *drawable)
{
if (src_drawable_ == drawable)
return;
if (src_drawable_)
gtk_signal_disconnect_by_data (GTK_OBJECT (src_drawable_), &src_drawable_);
g_signal_handlers_disconnect_by_func (G_OBJECT (src_drawable_),
G_CALLBACK (clone_src_drawable_destroyed_cb),
&src_drawable_);
src_drawable_ = drawable;
if (drawable)
{
gtk_signal_connect (GTK_OBJECT (drawable), "destroy",
GTK_SIGNAL_FUNC (clone_src_drawable_destroyed_cb),
&src_drawable_);
g_signal_connect (G_OBJECT (drawable), "destroy",
G_CALLBACK (clone_src_drawable_destroyed_cb),
&src_drawable_);
}
}

6
app/pdb/color_cmds.c
View File

@ -959,9 +959,9 @@ histogram_invoker (Gimp *gimp,
htd.histogram = histogram_widget_new (HISTOGRAM_WIDTH,
HISTOGRAM_HEIGHT);
gtk_signal_connect (GTK_OBJECT (htd.histogram), "range_changed",
GTK_SIGNAL_FUNC (histogram_tool_histogram_range),
(gpointer) &htd);
g_signal_connect (G_OBJECT (htd.histogram), "range_changed",
G_CALLBACK (histogram_tool_histogram_range),
(gpointer) &htd);
/* The information collection should occur only within selection bounds */
no_mask = (gimp_drawable_mask_bounds (drawable, &x1, &y1, &x2, &y2) == FALSE);

2
app/pdb/selection_cmds.c
View File

@ -1030,7 +1030,7 @@ selection_combine_invoker (Gimp *gimp,
operation,
0, 0); /* off x/y */
gimage_mask_load (gimage, new_channel);
gtk_object_unref (GTK_OBJECT (new_channel));
g_object_unref (G_OBJECT (new_channel));
}
else
success = FALSE;

4
app/tools/gimpbezierselecttool.c
View File

@ -1078,7 +1078,7 @@ bezier_select_reset (GimpBezierSelectTool *bezier_sel)
}
if (bezier_sel->mask)
gtk_object_unref (GTK_OBJECT (bezier_sel->mask));
g_object_unref (G_OBJECT (bezier_sel->mask));
bezier_sel->state = BEZIER_START; /* we are starting the curve */
bezier_sel->draw_mode = BEZIER_DRAW_ALL; /* draw everything by default */
@ -2873,7 +2873,7 @@ bezier_convert (GimpBezierSelectTool *bezier_sel,
/* destroy previous mask */
if (bezier_sel->mask)
{
gtk_object_unref (GTK_OBJECT (bezier_sel->mask));
g_object_unref (G_OBJECT (bezier_sel->mask));
bezier_sel->mask = NULL;
}

2
app/tools/gimpblendtool.c
View File

@ -801,7 +801,7 @@ blend_options_new (void)
/* automatically set the sensitive state of the table */
gtk_widget_set_sensitive (table, options->supersample_d);
gtk_object_set_data (GTK_OBJECT (options->supersample_w), "set_sensitive",
g_object_set_data (G_OBJECT (options->supersample_w), "set_sensitive",
table);
/* max depth scale */

20
app/tools/gimpbrushtool.c
View File

@ -863,8 +863,8 @@ gimp_paint_tool_paint (GimpPaintTool *tool,
GimpDrawable *drawable,
PaintState state)
{
gtk_signal_emit (GTK_OBJECT(tool), gimp_paint_tool_signals[PAINT],
drawable, state);
g_signal_emit (G_OBJECT(tool), gimp_paint_tool_signals[PAINT], 0,
drawable, state);
}
gboolean
@ -898,10 +898,10 @@ gimp_paint_tool_start (GimpPaintTool *paint_tool,
/* Each buffer is the same size as the maximum bounds of the active brush... */
if (brush && brush != gimp_context_get_brush (context))
{
gtk_signal_disconnect_by_func (GTK_OBJECT (brush),
GTK_SIGNAL_FUNC (gimp_paint_tool_invalidate_cache),
NULL);
gtk_object_unref (GTK_OBJECT (brush));
g_signal_handlers_disconnect_by_func (G_OBJECT (brush),
G_CALLBACK (gimp_paint_tool_invalidate_cache),
NULL);
g_object_unref (G_OBJECT (brush));
}
if (!(brush = gimp_context_get_brush (context)))
{
@ -909,10 +909,10 @@ gimp_paint_tool_start (GimpPaintTool *paint_tool,
return FALSE;
}
gtk_object_ref (GTK_OBJECT (brush));
gtk_signal_connect (GTK_OBJECT (brush), "invalidate_preview",
GTK_SIGNAL_FUNC (gimp_paint_tool_invalidate_cache),
NULL);
g_object_ref (G_OBJECT (brush));
g_signal_connect (G_OBJECT (brush), "invalidate_preview",
G_CALLBACK (gimp_paint_tool_invalidate_cache),
NULL);
paint_tool->spacing = (double) gimp_brush_get_spacing (brush) / 100.0;

2
app/tools/gimpbucketfilltool.c
View File

@ -605,7 +605,7 @@ bucket_fill (GimpImage *gimage,
/* free the mask */
if (mask)
gtk_object_unref (GTK_OBJECT (mask));
g_object_unref (G_OBJECT (mask));
if (new_buf)
temp_buf_free (pat_buf);

2
app/tools/gimpbycolorselecttool.c
View File

@ -255,7 +255,7 @@ gimp_by_color_select_tool_select (GimpImage *gimage,
gimp_channel_combine_mask (gimp_image_get_mask (gimage),
new_mask, op, off_x, off_y);
gtk_object_unref (GTK_OBJECT (new_mask));
g_object_unref (G_OBJECT (new_mask));
}
void

12
app/tools/gimpclonetool.c
View File

@ -254,14 +254,18 @@ clone_set_src_drawable (GimpDrawable *drawable)
{
if (src_drawable_ == drawable)
return;
if (src_drawable_)
gtk_signal_disconnect_by_data (GTK_OBJECT (src_drawable_), &src_drawable_);
g_signal_handlers_disconnect_by_func (G_OBJECT (src_drawable_),
G_CALLBACK (clone_src_drawable_destroyed_cb),
&src_drawable_);
src_drawable_ = drawable;
if (drawable)
{
gtk_signal_connect (GTK_OBJECT (drawable), "destroy",
GTK_SIGNAL_FUNC (clone_src_drawable_destroyed_cb),
&src_drawable_);
g_signal_connect (G_OBJECT (drawable), "destroy",
G_CALLBACK (clone_src_drawable_destroyed_cb),
&src_drawable_);
}
}

4
app/tools/gimpcolorpickertool.c
View File

@ -340,10 +340,10 @@ gimp_color_picker_tool_options_new (void)
gtk_scale_set_digits (GTK_SCALE (scale), 0);
gtk_container_add (GTK_CONTAINER (abox), scale);
gtk_widget_set_sensitive (scale, options->sample_average_d);
gtk_object_set_data (GTK_OBJECT (options->sample_average_w), "set_sensitive",
g_object_set_data (G_OBJECT (options->sample_average_w), "set_sensitive",
scale);
gtk_widget_set_sensitive (label, options->sample_average_d);
gtk_object_set_data (GTK_OBJECT (scale), "set_sensitive",
g_object_set_data (G_OBJECT (scale), "set_sensitive",
label);
gtk_scale_set_value_pos (GTK_SCALE (scale), GTK_POS_TOP);
gtk_range_set_update_policy (GTK_RANGE (scale), GTK_UPDATE_DELAYED);

8
app/tools/gimpdrawtool.c
View File

@ -182,7 +182,7 @@ gimp_draw_tool_start (GimpDrawTool *core,
gdk_gc_set_line_attributes (core->gc, core->line_width, core->line_style,
core->cap_style, core->join_style);
gtk_signal_emit (GTK_OBJECT(core), gimp_draw_tool_signals[DRAW]);
g_signal_emit (G_OBJECT(core), gimp_draw_tool_signals[DRAW], 0);
core->draw_state = VISIBLE;
}
@ -194,7 +194,7 @@ gimp_draw_tool_stop (GimpDrawTool *core)
if (core->draw_state == INVISIBLE)
return;
gtk_signal_emit (GTK_OBJECT(core), gimp_draw_tool_signals[DRAW]);
g_signal_emit (G_OBJECT(core), gimp_draw_tool_signals[DRAW], 0);
core->draw_state = INVISIBLE;
}
@ -209,7 +209,7 @@ gimp_draw_tool_resume (GimpDrawTool *core)
{
core->draw_state = VISIBLE;
gtk_signal_emit(GTK_OBJECT(core), gimp_draw_tool_signals[DRAW]);
g_signal_emit(G_OBJECT(core), gimp_draw_tool_signals[DRAW], 0);
}
}
@ -221,7 +221,7 @@ gimp_draw_tool_pause (GimpDrawTool *core)
{
core->draw_state = INVISIBLE;
gtk_signal_emit (GTK_OBJECT(core), gimp_draw_tool_signals[DRAW]);
g_signal_emit (G_OBJECT(core), gimp_draw_tool_signals[DRAW], 0);
}
core->paused_count++;

4
app/tools/gimpeditselectiontool.c
View File

@ -292,7 +292,7 @@ init_edit_selection (GimpTool *tool,
GIMP_TOOL (edit_select)->gdisp = gdisp;
GIMP_TOOL (edit_select)->state = ACTIVE;
gtk_object_ref (GTK_OBJECT (edit_select));
g_object_ref (G_OBJECT (edit_select));
tool_manager_push_tool (gdisp->gimage->gimp,
GIMP_TOOL (edit_select));
@ -402,7 +402,7 @@ gimp_edit_selection_tool_button_release (GimpTool *tool,
gdisplays_flush ();
gtk_object_unref (GTK_OBJECT (edit_select));
g_object_unref (G_OBJECT (edit_select));
}

4
app/tools/gimpellipseselecttool.c
View File

@ -133,7 +133,7 @@ ellipse_select (GimpImage *gimage,
feather_radius,
feather_radius,
op, 0, 0);
gtk_object_unref (GTK_OBJECT (new_mask));
g_object_unref (G_OBJECT (new_mask));
}
else if (op == SELECTION_INTERSECT)
{
@ -142,7 +142,7 @@ ellipse_select (GimpImage *gimage,
x, y, w, h, antialias);
gimp_channel_combine_mask (gimp_image_get_mask (gimage), new_mask,
op, 0, 0);
gtk_object_unref (GTK_OBJECT (new_mask));
g_object_unref (G_OBJECT (new_mask));
}
else
{

2
app/tools/gimpfreeselecttool.c
View File

@ -159,7 +159,7 @@ free_select (GimpImage *gimage,
gimp_channel_combine_mask (gimp_image_get_mask (gimage),
mask, op, 0, 0);
gtk_object_unref (GTK_OBJECT (mask));
g_object_unref (G_OBJECT (mask));
}
}

4
app/tools/gimpfuzzyselecttool.c
View File

@ -417,7 +417,7 @@ fuzzy_select (GimpImage *gimage,
gimp_channel_combine_mask (gimp_image_get_mask (gimage),
fuzzy_mask, op, off_x, off_y);
gtk_object_unref (GTK_OBJECT (fuzzy_mask));
g_object_unref (G_OBJECT (fuzzy_mask));
fuzzy_mask = NULL;
}
@ -644,7 +644,7 @@ fuzzy_select_calculate (GimpFuzzySelectTool *fuzzy_sel,
fuzzy_options->sample_merged);
if (fuzzy_mask)
gtk_object_unref (GTK_OBJECT (fuzzy_mask));
g_object_unref (G_OBJECT (fuzzy_mask));
fuzzy_mask = new;

4
app/tools/gimphuesaturationtool.c
View File

@ -490,7 +490,7 @@ hue_saturation_dialog_new (void)
{
radio_button = gtk_radio_button_new_with_label (group, gettext (hue_partition_names[i]));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio_button));
gtk_object_set_data (GTK_OBJECT (radio_button), "hue_partition",
g_object_set_data (G_OBJECT (radio_button), "hue_partition",
(gpointer) i);
if (!i)
@ -827,7 +827,7 @@ hue_saturation_partition_callback (GtkWidget *widget,
hsd = (HueSaturationDialog *) data;
partition = (HueRange) gtk_object_get_data (GTK_OBJECT (widget),
partition = (HueRange) g_object_get_data (G_OBJECT (widget),
"hue_partition");
hsd->hue_partition = partition;

4
app/tools/gimpiscissorstool.c
View File

@ -596,7 +596,7 @@ iscissors_convert (GimpIscissorsTool *iscissors,
}
if (iscissors->mask)
gtk_object_unref (GTK_OBJECT (iscissors->mask));
g_object_unref (G_OBJECT (iscissors->mask));
iscissors->mask = gimp_scan_convert_to_channel (sc, gdisp->gimage);
gimp_scan_convert_free (sc);
@ -1156,7 +1156,7 @@ gimp_iscissors_tool_reset (GimpIscissorsTool *iscissors)
/* free mask */
if (iscissors->mask)
{
gtk_object_unref (GTK_OBJECT (iscissors->mask));
g_object_unref (G_OBJECT (iscissors->mask));
iscissors->mask = NULL;
}

22
app/tools/gimppaintoptions-gui.c
View File

@ -582,7 +582,7 @@ paint_gradient_options_new (GtkType tool_type,
gtk_signal_connect (GTK_OBJECT (gradient->fade_unit_w), "unit_changed",
GTK_SIGNAL_FUNC (gimp_unit_menu_update),
&gradient->fade_unit);
gtk_object_set_data (GTK_OBJECT (gradient->fade_unit_w), "set_digits",
g_object_set_data (G_OBJECT (gradient->fade_unit_w), "set_digits",
spinbutton);
gtk_table_attach (GTK_TABLE (table), gradient->fade_unit_w, 2, 3, 0, 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
@ -591,9 +591,9 @@ paint_gradient_options_new (GtkType tool_type,
/* automatically set the sensitive state of the fadeout stuff */
gtk_widget_set_sensitive (spinbutton, gradient->use_fade_d);
gtk_widget_set_sensitive (gradient->fade_unit_w, gradient->use_fade_d);
gtk_object_set_data (GTK_OBJECT (gradient->use_fade_w),
g_object_set_data (G_OBJECT (gradient->use_fade_w),
"set_sensitive", spinbutton);
gtk_object_set_data (GTK_OBJECT (spinbutton),
g_object_set_data (G_OBJECT (spinbutton),
"set_sensitive", gradient->fade_unit_w);
}
@ -635,7 +635,7 @@ paint_gradient_options_new (GtkType tool_type,
gtk_signal_connect (GTK_OBJECT (gradient->gradient_unit_w), "unit_changed",
GTK_SIGNAL_FUNC (gimp_unit_menu_update),
&gradient->gradient_unit);
gtk_object_set_data (GTK_OBJECT (gradient->gradient_unit_w), "set_digits",
g_object_set_data (G_OBJECT (gradient->gradient_unit_w), "set_digits",
spinbutton);
gtk_table_attach (GTK_TABLE (table), gradient->gradient_unit_w, 2, 3, 1, 2,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
@ -684,18 +684,18 @@ paint_gradient_options_new (GtkType tool_type,
gtk_widget_set_sensitive (type_label, gradient->use_gradient_d);
gtk_widget_set_sensitive (paint_options->incremental_w,
! gradient->use_gradient_d);
gtk_object_set_data (GTK_OBJECT (gradient->use_gradient_w),
g_object_set_data (G_OBJECT (gradient->use_gradient_w),
"set_sensitive",
spinbutton);
gtk_object_set_data (GTK_OBJECT (spinbutton), "set_sensitive",
g_object_set_data (G_OBJECT (spinbutton), "set_sensitive",
gradient->gradient_unit_w);
gtk_object_set_data (GTK_OBJECT (gradient->gradient_unit_w),
g_object_set_data (G_OBJECT (gradient->gradient_unit_w),
"set_sensitive",
gradient->gradient_type_w);
gtk_object_set_data (GTK_OBJECT (gradient->gradient_type_w),
g_object_set_data (G_OBJECT (gradient->gradient_type_w),
"set_sensitive",
type_label);
gtk_object_set_data (GTK_OBJECT (gradient->use_gradient_w),
g_object_set_data (G_OBJECT (gradient->use_gradient_w),
"inverse_sensitive",
paint_options->incremental_w);
}
@ -721,7 +721,7 @@ paint_gradient_options_reset (PaintGradientOptions *gradient,
digits = ((gradient->fade_unit_d == GIMP_UNIT_PIXEL) ? 0 :
((gradient->fade_unit_d == GIMP_UNIT_PERCENT) ? 2 :
(MIN (6, MAX (3, gimp_unit_get_digits (gradient->fade_unit_d))))));
spinbutton = gtk_object_get_data (GTK_OBJECT (gradient->fade_unit_w),
spinbutton = g_object_get_data (G_OBJECT (gradient->fade_unit_w),
"set_digits");
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (spinbutton), digits);
}
@ -737,7 +737,7 @@ paint_gradient_options_reset (PaintGradientOptions *gradient,
digits = ((gradient->gradient_unit_d == GIMP_UNIT_PIXEL) ? 0 :
((gradient->gradient_unit_d == GIMP_UNIT_PERCENT) ? 2 :
(MIN (6, MAX (3, gimp_unit_get_digits (gradient->gradient_unit_d))))));
spinbutton = gtk_object_get_data (GTK_OBJECT (gradient->gradient_unit_w),
spinbutton = g_object_get_data (G_OBJECT (gradient->gradient_unit_w),
"set_digits");
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (spinbutton), digits);

20
app/tools/gimppainttool.c
View File

@ -863,8 +863,8 @@ gimp_paint_tool_paint (GimpPaintTool *tool,
GimpDrawable *drawable,
PaintState state)
{
gtk_signal_emit (GTK_OBJECT(tool), gimp_paint_tool_signals[PAINT],
drawable, state);
g_signal_emit (G_OBJECT(tool), gimp_paint_tool_signals[PAINT], 0,
drawable, state);
}
gboolean
@ -898,10 +898,10 @@ gimp_paint_tool_start (GimpPaintTool *paint_tool,
/* Each buffer is the same size as the maximum bounds of the active brush... */
if (brush && brush != gimp_context_get_brush (context))
{
gtk_signal_disconnect_by_func (GTK_OBJECT (brush),
GTK_SIGNAL_FUNC (gimp_paint_tool_invalidate_cache),
NULL);
gtk_object_unref (GTK_OBJECT (brush));
g_signal_handlers_disconnect_by_func (G_OBJECT (brush),
G_CALLBACK (gimp_paint_tool_invalidate_cache),
NULL);
g_object_unref (G_OBJECT (brush));
}
if (!(brush = gimp_context_get_brush (context)))
{
@ -909,10 +909,10 @@ gimp_paint_tool_start (GimpPaintTool *paint_tool,
return FALSE;
}
gtk_object_ref (GTK_OBJECT (brush));
gtk_signal_connect (GTK_OBJECT (brush), "invalidate_preview",
GTK_SIGNAL_FUNC (gimp_paint_tool_invalidate_cache),
NULL);
g_object_ref (G_OBJECT (brush));
g_signal_connect (G_OBJECT (brush), "invalidate_preview",
G_CALLBACK (gimp_paint_tool_invalidate_cache),
NULL);
paint_tool->spacing = (double) gimp_brush_get_spacing (brush) / 100.0;

8
app/tools/gimprectselecttool.c
View File

@ -160,7 +160,7 @@ rect_select (GimpImage *gimage,
feather_radius,
feather_radius,
op, 0, 0);
gtk_object_unref (GTK_OBJECT (new_mask));
g_object_unref (G_OBJECT (new_mask));
}
else if (op == SELECTION_INTERSECT)
{
@ -168,7 +168,7 @@ rect_select (GimpImage *gimage,
gimp_channel_combine_rect (new_mask, CHANNEL_OP_ADD, x, y, w, h);
gimp_channel_combine_mask (gimp_image_get_mask (gimage), new_mask,
op, 0, 0);
gtk_object_unref (GTK_OBJECT (new_mask));
g_object_unref (G_OBJECT (new_mask));
}
else
{
@ -643,6 +643,6 @@ gimp_rect_select_tool_rect_select (GimpRectSelectTool *rect_tool,
g_return_if_fail (rect_tool != NULL);
g_return_if_fail (GIMP_IS_RECT_SELECT_TOOL (rect_tool));
gtk_signal_emit (GTK_OBJECT (rect_tool), rect_select_signals[RECT_SELECT],
x, y, w, h);
g_signal_emit (G_OBJECT (rect_tool), rect_select_signals[RECT_SELECT], 0,
x, y, w, h);
}

4
app/tools/gimpregionselecttool.c
View File

@ -417,7 +417,7 @@ fuzzy_select (GimpImage *gimage,
gimp_channel_combine_mask (gimp_image_get_mask (gimage),
fuzzy_mask, op, off_x, off_y);
gtk_object_unref (GTK_OBJECT (fuzzy_mask));
g_object_unref (G_OBJECT (fuzzy_mask));
fuzzy_mask = NULL;
}
@ -644,7 +644,7 @@ fuzzy_select_calculate (GimpFuzzySelectTool *fuzzy_sel,
fuzzy_options->sample_merged);
if (fuzzy_mask)
gtk_object_unref (GTK_OBJECT (fuzzy_mask));
g_object_unref (G_OBJECT (fuzzy_mask));
fuzzy_mask = new;

14
app/tools/gimpselectionoptions.c
View File

@ -124,8 +124,8 @@ selection_options_init (SelectionOptions *options,
/* grey out label & scale if feather is off */
gtk_widget_set_sensitive (scale, options->feather_d);
gtk_widget_set_sensitive (label, options->feather_d);
gtk_object_set_data (GTK_OBJECT (options->feather_w), "set_sensitive", scale);
gtk_object_set_data (GTK_OBJECT (scale), "set_sensitive", label);
g_object_set_data (G_OBJECT (options->feather_w), "set_sensitive", scale);
g_object_set_data (G_OBJECT (scale), "set_sensitive", label);
gtk_widget_show (table);
@ -240,7 +240,7 @@ selection_options_init (SelectionOptions *options,
/* grey out the table if fixed size is off */
gtk_widget_set_sensitive (table, options->fixed_size_d);
gtk_object_set_data (GTK_OBJECT (options->fixed_size_w), "set_sensitive",
g_object_set_data (G_OBJECT (options->fixed_size_w), "set_sensitive",
table);
options->fixed_width_w =
@ -276,9 +276,9 @@ selection_options_init (SelectionOptions *options,
gtk_signal_connect (GTK_OBJECT (options->fixed_unit_w), "unit_changed",
GTK_SIGNAL_FUNC (gimp_unit_menu_update),
&options->fixed_unit);
gtk_object_set_data (GTK_OBJECT (options->fixed_unit_w), "set_digits",
g_object_set_data (G_OBJECT (options->fixed_unit_w), "set_digits",
width_spinbutton);
gtk_object_set_data (GTK_OBJECT (width_spinbutton), "set_digits",
g_object_set_data (G_OBJECT (width_spinbutton), "set_digits",
height_spinbutton);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Unit:"), 1.0, 0.5,
@ -349,12 +349,12 @@ selection_options_reset (GimpToolOptions *tool_options)
(MIN (6, MAX (3, gimp_unit_get_digits (options->fixed_unit_d))))));
spinbutton =
gtk_object_get_data (GTK_OBJECT (options->fixed_unit_w), "set_digits");
g_object_get_data (G_OBJECT (options->fixed_unit_w), "set_digits");
while (spinbutton)
{
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (spinbutton), digits);
spinbutton =
gtk_object_get_data (GTK_OBJECT (spinbutton), "set_digits");
g_object_get_data (G_OBJECT (spinbutton), "set_digits");
}
}

12
app/tools/gimpsourcetool.c
View File

@ -254,14 +254,18 @@ clone_set_src_drawable (GimpDrawable *drawable)
{
if (src_drawable_ == drawable)
return;
if (src_drawable_)
gtk_signal_disconnect_by_data (GTK_OBJECT (src_drawable_), &src_drawable_);
g_signal_handlers_disconnect_by_func (G_OBJECT (src_drawable_),
G_CALLBACK (clone_src_drawable_destroyed_cb),
&src_drawable_);
src_drawable_ = drawable;
if (drawable)
{
gtk_signal_connect (GTK_OBJECT (drawable), "destroy",
GTK_SIGNAL_FUNC (clone_src_drawable_destroyed_cb),
&src_drawable_);
g_signal_connect (G_OBJECT (drawable), "destroy",
G_CALLBACK (clone_src_drawable_destroyed_cb),
&src_drawable_);
}
}

6
app/tools/gimptexttool.c
View File

@ -335,10 +335,10 @@ text_tool_options_new (void)
gtk_widget_set_sensitive (options->antialias_w, ! options->use_dyntext_d);
gtk_widget_set_sensitive (spinbutton, ! options->use_dyntext_d);
gtk_widget_set_sensitive (label, ! options->use_dyntext_d);
gtk_object_set_data (GTK_OBJECT (options->use_dyntext_w), "inverse_sensitive",
g_object_set_data (G_OBJECT (options->use_dyntext_w), "inverse_sensitive",
spinbutton);
gtk_object_set_data (GTK_OBJECT (spinbutton), "inverse_sensitive", label);
gtk_object_set_data (GTK_OBJECT (label), "inverse_sensitive",
g_object_set_data (G_OBJECT (spinbutton), "inverse_sensitive", label);
g_object_set_data (G_OBJECT (label), "inverse_sensitive",
options->antialias_w);
return options;

36
app/tools/gimptool.c
View File

@ -269,8 +269,8 @@ gimp_tool_initialize (GimpTool *tool,
g_return_if_fail (tool);
g_return_if_fail (GIMP_IS_TOOL (tool));
gtk_signal_emit (GTK_OBJECT (tool), gimp_tool_signals[INITIALIZE],
gdisp);
g_signal_emit (G_OBJECT (tool), gimp_tool_signals[INITIALIZE], 0,
gdisp);
}
void
@ -281,8 +281,8 @@ gimp_tool_control (GimpTool *tool,
g_return_if_fail (tool);
g_return_if_fail (GIMP_IS_TOOL (tool));
gtk_signal_emit (GTK_OBJECT (tool), gimp_tool_signals[CONTROL],
action, gdisp);
g_signal_emit (G_OBJECT (tool), gimp_tool_signals[CONTROL], 0,
action, gdisp);
}
void
@ -293,8 +293,8 @@ gimp_tool_button_press (GimpTool *tool,
g_return_if_fail (tool);
g_return_if_fail (GIMP_IS_TOOL (tool));
gtk_signal_emit (GTK_OBJECT (tool), gimp_tool_signals[BUTTON_PRESS],
bevent, gdisp);
g_signal_emit (G_OBJECT (tool), gimp_tool_signals[BUTTON_PRESS], 0,
bevent, gdisp);
}
void
@ -305,8 +305,8 @@ gimp_tool_button_release (GimpTool *tool,
g_return_if_fail (tool);
g_return_if_fail (GIMP_IS_TOOL (tool));
gtk_signal_emit (GTK_OBJECT (tool), gimp_tool_signals[BUTTON_RELEASE],
bevent, gdisp);
g_signal_emit (G_OBJECT (tool), gimp_tool_signals[BUTTON_RELEASE], 0,
bevent, gdisp);
}
void
@ -317,8 +317,8 @@ gimp_tool_motion (GimpTool *tool,
g_return_if_fail (tool);
g_return_if_fail (GIMP_IS_TOOL (tool));
gtk_signal_emit (GTK_OBJECT (tool), gimp_tool_signals[MOTION],
mevent, gdisp);
g_signal_emit (G_OBJECT (tool), gimp_tool_signals[MOTION], 0,
mevent, gdisp);
}
void
@ -329,8 +329,8 @@ gimp_tool_arrow_key (GimpTool *tool,
g_return_if_fail (tool);
g_return_if_fail (GIMP_IS_TOOL (tool));
gtk_signal_emit (GTK_OBJECT (tool), gimp_tool_signals[ARROW_KEY],
kevent, gdisp);
g_signal_emit (G_OBJECT (tool), gimp_tool_signals[ARROW_KEY], 0,
kevent, gdisp);
}
void
@ -341,8 +341,8 @@ gimp_tool_modifier_key (GimpTool *tool,
g_return_if_fail (tool);
g_return_if_fail (GIMP_IS_TOOL (tool));
gtk_signal_emit (GTK_OBJECT (tool), gimp_tool_signals[MODIFIER_KEY],
kevent, gdisp);
g_signal_emit (G_OBJECT (tool), gimp_tool_signals[MODIFIER_KEY], 0,
kevent, gdisp);
}
void
@ -353,8 +353,8 @@ gimp_tool_cursor_update (GimpTool *tool,
g_return_if_fail (tool);
g_return_if_fail (GIMP_IS_TOOL (tool));
gtk_signal_emit (GTK_OBJECT (tool), gimp_tool_signals[CURSOR_UPDATE],
mevent, gdisp);
g_signal_emit (G_OBJECT (tool), gimp_tool_signals[CURSOR_UPDATE], 0,
mevent, gdisp);
}
void
@ -365,8 +365,8 @@ gimp_tool_oper_update (GimpTool *tool,
g_return_if_fail (tool);
g_return_if_fail (GIMP_IS_TOOL (tool));
gtk_signal_emit (GTK_OBJECT (tool), gimp_tool_signals[OPER_UPDATE],
mevent, gdisp);
g_signal_emit (G_OBJECT (tool), gimp_tool_signals[OPER_UPDATE], 0,
mevent, gdisp);
}

4
app/tools/gimptransformoptions.c
View File

@ -266,9 +266,9 @@ transform_options_init (TransformOptions *options,
gtk_widget_show (grid_density);
gtk_widget_set_sensitive (label, options->show_grid_d);
gtk_widget_set_sensitive (grid_density, options->show_grid_d);
gtk_object_set_data (GTK_OBJECT (options->show_grid_w), "set_sensitive",
g_object_set_data (G_OBJECT (options->show_grid_w), "set_sensitive",
grid_density);
gtk_object_set_data (GTK_OBJECT (grid_density), "set_sensitive", label);
g_object_set_data (G_OBJECT (grid_density), "set_sensitive", label);
gtk_widget_show (fbox);
gtk_widget_show (frame);

22
app/tools/paint_options.c
View File

@ -582,7 +582,7 @@ paint_gradient_options_new (GtkType tool_type,
gtk_signal_connect (GTK_OBJECT (gradient->fade_unit_w), "unit_changed",
GTK_SIGNAL_FUNC (gimp_unit_menu_update),
&gradient->fade_unit);
gtk_object_set_data (GTK_OBJECT (gradient->fade_unit_w), "set_digits",
g_object_set_data (G_OBJECT (gradient->fade_unit_w), "set_digits",
spinbutton);
gtk_table_attach (GTK_TABLE (table), gradient->fade_unit_w, 2, 3, 0, 1,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
@ -591,9 +591,9 @@ paint_gradient_options_new (GtkType tool_type,
/* automatically set the sensitive state of the fadeout stuff */
gtk_widget_set_sensitive (spinbutton, gradient->use_fade_d);
gtk_widget_set_sensitive (gradient->fade_unit_w, gradient->use_fade_d);
gtk_object_set_data (GTK_OBJECT (gradient->use_fade_w),
g_object_set_data (G_OBJECT (gradient->use_fade_w),
"set_sensitive", spinbutton);
gtk_object_set_data (GTK_OBJECT (spinbutton),
g_object_set_data (G_OBJECT (spinbutton),
"set_sensitive", gradient->fade_unit_w);
}
@ -635,7 +635,7 @@ paint_gradient_options_new (GtkType tool_type,
gtk_signal_connect (GTK_OBJECT (gradient->gradient_unit_w), "unit_changed",
GTK_SIGNAL_FUNC (gimp_unit_menu_update),
&gradient->gradient_unit);
gtk_object_set_data (GTK_OBJECT (gradient->gradient_unit_w), "set_digits",
g_object_set_data (G_OBJECT (gradient->gradient_unit_w), "set_digits",
spinbutton);
gtk_table_attach (GTK_TABLE (table), gradient->gradient_unit_w, 2, 3, 1, 2,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
@ -684,18 +684,18 @@ paint_gradient_options_new (GtkType tool_type,
gtk_widget_set_sensitive (type_label, gradient->use_gradient_d);
gtk_widget_set_sensitive (paint_options->incremental_w,
! gradient->use_gradient_d);
gtk_object_set_data (GTK_OBJECT (gradient->use_gradient_w),
g_object_set_data (G_OBJECT (gradient->use_gradient_w),
"set_sensitive",
spinbutton);
gtk_object_set_data (GTK_OBJECT (spinbutton), "set_sensitive",
g_object_set_data (G_OBJECT (spinbutton), "set_sensitive",
gradient->gradient_unit_w);
gtk_object_set_data (GTK_OBJECT (gradient->gradient_unit_w),
g_object_set_data (G_OBJECT (gradient->gradient_unit_w),
"set_sensitive",
gradient->gradient_type_w);
gtk_object_set_data (GTK_OBJECT (gradient->gradient_type_w),
g_object_set_data (G_OBJECT (gradient->gradient_type_w),
"set_sensitive",
type_label);
gtk_object_set_data (GTK_OBJECT (gradient->use_gradient_w),
g_object_set_data (G_OBJECT (gradient->use_gradient_w),
"inverse_sensitive",
paint_options->incremental_w);
}
@ -721,7 +721,7 @@ paint_gradient_options_reset (PaintGradientOptions *gradient,
digits = ((gradient->fade_unit_d == GIMP_UNIT_PIXEL) ? 0 :
((gradient->fade_unit_d == GIMP_UNIT_PERCENT) ? 2 :
(MIN (6, MAX (3, gimp_unit_get_digits (gradient->fade_unit_d))))));
spinbutton = gtk_object_get_data (GTK_OBJECT (gradient->fade_unit_w),
spinbutton = g_object_get_data (G_OBJECT (gradient->fade_unit_w),
"set_digits");
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (spinbutton), digits);
}
@ -737,7 +737,7 @@ paint_gradient_options_reset (PaintGradientOptions *gradient,
digits = ((gradient->gradient_unit_d == GIMP_UNIT_PIXEL) ? 0 :
((gradient->gradient_unit_d == GIMP_UNIT_PERCENT) ? 2 :
(MIN (6, MAX (3, gimp_unit_get_digits (gradient->gradient_unit_d))))));
spinbutton = gtk_object_get_data (GTK_OBJECT (gradient->gradient_unit_w),
spinbutton = g_object_get_data (G_OBJECT (gradient->gradient_unit_w),
"set_digits");
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (spinbutton), digits);

14
app/tools/selection_options.c
View File

@ -124,8 +124,8 @@ selection_options_init (SelectionOptions *options,
/* grey out label & scale if feather is off */
gtk_widget_set_sensitive (scale, options->feather_d);
gtk_widget_set_sensitive (label, options->feather_d);
gtk_object_set_data (GTK_OBJECT (options->feather_w), "set_sensitive", scale);
gtk_object_set_data (GTK_OBJECT (scale), "set_sensitive", label);
g_object_set_data (G_OBJECT (options->feather_w), "set_sensitive", scale);
g_object_set_data (G_OBJECT (scale), "set_sensitive", label);
gtk_widget_show (table);
@ -240,7 +240,7 @@ selection_options_init (SelectionOptions *options,
/* grey out the table if fixed size is off */
gtk_widget_set_sensitive (table, options->fixed_size_d);
gtk_object_set_data (GTK_OBJECT (options->fixed_size_w), "set_sensitive",
g_object_set_data (G_OBJECT (options->fixed_size_w), "set_sensitive",
table);
options->fixed_width_w =
@ -276,9 +276,9 @@ selection_options_init (SelectionOptions *options,
gtk_signal_connect (GTK_OBJECT (options->fixed_unit_w), "unit_changed",
GTK_SIGNAL_FUNC (gimp_unit_menu_update),
&options->fixed_unit);
gtk_object_set_data (GTK_OBJECT (options->fixed_unit_w), "set_digits",
g_object_set_data (G_OBJECT (options->fixed_unit_w), "set_digits",
width_spinbutton);
gtk_object_set_data (GTK_OBJECT (width_spinbutton), "set_digits",
g_object_set_data (G_OBJECT (width_spinbutton), "set_digits",
height_spinbutton);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
_("Unit:"), 1.0, 0.5,
@ -349,12 +349,12 @@ selection_options_reset (GimpToolOptions *tool_options)
(MIN (6, MAX (3, gimp_unit_get_digits (options->fixed_unit_d))))));
spinbutton =
gtk_object_get_data (GTK_OBJECT (options->fixed_unit_w), "set_digits");
g_object_get_data (G_OBJECT (options->fixed_unit_w), "set_digits");
while (spinbutton)
{
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (spinbutton), digits);
spinbutton =
gtk_object_get_data (GTK_OBJECT (spinbutton), "set_digits");
g_object_get_data (G_OBJECT (spinbutton), "set_digits");
}
}

12
app/tools/tool_manager.c
View File

@ -154,7 +154,7 @@ tool_manager_exit (Gimp *gimp)
tool_manager = tool_manager_get (gimp);
gtk_object_unref (GTK_OBJECT (tool_manager->global_tool_context));
g_object_unref (G_OBJECT (tool_manager->global_tool_context));
gimp_container_remove_handler (gimp->images,
tool_manager->image_dirty_handler_id);
@ -233,7 +233,7 @@ tool_manager_select_tool (Gimp *gimp,
tool_manager = tool_manager_get (gimp);
if (tool_manager->active_tool)
gtk_object_unref (GTK_OBJECT (tool_manager->active_tool));
g_object_unref (G_OBJECT (tool_manager->active_tool));
tool_manager->active_tool = tool;
}
@ -251,7 +251,7 @@ tool_manager_push_tool (Gimp *gimp,
if (tool_manager->active_tool)
{
gtk_object_ref (GTK_OBJECT (tool_manager->active_tool));
g_object_ref (G_OBJECT (tool_manager->active_tool));
tool_manager->tool_stack = g_slist_prepend (tool_manager->tool_stack,
tool_manager->active_tool);
@ -376,7 +376,7 @@ tool_manager_control_active (Gimp *gimp,
break;
case DESTROY:
gtk_object_unref (GTK_OBJECT (tool_manager->active_tool));
g_object_unref (G_OBJECT (tool_manager->active_tool));
tool_manager->active_tool = NULL;
break;
@ -589,14 +589,14 @@ tool_manager_help_func (const gchar *help_data)
static GimpToolManager *
tool_manager_get (Gimp *gimp)
{
return gtk_object_get_data (GTK_OBJECT (gimp), TOOL_MANAGER_DATA_KEY);
return g_object_get_data (G_OBJECT (gimp), TOOL_MANAGER_DATA_KEY);
}
static void
tool_manager_set (Gimp *gimp,
GimpToolManager *tool_manager)
{
gtk_object_set_data (GTK_OBJECT (gimp), TOOL_MANAGER_DATA_KEY,
g_object_set_data (G_OBJECT (gimp), TOOL_MANAGER_DATA_KEY,
tool_manager);
}

4
app/tools/transform_options.c
View File

@ -266,9 +266,9 @@ transform_options_init (TransformOptions *options,
gtk_widget_show (grid_density);
gtk_widget_set_sensitive (label, options->show_grid_d);
gtk_widget_set_sensitive (grid_density, options->show_grid_d);
gtk_object_set_data (GTK_OBJECT (options->show_grid_w), "set_sensitive",
g_object_set_data (G_OBJECT (options->show_grid_w), "set_sensitive",
grid_density);
gtk_object_set_data (GTK_OBJECT (grid_density), "set_sensitive", label);
g_object_set_data (G_OBJECT (grid_density), "set_sensitive", label);
gtk_widget_show (fbox);
gtk_widget_show (frame);

40
app/user_install.c
View File

@ -298,8 +298,8 @@ user_install_notebook_set_page (GtkNotebook *notebook,
page = gtk_notebook_get_nth_page (notebook, index);
title = gtk_object_get_data (GTK_OBJECT (page), "title");
footer = gtk_object_get_data (GTK_OBJECT (page), "footer");
title = g_object_get_data (G_OBJECT (page), "title");
footer = g_object_get_data (G_OBJECT (page), "footer");
gtk_label_set_text (GTK_LABEL (title_label), title);
gtk_label_set_text (GTK_LABEL (footer_label), footer);
@ -466,8 +466,8 @@ user_install_notebook_append_page (GtkNotebook *notebook,
GtkWidget *page;
page = gtk_vbox_new (FALSE, 6);
gtk_object_set_data (GTK_OBJECT (page), "title", title);
gtk_object_set_data (GTK_OBJECT (page), "footer", footer);
g_object_set_data (G_OBJECT (page), "title", title);
g_object_set_data (G_OBJECT (page), "footer", footer);
gtk_notebook_append_page (notebook, page, NULL);
gtk_widget_show (page);
@ -763,9 +763,9 @@ user_install_dialog_create (Gimp *gimp)
NULL, NULL, NULL, NULL,
FALSE, TRUE);
gtk_signal_connect (GTK_OBJECT (ctree), "select_row",
GTK_SIGNAL_FUNC (user_install_ctree_select_row),
notebook2);
g_signal_connect (G_OBJECT (ctree), "select_row",
G_CALLBACK (user_install_ctree_select_row),
notebook2);
file_pixmap = gdk_pixmap_create_from_xpm_d (dialog->window,
&file_mask,
@ -1058,8 +1058,8 @@ user_install_run (void)
if (executable)
{
gtk_object_set_data (GTK_OBJECT (log_page), "footer",
_("Click \"Continue\" to complete GIMP installation."));
g_object_set_data (G_OBJECT (log_page), "footer",
_("Click \"Continue\" to complete GIMP installation."));
}
else
{
@ -1211,7 +1211,7 @@ user_install_resolution (void)
chain = GIMP_COORDINATES_CHAINBUTTON (resolution_entry);
PAGE_STYLE (GTK_WIDGET (chain->line1));
PAGE_STYLE (GTK_WIDGET (chain->line2));
gtk_object_set_data (GTK_OBJECT (resolution_entry), "chain_button", chain);
g_object_set_data (G_OBJECT (resolution_entry), "chain_button", chain);
for (list = GTK_TABLE (resolution_entry)->children;
list;
@ -1241,18 +1241,18 @@ user_install_resolution (void)
button = gtk_button_new_with_label (_("Calibrate"));
gtk_misc_set_padding (GTK_MISC (GTK_BIN (button)->child), 4, 0);
gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_signal_connect (GTK_OBJECT (button), "clicked",
GTK_SIGNAL_FUNC (user_install_resolution_calibrate),
NULL);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (user_install_resolution_calibrate),
NULL);
gtk_widget_show (button);
gtk_object_set_data (GTK_OBJECT (xserver_toggle), "inverse_sensitive",
resolution_entry);
gtk_object_set_data (GTK_OBJECT (resolution_entry), "inverse_sensitive",
button);
gtk_signal_connect (GTK_OBJECT (xserver_toggle), "toggled",
GTK_SIGNAL_FUNC (gimp_toggle_button_sensitive_update),
NULL);
g_object_set_data (G_OBJECT (xserver_toggle), "inverse_sensitive",
resolution_entry);
g_object_set_data (G_OBJECT (resolution_entry), "inverse_sensitive",
button);
g_signal_connect (G_OBJECT (xserver_toggle), "toggled",
G_CALLBACK (gimp_toggle_button_sensitive_update),
NULL);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (xserver_toggle),
gimprc.using_xserver_resolution);
}

2
app/widgets/gimpdnd.c
View File

@ -396,7 +396,7 @@ gimp_dnd_data_drag_begin (GtkWidget *widget,
return;
get_data_func = (GCallback) g_object_get_data (G_OBJECT (widget),
"gimp_dnd_get_data_func");
"gimp_dnd_get_data_func");
get_data_data = (gpointer) g_object_get_data (G_OBJECT (widget),
"gimp_dnd_get_data_data");

6
tools/pdbgen/pdb/color.pdb
View File

@ -606,9 +606,9 @@ HELP
htd.histogram = histogram_widget_new (HISTOGRAM_WIDTH,
HISTOGRAM_HEIGHT);
gtk_signal_connect (GTK_OBJECT (htd.histogram), "range_changed",
GTK_SIGNAL_FUNC (histogram_tool_histogram_range),
(gpointer) &htd);
g_signal_connect (G_OBJECT (htd.histogram), "range_changed",
G_CALLBACK (histogram_tool_histogram_range),
(gpointer) &htd);
/* The information collection should occur only within selection bounds */
no_mask = (gimp_drawable_mask_bounds (drawable, &x1, &y1, &x2, &y2) == FALSE);

2
tools/pdbgen/pdb/selection.pdb
View File

@ -372,7 +372,7 @@ HELP
operation,
0, 0); /* off x/y */
gimage_mask_load (gimage, new_channel);
gtk_object_unref (GTK_OBJECT (new_channel));
g_object_unref (G_OBJECT (new_channel));
}
else
success = FALSE;