From 940f48f7cb72c4f09ee3a7dc6666e67ce6b271ed Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 29 Apr 2005 17:02:06 +0000 Subject: [PATCH] Use the internal unselect_all function, since we need the unselection to 2005-04-29 Matthias Clasen * gtk/gtkiconview.c (gtk_icon_view_move_cursor_start_end): Use the internal unselect_all function, since we need the unselection to happen even in browse mode. (#300995, Mathias Hasselmann) --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gtk/gtkiconview.c | 16 ++++++++-------- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 435b1a51e4..86c1443e67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2005-04-29 Matthias Clasen + * gtk/gtkiconview.c (gtk_icon_view_move_cursor_start_end): Use + the internal unselect_all function, since we need the unselection + to happen even in browse mode. (#300995, Mathias Hasselmann) + * gtk/gtkuimanager.c (update_node): Use g_object_notify() instead of triggering a ::notify by re-setting the property. (#300982, Sven Neumann) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 435b1a51e4..86c1443e67 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2005-04-29 Matthias Clasen + * gtk/gtkiconview.c (gtk_icon_view_move_cursor_start_end): Use + the internal unselect_all function, since we need the unselection + to happen even in browse mode. (#300995, Mathias Hasselmann) + * gtk/gtkuimanager.c (update_node): Use g_object_notify() instead of triggering a ::notify by re-setting the property. (#300982, Sven Neumann) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 435b1a51e4..86c1443e67 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 2005-04-29 Matthias Clasen + * gtk/gtkiconview.c (gtk_icon_view_move_cursor_start_end): Use + the internal unselect_all function, since we need the unselection + to happen even in browse mode. (#300995, Mathias Hasselmann) + * gtk/gtkuimanager.c (update_node): Use g_object_notify() instead of triggering a ::notify by re-setting the property. (#300982, Sven Neumann) diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index 08d195206a..6b38de53e0 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -2836,10 +2836,10 @@ gtk_icon_view_move_cursor_up_down (GtkIconView *icon_view, if (!icon_view->priv->ctrl_pressed && icon_view->priv->selection_mode != GTK_SELECTION_NONE) { - gtk_icon_view_unselect_all_internal (icon_view); + dirty = gtk_icon_view_unselect_all_internal (icon_view); dirty = gtk_icon_view_select_all_between (icon_view, icon_view->priv->anchor_item, - item); + item) || dirty; } gtk_icon_view_scroll_to_item (icon_view, item); @@ -2888,10 +2888,10 @@ gtk_icon_view_move_cursor_page_up_down (GtkIconView *icon_view, if (!icon_view->priv->ctrl_pressed && icon_view->priv->selection_mode != GTK_SELECTION_NONE) { - gtk_icon_view_unselect_all_internal (icon_view); + dirty = gtk_icon_view_unselect_all_internal (icon_view); dirty = gtk_icon_view_select_all_between (icon_view, icon_view->priv->anchor_item, - item); + item) || dirty; } gtk_icon_view_scroll_to_item (icon_view, item); @@ -2940,10 +2940,10 @@ gtk_icon_view_move_cursor_left_right (GtkIconView *icon_view, if (!icon_view->priv->ctrl_pressed && icon_view->priv->selection_mode != GTK_SELECTION_NONE) { - gtk_icon_view_unselect_all_internal (icon_view); + dirty = gtk_icon_view_unselect_all_internal (icon_view); dirty = gtk_icon_view_select_all_between (icon_view, icon_view->priv->anchor_item, - item); + item) || dirty; } gtk_icon_view_scroll_to_item (icon_view, item); @@ -2984,10 +2984,10 @@ gtk_icon_view_move_cursor_start_end (GtkIconView *icon_view, if (!icon_view->priv->ctrl_pressed && icon_view->priv->selection_mode != GTK_SELECTION_NONE) { - gtk_icon_view_unselect_all (icon_view); + dirty = gtk_icon_view_unselect_all_internal (icon_view); dirty = gtk_icon_view_select_all_between (icon_view, icon_view->priv->anchor_item, - item); + item) || dirty; } gtk_icon_view_scroll_to_item (icon_view, item);