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

cleanup, removed unecessary G_OBJECT() casts. Should do the same for 

2003-01-05  Manish Singh  <yosh@gimp.org>

        * many files in app, modules and libgimp*: cleanup, removed unecessary
        G_OBJECT() casts. Should do the same for plug-ins, when more of them
        get undeprecated.
This commit is contained in:
Manish Singh 2003-01-05 22:07:10 +00:00 committed by Manish Singh
parent 08caef0490
commit 1a44f2126c
288 changed files with 2010 additions and 2060 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2003-01-05 Manish Singh <yosh@gimp.org>
* many files in app, modules and libgimp*: cleanup, removed unecessary
G_OBJECT() casts. Should do the same for plug-ins, when more of them
get undeprecated.
2003-01-05 Manish Singh <yosh@gimp.org>
* plug-ins/script-fu/interp_regex.c: same as below for here.

8
app/actions/channels-commands.c
View File

@ -369,7 +369,7 @@ channels_new_channel_query (GimpImage *gimage,
TRUE, 0.0, 0.0,
NULL, NULL);
g_signal_connect (G_OBJECT (opacity_scale_data), "value_changed",
g_signal_connect (opacity_scale_data, "value_changed",
G_CALLBACK (channels_opacity_update),
options->color_panel);
@ -378,7 +378,7 @@ channels_new_channel_query (GimpImage *gimage,
TRUE, TRUE, 0);
gtk_widget_show (options->color_panel);
g_signal_connect (G_OBJECT (options->color_panel), "color_changed",
g_signal_connect (options->color_panel, "color_changed",
G_CALLBACK (channels_color_changed),
opacity_scale_data);
@ -518,7 +518,7 @@ channels_edit_channel_query (GimpChannel *channel)
TRUE, 0.0, 0.0,
NULL, NULL);
g_signal_connect (G_OBJECT (opacity_scale_data), "value_changed",
g_signal_connect (opacity_scale_data, "value_changed",
G_CALLBACK (channels_opacity_update),
options->color_panel);
@ -527,7 +527,7 @@ channels_edit_channel_query (GimpChannel *channel)
TRUE, TRUE, 0);
gtk_widget_show (options->color_panel);
g_signal_connect (G_OBJECT (options->color_panel), "color_changed",
g_signal_connect (options->color_panel, "color_changed",
G_CALLBACK (channels_color_changed),
opacity_scale_data);

4
app/actions/gradient-editor-commands.c
View File

@ -600,7 +600,7 @@ gradient_editor_replicate_cmd_callback (GtkWidget *widget,
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, TRUE, 4);
gtk_widget_show (scale);
g_signal_connect (G_OBJECT (scale_data), "value_changed",
g_signal_connect (scale_data, "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&editor->replicate_times);
@ -717,7 +717,7 @@ gradient_editor_split_uniformly_cmd_callback (GtkWidget *widget,
gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 4);
gtk_widget_show (scale);
g_signal_connect (G_OBJECT (scale_data), "value_changed",
g_signal_connect (scale_data, "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&editor->split_parts);

12
app/actions/gradients-commands.c
View File

@ -120,23 +120,23 @@ gradients_save_as_pov_query (GimpContainerEditor *editor)
gtk_container_set_border_width (GTK_CONTAINER (filesel), 2);
gtk_container_set_border_width (GTK_CONTAINER (filesel->button_area), 2);
g_signal_connect (G_OBJECT (filesel->ok_button), "clicked",
g_signal_connect (filesel->ok_button, "clicked",
G_CALLBACK (gradients_save_as_pov_ok_callback),
gradient);
g_signal_connect_swapped (G_OBJECT (filesel->cancel_button), "clicked",
g_signal_connect_swapped (filesel->cancel_button, "clicked",
G_CALLBACK (gtk_widget_destroy),
filesel);
g_signal_connect_swapped (G_OBJECT (filesel), "delete_event",
g_signal_connect_swapped (filesel, "delete_event",
G_CALLBACK (gtk_widget_destroy),
filesel);
g_object_ref (G_OBJECT (gradient));
g_object_ref (gradient);
g_signal_connect_object (G_OBJECT (filesel), "destroy",
g_signal_connect_object (filesel, "destroy",
G_CALLBACK (g_object_unref),
G_OBJECT (gradient),
gradient,
G_CONNECT_SWAPPED);
/* Connect the "F1" help key */

10
app/actions/image-commands.c
View File

@ -150,9 +150,9 @@ image_resize_cmd_callback (GtkWidget *widget,
G_CALLBACK (image_resize_callback),
image_resize);
g_signal_connect_object (G_OBJECT (gdisp), "disconnect",
g_signal_connect_object (gdisp, "disconnect",
G_CALLBACK (gtk_widget_destroy),
G_OBJECT (image_resize->resize->resize_shell),
image_resize->resize->resize_shell,
G_CONNECT_SWAPPED);
g_object_weak_ref (G_OBJECT (image_resize->resize->resize_shell),
@ -190,9 +190,9 @@ image_scale_cmd_callback (GtkWidget *widget,
G_CALLBACK (image_scale_callback),
image_scale);
g_signal_connect_object (G_OBJECT (gdisp), "disconnect",
g_signal_connect_object (gdisp, "disconnect",
G_CALLBACK (gtk_widget_destroy),
G_OBJECT (image_scale->resize->resize_shell),
image_scale->resize->resize_shell,
G_CONNECT_SWAPPED);
g_object_weak_ref (G_OBJECT (image_scale->resize->resize_shell),
@ -231,7 +231,7 @@ image_duplicate_cmd_callback (GtkWidget *widget,
gimp_create_display (new_gimage->gimp, new_gimage, 0x0101);
g_object_unref (G_OBJECT (new_gimage));
g_object_unref (new_gimage);
}
void

4
app/actions/layers-commands.c
View File

@ -830,7 +830,7 @@ layers_edit_layer_query (GimpLayer *layer)
_("Layer _Name"), 1.0, 0.5,
options->name_entry, 1, FALSE);
g_signal_connect (G_OBJECT (options->name_entry), "activate",
g_signal_connect (options->name_entry, "activate",
G_CALLBACK (edit_layer_query_ok_callback),
options);
@ -866,7 +866,7 @@ add_mask_query_ok_callback (GtkWidget *widget,
{
mask = gimp_layer_create_mask (layer, options->add_mask_type);
gimp_layer_add_mask (layer, mask, TRUE);
g_object_unref (G_OBJECT (mask));
g_object_unref (mask);
gimp_image_flush (gimage);
}

4
app/actions/qmask-commands.c
View File

@ -223,7 +223,7 @@ qmask_channel_query (GimpDisplayShell *shell)
_("Mask Opacity:"), 1.0, 1.0,
opacity_scale, 1, FALSE);
g_signal_connect (G_OBJECT (opacity_scale_data), "value_changed",
g_signal_connect (opacity_scale_data, "value_changed",
G_CALLBACK (qmask_query_scale_update),
options->color_panel);
@ -232,7 +232,7 @@ qmask_channel_query (GimpDisplayShell *shell)
TRUE, TRUE, 0);
gtk_widget_show (options->color_panel);
g_signal_connect (G_OBJECT (options->color_panel), "color_changed",
g_signal_connect (options->color_panel, "color_changed",
G_CALLBACK (qmask_query_color_changed),
opacity_scale_data);

4
app/actions/quick-mask-commands.c
View File

@ -223,7 +223,7 @@ qmask_channel_query (GimpDisplayShell *shell)
_("Mask Opacity:"), 1.0, 1.0,
opacity_scale, 1, FALSE);
g_signal_connect (G_OBJECT (opacity_scale_data), "value_changed",
g_signal_connect (opacity_scale_data, "value_changed",
G_CALLBACK (qmask_query_scale_update),
options->color_panel);
@ -232,7 +232,7 @@ qmask_channel_query (GimpDisplayShell *shell)
TRUE, TRUE, 0);
gtk_widget_show (options->color_panel);
g_signal_connect (G_OBJECT (options->color_panel), "color_changed",
g_signal_connect (options->color_panel, "color_changed",
G_CALLBACK (qmask_query_color_changed),
opacity_scale_data);

2
app/actions/vectors-commands.c
View File

@ -343,7 +343,7 @@ vectors_stroke_vectors (GimpVectors *vectors)
tool_manager_control_active (gimage->gimp, RESUME, gdisp);
g_object_unref (G_OBJECT (core));
g_object_unref (core);
gimp_image_flush (gimage);
}

8
app/app_procs.c
View File

@ -132,7 +132,7 @@ app_init (gint gimp_argc,
#if 0
/* solely for debugging */
g_signal_connect (G_OBJECT (gimprc), "notify",
g_signal_connect (gimprc, "notify",
G_CALLBACK (gimprc_notify_callback),
NULL);
#endif
@ -189,10 +189,10 @@ app_init (gint gimp_argc,
/* connect our "exit" callbacks after gui_restore() so they are
* invoked after the GUI's "exit" callbacks
*/
g_signal_connect (G_OBJECT (the_gimp), "exit",
g_signal_connect (the_gimp, "exit",
G_CALLBACK (app_exit_callback),
NULL);
g_signal_connect_after (G_OBJECT (the_gimp), "exit",
g_signal_connect_after (the_gimp, "exit",
G_CALLBACK (app_exit_finish_callback),
NULL);
@ -270,7 +270,7 @@ static gboolean
app_exit_finish_callback (Gimp *gimp,
gboolean kill_it)
{
g_object_unref (G_OBJECT (gimp));
g_object_unref (gimp);
the_gimp = NULL;
base_exit ();

6
app/base/base.c
View File

@ -80,7 +80,7 @@ base_init (GimpBaseConfig *config,
tile_cache_init (config->tile_cache_size);
g_signal_connect (G_OBJECT (config), "notify::tile-cache-size",
g_signal_connect (config, "notify::tile-cache-size",
G_CALLBACK (base_tile_cache_size_notify),
NULL);
@ -88,7 +88,7 @@ base_init (GimpBaseConfig *config,
/* Add the swap file */
if (! config->swap_path)
g_object_set (G_OBJECT (config), "swap_path", "${gimp_dir}", NULL);
g_object_set (config, "swap_path", "${gimp_dir}", NULL);
swapdir = gimp_config_path_expand (config->swap_path, TRUE, NULL);
swapfile = g_strdup_printf ("gimpswap.%lu", (unsigned long) getpid ());
@ -113,7 +113,7 @@ base_exit (void)
tile_swap_exit ();
tile_cache_exit ();
g_signal_handlers_disconnect_by_func (G_OBJECT (base_config),
g_signal_handlers_disconnect_by_func (base_config,
base_tile_cache_size_notify,
NULL);

4
app/config/gimprc.c
View File

@ -434,11 +434,11 @@ gimp_rc_set_autosave (GimpRc *rc,
return;
if (autosave)
g_signal_connect (G_OBJECT (rc), "notify",
g_signal_connect (rc, "notify",
G_CALLBACK (gimp_rc_notify),
NULL);
else
g_signal_handlers_disconnect_by_func (G_OBJECT (rc),
g_signal_handlers_disconnect_by_func (rc,
gimp_rc_notify, NULL);
rc->autosave = autosave;

12
app/config/test-config.c
View File

@ -93,7 +93,7 @@ main (int argc,
}
g_print (" done.\n\n");
g_signal_connect (G_OBJECT (gimprc), "notify",
g_signal_connect (gimprc, "notify",
G_CALLBACK (notify_callback),
NULL);
@ -109,18 +109,18 @@ main (int argc,
g_print ("\n done.\n");
g_print ("\n Changing a property ...");
g_object_set (G_OBJECT (gimprc), "use-help", FALSE, NULL);
g_object_set (gimprc, "use-help", FALSE, NULL);
g_print ("\n Testing gimp_config_duplicate() ...");
gimprc2 = GIMP_RC (gimp_config_duplicate (G_OBJECT (gimprc)));
g_print (" done.\n");
g_signal_connect (G_OBJECT (gimprc2), "notify",
g_signal_connect (gimprc2, "notify",
G_CALLBACK (notify_callback),
NULL);
g_print ("\n Changing a property in the duplicate ...");
g_object_set (G_OBJECT (gimprc2), "show-tips", FALSE, NULL);
g_object_set (gimprc2, "show-tips", FALSE, NULL);
g_print ("\n Querying for \"default-comment\" ... ");
@ -151,7 +151,7 @@ main (int argc,
g_free (result);
g_object_unref (G_OBJECT (gimprc2));
g_object_unref (gimprc2);
g_print ("\n Deserializing from gimpconfig.c (should fail) ...");
if (! gimp_config_deserialize (G_OBJECT (gimprc),
@ -166,7 +166,7 @@ main (int argc,
return EXIT_FAILURE;
}
g_object_unref (G_OBJECT (gimprc));
g_object_unref (gimprc);
g_print ("\nFinished test of GimpConfig.\n\n");

6
app/core/gimp-edit.c
View File

@ -92,7 +92,7 @@ gimp_edit_cut (GimpImage *gimage,
{
/* Free the old global edit buffer */
if (gimage->gimp->global_buffer)
g_object_unref (G_OBJECT (gimage->gimp->global_buffer));
g_object_unref (gimage->gimp->global_buffer);
/* Set the global edit buffer */
gimage->gimp->global_buffer = gimp_buffer_new (cropped_cut,
@ -149,7 +149,7 @@ gimp_edit_copy (GimpImage *gimage,
{
/* Free the old global edit buffer */
if (gimage->gimp->global_buffer)
g_object_unref (G_OBJECT (gimage->gimp->global_buffer));
g_object_unref (gimage->gimp->global_buffer);
/* Set the global edit buffer */
gimage->gimp->global_buffer = gimp_buffer_new (cropped_copy,
@ -275,7 +275,7 @@ gimp_edit_paste_as_new (Gimp *gimp,
gimp_create_display (gimp, gimage, 0x0101);
g_object_unref (G_OBJECT (gimage));
g_object_unref (gimage);
return gimage;
}

6
app/core/gimp-gradients.c
View File

@ -90,10 +90,10 @@ gimp_gradients_init (Gimp *gimp)
gradient->segments->left_color.b,
0.0);
g_signal_connect (G_OBJECT (gimp->user_context), "foreground_changed",
g_signal_connect (gimp->user_context, "foreground_changed",
G_CALLBACK (gimp_gradients_foreground_changed),
gimp);
g_signal_connect (G_OBJECT (gimp->user_context), "background_changed",
g_signal_connect (gimp->user_context, "background_changed",
G_CALLBACK (gimp_gradients_background_changed),
gimp);
}
@ -123,7 +123,7 @@ gimp_gradients_add_gradient (Gimp *gimp,
gimp_container_add (gimp->gradient_factory->container,
GIMP_OBJECT (gradient));
g_object_unref (G_OBJECT (gradient));
g_object_unref (gradient);
g_object_set_data (G_OBJECT (gimp), id, gradient);

2
app/core/gimp-modules.c
View File

@ -62,7 +62,7 @@ gimp_modules_exit (Gimp *gimp)
if (gimp->module_db)
{
g_object_unref (G_OBJECT (gimp->module_db));
g_object_unref (gimp->module_db);
gimp->module_db = NULL;
}
}

38
app/core/gimp.c
View File

@ -290,13 +290,13 @@ gimp_finalize (GObject *object)
if (gimp->standard_context)
{
g_object_unref (G_OBJECT (gimp->standard_context));
g_object_unref (gimp->standard_context);
gimp->standard_context = NULL;
}
if (gimp->documents)
{
g_object_unref (G_OBJECT (gimp->documents));
g_object_unref (gimp->documents);
gimp->documents = NULL;
}
@ -304,7 +304,7 @@ gimp_finalize (GObject *object)
if (gimp->tool_info_list)
{
g_object_unref (G_OBJECT (gimp->tool_info_list));
g_object_unref (gimp->tool_info_list);
gimp->tool_info_list = NULL;
}
@ -326,37 +326,37 @@ gimp_finalize (GObject *object)
if (gimp->brush_factory)
{
g_object_unref (G_OBJECT (gimp->brush_factory));
g_object_unref (gimp->brush_factory);
gimp->brush_factory = NULL;
}
if (gimp->pattern_factory)
{
g_object_unref (G_OBJECT (gimp->pattern_factory));
g_object_unref (gimp->pattern_factory);
gimp->pattern_factory = NULL;
}
if (gimp->gradient_factory)
{
g_object_unref (G_OBJECT (gimp->gradient_factory));
g_object_unref (gimp->gradient_factory);
gimp->gradient_factory = NULL;
}
if (gimp->palette_factory)
{
g_object_unref (G_OBJECT (gimp->palette_factory));
g_object_unref (gimp->palette_factory);
gimp->palette_factory = NULL;
}
if (gimp->named_buffers)
{
g_object_unref (G_OBJECT (gimp->named_buffers));
g_object_unref (gimp->named_buffers);
gimp->named_buffers = NULL;
}
if (gimp->global_buffer)
{
g_object_unref (G_OBJECT (gimp->global_buffer));
g_object_unref (gimp->global_buffer);
gimp->global_buffer = NULL;
}
@ -380,7 +380,7 @@ gimp_finalize (GObject *object)
if (gimp->images)
{
g_object_unref (G_OBJECT (gimp->images));
g_object_unref (gimp->images);
gimp->images = NULL;
}
@ -696,13 +696,13 @@ gimp_initialize (Gimp *gimp,
*/
context = gimp_context_new (gimp, "Default", NULL);
gimp_set_default_context (gimp, context);
g_object_unref (G_OBJECT (context));
g_object_unref (context);
/* the initial user_context is a straight copy of the default context
*/
context = gimp_context_new (gimp, "User", context);
gimp_set_user_context (gimp, context);
g_object_unref (G_OBJECT (context));
g_object_unref (context);
gimp_set_current_context (gimp, context);
@ -765,7 +765,7 @@ gimp_exit (Gimp *gimp,
g_return_if_fail (GIMP_IS_GIMP (gimp));
g_signal_emit (G_OBJECT (gimp), gimp_signals[EXIT], 0,
g_signal_emit (gimp, gimp_signals[EXIT], 0,
kill_it ? TRUE : FALSE,
&handled);
}
@ -965,14 +965,14 @@ gimp_set_default_context (Gimp *gimp,
if (gimp->default_context)
{
g_object_unref (G_OBJECT (gimp->default_context));
g_object_unref (gimp->default_context);
}
gimp->default_context = context;
if (gimp->default_context)
{
g_object_ref (G_OBJECT (gimp->default_context));
g_object_ref (gimp->default_context);
}
}
@ -993,14 +993,14 @@ gimp_set_user_context (Gimp *gimp,
if (gimp->user_context)
{
g_object_unref (G_OBJECT (gimp->user_context));
g_object_unref (gimp->user_context);
}
gimp->user_context = context;
if (gimp->user_context)
{
g_object_ref (G_OBJECT (gimp->user_context));
g_object_ref (gimp->user_context);
}
}
@ -1021,14 +1021,14 @@ gimp_set_current_context (Gimp *gimp,
if (gimp->current_context)
{
g_object_unref (G_OBJECT (gimp->current_context));
g_object_unref (gimp->current_context);
}
gimp->current_context = context;
if (gimp->current_context)
{
g_object_ref (G_OBJECT (gimp->current_context));
g_object_ref (gimp->current_context);
}
}

8
app/core/gimpbrush-load.c
View File

@ -351,7 +351,7 @@ gimp_brush_get_standard (void)
gimp_object_set_name (GIMP_OBJECT (standard_brush), "Standard");
/* set ref_count to 2 --> never swap the standard brush */
g_object_ref (G_OBJECT (standard_brush));
g_object_ref (standard_brush);
}
return GIMP_DATA (standard_brush);
@ -489,7 +489,7 @@ gimp_brush_spacing_changed (GimpBrush *brush)
{
g_return_if_fail (GIMP_IS_BRUSH (brush));
g_signal_emit (G_OBJECT (brush), brush_signals[SPACING_CHANGED], 0);
g_signal_emit (brush, brush_signals[SPACING_CHANGED], 0);
}
GimpBrush *
@ -587,7 +587,7 @@ gimp_brush_load_brush (gint fd,
"Brush file '%s' appears truncated."),
filename);
g_free (name);
g_object_unref (G_OBJECT (brush));
g_object_unref (brush);
return NULL;
}
break;
@ -608,7 +608,7 @@ gimp_brush_load_brush (gint fd,
"Brush file '%s' appears truncated."),
filename);
g_free (name);
g_object_unref (G_OBJECT (brush));
g_object_unref (brush);
return NULL;
}
}

8
app/core/gimpbrush.c
View File

@ -351,7 +351,7 @@ gimp_brush_get_standard (void)
gimp_object_set_name (GIMP_OBJECT (standard_brush), "Standard");
/* set ref_count to 2 --> never swap the standard brush */
g_object_ref (G_OBJECT (standard_brush));
g_object_ref (standard_brush);
}
return GIMP_DATA (standard_brush);
@ -489,7 +489,7 @@ gimp_brush_spacing_changed (GimpBrush *brush)
{
g_return_if_fail (GIMP_IS_BRUSH (brush));
g_signal_emit (G_OBJECT (brush), brush_signals[SPACING_CHANGED], 0);
g_signal_emit (brush, brush_signals[SPACING_CHANGED], 0);
}
GimpBrush *
@ -587,7 +587,7 @@ gimp_brush_load_brush (gint fd,
"Brush file '%s' appears truncated."),
filename);
g_free (name);
g_object_unref (G_OBJECT (brush));
g_object_unref (brush);
return NULL;
}
break;
@ -608,7 +608,7 @@ gimp_brush_load_brush (gint fd,
"Brush file '%s' appears truncated."),
filename);
g_free (name);
g_object_unref (G_OBJECT (brush));
g_object_unref (brush);
return NULL;
}
}

6
app/core/gimpbrushpipe-load.c
View File

@ -159,7 +159,7 @@ gimp_brush_pipe_finalize (GObject *object)
for (i = 0; i < pipe->nbrushes; i++)
if (pipe->brushes[i])
g_object_unref (G_OBJECT (pipe->brushes[i]));
g_object_unref (pipe->brushes[i]);
g_free (pipe->brushes);
pipe->brushes = NULL;
@ -371,7 +371,7 @@ gimp_brush_pipe_load (const gchar *filename,
"Brush file '%s' is corrupt."),
filename);
close (fd);
g_object_unref (G_OBJECT (pipe));
g_object_unref (pipe);
g_string_free (buffer, TRUE);
return NULL;
}
@ -461,7 +461,7 @@ gimp_brush_pipe_load (const gchar *filename,
"Brush file '%s' is corrupt."),
filename);
close (fd);
g_object_unref (G_OBJECT (pipe));
g_object_unref (pipe);
return NULL;
}

6
app/core/gimpbrushpipe.c
View File

@ -159,7 +159,7 @@ gimp_brush_pipe_finalize (GObject *object)
for (i = 0; i < pipe->nbrushes; i++)
if (pipe->brushes[i])
g_object_unref (G_OBJECT (pipe->brushes[i]));
g_object_unref (pipe->brushes[i]);
g_free (pipe->brushes);
pipe->brushes = NULL;
@ -371,7 +371,7 @@ gimp_brush_pipe_load (const gchar *filename,
"Brush file '%s' is corrupt."),
filename);
close (fd);
g_object_unref (G_OBJECT (pipe));
g_object_unref (pipe);
g_string_free (buffer, TRUE);
return NULL;
}
@ -461,7 +461,7 @@ gimp_brush_pipe_load (const gchar *filename,
"Brush file '%s' is corrupt."),
filename);
close (fd);
g_object_unref (G_OBJECT (pipe));
g_object_unref (pipe);
return NULL;
}

2
app/core/gimpchannel-combine.c
View File

@ -1624,7 +1624,7 @@ gimp_channel_translate (GimpChannel *mask,
copy_region (&srcPR, &destPR);
/* free the temporary mask */
g_object_unref (G_OBJECT (tmp_mask));
g_object_unref (tmp_mask);
}
/* calculate new bounds */

10
app/core/gimpchannel-select.c
View File

@ -69,7 +69,7 @@ gimp_image_mask_select_rectangle (GimpImage *gimage,
FALSE /* no undo */);
gimp_channel_combine_mask (gimp_image_get_mask (gimage), mask, op, 0, 0);
g_object_unref (G_OBJECT (mask));
g_object_unref (mask);
}
else
{
@ -117,7 +117,7 @@ gimp_image_mask_select_ellipse (GimpImage *gimage,
FALSE /* no undo */);
gimp_channel_combine_mask (gimp_image_get_mask (gimage), mask, op, 0, 0);
g_object_unref (G_OBJECT (mask));
g_object_unref (mask);
}
else
{
@ -173,7 +173,7 @@ gimp_image_mask_select_polygon (GimpImage *gimage,
FALSE /* no undo */);
gimp_channel_combine_mask (gimp_image_get_mask (gimage), mask, op, 0, 0);
g_object_unref (G_OBJECT (mask));
g_object_unref (mask);
}
gimp_image_mask_changed (gimage);
@ -310,7 +310,7 @@ gimp_image_mask_select_fuzzy (GimpImage *gimage,
feather_radius_x,
feather_radius_y);
g_object_unref (G_OBJECT (mask));
g_object_unref (mask);
}
void
@ -360,5 +360,5 @@ gimp_image_mask_select_by_color (GimpImage *gimage,
feather_radius_x,
feather_radius_y);
g_object_unref (G_OBJECT (mask));
g_object_unref (mask);
}

2
app/core/gimpchannel.c
View File

@ -1624,7 +1624,7 @@ gimp_channel_translate (GimpChannel *mask,
copy_region (&srcPR, &destPR);
/* free the temporary mask */
g_object_unref (G_OBJECT (tmp_mask));
g_object_unref (tmp_mask);
}
/* calculate new bounds */

28
app/core/gimpcontainer.c
View File

@ -555,7 +555,7 @@ gimp_container_deserialize (GObject *object,
gimp_container_add (container, child);
if (container->policy == GIMP_CONTAINER_POLICY_STRONG)
g_object_unref (G_OBJECT (child));
g_object_unref (child);
}
{
@ -648,7 +648,7 @@ gimp_container_add (GimpContainer *container,
{
handler = (GimpContainerHandler *) list->data;
handler_id = g_signal_connect (G_OBJECT (object),
handler_id = g_signal_connect (object,
handler->signame,
handler->callback,
handler->callback_data);
@ -660,11 +660,11 @@ gimp_container_add (GimpContainer *container,
switch (container->policy)
{
case GIMP_CONTAINER_POLICY_STRONG:
g_object_ref (G_OBJECT (object));
g_object_ref (object);
break;
case GIMP_CONTAINER_POLICY_WEAK:
g_signal_connect (G_OBJECT (object), "disconnect",
g_signal_connect (object, "disconnect",
G_CALLBACK (gimp_container_disconnect_callback),
container);
break;
@ -672,7 +672,7 @@ gimp_container_add (GimpContainer *container,
container->num_children++;
g_signal_emit (G_OBJECT (container), container_signals[ADD], 0, object);
g_signal_emit (container, container_signals[ADD], 0, object);
return TRUE;
}
@ -707,7 +707,7 @@ gimp_container_remove (GimpContainer *container,
if (handler_id)
{
g_signal_handler_disconnect (G_OBJECT (object), handler_id);
g_signal_handler_disconnect (object, handler_id);
g_object_set_qdata (G_OBJECT (object), handler->quark, NULL);
}
@ -715,17 +715,17 @@ gimp_container_remove (GimpContainer *container,
container->num_children--;
g_signal_emit (G_OBJECT (container), container_signals[REMOVE], 0,
g_signal_emit (container, container_signals[REMOVE], 0,
object);
switch (container->policy)
{
case GIMP_CONTAINER_POLICY_STRONG:
g_object_unref (G_OBJECT (object));
g_object_unref (object);
break;
case GIMP_CONTAINER_POLICY_WEAK:
g_signal_handlers_disconnect_by_func (G_OBJECT (object),
g_signal_handlers_disconnect_by_func (object,
gimp_container_disconnect_callback,
container);
break;
@ -784,7 +784,7 @@ gimp_container_reorder (GimpContainer *container,
return FALSE;
}
g_signal_emit (G_OBJECT (container), container_signals[REORDER], 0,
g_signal_emit (container, container_signals[REORDER], 0,
object, new_index);
return TRUE;
@ -798,7 +798,7 @@ gimp_container_freeze (GimpContainer *container)
container->freeze_count++;
if (container->freeze_count == 1)
g_signal_emit (G_OBJECT (container), container_signals[FREEZE], 0);
g_signal_emit (container, container_signals[FREEZE], 0);
}
void
@ -810,7 +810,7 @@ gimp_container_thaw (GimpContainer *container)
container->freeze_count--;
if (container->freeze_count == 0)
g_signal_emit (G_OBJECT (container), container_signals[THAW], 0);
g_signal_emit (container, container_signals[THAW], 0);
}
gboolean
@ -893,7 +893,7 @@ gimp_container_add_handler_foreach_func (GimpObject *object,
{
gulong handler_id;
handler_id = g_signal_connect (G_OBJECT (object),
handler_id = g_signal_connect (object,
handler->signame,
handler->callback,
handler->callback_data);
@ -953,7 +953,7 @@ gimp_container_remove_handler_foreach_func (GimpObject *object,
if (handler_id)
{
g_signal_handler_disconnect (G_OBJECT (object), handler_id);
g_signal_handler_disconnect (object, handler_id);
g_object_set_qdata (G_OBJECT (object), handler->quark, NULL);
}

200
app/core/gimpcontext.c
View File

@ -717,74 +717,74 @@ gimp_context_constructor (GType type,
g_assert (GIMP_IS_GIMP (gimp));
g_signal_connect_object (G_OBJECT (gimp->images), "remove",
g_signal_connect_object (gimp->images, "remove",
G_CALLBACK (gimp_context_image_removed),
object,
0);
g_signal_connect_object (G_OBJECT (gimp->displays), "remove",
g_signal_connect_object (gimp->displays, "remove",
G_CALLBACK (gimp_context_display_removed),
object,
0);
g_signal_connect_object (G_OBJECT (gimp->tool_info_list), "remove",
g_signal_connect_object (gimp->tool_info_list, "remove",
G_CALLBACK (gimp_context_tool_removed),
object,
0);
g_signal_connect_object (G_OBJECT (gimp->tool_info_list), "thaw",
g_signal_connect_object (gimp->tool_info_list, "thaw",
G_CALLBACK (gimp_context_tool_list_thaw),
object,
0);
g_signal_connect_object (G_OBJECT (gimp->brush_factory->container), "remove",
g_signal_connect_object (gimp->brush_factory->container, "remove",
G_CALLBACK (gimp_context_brush_removed),
object,
0);
g_signal_connect_object (G_OBJECT (gimp->brush_factory->container), "thaw",
g_signal_connect_object (gimp->brush_factory->container, "thaw",
G_CALLBACK (gimp_context_brush_list_thaw),
object,
0);
g_signal_connect_object (G_OBJECT (gimp->pattern_factory->container), "remove",
g_signal_connect_object (gimp->pattern_factory->container, "remove",
G_CALLBACK (gimp_context_pattern_removed),
object,
0);
g_signal_connect_object (G_OBJECT (gimp->pattern_factory->container), "thaw",
g_signal_connect_object (gimp->pattern_factory->container, "thaw",
G_CALLBACK (gimp_context_pattern_list_thaw),
object,
0);
g_signal_connect_object (G_OBJECT (gimp->gradient_factory->container), "remove",
g_signal_connect_object (gimp->gradient_factory->container, "remove",
G_CALLBACK (gimp_context_gradient_removed),
object,
0);
g_signal_connect_object (G_OBJECT (gimp->gradient_factory->container), "thaw",
g_signal_connect_object (gimp->gradient_factory->container, "thaw",
G_CALLBACK (gimp_context_gradient_list_thaw),
object,
0);
g_signal_connect_object (G_OBJECT (gimp->palette_factory->container), "remove",
g_signal_connect_object (gimp->palette_factory->container, "remove",
G_CALLBACK (gimp_context_palette_removed),
object,
0);
g_signal_connect_object (G_OBJECT (gimp->palette_factory->container), "thaw",
g_signal_connect_object (gimp->palette_factory->container, "thaw",
G_CALLBACK (gimp_context_palette_list_thaw),
object,
0);
g_signal_connect_object (G_OBJECT (gimp->named_buffers), "remove",
g_signal_connect_object (gimp->named_buffers, "remove",
G_CALLBACK (gimp_context_buffer_removed),
object,
0);
g_signal_connect_object (G_OBJECT (gimp->named_buffers), "thaw",
g_signal_connect_object (gimp->named_buffers, "thaw",
G_CALLBACK (gimp_context_buffer_list_thaw),
object,
0);
g_signal_connect_object (G_OBJECT (gimp->documents), "remove",
g_signal_connect_object (gimp->documents, "remove",
G_CALLBACK (gimp_context_imagefile_removed),
object,
0);
g_signal_connect_object (G_OBJECT (gimp->documents), "thaw",
g_signal_connect_object (gimp->documents, "thaw",
G_CALLBACK (gimp_context_imagefile_list_thaw),
object,
0);
@ -824,7 +824,7 @@ gimp_context_finalize (GObject *object)
if (context->tool_info)
{
g_object_unref (G_OBJECT (context->tool_info));
g_object_unref (context->tool_info);
context->tool_info = NULL;
}
if (context->tool_name)
@ -835,7 +835,7 @@ gimp_context_finalize (GObject *object)
if (context->brush)
{
g_object_unref (G_OBJECT (context->brush));
g_object_unref (context->brush);
context->brush = NULL;
}
if (context->brush_name)
@ -846,7 +846,7 @@ gimp_context_finalize (GObject *object)
if (context->pattern)
{
g_object_unref (G_OBJECT (context->pattern));
g_object_unref (context->pattern);
context->pattern = NULL;
}
if (context->pattern_name)
@ -857,7 +857,7 @@ gimp_context_finalize (GObject *object)
if (context->gradient)
{
g_object_unref (G_OBJECT (context->gradient));
g_object_unref (context->gradient);
context->gradient = NULL;
}
if (context->gradient_name)
@ -868,7 +868,7 @@ gimp_context_finalize (GObject *object)
if (context->palette)
{
g_object_unref (G_OBJECT (context->palette));
g_object_unref (context->palette);
context->palette = NULL;
}
if (context->palette_name)
@ -879,13 +879,13 @@ gimp_context_finalize (GObject *object)
if (context->buffer)
{
g_object_unref (G_OBJECT (context->buffer));
g_object_unref (context->buffer);
context->buffer = NULL;
}
if (context->imagefile)
{
g_object_unref (G_OBJECT (context->imagefile));
g_object_unref (context->imagefile);
context->imagefile = NULL;
}
@ -1256,10 +1256,10 @@ gimp_context_set_parent (GimpContext *context,
if (! ((1 << prop) & context->defined_props))
{
gimp_context_copy_property (parent, context, prop);
g_signal_connect_object (G_OBJECT (parent),
g_signal_connect_object (parent,
gimp_context_signal_names[prop],
gimp_context_signal_handlers[prop],
G_OBJECT (context),
context,
G_CONNECT_SWAPPED);
}
@ -1277,7 +1277,7 @@ gimp_context_unset_parent (GimpContext *context)
for (prop = 0; prop < GIMP_CONTEXT_NUM_PROPS; prop++)
if (! ((1 << prop) & context->defined_props))
{
g_signal_handlers_disconnect_by_func (G_OBJECT (context->parent),
g_signal_handlers_disconnect_by_func (context->parent,
gimp_context_signal_handlers[prop],
context);
}
@ -1305,7 +1305,7 @@ gimp_context_define_property (GimpContext *context,
{
context->defined_props |= mask;
if (context->parent)
g_signal_handlers_disconnect_by_func (G_OBJECT (context->parent),
g_signal_handlers_disconnect_by_func (context->parent,
gimp_context_signal_handlers[prop],
context);
}
@ -1318,10 +1318,10 @@ gimp_context_define_property (GimpContext *context,
if (context->parent)
{
gimp_context_copy_property (context->parent, context, prop);
g_signal_connect_object (G_OBJECT (context->parent),
g_signal_connect_object (context->parent,
gimp_context_signal_names[prop],
gimp_context_signal_handlers[prop],
G_OBJECT (context),
context,
G_CONNECT_SWAPPED);
}
}
@ -1426,7 +1426,7 @@ gimp_context_get_by_type (GimpContext *context,
g_return_val_if_fail ((prop = gimp_context_type_to_property (type)) != -1,
NULL);
g_object_get (G_OBJECT (context),
g_object_get (context,
gimp_context_prop_names[prop], &object,
NULL);
@ -1434,7 +1434,7 @@ gimp_context_get_by_type (GimpContext *context,
* which usually doesn't ref it's return value
*/
if (object)
g_object_unref (G_OBJECT (object));
g_object_unref (object);
return object;
}
@ -1449,7 +1449,7 @@ gimp_context_set_by_type (GimpContext *context,
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_return_if_fail ((prop = gimp_context_type_to_property (type)) != -1);
g_object_set (G_OBJECT (context),
g_object_set (context,
gimp_context_prop_names[prop], object,
NULL);
}
@ -1466,7 +1466,7 @@ gimp_context_changed_by_type (GimpContext *context,
object = gimp_context_get_by_type (context, type);
g_signal_emit (G_OBJECT (context),
g_signal_emit (context,
gimp_context_signals[prop], 0,
object);
}
@ -1497,7 +1497,7 @@ gimp_context_image_changed (GimpContext *context)
{
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_signal_emit (G_OBJECT (context),
g_signal_emit (context,
gimp_context_signals[IMAGE_CHANGED], 0,
context->image);
}
@ -1557,7 +1557,7 @@ gimp_context_display_changed (GimpContext *context)
{
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_signal_emit (G_OBJECT (context),
g_signal_emit (context,
gimp_context_signals[DISPLAY_CHANGED], 0,
context->display);
}
@ -1589,7 +1589,7 @@ gimp_context_real_set_display (GimpContext *context,
gimp_context_real_set_image (context, gimage);
g_object_unref (G_OBJECT (gimage));
g_object_unref (gimage);
}
gimp_context_display_changed (context);
@ -1631,7 +1631,7 @@ gimp_context_tool_changed (GimpContext *context)
{
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_signal_emit (G_OBJECT (context),
g_signal_emit (context,
gimp_context_signals[TOOL_CHANGED], 0,
context->tool_info);
}
@ -1684,10 +1684,10 @@ gimp_context_tool_removed (GimpContainer *container,
{
context->tool_info = NULL;
g_signal_handlers_disconnect_by_func (G_OBJECT (tool_info),
g_signal_handlers_disconnect_by_func (tool_info,
gimp_context_tool_dirty,
context);
g_object_unref (G_OBJECT (tool_info));
g_object_unref (tool_info);
if (! gimp_container_frozen (container))
gimp_context_tool_list_thaw (container, context);
@ -1713,25 +1713,25 @@ gimp_context_real_set_tool (GimpContext *context,
/* disconnect from the old tool's signals */
if (context->tool_info)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (context->tool_info),
g_signal_handlers_disconnect_by_func (context->tool_info,
gimp_context_tool_dirty,
context);
g_object_unref (G_OBJECT (context->tool_info));
g_object_unref (context->tool_info);
}
context->tool_info = tool_info;
if (tool_info)
{
g_object_ref (G_OBJECT (tool_info));
g_object_ref (tool_info);
g_signal_connect_object (G_OBJECT (tool_info), "invalidate_preview",
g_signal_connect_object (tool_info, "invalidate_preview",
G_CALLBACK (gimp_context_tool_dirty),
G_OBJECT (context),
context,
0);
g_signal_connect_object (G_OBJECT (tool_info), "name_changed",
g_signal_connect_object (tool_info, "name_changed",
G_CALLBACK (gimp_context_tool_dirty),
G_OBJECT (context),
context,
0);
if (tool_info != standard_tool_info)
@ -1785,7 +1785,7 @@ gimp_context_foreground_changed (GimpContext *context)
{
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_signal_emit (G_OBJECT (context),
g_signal_emit (context,
gimp_context_signals[FOREGROUND_CHANGED], 0,
&context->foreground);
}
@ -1839,7 +1839,7 @@ gimp_context_background_changed (GimpContext *context)
{
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_signal_emit (G_OBJECT (context),
g_signal_emit (context,
gimp_context_signals[BACKGROUND_CHANGED], 0,
&context->background);
}
@ -1934,7 +1934,7 @@ gimp_context_opacity_changed (GimpContext *context)
{
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_signal_emit (G_OBJECT (context),
g_signal_emit (context,
gimp_context_signals[OPACITY_CHANGED], 0,
context->opacity);
}
@ -1983,7 +1983,7 @@ gimp_context_paint_mode_changed (GimpContext *context)
{
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_signal_emit (G_OBJECT (context),
g_signal_emit (context,
gimp_context_signals[PAINT_MODE_CHANGED], 0,
context->paint_mode);
}
@ -2035,7 +2035,7 @@ gimp_context_brush_changed (GimpContext *context)
{
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_signal_emit (G_OBJECT (context),
g_signal_emit (context,
gimp_context_signals[BRUSH_CHANGED], 0,
context->brush);
}
@ -2087,10 +2087,10 @@ gimp_context_brush_removed (GimpContainer *container,
{
context->brush = NULL;
g_signal_handlers_disconnect_by_func (G_OBJECT (brush),
g_signal_handlers_disconnect_by_func (brush,
gimp_context_brush_dirty,
context);
g_object_unref (G_OBJECT (brush));
g_object_unref (brush);
if (! gimp_container_frozen (container))
gimp_context_brush_list_thaw (container, context);
@ -2128,11 +2128,11 @@ gimp_context_real_set_brush (GimpContext *context,
temp_buf_swap (context->brush->mask);
}
g_signal_handlers_disconnect_by_func (G_OBJECT (context->brush),
g_signal_handlers_disconnect_by_func (context->brush,
gimp_context_brush_dirty,
context);
g_object_unref (G_OBJECT (context->brush));
g_object_unref (context->brush);
}
context->brush = brush;
@ -2143,15 +2143,15 @@ gimp_context_real_set_brush (GimpContext *context,
base_config = GIMP_BASE_CONFIG (context->gimp->config);
g_object_ref (G_OBJECT (brush));
g_object_ref (brush);
g_signal_connect_object (G_OBJECT (brush), "invalidate_preview",
g_signal_connect_object (brush, "invalidate_preview",
G_CALLBACK (gimp_context_brush_dirty),
G_OBJECT (context),
context,
0);
g_signal_connect_object (G_OBJECT (brush), "name_changed",
g_signal_connect_object (brush, "name_changed",
G_CALLBACK (gimp_context_brush_dirty),
G_OBJECT (context),
context,
0);
/* Make sure the active brush is unswapped... */
@ -2211,7 +2211,7 @@ gimp_context_pattern_changed (GimpContext *context)
{
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_signal_emit (G_OBJECT (context),
g_signal_emit (context,
gimp_context_signals[PATTERN_CHANGED], 0,
context->pattern);
}
@ -2264,10 +2264,10 @@ gimp_context_pattern_removed (GimpContainer *container,
{
context->pattern = NULL;
g_signal_handlers_disconnect_by_func (G_OBJECT (pattern),
g_signal_handlers_disconnect_by_func (pattern,
gimp_context_pattern_dirty,
context);
g_object_unref (G_OBJECT (pattern));
g_object_unref (pattern);
if (! gimp_container_frozen (container))
gimp_context_pattern_list_thaw (container, context);
@ -2305,10 +2305,10 @@ gimp_context_real_set_pattern (GimpContext *context,
/* disconnect from the old pattern's signals */
if (context->pattern)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (context->pattern),
g_signal_handlers_disconnect_by_func (context->pattern,
gimp_context_pattern_dirty,
context);
g_object_unref (G_OBJECT (context->pattern));
g_object_unref (context->pattern);
}
context->pattern = pattern;
@ -2319,11 +2319,11 @@ gimp_context_real_set_pattern (GimpContext *context,
base_config = GIMP_BASE_CONFIG (context->gimp->config);
g_object_ref (G_OBJECT (pattern));
g_object_ref (pattern);
g_signal_connect_object (G_OBJECT (pattern), "name_changed",
g_signal_connect_object (pattern, "name_changed",
G_CALLBACK (gimp_context_pattern_dirty),
G_OBJECT (context),
context,
0);
/* Make sure the active pattern is unswapped... */
@ -2383,7 +2383,7 @@ gimp_context_gradient_changed (GimpContext *context)
{
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_signal_emit (G_OBJECT (context),
g_signal_emit (context,
gimp_context_signals[GRADIENT_CHANGED], 0,
context->gradient);
}
@ -2436,10 +2436,10 @@ gimp_context_gradient_removed (GimpContainer *container,
{
context->gradient = NULL;
g_signal_handlers_disconnect_by_func (G_OBJECT (gradient),
g_signal_handlers_disconnect_by_func (gradient,
gimp_context_gradient_dirty,
context);
g_object_unref (G_OBJECT (gradient));
g_object_unref (gradient);
if (! gimp_container_frozen (container))
gimp_context_gradient_list_thaw (container, context);
@ -2465,21 +2465,21 @@ gimp_context_real_set_gradient (GimpContext *context,
/* disconnect from the old gradient's signals */
if (context->gradient)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (context->gradient),
g_signal_handlers_disconnect_by_func (context->gradient,
gimp_context_gradient_dirty,
context);
g_object_unref (G_OBJECT (context->gradient));
g_object_unref (context->gradient);
}
context->gradient = gradient;
if (gradient)
{
g_object_ref (G_OBJECT (gradient));
g_object_ref (gradient);
g_signal_connect_object (G_OBJECT (gradient), "name_changed",
g_signal_connect_object (gradient, "name_changed",
G_CALLBACK (gimp_context_gradient_dirty),
G_OBJECT (context),
context,
0);
if (gradient != standard_gradient)
@ -2532,7 +2532,7 @@ gimp_context_palette_changed (GimpContext *context)
{
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_signal_emit (G_OBJECT (context),
g_signal_emit (context,
gimp_context_signals[PALETTE_CHANGED], 0,
context->palette);
}
@ -2585,10 +2585,10 @@ gimp_context_palette_removed (GimpContainer *container,
{
context->palette = NULL;
g_signal_handlers_disconnect_by_func (G_OBJECT (palette),
g_signal_handlers_disconnect_by_func (palette,
gimp_context_palette_dirty,
context);
g_object_unref (G_OBJECT (palette));
g_object_unref (palette);
if (! gimp_container_frozen (container))
gimp_context_palette_list_thaw (container, context);
@ -2614,21 +2614,21 @@ gimp_context_real_set_palette (GimpContext *context,
/* disconnect from the old palette's signals */
if (context->palette)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (context->palette),
g_signal_handlers_disconnect_by_func (context->palette,
gimp_context_palette_dirty,
context);
g_object_unref (G_OBJECT (context->palette));
g_object_unref (context->palette);
}
context->palette = palette;
if (palette)
{
g_object_ref (G_OBJECT (palette));
g_object_ref (palette);
g_signal_connect_object (G_OBJECT (palette), "name_changed",
g_signal_connect_object (palette, "name_changed",
G_CALLBACK (gimp_context_palette_dirty),
G_OBJECT (context),
context,
0);
if (palette != standard_palette)
@ -2682,7 +2682,7 @@ gimp_context_buffer_changed (GimpContext *context)
{
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_signal_emit (G_OBJECT (context),
g_signal_emit (context,
gimp_context_signals[BUFFER_CHANGED], 0,
context->buffer);
}
@ -2744,10 +2744,10 @@ gimp_context_buffer_removed (GimpContainer *container,
{
context->buffer = NULL;
g_signal_handlers_disconnect_by_func (G_OBJECT (buffer),
g_signal_handlers_disconnect_by_func (buffer,
gimp_context_buffer_dirty,
context);
g_object_unref (G_OBJECT (buffer));
g_object_unref (buffer);
if (! gimp_container_frozen (container))
gimp_context_buffer_list_thaw (container, context);
@ -2777,21 +2777,21 @@ gimp_context_real_set_buffer (GimpContext *context,
/* disconnect from the old buffer's signals */
if (context->buffer)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (context->buffer),
g_signal_handlers_disconnect_by_func (context->buffer,
gimp_context_buffer_dirty,
context);
g_object_unref (G_OBJECT (context->buffer));
g_object_unref (context->buffer);
}
context->buffer = buffer;
if (buffer)
{
g_object_ref (G_OBJECT (buffer));
g_object_ref (buffer);
g_signal_connect_object (G_OBJECT (buffer), "name_changed",
g_signal_connect_object (buffer, "name_changed",
G_CALLBACK (gimp_context_buffer_dirty),
G_OBJECT (context),
context,
0);
/*
@ -2849,7 +2849,7 @@ gimp_context_imagefile_changed (GimpContext *context)
{
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_signal_emit (G_OBJECT (context),
g_signal_emit (context,
gimp_context_signals[IMAGEFILE_CHANGED], 0,
context->imagefile);
}
@ -2911,10 +2911,10 @@ gimp_context_imagefile_removed (GimpContainer *container,
{
context->imagefile = NULL;
g_signal_handlers_disconnect_by_func (G_OBJECT (imagefile),
g_signal_handlers_disconnect_by_func (imagefile,
gimp_context_imagefile_dirty,
context);
g_object_unref (G_OBJECT (imagefile));
g_object_unref (imagefile);
if (! gimp_container_frozen (container))
gimp_context_imagefile_list_thaw (container, context);
@ -2944,21 +2944,21 @@ gimp_context_real_set_imagefile (GimpContext *context,
/* disconnect from the old imagefile's signals */
if (context->imagefile)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (context->imagefile),
g_signal_handlers_disconnect_by_func (context->imagefile,
gimp_context_imagefile_dirty,
context);
g_object_unref (G_OBJECT (context->imagefile));
g_object_unref (context->imagefile);
}
context->imagefile = imagefile;
if (imagefile)
{
g_object_ref (G_OBJECT (imagefile));
g_object_ref (imagefile);
g_signal_connect_object (G_OBJECT (imagefile), "name_changed",
g_signal_connect_object (imagefile, "name_changed",
G_CALLBACK (gimp_context_imagefile_dirty),
G_OBJECT (context),
context,
0);
/*

2
app/core/gimpdata.c
View File

@ -200,7 +200,7 @@ gimp_data_dirty (GimpData *data)
{
g_return_if_fail (GIMP_IS_DATA (data));
g_signal_emit (G_OBJECT (data), data_signals[DIRTY], 0);
g_signal_emit (data, data_signals[DIRTY], 0);
}
static void

8
app/core/gimpdatafactory.c
View File

@ -191,7 +191,7 @@ gimp_data_factory_data_init (GimpDataFactory *factory,
gimp_data_factory_data_free (factory);
g_object_get (G_OBJECT (factory->gimp->config),
g_object_get (factory->gimp->config,
factory->path_property_name, &path,
NULL);
@ -224,7 +224,7 @@ gimp_data_factory_data_save (GimpDataFactory *factory)
if (gimp_container_num_children (factory->container) == 0)
return;
g_object_get (G_OBJECT (factory->gimp->config),
g_object_get (factory->gimp->config,
factory->path_property_name, &path,
NULL);
@ -344,7 +344,7 @@ gimp_data_factory_data_new (GimpDataFactory *factory,
data = factory->data_new_func (name, base_config->stingy_memory_use);
gimp_container_add (factory->container, GIMP_OBJECT (data));
g_object_unref (G_OBJECT (data));
g_object_unref (data);
return data;
}
@ -466,7 +466,7 @@ gimp_data_factory_load_callback (GimpDatafileData *file_data)
else
{
gimp_container_add (factory->container, GIMP_OBJECT (data));
g_object_unref (G_OBJECT (data));
g_object_unref (data);
}
}
}

8
app/core/gimpdatalist.c
View File

@ -113,7 +113,7 @@ gimp_data_list_add (GimpContainer *container,
list->list = g_list_insert_sorted (list->list, object,
gimp_data_list_data_compare_func);
g_signal_connect (G_OBJECT (object), "name_changed",
g_signal_connect (object, "name_changed",
G_CALLBACK (gimp_data_list_object_renamed_callback),
container);
}
@ -126,7 +126,7 @@ gimp_data_list_remove (GimpContainer *container,
list = GIMP_LIST (container);
g_signal_handlers_disconnect_by_func (G_OBJECT (object),
g_signal_handlers_disconnect_by_func (object,
gimp_data_list_object_renamed_callback,
container);
@ -226,14 +226,14 @@ gimp_data_list_uniquefy_data_name (GimpDataList *data_list,
while (list2);
if (have)
g_signal_handlers_block_by_func (G_OBJECT (object),
g_signal_handlers_block_by_func (object,
gimp_data_list_object_renamed_callback,
data_list);
gimp_object_set_name (object, new_name);
if (have)
g_signal_handlers_unblock_by_func (G_OBJECT (object),
g_signal_handlers_unblock_by_func (object,
gimp_data_list_object_renamed_callback,
data_list);

4
app/core/gimpdocumentlist.c
View File

@ -178,7 +178,7 @@ gimp_document_list_deserialize (GObject *document_list,
gimp_container_add (GIMP_CONTAINER (document_list),
GIMP_OBJECT (imagefile));
g_object_unref (G_OBJECT (imagefile));
g_object_unref (imagefile);
}
break;
@ -233,7 +233,7 @@ gimp_document_list_add_uri (GimpDocumentList *document_list,
{
imagefile = gimp_imagefile_new (uri);
gimp_container_add (container, GIMP_OBJECT (imagefile));
g_object_unref (G_OBJECT (imagefile));
g_object_unref (imagefile);
}
return imagefile;

2
app/core/gimpdrawable-bucket-fill.c
View File

@ -323,7 +323,7 @@ gimp_drawable_bucket_fill_full (GimpDrawable *drawable,
/* free the mask */
if (mask)
g_object_unref (G_OBJECT (mask));
g_object_unref (mask);
if (new_buf)
temp_buf_free (pat_buf);

5
app/core/gimpdrawable.c
View File

@ -339,7 +339,7 @@ gimp_drawable_copy (GimpDrawable *drawable,
add_alpha_region (&srcPR, &destPR);
}
g_object_unref (G_OBJECT (GIMP_ITEM (new_drawable)->parasites));
g_object_unref (GIMP_ITEM (new_drawable)->parasites);
GIMP_ITEM (new_drawable)->parasites =
gimp_parasite_list_copy (GIMP_ITEM (drawable)->parasites);
@ -692,8 +692,7 @@ gimp_drawable_set_visible (GimpDrawable *drawable,
{
drawable->visible = visible;
g_signal_emit (G_OBJECT (drawable),
gimp_drawable_signals[VISIBILITY_CHANGED], 0);
g_signal_emit (drawable, gimp_drawable_signals[VISIBILITY_CHANGED], 0);
gimp_drawable_update (drawable,
0, 0,

6
app/core/gimpedit.c
View File

@ -92,7 +92,7 @@ gimp_edit_cut (GimpImage *gimage,
{
/* Free the old global edit buffer */
if (gimage->gimp->global_buffer)
g_object_unref (G_OBJECT (gimage->gimp->global_buffer));
g_object_unref (gimage->gimp->global_buffer);
/* Set the global edit buffer */
gimage->gimp->global_buffer = gimp_buffer_new (cropped_cut,
@ -149,7 +149,7 @@ gimp_edit_copy (GimpImage *gimage,
{
/* Free the old global edit buffer */
if (gimage->gimp->global_buffer)
g_object_unref (G_OBJECT (gimage->gimp->global_buffer));
g_object_unref (gimage->gimp->global_buffer);
/* Set the global edit buffer */
gimage->gimp->global_buffer = gimp_buffer_new (cropped_copy,
@ -275,7 +275,7 @@ gimp_edit_paste_as_new (Gimp *gimp,
gimp_create_display (gimp, gimage, 0x0101);
g_object_unref (G_OBJECT (gimage));
g_object_unref (gimage);
return gimage;
}

4
app/core/gimpgradient.c
View File

@ -308,7 +308,7 @@ gimp_gradient_get_standard (void)
{
standard_gradient = GIMP_GRADIENT (gimp_gradient_new ("Standard", FALSE));
g_object_ref (G_OBJECT (standard_gradient));
g_object_ref (standard_gradient);
}
return GIMP_DATA (standard_gradient);
@ -388,7 +388,7 @@ gimp_gradient_load (const gchar *filename,
g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
_("Fatal parsing error:\nGradient file '%s' is corrupt."),
filename);
g_object_unref (G_OBJECT (gradient));
g_object_unref (gradient);
fclose (file);
return NULL;
}

10
app/core/gimpimage-mask-select.c
View File

@ -69,7 +69,7 @@ gimp_image_mask_select_rectangle (GimpImage *gimage,
FALSE /* no undo */);
gimp_channel_combine_mask (gimp_image_get_mask (gimage), mask, op, 0, 0);
g_object_unref (G_OBJECT (mask));
g_object_unref (mask);
}
else
{
@ -117,7 +117,7 @@ gimp_image_mask_select_ellipse (GimpImage *gimage,
FALSE /* no undo */);
gimp_channel_combine_mask (gimp_image_get_mask (gimage), mask, op, 0, 0);
g_object_unref (G_OBJECT (mask));
g_object_unref (mask);
}
else
{
@ -173,7 +173,7 @@ gimp_image_mask_select_polygon (GimpImage *gimage,
FALSE /* no undo */);
gimp_channel_combine_mask (gimp_image_get_mask (gimage), mask, op, 0, 0);
g_object_unref (G_OBJECT (mask));
g_object_unref (mask);
}
gimp_image_mask_changed (gimage);
@ -310,7 +310,7 @@ gimp_image_mask_select_fuzzy (GimpImage *gimage,
feather_radius_x,
feather_radius_y);
g_object_unref (G_OBJECT (mask));
g_object_unref (mask);
}
void
@ -360,5 +360,5 @@ gimp_image_mask_select_by_color (GimpImage *gimage,
feather_radius_x,
feather_radius_y);
g_object_unref (G_OBJECT (mask));
g_object_unref (mask);
}

2
app/core/gimpimage-new.c
View File

@ -192,7 +192,7 @@ gimp_image_new_create_image (Gimp *gimp,
gimp_create_display (gimp, gimage, 0x0101);
g_object_unref (G_OBJECT (gimage));
g_object_unref (gimage);
}
return gimage;

2
app/core/gimpimage-qmask.c
View File

@ -111,7 +111,7 @@ gimp_image_set_qmask_state (GimpImage *gimage,
undo_push_group_end (gimage);
/* connect to the removed signal, so the buttons get updated */
g_signal_connect (G_OBJECT (mask), "removed",
g_signal_connect (mask, "removed",
G_CALLBACK (gimp_image_qmask_removed_callback),
gimage);
}

2
app/core/gimpimage-quick-mask.c
View File

@ -111,7 +111,7 @@ gimp_image_set_qmask_state (GimpImage *gimage,
undo_push_group_end (gimage);
/* connect to the removed signal, so the buttons get updated */
g_signal_connect (G_OBJECT (mask), "removed",
g_signal_connect (mask, "removed",
G_CALLBACK (gimp_image_qmask_removed_callback),
gimage);
}

20
app/core/gimpimage-undo-push.c
View File

@ -1657,7 +1657,7 @@ undo_push_layer (GimpImage *gimage,
new->pop_func = undo_pop_layer;
new->free_func = undo_free_layer;
g_object_ref (G_OBJECT (layer));
g_object_ref (layer);
lu->layer = layer;
lu->prev_position = prev_position;
@ -1765,7 +1765,7 @@ undo_free_layer (UndoState state,
lu = (LayerUndo *) lu_ptr;
g_object_unref (G_OBJECT (lu->layer));
g_object_unref (lu->layer);
g_free (lu);
}
@ -1972,7 +1972,7 @@ undo_push_layer_mask (GimpImage *gimage,
new->pop_func = undo_pop_layer_mask;
new->free_func = undo_free_layer_mask;
g_object_ref (G_OBJECT (mask));
g_object_ref (mask);
lmu->layer = layer;
lmu->mask = mask;
@ -2019,7 +2019,7 @@ undo_free_layer_mask (UndoState state,
lmu = (LayerMaskUndo *) lmu_ptr;
g_object_unref (G_OBJECT (lmu->mask));
g_object_unref (lmu->mask);
g_free (lmu);
}
@ -2276,7 +2276,7 @@ undo_push_channel (GimpImage *gimage,
new->pop_func = undo_pop_channel;
new->free_func = undo_free_channel;
g_object_ref (G_OBJECT (channel));
g_object_ref (channel);
cu->channel = channel;
cu->prev_position = prev_position;
@ -2354,7 +2354,7 @@ undo_free_channel (UndoState state,
cu = (ChannelUndo *) cu_ptr;
g_object_unref (G_OBJECT (cu->channel));
g_object_unref (cu->channel);
g_free (cu);
}
@ -2601,7 +2601,7 @@ undo_push_vectors (GimpImage *gimage,
new->pop_func = undo_pop_vectors;
new->free_func = undo_free_vectors;
g_object_ref (G_OBJECT (vectors));
g_object_ref (vectors);
vu->vectors = vectors;
vu->prev_position = prev_position;
@ -2667,7 +2667,7 @@ undo_free_vectors (UndoState state,
vu = (VectorsUndo *) vu_ptr;
g_object_unref (G_OBJECT (vu->vectors));
g_object_unref (vu->vectors);
g_free (vu);
}
@ -2734,7 +2734,7 @@ undo_pop_vectors_mod (GimpImage *gimage,
/* gimp_vectors_copy_strokes (temp, vmu->vectors); */
/* g_object_unref (G_OBJECT (temp)); */
/* g_object_unref (temp); */
return TRUE;
}
@ -2748,7 +2748,7 @@ undo_free_vectors_mod (UndoState state,
vmu = (VectorsModUndo *) vmu_ptr;
/* g_object_unref (G_OBJECT (vmu->undo_vectors)); */
/* g_object_unref (vmu->undo_vectors); */
g_free (vmu);
}

102
app/core/gimpimage.c
View File

@ -533,17 +533,17 @@ gimp_image_finalize (GObject *object)
if (gimage->layers)
{
g_object_unref (G_OBJECT (gimage->layers));
g_object_unref (gimage->layers);
gimage->layers = NULL;
}
if (gimage->channels)
{
g_object_unref (G_OBJECT (gimage->channels));
g_object_unref (gimage->channels);
gimage->channels = NULL;
}
if (gimage->vectors)
{
g_object_unref (G_OBJECT (gimage->vectors));
g_object_unref (gimage->vectors);
gimage->vectors = NULL;
}
if (gimage->layer_stack)
@ -554,7 +554,7 @@ gimp_image_finalize (GObject *object)
if (gimage->selection_mask)
{
g_object_unref (G_OBJECT (gimage->selection_mask));
g_object_unref (gimage->selection_mask);
gimage->selection_mask = NULL;
}
@ -566,7 +566,7 @@ gimp_image_finalize (GObject *object)
if (gimage->parasites)
{
g_object_unref (G_OBJECT (gimage->parasites));
g_object_unref (gimage->parasites);
gimage->parasites = NULL;
}
@ -579,12 +579,12 @@ gimp_image_finalize (GObject *object)
if (gimage->new_undo_stack)
{
g_object_unref (G_OBJECT (gimage->new_undo_stack));
g_object_unref (gimage->new_undo_stack);
gimage->new_undo_stack = NULL;
}
if (gimage->new_redo_stack)
{
g_object_unref (G_OBJECT (gimage->new_redo_stack));
g_object_unref (gimage->new_redo_stack);
gimage->new_redo_stack = NULL;
}
@ -977,10 +977,10 @@ gimp_image_new (Gimp *gimp,
gimage->width,
gimage->height);
g_signal_connect_object (G_OBJECT (gimp->config), "notify::transparency-type",
g_signal_connect_object (gimp->config, "notify::transparency-type",
G_CALLBACK (gimp_image_invalidate_layer_previews),
gimage, G_CONNECT_SWAPPED);
g_signal_connect_object (G_OBJECT (gimp->config), "notify::transparency-size",
g_signal_connect_object (gimp->config, "notify::transparency-size",
G_CALLBACK (gimp_image_invalidate_layer_previews),
gimage, G_CONNECT_SWAPPED);
@ -1159,7 +1159,7 @@ gimp_image_resolution_changed (GimpImage *gimage)
{
g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_signal_emit (G_OBJECT (gimage), gimp_image_signals[RESOLUTION_CHANGED], 0);
g_signal_emit (gimage, gimp_image_signals[RESOLUTION_CHANGED], 0);
}
void
@ -1191,7 +1191,7 @@ gimp_image_unit_changed (GimpImage *gimage)
{
g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_signal_emit (G_OBJECT (gimage), gimp_image_signals[UNIT_CHANGED], 0);
g_signal_emit (gimage, gimp_image_signals[UNIT_CHANGED], 0);
}
gint
@ -1247,8 +1247,7 @@ gimp_image_floating_selection_changed (GimpImage *gimage)
{
g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_signal_emit (G_OBJECT (gimage),
gimp_image_signals[FLOATING_SELECTION_CHANGED], 0);
g_signal_emit (gimage, gimp_image_signals[FLOATING_SELECTION_CHANGED], 0);
}
guchar *
@ -1266,7 +1265,7 @@ gimp_image_colormap_changed (GimpImage *gimage,
g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_return_if_fail (col < gimage->num_cols);
g_signal_emit (G_OBJECT (gimage), gimp_image_signals[COLORMAP_CHANGED], 0,
g_signal_emit (gimage, gimp_image_signals[COLORMAP_CHANGED], 0,
col);
}
@ -1283,7 +1282,7 @@ gimp_image_mask_changed (GimpImage *gimage)
{
g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_signal_emit (G_OBJECT (gimage), gimp_image_signals[MASK_CHANGED], 0);
g_signal_emit (gimage, gimp_image_signals[MASK_CHANGED], 0);
}
void
@ -1324,7 +1323,7 @@ gimp_image_set_component_active (GimpImage *gimage,
*/
gimp_image_unset_active_channel (gimage);
g_signal_emit (G_OBJECT (gimage),
g_signal_emit (gimage,
gimp_image_signals[COMPONENT_ACTIVE_CHANGED], 0,
type);
}
@ -1426,7 +1425,7 @@ gimp_image_set_component_visible (GimpImage *gimage,
{
gimage->visible[pixel] = visible ? TRUE : FALSE;
g_signal_emit (G_OBJECT (gimage),
g_signal_emit (gimage,
gimp_image_signals[COMPONENT_VISIBILITY_CHANGED], 0,
type);
@ -1467,7 +1466,7 @@ gimp_image_mode_changed (GimpImage *gimage)
{
g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_signal_emit (G_OBJECT (gimage), gimp_image_signals[MODE_CHANGED], 0);
g_signal_emit (gimage, gimp_image_signals[MODE_CHANGED], 0);
}
void
@ -1475,7 +1474,7 @@ gimp_image_alpha_changed (GimpImage *gimage)
{
g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_signal_emit (G_OBJECT (gimage), gimp_image_signals[ALPHA_CHANGED], 0);
g_signal_emit (gimage, gimp_image_signals[ALPHA_CHANGED], 0);
}
void
@ -1487,7 +1486,7 @@ gimp_image_update (GimpImage *gimage,
{
g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_signal_emit (G_OBJECT (gimage), gimp_image_signals[UPDATE], 0,
g_signal_emit (gimage, gimp_image_signals[UPDATE], 0,
x, y, width, height);
}
@ -1498,8 +1497,7 @@ gimp_image_update_guide (GimpImage *gimage,
g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_return_if_fail (guide != NULL);
g_signal_emit (G_OBJECT (gimage), gimp_image_signals[UPDATE_GUIDE], 0,
guide);
g_signal_emit (gimage, gimp_image_signals[UPDATE_GUIDE], 0, guide);
}
void
@ -1508,8 +1506,7 @@ gimp_image_selection_control (GimpImage *gimage,
{
g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_signal_emit (G_OBJECT (gimage), gimp_image_signals[SELECTION_CONTROL], 0,
control);
g_signal_emit (gimage, gimp_image_signals[SELECTION_CONTROL], 0, control);
}
void
@ -1517,7 +1514,7 @@ gimp_image_qmask_changed (GimpImage *gimage)
{
g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_signal_emit (G_OBJECT (gimage), gimp_image_signals[QMASK_CHANGED], 0);
g_signal_emit (gimage, gimp_image_signals[QMASK_CHANGED], 0);
}
@ -1575,15 +1572,14 @@ gimp_image_undo_start (GimpImage *gimage)
{
g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_signal_emit (G_OBJECT (gimage), gimp_image_signals[UNDO_START], 0);
g_signal_emit (gimage, gimp_image_signals[UNDO_START], 0);
}
void
gimp_image_undo_event (GimpImage *gimage,
gint event)
{
g_signal_emit (G_OBJECT (gimage), gimp_image_signals[UNDO_EVENT], 0,
event);
g_signal_emit (gimage, gimp_image_signals[UNDO_EVENT], 0, event);
}
@ -1624,7 +1620,7 @@ gimp_image_dirty (GimpImage *gimage)
gimage->dirty++;
g_signal_emit (G_OBJECT (gimage), gimp_image_signals[DIRTY], 0);
g_signal_emit (gimage, gimp_image_signals[DIRTY], 0);
TRC (("dirty %d -> %d\n", gimage->dirty-1, gimage->dirty));
@ -1638,7 +1634,7 @@ gimp_image_clean (GimpImage *gimage)
gimage->dirty--;
g_signal_emit (G_OBJECT (gimage), gimp_image_signals[CLEAN], 0);
g_signal_emit (gimage, gimp_image_signals[CLEAN], 0);
TRC (("clean %d -> %d\n", gimage->dirty+1, gimage->dirty));
@ -1652,7 +1648,7 @@ gimp_image_clean_all (GimpImage *gimage)
gimage->dirty = 0;
g_signal_emit (G_OBJECT (gimage), gimp_image_signals[CLEAN], 0);
g_signal_emit (gimage, gimp_image_signals[CLEAN], 0);
}
@ -1663,7 +1659,7 @@ gimp_image_flush (GimpImage *gimage)
{
g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_signal_emit (G_OBJECT (gimage), gimp_image_signals[FLUSH], 0);
g_signal_emit (gimage, gimp_image_signals[FLUSH], 0);
}
@ -2395,15 +2391,13 @@ gimp_image_set_active_layer (GimpImage *gimage,
{
gimage->active_layer = layer;
g_signal_emit (G_OBJECT (gimage),
gimp_image_signals[ACTIVE_LAYER_CHANGED], 0);
g_signal_emit (gimage, gimp_image_signals[ACTIVE_LAYER_CHANGED], 0);
if (gimage->active_channel)
{
gimage->active_channel = NULL;
g_signal_emit (G_OBJECT (gimage),
gimp_image_signals[ACTIVE_CHANNEL_CHANGED], 0);
g_signal_emit (gimage, gimp_image_signals[ACTIVE_CHANNEL_CHANGED], 0);
}
}
@ -2432,15 +2426,13 @@ gimp_image_set_active_channel (GimpImage *gimage,
{
gimage->active_channel = channel;
g_signal_emit (G_OBJECT (gimage),
gimp_image_signals[ACTIVE_CHANNEL_CHANGED], 0);
g_signal_emit (gimage, gimp_image_signals[ACTIVE_CHANNEL_CHANGED], 0);
if (gimage->active_layer)
{
gimage->active_layer = NULL;
g_signal_emit (G_OBJECT (gimage),
gimp_image_signals[ACTIVE_LAYER_CHANGED], 0);
g_signal_emit (gimage, gimp_image_signals[ACTIVE_LAYER_CHANGED], 0);
}
}
@ -2461,8 +2453,7 @@ gimp_image_unset_active_channel (GimpImage *gimage)
{
gimage->active_channel = NULL;
g_signal_emit (G_OBJECT (gimage),
gimp_image_signals[ACTIVE_CHANNEL_CHANGED], 0);
g_signal_emit (gimage, gimp_image_signals[ACTIVE_CHANNEL_CHANGED], 0);
if (gimage->layer_stack)
{
@ -2495,8 +2486,7 @@ gimp_image_set_active_vectors (GimpImage *gimage,
{
gimage->active_vectors = vectors;
g_signal_emit (G_OBJECT (gimage),
gimp_image_signals[ACTIVE_VECTORS_CHANGED], 0);
g_signal_emit (gimage, gimp_image_signals[ACTIVE_VECTORS_CHANGED], 0);
}
return vectors;
@ -2743,7 +2733,7 @@ gimp_image_add_layer (GimpImage *gimage,
}
gimp_container_insert (gimage->layers, GIMP_OBJECT (layer), position);
g_object_unref (G_OBJECT (layer));
g_object_unref (layer);
/* notify the layers dialog of the currently active layer */
gimp_image_set_active_layer (gimage, layer);
@ -2778,7 +2768,7 @@ gimp_image_remove_layer (GimpImage *gimage,
GIMP_OBJECT (layer)),
layer);
g_object_ref (G_OBJECT (layer));
g_object_ref (layer);
gimp_container_remove (gimage->layers, GIMP_OBJECT (layer));
gimage->layer_stack = g_slist_remove (gimage->layer_stack, layer);
@ -2801,8 +2791,7 @@ gimp_image_remove_layer (GimpImage *gimage,
{
gimage->active_layer = NULL;
g_signal_emit (G_OBJECT (gimage),
gimp_image_signals[ACTIVE_LAYER_CHANGED], 0);
g_signal_emit (gimage, gimp_image_signals[ACTIVE_LAYER_CHANGED], 0);
}
}
@ -2813,7 +2802,7 @@ gimp_image_remove_layer (GimpImage *gimage,
w = gimp_drawable_width (GIMP_DRAWABLE (layer));
h = gimp_drawable_height (GIMP_DRAWABLE (layer));
g_object_unref (G_OBJECT (layer));
g_object_unref (layer);
gimp_image_update (gimage, x, y, w, h);
@ -3033,7 +3022,7 @@ gimp_image_add_channel (GimpImage *gimage,
}
gimp_container_insert (gimage->channels, GIMP_OBJECT (channel), position);
g_object_unref (G_OBJECT (channel));
g_object_unref (channel);
/* notify this gimage of the currently active channel */
gimp_image_set_active_channel (gimage, channel);
@ -3064,7 +3053,7 @@ gimp_image_remove_channel (GimpImage *gimage,
GIMP_OBJECT (channel)),
gimp_image_get_active_channel (gimage));
g_object_ref (G_OBJECT (channel));
g_object_ref (channel);
gimp_container_remove (gimage->channels, GIMP_OBJECT (channel));
@ -3086,7 +3075,7 @@ gimp_image_remove_channel (GimpImage *gimage,
}
}
g_object_unref (G_OBJECT (channel));
g_object_unref (channel);
gimp_image_update (gimage, 0, 0, gimage->width, gimage->height);
@ -3220,7 +3209,7 @@ gimp_image_add_vectors (GimpImage *gimage,
}
gimp_container_insert (gimage->vectors, GIMP_OBJECT (vectors), position);
g_object_unref (G_OBJECT (vectors));
g_object_unref (vectors);
/* notify this gimage of the currently active vectors */
gimp_image_set_active_vectors (gimage, vectors);
@ -3244,7 +3233,7 @@ gimp_image_remove_vectors (GimpImage *gimage,
GIMP_OBJECT (vectors)),
gimp_image_get_active_vectors (gimage));
g_object_ref (G_OBJECT (vectors));
g_object_ref (vectors);
gimp_container_remove (gimage->vectors, GIMP_OBJECT (vectors));
@ -3266,12 +3255,11 @@ gimp_image_remove_vectors (GimpImage *gimage,
{
gimage->active_vectors = NULL;
g_signal_emit (G_OBJECT (gimage),
gimp_image_signals[ACTIVE_VECTORS_CHANGED], 0);
g_signal_emit (gimage, gimp_image_signals[ACTIVE_VECTORS_CHANGED], 0);
}
}
g_object_unref (G_OBJECT (vectors));
g_object_unref (vectors);
}
gboolean

7
app/core/gimpimagefile.c
View File

@ -402,7 +402,7 @@ gimp_imagefile_create_thumbnail (GimpImagefile *imagefile,
g_free (thumb_name);
}
g_object_unref (G_OBJECT (gimage));
g_object_unref (gimage);
}
else
{
@ -574,8 +574,7 @@ gimp_imagefile_set_info (GimpImagefile *imagefile,
}
if (changed || emit_always)
g_signal_emit (G_OBJECT (imagefile),
gimp_imagefile_signals[INFO_CHANGED], 0);
g_signal_emit (imagefile, gimp_imagefile_signals[INFO_CHANGED], 0);
}
static void
@ -980,7 +979,7 @@ gimp_imagefile_save_png_thumb (GimpImagefile *imagefile,
g_free (l_str);
}
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
g_free (temp_name);

8
app/core/gimpimagemap.c
View File

@ -302,7 +302,7 @@ gimp_image_map_commit (GimpImageMap *image_map)
image_map->undo_tiles, FALSE);
}
g_object_unref (G_OBJECT (image_map));
g_object_unref (image_map);
}
void
@ -360,7 +360,7 @@ gimp_image_map_clear (GimpImageMap *image_map)
image_map->gdisp->gimage->gimp);
#endif
g_object_unref (G_OBJECT (image_map));
g_object_unref (image_map);
return;
}
@ -393,7 +393,7 @@ gimp_image_map_abort (GimpImageMap *image_map)
gimp_image_undo_thaw (gimage);
g_object_unref (G_OBJECT (image_map));
g_object_unref (image_map);
}
guchar *
@ -489,7 +489,7 @@ gimp_image_map_do (GimpImageMap *image_map)
gimp_drawable_update (image_map->drawable, x, y, w, h);
if (image_map->interactive)
g_signal_emit (G_OBJECT (image_map), image_map_signals[FLUSH], 0);
g_signal_emit (image_map, image_map_signals[FLUSH], 0);
image_map->PRI = pixel_regions_process (image_map->PRI);

4
app/core/gimpitem.c
View File

@ -153,7 +153,7 @@ gimp_item_finalize (GObject *object)
if (item->parasites)
{
g_object_unref (G_OBJECT (item->parasites));
g_object_unref (item->parasites);
item->parasites = NULL;
}
@ -276,7 +276,7 @@ gimp_item_removed (GimpItem *item)
{
g_return_if_fail (GIMP_IS_ITEM (item));
g_signal_emit (G_OBJECT (item), gimp_item_signals[REMOVED], 0);
g_signal_emit (item, gimp_item_signals[REMOVED], 0);
}
gint

19
app/core/gimplayer.c
View File

@ -210,7 +210,7 @@ gimp_layer_finalize (GObject *object)
if (layer->mask)
{
g_object_unref (G_OBJECT (layer->mask));
g_object_unref (layer->mask);
layer->mask = NULL;
}
@ -589,7 +589,7 @@ gimp_layer_add_mask (GimpLayer *layer,
}
layer->mask = mask;
g_object_ref (G_OBJECT (layer->mask));
g_object_ref (layer->mask);
gimp_layer_mask_set_layer (mask, layer);
@ -601,7 +601,7 @@ gimp_layer_add_mask (GimpLayer *layer,
if (push_undo)
undo_push_layer_mask_add (gimage, layer, mask);
g_signal_emit (G_OBJECT (layer), layer_signals[MASK_CHANGED], 0);
g_signal_emit (layer, layer_signals[MASK_CHANGED], 0);
return layer->mask;
}
@ -819,7 +819,7 @@ gimp_layer_apply_mask (GimpLayer *layer,
GIMP_DRAWABLE (layer)->preview_valid = FALSE;
}
g_object_unref (G_OBJECT (layer->mask));
g_object_unref (layer->mask);
layer->mask = NULL;
if (push_undo)
@ -840,7 +840,7 @@ gimp_layer_apply_mask (GimpLayer *layer,
gimp_drawable_height (GIMP_DRAWABLE (layer)));
}
g_signal_emit (G_OBJECT (layer), layer_signals[MASK_CHANGED], 0);
g_signal_emit (layer, layer_signals[MASK_CHANGED], 0);
}
void
@ -1506,7 +1506,7 @@ gimp_layer_set_opacity (GimpLayer *layer,
{
layer->opacity = opacity;
g_signal_emit (G_OBJECT (layer), layer_signals[OPACITY_CHANGED], 0);
g_signal_emit (layer, layer_signals[OPACITY_CHANGED], 0);
gimp_drawable_update (GIMP_DRAWABLE (layer),
0, 0,
@ -1533,7 +1533,7 @@ gimp_layer_set_mode (GimpLayer *layer,
{
layer->mode = mode;
g_signal_emit (G_OBJECT (layer), layer_signals[MODE_CHANGED], 0);
g_signal_emit (layer, layer_signals[MODE_CHANGED], 0);
gimp_drawable_update (GIMP_DRAWABLE (layer),
0, 0,
@ -1560,8 +1560,7 @@ gimp_layer_set_preserve_trans (GimpLayer *layer,
{
layer->preserve_trans = preserve ? TRUE : FALSE;
g_signal_emit (G_OBJECT (layer),
layer_signals[PRESERVE_TRANS_CHANGED], 0);
g_signal_emit (layer, layer_signals[PRESERVE_TRANS_CHANGED], 0);
}
}
@ -1583,7 +1582,7 @@ gimp_layer_set_linked (GimpLayer *layer,
{
layer->linked = linked ? TRUE : FALSE;
g_signal_emit (G_OBJECT (layer), layer_signals[LINKED_CHANGED], 0);
g_signal_emit (layer, layer_signals[LINKED_CHANGED], 0);
}
}

9
app/core/gimplayermask.c
View File

@ -209,8 +209,7 @@ gimp_layer_mask_set_apply (GimpLayerMask *layer_mask,
gimp_drawable_height (drawable));
}
g_signal_emit (G_OBJECT (layer_mask),
layer_mask_signals[APPLY_CHANGED], 0);
g_signal_emit (layer_mask, layer_mask_signals[APPLY_CHANGED], 0);
}
}
@ -232,8 +231,7 @@ gimp_layer_mask_set_edit (GimpLayerMask *layer_mask,
{
layer_mask->edit_mask = edit ? TRUE : FALSE;
g_signal_emit (G_OBJECT (layer_mask),
layer_mask_signals[EDIT_CHANGED], 0);
g_signal_emit (layer_mask, layer_mask_signals[EDIT_CHANGED], 0);
}
}
@ -267,8 +265,7 @@ gimp_layer_mask_set_show (GimpLayerMask *layer_mask,
gimp_drawable_height (drawable));
}
g_signal_emit (G_OBJECT (layer_mask),
layer_mask_signals[SHOW_CHANGED], 0);
g_signal_emit (layer_mask, layer_mask_signals[SHOW_CHANGED], 0);
}
}

2
app/core/gimpmodules.c
View File

@ -62,7 +62,7 @@ gimp_modules_exit (Gimp *gimp)
if (gimp->module_db)
{
g_object_unref (G_OBJECT (gimp->module_db));
g_object_unref (gimp->module_db);
gimp->module_db = NULL;
}
}

4
app/core/gimpobject.c
View File

@ -153,7 +153,7 @@ gimp_object_dispose (GObject *object)
if (! disconnected)
{
g_signal_emit (G_OBJECT (object), object_signals[DISCONNECT], 0);
g_signal_emit (object, object_signals[DISCONNECT], 0);
g_object_set_data (G_OBJECT (object), "disconnected",
GINT_TO_POINTER (TRUE));
@ -250,7 +250,7 @@ gimp_object_name_changed (GimpObject *object)
{
g_return_if_fail (GIMP_IS_OBJECT (object));
g_signal_emit (G_OBJECT (object), object_signals[NAME_CHANGED], 0);
g_signal_emit (object, object_signals[NAME_CHANGED], 0);
}

8
app/core/gimppalette-load.c
View File

@ -336,7 +336,7 @@ gimp_palette_load (const gchar *filename,
_("Loading palette '%s':\nRead error in line %d."),
filename, linenum);
fclose (fp);
g_object_unref (G_OBJECT (palette));
g_object_unref (palette);
return NULL;
}
@ -361,7 +361,7 @@ gimp_palette_load (const gchar *filename,
_("Loading palette '%s':\nRead error in line %d."),
filename, linenum);
fclose (fp);
g_object_unref (G_OBJECT (palette));
g_object_unref (palette);
return NULL;
}
@ -389,7 +389,7 @@ gimp_palette_load (const gchar *filename,
_("Loading palette '%s':\nRead error in line %d."),
filename, linenum);
fclose (fp);
g_object_unref (G_OBJECT (palette));
g_object_unref (palette);
return NULL;
}
@ -459,7 +459,7 @@ gimp_palette_load (const gchar *filename,
_("Loading palette '%s':\nRead error in line %d."),
filename, linenum);
fclose (fp);
g_object_unref (G_OBJECT (palette));
g_object_unref (palette);
return NULL;
}

8
app/core/gimppalette-save.c
View File

@ -336,7 +336,7 @@ gimp_palette_load (const gchar *filename,
_("Loading palette '%s':\nRead error in line %d."),
filename, linenum);
fclose (fp);
g_object_unref (G_OBJECT (palette));
g_object_unref (palette);
return NULL;
}
@ -361,7 +361,7 @@ gimp_palette_load (const gchar *filename,
_("Loading palette '%s':\nRead error in line %d."),
filename, linenum);
fclose (fp);
g_object_unref (G_OBJECT (palette));
g_object_unref (palette);
return NULL;
}
@ -389,7 +389,7 @@ gimp_palette_load (const gchar *filename,
_("Loading palette '%s':\nRead error in line %d."),
filename, linenum);
fclose (fp);
g_object_unref (G_OBJECT (palette));
g_object_unref (palette);
return NULL;
}
@ -459,7 +459,7 @@ gimp_palette_load (const gchar *filename,
_("Loading palette '%s':\nRead error in line %d."),
filename, linenum);
fclose (fp);
g_object_unref (G_OBJECT (palette));
g_object_unref (palette);
return NULL;
}

8
app/core/gimppalette.c
View File

@ -336,7 +336,7 @@ gimp_palette_load (const gchar *filename,
_("Loading palette '%s':\nRead error in line %d."),
filename, linenum);
fclose (fp);
g_object_unref (G_OBJECT (palette));
g_object_unref (palette);
return NULL;
}
@ -361,7 +361,7 @@ gimp_palette_load (const gchar *filename,
_("Loading palette '%s':\nRead error in line %d."),
filename, linenum);
fclose (fp);
g_object_unref (G_OBJECT (palette));
g_object_unref (palette);
return NULL;
}
@ -389,7 +389,7 @@ gimp_palette_load (const gchar *filename,
_("Loading palette '%s':\nRead error in line %d."),
filename, linenum);
fclose (fp);
g_object_unref (G_OBJECT (palette));
g_object_unref (palette);
return NULL;
}
@ -459,7 +459,7 @@ gimp_palette_load (const gchar *filename,
_("Loading palette '%s':\nRead error in line %d."),
filename, linenum);
fclose (fp);
g_object_unref (G_OBJECT (palette));
g_object_unref (palette);
return NULL;
}

6
app/core/gimpparasitelist.c
View File

@ -364,8 +364,7 @@ gimp_parasite_list_add (GimpParasiteList *list,
parasite = gimp_parasite_copy (parasite);
g_hash_table_insert (list->table, parasite->name, parasite);
g_signal_emit (G_OBJECT (list), parasite_list_signals[ADD], 0,
parasite);
g_signal_emit (list, parasite_list_signals[ADD], 0, parasite);
}
void
@ -384,8 +383,7 @@ gimp_parasite_list_remove (GimpParasiteList *list,
{
g_hash_table_remove (list->table, name);
g_signal_emit (G_OBJECT (list), parasite_list_signals[REMOVE], 0,
parasite);
g_signal_emit (list, parasite_list_signals[REMOVE], 0, parasite);
gimp_parasite_free (parasite);
}

4
app/core/gimppattern-load.c
View File

@ -275,7 +275,7 @@ gimp_pattern_get_standard (void)
}
/* set ref_count to 2 --> never swap the standard pattern */
g_object_ref (G_OBJECT (standard_pattern));
g_object_ref (standard_pattern);
}
return GIMP_DATA (standard_pattern);
@ -399,7 +399,7 @@ gimp_pattern_load (const gchar *filename,
error:
if (pattern)
g_object_unref (G_OBJECT (pattern));
g_object_unref (pattern);
else if (name)
g_free (name);

4
app/core/gimppattern.c
View File

@ -275,7 +275,7 @@ gimp_pattern_get_standard (void)
}
/* set ref_count to 2 --> never swap the standard pattern */
g_object_ref (G_OBJECT (standard_pattern));
g_object_ref (standard_pattern);
}
return GIMP_DATA (standard_pattern);
@ -399,7 +399,7 @@ gimp_pattern_load (const gchar *filename,
error:
if (pattern)
g_object_unref (G_OBJECT (pattern));
g_object_unref (pattern);
else if (name)
g_free (name);

2
app/core/gimpprojection.c
View File

@ -274,7 +274,7 @@ gimp_display_delete (GimpDisplay *gdisp)
/* unrefs the gimage */
gimp_display_disconnect (gdisp);
g_object_unref (G_OBJECT (gdisp));
g_object_unref (gdisp);
}
gint

12
app/core/gimptoolinfo.c
View File

@ -159,7 +159,7 @@ gimp_tool_info_finalize (GObject *object)
}
if (tool_info->stock_pixbuf)
{
g_object_unref (G_OBJECT (tool_info->stock_pixbuf));
g_object_unref (tool_info->stock_pixbuf);
tool_info->stock_pixbuf = NULL;
}
@ -197,7 +197,7 @@ temp_buf_new_from_pixbuf (GdkPixbuf *pixbuf,
}
else
{
g_object_ref (G_OBJECT (pixbuf));
g_object_ref (pixbuf);
}
bytes = gdk_pixbuf_get_n_channels (pixbuf);
@ -215,7 +215,7 @@ temp_buf_new_from_pixbuf (GdkPixbuf *pixbuf,
t_data += width * bytes;
}
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
return temp_buf;
}
@ -291,7 +291,7 @@ gimp_tool_info_new (Gimp *gimp,
tool_info->stock_pixbuf = stock_pixbuf;
if (stock_pixbuf)
g_object_ref (G_OBJECT (stock_pixbuf));
g_object_ref (stock_pixbuf);
return tool_info;
}
@ -304,12 +304,12 @@ gimp_tool_info_set_standard (Gimp *gimp,
g_return_if_fail (! tool_info || GIMP_IS_TOOL_INFO (tool_info));
if (gimp->standard_tool_info)
g_object_unref (G_OBJECT (gimp->standard_tool_info));
g_object_unref (gimp->standard_tool_info);
gimp->standard_tool_info = tool_info;
if (gimp->standard_tool_info)
g_object_ref (G_OBJECT (gimp->standard_tool_info));
g_object_ref (gimp->standard_tool_info);
}
GimpToolInfo *

6
app/core/gimpundo.c
View File

@ -212,8 +212,7 @@ gimp_undo_push (GimpUndo *undo,
g_return_if_fail (GIMP_IS_UNDO (undo));
g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_signal_emit (G_OBJECT (undo), undo_signals[PUSH], 0,
gimage);
g_signal_emit (undo, undo_signals[PUSH], 0, gimage);
}
void
@ -223,8 +222,7 @@ gimp_undo_pop (GimpUndo *undo,
g_return_if_fail (GIMP_IS_UNDO (undo));
g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_signal_emit (G_OBJECT (undo), undo_signals[POP], 0,
gimage);
g_signal_emit (undo, undo_signals[POP], 0, gimage);
}
static void

8
app/core/gimpundostack.c
View File

@ -100,10 +100,10 @@ gimp_undo_stack_init (GimpUndoStack *stack)
stack->undos = undos;
g_signal_connect (G_OBJECT (undos), "add",
g_signal_connect (undos, "add",
G_CALLBACK (gimp_undo_stack_add_callback),
stack);
g_signal_connect (G_OBJECT (undos), "remove",
g_signal_connect (undos, "remove",
G_CALLBACK (gimp_undo_stack_remove_callback),
stack);
@ -119,7 +119,7 @@ gimp_undo_stack_finalize (GObject *object)
if (stack->undos)
{
g_object_unref (G_OBJECT (stack->undos));
g_object_unref (stack->undos);
stack->undos = NULL;
}
@ -163,7 +163,7 @@ gimp_undo_stack_push (GimpUndoStack *stack,
gimp_undo_push (undo, stack->gimage);
gimp_container_add (GIMP_CONTAINER (stack->undos), GIMP_OBJECT (undo));
g_object_unref (G_OBJECT (undo));
g_object_unref (undo);
}
GimpUndo *

4
app/core/gimpviewable.c
View File

@ -170,7 +170,7 @@ gimp_viewable_invalidate_preview (GimpViewable *viewable)
{
g_return_if_fail (GIMP_IS_VIEWABLE (viewable));
g_signal_emit (G_OBJECT (viewable), viewable_signals[INVALIDATE_PREVIEW], 0);
g_signal_emit (viewable, viewable_signals[INVALIDATE_PREVIEW], 0);
}
void
@ -178,7 +178,7 @@ gimp_viewable_size_changed (GimpViewable *viewable)
{
g_return_if_fail (GIMP_IS_VIEWABLE (viewable));
g_signal_emit (G_OBJECT (viewable), viewable_signals[SIZE_CHANGED], 0);
g_signal_emit (viewable, viewable_signals[SIZE_CHANGED], 0);
}
static void

14
app/dialogs/about-dialog.c
View File

@ -139,16 +139,16 @@ about_dialog_create (void)
gimp_help_connect (about_dialog, gimp_standard_help_func,
"dialogs/about.html");
g_signal_connect (G_OBJECT (about_dialog), "destroy",
g_signal_connect (about_dialog, "destroy",
G_CALLBACK (about_dialog_destroy),
NULL);
g_signal_connect (G_OBJECT (about_dialog), "unmap",
g_signal_connect (about_dialog, "unmap",
G_CALLBACK (about_dialog_unmap),
NULL);
g_signal_connect (G_OBJECT (about_dialog), "button_press_event",
g_signal_connect (about_dialog, "button_press_event",
G_CALLBACK (about_dialog_button),
NULL);
g_signal_connect (G_OBJECT (about_dialog), "key_press_event",
g_signal_connect (about_dialog, "key_press_event",
G_CALLBACK (about_dialog_key),
NULL);
@ -188,7 +188,7 @@ about_dialog_create (void)
gtk_container_add (GTK_CONTAINER (aboutframe), logo_area);
gtk_widget_show (logo_area);
g_signal_connect (G_OBJECT (logo_area), "expose_event",
g_signal_connect (logo_area, "expose_event",
G_CALLBACK (about_dialog_logo_expose),
NULL);
@ -345,8 +345,8 @@ about_dialog_load_logo (GtkWidget *window)
GDK_RGB_DITHER_NORMAL,
0, 0);
g_object_unref (G_OBJECT (gc));
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (gc);
g_object_unref (pixbuf);
dissolve_width =
(logo_width / ANIMATION_SIZE) +

42
app/dialogs/color-dialog.c
View File

@ -355,10 +355,10 @@ color_notebook_new_internal (GimpViewable *viewable,
gtk_box_pack_start (GTK_BOX (left_vbox), cnp->notebook, TRUE, TRUE, 0);
gtk_widget_show (cnp->notebook);
g_signal_connect (G_OBJECT (cnp->notebook), "color_changed",
g_signal_connect (cnp->notebook, "color_changed",
G_CALLBACK (color_notebook_notebook_changed),
cnp);
g_signal_connect (G_OBJECT (GIMP_COLOR_NOTEBOOK (cnp->notebook)->notebook),
g_signal_connect (GIMP_COLOR_NOTEBOOK (cnp->notebook)->notebook,
"switch_page",
G_CALLBACK (color_notebook_switch_page),
cnp);
@ -388,7 +388,7 @@ color_notebook_new_internal (GimpViewable *viewable,
gtk_container_add (GTK_CONTAINER (color_frame), cnp->new_color);
gtk_widget_show (cnp->new_color);
g_signal_connect (G_OBJECT (cnp->new_color), "color_changed",
g_signal_connect (cnp->new_color, "color_changed",
G_CALLBACK (color_notebook_new_color_changed),
cnp);
@ -421,7 +421,7 @@ color_notebook_new_internal (GimpViewable *viewable,
gimp_help_set_help_data (button, _("Revert to old color"), NULL);
g_signal_connect_swapped (G_OBJECT (button), "clicked",
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (color_notebook_reset_clicked),
cnp);
@ -437,10 +437,10 @@ color_notebook_new_internal (GimpViewable *viewable,
gtk_box_pack_start (GTK_BOX (right_vbox), cnp->scales, TRUE, TRUE, 0);
gtk_widget_show (cnp->scales);
g_signal_connect (G_OBJECT (cnp->scales), "channel_changed",
g_signal_connect (cnp->scales, "channel_changed",
G_CALLBACK (color_notebook_channel_changed),
cnp);
g_signal_connect (G_OBJECT (cnp->scales), "color_changed",
g_signal_connect (cnp->scales, "color_changed",
G_CALLBACK (color_notebook_scales_changed),
cnp);
@ -460,7 +460,7 @@ color_notebook_new_internal (GimpViewable *viewable,
NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
g_signal_connect (button, "clicked",
G_CALLBACK (color_history_add_clicked),
cnp);
@ -489,11 +489,11 @@ color_notebook_new_internal (GimpViewable *viewable,
gtk_widget_show (cnp->history[i]);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
g_signal_connect (button, "clicked",
G_CALLBACK (color_history_color_clicked),
cnp);
g_signal_connect (G_OBJECT (cnp->history[i]), "color_changed",
g_signal_connect (cnp->history[i], "color_changed",
G_CALLBACK (color_history_color_changed),
GINT_TO_POINTER (i));
}
@ -556,16 +556,16 @@ color_notebook_update (ColorNotebook *cnp,
if (update & UPDATE_NOTEBOOK)
{
g_signal_handlers_block_by_func (G_OBJECT (cnp->notebook),
G_CALLBACK (color_notebook_notebook_changed),
g_signal_handlers_block_by_func (cnp->notebook,
color_notebook_notebook_changed,
cnp);
gimp_color_selector_set_color (GIMP_COLOR_SELECTOR (cnp->notebook),
&cnp->rgb,
&cnp->hsv);
g_signal_handlers_unblock_by_func (G_OBJECT (cnp->notebook),
G_CALLBACK (color_notebook_notebook_changed),
g_signal_handlers_unblock_by_func (cnp->notebook,
color_notebook_notebook_changed,
cnp);
}
@ -575,16 +575,16 @@ color_notebook_update (ColorNotebook *cnp,
if (update & UPDATE_SCALES)
{
g_signal_handlers_block_by_func (G_OBJECT (cnp->scales),
G_CALLBACK (color_notebook_scales_changed),
g_signal_handlers_block_by_func (cnp->scales,
color_notebook_scales_changed,
cnp);
gimp_color_selector_set_color (GIMP_COLOR_SELECTOR (cnp->scales),
&cnp->rgb,
&cnp->hsv);
g_signal_handlers_unblock_by_func (G_OBJECT (cnp->scales),
G_CALLBACK (color_notebook_scales_changed),
g_signal_handlers_unblock_by_func (cnp->scales,
color_notebook_scales_changed,
cnp);
}
@ -594,14 +594,14 @@ color_notebook_update (ColorNotebook *cnp,
if (update & UPDATE_NEW_COLOR)
{
g_signal_handlers_block_by_func (G_OBJECT (cnp->new_color),
g_signal_handlers_block_by_func (cnp->new_color,
color_notebook_new_color_changed,
cnp);
gimp_color_area_set_color (GIMP_COLOR_AREA (cnp->new_color),
&cnp->rgb);
g_signal_handlers_unblock_by_func (G_OBJECT (cnp->new_color),
g_signal_handlers_unblock_by_func (cnp->new_color,
color_notebook_new_color_changed,
cnp);
}
@ -751,14 +751,14 @@ color_history_color_changed (GtkWidget *widget,
if (notebook->history[color_index] == widget)
continue;
g_signal_handlers_block_by_func (G_OBJECT (notebook->history[color_index]),
g_signal_handlers_block_by_func (notebook->history[color_index],
color_history_color_changed,
data);
gimp_color_area_set_color
(GIMP_COLOR_AREA (notebook->history[color_index]), &changed_color);
g_signal_handlers_unblock_by_func (G_OBJECT (notebook->history[color_index]),
g_signal_handlers_unblock_by_func (notebook->history[color_index],
color_history_color_changed,
data);
}

22
app/dialogs/convert-dialog.c
View File

@ -140,7 +140,7 @@ convert_to_indexed (GimpImage *gimage)
NULL);
g_signal_connect (G_OBJECT (dialog->shell), "destroy",
g_signal_connect (dialog->shell, "destroy",
G_CALLBACK (indexed_destroy_callback),
dialog);
@ -171,7 +171,7 @@ convert_to_indexed (GimpImage *gimage)
g_object_set_data (G_OBJECT (toggle), "gimp-item-data",
GINT_TO_POINTER (GIMP_MAKE_PALETTE));
g_signal_connect (G_OBJECT (toggle), "toggled",
g_signal_connect (toggle, "toggled",
G_CALLBACK (gimp_radio_button_update),
&dialog->palette_type);
@ -185,7 +185,7 @@ convert_to_indexed (GimpImage *gimage)
gtk_box_pack_end (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_widget_show (spinbutton);
g_signal_connect (G_OBJECT (adjustment), "value_changed",
g_signal_connect (adjustment, "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&dialog->num_colors);
@ -219,7 +219,7 @@ convert_to_indexed (GimpImage *gimage)
g_object_set_data (G_OBJECT (toggle), "gimp-item-data",
GINT_TO_POINTER (GIMP_WEB_PALETTE));
g_signal_connect (G_OBJECT (toggle), "toggled",
g_signal_connect (toggle, "toggled",
G_CALLBACK (gimp_radio_button_update),
&dialog->palette_type);
}
@ -237,7 +237,7 @@ convert_to_indexed (GimpImage *gimage)
g_object_set_data (G_OBJECT (toggle), "gimp-item-data",
GINT_TO_POINTER (GIMP_MONO_PALETTE));
g_signal_connect (G_OBJECT (toggle), "toggled",
g_signal_connect (toggle, "toggled",
G_CALLBACK (gimp_radio_button_update),
&dialog->palette_type);
@ -249,7 +249,7 @@ convert_to_indexed (GimpImage *gimage)
remove_toggle = gtk_check_button_new_with_label (_("Remove Unused Colors from Final Palette"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (remove_toggle),
dialog->remove_dups);
g_signal_connect (G_OBJECT (remove_toggle), "toggled",
g_signal_connect (remove_toggle, "toggled",
G_CALLBACK (gimp_toggle_button_update),
&dialog->remove_dups);
@ -266,12 +266,12 @@ convert_to_indexed (GimpImage *gimage)
g_object_set_data (G_OBJECT (toggle), "gimp-item-data",
GINT_TO_POINTER (GIMP_CUSTOM_PALETTE));
g_signal_connect (G_OBJECT (toggle), "toggled",
g_signal_connect (toggle, "toggled",
G_CALLBACK (gimp_radio_button_update),
&dialog->palette_type);
g_object_set_data (G_OBJECT (toggle), "set_sensitive", remove_toggle);
g_signal_connect (G_OBJECT (dialog->custom_palette_button), "clicked",
g_signal_connect (dialog->custom_palette_button, "clicked",
G_CALLBACK (indexed_custom_palette_button_callback),
dialog);
gtk_box_pack_end (GTK_BOX (hbox),
@ -324,7 +324,7 @@ convert_to_indexed (GimpImage *gimage)
dialog->alpha_dither);
gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
gtk_widget_show (toggle);
g_signal_connect (G_OBJECT (toggle), "toggled",
g_signal_connect (toggle, "toggled",
G_CALLBACK (gimp_toggle_button_update),
&dialog->alpha_dither);
@ -518,10 +518,10 @@ indexed_custom_palette_button_callback (GtkWidget *widget,
GIMP_OBJECT (theCustomPalette)->name,
NULL);
g_signal_connect (G_OBJECT (dialog->palette_select->shell), "destroy",
g_signal_connect (dialog->palette_select->shell, "destroy",
G_CALLBACK (indexed_palette_select_destroy_callback),
dialog);
g_signal_connect (G_OBJECT (dialog->palette_select->context),
g_signal_connect (dialog->palette_select->context,
"palette_changed",
G_CALLBACK (indexed_palette_select_palette),
dialog);

46
app/dialogs/dialogs-constructors.c
View File

@ -811,7 +811,7 @@ dialogs_indexed_palette_new (GimpDialogFactory *factory,
gimp_dockable_set_context (GIMP_DOCKABLE (dockable), context);
g_signal_connect (G_OBJECT (view), "selected",
g_signal_connect (view, "selected",
G_CALLBACK (dialogs_indexed_palette_selected),
dockable);
@ -1044,9 +1044,9 @@ dialogs_brush_tab_func (GimpDockable *dockable,
width, height, 1,
FALSE, FALSE, FALSE);
g_signal_connect_object (G_OBJECT (context), "brush_changed",
g_signal_connect_object (context, "brush_changed",
G_CALLBACK (gimp_preview_set_viewable),
G_OBJECT (preview),
preview,
G_CONNECT_SWAPPED);
return preview;
@ -1071,9 +1071,9 @@ dialogs_pattern_tab_func (GimpDockable *dockable,
width, height, 1,
FALSE, FALSE, FALSE);
g_signal_connect_object (G_OBJECT (context), "pattern_changed",
g_signal_connect_object (context, "pattern_changed",
G_CALLBACK (gimp_preview_set_viewable),
G_OBJECT (preview),
preview,
G_CONNECT_SWAPPED);
return preview;
@ -1098,9 +1098,9 @@ dialogs_gradient_tab_func (GimpDockable *dockable,
width, height, 1,
FALSE, FALSE, FALSE);
g_signal_connect_object (G_OBJECT (context), "gradient_changed",
g_signal_connect_object (context, "gradient_changed",
G_CALLBACK (gimp_preview_set_viewable),
G_OBJECT (preview),
preview,
G_CONNECT_SWAPPED);
return preview;
@ -1125,9 +1125,9 @@ dialogs_palette_tab_func (GimpDockable *dockable,
width, height, 1,
FALSE, FALSE, FALSE);
g_signal_connect_object (G_OBJECT (context), "palette_changed",
g_signal_connect_object (context, "palette_changed",
G_CALLBACK (gimp_preview_set_viewable),
G_OBJECT (preview),
preview,
G_CONNECT_SWAPPED);
return preview;
@ -1154,9 +1154,9 @@ dialogs_tool_tab_func (GimpDockable *dockable,
image = gtk_image_new_from_stock (gimp_context_get_tool (context)->stock_id,
size);
g_signal_connect_object (G_OBJECT (context), "tool_changed",
g_signal_connect_object (context, "tool_changed",
G_CALLBACK (dialogs_tool_tab_tool_changed),
G_OBJECT (image),
image,
0);
return image;
@ -1212,9 +1212,9 @@ dialogs_tool_options_tab_func (GimpDockable *dockable,
g_object_set_data (G_OBJECT (label), "tool-icon", image);
g_signal_connect_object (G_OBJECT (context), "tool_changed",
g_signal_connect_object (context, "tool_changed",
G_CALLBACK (dialogs_tool_options_tool_changed),
G_OBJECT (label),
label,
0);
return hbox;
@ -1297,14 +1297,14 @@ dialogs_set_image_item_context_func (GimpDockable *dockable,
{
if (dockable->context)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (dockable->context),
g_signal_handlers_disconnect_by_func (dockable->context,
dialogs_image_item_view_image_changed,
view);
}
if (context)
{
g_signal_connect (G_OBJECT (context), "image_changed",
g_signal_connect (context, "image_changed",
G_CALLBACK (dialogs_image_item_view_image_changed),
view);
@ -1332,14 +1332,14 @@ dialogs_set_path_context_func (GimpDockable *dockable,
{
if (dockable->context)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (dockable->context),
g_signal_handlers_disconnect_by_func (dockable->context,
dialogs_path_view_image_changed,
view);
}
if (context)
{
g_signal_connect (G_OBJECT (context), "image_changed",
g_signal_connect (context, "image_changed",
G_CALLBACK (dialogs_path_view_image_changed),
view);
@ -1367,14 +1367,14 @@ dialogs_set_indexed_palette_context_func (GimpDockable *dockable,
{
if (dockable->context)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (dockable->context),
g_signal_handlers_disconnect_by_func (dockable->context,
dialogs_indexed_palette_image_changed,
view);
}
if (context)
{
g_signal_connect (G_OBJECT (context), "image_changed",
g_signal_connect (context, "image_changed",
G_CALLBACK (dialogs_indexed_palette_image_changed),
view);
@ -1402,14 +1402,14 @@ dialogs_set_selection_editor_context_func (GimpDockable *dockable,
{
if (dockable->context)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (dockable->context),
g_signal_handlers_disconnect_by_func (dockable->context,
dialogs_selection_editor_image_changed,
view);
}
if (context)
{
g_signal_connect (G_OBJECT (context), "image_changed",
g_signal_connect (context, "image_changed",
G_CALLBACK (dialogs_selection_editor_image_changed),
view);
@ -1437,14 +1437,14 @@ dialogs_set_navigation_context_func (GimpDockable *dockable,
{
if (dockable->context)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (dockable->context),
g_signal_handlers_disconnect_by_func (dockable->context,
dialogs_navigation_display_changed,
view);
}
if (context)
{
g_signal_connect (G_OBJECT (context), "display_changed",
g_signal_connect (context, "display_changed",
G_CALLBACK (dialogs_navigation_display_changed),
view);

6
app/dialogs/dialogs.c
View File

@ -136,7 +136,7 @@ dialogs_exit (Gimp *gimp)
{
if (global_dialog_factory)
{
g_object_unref (G_OBJECT (global_dialog_factory));
g_object_unref (global_dialog_factory);
global_dialog_factory = NULL;
}
@ -148,13 +148,13 @@ dialogs_exit (Gimp *gimp)
*/
if (global_toolbox_factory)
{
g_object_unref (G_OBJECT (global_toolbox_factory));
g_object_unref (global_toolbox_factory);
global_toolbox_factory = NULL;
}
if (global_dock_factory)
{
g_object_unref (G_OBJECT (global_dock_factory));
g_object_unref (global_dock_factory);
global_dock_factory = NULL;
}
}

6
app/dialogs/file-dialog-utils.c
View File

@ -70,14 +70,14 @@ file_dialog_new (Gimp *gimp,
gtk_container_set_border_width (GTK_CONTAINER (fs->button_area), 2);
gtk_container_set_border_width (GTK_CONTAINER (filesel), 2);
g_signal_connect_swapped (G_OBJECT (fs->cancel_button), "clicked",
g_signal_connect_swapped (fs->cancel_button, "clicked",
G_CALLBACK (file_dialog_hide),
filesel);
g_signal_connect (G_OBJECT (filesel), "delete_event",
g_signal_connect (filesel, "delete_event",
G_CALLBACK (file_dialog_hide),
NULL);
g_signal_connect (G_OBJECT (fs->ok_button), "clicked",
g_signal_connect (fs->ok_button, "clicked",
G_CALLBACK (ok_callback),
filesel);

20
app/dialogs/file-open-dialog.c
View File

@ -254,7 +254,7 @@ file_open_dialog_create (Gimp *gimp)
gchar *str;
/* Catch file-list clicks so we can update the preview thumbnail */
g_signal_connect (G_OBJECT (tree_sel), "changed",
g_signal_connect (tree_sel, "changed",
G_CALLBACK (file_open_selchanged_callback),
open_dialog);
@ -274,7 +274,7 @@ file_open_dialog_create (Gimp *gimp)
gtk_container_add (GTK_CONTAINER (open_options_frame), ebox);
gtk_widget_show (ebox);
g_signal_connect (G_OBJECT (ebox), "button_press_event",
g_signal_connect (ebox, "button_press_event",
G_CALLBACK (file_open_thumbnail_button_press),
open_dialog);
@ -300,16 +300,16 @@ file_open_dialog_create (Gimp *gimp)
gtk_container_add (GTK_CONTAINER (button), label);
gtk_widget_show (label);
g_signal_connect (G_OBJECT (button), "button_press_event",
g_signal_connect (button, "button_press_event",
G_CALLBACK (gtk_true),
NULL);
g_signal_connect (G_OBJECT (button), "button_release_event",
g_signal_connect (button, "button_release_event",
G_CALLBACK (gtk_true),
NULL);
g_signal_connect (G_OBJECT (button), "enter_notify_event",
g_signal_connect (button, "enter_notify_event",
G_CALLBACK (gtk_true),
NULL);
g_signal_connect (G_OBJECT (button), "leave_notify_event",
g_signal_connect (button, "leave_notify_event",
G_CALLBACK (gtk_true),
NULL);
@ -341,10 +341,10 @@ file_open_dialog_create (Gimp *gimp)
gtk_label_set_mnemonic_widget (GTK_LABEL (label), open_options_preview);
g_signal_connect (G_OBJECT (open_options_preview), "clicked",
g_signal_connect (open_options_preview, "clicked",
G_CALLBACK (file_open_thumbnail_clicked),
open_dialog);
g_signal_connect (G_OBJECT (open_options_preview), "extended_clicked",
g_signal_connect (open_options_preview, "extended_clicked",
G_CALLBACK (file_open_thumbnail_ext_clicked),
open_dialog);
@ -367,7 +367,7 @@ file_open_dialog_create (Gimp *gimp)
gtk_widget_set_size_request (label, -1, requisition.height);
}
g_signal_connect (G_OBJECT (open_options_imagefile), "info_changed",
g_signal_connect (open_options_imagefile, "info_changed",
G_CALLBACK (file_open_imagefile_info_changed),
label);
@ -502,7 +502,7 @@ file_open_create_thumbnail (const gchar *filename,
gimp_imagefile_create_thumbnail (imagefile, size);
}
g_object_unref (G_OBJECT (imagefile));
g_object_unref (imagefile);
basename = file_utils_uri_to_utf8_basename (uri);
gtk_label_set_text (GTK_LABEL (open_options_title), basename);

14
app/dialogs/image-new-dialog.c
View File

@ -285,10 +285,10 @@ file_new_dialog_create (Gimp *gimp,
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (info->size_se), 1,
info->values->height);
g_signal_connect (G_OBJECT (info->size_se), "refval_changed",
g_signal_connect (info->size_se, "refval_changed",
G_CALLBACK (file_new_image_size_callback),
info);
g_signal_connect (G_OBJECT (info->size_se), "value_changed",
g_signal_connect (info->size_se, "value_changed",
G_CALLBACK (file_new_image_size_callback),
info);
@ -348,7 +348,7 @@ file_new_dialog_create (Gimp *gimp,
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (info->resolution_se), 1,
info->values->yresolution);
g_signal_connect (G_OBJECT (info->resolution_se), "value_changed",
g_signal_connect (info->resolution_se, "value_changed",
G_CALLBACK (file_new_resolution_callback),
info);
@ -456,7 +456,7 @@ file_new_reset_callback (GtkWidget *widget,
config = info->gimp->config;
g_signal_handlers_block_by_func (G_OBJECT (info->resolution_se),
g_signal_handlers_block_by_func (info->resolution_se,
file_new_resolution_callback,
info);
@ -472,7 +472,7 @@ file_new_reset_callback (GtkWidget *widget,
gimp_size_entry_set_unit (GIMP_SIZE_ENTRY (info->resolution_se),
config->default_resolution_unit);
g_signal_handlers_unblock_by_func (G_OBJECT (info->resolution_se),
g_signal_handlers_unblock_by_func (info->resolution_se,
file_new_resolution_callback,
info);
@ -594,7 +594,7 @@ file_new_resolution_callback (GtkWidget *widget,
if (gimp_chain_button_get_active
(GIMP_CHAIN_BUTTON (info->couple_resolutions)))
{
g_signal_handlers_block_by_func (G_OBJECT (info->resolution_se),
g_signal_handlers_block_by_func (info->resolution_se,
file_new_resolution_callback,
info);
@ -610,7 +610,7 @@ file_new_resolution_callback (GtkWidget *widget,
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (widget), 0, xres);
}
g_signal_handlers_unblock_by_func (G_OBJECT (info->resolution_se),
g_signal_handlers_unblock_by_func (info->resolution_se,
file_new_resolution_callback,
info);
}

12
app/dialogs/info-dialog.c
View File

@ -164,7 +164,7 @@ info_dialog_add_entry (InfoDialog *idialog,
gtk_entry_set_text (GTK_ENTRY (entry), text_ptr ? text_ptr : "");
if (callback)
g_signal_connect (G_OBJECT (entry), "changed",
g_signal_connect (entry, "changed",
callback,
callback_data);
@ -203,7 +203,7 @@ info_dialog_add_scale (InfoDialog *idialog,
gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);
if (callback)
g_signal_connect (G_OBJECT (adjustment), "value_changed",
g_signal_connect (adjustment, "value_changed",
callback,
callback_data);
@ -244,7 +244,7 @@ info_dialog_add_spinbutton (InfoDialog *idialog,
gtk_entry_set_width_chars (GTK_ENTRY (spinbutton), SB_WIDTH);
if (callback)
g_signal_connect (G_OBJECT (adjustment), "value_changed",
g_signal_connect (adjustment, "value_changed",
callback,
callback_data);
@ -290,7 +290,7 @@ info_dialog_add_sizeentry (InfoDialog *idialog,
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), i, value_ptr[i]);
if (callback)
g_signal_connect (G_OBJECT (sizeentry), "value_changed",
g_signal_connect (sizeentry, "value_changed",
callback,
callback_data);
@ -428,7 +428,7 @@ info_dialog_update_field (InfoField *field)
return;
if (field->field_type != INFO_LABEL)
g_signal_handlers_block_by_func (G_OBJECT (field->obj),
g_signal_handlers_block_by_func (field->obj,
field->callback,
field->callback_data);
@ -463,7 +463,7 @@ info_dialog_update_field (InfoField *field)
}
if (field->field_type != INFO_LABEL)
g_signal_handlers_unblock_by_func (G_OBJECT (field->obj),
g_signal_handlers_unblock_by_func (field->obj,
field->callback,
field->callback_data);
}

4
app/dialogs/info-window.c
View File

@ -310,7 +310,7 @@ info_window_create_extended (InfoDialog *info_win,
/* Set back to first page */
gtk_notebook_set_current_page (GTK_NOTEBOOK (info_win->info_notebook), 0);
g_signal_connect (G_OBJECT (info_win->info_notebook), "switch_page",
g_signal_connect (info_win->info_notebook, "switch_page",
G_CALLBACK (info_window_page_switch),
info_win);
}
@ -416,7 +416,7 @@ info_window_follow_auto (Gimp *gimp)
{
info_window_auto = info_window_create (gdisp);
g_signal_connect (G_OBJECT (context), "display_changed",
g_signal_connect (context, "display_changed",
G_CALLBACK (info_window_change_display),
NULL);

20
app/dialogs/module-dialog.c
View File

@ -157,7 +157,7 @@ module_browser_new (Gimp *gimp)
rend = gtk_cell_renderer_toggle_new ();
g_signal_connect (G_OBJECT (rend), "toggled",
g_signal_connect (rend, "toggled",
G_CALLBACK (browser_autoload_toggled),
browser);
@ -194,7 +194,7 @@ module_browser_new (Gimp *gimp)
gtk_box_pack_start (GTK_BOX (hbox), browser->button, TRUE, TRUE, 0);
gtk_widget_show (browser->button);
g_signal_connect (G_OBJECT (browser->button), "clicked",
g_signal_connect (browser->button, "clicked",
G_CALLBACK (browser_load_unload_callback),
browser);
@ -204,7 +204,7 @@ module_browser_new (Gimp *gimp)
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv));
g_signal_connect (G_OBJECT (sel), "changed",
g_signal_connect (sel, "changed",
G_CALLBACK (browser_select_callback),
browser);
@ -214,17 +214,17 @@ module_browser_new (Gimp *gimp)
/* hook the GimpModuleDB signals so we can refresh the display
* appropriately.
*/
g_signal_connect (G_OBJECT (gimp->module_db), "add",
g_signal_connect (gimp->module_db, "add",
G_CALLBACK (browser_info_add),
browser);
g_signal_connect (G_OBJECT (gimp->module_db), "remove",
g_signal_connect (gimp->module_db, "remove",
G_CALLBACK (browser_info_remove),
browser);
g_signal_connect (G_OBJECT (gimp->module_db), "module_modified",
g_signal_connect (gimp->module_db, "module_modified",
G_CALLBACK (browser_info_update),
browser);
g_signal_connect (G_OBJECT (shell), "destroy",
g_signal_connect (shell, "destroy",
G_CALLBACK (browser_destroy_callback),
browser);
@ -245,13 +245,13 @@ static void
browser_destroy_callback (GtkWidget *widget,
ModuleBrowser *browser)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (browser->gimp->module_db),
g_signal_handlers_disconnect_by_func (browser->gimp->module_db,
browser_info_add,
browser);
g_signal_handlers_disconnect_by_func (G_OBJECT (browser->gimp->module_db),
g_signal_handlers_disconnect_by_func (browser->gimp->module_db,
browser_info_remove,
browser);
g_signal_handlers_disconnect_by_func (G_OBJECT (browser->gimp->module_db),
g_signal_handlers_disconnect_by_func (browser->gimp->module_db,
browser_info_update,
browser);

4
app/dialogs/offset-dialog.c
View File

@ -179,7 +179,7 @@ offset_dialog_create (GimpDrawable *drawable)
gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
g_signal_connect (button, "clicked",
G_CALLBACK (offset_halfheight_callback),
off_d);
@ -189,7 +189,7 @@ offset_dialog_create (GimpDrawable *drawable)
gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, FALSE, 0);
gtk_widget_show (check);
g_signal_connect (G_OBJECT (check), "toggled",
g_signal_connect (check, "toggled",
G_CALLBACK (gimp_toggle_button_update),
&off_d->wrap_around);

28
app/dialogs/palette-import-dialog.c
View File

@ -217,7 +217,7 @@ palette_import_dialog_new (Gimp *gimp)
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (import_dialog->gradient_radio));
g_signal_connect (G_OBJECT (import_dialog->gradient_radio), "toggled",
g_signal_connect (import_dialog->gradient_radio, "toggled",
G_CALLBACK (palette_import_grad_callback),
import_dialog);
@ -227,7 +227,7 @@ palette_import_dialog_new (Gimp *gimp)
0, 1, 1, 2);
gtk_widget_show (import_dialog->image_radio);
g_signal_connect (G_OBJECT (import_dialog->image_radio), "toggled",
g_signal_connect (import_dialog->image_radio, "toggled",
G_CALLBACK (palette_import_image_callback),
import_dialog);
@ -307,7 +307,7 @@ palette_import_dialog_new (Gimp *gimp)
TRUE, 0.0, 0.0,
NULL, NULL));
g_signal_connect_swapped (G_OBJECT (import_dialog->num_colors),
g_signal_connect_swapped (import_dialog->num_colors,
"value_changed",
G_CALLBACK (palette_import_make_palette),
import_dialog);
@ -320,7 +320,7 @@ palette_import_dialog_new (Gimp *gimp)
TRUE, 0.0, 0.0,
NULL, NULL));
g_signal_connect (G_OBJECT (import_dialog->columns), "value_changed",
g_signal_connect (import_dialog->columns, "value_changed",
G_CALLBACK (palette_import_columns_changed),
import_dialog);
@ -333,7 +333,7 @@ palette_import_dialog_new (Gimp *gimp)
NULL, NULL));
gimp_scale_entry_set_sensitive (GTK_OBJECT (import_dialog->threshold), FALSE);
g_signal_connect_swapped (G_OBJECT (import_dialog->threshold), "value_changed",
g_signal_connect_swapped (import_dialog->threshold, "value_changed",
G_CALLBACK (palette_import_make_palette),
import_dialog);
@ -359,17 +359,17 @@ palette_import_dialog_new (Gimp *gimp)
/* keep the dialog up-to-date */
g_signal_connect (G_OBJECT (gimp->images), "add",
g_signal_connect (gimp->images, "add",
G_CALLBACK (palette_import_image_add),
import_dialog);
g_signal_connect (G_OBJECT (gimp->images), "remove",
g_signal_connect (gimp->images, "remove",
G_CALLBACK (palette_import_image_remove),
import_dialog);
g_signal_connect (G_OBJECT (import_dialog->context), "gradient_changed",
g_signal_connect (import_dialog->context, "gradient_changed",
G_CALLBACK (palette_import_gradient_changed),
import_dialog);
g_signal_connect (G_OBJECT (import_dialog->context), "image_changed",
g_signal_connect (import_dialog->context, "image_changed",
G_CALLBACK (palette_import_image_changed),
import_dialog);
@ -392,17 +392,17 @@ palette_import_close_callback (GtkWidget *widget,
gimp = import_dialog->context->gimp;
g_signal_handlers_disconnect_by_func (G_OBJECT (gimp->images),
g_signal_handlers_disconnect_by_func (gimp->images,
palette_import_image_add,
import_dialog);
g_signal_handlers_disconnect_by_func (G_OBJECT (gimp->images),
g_signal_handlers_disconnect_by_func (gimp->images,
palette_import_image_remove,
import_dialog);
g_object_unref (G_OBJECT (import_dialog->context));
g_object_unref (import_dialog->context);
if (import_dialog->palette)
g_object_unref (G_OBJECT (import_dialog->palette));
g_object_unref (import_dialog->palette);
gtk_widget_destroy (import_dialog->dialog);
g_free (import_dialog);
@ -627,7 +627,7 @@ palette_import_make_palette (ImportDialog *import_dialog)
if (palette)
{
if (import_dialog->palette)
g_object_unref (G_OBJECT (import_dialog->palette));
g_object_unref (import_dialog->palette);
palette->n_columns = n_columns;

28
app/dialogs/preferences-dialog.c
View File

@ -884,7 +884,7 @@ prefs_dialog_new (Gimp *gimp,
GDK_TYPE_PIXBUF, G_TYPE_STRING,
G_TYPE_INT, G_TYPE_STRING, GDK_TYPE_PIXBUF);
tv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (tree));
g_object_unref (G_OBJECT (tree));
g_object_unref (tree);
gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (tv), FALSE);
@ -962,7 +962,7 @@ prefs_dialog_new (Gimp *gimp,
g_object_set_data (G_OBJECT (notebook), "image", image);
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv));
g_signal_connect (G_OBJECT (sel), "changed",
g_signal_connect (sel, "changed",
G_CALLBACK (prefs_tree_select_callback),
notebook);
@ -1045,10 +1045,10 @@ prefs_dialog_new (Gimp *gimp,
gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (sizeentry2),
_("dpi"), 1, 4, 0.0);
g_signal_connect (G_OBJECT (sizeentry2), "value_changed",
g_signal_connect (sizeentry2, "value_changed",
G_CALLBACK (prefs_default_resolution_callback),
sizeentry);
g_signal_connect (G_OBJECT (sizeentry2), "refval_changed",
g_signal_connect (sizeentry2, "refval_changed",
G_CALLBACK (prefs_default_resolution_callback),
sizeentry);
@ -1100,7 +1100,7 @@ prefs_dialog_new (Gimp *gimp,
gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
gtk_widget_show (text_view);
g_object_unref (G_OBJECT (text_buffer));
g_object_unref (text_buffer);
/***************/
@ -1165,7 +1165,7 @@ prefs_dialog_new (Gimp *gimp,
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
g_signal_connect (button, "clicked",
G_CALLBACK (gimp_dialog_factories_session_clear),
NULL);
@ -1269,22 +1269,22 @@ prefs_dialog_new (Gimp *gimp,
g_list_free (input_children);
g_object_ref (G_OBJECT (input_vbox));
g_object_ref (input_vbox);
gtk_container_remove (GTK_CONTAINER (GTK_DIALOG (input_dialog)->vbox),
input_vbox);
gtk_box_pack_start (GTK_BOX (vbox2), input_vbox, TRUE, TRUE, 0);
g_object_unref (G_OBJECT (input_vbox));
g_object_unref (input_vbox);
g_object_weak_ref (G_OBJECT (input_vbox),
(GWeakNotify) gtk_widget_destroy,
input_dialog);
g_signal_connect (G_OBJECT (input_dialog), "enable_device",
g_signal_connect (input_dialog, "enable_device",
G_CALLBACK (prefs_input_dialog_able_callback),
NULL);
g_signal_connect (G_OBJECT (input_dialog), "disable_device",
g_signal_connect (input_dialog, "disable_device",
G_CALLBACK (prefs_input_dialog_able_callback),
NULL);
}
@ -1303,7 +1303,7 @@ prefs_dialog_new (Gimp *gimp,
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
gtk_widget_show (button);
g_signal_connect_swapped (G_OBJECT (button), "clicked",
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gimp_devices_save),
gimp);
@ -1499,7 +1499,7 @@ prefs_dialog_new (Gimp *gimp,
gtk_tree_view_append_column (GTK_TREE_VIEW (view), col);
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
g_signal_connect (G_OBJECT (sel), "changed",
g_signal_connect (sel, "changed",
G_CALLBACK (prefs_format_string_select_callback),
entry);
@ -1629,7 +1629,7 @@ prefs_dialog_new (Gimp *gimp,
gtk_widget_set_sensitive (calibrate_button,
! display_config->monitor_res_from_gdk);
g_signal_connect (G_OBJECT (calibrate_button), "clicked",
g_signal_connect (calibrate_button, "clicked",
G_CALLBACK (prefs_resolution_calibrate_callback),
sizeentry);
@ -1650,7 +1650,7 @@ prefs_dialog_new (Gimp *gimp,
g_object_set_data (G_OBJECT (sizeentry), "inverse_sensitive",
calibrate_button);
g_signal_connect (G_OBJECT (button), "toggled",
g_signal_connect (button, "toggled",
G_CALLBACK (prefs_res_source_callback),
config);

62
app/dialogs/resize-dialog.c
View File

@ -357,10 +357,10 @@ resize_widget_new (GimpViewable *viewable,
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->size_se), 0, width);
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->size_se), 1, height);
g_signal_connect (G_OBJECT (private->size_se), "value_changed",
g_signal_connect (private->size_se, "value_changed",
G_CALLBACK (size_callback),
resize);
g_signal_connect (G_OBJECT (private->size_se), "unit_changed",
g_signal_connect (private->size_se, "unit_changed",
G_CALLBACK (orig_labels_update),
resize);
@ -402,7 +402,7 @@ resize_widget_new (GimpViewable *viewable,
gtk_table_attach_defaults (GTK_TABLE (table2), spinbutton, 0, 1, 0, 1);
gtk_widget_show (spinbutton);
g_signal_connect (G_OBJECT ( private->ratio_x_adj), "value_changed",
g_signal_connect (private->ratio_x_adj, "value_changed",
G_CALLBACK (ratio_callback),
resize);
@ -417,7 +417,7 @@ resize_widget_new (GimpViewable *viewable,
gtk_table_attach_defaults (GTK_TABLE (table2), spinbutton, 0, 1, 1, 2);
gtk_widget_show (spinbutton);
g_signal_connect (G_OBJECT (private->ratio_y_adj), "value_changed",
g_signal_connect (private->ratio_y_adj, "value_changed",
G_CALLBACK (ratio_callback),
resize);
@ -494,7 +494,7 @@ resize_widget_new (GimpViewable *viewable,
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->offset_se), 0, 0);
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->offset_se), 1, 0);
g_signal_connect (G_OBJECT (private->offset_se), "value_changed",
g_signal_connect (private->offset_se, "value_changed",
G_CALLBACK (offset_update),
resize);
@ -504,7 +504,7 @@ resize_widget_new (GimpViewable *viewable,
4, 5, 1, 2);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
g_signal_connect (button, "clicked",
G_CALLBACK (offset_center_clicked),
resize);
@ -523,7 +523,7 @@ resize_widget_new (GimpViewable *viewable,
gtk_container_add (GTK_CONTAINER (frame), private->offset_area);
gtk_widget_show (private->offset_area);
g_signal_connect (G_OBJECT (private->offset_area), "offsets_changed",
g_signal_connect (private->offset_area, "offsets_changed",
G_CALLBACK (offset_area_offsets_changed),
resize);
@ -608,10 +608,10 @@ resize_widget_new (GimpViewable *viewable,
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->printsize_se),
1, resize->height);
g_signal_connect (G_OBJECT (private->printsize_se), "value_changed",
g_signal_connect (private->printsize_se, "value_changed",
G_CALLBACK (printsize_update),
resize);
g_signal_connect (G_OBJECT (private->printsize_se), "unit_changed",
g_signal_connect (private->printsize_se, "unit_changed",
G_CALLBACK (unit_update),
resize);
@ -665,7 +665,7 @@ resize_widget_new (GimpViewable *viewable,
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->resolution_se),
1, resize->resolution_y);
g_signal_connect (G_OBJECT (private->resolution_se), "value_changed",
g_signal_connect (private->resolution_se, "value_changed",
G_CALLBACK (resolution_callback),
resize);
@ -840,7 +840,7 @@ offset_center_clicked (GtkWidget *widget,
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->offset_se), 0, off_x);
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->offset_se), 1, off_y);
g_signal_emit_by_name (G_OBJECT (private->offset_se), "value_changed", 0);
g_signal_emit_by_name (private->offset_se, "value_changed", 0);
}
static void
@ -971,7 +971,7 @@ size_update (Resize *resize,
gimp_offset_area_set_size (GIMP_OFFSET_AREA (private->offset_area),
resize->width, resize->height);
g_signal_handlers_block_by_func (G_OBJECT (private->size_se),
g_signal_handlers_block_by_func (private->size_se,
size_callback,
resize);
@ -980,24 +980,24 @@ size_update (Resize *resize,
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->size_se),
1, height);
g_signal_handlers_unblock_by_func (G_OBJECT (private->size_se),
g_signal_handlers_unblock_by_func (private->size_se,
size_callback,
resize);
g_signal_handlers_block_by_func (G_OBJECT (private->ratio_x_adj),
g_signal_handlers_block_by_func (private->ratio_x_adj,
ratio_callback,
resize);
g_signal_handlers_block_by_func (G_OBJECT (private->ratio_y_adj),
g_signal_handlers_block_by_func (private->ratio_y_adj,
ratio_callback,
resize);
gtk_adjustment_set_value (GTK_ADJUSTMENT (private->ratio_x_adj), ratio_x);
gtk_adjustment_set_value (GTK_ADJUSTMENT (private->ratio_y_adj), ratio_y);
g_signal_handlers_unblock_by_func (G_OBJECT (private->ratio_x_adj),
g_signal_handlers_unblock_by_func (private->ratio_x_adj,
ratio_callback,
resize);
g_signal_handlers_unblock_by_func (G_OBJECT (private->ratio_y_adj),
g_signal_handlers_unblock_by_func (private->ratio_y_adj,
ratio_callback,
resize);
@ -1015,7 +1015,7 @@ size_update (Resize *resize,
if ((resize->type == ScaleWidget) && (resize->target == ResizeImage))
{
g_signal_handlers_block_by_func (G_OBJECT (private->printsize_se),
g_signal_handlers_block_by_func (private->printsize_se,
printsize_update,
resize);
@ -1024,7 +1024,7 @@ size_update (Resize *resize,
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->printsize_se),
1, height);
g_signal_handlers_unblock_by_func (G_OBJECT (private->printsize_se),
g_signal_handlers_unblock_by_func (private->printsize_se,
printsize_update,
resize);
}
@ -1100,7 +1100,7 @@ printsize_update (GtkWidget *widget,
resize->resolution_x = res_x;
resize->resolution_y = res_y;
g_signal_handlers_block_by_func (G_OBJECT (private->resolution_se),
g_signal_handlers_block_by_func (private->resolution_se,
resolution_callback,
resize);
@ -1109,11 +1109,11 @@ printsize_update (GtkWidget *widget,
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->resolution_se),
1, res_y);
g_signal_handlers_unblock_by_func (G_OBJECT (private->resolution_se),
g_signal_handlers_unblock_by_func (private->resolution_se,
resolution_callback,
resize);
g_signal_handlers_block_by_func (GTK_OBJECT (private->size_se),
g_signal_handlers_block_by_func (private->size_se,
size_callback,
resize);
@ -1126,11 +1126,11 @@ printsize_update (GtkWidget *widget,
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->size_se),
1, height);
g_signal_handlers_unblock_by_func (G_OBJECT (private->size_se),
g_signal_handlers_unblock_by_func (private->size_se,
size_callback,
resize);
g_signal_handlers_block_by_func (G_OBJECT (private->printsize_se),
g_signal_handlers_block_by_func (private->printsize_se,
printsize_update,
resize);
@ -1143,7 +1143,7 @@ printsize_update (GtkWidget *widget,
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->printsize_se),
1, height);
g_signal_handlers_unblock_by_func (G_OBJECT (private->printsize_se),
g_signal_handlers_unblock_by_func (private->printsize_se,
printsize_update,
resize);
}
@ -1194,7 +1194,7 @@ resolution_update (Resize *resize,
resize->resolution_x = res_x;
resize->resolution_y = res_y;
g_signal_handlers_block_by_func (G_OBJECT (private->resolution_se),
g_signal_handlers_block_by_func (private->resolution_se,
resolution_callback,
resize);
@ -1203,11 +1203,11 @@ resolution_update (Resize *resize,
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (private->resolution_se),
1, res_y);
g_signal_handlers_unblock_by_func (G_OBJECT (private->resolution_se),
g_signal_handlers_unblock_by_func (private->resolution_se,
resolution_callback,
resize);
g_signal_handlers_block_by_func (GTK_OBJECT (private->size_se),
g_signal_handlers_block_by_func (private->size_se,
size_callback,
resize);
@ -1216,11 +1216,11 @@ resolution_update (Resize *resize,
gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->size_se),
1, res_y, TRUE);
g_signal_handlers_unblock_by_func (G_OBJECT (private->size_se),
g_signal_handlers_unblock_by_func (private->size_se,
size_callback,
resize);
g_signal_handlers_block_by_func (G_OBJECT (private->printsize_se),
g_signal_handlers_block_by_func (private->printsize_se,
printsize_update,
resize);
@ -1229,7 +1229,7 @@ resolution_update (Resize *resize,
gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (private->printsize_se),
1, res_y, TRUE);
g_signal_handlers_unblock_by_func (GTK_OBJECT (private->printsize_se),
g_signal_handlers_unblock_by_func (private->printsize_se,
printsize_update,
resize);
}

20
app/dialogs/resolution-calibrate-dialog.c
View File

@ -125,16 +125,16 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry,
NULL);
g_signal_connect (G_OBJECT (dialog), "destroy",
g_signal_connect (dialog, "destroy",
G_CALLBACK (gtk_main_quit),
NULL);
g_object_set_data (G_OBJECT (dialog), "resolution-entry", resolution_entry);
g_signal_connect_object (G_OBJECT (resolution_entry), "destroy",
g_signal_connect_object (resolution_entry, "destroy",
G_CALLBACK (gtk_widget_destroy),
G_OBJECT (dialog), G_CONNECT_SWAPPED);
g_signal_connect_object (G_OBJECT (resolution_entry), "unmap",
dialog, G_CONNECT_SWAPPED);
g_signal_connect_object (resolution_entry, "unmap",
G_CALLBACK (gtk_widget_destroy),
G_OBJECT (dialog), G_CONNECT_SWAPPED);
dialog, G_CONNECT_SWAPPED);
SET_STYLE (dialog, dialog_style);
gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 8);
@ -188,7 +188,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry,
SET_STYLE (darea, dialog_style);
gtk_widget_set_size_request (darea, 16, 16);
if (expose_callback)
g_signal_connect (G_OBJECT (darea), "expose_event",
g_signal_connect (darea, "expose_event",
G_CALLBACK (expose_callback),
GINT_TO_POINTER (GTK_CORNER_TOP_LEFT));
gtk_table_attach (GTK_TABLE (table), darea, 0, 1, 0, 1,
@ -199,7 +199,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry,
SET_STYLE (darea, dialog_style);
gtk_widget_set_size_request (darea, 16, 16);
if (expose_callback)
g_signal_connect (G_OBJECT (darea), "expose_event",
g_signal_connect (darea, "expose_event",
G_CALLBACK (expose_callback),
GINT_TO_POINTER (GTK_CORNER_BOTTOM_LEFT));
gtk_table_attach (GTK_TABLE (table), darea, 0, 1, 2, 3,
@ -210,7 +210,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry,
SET_STYLE (darea, dialog_style);
gtk_widget_set_size_request (darea, 16, 16);
if (expose_callback)
g_signal_connect (G_OBJECT (darea), "expose_event",
g_signal_connect (darea, "expose_event",
G_CALLBACK (expose_callback),
GINT_TO_POINTER (GTK_CORNER_TOP_RIGHT));
gtk_table_attach (GTK_TABLE (table), darea, 2, 3, 0, 1,
@ -221,7 +221,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry,
SET_STYLE (darea, dialog_style);
gtk_widget_set_size_request (darea, 16, 16);
if (expose_callback)
g_signal_connect (G_OBJECT (darea), "expose_event",
g_signal_connect (darea, "expose_event",
G_CALLBACK (expose_callback),
GINT_TO_POINTER (GTK_CORNER_BOTTOM_RIGHT));
gtk_table_attach (GTK_TABLE (table), darea, 2, 3, 2, 3,
@ -266,7 +266,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry,
1, GIMP_MAX_IMAGE_SIZE,
0, 0);
gtk_widget_hide (GTK_WIDGET (GIMP_COORDINATES_CHAINBUTTON (calibrate_entry)));
g_signal_connect (G_OBJECT (dialog), "destroy",
g_signal_connect (dialog, "destroy",
G_CALLBACK (gtk_widget_destroyed),
&calibrate_entry);

10
app/dialogs/tips-dialog.c
View File

@ -112,11 +112,11 @@ tips_dialog_create (Gimp *gimp)
gtk_window_set_position (GTK_WINDOW (tips_dialog), GTK_WIN_POS_CENTER);
gtk_window_set_resizable (GTK_WINDOW (tips_dialog), TRUE);
g_signal_connect (G_OBJECT (tips_dialog), "delete_event",
g_signal_connect (tips_dialog, "delete_event",
G_CALLBACK (gtk_widget_destroy),
NULL);
g_signal_connect (G_OBJECT (tips_dialog), "destroy",
g_signal_connect (tips_dialog, "destroy",
G_CALLBACK (tips_dialog_destroy),
config);
@ -186,7 +186,7 @@ tips_dialog_create (Gimp *gimp)
gtk_container_add (GTK_CONTAINER (bbox), button);
gtk_widget_show (button);
g_signal_connect_swapped (G_OBJECT (button), "clicked",
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_destroy),
tips_dialog);
@ -202,7 +202,7 @@ tips_dialog_create (Gimp *gimp)
gtk_container_add (GTK_CONTAINER (bbox), button);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
g_signal_connect (button, "clicked",
G_CALLBACK (tips_show_previous),
NULL);
@ -212,7 +212,7 @@ tips_dialog_create (Gimp *gimp)
gtk_container_add (GTK_CONTAINER (bbox), button);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
g_signal_connect (button, "clicked",
G_CALLBACK (tips_show_next),
NULL);

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

@ -399,8 +399,8 @@ user_install_continue_callback (GtkWidget *widget,
case RESOLUTION_PAGE:
gimp_rc_save (gimprc);
g_object_unref (G_OBJECT (title_style));
g_object_unref (G_OBJECT (page_style));
g_object_unref (title_style);
g_object_unref (page_style);
gtk_widget_destroy (user_install_dialog);
@ -702,7 +702,7 @@ user_install_dialog_create (const gchar *alternate_system_gimprc,
darea = gtk_drawing_area_new ();
TITLE_STYLE (darea);
gtk_widget_set_size_request (darea, 16, 16);
g_signal_connect (G_OBJECT (darea), "expose_event",
g_signal_connect (darea, "expose_event",
G_CALLBACK (user_install_corner_expose),
GINT_TO_POINTER (GTK_CORNER_TOP_LEFT));
gtk_table_attach (GTK_TABLE (table), darea, 0, 1, 0, 1,
@ -712,7 +712,7 @@ user_install_dialog_create (const gchar *alternate_system_gimprc,
darea = gtk_drawing_area_new ();
TITLE_STYLE (darea);
gtk_widget_set_size_request (darea, 16, 16);
g_signal_connect (G_OBJECT (darea), "expose_event",
g_signal_connect (darea, "expose_event",
G_CALLBACK (user_install_corner_expose),
GINT_TO_POINTER (GTK_CORNER_BOTTOM_LEFT));
gtk_table_attach (GTK_TABLE (table), darea, 0, 1, 2, 3,
@ -842,7 +842,7 @@ user_install_dialog_create (const gchar *alternate_system_gimprc,
gtk_notebook_append_page (GTK_NOTEBOOK (notebook2), page2, NULL);
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv));
g_signal_connect (G_OBJECT (sel), "changed",
g_signal_connect (sel, "changed",
G_CALLBACK (user_install_sel_changed),
notebook2);
@ -1321,7 +1321,7 @@ user_install_resolution (GimpRc *gimprc)
gtk_widget_set_sensitive (button, !config->monitor_res_from_gdk);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
g_signal_connect (button, "clicked",
G_CALLBACK (user_install_resolution_calibrate),
entry);
@ -1329,7 +1329,7 @@ user_install_resolution (GimpRc *gimprc)
entry);
g_object_set_data (G_OBJECT (entry), "inverse_sensitive",
button);
g_signal_connect (G_OBJECT (toggle), "toggled",
g_signal_connect (toggle, "toggled",
G_CALLBACK (gimp_toggle_button_sensitive_update),
NULL);
}

24
app/display/gimpdisplay-handlers.c
View File

@ -71,21 +71,21 @@ gimp_display_connect (GimpDisplay *gdisp,
G_GNUC_FUNCTION, G_OBJECT (gdisp->gimage)->ref_count);
#endif
g_object_ref (G_OBJECT (gimage));
g_object_ref (gimage);
g_signal_connect (G_OBJECT (gimage), "update",
g_signal_connect (gimage, "update",
G_CALLBACK (gimp_display_update_handler),
gdisp);
g_signal_connect (G_OBJECT (gimage), "mode_changed",
g_signal_connect (gimage, "mode_changed",
G_CALLBACK (gimp_display_mode_changed_handler),
gdisp);
g_signal_connect (G_OBJECT (gimage), "colormap_changed",
g_signal_connect (gimage, "colormap_changed",
G_CALLBACK (gimp_display_colormap_changed_handler),
gdisp);
g_signal_connect (G_OBJECT (gimage), "size_changed",
g_signal_connect (gimage, "size_changed",
G_CALLBACK (gimp_display_size_changed_handler),
gdisp);
g_signal_connect (G_OBJECT (gimage), "flush",
g_signal_connect (gimage, "flush",
G_CALLBACK (gimp_display_flush_handler),
gdisp);
}
@ -96,19 +96,19 @@ gimp_display_disconnect (GimpDisplay *gdisp)
g_return_if_fail (GIMP_IS_DISPLAY (gdisp));
g_return_if_fail (GIMP_IS_IMAGE (gdisp->gimage));
g_signal_handlers_disconnect_by_func (G_OBJECT (gdisp->gimage),
g_signal_handlers_disconnect_by_func (gdisp->gimage,
gimp_display_flush_handler,
gdisp);
g_signal_handlers_disconnect_by_func (G_OBJECT (gdisp->gimage),
g_signal_handlers_disconnect_by_func (gdisp->gimage,
gimp_display_size_changed_handler,
gdisp);
g_signal_handlers_disconnect_by_func (G_OBJECT (gdisp->gimage),
g_signal_handlers_disconnect_by_func (gdisp->gimage,
gimp_display_colormap_changed_handler,
gdisp);
g_signal_handlers_disconnect_by_func (G_OBJECT (gdisp->gimage),
g_signal_handlers_disconnect_by_func (gdisp->gimage,
gimp_display_mode_changed_handler,
gdisp);
g_signal_handlers_disconnect_by_func (G_OBJECT (gdisp->gimage),
g_signal_handlers_disconnect_by_func (gdisp->gimage,
gimp_display_update_handler,
gdisp);
@ -119,7 +119,7 @@ gimp_display_disconnect (GimpDisplay *gdisp)
G_GNUC_FUNCTION, G_OBJECT (gdisp->gimage)->ref_count);
#endif
g_object_unref (G_OBJECT (gdisp->gimage));
g_object_unref (gdisp->gimage);
gdisp->gimage = NULL;
}

2
app/display/gimpdisplay.c
View File

@ -274,7 +274,7 @@ gimp_display_delete (GimpDisplay *gdisp)
/* unrefs the gimage */
gimp_display_disconnect (gdisp);
g_object_unref (G_OBJECT (gdisp));
g_object_unref (gdisp);
}
gint

6
app/display/gimpdisplayshell-callbacks.c
View File

@ -128,7 +128,7 @@ gimp_display_shell_events (GtkWidget *widget,
{
gchar *accel = NULL;
g_object_get (G_OBJECT (gtk_widget_get_settings (widget)),
g_object_get (gtk_widget_get_settings (widget),
"gtk-menu-bar-accel", &accel,
NULL);
@ -275,10 +275,10 @@ gimp_display_shell_canvas_realize (GtkWidget *canvas,
gdk_gc_set_exposures (shell->render_gc, TRUE);
/* set up the scrollbar observers */
g_signal_connect (G_OBJECT (shell->hsbdata), "value_changed",
g_signal_connect (shell->hsbdata, "value_changed",
G_CALLBACK (gimp_display_shell_hscrollbar_update),
shell);
g_signal_connect (G_OBJECT (shell->vsbdata), "value_changed",
g_signal_connect (shell->vsbdata, "value_changed",
G_CALLBACK (gimp_display_shell_vscrollbar_update),
shell);

60
app/display/gimpdisplayshell-draw.c
View File

@ -282,13 +282,13 @@ gimp_display_shell_init (GimpDisplayShell *shell)
GDK_KEY_RELEASE_MASK));
/* active display callback */
g_signal_connect (G_OBJECT (shell), "button_press_event",
g_signal_connect (shell, "button_press_event",
G_CALLBACK (gimp_display_shell_events),
shell);
g_signal_connect (G_OBJECT (shell), "button_release_event",
g_signal_connect (shell, "button_release_event",
G_CALLBACK (gimp_display_shell_events),
shell);
g_signal_connect (G_OBJECT (shell), "key_press_event",
g_signal_connect (shell, "key_press_event",
G_CALLBACK (gimp_display_shell_events),
shell);
@ -363,7 +363,7 @@ gimp_display_shell_destroy (GtkObject *object)
if (shell->padding_gc)
{
g_object_unref (G_OBJECT (shell->padding_gc));
g_object_unref (shell->padding_gc);
shell->padding_gc = NULL;
}
@ -527,13 +527,13 @@ gimp_display_shell_new (GimpDisplay *gdisp,
gtk_widget_show (menubar);
/* active display callback */
g_signal_connect (G_OBJECT (menubar), "button_press_event",
g_signal_connect (menubar, "button_press_event",
G_CALLBACK (gimp_display_shell_events),
shell);
g_signal_connect (G_OBJECT (menubar), "button_release_event",
g_signal_connect (menubar, "button_release_event",
G_CALLBACK (gimp_display_shell_events),
shell);
g_signal_connect (G_OBJECT (menubar), "key_press_event",
g_signal_connect (menubar, "key_press_event",
G_CALLBACK (gimp_display_shell_events),
shell);
@ -587,7 +587,7 @@ gimp_display_shell_new (GimpDisplay *gdisp,
gtk_widget_set_events (GTK_WIDGET (shell->origin),
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
g_signal_connect (G_OBJECT (shell->origin), "button_press_event",
g_signal_connect (shell->origin, "button_press_event",
G_CALLBACK (gimp_display_shell_origin_button_press),
shell);
@ -606,10 +606,10 @@ gimp_display_shell_new (GimpDisplay *gdisp,
gtk_widget_set_events (GTK_WIDGET (shell->hrule),
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
g_signal_connect_swapped (G_OBJECT (shell->canvas), "motion_notify_event",
g_signal_connect_swapped (shell->canvas, "motion_notify_event",
G_CALLBACK (GTK_WIDGET_GET_CLASS (shell->hrule)->motion_notify_event),
shell->hrule);
g_signal_connect (G_OBJECT (shell->hrule), "button_press_event",
g_signal_connect (shell->hrule, "button_press_event",
G_CALLBACK (gimp_display_shell_hruler_button_press),
shell);
@ -620,10 +620,10 @@ gimp_display_shell_new (GimpDisplay *gdisp,
gtk_widget_set_events (GTK_WIDGET (shell->vrule),
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
g_signal_connect_swapped (G_OBJECT (shell->canvas), "motion_notify_event",
g_signal_connect_swapped (shell->canvas, "motion_notify_event",
G_CALLBACK (GTK_WIDGET_GET_CLASS (shell->vrule)->motion_notify_event),
shell->vrule);
g_signal_connect (G_OBJECT (shell->vrule), "button_press_event",
g_signal_connect (shell->vrule, "button_press_event",
G_CALLBACK (gimp_display_shell_vruler_button_press),
shell);
@ -636,22 +636,22 @@ gimp_display_shell_new (GimpDisplay *gdisp,
gtk_widget_set_extension_events (shell->canvas, GDK_EXTENSION_EVENTS_ALL);
GTK_WIDGET_SET_FLAGS (shell->canvas, GTK_CAN_FOCUS);
g_signal_connect (G_OBJECT (shell->canvas), "realize",
g_signal_connect (shell->canvas, "realize",
G_CALLBACK (gimp_display_shell_canvas_realize),
shell);
/* set the active display before doing any other canvas event processing */
g_signal_connect (G_OBJECT (shell->canvas), "event",
g_signal_connect (shell->canvas, "event",
G_CALLBACK (gimp_display_shell_events),
shell);
g_signal_connect (G_OBJECT (shell->canvas), "expose_event",
g_signal_connect (shell->canvas, "expose_event",
G_CALLBACK (gimp_display_shell_canvas_expose),
shell);
g_signal_connect (G_OBJECT (shell->canvas), "configure_event",
g_signal_connect (shell->canvas, "configure_event",
G_CALLBACK (gimp_display_shell_canvas_configure),
shell);
g_signal_connect (G_OBJECT (shell->canvas), "event",
g_signal_connect (shell->canvas, "event",
G_CALLBACK (gimp_display_shell_canvas_tool_events),
shell);
@ -667,10 +667,10 @@ gimp_display_shell_new (GimpDisplay *gdisp,
gimp_help_set_help_data (shell->padding_button,
_("Set canvas padding color"), "#padding_button");
g_signal_connect (G_OBJECT (shell->padding_button), "button_press_event",
g_signal_connect (shell->padding_button, "button_press_event",
G_CALLBACK (gimp_display_shell_color_button_press),
shell);
g_signal_connect (G_OBJECT (shell->padding_button), "color_changed",
g_signal_connect (shell->padding_button, "color_changed",
G_CALLBACK (gimp_display_shell_color_button_changed),
shell);
@ -720,10 +720,10 @@ gimp_display_shell_new (GimpDisplay *gdisp,
gimp_help_set_help_data (shell->qmask,
_("Toggle QuickMask"), "#qmask_button");
g_signal_connect (G_OBJECT (shell->qmask), "toggled",
g_signal_connect (shell->qmask, "toggled",
G_CALLBACK (gimp_display_shell_qmask_toggled),
shell);
g_signal_connect (G_OBJECT (shell->qmask), "button_press_event",
g_signal_connect (shell->qmask, "button_press_event",
G_CALLBACK (gimp_display_shell_qmask_button_press),
shell);
@ -734,7 +734,7 @@ gimp_display_shell_new (GimpDisplay *gdisp,
gtk_container_add (GTK_CONTAINER (shell->nav_ebox), image);
gtk_widget_show (image);
g_signal_connect (G_OBJECT (shell->nav_ebox), "button_press_event",
g_signal_connect (shell->nav_ebox, "button_press_event",
G_CALLBACK (gimp_display_shell_nav_button_press),
shell);
@ -843,7 +843,7 @@ gimp_display_shell_reconnect (GimpDisplayShell *shell)
gimp_statusbar_resize_cursor (GIMP_STATUSBAR (shell->statusbar));
gimp_display_shell_shrink_wrap (shell);
g_signal_emit (G_OBJECT (shell), display_shell_signals[RECONNECT], 0);
g_signal_emit (shell, display_shell_signals[RECONNECT], 0);
}
void
@ -851,7 +851,7 @@ gimp_display_shell_scaled (GimpDisplayShell *shell)
{
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_signal_emit (G_OBJECT (shell), display_shell_signals[SCALED], 0);
g_signal_emit (shell, display_shell_signals[SCALED], 0);
}
void
@ -859,7 +859,7 @@ gimp_display_shell_scrolled (GimpDisplayShell *shell)
{
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_signal_emit (G_OBJECT (shell), display_shell_signals[SCROLLED], 0);
g_signal_emit (shell, display_shell_signals[SCROLLED], 0);
}
@ -1482,7 +1482,7 @@ gimp_display_shell_update_icon (GimpDisplayShell *shell)
gtk_window_set_icon (GTK_WINDOW (shell), pixbuf);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
}
void
@ -1549,14 +1549,14 @@ gimp_display_shell_set_padding (GimpDisplayShell *shell,
if (shell->padding_button)
{
g_signal_handlers_block_by_func (G_OBJECT (shell->padding_button),
g_signal_handlers_block_by_func (shell->padding_button,
gimp_display_shell_color_button_changed,
shell);
gimp_color_button_set_color (GIMP_COLOR_BUTTON (shell->padding_button),
&shell->padding_color);
g_signal_handlers_unblock_by_func (G_OBJECT (shell->padding_button),
g_signal_handlers_unblock_by_func (shell->padding_button,
gimp_display_shell_color_button_changed,
shell);
}
@ -1803,7 +1803,7 @@ gimp_display_shell_shrink_wrap (GimpDisplayShell *shell)
/* block the resulting expose event on any of the following
* changes because our caller has to do a full display update anyway
*/
g_signal_handlers_block_by_func (G_OBJECT (shell->canvas),
g_signal_handlers_block_by_func (shell->canvas,
gimp_display_shell_canvas_expose,
shell);
@ -1832,7 +1832,7 @@ gimp_display_shell_shrink_wrap (GimpDisplayShell *shell)
MAX (0, shell_x), MAX (0, shell_y));
}
g_signal_handlers_unblock_by_func (G_OBJECT (shell->canvas),
g_signal_handlers_unblock_by_func (shell->canvas,
gimp_display_shell_canvas_expose,
shell);
}

18
app/display/gimpdisplayshell-filter-dialog.c
View File

@ -156,7 +156,7 @@ make_dialog (ColorDisplayDialog *cdd)
cdd->src = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
tv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (cdd->src));
g_object_unref (G_OBJECT (cdd->src));
g_object_unref (cdd->src);
gtk_widget_set_size_request (tv, LIST_WIDTH, LIST_HEIGHT);
gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW (tv), FALSE);
@ -170,7 +170,7 @@ make_dialog (ColorDisplayDialog *cdd)
cdd->src_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv));
g_signal_connect (G_OBJECT (cdd->src_sel), "changed",
g_signal_connect (cdd->src_sel, "changed",
G_CALLBACK (src_selection_changed),
cdd);
@ -191,7 +191,7 @@ make_dialog (ColorDisplayDialog *cdd)
_("Add the selected filter to the list of "
"active filters."), NULL);
g_signal_connect (G_OBJECT (cdd->add_button), "clicked",
g_signal_connect (cdd->add_button, "clicked",
G_CALLBACK (color_display_add_callback),
cdd);
@ -208,7 +208,7 @@ make_dialog (ColorDisplayDialog *cdd)
_("Remove the selected filter from the list of "
"active filters."), NULL);
g_signal_connect (G_OBJECT (cdd->remove_button), "clicked",
g_signal_connect (cdd->remove_button, "clicked",
G_CALLBACK (color_display_remove_callback),
cdd);
@ -248,7 +248,7 @@ make_dialog (ColorDisplayDialog *cdd)
cdd->dest = gtk_tree_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
tv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (cdd->dest));
g_object_unref (G_OBJECT (cdd->dest));
g_object_unref (cdd->dest);
gtk_widget_set_size_request (tv, LIST_WIDTH, LIST_HEIGHT);
gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW (tv), FALSE);
@ -262,7 +262,7 @@ make_dialog (ColorDisplayDialog *cdd)
cdd->dest_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (tv));
g_signal_connect (G_OBJECT (cdd->dest_sel), "changed",
g_signal_connect (cdd->dest_sel, "changed",
G_CALLBACK (dest_selection_changed),
cdd);
@ -289,7 +289,7 @@ make_dialog (ColorDisplayDialog *cdd)
_("Reset the selected filter to default values"),
NULL);
g_signal_connect (G_OBJECT (cdd->reset_button), "clicked",
g_signal_connect (cdd->reset_button, "clicked",
G_CALLBACK (selected_filter_reset),
cdd);
@ -620,7 +620,7 @@ dest_selection_changed (GtkTreeSelection *sel,
if (cdd->selected)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (cdd->selected),
g_signal_handlers_disconnect_by_func (cdd->selected,
selected_filter_changed,
cdd);
g_object_remove_weak_pointer (G_OBJECT (cdd->selected),
@ -652,7 +652,7 @@ dest_selection_changed (GtkTreeSelection *sel,
cdd->selected = filter;
g_object_add_weak_pointer (G_OBJECT (filter), (gpointer) &cdd->selected);
g_signal_connect (G_OBJECT (cdd->selected), "changed",
g_signal_connect (cdd->selected, "changed",
G_CALLBACK (selected_filter_changed),
cdd);

78
app/display/gimpdisplayshell-handlers.c
View File

@ -108,77 +108,77 @@ gimp_display_shell_connect (GimpDisplayShell *shell)
shell->padding_mode = display_config->canvas_padding_mode;
shell->padding_color = display_config->canvas_padding_color;
g_signal_connect (G_OBJECT (gimage), "clean",
g_signal_connect (gimage, "clean",
G_CALLBACK (gimp_display_shell_clean_dirty_handler),
shell);
g_signal_connect (G_OBJECT (gimage), "dirty",
g_signal_connect (gimage, "dirty",
G_CALLBACK (gimp_display_shell_clean_dirty_handler),
shell);
g_signal_connect (G_OBJECT (gimage), "undo_event",
g_signal_connect (gimage, "undo_event",
G_CALLBACK (gimp_display_shell_undo_event_handler),
shell);
g_signal_connect (G_OBJECT (gimage), "name_changed",
g_signal_connect (gimage, "name_changed",
G_CALLBACK (gimp_display_shell_name_changed_handler),
shell);
g_signal_connect (G_OBJECT (gimage), "selection_control",
g_signal_connect (gimage, "selection_control",
G_CALLBACK (gimp_display_shell_selection_control_handler),
shell);
g_signal_connect (G_OBJECT (gimage), "size_changed",
g_signal_connect (gimage, "size_changed",
G_CALLBACK (gimp_display_shell_size_changed_handler),
shell);
g_signal_connect (G_OBJECT (gimage), "resolution_changed",
g_signal_connect (gimage, "resolution_changed",
G_CALLBACK (gimp_display_shell_resolution_changed_handler),
shell);
g_signal_connect (G_OBJECT (gimage), "unit_changed",
g_signal_connect (gimage, "unit_changed",
G_CALLBACK (gimp_display_shell_unit_changed_handler),
shell);
g_signal_connect (G_OBJECT (gimage), "qmask_changed",
g_signal_connect (gimage, "qmask_changed",
G_CALLBACK (gimp_display_shell_qmask_changed_handler),
shell);
g_signal_connect (G_OBJECT (gimage), "update_guide",
g_signal_connect (gimage, "update_guide",
G_CALLBACK (gimp_display_shell_update_guide_handler),
shell);
g_signal_connect (G_OBJECT (gimage), "invalidate_preview",
g_signal_connect (gimage, "invalidate_preview",
G_CALLBACK (gimp_display_shell_invalidate_preview_handler),
shell);
g_signal_connect (G_OBJECT (gimage->gimp->config),
g_signal_connect (gimage->gimp->config,
"notify::transparency-size",
G_CALLBACK (gimp_display_shell_check_notify_handler),
shell);
g_signal_connect (G_OBJECT (gimage->gimp->config),
g_signal_connect (gimage->gimp->config,
"notify::transparency-type",
G_CALLBACK (gimp_display_shell_check_notify_handler),
shell);
g_signal_connect (G_OBJECT (gimage->gimp->config),
g_signal_connect (gimage->gimp->config,
"notify::image-title-format",
G_CALLBACK (gimp_display_shell_title_notify_handler),
shell);
g_signal_connect (G_OBJECT (gimage->gimp->config),
g_signal_connect (gimage->gimp->config,
"notify::image-status-format",
G_CALLBACK (gimp_display_shell_title_notify_handler),
shell);
g_signal_connect (G_OBJECT (gimage->gimp->config),
g_signal_connect (gimage->gimp->config,
"notify::navigation-preview-size",
G_CALLBACK (gimp_display_shell_nav_size_notify_handler),
shell);
g_signal_connect (G_OBJECT (gimage->gimp->config),
g_signal_connect (gimage->gimp->config,
"notify::monitor-xresolution",
G_CALLBACK (gimp_display_shell_monitor_res_notify_handler),
shell);
g_signal_connect (G_OBJECT (gimage->gimp->config),
g_signal_connect (gimage->gimp->config,
"notify::monitor-yresolution",
G_CALLBACK (gimp_display_shell_monitor_res_notify_handler),
shell);
g_signal_connect (G_OBJECT (gimage->gimp->config),
g_signal_connect (gimage->gimp->config,
"notify::canvas-padding-mode",
G_CALLBACK (gimp_display_shell_padding_notify_handler),
shell);
g_signal_connect (G_OBJECT (gimage->gimp->config),
g_signal_connect (gimage->gimp->config,
"notify::canvas-padding-color",
G_CALLBACK (gimp_display_shell_padding_notify_handler),
shell);
g_signal_connect (G_OBJECT (gimage->gimp->config),
g_signal_connect (gimage->gimp->config,
"notify::marching-ants-speed",
G_CALLBACK (gimp_display_shell_ants_speed_notify_handler),
shell);
@ -204,53 +204,53 @@ gimp_display_shell_disconnect (GimpDisplayShell *shell)
shell->icon_idle_id = 0;
}
g_signal_handlers_disconnect_by_func (G_OBJECT (gimage->gimp->config),
g_signal_handlers_disconnect_by_func (gimage->gimp->config,
gimp_display_shell_ants_speed_notify_handler,
shell);
g_signal_handlers_disconnect_by_func (G_OBJECT (gimage->gimp->config),
g_signal_handlers_disconnect_by_func (gimage->gimp->config,
gimp_display_shell_padding_notify_handler,
shell);
g_signal_handlers_disconnect_by_func (G_OBJECT (gimage->gimp->config),
g_signal_handlers_disconnect_by_func (gimage->gimp->config,
gimp_display_shell_monitor_res_notify_handler,
shell);
g_signal_handlers_disconnect_by_func (G_OBJECT (gimage->gimp->config),
g_signal_handlers_disconnect_by_func (gimage->gimp->config,
gimp_display_shell_nav_size_notify_handler,
shell);
g_signal_handlers_disconnect_by_func (G_OBJECT (gimage->gimp->config),
g_signal_handlers_disconnect_by_func (gimage->gimp->config,
gimp_display_shell_title_notify_handler,
shell);
g_signal_handlers_disconnect_by_func (G_OBJECT (gimage->gimp->config),
g_signal_handlers_disconnect_by_func (gimage->gimp->config,
gimp_display_shell_check_notify_handler,
shell);
g_signal_handlers_disconnect_by_func (G_OBJECT (gimage),
g_signal_handlers_disconnect_by_func (gimage,
gimp_display_shell_invalidate_preview_handler,
shell);
g_signal_handlers_disconnect_by_func (G_OBJECT (gimage),
g_signal_handlers_disconnect_by_func (gimage,
gimp_display_shell_update_guide_handler,
shell);
g_signal_handlers_disconnect_by_func (G_OBJECT (gimage),
g_signal_handlers_disconnect_by_func (gimage,
gimp_display_shell_qmask_changed_handler,
shell);
g_signal_handlers_disconnect_by_func (G_OBJECT (gimage),
g_signal_handlers_disconnect_by_func (gimage,
gimp_display_shell_unit_changed_handler,
shell);
g_signal_handlers_disconnect_by_func (G_OBJECT (gimage),
g_signal_handlers_disconnect_by_func (gimage,
gimp_display_shell_resolution_changed_handler,
shell);
g_signal_handlers_disconnect_by_func (G_OBJECT (gimage),
g_signal_handlers_disconnect_by_func (gimage,
gimp_display_shell_size_changed_handler,
shell);
g_signal_handlers_disconnect_by_func (G_OBJECT (gimage),
g_signal_handlers_disconnect_by_func (gimage,
gimp_display_shell_selection_control_handler,
shell);
g_signal_handlers_disconnect_by_func (G_OBJECT (gimage),
g_signal_handlers_disconnect_by_func (gimage,
gimp_display_shell_name_changed_handler,
shell);
g_signal_handlers_disconnect_by_func (G_OBJECT (gimage),
g_signal_handlers_disconnect_by_func (gimage,
gimp_display_shell_undo_event_handler,
shell);
g_signal_handlers_disconnect_by_func (G_OBJECT (gimage),
g_signal_handlers_disconnect_by_func (gimage,
gimp_display_shell_clean_dirty_handler,
shell);
}
@ -327,7 +327,7 @@ gimp_display_shell_qmask_changed_handler (GimpImage *gimage,
image = GTK_IMAGE (GTK_BIN (shell->qmask)->child);
g_signal_handlers_block_by_func (G_OBJECT (shell->qmask),
g_signal_handlers_block_by_func (shell->qmask,
gimp_display_shell_qmask_toggled,
shell);
@ -339,7 +339,7 @@ gimp_display_shell_qmask_changed_handler (GimpImage *gimage,
else
gtk_image_set_from_stock (image, GIMP_STOCK_QMASK_OFF, GTK_ICON_SIZE_MENU);
g_signal_handlers_unblock_by_func (G_OBJECT (shell->qmask),
g_signal_handlers_unblock_by_func (shell->qmask,
gimp_display_shell_qmask_toggled,
shell);
}

2
app/display/gimpdisplayshell-layer-select.c
View File

@ -111,7 +111,7 @@ gimp_display_shell_layer_select_init (GimpImage *gimage,
GDK_KEY_RELEASE_MASK |
GDK_BUTTON_PRESS_MASK));
g_signal_connect (G_OBJECT (layer_select->shell), "event",
g_signal_connect (layer_select->shell, "event",
G_CALLBACK (layer_select_events),
layer_select);

12
app/display/gimpdisplayshell-render.c
View File

@ -65,7 +65,7 @@ struct _RenderInfo
};
static void render_setup_notify (GObject *config,
static void render_setup_notify (gpointer config,
GParamSpec *param_spec,
Gimp *gimp);
@ -98,14 +98,14 @@ render_init (Gimp *gimp)
{
g_return_if_fail (GIMP_IS_GIMP (gimp));
g_signal_connect (G_OBJECT (gimp->config), "notify::transparency-size",
g_signal_connect (gimp->config, "notify::transparency-size",
G_CALLBACK (render_setup_notify),
gimp);
g_signal_connect (G_OBJECT (gimp->config), "notify::transparency-type",
g_signal_connect (gimp->config, "notify::transparency-type",
G_CALLBACK (render_setup_notify),
gimp);
render_setup_notify (G_OBJECT (gimp->config), NULL, gimp);
render_setup_notify (gimp->config, NULL, gimp);
}
void
@ -113,7 +113,7 @@ render_exit (Gimp *gimp)
{
g_return_if_fail (GIMP_IS_GIMP (gimp));
g_signal_handlers_disconnect_by_func (G_OBJECT (gimp->config),
g_signal_handlers_disconnect_by_func (gimp->config,
render_setup_notify,
gimp);
@ -156,7 +156,7 @@ render_exit (Gimp *gimp)
static void
render_setup_notify (GObject *config,
render_setup_notify (gpointer config,
GParamSpec *param_spec,
Gimp *gimp)
{

60
app/display/gimpdisplayshell.c
View File

@ -282,13 +282,13 @@ gimp_display_shell_init (GimpDisplayShell *shell)
GDK_KEY_RELEASE_MASK));
/* active display callback */
g_signal_connect (G_OBJECT (shell), "button_press_event",
g_signal_connect (shell, "button_press_event",
G_CALLBACK (gimp_display_shell_events),
shell);
g_signal_connect (G_OBJECT (shell), "button_release_event",
g_signal_connect (shell, "button_release_event",
G_CALLBACK (gimp_display_shell_events),
shell);
g_signal_connect (G_OBJECT (shell), "key_press_event",
g_signal_connect (shell, "key_press_event",
G_CALLBACK (gimp_display_shell_events),
shell);
@ -363,7 +363,7 @@ gimp_display_shell_destroy (GtkObject *object)
if (shell->padding_gc)
{
g_object_unref (G_OBJECT (shell->padding_gc));
g_object_unref (shell->padding_gc);
shell->padding_gc = NULL;
}
@ -527,13 +527,13 @@ gimp_display_shell_new (GimpDisplay *gdisp,
gtk_widget_show (menubar);
/* active display callback */
g_signal_connect (G_OBJECT (menubar), "button_press_event",
g_signal_connect (menubar, "button_press_event",
G_CALLBACK (gimp_display_shell_events),
shell);
g_signal_connect (G_OBJECT (menubar), "button_release_event",
g_signal_connect (menubar, "button_release_event",
G_CALLBACK (gimp_display_shell_events),
shell);
g_signal_connect (G_OBJECT (menubar), "key_press_event",
g_signal_connect (menubar, "key_press_event",
G_CALLBACK (gimp_display_shell_events),
shell);
@ -587,7 +587,7 @@ gimp_display_shell_new (GimpDisplay *gdisp,
gtk_widget_set_events (GTK_WIDGET (shell->origin),
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
g_signal_connect (G_OBJECT (shell->origin), "button_press_event",
g_signal_connect (shell->origin, "button_press_event",
G_CALLBACK (gimp_display_shell_origin_button_press),
shell);
@ -606,10 +606,10 @@ gimp_display_shell_new (GimpDisplay *gdisp,
gtk_widget_set_events (GTK_WIDGET (shell->hrule),
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
g_signal_connect_swapped (G_OBJECT (shell->canvas), "motion_notify_event",
g_signal_connect_swapped (shell->canvas, "motion_notify_event",
G_CALLBACK (GTK_WIDGET_GET_CLASS (shell->hrule)->motion_notify_event),
shell->hrule);
g_signal_connect (G_OBJECT (shell->hrule), "button_press_event",
g_signal_connect (shell->hrule, "button_press_event",
G_CALLBACK (gimp_display_shell_hruler_button_press),
shell);
@ -620,10 +620,10 @@ gimp_display_shell_new (GimpDisplay *gdisp,
gtk_widget_set_events (GTK_WIDGET (shell->vrule),
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
g_signal_connect_swapped (G_OBJECT (shell->canvas), "motion_notify_event",
g_signal_connect_swapped (shell->canvas, "motion_notify_event",
G_CALLBACK (GTK_WIDGET_GET_CLASS (shell->vrule)->motion_notify_event),
shell->vrule);
g_signal_connect (G_OBJECT (shell->vrule), "button_press_event",
g_signal_connect (shell->vrule, "button_press_event",
G_CALLBACK (gimp_display_shell_vruler_button_press),
shell);
@ -636,22 +636,22 @@ gimp_display_shell_new (GimpDisplay *gdisp,
gtk_widget_set_extension_events (shell->canvas, GDK_EXTENSION_EVENTS_ALL);
GTK_WIDGET_SET_FLAGS (shell->canvas, GTK_CAN_FOCUS);
g_signal_connect (G_OBJECT (shell->canvas), "realize",
g_signal_connect (shell->canvas, "realize",
G_CALLBACK (gimp_display_shell_canvas_realize),
shell);
/* set the active display before doing any other canvas event processing */
g_signal_connect (G_OBJECT (shell->canvas), "event",
g_signal_connect (shell->canvas, "event",
G_CALLBACK (gimp_display_shell_events),
shell);
g_signal_connect (G_OBJECT (shell->canvas), "expose_event",
g_signal_connect (shell->canvas, "expose_event",
G_CALLBACK (gimp_display_shell_canvas_expose),
shell);
g_signal_connect (G_OBJECT (shell->canvas), "configure_event",
g_signal_connect (shell->canvas, "configure_event",
G_CALLBACK (gimp_display_shell_canvas_configure),
shell);
g_signal_connect (G_OBJECT (shell->canvas), "event",
g_signal_connect (shell->canvas, "event",
G_CALLBACK (gimp_display_shell_canvas_tool_events),
shell);
@ -667,10 +667,10 @@ gimp_display_shell_new (GimpDisplay *gdisp,
gimp_help_set_help_data (shell->padding_button,
_("Set canvas padding color"), "#padding_button");
g_signal_connect (G_OBJECT (shell->padding_button), "button_press_event",
g_signal_connect (shell->padding_button, "button_press_event",
G_CALLBACK (gimp_display_shell_color_button_press),
shell);
g_signal_connect (G_OBJECT (shell->padding_button), "color_changed",
g_signal_connect (shell->padding_button, "color_changed",
G_CALLBACK (gimp_display_shell_color_button_changed),
shell);
@ -720,10 +720,10 @@ gimp_display_shell_new (GimpDisplay *gdisp,
gimp_help_set_help_data (shell->qmask,
_("Toggle QuickMask"), "#qmask_button");
g_signal_connect (G_OBJECT (shell->qmask), "toggled",
g_signal_connect (shell->qmask, "toggled",
G_CALLBACK (gimp_display_shell_qmask_toggled),
shell);
g_signal_connect (G_OBJECT (shell->qmask), "button_press_event",
g_signal_connect (shell->qmask, "button_press_event",
G_CALLBACK (gimp_display_shell_qmask_button_press),
shell);
@ -734,7 +734,7 @@ gimp_display_shell_new (GimpDisplay *gdisp,
gtk_container_add (GTK_CONTAINER (shell->nav_ebox), image);
gtk_widget_show (image);
g_signal_connect (G_OBJECT (shell->nav_ebox), "button_press_event",
g_signal_connect (shell->nav_ebox, "button_press_event",
G_CALLBACK (gimp_display_shell_nav_button_press),
shell);
@ -843,7 +843,7 @@ gimp_display_shell_reconnect (GimpDisplayShell *shell)
gimp_statusbar_resize_cursor (GIMP_STATUSBAR (shell->statusbar));
gimp_display_shell_shrink_wrap (shell);
g_signal_emit (G_OBJECT (shell), display_shell_signals[RECONNECT], 0);
g_signal_emit (shell, display_shell_signals[RECONNECT], 0);
}
void
@ -851,7 +851,7 @@ gimp_display_shell_scaled (GimpDisplayShell *shell)
{
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_signal_emit (G_OBJECT (shell), display_shell_signals[SCALED], 0);
g_signal_emit (shell, display_shell_signals[SCALED], 0);
}
void
@ -859,7 +859,7 @@ gimp_display_shell_scrolled (GimpDisplayShell *shell)
{
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
g_signal_emit (G_OBJECT (shell), display_shell_signals[SCROLLED], 0);
g_signal_emit (shell, display_shell_signals[SCROLLED], 0);
}
@ -1482,7 +1482,7 @@ gimp_display_shell_update_icon (GimpDisplayShell *shell)
gtk_window_set_icon (GTK_WINDOW (shell), pixbuf);
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (pixbuf);
}
void
@ -1549,14 +1549,14 @@ gimp_display_shell_set_padding (GimpDisplayShell *shell,
if (shell->padding_button)
{
g_signal_handlers_block_by_func (G_OBJECT (shell->padding_button),
g_signal_handlers_block_by_func (shell->padding_button,
gimp_display_shell_color_button_changed,
shell);
gimp_color_button_set_color (GIMP_COLOR_BUTTON (shell->padding_button),
&shell->padding_color);
g_signal_handlers_unblock_by_func (G_OBJECT (shell->padding_button),
g_signal_handlers_unblock_by_func (shell->padding_button,
gimp_display_shell_color_button_changed,
shell);
}
@ -1803,7 +1803,7 @@ gimp_display_shell_shrink_wrap (GimpDisplayShell *shell)
/* block the resulting expose event on any of the following
* changes because our caller has to do a full display update anyway
*/
g_signal_handlers_block_by_func (G_OBJECT (shell->canvas),
g_signal_handlers_block_by_func (shell->canvas,
gimp_display_shell_canvas_expose,
shell);
@ -1832,7 +1832,7 @@ gimp_display_shell_shrink_wrap (GimpDisplayShell *shell)
MAX (0, shell_x), MAX (0, shell_y));
}
g_signal_handlers_unblock_by_func (G_OBJECT (shell->canvas),
g_signal_handlers_unblock_by_func (shell->canvas,
gimp_display_shell_canvas_expose,
shell);
}

28
app/display/gimpnavigationeditor.c
View File

@ -160,7 +160,7 @@ gimp_navigation_view_init (GimpNavigationView *view)
gtk_container_add (GTK_CONTAINER (frame), abox);
gtk_widget_show (abox);
g_signal_connect (G_OBJECT (abox), "size_allocate",
g_signal_connect (abox, "size_allocate",
G_CALLBACK (gimp_navigation_view_abox_resized),
view);
@ -168,13 +168,13 @@ gimp_navigation_view_init (GimpNavigationView *view)
gtk_container_add (GTK_CONTAINER (abox), view->preview);
gtk_widget_show (view->preview);
g_signal_connect (G_OBJECT (view->preview), "marker_changed",
g_signal_connect (view->preview, "marker_changed",
G_CALLBACK (gimp_navigation_view_marker_changed),
view);
g_signal_connect (G_OBJECT (view->preview), "zoom",
g_signal_connect (view->preview, "zoom",
G_CALLBACK (gimp_navigation_view_zoom),
view);
g_signal_connect (G_OBJECT (view->preview), "scroll",
g_signal_connect (view->preview, "scroll",
G_CALLBACK (gimp_navigation_view_scroll),
view);
@ -215,13 +215,13 @@ gimp_navigation_view_set_shell (GimpNavigationView *view,
if (view->shell)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (view->shell),
g_signal_handlers_disconnect_by_func (view->shell,
gimp_navigation_view_shell_scaled,
view);
g_signal_handlers_disconnect_by_func (G_OBJECT (view->shell),
g_signal_handlers_disconnect_by_func (view->shell,
gimp_navigation_view_shell_scrolled,
view);
g_signal_handlers_disconnect_by_func (G_OBJECT (view->shell),
g_signal_handlers_disconnect_by_func (view->shell,
gimp_navigation_view_shell_reconnect,
view);
}
@ -237,13 +237,13 @@ gimp_navigation_view_set_shell (GimpNavigationView *view,
gimp_preview_set_viewable (GIMP_PREVIEW (view->preview),
GIMP_VIEWABLE (shell->gdisp->gimage));
g_signal_connect (G_OBJECT (view->shell), "scaled",
g_signal_connect (view->shell, "scaled",
G_CALLBACK (gimp_navigation_view_shell_scaled),
view);
g_signal_connect (G_OBJECT (view->shell), "scrolled",
g_signal_connect (view->shell, "scrolled",
G_CALLBACK (gimp_navigation_view_shell_scrolled),
view);
g_signal_connect (G_OBJECT (view->shell), "reconnect",
g_signal_connect (view->shell, "reconnect",
G_CALLBACK (gimp_navigation_view_shell_reconnect),
view);
@ -286,7 +286,7 @@ gimp_navigation_view_popup (GimpDisplayShell *shell,
gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (view));
gtk_widget_show (GTK_WIDGET (view));
g_signal_connect (G_OBJECT (view->preview), "button_release_event",
g_signal_connect (view->preview, "button_release_event",
G_CALLBACK (gimp_navigation_view_button_release),
shell);
}
@ -419,7 +419,7 @@ gimp_navigation_view_new_private (GimpDisplayShell *shell,
view->zoom_adjustment =
GTK_ADJUSTMENT (gtk_adjustment_new (0.0, -15.0, 15.0, 1.0, 1.0, 0.0));
g_signal_connect (G_OBJECT (view->zoom_adjustment), "value_changed",
g_signal_connect (view->zoom_adjustment, "value_changed",
G_CALLBACK (gimp_navigation_view_zoom_adj_changed),
view);
@ -704,13 +704,13 @@ gimp_navigation_view_shell_scaled (GimpDisplayShell *shell,
else
val = RINT (f) - 1;
g_signal_handlers_block_by_func (G_OBJECT (view->zoom_adjustment),
g_signal_handlers_block_by_func (view->zoom_adjustment,
gimp_navigation_view_zoom_adj_changed,
view);
gtk_adjustment_set_value (view->zoom_adjustment, val);
g_signal_handlers_unblock_by_func (G_OBJECT (view->zoom_adjustment),
g_signal_handlers_unblock_by_func (view->zoom_adjustment,
gimp_navigation_view_zoom_adj_changed,
view);
}

28
app/display/gimpnavigationview.c
View File

@ -160,7 +160,7 @@ gimp_navigation_view_init (GimpNavigationView *view)
gtk_container_add (GTK_CONTAINER (frame), abox);
gtk_widget_show (abox);
g_signal_connect (G_OBJECT (abox), "size_allocate",
g_signal_connect (abox, "size_allocate",
G_CALLBACK (gimp_navigation_view_abox_resized),
view);
@ -168,13 +168,13 @@ gimp_navigation_view_init (GimpNavigationView *view)
gtk_container_add (GTK_CONTAINER (abox), view->preview);
gtk_widget_show (view->preview);
g_signal_connect (G_OBJECT (view->preview), "marker_changed",
g_signal_connect (view->preview, "marker_changed",
G_CALLBACK (gimp_navigation_view_marker_changed),
view);
g_signal_connect (G_OBJECT (view->preview), "zoom",
g_signal_connect (view->preview, "zoom",
G_CALLBACK (gimp_navigation_view_zoom),
view);
g_signal_connect (G_OBJECT (view->preview), "scroll",
g_signal_connect (view->preview, "scroll",
G_CALLBACK (gimp_navigation_view_scroll),
view);
@ -215,13 +215,13 @@ gimp_navigation_view_set_shell (GimpNavigationView *view,
if (view->shell)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (view->shell),
g_signal_handlers_disconnect_by_func (view->shell,
gimp_navigation_view_shell_scaled,
view);
g_signal_handlers_disconnect_by_func (G_OBJECT (view->shell),
g_signal_handlers_disconnect_by_func (view->shell,
gimp_navigation_view_shell_scrolled,
view);
g_signal_handlers_disconnect_by_func (G_OBJECT (view->shell),
g_signal_handlers_disconnect_by_func (view->shell,
gimp_navigation_view_shell_reconnect,
view);
}
@ -237,13 +237,13 @@ gimp_navigation_view_set_shell (GimpNavigationView *view,
gimp_preview_set_viewable (GIMP_PREVIEW (view->preview),
GIMP_VIEWABLE (shell->gdisp->gimage));
g_signal_connect (G_OBJECT (view->shell), "scaled",
g_signal_connect (view->shell, "scaled",
G_CALLBACK (gimp_navigation_view_shell_scaled),
view);
g_signal_connect (G_OBJECT (view->shell), "scrolled",
g_signal_connect (view->shell, "scrolled",
G_CALLBACK (gimp_navigation_view_shell_scrolled),
view);
g_signal_connect (G_OBJECT (view->shell), "reconnect",
g_signal_connect (view->shell, "reconnect",
G_CALLBACK (gimp_navigation_view_shell_reconnect),
view);
@ -286,7 +286,7 @@ gimp_navigation_view_popup (GimpDisplayShell *shell,
gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (view));
gtk_widget_show (GTK_WIDGET (view));
g_signal_connect (G_OBJECT (view->preview), "button_release_event",
g_signal_connect (view->preview, "button_release_event",
G_CALLBACK (gimp_navigation_view_button_release),
shell);
}
@ -419,7 +419,7 @@ gimp_navigation_view_new_private (GimpDisplayShell *shell,
view->zoom_adjustment =
GTK_ADJUSTMENT (gtk_adjustment_new (0.0, -15.0, 15.0, 1.0, 1.0, 0.0));
g_signal_connect (G_OBJECT (view->zoom_adjustment), "value_changed",
g_signal_connect (view->zoom_adjustment, "value_changed",
G_CALLBACK (gimp_navigation_view_zoom_adj_changed),
view);
@ -704,13 +704,13 @@ gimp_navigation_view_shell_scaled (GimpDisplayShell *shell,
else
val = RINT (f) - 1;
g_signal_handlers_block_by_func (G_OBJECT (view->zoom_adjustment),
g_signal_handlers_block_by_func (view->zoom_adjustment,
gimp_navigation_view_zoom_adj_changed,
view);
gtk_adjustment_set_value (view->zoom_adjustment, val);
g_signal_handlers_unblock_by_func (G_OBJECT (view->zoom_adjustment),
g_signal_handlers_unblock_by_func (view->zoom_adjustment,
gimp_navigation_view_zoom_adj_changed,
view);
}

8
app/display/gimpprogress.c
View File

@ -398,11 +398,11 @@ gimp_progress_signal_setup (GimpProgress *progress,
/* remove any existing signal handlers */
if (progress->cancel_callback)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (button),
g_signal_handlers_disconnect_by_func (button,
progress->cancel_callback,
progress->cancel_data);
if (dialog)
g_signal_handlers_disconnect_by_func (G_OBJECT (dialog),
g_signal_handlers_disconnect_by_func (dialog,
progress->cancel_callback,
progress->cancel_data);
}
@ -410,12 +410,12 @@ gimp_progress_signal_setup (GimpProgress *progress,
/* add the new handlers */
if (cancel_callback)
{
g_signal_connect (G_OBJECT (button), "clicked",
g_signal_connect (button, "clicked",
G_CALLBACK (cancel_callback),
cancel_data);
if (dialog)
g_signal_connect (G_OBJECT (dialog), "destroy",
g_signal_connect (dialog, "destroy",
G_CALLBACK (cancel_callback),
cancel_data);
}

2
app/file/file-open.c
View File

@ -207,7 +207,7 @@ file_open_with_proc_and_display (Gimp *gimp,
gimp_create_display (gimage->gimp, gimage, 0x0101);
g_object_unref (G_OBJECT (gimage));
g_object_unref (gimage);
documents = GIMP_DOCUMENT_LIST (gimp->documents);
imagefile = gimp_document_list_add_uri (documents, uri);

4
app/file/file-save.c
View File

@ -139,7 +139,7 @@ file_save (GimpImage *gimage,
}
/* ref the image, so it can't get deleted during save */
g_object_ref (G_OBJECT (gimage));
g_object_ref (gimage);
proc = plug_in_proc_def_get_proc (file_proc);
@ -202,7 +202,7 @@ file_save (GimpImage *gimage,
g_free (return_vals);
g_free (args);
g_object_unref (G_OBJECT (gimage));
g_object_unref (gimage);
return status;
}

14
app/gui/about-dialog.c
View File

@ -139,16 +139,16 @@ about_dialog_create (void)
gimp_help_connect (about_dialog, gimp_standard_help_func,
"dialogs/about.html");
g_signal_connect (G_OBJECT (about_dialog), "destroy",
g_signal_connect (about_dialog, "destroy",
G_CALLBACK (about_dialog_destroy),
NULL);
g_signal_connect (G_OBJECT (about_dialog), "unmap",
g_signal_connect (about_dialog, "unmap",
G_CALLBACK (about_dialog_unmap),
NULL);
g_signal_connect (G_OBJECT (about_dialog), "button_press_event",
g_signal_connect (about_dialog, "button_press_event",
G_CALLBACK (about_dialog_button),
NULL);
g_signal_connect (G_OBJECT (about_dialog), "key_press_event",
g_signal_connect (about_dialog, "key_press_event",
G_CALLBACK (about_dialog_key),
NULL);
@ -188,7 +188,7 @@ about_dialog_create (void)
gtk_container_add (GTK_CONTAINER (aboutframe), logo_area);
gtk_widget_show (logo_area);
g_signal_connect (G_OBJECT (logo_area), "expose_event",
g_signal_connect (logo_area, "expose_event",
G_CALLBACK (about_dialog_logo_expose),
NULL);
@ -345,8 +345,8 @@ about_dialog_load_logo (GtkWidget *window)
GDK_RGB_DITHER_NORMAL,
0, 0);
g_object_unref (G_OBJECT (gc));
g_object_unref (G_OBJECT (pixbuf));
g_object_unref (gc);
g_object_unref (pixbuf);
dissolve_width =
(logo_width / ANIMATION_SIZE) +

20
app/gui/brush-select.c
View File

@ -136,13 +136,13 @@ brush_select_new (Gimp *gimp,
gimp_context_set_opacity (bsp->context, initial_opacity);
bsp->spacing_value = initial_spacing;
g_signal_connect (G_OBJECT (bsp->context), "brush_changed",
g_signal_connect (bsp->context, "brush_changed",
G_CALLBACK (brush_select_brush_changed),
bsp);
g_signal_connect (G_OBJECT (bsp->context), "opacity_changed",
g_signal_connect (bsp->context, "opacity_changed",
G_CALLBACK (brush_select_opacity_changed),
bsp);
g_signal_connect (G_OBJECT (bsp->context), "paint_mode_changed",
g_signal_connect (bsp->context, "paint_mode_changed",
G_CALLBACK (brush_select_paint_mode_changed),
bsp);
@ -188,7 +188,7 @@ brush_select_new (Gimp *gimp,
TRUE, 0.0, 0.0,
NULL, NULL));
g_signal_connect (G_OBJECT (bsp->opacity_data), "value_changed",
g_signal_connect (bsp->opacity_data, "value_changed",
G_CALLBACK (opacity_scale_update),
bsp);
@ -208,7 +208,7 @@ brush_select_new (Gimp *gimp,
if (initial_spacing >= 0)
gtk_adjustment_set_value (spacing_adj, initial_spacing);
g_signal_connect (G_OBJECT (spacing_adj), "value_changed",
g_signal_connect (spacing_adj, "value_changed",
G_CALLBACK (spacing_scale_update),
bsp);
@ -233,7 +233,7 @@ brush_select_free (BrushSelect *bsp)
g_free (bsp->callback_name);
if (bsp->context)
g_object_unref (G_OBJECT (bsp->context));
g_object_unref (bsp->context);
g_free (bsp);
}
@ -344,14 +344,14 @@ brush_select_opacity_changed (GimpContext *context,
gdouble opacity,
BrushSelect *bsp)
{
g_signal_handlers_block_by_func (G_OBJECT (bsp->opacity_data),
g_signal_handlers_block_by_func (bsp->opacity_data,
opacity_scale_update,
bsp);
gtk_adjustment_set_value (GTK_ADJUSTMENT (bsp->opacity_data),
opacity * 100.0);
g_signal_handlers_unblock_by_func (G_OBJECT (bsp->opacity_data),
g_signal_handlers_unblock_by_func (bsp->opacity_data,
opacity_scale_update,
bsp);
@ -373,13 +373,13 @@ static void
opacity_scale_update (GtkAdjustment *adjustment,
BrushSelect *bsp)
{
g_signal_handlers_block_by_func (G_OBJECT (bsp->context),
g_signal_handlers_block_by_func (bsp->context,
brush_select_opacity_changed,
bsp);
gimp_context_set_opacity (bsp->context, adjustment->value / 100.0);
g_signal_handlers_unblock_by_func (G_OBJECT (bsp->context),
g_signal_handlers_unblock_by_func (bsp->context,
brush_select_opacity_changed,
bsp);
}

8
app/gui/channels-commands.c
View File

@ -369,7 +369,7 @@ channels_new_channel_query (GimpImage *gimage,
TRUE, 0.0, 0.0,
NULL, NULL);
g_signal_connect (G_OBJECT (opacity_scale_data), "value_changed",
g_signal_connect (opacity_scale_data, "value_changed",
G_CALLBACK (channels_opacity_update),
options->color_panel);
@ -378,7 +378,7 @@ channels_new_channel_query (GimpImage *gimage,
TRUE, TRUE, 0);
gtk_widget_show (options->color_panel);
g_signal_connect (G_OBJECT (options->color_panel), "color_changed",
g_signal_connect (options->color_panel, "color_changed",
G_CALLBACK (channels_color_changed),
opacity_scale_data);
@ -518,7 +518,7 @@ channels_edit_channel_query (GimpChannel *channel)
TRUE, 0.0, 0.0,
NULL, NULL);
g_signal_connect (G_OBJECT (opacity_scale_data), "value_changed",
g_signal_connect (opacity_scale_data, "value_changed",
G_CALLBACK (channels_opacity_update),
options->color_panel);
@ -527,7 +527,7 @@ channels_edit_channel_query (GimpChannel *channel)
TRUE, TRUE, 0);
gtk_widget_show (options->color_panel);
g_signal_connect (G_OBJECT (options->color_panel), "color_changed",
g_signal_connect (options->color_panel, "color_changed",
G_CALLBACK (channels_color_changed),
opacity_scale_data);

42
app/gui/color-notebook.c
View File

@ -355,10 +355,10 @@ color_notebook_new_internal (GimpViewable *viewable,
gtk_box_pack_start (GTK_BOX (left_vbox), cnp->notebook, TRUE, TRUE, 0);
gtk_widget_show (cnp->notebook);
g_signal_connect (G_OBJECT (cnp->notebook), "color_changed",
g_signal_connect (cnp->notebook, "color_changed",
G_CALLBACK (color_notebook_notebook_changed),
cnp);
g_signal_connect (G_OBJECT (GIMP_COLOR_NOTEBOOK (cnp->notebook)->notebook),
g_signal_connect (GIMP_COLOR_NOTEBOOK (cnp->notebook)->notebook,
"switch_page",
G_CALLBACK (color_notebook_switch_page),
cnp);
@ -388,7 +388,7 @@ color_notebook_new_internal (GimpViewable *viewable,
gtk_container_add (GTK_CONTAINER (color_frame), cnp->new_color);
gtk_widget_show (cnp->new_color);
g_signal_connect (G_OBJECT (cnp->new_color), "color_changed",
g_signal_connect (cnp->new_color, "color_changed",
G_CALLBACK (color_notebook_new_color_changed),
cnp);
@ -421,7 +421,7 @@ color_notebook_new_internal (GimpViewable *viewable,
gimp_help_set_help_data (button, _("Revert to old color"), NULL);
g_signal_connect_swapped (G_OBJECT (button), "clicked",
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (color_notebook_reset_clicked),
cnp);
@ -437,10 +437,10 @@ color_notebook_new_internal (GimpViewable *viewable,
gtk_box_pack_start (GTK_BOX (right_vbox), cnp->scales, TRUE, TRUE, 0);
gtk_widget_show (cnp->scales);
g_signal_connect (G_OBJECT (cnp->scales), "channel_changed",
g_signal_connect (cnp->scales, "channel_changed",
G_CALLBACK (color_notebook_channel_changed),
cnp);
g_signal_connect (G_OBJECT (cnp->scales), "color_changed",
g_signal_connect (cnp->scales, "color_changed",
G_CALLBACK (color_notebook_scales_changed),
cnp);
@ -460,7 +460,7 @@ color_notebook_new_internal (GimpViewable *viewable,
NULL);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
g_signal_connect (button, "clicked",
G_CALLBACK (color_history_add_clicked),
cnp);
@ -489,11 +489,11 @@ color_notebook_new_internal (GimpViewable *viewable,
gtk_widget_show (cnp->history[i]);
gtk_widget_show (button);
g_signal_connect (G_OBJECT (button), "clicked",
g_signal_connect (button, "clicked",
G_CALLBACK (color_history_color_clicked),
cnp);
g_signal_connect (G_OBJECT (cnp->history[i]), "color_changed",
g_signal_connect (cnp->history[i], "color_changed",
G_CALLBACK (color_history_color_changed),
GINT_TO_POINTER (i));
}
@ -556,16 +556,16 @@ color_notebook_update (ColorNotebook *cnp,
if (update & UPDATE_NOTEBOOK)
{
g_signal_handlers_block_by_func (G_OBJECT (cnp->notebook),
G_CALLBACK (color_notebook_notebook_changed),
g_signal_handlers_block_by_func (cnp->notebook,
color_notebook_notebook_changed,
cnp);
gimp_color_selector_set_color (GIMP_COLOR_SELECTOR (cnp->notebook),
&cnp->rgb,
&cnp->hsv);
g_signal_handlers_unblock_by_func (G_OBJECT (cnp->notebook),
G_CALLBACK (color_notebook_notebook_changed),
g_signal_handlers_unblock_by_func (cnp->notebook,
color_notebook_notebook_changed,
cnp);
}
@ -575,16 +575,16 @@ color_notebook_update (ColorNotebook *cnp,
if (update & UPDATE_SCALES)
{
g_signal_handlers_block_by_func (G_OBJECT (cnp->scales),
G_CALLBACK (color_notebook_scales_changed),
g_signal_handlers_block_by_func (cnp->scales,
color_notebook_scales_changed,
cnp);
gimp_color_selector_set_color (GIMP_COLOR_SELECTOR (cnp->scales),
&cnp->rgb,
&cnp->hsv);
g_signal_handlers_unblock_by_func (G_OBJECT (cnp->scales),
G_CALLBACK (color_notebook_scales_changed),
g_signal_handlers_unblock_by_func (cnp->scales,
color_notebook_scales_changed,
cnp);
}
@ -594,14 +594,14 @@ color_notebook_update (ColorNotebook *cnp,
if (update & UPDATE_NEW_COLOR)
{
g_signal_handlers_block_by_func (G_OBJECT (cnp->new_color),
g_signal_handlers_block_by_func (cnp->new_color,
color_notebook_new_color_changed,
cnp);
gimp_color_area_set_color (GIMP_COLOR_AREA (cnp->new_color),
&cnp->rgb);
g_signal_handlers_unblock_by_func (G_OBJECT (cnp->new_color),
g_signal_handlers_unblock_by_func (cnp->new_color,
color_notebook_new_color_changed,
cnp);
}
@ -751,14 +751,14 @@ color_history_color_changed (GtkWidget *widget,
if (notebook->history[color_index] == widget)
continue;
g_signal_handlers_block_by_func (G_OBJECT (notebook->history[color_index]),
g_signal_handlers_block_by_func (notebook->history[color_index],
color_history_color_changed,
data);
gimp_color_area_set_color
(GIMP_COLOR_AREA (notebook->history[color_index]), &changed_color);
g_signal_handlers_unblock_by_func (G_OBJECT (notebook->history[color_index]),
g_signal_handlers_unblock_by_func (notebook->history[color_index],
color_history_color_changed,
data);
}

22
app/gui/convert-dialog.c
View File

@ -140,7 +140,7 @@ convert_to_indexed (GimpImage *gimage)
NULL);
g_signal_connect (G_OBJECT (dialog->shell), "destroy",
g_signal_connect (dialog->shell, "destroy",
G_CALLBACK (indexed_destroy_callback),
dialog);
@ -171,7 +171,7 @@ convert_to_indexed (GimpImage *gimage)
g_object_set_data (G_OBJECT (toggle), "gimp-item-data",
GINT_TO_POINTER (GIMP_MAKE_PALETTE));
g_signal_connect (G_OBJECT (toggle), "toggled",
g_signal_connect (toggle, "toggled",
G_CALLBACK (gimp_radio_button_update),
&dialog->palette_type);
@ -185,7 +185,7 @@ convert_to_indexed (GimpImage *gimage)
gtk_box_pack_end (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
gtk_widget_show (spinbutton);
g_signal_connect (G_OBJECT (adjustment), "value_changed",
g_signal_connect (adjustment, "value_changed",
G_CALLBACK (gimp_int_adjustment_update),
&dialog->num_colors);
@ -219,7 +219,7 @@ convert_to_indexed (GimpImage *gimage)
g_object_set_data (G_OBJECT (toggle), "gimp-item-data",
GINT_TO_POINTER (GIMP_WEB_PALETTE));
g_signal_connect (G_OBJECT (toggle), "toggled",
g_signal_connect (toggle, "toggled",
G_CALLBACK (gimp_radio_button_update),
&dialog->palette_type);
}
@ -237,7 +237,7 @@ convert_to_indexed (GimpImage *gimage)
g_object_set_data (G_OBJECT (toggle), "gimp-item-data",
GINT_TO_POINTER (GIMP_MONO_PALETTE));
g_signal_connect (G_OBJECT (toggle), "toggled",
g_signal_connect (toggle, "toggled",
G_CALLBACK (gimp_radio_button_update),
&dialog->palette_type);
@ -249,7 +249,7 @@ convert_to_indexed (GimpImage *gimage)
remove_toggle = gtk_check_button_new_with_label (_("Remove Unused Colors from Final Palette"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (remove_toggle),
dialog->remove_dups);
g_signal_connect (G_OBJECT (remove_toggle), "toggled",
g_signal_connect (remove_toggle, "toggled",
G_CALLBACK (gimp_toggle_button_update),
&dialog->remove_dups);
@ -266,12 +266,12 @@ convert_to_indexed (GimpImage *gimage)
g_object_set_data (G_OBJECT (toggle), "gimp-item-data",
GINT_TO_POINTER (GIMP_CUSTOM_PALETTE));
g_signal_connect (G_OBJECT (toggle), "toggled",
g_signal_connect (toggle, "toggled",
G_CALLBACK (gimp_radio_button_update),
&dialog->palette_type);
g_object_set_data (G_OBJECT (toggle), "set_sensitive", remove_toggle);
g_signal_connect (G_OBJECT (dialog->custom_palette_button), "clicked",
g_signal_connect (dialog->custom_palette_button, "clicked",
G_CALLBACK (indexed_custom_palette_button_callback),
dialog);
gtk_box_pack_end (GTK_BOX (hbox),
@ -324,7 +324,7 @@ convert_to_indexed (GimpImage *gimage)
dialog->alpha_dither);
gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
gtk_widget_show (toggle);
g_signal_connect (G_OBJECT (toggle), "toggled",
g_signal_connect (toggle, "toggled",
G_CALLBACK (gimp_toggle_button_update),
&dialog->alpha_dither);
@ -518,10 +518,10 @@ indexed_custom_palette_button_callback (GtkWidget *widget,
GIMP_OBJECT (theCustomPalette)->name,
NULL);
g_signal_connect (G_OBJECT (dialog->palette_select->shell), "destroy",
g_signal_connect (dialog->palette_select->shell, "destroy",
G_CALLBACK (indexed_palette_select_destroy_callback),
dialog);
g_signal_connect (G_OBJECT (dialog->palette_select->context),
g_signal_connect (dialog->palette_select->context,
"palette_changed",
G_CALLBACK (indexed_palette_select_palette),
dialog);

24
app/gui/device-status-dialog.c
View File

@ -163,7 +163,7 @@ device_status_dialog_create (Gimp *gimp)
context = GIMP_CONTEXT (device_info);
g_signal_connect (G_OBJECT (device_info), "changed",
g_signal_connect (device_info, "changed",
G_CALLBACK (device_status_dialog_update),
deviceD);
@ -189,9 +189,9 @@ device_status_dialog_create (Gimp *gimp)
gimp_preview_new_full (GIMP_VIEWABLE (gimp_context_get_tool (context)),
CELL_SIZE, CELL_SIZE, 0,
FALSE, FALSE, TRUE);
g_signal_connect_object (G_OBJECT (context), "tool_changed",
g_signal_connect_object (context, "tool_changed",
G_CALLBACK (gimp_preview_set_viewable),
G_OBJECT (deviceD->tools[i]),
deviceD->tools[i],
G_CONNECT_SWAPPED);
gimp_dnd_viewable_dest_add (deviceD->tools[i],
GIMP_TYPE_TOOL_INFO,
@ -209,7 +209,7 @@ device_status_dialog_create (Gimp *gimp)
GDK_BUTTON1_MASK | GDK_BUTTON2_MASK);
gtk_widget_set_size_request (deviceD->foregrounds[i],
CELL_SIZE, CELL_SIZE);
g_signal_connect (G_OBJECT (deviceD->foregrounds[i]), "color_changed",
g_signal_connect (deviceD->foregrounds[i], "color_changed",
G_CALLBACK (device_status_foreground_changed),
device_info);
gtk_table_attach (GTK_TABLE (deviceD->table),
@ -225,7 +225,7 @@ device_status_dialog_create (Gimp *gimp)
GDK_BUTTON1_MASK | GDK_BUTTON2_MASK);
gtk_widget_set_size_request (deviceD->backgrounds[i],
CELL_SIZE, CELL_SIZE);
g_signal_connect (G_OBJECT (deviceD->backgrounds[i]), "color_changed",
g_signal_connect (deviceD->backgrounds[i], "color_changed",
G_CALLBACK (device_status_background_changed),
device_info);
gtk_table_attach (GTK_TABLE (deviceD->table),
@ -239,9 +239,9 @@ device_status_dialog_create (Gimp *gimp)
gimp_preview_new_full (GIMP_VIEWABLE (gimp_context_get_brush (context)),
CELL_SIZE, CELL_SIZE, 0,
FALSE, FALSE, TRUE);
g_signal_connect_object (G_OBJECT (context),"brush_changed",
g_signal_connect_object (context,"brush_changed",
G_CALLBACK (gimp_preview_set_viewable),
G_OBJECT (deviceD->brushes[i]),
deviceD->brushes[i],
G_CONNECT_SWAPPED);
gimp_dnd_viewable_dest_add (deviceD->brushes[i],
GIMP_TYPE_BRUSH,
@ -257,9 +257,9 @@ device_status_dialog_create (Gimp *gimp)
gimp_preview_new_full (GIMP_VIEWABLE (gimp_context_get_pattern (context)),
CELL_SIZE, CELL_SIZE, 0,
FALSE, FALSE, TRUE);
g_signal_connect_object (G_OBJECT (context), "pattern_changed",
g_signal_connect_object (context, "pattern_changed",
G_CALLBACK (gimp_preview_set_viewable),
G_OBJECT (deviceD->patterns[i]),
deviceD->patterns[i],
G_CONNECT_SWAPPED);
gimp_dnd_viewable_dest_add (deviceD->patterns[i],
GIMP_TYPE_PATTERN,
@ -275,9 +275,9 @@ device_status_dialog_create (Gimp *gimp)
gimp_preview_new_full (GIMP_VIEWABLE (gimp_context_get_gradient (context)),
CELL_SIZE * 2, CELL_SIZE, 0,
FALSE, FALSE, TRUE);
g_signal_connect_object (G_OBJECT (context), "gradient_changed",
g_signal_connect_object (context, "gradient_changed",
G_CALLBACK (gimp_preview_set_viewable),
G_OBJECT (deviceD->gradients[i]),
deviceD->gradients[i],
G_CONNECT_SWAPPED);
gimp_dnd_viewable_dest_add (deviceD->gradients[i],
GIMP_TYPE_GRADIENT,
@ -294,7 +294,7 @@ device_status_dialog_create (Gimp *gimp)
device_status_dialog_update_current (gimp);
g_signal_connect (G_OBJECT (deviceD->shell), "destroy",
g_signal_connect (deviceD->shell, "destroy",
G_CALLBACK (device_status_destroy_callback),
NULL);

46
app/gui/dialogs-constructors.c
View File

@ -811,7 +811,7 @@ dialogs_indexed_palette_new (GimpDialogFactory *factory,
gimp_dockable_set_context (GIMP_DOCKABLE (dockable), context);
g_signal_connect (G_OBJECT (view), "selected",
g_signal_connect (view, "selected",
G_CALLBACK (dialogs_indexed_palette_selected),
dockable);
@ -1044,9 +1044,9 @@ dialogs_brush_tab_func (GimpDockable *dockable,
width, height, 1,
FALSE, FALSE, FALSE);
g_signal_connect_object (G_OBJECT (context), "brush_changed",
g_signal_connect_object (context, "brush_changed",
G_CALLBACK (gimp_preview_set_viewable),
G_OBJECT (preview),
preview,
G_CONNECT_SWAPPED);
return preview;
@ -1071,9 +1071,9 @@ dialogs_pattern_tab_func (GimpDockable *dockable,
width, height, 1,
FALSE, FALSE, FALSE);
g_signal_connect_object (G_OBJECT (context), "pattern_changed",
g_signal_connect_object (context, "pattern_changed",
G_CALLBACK (gimp_preview_set_viewable),
G_OBJECT (preview),
preview,
G_CONNECT_SWAPPED);
return preview;
@ -1098,9 +1098,9 @@ dialogs_gradient_tab_func (GimpDockable *dockable,
width, height, 1,
FALSE, FALSE, FALSE);
g_signal_connect_object (G_OBJECT (context), "gradient_changed",
g_signal_connect_object (context, "gradient_changed",
G_CALLBACK (gimp_preview_set_viewable),
G_OBJECT (preview),
preview,
G_CONNECT_SWAPPED);
return preview;
@ -1125,9 +1125,9 @@ dialogs_palette_tab_func (GimpDockable *dockable,
width, height, 1,
FALSE, FALSE, FALSE);
g_signal_connect_object (G_OBJECT (context), "palette_changed",
g_signal_connect_object (context, "palette_changed",
G_CALLBACK (gimp_preview_set_viewable),
G_OBJECT (preview),
preview,
G_CONNECT_SWAPPED);
return preview;
@ -1154,9 +1154,9 @@ dialogs_tool_tab_func (GimpDockable *dockable,
image = gtk_image_new_from_stock (gimp_context_get_tool (context)->stock_id,
size);
g_signal_connect_object (G_OBJECT (context), "tool_changed",
g_signal_connect_object (context, "tool_changed",
G_CALLBACK (dialogs_tool_tab_tool_changed),
G_OBJECT (image),
image,
0);
return image;
@ -1212,9 +1212,9 @@ dialogs_tool_options_tab_func (GimpDockable *dockable,
g_object_set_data (G_OBJECT (label), "tool-icon", image);
g_signal_connect_object (G_OBJECT (context), "tool_changed",
g_signal_connect_object (context, "tool_changed",
G_CALLBACK (dialogs_tool_options_tool_changed),
G_OBJECT (label),
label,
0);
return hbox;
@ -1297,14 +1297,14 @@ dialogs_set_image_item_context_func (GimpDockable *dockable,
{
if (dockable->context)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (dockable->context),
g_signal_handlers_disconnect_by_func (dockable->context,
dialogs_image_item_view_image_changed,
view);
}
if (context)
{
g_signal_connect (G_OBJECT (context), "image_changed",
g_signal_connect (context, "image_changed",
G_CALLBACK (dialogs_image_item_view_image_changed),
view);
@ -1332,14 +1332,14 @@ dialogs_set_path_context_func (GimpDockable *dockable,
{
if (dockable->context)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (dockable->context),
g_signal_handlers_disconnect_by_func (dockable->context,
dialogs_path_view_image_changed,
view);
}
if (context)
{
g_signal_connect (G_OBJECT (context), "image_changed",
g_signal_connect (context, "image_changed",
G_CALLBACK (dialogs_path_view_image_changed),
view);
@ -1367,14 +1367,14 @@ dialogs_set_indexed_palette_context_func (GimpDockable *dockable,
{
if (dockable->context)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (dockable->context),
g_signal_handlers_disconnect_by_func (dockable->context,
dialogs_indexed_palette_image_changed,
view);
}
if (context)
{
g_signal_connect (G_OBJECT (context), "image_changed",
g_signal_connect (context, "image_changed",
G_CALLBACK (dialogs_indexed_palette_image_changed),
view);
@ -1402,14 +1402,14 @@ dialogs_set_selection_editor_context_func (GimpDockable *dockable,
{
if (dockable->context)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (dockable->context),
g_signal_handlers_disconnect_by_func (dockable->context,
dialogs_selection_editor_image_changed,
view);
}
if (context)
{
g_signal_connect (G_OBJECT (context), "image_changed",
g_signal_connect (context, "image_changed",
G_CALLBACK (dialogs_selection_editor_image_changed),
view);
@ -1437,14 +1437,14 @@ dialogs_set_navigation_context_func (GimpDockable *dockable,
{
if (dockable->context)
{
g_signal_handlers_disconnect_by_func (G_OBJECT (dockable->context),
g_signal_handlers_disconnect_by_func (dockable->context,
dialogs_navigation_display_changed,
view);
}
if (context)
{
g_signal_connect (G_OBJECT (context), "display_changed",
g_signal_connect (context, "display_changed",
G_CALLBACK (dialogs_navigation_display_changed),
view);

6
app/gui/dialogs.c
View File

@ -136,7 +136,7 @@ dialogs_exit (Gimp *gimp)
{
if (global_dialog_factory)
{
g_object_unref (G_OBJECT (global_dialog_factory));
g_object_unref (global_dialog_factory);
global_dialog_factory = NULL;
}
@ -148,13 +148,13 @@ dialogs_exit (Gimp *gimp)
*/
if (global_toolbox_factory)
{
g_object_unref (G_OBJECT (global_toolbox_factory));
g_object_unref (global_toolbox_factory);
global_toolbox_factory = NULL;
}
if (global_dock_factory)
{
g_object_unref (G_OBJECT (global_dock_factory));
g_object_unref (global_dock_factory);
global_dock_factory = NULL;
}
}

16
app/gui/error-console-dialog.c
View File

@ -130,7 +130,7 @@ error_console_create (Gimp *gimp)
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
g_signal_connect (G_OBJECT (menuitem), "activate",
g_signal_connect (menuitem, "activate",
G_CALLBACK (error_console_clear_callback),
text_buffer);
@ -143,7 +143,7 @@ error_console_create (Gimp *gimp)
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
g_signal_connect (G_OBJECT (menuitem), "activate",
g_signal_connect (menuitem, "activate",
G_CALLBACK (error_console_write_all_callback),
text_buffer);
@ -151,20 +151,20 @@ error_console_create (Gimp *gimp)
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
gtk_widget_show (menuitem);
g_signal_connect (G_OBJECT (menuitem), "activate",
g_signal_connect (menuitem, "activate",
G_CALLBACK (error_console_write_selection_callback),
text_buffer);
/* The output text widget */
text_view = gtk_text_view_new_with_buffer (text_buffer);
g_object_unref (G_OBJECT (text_buffer));
g_object_unref (text_buffer);
gtk_text_view_set_editable (GTK_TEXT_VIEW (text_view), FALSE);
gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_view), GTK_WRAP_WORD);
gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
gtk_widget_show (text_view);
g_signal_connect (G_OBJECT (text_view), "button_press_event",
g_signal_connect (text_view, "button_press_event",
G_CALLBACK (text_clicked_callback),
menu);
@ -295,15 +295,15 @@ error_console_create_file_dialog (GtkTextBuffer *buffer,
gtk_container_set_border_width (GTK_CONTAINER (filesel), 2);
gtk_container_set_border_width (GTK_CONTAINER (filesel->button_area), 2);
g_signal_connect_swapped (G_OBJECT (filesel->cancel_button), "clicked",
g_signal_connect_swapped (filesel->cancel_button, "clicked",
G_CALLBACK (gtk_widget_destroy),
filesel);
g_signal_connect_swapped (G_OBJECT (filesel), "delete_event",
g_signal_connect_swapped (filesel, "delete_event",
G_CALLBACK (gtk_widget_destroy),
filesel);
g_signal_connect (G_OBJECT (filesel->ok_button), "clicked",
g_signal_connect (filesel->ok_button, "clicked",
G_CALLBACK (error_console_file_ok_callback),
filesel);

6
app/gui/file-dialog-utils.c
View File

@ -70,14 +70,14 @@ file_dialog_new (Gimp *gimp,
gtk_container_set_border_width (GTK_CONTAINER (fs->button_area), 2);
gtk_container_set_border_width (GTK_CONTAINER (filesel), 2);
g_signal_connect_swapped (G_OBJECT (fs->cancel_button), "clicked",
g_signal_connect_swapped (fs->cancel_button, "clicked",
G_CALLBACK (file_dialog_hide),
filesel);
g_signal_connect (G_OBJECT (filesel), "delete_event",
g_signal_connect (filesel, "delete_event",
G_CALLBACK (file_dialog_hide),
NULL);
g_signal_connect (G_OBJECT (fs->ok_button), "clicked",
g_signal_connect (fs->ok_button, "clicked",
G_CALLBACK (ok_callback),
filesel);

Some files were not shown because too many files have changed in this diff Show More