Commit b2c676bd authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

added GTK_DISABLE_COMPAT_H back to CPPFLAGS.

2001-08-01  Sven Neumann  <sven@gimp.org>

	* configure.in: added GTK_DISABLE_COMPAT_H back to CPPFLAGS.

	* app/user_install.c
	* app/base/base.c
	* app/gui/info-window.c
	* app/gui/menus.c
	* app/gui/preferences-dialog.c
	* app/pdb/procedural_db_cmds.c
	* app/tools/gimpcurvestool.c
	* app/tools/gimptexttool.c
	* app/tools/gimptransformtool.c
	* app/widgets/gimpdialogfactory.c
	* app/widgets/gimpdockbook.c
	* app/widgets/gimpdrawablelistview.c
	* app/widgets/gimpnavigationpreview.c
	* libgimpbase/gimpparasiteio.c
	* libgimpwidgets/gimpwidgets.c
	* plug-ins/FractalExplorer/Dialogs.c
	* plug-ins/common/animationplay.c
	* plug-ins/common/newsprint.c
	* plug-ins/common/uniteditor.c
	* plug-ins/dbbrowser/dbbrowser_utils.c
	* plug-ins/gap/gap_navigator_dialog.c
	* plug-ins/gdyntext/gdyntext_ui.c
	* plug-ins/helpbrowser/helpbrowser.c
	* plug-ins/ifscompose/ifscompose_storage.c
	* plug-ins/print/gimp_main_window.c
	* tools/gimp-remote.c
	* tools/pdbgen/pdb/procedural_db.pdb: replaced lots of deprecated
	glib, gdk and gtk+ functions using the new API.

	* app/paint-funcs/paint-funcs-rgb.c: removed trailing commas.
parent 34e395df
2001-08-01 Sven Neumann <sven@gimp.org>
* configure.in: added GTK_DISABLE_COMPAT_H back to CPPFLAGS.
* app/user_install.c
* app/base/base.c
* app/gui/info-window.c
* app/gui/menus.c
* app/gui/preferences-dialog.c
* app/pdb/procedural_db_cmds.c
* app/tools/gimpcurvestool.c
* app/tools/gimptexttool.c
* app/tools/gimptransformtool.c
* app/widgets/gimpdialogfactory.c
* app/widgets/gimpdockbook.c
* app/widgets/gimpdrawablelistview.c
* app/widgets/gimpnavigationpreview.c
* libgimpbase/gimpparasiteio.c
* libgimpwidgets/gimpwidgets.c
* plug-ins/FractalExplorer/Dialogs.c
* plug-ins/common/animationplay.c
* plug-ins/common/newsprint.c
* plug-ins/common/uniteditor.c
* plug-ins/dbbrowser/dbbrowser_utils.c
* plug-ins/gap/gap_navigator_dialog.c
* plug-ins/gdyntext/gdyntext_ui.c
* plug-ins/helpbrowser/helpbrowser.c
* plug-ins/ifscompose/ifscompose_storage.c
* plug-ins/print/gimp_main_window.c
* tools/gimp-remote.c
* tools/pdbgen/pdb/procedural_db.pdb: replaced lots of deprecated
glib, gdk and gtk+ functions using the new API.
* app/paint-funcs/paint-funcs-rgb.c: removed trailing commas.
2001-08-01 Michael Natterer <mitch@gimp.org>
* app/base/base.c: g_strdup (g_get_temp_dir ()), may fix an unseen
......
......@@ -119,8 +119,8 @@ toast_old_temp_files (void)
/* On Windows, you can't remove open files anyhow,
* so no harm trying.
*/
g_string_sprintf (filename, "%s" G_DIR_SEPARATOR_S "%s",
base_config->swap_path, entry->d_name);
g_string_printf (filename, "%s" G_DIR_SEPARATOR_S "%s",
base_config->swap_path, entry->d_name);
unlink (filename->str);
}
}
......
......@@ -1673,7 +1673,7 @@ curves_graph_events (GtkWidget *widget,
GIMP_TOOL_CURSOR_NONE,
GIMP_CURSOR_MODIFIER_NONE);
gdk_window_set_cursor (cd->graph->window, cursor);
gdk_cursor_destroy (cursor);
gdk_cursor_unref (cursor);
}
curve_print_loc (cd, x, 255 - y);
......
......@@ -1046,10 +1046,7 @@ gimp_transform_tool_grid_recalc (GimpTransformTool *tr_tool)
}
if (gimp_transform_tool_show_grid ())
{
/* EEEEEEK!!! */
gimp_transform_tool_setup_grid (GIMP_TRANSFORM_TOOL (tool_manager_get_active (the_gimp)));
}
gimp_transform_tool_setup_grid (tr_tool);
}
static void
......@@ -1697,14 +1694,12 @@ gimp_transform_tool_cubic (gdouble dx,
result = ((( ( - 7 * jm1 + 21 * j - 21 * jp1 + 7 * jp2 ) * dx +
( 15 * jm1 - 36 * j + 27 * jp1 - 6 * jp2 ) ) * dx +
( - 9 * jm1 + 9 * jp1 ) ) * dx + (jm1 + 16 * j + jp1) ) / 18.0;
#else
#endif
/* Catmull-Rom - not bad */
result = ((( ( - jm1 + 3 * j - 3 * jp1 + jp2 ) * dx +
( 2 * jm1 - 5 * j + 4 * jp1 - jp2 ) ) * dx +
( - jm1 + jp1 ) ) * dx + (j + j) ) / 2.0;
#endif
return result;
}
......@@ -1046,10 +1046,7 @@ gimp_transform_tool_grid_recalc (GimpTransformTool *tr_tool)
}
if (gimp_transform_tool_show_grid ())
{
/* EEEEEEK!!! */
gimp_transform_tool_setup_grid (GIMP_TRANSFORM_TOOL (tool_manager_get_active (the_gimp)));
}
gimp_transform_tool_setup_grid (tr_tool);
}
static void
......@@ -1697,14 +1694,12 @@ gimp_transform_tool_cubic (gdouble dx,
result = ((( ( - 7 * jm1 + 21 * j - 21 * jp1 + 7 * jp2 ) * dx +
( 15 * jm1 - 36 * j + 27 * jp1 - 6 * jp2 ) ) * dx +
( - 9 * jm1 + 9 * jp1 ) ) * dx + (jm1 + 16 * j + jp1) ) / 18.0;
#else
#endif
/* Catmull-Rom - not bad */
result = ((( ( - jm1 + 3 * j - 3 * jp1 + jp2 ) * dx +
( 2 * jm1 - 5 * j + 4 * jp1 - jp2 ) ) * dx +
( - jm1 + jp1 ) ) * dx + (j + j) ) / 2.0;
#endif
return result;
}
......@@ -288,13 +288,13 @@ info_window_create_extended (InfoDialog *info_win)
gtk_widget_show (hbox);
gtk_notebook_append_page (GTK_NOTEBOOK(info_win->info_notebook),
gtk_notebook_append_page (GTK_NOTEBOOK (info_win->info_notebook),
main_table, gtk_label_new (_("Extended")));
gtk_widget_show (main_table);
/* Set back to first page */
gtk_notebook_set_page (GTK_NOTEBOOK(info_win->info_notebook), 0);
gtk_notebook_set_current_page (GTK_NOTEBOOK (info_win->info_notebook), 0);
gtk_object_set_user_data (GTK_OBJECT (info_win->info_notebook),
(gpointer)info_win);
......
......@@ -1155,7 +1155,7 @@ prefs_default_resolution_callback (GtkWidget *widget,
new_xres = gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (widget), 0);
new_yres = gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (widget), 1);
size_sizeentry = gtk_object_get_data (GTK_OBJECT (widget), "size_sizeentry");
size_sizeentry = g_object_get_data (G_OBJECT (widget), "size_sizeentry");
if (gimp_chain_button_get_active (GIMP_CHAIN_BUTTON (data)))
{
......@@ -1213,7 +1213,7 @@ prefs_res_source_callback (GtkWidget *widget,
else
{
monitor_resolution_sizeentry =
gtk_object_get_data (GTK_OBJECT (widget), "monitor_resolution_sizeentry");
g_object_get_data (G_OBJECT (widget), "monitor_resolution_sizeentry");
if (monitor_resolution_sizeentry)
{
......@@ -1336,10 +1336,10 @@ prefs_tree_select_callback (GtkWidget *widget,
if (! GTK_CLIST (widget)->selection)
return;
notebook = (GtkNotebook*) gtk_object_get_user_data (GTK_OBJECT (widget));
notebook = g_object_get_data (G_OBJECT (widget), "notebook");
page = (gint) gtk_ctree_node_get_row_data (GTK_CTREE (widget), node);
gtk_notebook_set_page (notebook, page);
gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), page);
}
/* create a frame with title and a vbox */
......@@ -1369,11 +1369,11 @@ prefs_help_func (const gchar *help_data)
GtkWidget *event_box;
gint page_num;
notebook = gtk_object_get_user_data (GTK_OBJECT (prefs_dlg));
notebook = g_object_get_data (G_OBJECT (prefs_dlg), "notebook");
page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
event_box = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), page_num);
help_data = gtk_object_get_data (GTK_OBJECT (event_box), "gimp_help_data");
help_data = g_object_get_data (G_OBJECT (event_box), "gimp_help_data");
gimp_standard_help_func (help_data);
}
......@@ -1560,8 +1560,8 @@ preferences_dialog_create (void)
gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE);
gtk_container_add (GTK_CONTAINER (frame), notebook);
gtk_object_set_user_data (GTK_OBJECT (prefs_dlg), notebook);
gtk_object_set_user_data (GTK_OBJECT (ctree), notebook);
g_object_set_data (G_OBJECT (prefs_dlg), "notebook", notebook);
g_object_set_data (G_OBJECT (ctree), "notebook", notebook);
g_signal_connect (G_OBJECT (ctree), "tree_select_row",
G_CALLBACK (prefs_tree_select_callback),
......@@ -1663,7 +1663,7 @@ preferences_dialog_create (void)
gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (sizeentry2),
_("dpi"), 1, 4, 0.0);
gtk_object_set_data (GTK_OBJECT (sizeentry2), "size_sizeentry", sizeentry);
g_object_set_data (G_OBJECT (sizeentry2), "size_sizeentry", sizeentry);
gimp_size_entry_set_refval_boundaries
(GIMP_SIZE_ENTRY (sizeentry2), 0, GIMP_MIN_RESOLUTION, GIMP_MAX_RESOLUTION);
......@@ -2518,7 +2518,7 @@ preferences_dialog_create (void)
button = gimp_chain_button_new (GIMP_CHAIN_BOTTOM);
if (ABS (gimprc.monitor_xres - gimprc.monitor_yres) < GIMP_MIN_RESOLUTION)
gimp_chain_button_set_active (GIMP_CHAIN_BUTTON (button), TRUE);
gtk_object_set_data (GTK_OBJECT (sizeentry), "chain_button", button);
g_object_set_data (G_OBJECT (sizeentry), "chain_button", button);
gtk_table_attach_defaults (GTK_TABLE (sizeentry), button, 1, 3, 3, 4);
gtk_widget_show (button);
......@@ -2571,14 +2571,14 @@ preferences_dialog_create (void)
g_signal_connect (G_OBJECT (button), "toggled",
G_CALLBACK (prefs_res_source_callback),
NULL);
gtk_object_set_data (GTK_OBJECT (button), "monitor_resolution_sizeentry",
sizeentry);
gtk_object_set_data (GTK_OBJECT (button), "set_sensitive",
label);
gtk_object_set_data (GTK_OBJECT (button), "inverse_sensitive",
sizeentry);
gtk_object_set_data (GTK_OBJECT (sizeentry), "inverse_sensitive",
calibrate_button);
g_object_set_data (G_OBJECT (button), "monitor_resolution_sizeentry",
sizeentry);
g_object_set_data (G_OBJECT (button), "set_sensitive",
label);
g_object_set_data (G_OBJECT (button), "inverse_sensitive",
sizeentry);
g_object_set_data (G_OBJECT (sizeentry), "inverse_sensitive",
calibrate_button);
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
gtk_widget_show (button);
gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE, 0);
......
......@@ -309,7 +309,7 @@ user_install_notebook_set_page (GtkNotebook *notebook,
gimp_pixmap_set (GIMP_PIXMAP (title_pixmap), eek_xpm);
}
gtk_notebook_set_page (notebook, index);
gtk_notebook_set_current_page (notebook, index);
}
static void
......@@ -498,7 +498,7 @@ user_install_ctree_select_row (GtkWidget *widget,
notebook = (GtkNotebook*) data;
gtk_notebook_set_page (notebook, row);
gtk_notebook_set_current_page (notebook, row);
}
void
......
......@@ -288,13 +288,13 @@ info_window_create_extended (InfoDialog *info_win)
gtk_widget_show (hbox);
gtk_notebook_append_page (GTK_NOTEBOOK(info_win->info_notebook),
gtk_notebook_append_page (GTK_NOTEBOOK (info_win->info_notebook),
main_table, gtk_label_new (_("Extended")));
gtk_widget_show (main_table);
/* Set back to first page */
gtk_notebook_set_page (GTK_NOTEBOOK(info_win->info_notebook), 0);
gtk_notebook_set_current_page (GTK_NOTEBOOK (info_win->info_notebook), 0);
gtk_object_set_user_data (GTK_OBJECT (info_win->info_notebook),
(gpointer)info_win);
......
......@@ -1965,10 +1965,10 @@ menus_last_opened_update_labels (void)
for (i = 1; i <= num_entries; i++)
{
g_string_sprintf (entry_filename, "%d. %s", i,
g_basename (((GString *) filename_slist->data)->str));
g_string_printf (entry_filename, "%d. %s", i,
g_basename (((GString *) filename_slist->data)->str));
g_string_sprintf (path, "/File/MRU%02d", i);
g_string_printf (path, "/File/MRU%02d", i);
widget = gtk_item_factory_get_widget (toolbox_factory, path->str);
if (widget)
......
......@@ -1155,7 +1155,7 @@ prefs_default_resolution_callback (GtkWidget *widget,
new_xres = gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (widget), 0);
new_yres = gimp_size_entry_get_refval (GIMP_SIZE_ENTRY (widget), 1);
size_sizeentry = gtk_object_get_data (GTK_OBJECT (widget), "size_sizeentry");
size_sizeentry = g_object_get_data (G_OBJECT (widget), "size_sizeentry");
if (gimp_chain_button_get_active (GIMP_CHAIN_BUTTON (data)))
{
......@@ -1213,7 +1213,7 @@ prefs_res_source_callback (GtkWidget *widget,
else
{
monitor_resolution_sizeentry =
gtk_object_get_data (GTK_OBJECT (widget), "monitor_resolution_sizeentry");
g_object_get_data (G_OBJECT (widget), "monitor_resolution_sizeentry");
if (monitor_resolution_sizeentry)
{
......@@ -1336,10 +1336,10 @@ prefs_tree_select_callback (GtkWidget *widget,
if (! GTK_CLIST (widget)->selection)
return;
notebook = (GtkNotebook*) gtk_object_get_user_data (GTK_OBJECT (widget));
notebook = g_object_get_data (G_OBJECT (widget), "notebook");
page = (gint) gtk_ctree_node_get_row_data (GTK_CTREE (widget), node);
gtk_notebook_set_page (notebook, page);
gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), page);
}
/* create a frame with title and a vbox */
......@@ -1369,11 +1369,11 @@ prefs_help_func (const gchar *help_data)
GtkWidget *event_box;
gint page_num;
notebook = gtk_object_get_user_data (GTK_OBJECT (prefs_dlg));
notebook = g_object_get_data (G_OBJECT (prefs_dlg), "notebook");
page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
event_box = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), page_num);
help_data = gtk_object_get_data (GTK_OBJECT (event_box), "gimp_help_data");
help_data = g_object_get_data (G_OBJECT (event_box), "gimp_help_data");
gimp_standard_help_func (help_data);
}
......@@ -1560,8 +1560,8 @@ preferences_dialog_create (void)
gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE);
gtk_container_add (GTK_CONTAINER (frame), notebook);
gtk_object_set_user_data (GTK_OBJECT (prefs_dlg), notebook);
gtk_object_set_user_data (GTK_OBJECT (ctree), notebook);
g_object_set_data (G_OBJECT (prefs_dlg), "notebook", notebook);
g_object_set_data (G_OBJECT (ctree), "notebook", notebook);
g_signal_connect (G_OBJECT (ctree), "tree_select_row",
G_CALLBACK (prefs_tree_select_callback),
......@@ -1663,7 +1663,7 @@ preferences_dialog_create (void)
gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (sizeentry2),
_("dpi"), 1, 4, 0.0);
gtk_object_set_data (GTK_OBJECT (sizeentry2), "size_sizeentry", sizeentry);
g_object_set_data (G_OBJECT (sizeentry2), "size_sizeentry", sizeentry);
gimp_size_entry_set_refval_boundaries
(GIMP_SIZE_ENTRY (sizeentry2), 0, GIMP_MIN_RESOLUTION, GIMP_MAX_RESOLUTION);
......@@ -2518,7 +2518,7 @@ preferences_dialog_create (void)
button = gimp_chain_button_new (GIMP_CHAIN_BOTTOM);
if (ABS (gimprc.monitor_xres - gimprc.monitor_yres) < GIMP_MIN_RESOLUTION)
gimp_chain_button_set_active (GIMP_CHAIN_BUTTON (button), TRUE);
gtk_object_set_data (GTK_OBJECT (sizeentry), "chain_button", button);
g_object_set_data (G_OBJECT (sizeentry), "chain_button", button);
gtk_table_attach_defaults (GTK_TABLE (sizeentry), button, 1, 3, 3, 4);
gtk_widget_show (button);
......@@ -2571,14 +2571,14 @@ preferences_dialog_create (void)
g_signal_connect (G_OBJECT (button), "toggled",
G_CALLBACK (prefs_res_source_callback),
NULL);
gtk_object_set_data (GTK_OBJECT (button), "monitor_resolution_sizeentry",
sizeentry);
gtk_object_set_data (GTK_OBJECT (button), "set_sensitive",
label);
gtk_object_set_data (GTK_OBJECT (button), "inverse_sensitive",
sizeentry);
gtk_object_set_data (GTK_OBJECT (sizeentry), "inverse_sensitive",
calibrate_button);
g_object_set_data (G_OBJECT (button), "monitor_resolution_sizeentry",
sizeentry);
g_object_set_data (G_OBJECT (button), "set_sensitive",
label);
g_object_set_data (G_OBJECT (button), "inverse_sensitive",
sizeentry);
g_object_set_data (G_OBJECT (sizeentry), "inverse_sensitive",
calibrate_button);
gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
gtk_widget_show (button);
gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE, 0);
......
......@@ -309,7 +309,7 @@ user_install_notebook_set_page (GtkNotebook *notebook,
gimp_pixmap_set (GIMP_PIXMAP (title_pixmap), eek_xpm);
}
gtk_notebook_set_page (notebook, index);
gtk_notebook_set_current_page (notebook, index);
}
static void
......@@ -498,7 +498,7 @@ user_install_ctree_select_row (GtkWidget *widget,
notebook = (GtkNotebook*) data;
gtk_notebook_set_page (notebook, row);
gtk_notebook_set_current_page (notebook, row);
}
void
......
......@@ -1965,10 +1965,10 @@ menus_last_opened_update_labels (void)
for (i = 1; i <= num_entries; i++)
{
g_string_sprintf (entry_filename, "%d. %s", i,
g_basename (((GString *) filename_slist->data)->str));
g_string_printf (entry_filename, "%d. %s", i,
g_basename (((GString *) filename_slist->data)->str));
g_string_sprintf (path, "/File/MRU%02d", i);
g_string_printf (path, "/File/MRU%02d", i);
widget = gtk_item_factory_get_widget (toolbox_factory, path->str);
if (widget)
......
......@@ -86,28 +86,28 @@ static const LayerMode layer_modes[] =
* in the LayerModeEffects enumeration.
*/
{
{ TRUE, TRUE, FALSE, }, /* NORMAL_MODE */
{ TRUE, TRUE, FALSE, }, /* DISSOLVE_MODE */
{ TRUE, TRUE, FALSE, }, /* BEHIND_MODE */
{ FALSE, FALSE, FALSE, }, /* MULTIPLY_MODE */
{ FALSE, FALSE, FALSE, }, /* SCREEN_MODE */
{ FALSE, FALSE, FALSE, }, /* OVERLAY_MODE */
{ FALSE, FALSE, FALSE, }, /* DIFFERENCE_MODE */
{ FALSE, FALSE, FALSE, }, /* ADDITION_MODE */
{ FALSE, FALSE, FALSE, }, /* SUBTRACT_MODE */
{ FALSE, FALSE, FALSE, }, /* DARKEN_ONLY_MODE */
{ FALSE, FALSE, FALSE, }, /* LIGHTEN_ONLY_MODE */
{ FALSE, FALSE, FALSE, }, /* HUE_MODE */
{ FALSE, FALSE, FALSE, }, /* SATURATION_MODE */
{ FALSE, FALSE, FALSE, }, /* COLOR_MODE */
{ FALSE, FALSE, FALSE, }, /* VALUE_MODE */
{ FALSE, FALSE, FALSE, }, /* DIVIDE_MODE */
{ FALSE, FALSE, FALSE, }, /* DODGE_MODE */
{ FALSE, FALSE, FALSE, }, /* BURN_MODE */
{ FALSE, FALSE, FALSE, }, /* HARDLIGHT_MODE */
{ TRUE, FALSE, TRUE, }, /* ERASE_MODE */
{ TRUE, TRUE, TRUE, }, /* REPLACE_MODE */
{ TRUE, FALSE, TRUE, } /* ANTI_ERASE_MODE */
{ TRUE, TRUE, FALSE }, /* NORMAL_MODE */
{ TRUE, TRUE, FALSE }, /* DISSOLVE_MODE */
{ TRUE, TRUE, FALSE }, /* BEHIND_MODE */
{ FALSE, FALSE, FALSE }, /* MULTIPLY_MODE */
{ FALSE, FALSE, FALSE }, /* SCREEN_MODE */
{ FALSE, FALSE, FALSE }, /* OVERLAY_MODE */
{ FALSE, FALSE, FALSE }, /* DIFFERENCE_MODE */
{ FALSE, FALSE, FALSE }, /* ADDITION_MODE */
{ FALSE, FALSE, FALSE }, /* SUBTRACT_MODE */
{ FALSE, FALSE, FALSE }, /* DARKEN_ONLY_MODE */
{ FALSE, FALSE, FALSE }, /* LIGHTEN_ONLY_MODE */
{ FALSE, FALSE, FALSE }, /* HUE_MODE */
{ FALSE, FALSE, FALSE }, /* SATURATION_MODE */
{ FALSE, FALSE, FALSE }, /* COLOR_MODE */
{ FALSE, FALSE, FALSE }, /* VALUE_MODE */
{ FALSE, FALSE, FALSE }, /* DIVIDE_MODE */
{ FALSE, FALSE, FALSE }, /* DODGE_MODE */
{ FALSE, FALSE, FALSE }, /* BURN_MODE */
{ FALSE, FALSE, FALSE }, /* HARDLIGHT_MODE */
{ TRUE, FALSE, TRUE }, /* ERASE_MODE */
{ TRUE, TRUE, TRUE }, /* REPLACE_MODE */
{ TRUE, FALSE, TRUE } /* ANTI_ERASE_MODE */
};
/* ColorHash structure */
......
......@@ -213,7 +213,7 @@ procedural_db_print_entry (gpointer key,
if (list || num != 1)
{
g_string_sprintf (buf, "%s <%d>", procedure->name, num);
g_string_printf (buf, "%s <%d>", procedure->name, num);
output_string (buf->str);
}
else
......
......@@ -1673,7 +1673,7 @@ curves_graph_events (GtkWidget *widget,
GIMP_TOOL_CURSOR_NONE,
GIMP_CURSOR_MODIFIER_NONE);
gdk_window_set_cursor (cd->graph->window, cursor);
gdk_cursor_destroy (cursor);
gdk_cursor_unref (cursor);
}
curve_print_loc (cd, x, 255 - y);
......
......@@ -822,7 +822,7 @@ text_render (GimpImage *gimage,
text_gdk_image_to_region (image, antialias, &maskPR);
/* free the image */
gdk_image_destroy (image);
gdk_image_unref (image);
}
/* Crop the mask buffer */
......
......@@ -1046,10 +1046,7 @@ gimp_transform_tool_grid_recalc (GimpTransformTool *tr_tool)
}
if (gimp_transform_tool_show_grid ())
{
/* EEEEEEK!!! */
gimp_transform_tool_setup_grid (GIMP_TRANSFORM_TOOL (tool_manager_get_active (the_gimp)));
}
gimp_transform_tool_setup_grid (tr_tool);
}
static void
......@@ -1697,14 +1694,12 @@ gimp_transform_tool_cubic (gdouble dx,
result = ((( ( - 7 * jm1 + 21 * j - 21 * jp1 + 7 * jp2 ) * dx +
( 15 * jm1 - 36 * j + 27 * jp1 - 6 * jp2 ) ) * dx +
( - 9 * jm1 + 9 * jp1 ) ) * dx + (jm1 + 16 * j + jp1) ) / 18.0;
#else
#endif
/* Catmull-Rom - not bad */
result = ((( ( - jm1 + 3 * j - 3 * jp1 + jp2 ) * dx +
( 2 * jm1 - 5 * j + 4 * jp1 - jp2 ) ) * dx +
( - jm1 + jp1 ) ) * dx + (j + j) ) / 2.0;
#endif
return result;
}
......@@ -309,7 +309,7 @@ user_install_notebook_set_page (GtkNotebook *notebook,
gimp_pixmap_set (GIMP_PIXMAP (title_pixmap), eek_xpm);
}
gtk_notebook_set_page (notebook, index);
gtk_notebook_set_current_page (notebook, index);
}
static void
......@@ -498,7 +498,7 @@ user_install_ctree_select_row (GtkWidget *widget,
notebook = (GtkNotebook*) data;
gtk_notebook_set_page (notebook, row);
gtk_notebook_set_current_page (notebook, row);
}
void
......
......@@ -453,8 +453,8 @@ gimp_dialog_factory_dialog_new_internal (GimpDialogFactory *factory,
{
GtkWidget *toplevel;
gtk_notebook_set_page (GTK_NOTEBOOK (dockable->dockbook),
page_num);
gtk_notebook_set_current_page (GTK_NOTEBOOK (dockable->dockbook),
page_num);
toplevel = gtk_widget_get_toplevel (dialog);
......@@ -1274,7 +1274,7 @@ gimp_dialog_factories_idle_foreach (gchar *name,
}
}
gdk_cursor_destroy (cursor);
gdk_cursor_unref (cursor);
}
static void
......
......@@ -362,7 +362,7 @@ gimp_dockbook_menu_switch_page (GtkWidget *widget,
page_num = gtk_notebook_page_num (GTK_NOTEBOOK (dockable->dockbook),
GTK_WIDGET (dockable));
gtk_notebook_set_page (GTK_NOTEBOOK (dockable->dockbook), page_num);
gtk_notebook_set_current_page (GTK_NOTEBOOK (dockable->dockbook), page_num);
}
static void
......@@ -416,7 +416,7 @@ gimp_dockbook_tab_button_press (GtkWidget *widget,
page_num = gtk_notebook_page_num (GTK_NOTEBOOK (dockbook),
GTK_WIDGET (dockable));
gtk_notebook_set_page (GTK_NOTEBOOK (dockbook), page_num);
gtk_notebook_set_current_page (GTK_NOTEBOOK (dockbook), page_num);
if (bevent->button == 3)
{
......
......@@ -461,7 +461,6 @@ void
gimp_drawable_list_view_set_image (GimpDrawableListView *view,
GimpImage *gimage)
{
g_return_if_fail (view != NULL);
g_return_if_fail (GIMP_IS_DRAWABLE_LIST_VIEW (view));
g_return_if_fail (! gimage || GIMP_IS_IMAGE (gimage));
......@@ -473,7 +472,6 @@ static void
gimp_drawable_list_view_real_set_image (GimpDrawableListView *view,
GimpImage *gimage)
{
g_return_if_fail (view != NULL);
g_return_if_fail (GIMP_IS_DRAWABLE_LIST_VIEW (view));
g_return_if_fail (! gimage || GIMP_IS_IMAGE (gimage));
......
......@@ -461,7 +461,6 @@ void
gimp_drawable_list_view_set_image (GimpDrawableListView *view,
GimpImage *gimage)
{
g_return_if_fail (view != NULL);
g_return_if_fail (GIMP_IS_DRAWABLE_LIST_VIEW (view));
g_return_if_fail (! gimage || GIMP_IS_IMAGE (gimage));
......@@ -473,7 +472,6 @@ static void
gimp_drawable_list_view_real_set_image (GimpDrawableListView *view,
GimpImage *gimage)
{
g_return_if_fail (view != NULL);
g_return_if_fail (GIMP_IS_DRAWABLE_LIST_VIEW (view));
g_return_if_fail (! gimage || GIMP_IS_IMAGE (gimage));
......
......@@ -1965,10 +1965,10 @@ menus_last_opened_update_labels (void)
for (i = 1; i <= num_entries; i++)
{
g_string_sprintf (entry_filename, "%d. %s", i,
g_basename (((GString *) filename_slist->data)->str));
g_string_printf (entry_filename, "%d. %s", i,
g_basename (((GString *) filename_slist->data)->str));
g_string_sprintf (path, "/File/MRU%02d", i);
g_string_printf (path, "/File/MRU%02d", i);
widget = gtk_item_factory_get_widget (toolbox_factory, path->str);
if (widget)
......
......@@ -461,7 +461,6 @@ void
gimp_drawable_list_view_set_image (GimpDrawableListView *view,
GimpImage *gimage)
{
g_return_if_fail (view != NULL);
g_return_if_fail (GIMP_IS_DRAWABLE_LIST_VIEW (view));
g_return_if_fail (! gimage || GIMP_IS_IMAGE (gimage));
......@@ -473,7 +472,6 @@ static void
gimp_drawable_list_view_real_set_image (GimpDrawableListView *view,
GimpImage *gimage)
{
g_return_if_fail (view != NULL);
g_return_if_fail (GIMP_IS_DRAWABLE_LIST_VIEW (view));
g_return_if_fail (! gimage || GIMP_IS_IMAGE (gimage));
......
......@@ -461,7 +461,6 @@ void
gimp_drawable_list_view_set_image (GimpDrawableListView *view,
GimpImage *gimage)
{
g_return_if_fail (view != NULL);
g_return_if_fail (GIMP_IS_DRAWABLE_LIST_VIEW (view));
g_return_if_fail (! gimage || GIMP_IS_IMAGE (gimage));
......@@ -473,7 +472,6 @@ static void
gimp_drawable_list_view_real_set_image (GimpDrawableListView *view,
GimpImage *gimage)
{
g_return_if_fail (view != NULL);
g_return_if_fail (GIMP_IS_DRAWABLE_LIST_VIEW (view));
g_return_if_fail (! gimage || GIMP_IS_IMAGE (gimage));
......
......@@ -267,7 +267,7 @@ gimp_navigation_preview_grab_pointer (GimpNavigationPreview *nav_preview)
GDK_EXTENSION_EVENTS_ALL,
widget->window, cursor, 0);
gdk_cursor_destroy (cursor);
gdk_cursor_unref (cursor);
}
static gboolean
......
......@@ -267,7 +267,7 @@ gimp_navigation_preview_grab_pointer (GimpNavigationPreview *nav_preview)
GDK_EXTENSION_EVENTS_ALL,
widget->window, cursor, 0);
gdk_cursor_destroy (cursor);
gdk_cursor_unref (cursor);
}
static gboolean
......
......@@ -751,7 +751,7 @@ rm -f confauthorsgen
AM_CONDITIONAL(STATICLIBS, test x$enable_static = xyes)
dnl CPPFLAGS="${CPPFLAGS} -DGTK_DISABLE_COMPAT_H"
CPPFLAGS="${CPPFLAGS} -DGTK_DISABLE_COMPAT_H"
AC_SUBST(GIMP_MAJOR_VERSION)
AC_SUBST(GIMP_MINOR_VERSION)
......
......@@ -580,7 +580,7 @@ dialog_search_callback (GtkWidget *widget,
dbbrowser_t *dbbrowser = data;
gchar *func_name;
gchar *label;
gchar *query_text;
const gchar *query_text;
GString *query;
gtk_clist_freeze (GTK_CLIST (dbbrowser->clist));
......
......@@ -580,7 +580,7 @@ dialog_search_callback (GtkWidget *widget,
dbbrowser_t *dbbrowser = data;
gchar *func_name;
gchar *label;
gchar *query_text;
const gchar *query_text;
GString *query;
gtk_clist_freeze (GTK_CLIST (dbbrowser->clist));
......
......@@ -152,17 +152,17 @@ gimp_pixpipe_params_build (GimpPixPipeParams *params)
gint i;
g_string_sprintf (s, "ncells:%d cellwidth:%d cellheight:%d "
"step:%d dim:%d cols:%d rows:%d placement:%s",