[gtk/wip/ebassi/filechooser-new: 53/55] Remove GtkPlacesView:local-only



commit 6e699e3f04af3d928feb897fed254db81ead8390
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Sat Feb 22 15:03:31 2020 +0000

    Remove GtkPlacesView:local-only
    
    We don't use it any more from the file chooser widget.

 gtk/gtkplacesview.c            | 111 -----------------------------------------
 gtk/gtkplacesviewprivate.h     |   5 --
 gtk/ui/gtkfilechooserwidget.ui |   1 -
 3 files changed, 117 deletions(-)
---
diff --git a/gtk/gtkplacesview.c b/gtk/gtkplacesview.c
index c1af705cf7..8a54c1b3f3 100644
--- a/gtk/gtkplacesview.c
+++ b/gtk/gtkplacesview.c
@@ -89,7 +89,6 @@ struct _GtkPlacesViewPrivate
 
   GtkPlacesViewRow              *row_for_action;
 
-  guint                          local_only : 1;
   guint                          should_open_location : 1;
   guint                          should_pulse_entry : 1;
   guint                          entry_pulse_timeout_id;
@@ -126,7 +125,6 @@ G_DEFINE_TYPE_WITH_PRIVATE (GtkPlacesView, gtk_places_view, GTK_TYPE_BOX)
 /* GtkPlacesView properties & signals */
 enum {
   PROP_0,
-  PROP_LOCAL_ONLY,
   PROP_OPEN_FLAGS,
   PROP_FETCHING_NETWORKS,
   PROP_LOADING,
@@ -449,10 +447,6 @@ gtk_places_view_get_property (GObject    *object,
 
   switch (prop_id)
     {
-    case PROP_LOCAL_ONLY:
-      g_value_set_boolean (value, gtk_places_view_get_local_only (self));
-      break;
-
     case PROP_LOADING:
       g_value_set_boolean (value, gtk_places_view_get_loading (self));
       break;
@@ -480,10 +474,6 @@ gtk_places_view_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_LOCAL_ONLY:
-      gtk_places_view_set_local_only (self, g_value_get_boolean (value));
-      break;
-
     case PROP_OPEN_FLAGS:
       gtk_places_view_set_open_flags (self, g_value_get_flags (value));
       break;
@@ -1953,38 +1943,12 @@ on_listbox_row_activated (GtkPlacesView    *view,
   activate_row (view, row, priv->current_open_flags);
 }
 
-static gboolean
-is_mount_locally_accessible (GMount *mount)
-{
-  GFile *base_file;
-  gchar *path;
-
-  if (mount == NULL)
-    return FALSE;
-
-  base_file = g_mount_get_root (mount);
-
-  if (base_file == NULL)
-    return FALSE;
-
-  path = g_file_get_path (base_file);
-  g_object_unref (base_file);
-
-  if (path == NULL)
-    return FALSE;
-
-  g_free (path);
-  return TRUE;
-}
-
 static gboolean
 listbox_filter_func (GtkListBoxRow *row,
                      gpointer       user_data)
 {
   GtkPlacesViewPrivate *priv;
-  gboolean is_network;
   gboolean is_placeholder;
-  gboolean is_local = FALSE;
   gboolean retval;
   gboolean searching;
   gchar *name;
@@ -1994,25 +1958,8 @@ listbox_filter_func (GtkListBoxRow *row,
   retval = FALSE;
   searching = priv->search_query && priv->search_query[0] != '\0';
 
-  is_network = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (row), "is-network"));
   is_placeholder = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (row), "is-placeholder"));
 
-  if (GTK_IS_PLACES_VIEW_ROW (row))
-    {
-      GtkPlacesViewRow *placesviewrow;
-      GMount *mount;
-
-      placesviewrow = GTK_PLACES_VIEW_ROW (row);
-      g_object_get(G_OBJECT (placesviewrow), "mount", &mount, NULL);
-
-      is_local = is_mount_locally_accessible (mount);
-
-      g_clear_object (&mount);
-    }
-
-  if (is_network && priv->local_only && !is_local)
-    return FALSE;
-
   if (is_placeholder && searching)
     return FALSE;
 
@@ -2298,13 +2245,6 @@ gtk_places_view_class_init (GtkPlacesViewClass *klass)
                         G_TYPE_STRING,
                         G_TYPE_STRING);
 
-  properties[PROP_LOCAL_ONLY] =
-          g_param_spec_boolean ("local-only",
-                                P_("Local Only"),
-                                P_("Whether the sidebar only includes local files"),
-                                FALSE,
-                                GTK_PARAM_READWRITE);
-
   properties[PROP_LOADING] =
           g_param_spec_boolean ("loading",
                                 P_("Loading"),
@@ -2607,54 +2547,3 @@ gtk_places_view_set_fetching_networks (GtkPlacesView *view,
       g_object_notify_by_pspec (G_OBJECT (view), properties [PROP_FETCHING_NETWORKS]);
     }
 }
-
-/*
- * gtk_places_view_get_local_only:
- * @view: a #GtkPlacesView
- *
- * Returns %TRUE if only local volumes are shown, i.e. no networks
- * are displayed.
- *
- * Returns: %TRUE if only local volumes are shown, %FALSE otherwise.
- */
-gboolean
-gtk_places_view_get_local_only (GtkPlacesView *view)
-{
-  GtkPlacesViewPrivate *priv;
-
-  g_return_val_if_fail (GTK_IS_PLACES_VIEW (view), FALSE);
-
-  priv = gtk_places_view_get_instance_private (view);
-
-  return priv->local_only;
-}
-
-/*
- * gtk_places_view_set_local_only:
- * @view: a #GtkPlacesView
- * @local_only: %TRUE to hide remote locations, %FALSE to show.
- *
- * Sets the #GtkPlacesView::local-only property to @local_only.
- */
-void
-gtk_places_view_set_local_only (GtkPlacesView *view,
-                                gboolean       local_only)
-{
-  GtkPlacesViewPrivate *priv;
-
-  g_return_if_fail (GTK_IS_PLACES_VIEW (view));
-
-  priv = gtk_places_view_get_instance_private (view);
-
-  if (priv->local_only != local_only)
-    {
-      priv->local_only = local_only;
-
-      gtk_widget_set_visible (priv->actionbar, !local_only);
-      update_places (view);
-
-      update_view_mode (view);
-
-      g_object_notify_by_pspec (G_OBJECT (view), properties [PROP_LOCAL_ONLY]);
-    }
-}
diff --git a/gtk/gtkplacesviewprivate.h b/gtk/gtkplacesviewprivate.h
index 9400efa8b2..e2385a39ed 100644
--- a/gtk/gtkplacesviewprivate.h
+++ b/gtk/gtkplacesviewprivate.h
@@ -72,11 +72,6 @@ const gchar*       gtk_places_view_get_search_query              (GtkPlacesView
 void               gtk_places_view_set_search_query              (GtkPlacesView      *view,
                                                                   const gchar        *query_text);
 
-gboolean           gtk_places_view_get_local_only                (GtkPlacesView         *view);
-
-void               gtk_places_view_set_local_only                (GtkPlacesView         *view,
-                                                                  gboolean               local_only);
-
 gboolean           gtk_places_view_get_loading                   (GtkPlacesView         *view);
 
 GtkWidget *        gtk_places_view_new                           (void);
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index 039b5043f9..1b5433c9cb 100644
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -263,7 +263,6 @@
                                 <property name="name">other_locations</property>
                                 <property name="child">
                                   <object class="GtkPlacesView" id="places_view">
-                                    <property name="local-only">0</property>
                                     <signal name="open-location" handler="places_sidebar_open_location_cb" 
swapped="no"/>
                                     <signal name="show-error-message" 
handler="places_sidebar_show_error_message_cb" swapped="no"/>
                                   </object>


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