AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Create the bookmarks manager from the places sidebar

Browse Source 
Signed-off-by: Federico Mena Quintero <federico@gnome.org>
This commit is contained in:
Federico Mena Quintero 2011-10-03 09:44:46 -05:00
parent b8b6d592e6
commit 0be8218608
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gtk/gtkplacessidebar.c
View File

@ -27,6 +27,7 @@
#include "config.h" #include "config.h"
#include "gdk/gdkkeysyms.h" #include "gdk/gdkkeysyms.h"
#include "gtkbookmarksmanager.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkplacessidebar.h" #include "gtkplacessidebar.h"
#include "gtkscrolledwindow.h" #include "gtkscrolledwindow.h"
@ -44,7 +45,7 @@ struct _GtkPlacesSidebar {
GtkListStore *store; GtkListStore *store;
GtkTreeModel *filter_model; GtkTreeModel *filter_model;
NautilusWindow *window; NautilusWindow *window;
NautilusBookmarkList *bookmarks; GtkBookmarksManager *bookmarks_manager;
GVolumeMonitor *volume_monitor; GVolumeMonitor *volume_monitor;
gboolean devices_header_added; gboolean devices_header_added;
@ -75,8 +76,6 @@ struct _GtkPlacesSidebar {
GtkPlacesOpenMode go_to_after_mount_open_mode; GtkPlacesOpenMode go_to_after_mount_open_mode;
GtkTreePath *eject_highlight_path; GtkTreePath *eject_highlight_path;
guint bookmarks_changed_id;
}; };
struct _GtkPlacesSidebarClass { struct _GtkPlacesSidebarClass {
@ -3006,6 +3005,12 @@ create_volume_monitor (GtkPlacesSidebar *sidebar)
G_CALLBACK (drive_changed_callback), sidebar, 0); G_CALLBACK (drive_changed_callback), sidebar, 0);
} }
static void
bookmarks_changed_cb (gpointer data)
{
update_places (sidebar);
}
static void static void
gtk_places_sidebar_init (GtkPlacesSidebar *sidebar) gtk_places_sidebar_init (GtkPlacesSidebar *sidebar)
{ {
@ -3016,6 +3021,8 @@ gtk_places_sidebar_init (GtkPlacesSidebar *sidebar)
create_volume_monitor (sidebar); create_volume_monitor (sidebar);
sidebar->bookmarks_manager = _gtk_bookmarks_manager_new (bookmarks_changed_cb, sidebar);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sidebar), gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sidebar),
GTK_POLICY_NEVER, GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC); GTK_POLICY_AUTOMATIC);
@ -3232,10 +3239,9 @@ gtk_places_sidebar_dispose (GObject *object)
sidebar->eject_highlight_path = NULL; sidebar->eject_highlight_path = NULL;
} }
if (sidebar->bookmarks_changed_id != 0) { if (sidebar->bookmarks_manager != NULL) {
g_signal_handler_disconnect (sidebar->bookmarks, _gtk_bookmarks_manager_free (sidebar->bookmarks_manager);
sidebar->bookmarks_changed_id); sidebar->bookmarks_manager = NULL;
sidebar->bookmarks_changed_id = 0;
} }
g_clear_object (&sidebar->store); g_clear_object (&sidebar->store);
@ -3288,13 +3294,6 @@ gtk_places_sidebar_set_parent_window (GtkPlacesSidebar *sidebar,
{ {
sidebar->window = window; sidebar->window = window;
sidebar->bookmarks = nautilus_bookmark_list_new ();
sidebar->bookmarks_changed_id =
g_signal_connect_swapped (sidebar->bookmarks, "changed",
G_CALLBACK (update_places),
sidebar);
g_signal_connect_swapped (nautilus_preferences, "changed::" NAUTILUS_PREFERENCES_ALWAYS_USE_BROWSER, g_signal_connect_swapped (nautilus_preferences, "changed::" NAUTILUS_PREFERENCES_ALWAYS_USE_BROWSER,
G_CALLBACK (bookmarks_popup_menu_detach_cb), sidebar); G_CALLBACK (bookmarks_popup_menu_detach_cb), sidebar);