summaryrefslogtreecommitdiff
path: root/components/tree
diff options
context:
space:
mode:
Diffstat (limited to 'components/tree')
-rw-r--r--components/tree/Makefile.am2
-rw-r--r--components/tree/nautilus-tree-change-queue.c10
-rw-r--r--components/tree/nautilus-tree-expansion-state.c12
-rw-r--r--components/tree/nautilus-tree-model.c10
-rw-r--r--components/tree/nautilus-tree-node.c6
-rw-r--r--components/tree/nautilus-tree-view-dnd.c26
-rw-r--r--components/tree/nautilus-tree-view.c24
7 files changed, 46 insertions, 44 deletions
diff --git a/components/tree/Makefile.am b/components/tree/Makefile.am
index ead973cf7..f8d4712e7 100644
--- a/components/tree/Makefile.am
+++ b/components/tree/Makefile.am
@@ -6,6 +6,8 @@ INCLUDES = \
-DG_LOG_DOMAIN=\"Nautilus-Tree\" \
-I$(top_srcdir) \
-I$(top_builddir) \
+ $(EEL_INCLUDEDIR) \
+ $(LIBRSVG_INCLUDEDIR) \
$(VFS_CFLAGS) \
$(GCONF_CFLAGS) \
$(GNOMEUI_CFLAGS) \
diff --git a/components/tree/nautilus-tree-change-queue.c b/components/tree/nautilus-tree-change-queue.c
index ba0e810ec..9c7cc7d93 100644
--- a/components/tree/nautilus-tree-change-queue.c
+++ b/components/tree/nautilus-tree-change-queue.c
@@ -25,8 +25,8 @@
them to an idle handler. */
#include "nautilus-tree-change-queue.h"
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-glib-extensions.h>
struct NautilusTreeChangeQueueDetails {
GSList *head;
@@ -39,7 +39,7 @@ static void nautilus_tree_change_queue_initialize (gpointer object,
gpointer klass);
static void nautilus_tree_change_queue_initialize_class (gpointer klass);
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTreeChangeQueue, nautilus_tree_change_queue, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeChangeQueue, nautilus_tree_change_queue, GTK_TYPE_OBJECT)
static NautilusTreeChange *nautilus_tree_change_new (NautilusTreeChangeType change_type,
@@ -76,12 +76,12 @@ nautilus_tree_change_queue_destroy (GtkObject *object)
NautilusTreeChangeQueue *queue;
queue = (NautilusTreeChangeQueue *) object;
- nautilus_g_slist_free_deep_custom (queue->details->head,
+ eel_g_slist_free_deep_custom (queue->details->head,
(GFunc) nautilus_tree_change_free,
NULL);
g_free (queue->details);
- NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+ EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
}
diff --git a/components/tree/nautilus-tree-expansion-state.c b/components/tree/nautilus-tree-expansion-state.c
index 065d45bf1..80e3097af 100644
--- a/components/tree/nautilus-tree-expansion-state.c
+++ b/components/tree/nautilus-tree-expansion-state.c
@@ -26,8 +26,8 @@
#include <config.h>
#include "nautilus-tree-expansion-state.h"
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
#include <libnautilus-extensions/nautilus-preferences.h>
@@ -44,7 +44,7 @@ static void nautilus_tree_expansion_state_initialize (gpoint
gpointer klass);
static void nautilus_tree_expansion_state_initialize_class (gpointer klass);
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTreeExpansionState, nautilus_tree_expansion_state, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeExpansionState, nautilus_tree_expansion_state, GTK_TYPE_OBJECT)
static gboolean expansion_table_hash_remove_func (gpointer key,
@@ -87,7 +87,7 @@ nautilus_tree_expansion_state_load_table_from_gconf (NautilusTreeExpansionState
uris = nautilus_preferences_get_string_list (NAUTILUS_PREFERENCES_TREE_VIEW_EXPANSION_STATE);
g_list_foreach (uris, expansion_state_load_callback, expansion_state);
- nautilus_g_list_free_deep (uris);
+ eel_g_list_free_deep (uris);
}
@@ -120,7 +120,7 @@ nautilus_tree_expansion_state_save_table_to_gconf (NautilusTreeExpansionState *e
GList *uris;
uris = hash_table_get_keys (expansion_state->details->table);
- uris = nautilus_g_str_list_alphabetize (uris);
+ uris = eel_g_str_list_alphabetize (uris);
nautilus_preferences_set_string_list (NAUTILUS_PREFERENCES_TREE_VIEW_EXPANSION_STATE, uris);
g_list_free (uris);
}
@@ -160,7 +160,7 @@ nautilus_tree_expansion_state_destroy (GtkObject *object)
g_free (expansion_state->details);
- NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+ EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
}
diff --git a/components/tree/nautilus-tree-model.c b/components/tree/nautilus-tree-model.c
index f4c2da35d..685a89a5a 100644
--- a/components/tree/nautilus-tree-model.c
+++ b/components/tree/nautilus-tree-model.c
@@ -30,8 +30,8 @@
#include <gtk/gtksignal.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libnautilus-extensions/nautilus-file-attributes.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
#include <stdio.h>
#include <string.h>
@@ -92,7 +92,7 @@ static void nautilus_tree_model_directory_done_loading_callback (NautilusDirect
NautilusTreeModel *model);
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTreeModel, nautilus_tree_model, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeModel, nautilus_tree_model, GTK_TYPE_OBJECT)
/* infrastructure stuff */
@@ -159,7 +159,7 @@ destroy_file_hash (GHashTable *hash)
if (hash == NULL) {
return;
}
- nautilus_g_hash_table_destroy_deep_custom
+ eel_g_hash_table_destroy_deep_custom
(hash,
(GFunc) nautilus_file_unref, NULL,
NULL, NULL);
@@ -189,7 +189,7 @@ nautilus_tree_model_destroy (GtkObject *object)
g_free (model->details);
- NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+ EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
}
diff --git a/components/tree/nautilus-tree-node.c b/components/tree/nautilus-tree-node.c
index 80e87bbed..74ac66123 100644
--- a/components/tree/nautilus-tree-node.c
+++ b/components/tree/nautilus-tree-node.c
@@ -29,7 +29,7 @@
#include "nautilus-tree-node-private.h"
#include <libnautilus-extensions/nautilus-directory.h>
#include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
static void nautilus_tree_node_destroy (GtkObject *object);
@@ -39,7 +39,7 @@ static void nautilus_tree_node_initialize_class (gpointer klas
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTreeNode, nautilus_tree_node, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeNode, nautilus_tree_node, GTK_TYPE_OBJECT)
static void
@@ -80,7 +80,7 @@ nautilus_tree_node_destroy (GtkObject *object)
g_free (node->details->uri);
g_free (node->details);
- NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+ EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
}
NautilusTreeNode *
diff --git a/components/tree/nautilus-tree-view-dnd.c b/components/tree/nautilus-tree-view-dnd.c
index d22622ff1..e38968cc0 100644
--- a/components/tree/nautilus-tree-view-dnd.c
+++ b/components/tree/nautilus-tree-view-dnd.c
@@ -33,12 +33,12 @@
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtksignal.h>
#include <libgnome/gnome-i18n.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
#include <libnautilus-extensions/nautilus-drag.h>
#include <libnautilus-extensions/nautilus-file-operations.h>
#include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
/* This constant is zero because right now it does not seem we need
extra delay on horizontal-only auto-scroll. However, it's left in
@@ -168,7 +168,7 @@ tree_view_realize_callback (GtkWidget *widget, gpointer user_data)
gtk_style_ref (new_style);
/* calculate a new prelighting color */
- nautilus_gtk_style_shade (&style->bg[GTK_STATE_SELECTED],
+ eel_gtk_style_shade (&style->bg[GTK_STATE_SELECTED],
&new_prelight_color,
1.35);
/* set the new color to our special prelighting Style. */
@@ -197,14 +197,14 @@ nautilus_tree_view_init_dnd (NautilusTreeView *view)
view->details->dnd->drag_info = g_new0 (NautilusDragInfo, 1);
nautilus_drag_init (view->details->dnd->drag_info,
nautilus_tree_view_dnd_target_table,
- NAUTILUS_N_ELEMENTS (nautilus_tree_view_dnd_target_table),
+ EEL_N_ELEMENTS (nautilus_tree_view_dnd_target_table),
NULL);
gtk_drag_dest_set (GTK_WIDGET (view->details->tree),
0,
nautilus_tree_view_dnd_target_table,
- NAUTILUS_N_ELEMENTS (nautilus_tree_view_dnd_target_table),
+ EEL_N_ELEMENTS (nautilus_tree_view_dnd_target_table),
GDK_ACTION_COPY
| GDK_ACTION_MOVE
| GDK_ACTION_LINK
@@ -396,7 +396,7 @@ get_data_on_first_target_we_support (GtkWidget *widget, GdkDragContext *context,
if (nautilus_tree_view_dnd_target_list == NULL)
nautilus_tree_view_dnd_target_list = gtk_target_list_new (nautilus_tree_view_dnd_target_table,
- NAUTILUS_N_ELEMENTS (nautilus_tree_view_dnd_target_table));
+ EEL_N_ELEMENTS (nautilus_tree_view_dnd_target_table));
for (target = context->targets; target != NULL; target = target->next) {
guint dummy_info;
@@ -801,7 +801,7 @@ nautilus_tree_view_set_dnd_icon (NautilusTreeView *tree_view, GdkDragContext *co
&expanded);
/* FIXME: We can do better than 10,10 for the hot spot. */
- nautilus_drag_set_icon_pixbuf (context, pixbuf, 10, 10);
+ eel_drag_set_icon_pixbuf (context, pixbuf, 10, 10);
}
@@ -1031,8 +1031,8 @@ static gboolean
ready_to_start_scrolling (NautilusDragInfo *drag_info,
int y_scroll_delta)
{
- return (y_scroll_delta != 0 && drag_info->start_auto_scroll_in < nautilus_get_system_time ()) ||
- drag_info->start_auto_scroll_in + AUTOSCROLL_X_ONLY_EXTRA_DELAY < nautilus_get_system_time ();
+ return (y_scroll_delta != 0 && drag_info->start_auto_scroll_in < eel_get_system_time ()) ||
+ drag_info->start_auto_scroll_in + AUTOSCROLL_X_ONLY_EXTRA_DELAY < eel_get_system_time ();
}
static int
@@ -1091,8 +1091,8 @@ nautilus_tree_view_real_scroll (NautilusTreeView *tree_view, float delta_x, floa
hadj = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (tree_view->details->scrolled_window));
vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (tree_view->details->scrolled_window));
- nautilus_gtk_adjustment_set_value (hadj, hadj->value + delta_x);
- nautilus_gtk_adjustment_set_value (vadj, vadj->value + delta_y);
+ eel_gtk_adjustment_set_value (hadj, hadj->value + delta_x);
+ eel_gtk_adjustment_set_value (vadj, vadj->value + delta_y);
}
@@ -1268,7 +1268,7 @@ nautilus_tree_view_drag_destroy_real (NautilusTreeView *tree_view)
drag_info->drop_occured = FALSE;
if (drag_info->selection_data != NULL) {
- nautilus_gtk_selection_data_free_deep (drag_info->selection_data);
+ eel_gtk_selection_data_free_deep (drag_info->selection_data);
drag_info->selection_data = NULL;
}
}
diff --git a/components/tree/nautilus-tree-view.c b/components/tree/nautilus-tree-view.c
index ffc47a3bb..94ffaf294 100644
--- a/components/tree/nautilus-tree-view.c
+++ b/components/tree/nautilus-tree-view.c
@@ -39,12 +39,12 @@
#include <libnautilus-extensions/nautilus-file-attributes.h>
#include <libnautilus-extensions/nautilus-file-utilities.h>
#include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-glib-extensions.h>
#include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
#include <libnautilus-extensions/nautilus-icon-factory.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-string.h>
#include <stdio.h>
#define DISPLAY_TIMEOUT_INTERVAL_MSECS 500
@@ -93,7 +93,7 @@ static void insert_unparented_nodes (NautilusTreeView *vie
static void expand_uri_sequence_and_select_end (NautilusTreeView *view);
static gboolean is_anti_aliased (NautilusTreeView *view);
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTreeView,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeView,
nautilus_tree_view,
NAUTILUS_TYPE_VIEW)
@@ -161,7 +161,7 @@ nautilus_tree_view_would_include_uri (NautilusTreeView *view,
/* The tree view currently only ever shows `file:' URIs */
- if (!nautilus_str_has_prefix (uri, "file:")) {
+ if (!eel_str_has_prefix (uri, "file:")) {
return FALSE;
}
@@ -573,7 +573,7 @@ notify_node_seen (NautilusTreeView *view,
uri = nautilus_file_get_uri (nautilus_tree_node_get_file (node));
- if (nautilus_strcmp (uri, view->details->wait_uri) == 0) {
+ if (eel_strcmp (uri, view->details->wait_uri) == 0) {
awaited_node_or_uri_found (view);
}
@@ -1149,14 +1149,14 @@ nautilus_tree_view_destroy (GtkObject *object)
gtk_object_unref (GTK_OBJECT (view->details->expansion_state));
}
- nautilus_gtk_object_list_free (view->details->unparented_tree_nodes);
+ eel_gtk_object_list_free (view->details->unparented_tree_nodes);
g_free (view->details->current_main_view_uri);
g_free (view->details->selected_uri);
g_free (view->details);
- NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+ EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
}
static NautilusCTreeNode *
@@ -1259,7 +1259,7 @@ call_when_uri_loaded_or_parent_done_loading (NautilusTreeView *view,
static void
cancel_selection_in_progress (NautilusTreeView *view)
{
- nautilus_g_list_free_deep (view->details->in_progress_select_uris);
+ eel_g_list_free_deep (view->details->in_progress_select_uris);
view->details->in_progress_select_uris = NULL;
g_free (view->details->wait_uri);
@@ -1348,7 +1348,7 @@ expand_uri_sequence_and_select_end (NautilusTreeView *view)
p->prev->next = NULL;
p->prev = NULL;
- nautilus_g_list_free_deep (old_sequence);
+ eel_g_list_free_deep (old_sequence);
}
static void
@@ -1360,7 +1360,7 @@ select_current_location (NautilusTreeView *view)
* nautilus_uris_match or nautilus_uris_match_ignore_fragments
* should be used here.
*/
- if (nautilus_strcmp (view->details->current_main_view_uri,
+ if (eel_strcmp (view->details->current_main_view_uri,
view->details->selected_uri) == 0) {
return;
}
View Lorry Controller Status