aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--lib/widgets/ephy-node-view.c25
-rw-r--r--lib/widgets/ephy-node-view.h3
3 files changed, 21 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 848680401..606701b5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-04-19 Marco Pesenti Gritti <marco@it.gnome.org>
+
+ * lib/widgets/ephy-node-view.c: (ephy_node_view_add_column),
+ (ephy_node_view_remove), (ephy_node_view_edit):
+
+ Fix bookmarks editing and warnings when openining the dialog.
+
+ * lib/widgets/ephy-node-view.h:
+
+ Remove unused api.
+
2003-04-19 Xan Lopez <xan@masilla.org>
* embed/downloader-view.c: (controls_info_foreach),
diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c
index 3d52afd21..18b6cd29c 100644
--- a/lib/widgets/ephy-node-view.c
+++ b/lib/widgets/ephy-node-view.c
@@ -759,6 +759,7 @@ ephy_node_view_add_column (EphyNodeView *view,
view->priv->editable_renderer = renderer;
view->priv->editable_column = gcolumn;
view->priv->editable_node_column = column;
+ view->priv->editable_property = prop_id;
g_signal_connect (renderer, "edited", G_CALLBACK (cell_renderer_edited), view);
}
@@ -800,12 +801,15 @@ ephy_node_view_add_column (EphyNodeView *view,
int scol;
GList *order = NULL;
- scol = ephy_tree_model_node_add_func_column
- (view->priv->nodemodel, G_TYPE_INT,
- (EphyTreeModelNodeValueFunc) provide_priority,
- view);
+ if (priority_prop_id >= 0)
+ {
+ scol = ephy_tree_model_node_add_func_column
+ (view->priv->nodemodel, G_TYPE_INT,
+ (EphyTreeModelNodeValueFunc) provide_priority,
+ view);
+ order = g_list_append (order, GINT_TO_POINTER (scol));
+ }
- order = g_list_append (order, GINT_TO_POINTER (scol));
order = g_list_append (order, GINT_TO_POINTER (column));
gtk_tree_sortable_set_default_sort_func
(GTK_TREE_SORTABLE (view->priv->sortmodel),
@@ -925,7 +929,7 @@ ephy_node_view_remove (EphyNodeView *view)
gtk_tree_model_sort_convert_child_iter_to_iter (GTK_TREE_MODEL_SORT (view->priv->sortmodel),
&iter, &iter2);
iter2 = iter;
-
+
if (gtk_tree_model_iter_next (GTK_TREE_MODEL (view->priv->sortmodel), &iter))
{
path = gtk_tree_model_get_path (GTK_TREE_MODEL (view->priv->sortmodel), &iter);
@@ -1036,15 +1040,6 @@ ephy_node_view_edit (EphyNodeView *view)
}
gboolean
-ephy_node_view_is_editing (EphyNodeView *view,
- int property)
-{
- view->priv->editable_property = property;
-
- return view->priv->editing;
-}
-
-gboolean
ephy_node_view_is_target (EphyNodeView *view)
{
if (target_view == view)
diff --git a/lib/widgets/ephy-node-view.h b/lib/widgets/ephy-node-view.h
index 47a71d463..f19f8cc30 100644
--- a/lib/widgets/ephy-node-view.h
+++ b/lib/widgets/ephy-node-view.h
@@ -107,9 +107,6 @@ void ephy_node_view_enable_drag_dest (EphyNodeView *view,
void ephy_node_view_edit (EphyNodeView *view);
-gboolean ephy_node_view_is_editing (EphyNodeView *view,
- int property);
-
gboolean ephy_node_view_is_target (EphyNodeView *view);
G_END_DECLS