summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Soriano <csoriano@gnome.org>2016-02-17 18:38:01 +0100
committerCarlos Soriano <csoriano@gnome.org>2016-02-17 20:56:39 +0100
commit62baf1567146d55b934ecb2fde8d8d858c4b1359 (patch)
treebd681f52da5efa29388fac9dfcd8b8df99c5c2b1
parent2c1ef7cc3bc1d0ddccfce3cd2fe04882367496f6 (diff)
downloadnautilus-62baf1567146d55b934ecb2fde8d8d858c4b1359.tar.gz
gtkplacesview: update to master
-rw-r--r--src/gtk/gtkplacesview.c20
1 files changed, 7 insertions, 13 deletions
diff --git a/src/gtk/gtkplacesview.c b/src/gtk/gtkplacesview.c
index 484b4fcab..f6d5e7a6f 100644
--- a/src/gtk/gtkplacesview.c
+++ b/src/gtk/gtkplacesview.c
@@ -3,16 +3,16 @@
* Copyright (C) 2015 Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -329,11 +329,7 @@ set_busy_cursor (GtkPlacesView *view,
display = gtk_widget_get_display (widget);
if (busy)
- {
- cursor = gdk_cursor_new_from_name (display, "left_ptr_watch");
- if (cursor == NULL)
- cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
- }
+ cursor = gdk_cursor_new_from_name (display, "progress");
else
cursor = NULL;
@@ -2249,6 +2245,8 @@ gtk_places_view_class_init (GtkPlacesViewClass *klass)
gtk_widget_class_bind_template_callback (widget_class, on_key_press_event);
gtk_widget_class_bind_template_callback (widget_class, on_listbox_row_activated);
gtk_widget_class_bind_template_callback (widget_class, on_recent_servers_listbox_row_activated);
+
+ gtk_widget_class_set_css_name (widget_class, "placesview");
}
static void
@@ -2374,8 +2372,6 @@ gtk_places_view_get_search_query (GtkPlacesView *view)
*
* Sets the search query of @view. The search is immediately performed
* once the query is set.
- *
- * Returns:
*/
void
gtk_places_view_set_search_query (GtkPlacesView *view,
@@ -2511,8 +2507,6 @@ gtk_places_view_get_local_only (GtkPlacesView *view)
*
* Sets the #GtkPlacesView::local-only property to @local_only.
*
- * Returns:
- *
* Since: 3.18
*/
void