[gtk+/gtk-3-22] gtkplacessidebar: remove oversight of old code
- From: Carlos Soriano <csoriano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-3-22] gtkplacessidebar: remove oversight of old code
- Date: Mon, 28 Aug 2017 06:15:10 +0000 (UTC)
commit f68421376bdbe6b1228c25b55f5674ae4ae9ef82
Author: Julius Härtl <jus bitgrid net>
Date: Sat Aug 26 22:43:16 2017 +0200
gtkplacessidebar: remove oversight of old code
https://bugzilla.gnome.org/show_bug.cgi?id=786123
gtk/gtkplacessidebar.c | 24 ++++++++----------------
gtk/gtkplacessidebarprivate.h | 2 --
2 files changed, 8 insertions(+), 18 deletions(-)
---
diff --git a/gtk/gtkplacessidebar.c b/gtk/gtkplacessidebar.c
index 014c278..289799f 100644
--- a/gtk/gtkplacessidebar.c
+++ b/gtk/gtkplacessidebar.c
@@ -1187,7 +1187,7 @@ update_places (GtkPlacesSidebar *sidebar)
tooltip = g_file_get_parse_name (root);
add_place (sidebar, PLACES_MOUNTED_VOLUME,
- SECTION_DEVICES,
+ SECTION_MOUNTS,
name, start_icon, NULL, mount_uri,
drive, volume, mount, NULL, 0, tooltip);
g_object_unref (root);
@@ -1212,7 +1212,7 @@ update_places (GtkPlacesSidebar *sidebar)
tooltip = g_strdup_printf (_("Mount and open “%s”"), name);
add_place (sidebar, PLACES_MOUNTED_VOLUME,
- SECTION_DEVICES,
+ SECTION_MOUNTS,
name, start_icon, NULL, NULL,
drive, volume, NULL, NULL, 0, tooltip);
g_object_unref (start_icon);
@@ -1240,7 +1240,7 @@ update_places (GtkPlacesSidebar *sidebar)
tooltip = g_strdup_printf (_("Mount and open “%s”"), name);
add_place (sidebar, PLACES_BUILT_IN,
- SECTION_DEVICES,
+ SECTION_MOUNTS,
name, start_icon, NULL, NULL,
drive, NULL, NULL, NULL, 0, tooltip);
g_object_unref (start_icon);
@@ -1290,7 +1290,7 @@ update_places (GtkPlacesSidebar *sidebar)
tooltip = g_file_get_parse_name (root);
name = g_mount_get_name (mount);
add_place (sidebar, PLACES_MOUNTED_VOLUME,
- SECTION_DEVICES,
+ SECTION_MOUNTS,
name, start_icon, NULL, mount_uri,
NULL, volume, mount, NULL, 0, tooltip);
g_object_unref (mount);
@@ -1306,7 +1306,7 @@ update_places (GtkPlacesSidebar *sidebar)
start_icon = g_volume_get_symbolic_icon (volume);
name = g_volume_get_name (volume);
add_place (sidebar, PLACES_MOUNTED_VOLUME,
- SECTION_DEVICES,
+ SECTION_MOUNTS,
name, start_icon, NULL, NULL,
NULL, volume, NULL, NULL, 0, name);
g_object_unref (start_icon);
@@ -1322,7 +1322,7 @@ update_places (GtkPlacesSidebar *sidebar)
mount_uri = "file:///"; /* No need to strdup */
start_icon = g_themed_icon_new_with_default_fallbacks (ICON_NAME_FILESYSTEM);
add_place (sidebar, PLACES_BUILT_IN,
- SECTION_DEVICES,
+ SECTION_MOUNTS,
sidebar->hostname, start_icon, NULL, mount_uri,
NULL, NULL, NULL, NULL, 0,
_("Open the contents of the file system"));
@@ -1429,14 +1429,6 @@ update_places (GtkPlacesSidebar *sidebar)
_("Connect to a network server address"));
g_object_unref (start_icon);
}
- mount_uri = "network:///";
- start_icon = g_themed_icon_new_with_default_fallbacks (ICON_NAME_NETWORK);
- add_place (sidebar, PLACES_BUILT_IN,
- SECTION_NETWORK,
- _("Browse Network"), start_icon, NULL, mount_uri,
- NULL, NULL, NULL, NULL, 0,
- _("Browse the contents of the network"));
- g_object_unref (start_icon);
network_volumes = g_list_reverse (network_volumes);
for (l = network_volumes; l != NULL; l = l->next)
@@ -1456,7 +1448,7 @@ update_places (GtkPlacesSidebar *sidebar)
tooltip = g_strdup_printf (_("Mount and open “%s”"), name);
add_place (sidebar, PLACES_MOUNTED_VOLUME,
- SECTION_NETWORK,
+ SECTION_MOUNTS,
name, start_icon, NULL, NULL,
NULL, volume, NULL, NULL, 0, tooltip);
g_object_unref (start_icon);
@@ -1475,7 +1467,7 @@ update_places (GtkPlacesSidebar *sidebar)
name = g_mount_get_name (mount);
tooltip = g_file_get_parse_name (root);
add_place (sidebar, PLACES_MOUNTED_VOLUME,
- SECTION_NETWORK,
+ SECTION_MOUNTS,
name, start_icon, NULL, mount_uri,
NULL, NULL, mount, NULL, 0, tooltip);
g_object_unref (root);
diff --git a/gtk/gtkplacessidebarprivate.h b/gtk/gtkplacessidebarprivate.h
index 30ec2c1..aee1e18 100644
--- a/gtk/gtkplacessidebarprivate.h
+++ b/gtk/gtkplacessidebarprivate.h
@@ -32,8 +32,6 @@ typedef enum {
SECTION_COMPUTER,
SECTION_MOUNTS,
SECTION_CLOUD,
- SECTION_DEVICES,
- SECTION_NETWORK,
SECTION_BOOKMARKS,
SECTION_OTHER_LOCATIONS,
N_SECTIONS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]