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

Don't do operations on a NULL path. (updated_folder_cb,

Browse Source 
2001-10-31  Christopher James Lahey  <clahey@ximian.com>

	* e-storage-set-view.c (cursor_activated): Don't do operations on
	a NULL path.
	(updated_folder_cb, folder_changed_cb): Send pre_change signal
	here.

svn path=/trunk/; revision=14558
This commit is contained in:
Christopher James Lahey
2001-10-31 23:46:10 +00:00
committed by Chris Lahey
parent 71a63f1498
commit 49bad8cf37
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
shell/ChangeLog
View File

@ -1,3 +1,10 @@
2001-10-31 Christopher James Lahey <clahey@ximian.com>
* e-storage-set-view.c (cursor_activated): Don't do operations on
a NULL path.
(updated_folder_cb, folder_changed_cb): Send pre_change signal
here.
2001-10-31 Ettore Perazzoli <ettore@ximian.com>
* e-storage-set-view.c (handle_evolution_path_drag_motion): If the

24
shell/e-storage-set-view.c
View File

@ -1319,17 +1319,21 @@ cursor_activated (ETree *tree,
priv = storage_set_view->priv;
g_free (priv->selected_row_path);
priv->selected_row_path = g_strdup (e_tree_memory_node_get_data (E_TREE_MEMORY (priv->etree_model), path));
if (path) {
priv->selected_row_path = g_strdup (e_tree_memory_node_get_data (E_TREE_MEMORY (priv->etree_model), path));
if (e_tree_model_node_depth (priv->etree_model, path) >= 2) {
/* it was a folder */
gtk_signal_emit (GTK_OBJECT (storage_set_view), signals[FOLDER_SELECTED],
priv->selected_row_path);
} else {
/* it was a storage */
gtk_signal_emit (GTK_OBJECT (storage_set_view), signals[STORAGE_SELECTED],
priv->selected_row_path + 1);
if (e_tree_model_node_depth (priv->etree_model, path) >= 2) {
/* it was a folder */
gtk_signal_emit (GTK_OBJECT (storage_set_view), signals[FOLDER_SELECTED],
priv->selected_row_path);
} else {
/* it was a storage */
gtk_signal_emit (GTK_OBJECT (storage_set_view), signals[STORAGE_SELECTED],
priv->selected_row_path + 1);
}
}
else
priv->selected_row_path = NULL;
}
@ -1650,6 +1654,7 @@ updated_folder_cb (EStorageSet *storage_set,
etree = priv->etree_model;
node = lookup_node_in_hash (storage_set_view, path);
e_tree_model_pre_change (etree);
e_tree_model_node_data_changed (etree, node);
}
@ -1811,6 +1816,7 @@ folder_changed_cb (EFolder *folder,
return;
}
e_tree_model_pre_change (priv->etree_model);
e_tree_model_node_data_changed (priv->etree_model, node);
}