mirror of https://github.com/GNOME/gimp.git
cast batch_cmds to (const gchar **) when passing them to batch_init().
2003-03-25 Michael Natterer <mitch@gimp.org> * app/app_procs.c (app_init): cast batch_cmds to (const gchar **) when passing them to batch_init(). * app/widgets/gimpcontainertreeview.c (gimp_container_tree_view_button_press): moved the call just added inside the if(view->container) because it will fail if selecting the item destroyed the widget.
This commit is contained in:
parent
d7f1b640e0
commit
b7190b2529
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
|||
2003-03-25 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* app/app_procs.c (app_init): cast batch_cmds to (const gchar **)
|
||||
when passing them to batch_init().
|
||||
|
||||
* app/widgets/gimpcontainertreeview.c
|
||||
(gimp_container_tree_view_button_press): moved the call just added
|
||||
inside the if(view->container) because it will fail if selecting
|
||||
the item destroyed the widget.
|
||||
|
||||
2003-03-25 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* app/widgets/gimpcontainerpopup.c
|
||||
|
|
|
@ -254,7 +254,7 @@ app_init (gint gimp_argc,
|
|||
}
|
||||
}
|
||||
|
||||
batch_init (the_gimp, batch_cmds);
|
||||
batch_init (the_gimp, (const gchar **) batch_cmds);
|
||||
|
||||
if (! no_interface)
|
||||
{
|
||||
|
|
|
@ -772,16 +772,8 @@ gimp_container_tree_view_button_press (GtkWidget *widget,
|
|||
{
|
||||
/* don't select item if a toggle was clicked */
|
||||
if (! toggled_cell)
|
||||
{
|
||||
gimp_container_view_item_selected (container_view,
|
||||
renderer->viewable);
|
||||
|
||||
/* another row may have been set by selecting */
|
||||
gtk_tree_view_column_cell_set_cell_data (column,
|
||||
tree_view->model,
|
||||
&iter,
|
||||
FALSE, FALSE);
|
||||
}
|
||||
gimp_container_view_item_selected (container_view,
|
||||
renderer->viewable);
|
||||
|
||||
/* a callback invoked by selecting the item may have
|
||||
* destroyed us, so check if the container is still there
|
||||
|
@ -790,6 +782,12 @@ gimp_container_tree_view_button_press (GtkWidget *widget,
|
|||
{
|
||||
gchar *path_str = NULL;
|
||||
|
||||
/* another row may have been set by selecting */
|
||||
gtk_tree_view_column_cell_set_cell_data (column,
|
||||
tree_view->model,
|
||||
&iter,
|
||||
FALSE, FALSE);
|
||||
|
||||
if (toggled_cell || clicked_cell)
|
||||
path_str = gtk_tree_path_to_string (path);
|
||||
|
||||
|
|
Loading…
Reference in New Issue