diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2012-06-11 13:14:20 -0400 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2012-06-11 13:14:20 -0400 |
| commit | d48b12676b316a36a3e85897b95d1bbb78c98fa2 (patch) | |
| tree | b3087ea51092b1bb215cbfccdefef7aadc40cd8f | |
| parent | 1273d9d9640a353b1d6131ca97ec045f59ceccbb (diff) | |
| download | nautilus-d48b12676b316a36a3e85897b95d1bbb78c98fa2.tar.gz | |
places-sidebar: cleanups
| -rw-r--r-- | src/nautilus-places-sidebar.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c index 04fe10135..853e7b4e5 100644 --- a/src/nautilus-places-sidebar.c +++ b/src/nautilus-places-sidebar.c @@ -32,7 +32,6 @@ #include <libnautilus-private/nautilus-dnd.h> #include <libnautilus-private/nautilus-bookmark.h> #include <libnautilus-private/nautilus-global-preferences.h> -#include <libnautilus-private/nautilus-module.h> #include <libnautilus-private/nautilus-file.h> #include <libnautilus-private/nautilus-file-utilities.h> #include <libnautilus-private/nautilus-file-operations.h> @@ -170,8 +169,8 @@ static void bookmarks_check_popup_sensitivity (NautilusPlacesSidebar *s /* Identifiers for target types */ enum { - GTK_TREE_MODEL_ROW, - TEXT_URI_LIST + GTK_TREE_MODEL_ROW, + TEXT_URI_LIST }; /* Target types for dragging from the shortcuts list */ @@ -187,18 +186,15 @@ static const GtkTargetEntry nautilus_shortcuts_drop_targets [] = { /* Drag and drop interface declarations */ typedef struct { - GtkListStore parent; + GtkListStore parent; - NautilusPlacesSidebar *sidebar; + NautilusPlacesSidebar *sidebar; } NautilusShortcutsModel; typedef struct { - GtkListStoreClass parent_class; + GtkListStoreClass parent_class; } NautilusShortcutsModelClass; -#define NAUTILUS_TYPE_SHORTCUTS_MODEL (_nautilus_shortcuts_model_get_type ()) -#define NAUTILUS_SHORTCUTS_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_SHORTCUTS_MODEL_TYPE, NautilusShortcutsModel)) - GType _nautilus_shortcuts_model_get_type (void); static void _nautilus_shortcuts_model_drag_source_init (GtkTreeDragSourceIface *iface); G_DEFINE_TYPE_WITH_CODE (NautilusShortcutsModel, _nautilus_shortcuts_model, GTK_TYPE_LIST_STORE, @@ -1074,12 +1070,12 @@ loading_uri_callback (NautilusWindow *window, /* Computes the appropriate row and position for dropping */ static gboolean -compute_drop_position (GtkTreeView *tree_view, +compute_drop_position (GtkTreeView *tree_view, int x, int y, GtkTreePath **path, GtkTreeViewDropPosition *pos, - NautilusPlacesSidebar *sidebar) + NautilusPlacesSidebar *sidebar) { GtkTreeModel *model; GtkTreeIter iter; @@ -3626,7 +3622,7 @@ nautilus_shortcuts_model_new (NautilusPlacesSidebar *sidebar) G_TYPE_STRING }; - model = g_object_new (NAUTILUS_TYPE_SHORTCUTS_MODEL, NULL); + model = g_object_new (_nautilus_shortcuts_model_get_type (), NULL); model->sidebar = sidebar; gtk_list_store_set_column_types (GTK_LIST_STORE (model), |