[gimp/wip/Jehan/layers-dockable-refresh: 58/105] app: get rid of GimpContainerViewInterface select_item signal.




commit 8cc31d51860efe3fd0ba440b8bde9e399cd24cbe
Author: Jehan <jehan girinstud io>
Date:   Sat Jun 19 23:31:37 2021 +0200

    app: get rid of GimpContainerViewInterface select_item signal.
    
    Now that we have implementations for select_items everywhere and that
    all the code is only wired to call or handle select_items, the single
    item variant select_item is of no use anymore. Let's make a big cleanup.

 app/widgets/gimpcontainercombobox.c | 36 ------------------------
 app/widgets/gimpcontainerentry.c    | 51 ----------------------------------
 app/widgets/gimpcontainericonview.c | 55 -------------------------------------
 app/widgets/gimpcontainertreeview.c | 51 ----------------------------------
 app/widgets/gimpcontainerview.c     | 19 ++-----------
 app/widgets/gimpcontainerview.h     |  3 --
 app/widgets/gimpdrawabletreeview.c  | 39 --------------------------
 app/widgets/gimpitemtreeview.c      | 45 ------------------------------
 app/widgets/gimplayertreeview.c     | 43 +----------------------------
 app/widgets/gimptooleditor.c        | 20 --------------
 10 files changed, 4 insertions(+), 358 deletions(-)
---
diff --git a/app/widgets/gimpcontainercombobox.c b/app/widgets/gimpcontainercombobox.c
index 42f5c7c464..df12453860 100644
--- a/app/widgets/gimpcontainercombobox.c
+++ b/app/widgets/gimpcontainercombobox.c
@@ -74,9 +74,6 @@ static void     gimp_container_combo_box_reorder_item (GimpContainerView      *v
 static void     gimp_container_combo_box_rename_item  (GimpContainerView      *view,
                                                        GimpViewable           *viewable,
                                                        gpointer                insert_data);
-static gboolean  gimp_container_combo_box_select_item (GimpContainerView      *view,
-                                                       GimpViewable           *viewable,
-                                                       gpointer                insert_data);
 static gboolean  gimp_container_combo_box_select_items(GimpContainerView      *view,
                                                        GList                  *viewables,
                                                        GList                  *paths);
@@ -129,7 +126,6 @@ gimp_container_combo_box_view_iface_init (GimpContainerViewInterface *iface)
   iface->remove_item   = gimp_container_combo_box_remove_item;
   iface->reorder_item  = gimp_container_combo_box_reorder_item;
   iface->rename_item   = gimp_container_combo_box_rename_item;
-  iface->select_item   = gimp_container_combo_box_select_item;
   iface->select_items  = gimp_container_combo_box_select_items;
   iface->clear_items   = gimp_container_combo_box_clear_items;
   iface->set_view_size = gimp_container_combo_box_set_view_size;
@@ -352,38 +348,6 @@ gimp_container_combo_box_rename_item (GimpContainerView *view,
                                            insert_data);
 }
 
-static gboolean
-gimp_container_combo_box_select_item (GimpContainerView *view,
-                                      GimpViewable      *viewable,
-                                      gpointer           insert_data)
-{
-  GtkComboBox *combo_box = GTK_COMBO_BOX (view);
-
-  if (gtk_combo_box_get_model (GTK_COMBO_BOX (view)))
-    {
-      GtkTreeIter *iter = insert_data;
-
-     g_signal_handlers_block_by_func (combo_box,
-                                       gimp_container_combo_box_changed,
-                                       view);
-
-      if (iter)
-        {
-          gtk_combo_box_set_active_iter (combo_box, iter);
-        }
-      else
-        {
-          gtk_combo_box_set_active (combo_box, -1);
-        }
-
-      g_signal_handlers_unblock_by_func (combo_box,
-                                         gimp_container_combo_box_changed,
-                                         view);
-    }
-
-  return TRUE;
-}
-
 static gboolean
 gimp_container_combo_box_select_items (GimpContainerView *view,
                                        GList             *viewables,
diff --git a/app/widgets/gimpcontainerentry.c b/app/widgets/gimpcontainerentry.c
index fdc96ef11c..dc9df67b67 100644
--- a/app/widgets/gimpcontainerentry.c
+++ b/app/widgets/gimpcontainerentry.c
@@ -60,9 +60,6 @@ static void     gimp_container_entry_reorder_item (GimpContainerView      *view,
 static void     gimp_container_entry_rename_item  (GimpContainerView      *view,
                                                    GimpViewable           *viewable,
                                                    gpointer                insert_data);
-static gboolean  gimp_container_entry_select_item (GimpContainerView      *view,
-                                                   GimpViewable           *viewable,
-                                                   gpointer                insert_data);
 static gboolean  gimp_container_entry_select_items(GimpContainerView      *view,
                                                    GList                  *items,
                                                    GList                  *paths);
@@ -112,7 +109,6 @@ gimp_container_entry_view_iface_init (GimpContainerViewInterface *iface)
   iface->remove_item   = gimp_container_entry_remove_item;
   iface->reorder_item  = gimp_container_entry_reorder_item;
   iface->rename_item   = gimp_container_entry_rename_item;
-  iface->select_item   = gimp_container_entry_select_item;
   iface->select_items  = gimp_container_entry_select_items;
   iface->clear_items   = gimp_container_entry_clear_items;
   iface->set_view_size = gimp_container_entry_set_view_size;
@@ -314,53 +310,6 @@ gimp_container_entry_rename_item (GimpContainerView *view,
                                          insert_data);
 }
 
-static gboolean
-gimp_container_entry_select_item (GimpContainerView *view,
-                                  GimpViewable      *viewable,
-                                  gpointer           insert_data)
-{
-  GimpContainerEntry *container_entry = GIMP_CONTAINER_ENTRY (view);
-  GtkEntry           *entry           = GTK_ENTRY (view);
-  GtkTreeIter        *iter            = insert_data;
-
-  g_signal_handlers_block_by_func (entry,
-                                   gimp_container_entry_changed,
-                                   view);
-
-  if (container_entry->viewable)
-    {
-      g_object_remove_weak_pointer (G_OBJECT (container_entry->viewable),
-                                    (gpointer) &container_entry->viewable);
-      container_entry->viewable = NULL;
-    }
-
-  if (iter)
-    {
-      container_entry->viewable = viewable;
-      g_object_add_weak_pointer (G_OBJECT (container_entry->viewable),
-                                 (gpointer) &container_entry->viewable);
-
-      gtk_entry_set_icon_from_icon_name (entry,
-                                         GTK_ENTRY_ICON_SECONDARY,
-                                         NULL);
-    }
-  else
-    {
-      /* The selected item does not exist. */
-      gtk_entry_set_icon_from_icon_name (entry,
-                                         GTK_ENTRY_ICON_SECONDARY,
-                                         GIMP_ICON_WILBER_EEK);
-    }
-
-  gtk_entry_set_text (entry, viewable? gimp_object_get_name (viewable) : "");
-
-  g_signal_handlers_unblock_by_func (entry,
-                                     gimp_container_entry_changed,
-                                     view);
-
-  return TRUE;
-}
-
 static gboolean
 gimp_container_entry_select_items (GimpContainerView   *view,
                                    GList               *viewables,
diff --git a/app/widgets/gimpcontainericonview.c b/app/widgets/gimpcontainericonview.c
index 71eae2e422..4c9ee1b147 100644
--- a/app/widgets/gimpcontainericonview.c
+++ b/app/widgets/gimpcontainericonview.c
@@ -77,9 +77,6 @@ static void          gimp_container_icon_view_reorder_item      (GimpContainerVi
 static void          gimp_container_icon_view_rename_item       (GimpContainerView           *view,
                                                                  GimpViewable                *viewable,
                                                                  gpointer                     insert_data);
-static gboolean      gimp_container_icon_view_select_item       (GimpContainerView           *view,
-                                                                 GimpViewable                *viewable,
-                                                                 gpointer                     insert_data);
 static gboolean      gimp_container_icon_view_select_items      (GimpContainerView           *view,
                                                                  GList                       *items,
                                                                  GList                       *paths);
@@ -152,7 +149,6 @@ gimp_container_icon_view_view_iface_init (GimpContainerViewInterface *iface)
   iface->remove_item        = gimp_container_icon_view_remove_item;
   iface->reorder_item       = gimp_container_icon_view_reorder_item;
   iface->rename_item        = gimp_container_icon_view_rename_item;
-  iface->select_item        = gimp_container_icon_view_select_item;
   iface->select_items       = gimp_container_icon_view_select_items;
   iface->clear_items        = gimp_container_icon_view_clear_items;
   iface->set_view_size      = gimp_container_icon_view_set_view_size;
@@ -473,57 +469,6 @@ gimp_container_icon_view_rename_item (GimpContainerView *view,
                                          iter);
 }
 
-static gboolean
-gimp_container_icon_view_select_item (GimpContainerView *view,
-                                      GimpViewable      *viewable,
-                                      gpointer           insert_data)
-{
-  GimpContainerIconView *icon_view = GIMP_CONTAINER_ICON_VIEW (view);
-
-  if (viewable && insert_data)
-    {
-      GtkTreePath *path;
-      GtkTreePath *parent_path;
-      GtkTreeIter *iter = (GtkTreeIter *) insert_data;
-
-      path = gtk_tree_model_get_path (icon_view->model, iter);
-
-      parent_path = gtk_tree_path_copy (path);
-
-      if (gtk_tree_path_up (parent_path))
-        ;
-#if 0
-        gtk_icon_view_expand_to_path (icon_view->view, parent_path);
-#endif
-
-      gtk_tree_path_free (parent_path);
-
-      g_signal_handlers_block_by_func (icon_view->view,
-                                       gimp_container_icon_view_selection_changed,
-                                       icon_view);
-
-      gtk_icon_view_unselect_all (icon_view->view);
-      gtk_icon_view_select_path (icon_view->view, path);
-      gtk_icon_view_set_cursor (icon_view->view, path, NULL, FALSE);
-
-      g_signal_handlers_unblock_by_func (icon_view->view,
-                                         gimp_container_icon_view_selection_changed,
-                                         icon_view);
-
-      gtk_icon_view_scroll_to_path (icon_view->view, path, FALSE, 0.0, 0.0);
-
-      gtk_tree_path_free (path);
-    }
-  else if (insert_data == NULL)
-    {
-      /* viewable == NULL && insert_data != NULL means multiple selection.
-       * viewable == NULL && insert_data == NULL means no selection. */
-      gtk_icon_view_unselect_all (icon_view->view);
-    }
-
-  return TRUE;
-}
-
 static gboolean
 gimp_container_icon_view_select_items (GimpContainerView *view,
                                        GList             *viewables,
diff --git a/app/widgets/gimpcontainertreeview.c b/app/widgets/gimpcontainertreeview.c
index 9f993d2483..e883570e80 100644
--- a/app/widgets/gimpcontainertreeview.c
+++ b/app/widgets/gimpcontainertreeview.c
@@ -89,9 +89,6 @@ static void          gimp_container_tree_view_rename_item       (GimpContainerVi
 static void          gimp_container_tree_view_expand_item       (GimpContainerView           *view,
                                                                  GimpViewable                *viewable,
                                                                  gpointer                     insert_data);
-static gboolean      gimp_container_tree_view_select_item       (GimpContainerView           *view,
-                                                                 GimpViewable                *viewable,
-                                                                 gpointer                     insert_data);
 static gboolean      gimp_container_tree_view_select_items      (GimpContainerView           *view,
                                                                  GList                       *viewables,
                                                                  GList                       *paths);
@@ -222,7 +219,6 @@ gimp_container_tree_view_view_iface_init (GimpContainerViewInterface *iface)
   iface->reorder_item       = gimp_container_tree_view_reorder_item;
   iface->rename_item        = gimp_container_tree_view_rename_item;
   iface->expand_item        = gimp_container_tree_view_expand_item;
-  iface->select_item        = gimp_container_tree_view_select_item;
   iface->select_items       = gimp_container_tree_view_select_items;
   iface->clear_items        = gimp_container_tree_view_clear_items;
   iface->set_view_size      = gimp_container_tree_view_set_view_size;
@@ -870,53 +866,6 @@ gimp_container_tree_view_expand_item (GimpContainerView *view,
     }
 }
 
-static gboolean
-gimp_container_tree_view_select_item (GimpContainerView *view,
-                                      GimpViewable      *viewable,
-                                      gpointer           insert_data)
-{
-  GimpContainerTreeView *tree_view = GIMP_CONTAINER_TREE_VIEW (view);
-
-  if (viewable && insert_data)
-    {
-      GtkTreePath *path;
-      GtkTreePath *parent_path;
-      GtkTreeIter *iter = (GtkTreeIter *) insert_data;
-
-      path = gtk_tree_model_get_path (tree_view->model, iter);
-
-      parent_path = gtk_tree_path_copy (path);
-
-      if (gtk_tree_path_up (parent_path))
-        gtk_tree_view_expand_to_path (tree_view->view, parent_path);
-
-      gtk_tree_path_free (parent_path);
-
-      g_signal_handlers_block_by_func (tree_view->priv->selection,
-                                       gimp_container_tree_view_selection_changed,
-                                       tree_view);
-
-      gtk_tree_view_set_cursor (tree_view->view, path, NULL, FALSE);
-
-      g_signal_handlers_unblock_by_func (tree_view->priv->selection,
-                                         gimp_container_tree_view_selection_changed,
-                                         tree_view);
-
-      gtk_tree_view_scroll_to_cell (tree_view->view, path,
-                                    NULL, FALSE, 0.0, 0.0);
-
-      gtk_tree_path_free (path);
-    }
-  else if (insert_data == NULL)
-    {
-      /* viewable == NULL && insert_data != NULL means multiple selection.
-       * viewable == NULL && insert_data == NULL means no selection. */
-      gtk_tree_selection_unselect_all (tree_view->priv->selection);
-    }
-
-  return TRUE;
-}
-
 static gboolean
 gimp_container_tree_view_select_items (GimpContainerView *view,
                                        GList             *items,
diff --git a/app/widgets/gimpcontainerview.c b/app/widgets/gimpcontainerview.c
index e6e927269a..3d1d158594 100644
--- a/app/widgets/gimpcontainerview.c
+++ b/app/widgets/gimpcontainerview.c
@@ -45,7 +45,6 @@
 
 enum
 {
-  SELECT_ITEM,
   SELECT_ITEMS,
   ACTIVATE_ITEM,
   LAST_SIGNAL
@@ -157,17 +156,6 @@ static guint view_signals[LAST_SIGNAL] = { 0 };
 static void
 gimp_container_view_default_init (GimpContainerViewInterface *iface)
 {
-  view_signals[SELECT_ITEM] =
-    g_signal_new ("select-item",
-                  G_TYPE_FROM_INTERFACE (iface),
-                  G_SIGNAL_RUN_LAST,
-                  G_STRUCT_OFFSET (GimpContainerViewInterface, select_item),
-                  NULL, NULL,
-                  gimp_marshal_BOOLEAN__OBJECT_POINTER,
-                  G_TYPE_BOOLEAN, 2,
-                  GIMP_TYPE_OBJECT,
-                  G_TYPE_POINTER);
-
   view_signals[SELECT_ITEMS] =
     g_signal_new ("select-items",
                   G_TYPE_FROM_INTERFACE (iface),
@@ -190,7 +178,6 @@ gimp_container_view_default_init (GimpContainerViewInterface *iface)
                   GIMP_TYPE_OBJECT,
                   G_TYPE_POINTER);
 
-  iface->select_item        = NULL;
   iface->select_items       = NULL;
   iface->activate_item      = NULL;
 
@@ -862,8 +849,8 @@ gimp_container_view_multi_selected (GimpContainerView *view,
  * the class to decide what type of data is passed along.
  *
  * Note that by default, the interface only implements some basic single
- * selection. Override select_item() and select_items() signals to get
- * more complete selection support.
+ * selection. Override select_items() signal to get more complete
+ * selection support.
  *
  * Returns: the number of selected items.
  */
@@ -1388,7 +1375,7 @@ gimp_container_view_context_changed (GimpContext       *context,
     viewables = g_list_prepend (viewables, viewable);
 
   if (! gimp_container_view_select_items (view, viewables))
-    g_warning ("%s: select_item() failed (should not happen)", G_STRFUNC);
+    g_warning ("%s: select_items() failed (should not happen)", G_STRFUNC);
 
   g_list_free (viewables);
 }
diff --git a/app/widgets/gimpcontainerview.h b/app/widgets/gimpcontainerview.h
index 3094710ac0..e768c6345e 100644
--- a/app/widgets/gimpcontainerview.h
+++ b/app/widgets/gimpcontainerview.h
@@ -44,9 +44,6 @@ struct _GimpContainerViewInterface
   GTypeInterface base_iface;
 
   /*  signals  */
-  gboolean (* select_item)        (GimpContainerView *view,
-                                   GimpViewable      *object,
-                                   gpointer           insert_data);
   gboolean (* select_items)       (GimpContainerView *view,
                                    GList             *items,
                                    GList             *paths);
diff --git a/app/widgets/gimpdrawabletreeview.c b/app/widgets/gimpdrawabletreeview.c
index b393b68291..57687af879 100644
--- a/app/widgets/gimpdrawabletreeview.c
+++ b/app/widgets/gimpdrawabletreeview.c
@@ -47,9 +47,6 @@ static void   gimp_drawable_tree_view_view_iface_init (GimpContainerViewInterfac
 
 static void     gimp_drawable_tree_view_constructed   (GObject           *object);
 
-static gboolean gimp_drawable_tree_view_select_item   (GimpContainerView *view,
-                                                       GimpViewable      *item,
-                                                       gpointer           insert_data);
 static gboolean gimp_drawable_tree_view_select_items  (GimpContainerView *view,
                                                        GList             *items,
                                                        GList             *paths);
@@ -134,7 +131,6 @@ gimp_drawable_tree_view_view_iface_init (GimpContainerViewInterface *iface)
 {
   parent_view_iface = g_type_interface_peek_parent (iface);
 
-  iface->select_item  = gimp_drawable_tree_view_select_item;
   iface->select_items = gimp_drawable_tree_view_select_items;
 }
 
@@ -168,41 +164,6 @@ gimp_drawable_tree_view_constructed (GObject *object)
 
 /*  GimpContainerView methods  */
 
-static gboolean
-gimp_drawable_tree_view_select_item (GimpContainerView *view,
-                                     GimpViewable      *item,
-                                     gpointer           insert_data)
-{
-  GimpItemTreeView *item_view = GIMP_ITEM_TREE_VIEW (view);
-  GimpImage        *image     = gimp_item_tree_view_get_image (item_view);
-  gboolean          success   = TRUE;
-
-  if (image)
-    {
-      GimpLayer *floating_sel = gimp_image_get_floating_selection (image);
-
-      success = (item         == NULL ||
-                 floating_sel == NULL ||
-                 item         == GIMP_VIEWABLE (floating_sel));
-
-      if (! success)
-        {
-          Gimp        *gimp    = image->gimp;
-          GimpContext *context = gimp_get_user_context (gimp);
-          GimpDisplay *display = gimp_context_get_display (context);
-
-          gimp_message_literal (gimp, G_OBJECT (display), GIMP_MESSAGE_WARNING,
-                                _("Cannot select item while a floating "
-                                  "selection is active."));
-        }
-    }
-
-  if (success)
-    success = parent_view_iface->select_item (view, item, insert_data);
-
-  return success;
-}
-
 static gboolean
 gimp_drawable_tree_view_select_items (GimpContainerView *view,
                                       GList             *items,
diff --git a/app/widgets/gimpitemtreeview.c b/app/widgets/gimpitemtreeview.c
index 94c299d232..9d995064bf 100644
--- a/app/widgets/gimpitemtreeview.c
+++ b/app/widgets/gimpitemtreeview.c
@@ -148,9 +148,6 @@ static gpointer gimp_item_tree_view_insert_item     (GimpContainerView *view,
                                                      gpointer           parent_insert_data,
                                                      gint               index);
 static void  gimp_item_tree_view_insert_items_after (GimpContainerView *view);
-static gboolean gimp_item_tree_view_select_item     (GimpContainerView *view,
-                                                     GimpViewable      *item,
-                                                     gpointer           insert_data);
 static gboolean gimp_item_tree_view_select_items    (GimpContainerView *view,
                                                      GList             *items,
                                                      GList             *paths);
@@ -321,7 +318,6 @@ gimp_item_tree_view_view_iface_init (GimpContainerViewInterface *iface)
   iface->set_context        = gimp_item_tree_view_set_context;
   iface->insert_item        = gimp_item_tree_view_insert_item;
   iface->insert_items_after = gimp_item_tree_view_insert_items_after;
-  iface->select_item        = gimp_item_tree_view_select_item;
   iface->select_items       = gimp_item_tree_view_select_items;
   iface->activate_item      = gimp_item_tree_view_activate_item;
 }
@@ -1193,47 +1189,6 @@ gimp_item_tree_view_insert_items_after (GimpContainerView *view)
   gimp_container_view_select_items (view, selected_items);
 }
 
-static gboolean
-gimp_item_tree_view_select_item (GimpContainerView *view,
-                                 GimpViewable      *item,
-                                 gpointer           insert_data)
-{
-  GimpItemTreeView *tree_view         = GIMP_ITEM_TREE_VIEW (view);
-  gboolean          options_sensitive = FALSE;
-  gboolean          success;
-
-  success = parent_view_iface->select_item (view, item, insert_data);
-
-  if (item)
-    {
-      GimpItemTreeViewClass *item_view_class;
-      GList                 *items;
-
-      item_view_class = GIMP_ITEM_TREE_VIEW_GET_CLASS (tree_view);
-
-      items = item_view_class->get_selected_items (tree_view->priv->image);
-
-      if (g_list_length (items) != 1 ||
-          items->data != (GimpItem *) item)
-        {
-          item_view_class->set_active_item (tree_view->priv->image,
-                                            GIMP_ITEM (item));
-
-          gimp_image_flush (tree_view->priv->image);
-          items = item_view_class->get_selected_items (tree_view->priv->image);
-        }
-
-      options_sensitive = TRUE;
-    }
-
-  gimp_ui_manager_update (gimp_editor_get_ui_manager (GIMP_EDITOR (tree_view)), tree_view);
-
-  if (tree_view->priv->options_box)
-    gtk_widget_set_sensitive (tree_view->priv->options_box, options_sensitive);
-
-  return success;
-}
-
 static gboolean
 gimp_item_tree_view_select_items (GimpContainerView *view,
                                   GList             *items,
diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c
index fe843bf182..c0887625b7 100644
--- a/app/widgets/gimplayertreeview.c
+++ b/app/widgets/gimplayertreeview.c
@@ -111,9 +111,6 @@ static gpointer   gimp_layer_tree_view_insert_item                (GimpContainer
                                                                    GimpViewable               *viewable,
                                                                    gpointer                    
parent_insert_data,
                                                                    gint                        index);
-static gboolean   gimp_layer_tree_view_select_item                (GimpContainerView          *view,
-                                                                   GimpViewable               *item,
-                                                                   gpointer                    insert_data);
 static gboolean   gimp_layer_tree_view_select_items               (GimpContainerView          *view,
                                                                    GList                      *items,
                                                                    GList                      *paths);
@@ -266,7 +263,6 @@ gimp_layer_tree_view_view_iface_init (GimpContainerViewInterface *iface)
   iface->set_container = gimp_layer_tree_view_set_container;
   iface->set_context   = gimp_layer_tree_view_set_context;
   iface->insert_item   = gimp_layer_tree_view_insert_item;
-  iface->select_item   = gimp_layer_tree_view_select_item;
   iface->select_items  = gimp_layer_tree_view_select_items;
   iface->set_view_size = gimp_layer_tree_view_set_view_size;
 
@@ -691,43 +687,6 @@ gimp_layer_tree_view_insert_item (GimpContainerView *view,
   return iter;
 }
 
-static gboolean
-gimp_layer_tree_view_select_item (GimpContainerView *view,
-                                  GimpViewable      *item,
-                                  gpointer           insert_data)
-{
-  GimpLayerTreeView *layer_view = GIMP_LAYER_TREE_VIEW (view);
-  gboolean           success;
-
-  success = parent_view_iface->select_item (view, item, insert_data);
-
-  if (item)
-    {
-      if (success)
-        {
-          GList *layers = g_list_prepend (NULL, item);
-
-          gimp_layer_tree_view_update_borders (layer_view,
-                                               (GtkTreeIter *) insert_data);
-          gimp_layer_tree_view_update_options (layer_view, layers);
-          gimp_layer_tree_view_update_menu (layer_view, layers);
-          g_list_free (layers);
-        }
-    }
-
-  if (! success)
-    {
-      GimpEditor *editor = GIMP_EDITOR (view);
-
-      /* currently, select_item() only ever fails when there is a floating
-       * selection, which can be committed/canceled through the editor buttons.
-       */
-      gimp_widget_blink (GTK_WIDGET (gimp_editor_get_button_box (editor)));
-    }
-
-  return success;
-}
-
 static gboolean
 gimp_layer_tree_view_select_items (GimpContainerView *view,
                                    GList             *items,
@@ -761,7 +720,7 @@ gimp_layer_tree_view_select_items (GimpContainerView *view,
     {
       GimpEditor *editor = GIMP_EDITOR (view);
 
-      /* currently, select_item() only ever fails when there is a floating
+      /* currently, select_items() only ever fails when there is a floating
        * selection, which can be committed/canceled through the editor buttons.
        */
       gimp_widget_blink (GTK_WIDGET (gimp_editor_get_button_box (editor)));
diff --git a/app/widgets/gimptooleditor.c b/app/widgets/gimptooleditor.c
index c78a2ff895..b1cedded16 100644
--- a/app/widgets/gimptooleditor.c
+++ b/app/widgets/gimptooleditor.c
@@ -76,9 +76,6 @@ static void            gimp_tool_editor_view_iface_init           (GimpContainer
 
 static void            gimp_tool_editor_constructed               (GObject                    *object);
 
-static gboolean        gimp_tool_editor_select_item               (GimpContainerView          *view,
-                                                                   GimpViewable               *viewable,
-                                                                   gpointer                    insert_data);
 static gboolean        gimp_tool_editor_select_items              (GimpContainerView          *view,
                                                                    GList                      *items,
                                                                    GList                      *paths);
@@ -172,7 +169,6 @@ gimp_tool_editor_view_iface_init (GimpContainerViewInterface *iface)
   if (! parent_view_iface)
     parent_view_iface = g_type_default_interface_peek (GIMP_TYPE_CONTAINER_VIEW);
 
-  iface->select_item   = gimp_tool_editor_select_item;
   iface->select_items  = gimp_tool_editor_select_items;
   iface->set_container = gimp_tool_editor_set_container;
   iface->set_context   = gimp_tool_editor_set_context;
@@ -282,22 +278,6 @@ gimp_tool_editor_constructed (GObject *object)
   gimp_tool_editor_update_sensitivity (tool_editor);
 }
 
-static gboolean
-gimp_tool_editor_select_item (GimpContainerView *container_view,
-                              GimpViewable      *viewable,
-                              gpointer           insert_data)
-{
-  GimpToolEditor *tool_editor = GIMP_TOOL_EDITOR (container_view);
-  gboolean        result;
-
-  result = parent_view_iface->select_item (container_view,
-                                           viewable, insert_data);
-
-  gimp_tool_editor_update_sensitivity (tool_editor);
-
-  return result;
-}
-
 static gboolean
 gimp_tool_editor_select_items (GimpContainerView   *container_view,
                                GList               *viewables,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]