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

use g_tree_foreach() instead of deprecated g_tree_traverse(). 

2001-12-02  Sven Neumann  <sven@gimp.org>

	* app/plug-in/plug-in.c: use g_tree_foreach() instead of deprecated
	g_tree_traverse().

	* app/undo_history.c
	* app/display/gimpdisplayshell-selection.c
	* app/display/gimpdisplayshell.c
	* app/gui/about-dialog.c
	* app/gui/color-area.c
	* app/gui/color-select.c
	* app/gui/gradient-editor.c
	* app/gui/gui.c
	* app/gui/paths-dialog.c
	* app/gui/user-install-dialog.c
	* app/tools/gimpcurvestool.c
	* app/tools/gimpinktool.c
	* app/widgets/gimpcursor.c
	* app/widgets/gimpnavigationpreview.c
	* libgimpwidgets/gimpchainbutton.c
	* libgimpwidgets/gimppixmap.c
	* plug-ins/common/animationplay.c
	* plug-ins/common/uniteditor.c
	* plug-ins/ifscompose/ifscompose.c: s/gdk_gc_unref/g_object_unref/,
	s/gdk_drawable_unref/g_object_unref/
This commit is contained in:
Sven Neumann 2001-12-02 15:43:00 +00:00 committed by Sven Neumann
parent 1ed9180112
commit 83468fca06
48 changed files with 260 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ChangeLog
View File

@ -1,3 +1,29 @@
2001-12-02 Sven Neumann <sven@gimp.org>
* app/plug-in/plug-in.c: use g_tree_foreach() instead of deprecated
g_tree_traverse().
* app/undo_history.c
* app/display/gimpdisplayshell-selection.c
* app/display/gimpdisplayshell.c
* app/gui/about-dialog.c
* app/gui/color-area.c
* app/gui/color-select.c
* app/gui/gradient-editor.c
* app/gui/gui.c
* app/gui/paths-dialog.c
* app/gui/user-install-dialog.c
* app/tools/gimpcurvestool.c
* app/tools/gimpinktool.c
* app/widgets/gimpcursor.c
* app/widgets/gimpnavigationpreview.c
* libgimpwidgets/gimpchainbutton.c
* libgimpwidgets/gimppixmap.c
* plug-ins/common/animationplay.c
* plug-ins/common/uniteditor.c
* plug-ins/ifscompose/ifscompose.c: s/gdk_gc_unref/g_object_unref/,
s/gdk_drawable_unref/g_object_unref/
2001-12-02 Daniel Egger <degger@fhm.edu>
* app/gimprc.c: Convert ugly comments into named structure fields.

15
app/actions/plug-in-commands.c
View File

@ -2781,9 +2781,10 @@ plug_in_make_menu (void)
proc_def = procs->data;
procs = procs->next;
if (proc_def->prog && proc_def->menu_path && (!proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics))
if (proc_def->prog &&
proc_def->menu_path && ( !proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics) )
{
menu_entry = g_new (PlugInMenuEntry, 1);
menu_entry->proc_def = proc_def;
@ -2792,14 +2793,16 @@ plug_in_make_menu (void)
menu_entry->help_path = plug_in_def->help_path;
g_tree_insert (menu_entries,
dgettext (menu_entry->domain, proc_def->menu_path),
dgettext (menu_entry->domain,
proc_def->menu_path),
menu_entry);
}
}
}
g_tree_traverse (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry, G_IN_ORDER, NULL);
g_tree_foreach (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry,
NULL);
g_tree_destroy (menu_entries);
g_slist_free (domains);

2
app/base/curves.c
View File

@ -593,7 +593,7 @@ curves_free (void)
gtk_widget_destroy (curves_dialog->shell);
if (curves_dialog->pixmap)
gdk_drawable_unref (curves_dialog->pixmap);
g_object_unref (curves_dialog->pixmap);
if (curves_dialog->cursor_layout)
g_object_unref (curves_dialog->cursor_layout);

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

@ -368,7 +368,7 @@ about_dialog_load_logo (GtkWidget *window)
gtk_preview_put (GTK_PREVIEW (preview),
logo_pixmap, gc,
0, 0, 0, 0, logo_width, logo_height);
gdk_gc_unref (gc);
g_object_unref (gc);
gtk_object_sink (GTK_OBJECT (preview));
g_free (pixelrow);
@ -587,8 +587,8 @@ about_dialog_tool_drop (GtkWidget *widget,
gdk_gc_set_clip_origin (logo_area->style->black_gc, 0, 0);
}
gdk_drawable_unref (pixmap);
gdk_drawable_unref (mask);
g_object_unref (pixmap);
g_object_unref (mask);
scroll_text = drop_text;
nscroll_texts = G_N_ELEMENTS (drop_text);

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

@ -818,10 +818,10 @@ user_install_dialog_create (Gimp *gimp)
gtk_widget_set_usize (ctree, -1, ctree->requisition.height);
gdk_drawable_unref (file_pixmap);
gdk_drawable_unref (file_mask);
gdk_drawable_unref (folder_pixmap);
gdk_drawable_unref (folder_mask);
g_object_unref (file_pixmap);
g_object_unref (file_mask);
g_object_unref (folder_pixmap);
g_object_unref (folder_mask);
}
/* Page 3 */

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

@ -276,7 +276,7 @@ gimp_display_shell_destroy (GtkObject *object)
if (shell->render_gc)
{
gdk_gc_unref (shell->render_gc);
g_object_unref (shell->render_gc);
shell->render_gc = NULL;
}

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

@ -218,15 +218,15 @@ gimp_display_shell_selection_free (Selection *select)
g_source_remove (select->timeout_id);
if (select->gc_in)
gdk_gc_unref (select->gc_in);
g_object_unref (select->gc_in);
if (select->gc_out)
gdk_gc_unref (select->gc_out);
g_object_unref (select->gc_out);
if (select->gc_layer)
gdk_gc_unref (select->gc_layer);
g_object_unref (select->gc_layer);
if (select->gc_white)
gdk_gc_unref (select->gc_white);
g_object_unref (select->gc_white);
if (select->gc_black)
gdk_gc_unref (select->gc_black);
g_object_unref (select->gc_black);
selection_free_segs (select);
@ -409,7 +409,7 @@ create_cycled_ants_pixmap (GdkWindow *window,
gdk_draw_line (pixmap, gc, i, j, i, j);
}
gdk_gc_unref (gc);
g_object_unref (gc);
return pixmap;
}

2
app/display/gimpdisplayshell.c
View File

@ -276,7 +276,7 @@ gimp_display_shell_destroy (GtkObject *object)
if (shell->render_gc)
{
gdk_gc_unref (shell->render_gc);
g_object_unref (shell->render_gc);
shell->render_gc = NULL;
}

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

@ -368,7 +368,7 @@ about_dialog_load_logo (GtkWidget *window)
gtk_preview_put (GTK_PREVIEW (preview),
logo_pixmap, gc,
0, 0, 0, 0, logo_width, logo_height);
gdk_gc_unref (gc);
g_object_unref (gc);
gtk_object_sink (GTK_OBJECT (preview));
g_free (pixelrow);
@ -587,8 +587,8 @@ about_dialog_tool_drop (GtkWidget *widget,
gdk_gc_set_clip_origin (logo_area->style->black_gc, 0, 0);
}
gdk_drawable_unref (pixmap);
gdk_drawable_unref (mask);
g_object_unref (pixmap);
g_object_unref (mask);
scroll_text = drop_text;
nscroll_texts = G_N_ELEMENTS (drop_text);

4
app/gui/color-area.c
View File

@ -474,8 +474,8 @@ color_area_events (GtkWidget *widget,
case GDK_CONFIGURE:
if (color_area_pixmap)
{
gdk_drawable_unref (color_area_pixmap);
gdk_drawable_unref (color_area_mask);
g_object_unref (color_area_pixmap);
g_object_unref (color_area_mask);
}
color_area_pixmap = gdk_pixmap_new (widget->window,

2
app/gui/color-select.c
View File

@ -1453,7 +1453,7 @@ color_select_notebook_free (gpointer data)
{
notebook_glue *glue = data;
gdk_gc_unref (glue->csp->gc);
g_object_unref (glue->csp->gc);
g_free (glue->csp);
/* don't need to destroy the widget, since it's done by the caller

2
app/gui/gradient-editor.c
View File

@ -1839,7 +1839,7 @@ control_update (GradientEditor *editor,
(cheight != pheight))
{
if (editor->control_pixmap)
gdk_drawable_unref (editor->control_pixmap);
g_object_unref (editor->control_pixmap);
editor->control_pixmap =
gdk_pixmap_new (editor->control->window, cwidth, cheight, -1);

4
app/gui/gui.c
View File

@ -518,8 +518,8 @@ gui_rotate_the_shield_harmonics (GtkWidget *widget,
gdk_gc_set_clip_origin (widget->style->black_gc, 0, 0);
}
gdk_drawable_unref (pixmap);
gdk_drawable_unref (mask);
g_object_unref (pixmap);
g_object_unref (mask);
return FALSE;
}

2
app/gui/paths-dialog.c
View File

@ -411,7 +411,7 @@ clear_pathwidget (gpointer data)
if (pwidget)
{
if (pwidget->paths_pixmap)
gdk_drawable_unref (pwidget->paths_pixmap);
g_object_unref (pwidget->paths_pixmap);
g_free (pwidget);
}

15
app/gui/plug-in-commands.c
View File

@ -2781,9 +2781,10 @@ plug_in_make_menu (void)
proc_def = procs->data;
procs = procs->next;
if (proc_def->prog && proc_def->menu_path && (!proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics))
if (proc_def->prog &&
proc_def->menu_path && ( !proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics) )
{
menu_entry = g_new (PlugInMenuEntry, 1);
menu_entry->proc_def = proc_def;
@ -2792,14 +2793,16 @@ plug_in_make_menu (void)
menu_entry->help_path = plug_in_def->help_path;
g_tree_insert (menu_entries,
dgettext (menu_entry->domain, proc_def->menu_path),
dgettext (menu_entry->domain,
proc_def->menu_path),
menu_entry);
}
}
}
g_tree_traverse (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry, G_IN_ORDER, NULL);
g_tree_foreach (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry,
NULL);
g_tree_destroy (menu_entries);
g_slist_free (domains);

15
app/gui/plug-in-menus.c
View File

@ -2781,9 +2781,10 @@ plug_in_make_menu (void)
proc_def = procs->data;
procs = procs->next;
if (proc_def->prog && proc_def->menu_path && (!proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics))
if (proc_def->prog &&
proc_def->menu_path && ( !proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics) )
{
menu_entry = g_new (PlugInMenuEntry, 1);
menu_entry->proc_def = proc_def;
@ -2792,14 +2793,16 @@ plug_in_make_menu (void)
menu_entry->help_path = plug_in_def->help_path;
g_tree_insert (menu_entries,
dgettext (menu_entry->domain, proc_def->menu_path),
dgettext (menu_entry->domain,
proc_def->menu_path),
menu_entry);
}
}
}
g_tree_traverse (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry, G_IN_ORDER, NULL);
g_tree_foreach (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry,
NULL);
g_tree_destroy (menu_entries);
g_slist_free (domains);

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

@ -818,10 +818,10 @@ user_install_dialog_create (Gimp *gimp)
gtk_widget_set_usize (ctree, -1, ctree->requisition.height);
gdk_drawable_unref (file_pixmap);
gdk_drawable_unref (file_mask);
gdk_drawable_unref (folder_pixmap);
gdk_drawable_unref (folder_mask);
g_object_unref (file_pixmap);
g_object_unref (file_mask);
g_object_unref (folder_pixmap);
g_object_unref (folder_mask);
}
/* Page 3 */

15
app/menus/plug-in-menus.c
View File

@ -2781,9 +2781,10 @@ plug_in_make_menu (void)
proc_def = procs->data;
procs = procs->next;
if (proc_def->prog && proc_def->menu_path && (!proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics))
if (proc_def->prog &&
proc_def->menu_path && ( !proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics) )
{
menu_entry = g_new (PlugInMenuEntry, 1);
menu_entry->proc_def = proc_def;
@ -2792,14 +2793,16 @@ plug_in_make_menu (void)
menu_entry->help_path = plug_in_def->help_path;
g_tree_insert (menu_entries,
dgettext (menu_entry->domain, proc_def->menu_path),
dgettext (menu_entry->domain,
proc_def->menu_path),
menu_entry);
}
}
}
g_tree_traverse (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry, G_IN_ORDER, NULL);
g_tree_foreach (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry,
NULL);
g_tree_destroy (menu_entries);
g_slist_free (domains);

10
app/paint/gimpink.c
View File

@ -768,8 +768,8 @@ blob_pixmap (GdkColormap *colormap,
paint_blob (pixmap, black_gc, blob);
g_free (blob);
gdk_gc_unref (white_gc);
gdk_gc_unref (black_gc);
g_object_unref (white_gc);
g_object_unref (black_gc);
return pixmap;
}
@ -1578,7 +1578,7 @@ ink_options_new (GimpToolInfo *tool_info)
blob_ellipse);
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_drawable_unref (pixmap);
g_object_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button = gtk_radio_button_new (NULL);
@ -1597,7 +1597,7 @@ ink_options_new (GimpToolInfo *tool_info)
blob_square);
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_drawable_unref (pixmap);
g_object_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button =
@ -1617,7 +1617,7 @@ ink_options_new (GimpToolInfo *tool_info)
blob_diamond);
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_drawable_unref (pixmap);
g_object_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button =

15
app/plug-in/gimpplugin-message.c
View File

@ -2781,9 +2781,10 @@ plug_in_make_menu (void)
proc_def = procs->data;
procs = procs->next;
if (proc_def->prog && proc_def->menu_path && (!proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics))
if (proc_def->prog &&
proc_def->menu_path && ( !proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics) )
{
menu_entry = g_new (PlugInMenuEntry, 1);
menu_entry->proc_def = proc_def;
@ -2792,14 +2793,16 @@ plug_in_make_menu (void)
menu_entry->help_path = plug_in_def->help_path;
g_tree_insert (menu_entries,
dgettext (menu_entry->domain, proc_def->menu_path),
dgettext (menu_entry->domain,
proc_def->menu_path),
menu_entry);
}
}
}
g_tree_traverse (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry, G_IN_ORDER, NULL);
g_tree_foreach (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry,
NULL);
g_tree_destroy (menu_entries);
g_slist_free (domains);

15
app/plug-in/gimpplugin-progress.c
View File

@ -2781,9 +2781,10 @@ plug_in_make_menu (void)
proc_def = procs->data;
procs = procs->next;
if (proc_def->prog && proc_def->menu_path && (!proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics))
if (proc_def->prog &&
proc_def->menu_path && ( !proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics) )
{
menu_entry = g_new (PlugInMenuEntry, 1);
menu_entry->proc_def = proc_def;
@ -2792,14 +2793,16 @@ plug_in_make_menu (void)
menu_entry->help_path = plug_in_def->help_path;
g_tree_insert (menu_entries,
dgettext (menu_entry->domain, proc_def->menu_path),
dgettext (menu_entry->domain,
proc_def->menu_path),
menu_entry);
}
}
}
g_tree_traverse (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry, G_IN_ORDER, NULL);
g_tree_foreach (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry,
NULL);
g_tree_destroy (menu_entries);
g_slist_free (domains);

15
app/plug-in/gimpplugin.c
View File

@ -2781,9 +2781,10 @@ plug_in_make_menu (void)
proc_def = procs->data;
procs = procs->next;
if (proc_def->prog && proc_def->menu_path && (!proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics))
if (proc_def->prog &&
proc_def->menu_path && ( !proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics) )
{
menu_entry = g_new (PlugInMenuEntry, 1);
menu_entry->proc_def = proc_def;
@ -2792,14 +2793,16 @@ plug_in_make_menu (void)
menu_entry->help_path = plug_in_def->help_path;
g_tree_insert (menu_entries,
dgettext (menu_entry->domain, proc_def->menu_path),
dgettext (menu_entry->domain,
proc_def->menu_path),
menu_entry);
}
}
}
g_tree_traverse (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry, G_IN_ORDER, NULL);
g_tree_foreach (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry,
NULL);
g_tree_destroy (menu_entries);
g_slist_free (domains);

15
app/plug-in/gimppluginmanager-call.c
View File

@ -2781,9 +2781,10 @@ plug_in_make_menu (void)
proc_def = procs->data;
procs = procs->next;
if (proc_def->prog && proc_def->menu_path && (!proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics))
if (proc_def->prog &&
proc_def->menu_path && ( !proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics) )
{
menu_entry = g_new (PlugInMenuEntry, 1);
menu_entry->proc_def = proc_def;
@ -2792,14 +2793,16 @@ plug_in_make_menu (void)
menu_entry->help_path = plug_in_def->help_path;
g_tree_insert (menu_entries,
dgettext (menu_entry->domain, proc_def->menu_path),
dgettext (menu_entry->domain,
proc_def->menu_path),
menu_entry);
}
}
}
g_tree_traverse (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry, G_IN_ORDER, NULL);
g_tree_foreach (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry,
NULL);
g_tree_destroy (menu_entries);
g_slist_free (domains);

15
app/plug-in/gimppluginmanager-run.c
View File

@ -2781,9 +2781,10 @@ plug_in_make_menu (void)
proc_def = procs->data;
procs = procs->next;
if (proc_def->prog && proc_def->menu_path && (!proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics))
if (proc_def->prog &&
proc_def->menu_path && ( !proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics) )
{
menu_entry = g_new (PlugInMenuEntry, 1);
menu_entry->proc_def = proc_def;
@ -2792,14 +2793,16 @@ plug_in_make_menu (void)
menu_entry->help_path = plug_in_def->help_path;
g_tree_insert (menu_entries,
dgettext (menu_entry->domain, proc_def->menu_path),
dgettext (menu_entry->domain,
proc_def->menu_path),
menu_entry);
}
}
}
g_tree_traverse (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry, G_IN_ORDER, NULL);
g_tree_foreach (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry,
NULL);
g_tree_destroy (menu_entries);
g_slist_free (domains);

15
app/plug-in/gimppluginmanager.c
View File

@ -2781,9 +2781,10 @@ plug_in_make_menu (void)
proc_def = procs->data;
procs = procs->next;
if (proc_def->prog && proc_def->menu_path && (!proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics))
if (proc_def->prog &&
proc_def->menu_path && ( !proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics) )
{
menu_entry = g_new (PlugInMenuEntry, 1);
menu_entry->proc_def = proc_def;
@ -2792,14 +2793,16 @@ plug_in_make_menu (void)
menu_entry->help_path = plug_in_def->help_path;
g_tree_insert (menu_entries,
dgettext (menu_entry->domain, proc_def->menu_path),
dgettext (menu_entry->domain,
proc_def->menu_path),
menu_entry);
}
}
}
g_tree_traverse (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry, G_IN_ORDER, NULL);
g_tree_foreach (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry,
NULL);
g_tree_destroy (menu_entries);
g_slist_free (domains);

15
app/plug-in/gimppluginshm.c
View File

@ -2781,9 +2781,10 @@ plug_in_make_menu (void)
proc_def = procs->data;
procs = procs->next;
if (proc_def->prog && proc_def->menu_path && (!proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics))
if (proc_def->prog &&
proc_def->menu_path && ( !proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics) )
{
menu_entry = g_new (PlugInMenuEntry, 1);
menu_entry->proc_def = proc_def;
@ -2792,14 +2793,16 @@ plug_in_make_menu (void)
menu_entry->help_path = plug_in_def->help_path;
g_tree_insert (menu_entries,
dgettext (menu_entry->domain, proc_def->menu_path),
dgettext (menu_entry->domain,
proc_def->menu_path),
menu_entry);
}
}
}
g_tree_traverse (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry, G_IN_ORDER, NULL);
g_tree_foreach (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry,
NULL);
g_tree_destroy (menu_entries);
g_slist_free (domains);

15
app/plug-in/plug-in-def.c
View File

@ -2781,9 +2781,10 @@ plug_in_make_menu (void)
proc_def = procs->data;
procs = procs->next;
if (proc_def->prog && proc_def->menu_path && (!proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics))
if (proc_def->prog &&
proc_def->menu_path && ( !proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics) )
{
menu_entry = g_new (PlugInMenuEntry, 1);
menu_entry->proc_def = proc_def;
@ -2792,14 +2793,16 @@ plug_in_make_menu (void)
menu_entry->help_path = plug_in_def->help_path;
g_tree_insert (menu_entries,
dgettext (menu_entry->domain, proc_def->menu_path),
dgettext (menu_entry->domain,
proc_def->menu_path),
menu_entry);
}
}
}
g_tree_traverse (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry, G_IN_ORDER, NULL);
g_tree_foreach (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry,
NULL);
g_tree_destroy (menu_entries);
g_slist_free (domains);

15
app/plug-in/plug-in-message.c
View File

@ -2781,9 +2781,10 @@ plug_in_make_menu (void)
proc_def = procs->data;
procs = procs->next;
if (proc_def->prog && proc_def->menu_path && (!proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics))
if (proc_def->prog &&
proc_def->menu_path && ( !proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics) )
{
menu_entry = g_new (PlugInMenuEntry, 1);
menu_entry->proc_def = proc_def;
@ -2792,14 +2793,16 @@ plug_in_make_menu (void)
menu_entry->help_path = plug_in_def->help_path;
g_tree_insert (menu_entries,
dgettext (menu_entry->domain, proc_def->menu_path),
dgettext (menu_entry->domain,
proc_def->menu_path),
menu_entry);
}
}
}
g_tree_traverse (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry, G_IN_ORDER, NULL);
g_tree_foreach (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry,
NULL);
g_tree_destroy (menu_entries);
g_slist_free (domains);

15
app/plug-in/plug-in-params.c
View File

@ -2781,9 +2781,10 @@ plug_in_make_menu (void)
proc_def = procs->data;
procs = procs->next;
if (proc_def->prog && proc_def->menu_path && (!proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics))
if (proc_def->prog &&
proc_def->menu_path && ( !proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics) )
{
menu_entry = g_new (PlugInMenuEntry, 1);
menu_entry->proc_def = proc_def;
@ -2792,14 +2793,16 @@ plug_in_make_menu (void)
menu_entry->help_path = plug_in_def->help_path;
g_tree_insert (menu_entries,
dgettext (menu_entry->domain, proc_def->menu_path),
dgettext (menu_entry->domain,
proc_def->menu_path),
menu_entry);
}
}
}
g_tree_traverse (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry, G_IN_ORDER, NULL);
g_tree_foreach (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry,
NULL);
g_tree_destroy (menu_entries);
g_slist_free (domains);

15
app/plug-in/plug-in-progress.c
View File

@ -2781,9 +2781,10 @@ plug_in_make_menu (void)
proc_def = procs->data;
procs = procs->next;
if (proc_def->prog && proc_def->menu_path && (!proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics))
if (proc_def->prog &&
proc_def->menu_path && ( !proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics) )
{
menu_entry = g_new (PlugInMenuEntry, 1);
menu_entry->proc_def = proc_def;
@ -2792,14 +2793,16 @@ plug_in_make_menu (void)
menu_entry->help_path = plug_in_def->help_path;
g_tree_insert (menu_entries,
dgettext (menu_entry->domain, proc_def->menu_path),
dgettext (menu_entry->domain,
proc_def->menu_path),
menu_entry);
}
}
}
g_tree_traverse (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry, G_IN_ORDER, NULL);
g_tree_foreach (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry,
NULL);
g_tree_destroy (menu_entries);
g_slist_free (domains);

15
app/plug-in/plug-in-run.c
View File

@ -2781,9 +2781,10 @@ plug_in_make_menu (void)
proc_def = procs->data;
procs = procs->next;
if (proc_def->prog && proc_def->menu_path && (!proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics))
if (proc_def->prog &&
proc_def->menu_path && ( !proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics) )
{
menu_entry = g_new (PlugInMenuEntry, 1);
menu_entry->proc_def = proc_def;
@ -2792,14 +2793,16 @@ plug_in_make_menu (void)
menu_entry->help_path = plug_in_def->help_path;
g_tree_insert (menu_entries,
dgettext (menu_entry->domain, proc_def->menu_path),
dgettext (menu_entry->domain,
proc_def->menu_path),
menu_entry);
}
}
}
g_tree_traverse (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry, G_IN_ORDER, NULL);
g_tree_foreach (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry,
NULL);
g_tree_destroy (menu_entries);
g_slist_free (domains);

15
app/plug-in/plug-in-shm.c
View File

@ -2781,9 +2781,10 @@ plug_in_make_menu (void)
proc_def = procs->data;
procs = procs->next;
if (proc_def->prog && proc_def->menu_path && (!proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics))
if (proc_def->prog &&
proc_def->menu_path && ( !proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics) )
{
menu_entry = g_new (PlugInMenuEntry, 1);
menu_entry->proc_def = proc_def;
@ -2792,14 +2793,16 @@ plug_in_make_menu (void)
menu_entry->help_path = plug_in_def->help_path;
g_tree_insert (menu_entries,
dgettext (menu_entry->domain, proc_def->menu_path),
dgettext (menu_entry->domain,
proc_def->menu_path),
menu_entry);
}
}
}
g_tree_traverse (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry, G_IN_ORDER, NULL);
g_tree_foreach (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry,
NULL);
g_tree_destroy (menu_entries);
g_slist_free (domains);

15
app/plug-in/plug-in.c
View File

@ -2781,9 +2781,10 @@ plug_in_make_menu (void)
proc_def = procs->data;
procs = procs->next;
if (proc_def->prog && proc_def->menu_path && (!proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics))
if (proc_def->prog &&
proc_def->menu_path && ( !proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics) )
{
menu_entry = g_new (PlugInMenuEntry, 1);
menu_entry->proc_def = proc_def;
@ -2792,14 +2793,16 @@ plug_in_make_menu (void)
menu_entry->help_path = plug_in_def->help_path;
g_tree_insert (menu_entries,
dgettext (menu_entry->domain, proc_def->menu_path),
dgettext (menu_entry->domain,
proc_def->menu_path),
menu_entry);
}
}
}
g_tree_traverse (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry, G_IN_ORDER, NULL);
g_tree_foreach (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry,
NULL);
g_tree_destroy (menu_entries);
g_slist_free (domains);

15
app/plug-in/plug-ins.c
View File

@ -2781,9 +2781,10 @@ plug_in_make_menu (void)
proc_def = procs->data;
procs = procs->next;
if (proc_def->prog && proc_def->menu_path && (!proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics))
if (proc_def->prog &&
proc_def->menu_path && ( !proc_def->extensions &&
!proc_def->prefixes &&
!proc_def->magics) )
{
menu_entry = g_new (PlugInMenuEntry, 1);
menu_entry->proc_def = proc_def;
@ -2792,14 +2793,16 @@ plug_in_make_menu (void)
menu_entry->help_path = plug_in_def->help_path;
g_tree_insert (menu_entries,
dgettext (menu_entry->domain, proc_def->menu_path),
dgettext (menu_entry->domain,
proc_def->menu_path),
menu_entry);
}
}
}
g_tree_traverse (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry, G_IN_ORDER, NULL);
g_tree_foreach (menu_entries,
(GTraverseFunc) plug_in_make_menu_entry,
NULL);
g_tree_destroy (menu_entries);
g_slist_free (domains);

2
app/tools/gimpcurvestool.c
View File

@ -593,7 +593,7 @@ curves_free (void)
gtk_widget_destroy (curves_dialog->shell);
if (curves_dialog->pixmap)
gdk_drawable_unref (curves_dialog->pixmap);
g_object_unref (curves_dialog->pixmap);
if (curves_dialog->cursor_layout)
g_object_unref (curves_dialog->cursor_layout);

10
app/tools/gimpinktool.c
View File

@ -768,8 +768,8 @@ blob_pixmap (GdkColormap *colormap,
paint_blob (pixmap, black_gc, blob);
g_free (blob);
gdk_gc_unref (white_gc);
gdk_gc_unref (black_gc);
g_object_unref (white_gc);
g_object_unref (black_gc);
return pixmap;
}
@ -1578,7 +1578,7 @@ ink_options_new (GimpToolInfo *tool_info)
blob_ellipse);
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_drawable_unref (pixmap);
g_object_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button = gtk_radio_button_new (NULL);
@ -1597,7 +1597,7 @@ ink_options_new (GimpToolInfo *tool_info)
blob_square);
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_drawable_unref (pixmap);
g_object_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button =
@ -1617,7 +1617,7 @@ ink_options_new (GimpToolInfo *tool_info)
blob_diamond);
pixmap_widget = gtk_pixmap_new (pixmap, NULL);
gdk_drawable_unref (pixmap);
g_object_unref (pixmap);
gtk_misc_set_padding (GTK_MISC (pixmap_widget), 6, 0);
radio_button =

2
app/undo_history.c
View File

@ -404,7 +404,7 @@ undo_history_set_pixmap_idle (gpointer data)
gtk_clist_set_row_data (idle->clist, idle->row, (gpointer)2);
gtk_clist_set_pixmap (idle->clist, idle->row, 0, pixmap, NULL);
gdk_drawable_unref (pixmap);
g_object_unref (pixmap);
return (FALSE);
}

4
app/widgets/gimpcursor.c
View File

@ -609,8 +609,8 @@ gimp_cursor_new (GimpCursorType cursor_type,
bmcursor->x_hot,
bmcursor->y_hot);
gdk_drawable_unref (bitmap);
gdk_drawable_unref (mask);
g_object_unref (bitmap);
g_object_unref (mask);
return cursor;
}

2
app/widgets/gimpgradienteditor.c
View File

@ -1839,7 +1839,7 @@ control_update (GradientEditor *editor,
(cheight != pheight))
{
if (editor->control_pixmap)
gdk_drawable_unref (editor->control_pixmap);
g_object_unref (editor->control_pixmap);
editor->control_pixmap =
gdk_pixmap_new (editor->control->window, cwidth, cheight, -1);

2
app/widgets/gimpnavigationpreview.c
View File

@ -191,7 +191,7 @@ gimp_navigation_preview_destroy (GtkObject *object)
if (nav_preview->gc)
{
gdk_gc_unref (nav_preview->gc);
g_object_unref (nav_preview->gc);
nav_preview->gc = NULL;
}

2
app/widgets/gimpnavigationview.c
View File

@ -191,7 +191,7 @@ gimp_navigation_preview_destroy (GtkObject *object)
if (nav_preview->gc)
{
gdk_gc_unref (nav_preview->gc);
g_object_unref (nav_preview->gc);
nav_preview->gc = NULL;
}

4
app/widgets/gimptoolbox-color-area.c
View File

@ -474,8 +474,8 @@ color_area_events (GtkWidget *widget,
case GDK_CONFIGURE:
if (color_area_pixmap)
{
gdk_drawable_unref (color_area_pixmap);
gdk_drawable_unref (color_area_mask);
g_object_unref (color_area_pixmap);
g_object_unref (color_area_mask);
}
color_area_pixmap = gdk_pixmap_new (widget->window,

8
libgimpwidgets/gimpchainbutton.c
View File

@ -173,25 +173,25 @@ gimp_chain_button_destroy (GtkObject *object)
if (gcb->broken)
{
gdk_drawable_unref (gcb->broken);
g_object_unref (gcb->broken);
gcb->broken = NULL;
}
if (gcb->broken_mask)
{
gdk_drawable_unref (gcb->broken_mask);
g_object_unref (gcb->broken_mask);
gcb->broken_mask = NULL;
}
if (gcb->chain)
{
gdk_drawable_unref (gcb->chain);
g_object_unref (gcb->chain);
gcb->chain = NULL;
}
if (gcb->chain_mask)
{
gdk_drawable_unref (gcb->chain_mask);
g_object_unref (gcb->chain_mask);
gcb->chain_mask = NULL;
}

2
libgimpwidgets/gimpcolorselect.c
View File

@ -1453,7 +1453,7 @@ color_select_notebook_free (gpointer data)
{
notebook_glue *glue = data;
gdk_gc_unref (glue->csp->gc);
g_object_unref (glue->csp->gc);
g_free (glue->csp);
/* don't need to destroy the widget, since it's done by the caller

4
libgimpwidgets/gimppixmap.c
View File

@ -182,8 +182,8 @@ gimp_pixmap_create_from_xpm_d (GimpPixmap *pixmap)
gtk_pixmap_set (GTK_PIXMAP (pixmap), gdk_pixmap, mask);
if (gdk_pixmap)
gdk_drawable_unref (gdk_pixmap);
g_object_unref (gdk_pixmap);
if (mask)
gdk_drawable_unref (mask);
g_object_unref (mask);
}

2
plug-ins/common/animationplay.c
View File

@ -392,7 +392,7 @@ reshape_from_bitmap (gchar* bitmap)
bitmap,
width, height);
gtk_widget_shape_combine_mask (shape_window, shape_mask, 0, 0);
gdk_drawable_unref (shape_mask);
g_object_unref (shape_mask);
if (!prev_bitmap)
{

8
plug-ins/common/uniteditor.c
View File

@ -682,8 +682,8 @@ unit_editor_dialog (void)
gimp_help_free ();
gdk_flush ();
gdk_drawable_unref (yes_pixmap);
gdk_drawable_unref (yes_mask);
gdk_drawable_unref (no_pixmap);
gdk_drawable_unref (no_mask);
g_object_unref (yes_pixmap);
g_object_unref (yes_mask);
g_object_unref (no_pixmap);
g_object_unref (no_mask);
}

4
plug-ins/ifscompose/ifscompose.c
View File

@ -1061,7 +1061,7 @@ ifs_compose_dialog (GimpDrawable *drawable)
gdk_flush ();
gdk_gc_unref (ifsDesign->selected_gc);
g_object_unref (ifsDesign->selected_gc);
g_free(ifsD);
@ -1600,7 +1600,7 @@ design_area_configure (GtkWidget *widget,
if (ifsDesign->pixmap)
{
gdk_drawable_unref(ifsDesign->pixmap);
g_object_unref(ifsDesign->pixmap);
}
ifsDesign->pixmap = gdk_pixmap_new(widget->window,
widget->allocation.width,