Commit e5949e43 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

app_procs.c errors.c errors.h file-save.c gdisplay.c module_db.c use

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

	* app_procs.c
	* errors.c
	* errors.h
	* file-save.c
	* gdisplay.c
	* module_db.c
	* undo.c: use GObject functions and const fixes.
parent a5dccb8d
2001-07-25 Sven Neumann <sven@gimp.org>
* app_procs.c
* errors.c
* errors.h
* file-save.c
* gdisplay.c
* module_db.c
* undo.c: use GObject functions and const fixes.
2001-07-25 Michael Natterer <mitch@gimp.org>
* app/gui/brush-select.c
......
......@@ -280,7 +280,7 @@ app_exit_finish (void)
gimp_shutdown (the_gimp);
gtk_object_unref (GTK_OBJECT (the_gimp));
g_object_unref (G_OBJECT (the_gimp));
the_gimp = NULL;
base_exit ();
......
......@@ -1445,7 +1445,7 @@ undo_push_layer (GimpImage *gimage,
if ((new = undo_push (gimage, size, type, TRUE)))
{
gtk_object_ref (GTK_OBJECT (lu->layer));
g_object_ref (G_OBJECT (lu->layer));
new->data = lu_ptr;
new->pop_func = undo_pop_layer;
......@@ -1541,7 +1541,7 @@ undo_free_layer (UndoState state,
lu = (LayerUndo *) lu_ptr;
gtk_object_unref (GTK_OBJECT (lu->layer));
g_object_unref (G_OBJECT (lu->layer));
g_free (lu);
}
......@@ -1701,7 +1701,7 @@ undo_push_layer_mask (GimpImage *gimage,
else
{
if (type == LAYER_MASK_REMOVE_UNDO)
gtk_object_unref (GTK_OBJECT (lmu->mask));
g_object_unref (G_OBJECT (lmu->mask));
g_free (lmu);
return FALSE;
......@@ -1750,7 +1750,7 @@ undo_free_layer_mask (UndoState state,
*/
if ((state == REDO && type == LAYER_MASK_ADD_UNDO) ||
(state == UNDO && type == LAYER_MASK_REMOVE_UNDO))
gtk_object_unref (GTK_OBJECT (lmu->mask));
g_object_unref (G_OBJECT (lmu->mask));
g_free (lmu);
}
......@@ -1778,7 +1778,7 @@ undo_push_channel (GimpImage *gimage,
if ((new = undo_push (gimage, size, type, TRUE)))
{
gtk_object_ref (GTK_OBJECT (cu->channel));
g_object_ref (G_OBJECT (cu->channel));
new->data = cu_ptr;
new->pop_func = undo_pop_channel;
......@@ -1857,7 +1857,7 @@ undo_free_channel (UndoState state,
cu = (ChannelUndo *) cu_ptr;
gtk_object_unref (GTK_OBJECT (cu->channel));
g_object_unref (G_OBJECT (cu->channel));
g_free (cu);
}
......
......@@ -468,7 +468,7 @@ gdisplay_delete (GDisplay *gdisp)
/* free the gimage */
gdisp->gimage->disp_count--;
gtk_object_unref (GTK_OBJECT (gdisp->gimage));
g_object_unref (G_OBJECT (gdisp->gimage));
if (gdisp->nav_popup)
nav_dialog_free (gdisp, gdisp->nav_popup);
......@@ -2599,7 +2599,7 @@ gdisplay_reconnect (GDisplay *gdisp,
gtk_signal_disconnect_by_data (GTK_OBJECT (gdisp->gimage), gdisp);
gdisp->gimage->disp_count--;
gtk_object_unref (GTK_OBJECT (gdisp->gimage));
g_object_unref (G_OBJECT (gdisp->gimage));
instance = gimage->instance_count;
gimage->instance_count++;
......
......@@ -505,7 +505,7 @@ module_info_new (void)
static void
module_info_free (ModuleInfo *mod)
{
gtk_object_unref (GTK_OBJECT (mod));
g_object_unref (G_OBJECT (mod));
}
......
......@@ -468,7 +468,7 @@ gdisplay_delete (GDisplay *gdisp)
/* free the gimage */
gdisp->gimage->disp_count--;
gtk_object_unref (GTK_OBJECT (gdisp->gimage));
g_object_unref (G_OBJECT (gdisp->gimage));
if (gdisp->nav_popup)
nav_dialog_free (gdisp, gdisp->nav_popup);
......@@ -2599,7 +2599,7 @@ gdisplay_reconnect (GDisplay *gdisp,
gtk_signal_disconnect_by_data (GTK_OBJECT (gdisp->gimage), gdisp);
gdisp->gimage->disp_count--;
gtk_object_unref (GTK_OBJECT (gdisp->gimage));
g_object_unref (G_OBJECT (gdisp->gimage));
instance = gimage->instance_count;
gimage->instance_count++;
......
......@@ -80,7 +80,7 @@ gimp_error_log_func (const gchar *domain,
}
void
gimp_fatal_error (gchar *fmt, ...)
gimp_fatal_error (const gchar *fmt, ...)
{
va_list args;
gchar *message;
......@@ -134,7 +134,7 @@ gimp_fatal_error (gchar *fmt, ...)
}
void
gimp_terminate (gchar *fmt, ...)
gimp_terminate (const gchar *fmt, ...)
{
va_list args;
gchar *message;
......
......@@ -29,8 +29,8 @@ void gimp_error_log_func (const gchar *domain,
const gchar *message,
gpointer data);
void gimp_fatal_error (gchar *, ...);
void gimp_terminate (gchar *, ...);
void gimp_fatal_error (const gchar *, ...);
void gimp_terminate (const gchar *, ...);
#endif /* __ERRORS_H__ */
......@@ -148,7 +148,7 @@ file_save (GimpImage *gimage,
}
/* ref the image, so it can't get deleted during save */
gtk_object_ref (GTK_OBJECT (gimage));
g_object_ref (G_OBJECT (gimage));
proc = &file_proc->db_info;
......@@ -206,7 +206,7 @@ file_save (GimpImage *gimage,
g_free (return_vals);
g_free (args);
gtk_object_unref (GTK_OBJECT (gimage));
g_object_unref (G_OBJECT (gimage));
return status;
}
......
......@@ -148,7 +148,7 @@ file_save (GimpImage *gimage,
}
/* ref the image, so it can't get deleted during save */
gtk_object_ref (GTK_OBJECT (gimage));
g_object_ref (G_OBJECT (gimage));
proc = &file_proc->db_info;
......@@ -206,7 +206,7 @@ file_save (GimpImage *gimage,
g_free (return_vals);
g_free (args);
gtk_object_unref (GTK_OBJECT (gimage));
g_object_unref (G_OBJECT (gimage));
return status;
}
......
......@@ -468,7 +468,7 @@ gdisplay_delete (GDisplay *gdisp)
/* free the gimage */
gdisp->gimage->disp_count--;
gtk_object_unref (GTK_OBJECT (gdisp->gimage));
g_object_unref (G_OBJECT (gdisp->gimage));
if (gdisp->nav_popup)
nav_dialog_free (gdisp, gdisp->nav_popup);
......@@ -2599,7 +2599,7 @@ gdisplay_reconnect (GDisplay *gdisp,
gtk_signal_disconnect_by_data (GTK_OBJECT (gdisp->gimage), gdisp);
gdisp->gimage->disp_count--;
gtk_object_unref (GTK_OBJECT (gdisp->gimage));
g_object_unref (G_OBJECT (gdisp->gimage));
instance = gimage->instance_count;
gimage->instance_count++;
......
......@@ -505,7 +505,7 @@ module_info_new (void)
static void
module_info_free (ModuleInfo *mod)
{
gtk_object_unref (GTK_OBJECT (mod));
g_object_unref (G_OBJECT (mod));
}
......
......@@ -505,7 +505,7 @@ module_info_new (void)
static void
module_info_free (ModuleInfo *mod)
{
gtk_object_unref (GTK_OBJECT (mod));
g_object_unref (G_OBJECT (mod));
}
......
......@@ -1445,7 +1445,7 @@ undo_push_layer (GimpImage *gimage,
if ((new = undo_push (gimage, size, type, TRUE)))
{
gtk_object_ref (GTK_OBJECT (lu->layer));
g_object_ref (G_OBJECT (lu->layer));
new->data = lu_ptr;
new->pop_func = undo_pop_layer;
......@@ -1541,7 +1541,7 @@ undo_free_layer (UndoState state,
lu = (LayerUndo *) lu_ptr;
gtk_object_unref (GTK_OBJECT (lu->layer));
g_object_unref (G_OBJECT (lu->layer));
g_free (lu);
}
......@@ -1701,7 +1701,7 @@ undo_push_layer_mask (GimpImage *gimage,
else
{
if (type == LAYER_MASK_REMOVE_UNDO)
gtk_object_unref (GTK_OBJECT (lmu->mask));
g_object_unref (G_OBJECT (lmu->mask));
g_free (lmu);
return FALSE;
......@@ -1750,7 +1750,7 @@ undo_free_layer_mask (UndoState state,
*/
if ((state == REDO && type == LAYER_MASK_ADD_UNDO) ||
(state == UNDO && type == LAYER_MASK_REMOVE_UNDO))
gtk_object_unref (GTK_OBJECT (lmu->mask));
g_object_unref (G_OBJECT (lmu->mask));
g_free (lmu);
}
......@@ -1778,7 +1778,7 @@ undo_push_channel (GimpImage *gimage,
if ((new = undo_push (gimage, size, type, TRUE)))
{
gtk_object_ref (GTK_OBJECT (cu->channel));
g_object_ref (G_OBJECT (cu->channel));
new->data = cu_ptr;
new->pop_func = undo_pop_channel;
......@@ -1857,7 +1857,7 @@ undo_free_channel (UndoState state,
cu = (ChannelUndo *) cu_ptr;
gtk_object_unref (GTK_OBJECT (cu->channel));
g_object_unref (G_OBJECT (cu->channel));
g_free (cu);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment