callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cast batch_cmds to (const gchar **) when passing them to batch_init().

Browse Source 
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:
Michael Natterer
2003-03-25 01:25:39 +00:00
committed by Michael Natterer
parent d7f1b640e0
commit b7190b2529
3 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -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> 2003-03-25 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpcontainerpopup.c * app/widgets/gimpcontainerpopup.c

2
app/app_procs.c
View File

@ -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) if (! no_interface)
{ {

18
app/widgets/gimpcontainertreeview.c
View File

@ -772,16 +772,8 @@ gimp_container_tree_view_button_press (GtkWidget *widget,
{ {
/* don't select item if a toggle was clicked */ /* don't select item if a toggle was clicked */
if (! toggled_cell) if (! toggled_cell)
{ gimp_container_view_item_selected (container_view,
gimp_container_view_item_selected (container_view, renderer->viewable);
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);
}
/* a callback invoked by selecting the item may have /* a callback invoked by selecting the item may have
* destroyed us, so check if the container is still there * 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; 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) if (toggled_cell || clicked_cell)
path_str = gtk_tree_path_to_string (path); path_str = gtk_tree_path_to_string (path);