diff options
64 files changed, 802 insertions, 832 deletions
diff --git a/applets/preferences-applet/nautilus-preferences-applet.c b/applets/preferences-applet/nautilus-preferences-applet.c index da97bc13a..e8c630410 100644 --- a/applets/preferences-applet/nautilus-preferences-applet.c +++ b/applets/preferences-applet/nautilus-preferences-applet.c @@ -74,7 +74,7 @@ boolean_preference_changed_callback (gpointer callback_data) g_return_if_fail (GTK_IS_TOGGLE_BUTTON (foo->button)); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (foo->button), - nautilus_preferences_get_boolean (foo->preference_name)); + eel_preferences_get_boolean (foo->preference_name)); } static void @@ -87,7 +87,7 @@ button_toggled (GtkWidget *button, g_return_if_fail (foo->preference_name != NULL); g_return_if_fail (GTK_IS_TOGGLE_BUTTON (foo->button)); - nautilus_preferences_set_boolean (foo->preference_name, GTK_TOGGLE_BUTTON (foo->button)->active); + eel_preferences_set_boolean (foo->preference_name, GTK_TOGGLE_BUTTON (foo->button)->active); } static GtkWidget * @@ -114,7 +114,7 @@ boolean_toggle_button_new (const char *preference_name, foo); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), - nautilus_preferences_get_boolean (preference_name)); + eel_preferences_get_boolean (preference_name)); gtk_signal_connect_while_alive (GTK_OBJECT (button), "toggled", @@ -122,7 +122,7 @@ boolean_toggle_button_new (const char *preference_name, foo, GTK_OBJECT (button)); - nautilus_preferences_add_callback_while_alive (preference_name, + eel_preferences_add_callback_while_alive (preference_name, boolean_preference_changed_callback, foo, GTK_OBJECT (button)); @@ -172,7 +172,7 @@ user_level_changed_callback (gpointer callback_data) g_return_if_fail (GTK_IS_TOGGLE_BUTTON (callback_data)); gtk_widget_set_sensitive (GTK_WIDGET (callback_data), - nautilus_preferences_get_user_level () > 0); + eel_preferences_get_user_level () > 0); } int @@ -230,12 +230,12 @@ main (int argc, char **argv) _("Smooth Graphics")); gtk_box_pack_start (GTK_BOX (preference_vbox), smooth_graphics_button, TRUE, TRUE, 1); - nautilus_preferences_add_callback ("user_level", + eel_preferences_add_callback ("user_level", user_level_changed_callback, show_desktop_button); user_level_changed_callback (show_desktop_button); - nautilus_preferences_add_callback ("user_level", + eel_preferences_add_callback ("user_level", user_level_changed_callback, smooth_graphics_button); user_level_changed_callback (smooth_graphics_button); diff --git a/components/adapter/nautilus-adapter.c b/components/adapter/nautilus-adapter.c index 056146052..c78d7b348 100644 --- a/components/adapter/nautilus-adapter.c +++ b/components/adapter/nautilus-adapter.c @@ -27,22 +27,22 @@ #include <config.h> #include "nautilus-adapter.h" -#include "nautilus-adapter-load-strategy.h" -#include "nautilus-adapter-embed-strategy.h" -#include "nautilus-adapter-embed-strategy-private.h" +#include "nautilus-adapter-embed-strategy-private.h" +#include "nautilus-adapter-embed-strategy.h" +#include "nautilus-adapter-load-strategy.h" #include <bonobo/bonobo-control.h> #include <bonobo/bonobo-item-container.h> -#include <bonobo/bonobo-view-frame.h> #include <bonobo/bonobo-object-client.h> -#include <gtk/gtksignal.h> +#include <bonobo/bonobo-view-frame.h> +#include <eel/eel-generous-bin.h> +#include <eel/eel-gtk-macros.h> #include <gdk-pixbuf/gdk-pixbuf.h> +#include <gtk/gtksignal.h> #include <libgnome/gnome-i18n.h> #include <libgnomeui/gnome-stock.h> -#include <libnautilus/nautilus-bonobo-ui.h> -#include <eel/eel-gtk-macros.h> -#include <libnautilus-private/nautilus-generous-bin.h> #include <libnautilus-adapter/nautilus-adapter-factory.h> +#include <libnautilus/nautilus-bonobo-ui.h> struct NautilusAdapterDetails { NautilusView *nautilus_view; @@ -166,7 +166,7 @@ nautilus_adapter_new (Bonobo_Unknown component) /* Set up a few wrapper framework details */ - bin = gtk_widget_new (NAUTILUS_TYPE_GENEROUS_BIN, NULL); + bin = gtk_widget_new (EEL_TYPE_GENEROUS_BIN, NULL); gtk_widget_show (bin); control = bonobo_control_new (bin); adapter->details->nautilus_view = nautilus_view_new_from_bonobo_control (control); diff --git a/components/news/nautilus-news.c b/components/news/nautilus-news.c index ff8213f87..2e2cfb4e5 100644 --- a/components/news/nautilus-news.c +++ b/components/news/nautilus-news.c @@ -334,12 +334,12 @@ do_destroy (GtkObject *obj, News *news) /* free all the channel data */ nautilus_news_free_channel_list (news); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS, - max_items_changed, - news); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_NEWS_UPDATE_INTERVAL, - update_interval_changed, - news); + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS, + max_items_changed, + news); + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_NEWS_UPDATE_INTERVAL, + update_interval_changed, + news); g_free (news); } @@ -1740,7 +1740,7 @@ max_items_changed (gpointer user_data) news = (News*) user_data; - news->max_item_count = nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS); + news->max_item_count = eel_preferences_get_integer (NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS); if (news->max_item_count <= 0) { news->max_item_count = 2; } @@ -1754,7 +1754,7 @@ update_interval_changed (gpointer user_data) news = (News*) user_data; - news->update_interval = 60 * nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_NEWS_UPDATE_INTERVAL); + news->update_interval = 60 * eel_preferences_get_integer (NAUTILUS_PREFERENCES_NEWS_UPDATE_INTERVAL); if (news->update_interval < 60) { news->update_interval = 60; } @@ -2420,8 +2420,8 @@ make_news_view (const char *iid, gpointer callback_data) news->bold_font = eel_scalable_font_get_default_bold_font (); /* get preferences and sanity check them */ - news->max_item_count = nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS); - news->update_interval = 60 * nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_NEWS_UPDATE_INTERVAL); + news->max_item_count = eel_preferences_get_integer (NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS); + news->update_interval = 60 * eel_preferences_get_integer (NAUTILUS_PREFERENCES_NEWS_UPDATE_INTERVAL); if (news->max_item_count <= 0) { news->max_item_count = 2; @@ -2429,8 +2429,8 @@ make_news_view (const char *iid, gpointer callback_data) if (news->update_interval < 60) { news->update_interval = 60; } - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS, max_items_changed, news); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_NEWS_UPDATE_INTERVAL, update_interval_changed, news); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS, max_items_changed, news); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_NEWS_UPDATE_INTERVAL, update_interval_changed, news); /* load some images */ nautilus_news_load_images (news); diff --git a/components/text/nautilus-text-view.c b/components/text/nautilus-text-view.c index 651512448..661c1be8b 100644 --- a/components/text/nautilus-text-view.c +++ b/components/text/nautilus-text-view.c @@ -134,12 +134,12 @@ nautilus_text_view_initialize_class (NautilusTextViewClass *klass) object_class->destroy = nautilus_text_view_destroy; /* Text view component fonts */ - nautilus_preferences_default_set_string (NAUTILUS_PREFERENCES_TEXT_VIEW_FONT, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - "fixed"); - nautilus_preferences_default_set_integer (NAUTILUS_PREFERENCES_TEXT_VIEW_STANDARD_FONT_SIZE, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - 14); + eel_preferences_default_set_string (NAUTILUS_PREFERENCES_TEXT_VIEW_FONT, + EEL_USER_LEVEL_INTERMEDIATE, + "fixed"); + eel_preferences_default_set_integer (NAUTILUS_PREFERENCES_TEXT_VIEW_STANDARD_FONT_SIZE, + EEL_USER_LEVEL_INTERMEDIATE, + 14); } /* initialize ourselves by connecting to the location change signal and allocating our subviews */ @@ -206,14 +206,14 @@ nautilus_text_view_initialize (NautilusTextView *text_view) nautilus_text_view_update_font (text_view); /* Keep track of font changes */ - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_TEXT_VIEW_FONT, - font_changed_callback, - text_view, - GTK_OBJECT (text_view)); - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_TEXT_VIEW_STANDARD_FONT_SIZE, - font_changed_callback, - text_view, - GTK_OBJECT (text_view)); + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_TEXT_VIEW_FONT, + font_changed_callback, + text_view, + GTK_OBJECT (text_view)); + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_TEXT_VIEW_STANDARD_FONT_SIZE, + font_changed_callback, + text_view, + GTK_OBJECT (text_view)); scrolled_window = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), @@ -429,11 +429,11 @@ nautilus_text_view_update_font (NautilusTextView *text_view) GdkFont *font; int font_size; - font_size = nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_TEXT_VIEW_STANDARD_FONT_SIZE); + font_size = eel_preferences_get_integer (NAUTILUS_PREFERENCES_TEXT_VIEW_STANDARD_FONT_SIZE); font_size += text_view_font_size_deltas[text_view->details->zoom_index]; - font_name = nautilus_preferences_get (NAUTILUS_PREFERENCES_TEXT_VIEW_FONT); + font_name = eel_preferences_get (NAUTILUS_PREFERENCES_TEXT_VIEW_FONT); g_return_if_fail (font_name != NULL); font = nautilus_font_factory_get_font_by_family (font_name, font_size); @@ -457,7 +457,7 @@ handle_ui_event (BonoboUIComponent *ui, { if (type == Bonobo_UIComponent_STATE_CHANGED && eel_str_is_equal (state, "1")) { - nautilus_preferences_set (NAUTILUS_PREFERENCES_TEXT_VIEW_FONT, id); + eel_preferences_set (NAUTILUS_PREFERENCES_TEXT_VIEW_FONT, id); } } diff --git a/components/throbber/nautilus-throbber.c b/components/throbber/nautilus-throbber.c index cce3dff0e..24132ac39 100644 --- a/components/throbber/nautilus-throbber.c +++ b/components/throbber/nautilus-throbber.c @@ -191,10 +191,10 @@ nautilus_throbber_destroy (GtkObject *object) nautilus_throbber_remove_update_callback (throbber); nautilus_throbber_unload_images (throbber); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, - nautilus_throbber_theme_changed, - object); - + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, + nautilus_throbber_theme_changed, + object); + if (throbber->details->property_bag) { bonobo_object_unref (BONOBO_OBJECT (throbber->details->property_bag)); } @@ -306,9 +306,9 @@ nautilus_throbber_initialize (NautilusThrobber *throbber) gtk_widget_show (widget); /* add a callback for when the theme changes */ - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_THEME, - nautilus_throbber_theme_changed, - throbber); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_THEME, + nautilus_throbber_theme_changed, + throbber); } /* allocate a new throbber */ diff --git a/components/tree/nautilus-tree-expansion-state.c b/components/tree/nautilus-tree-expansion-state.c index fac375d09..b7f073d3e 100644 --- a/components/tree/nautilus-tree-expansion-state.c +++ b/components/tree/nautilus-tree-expansion-state.c @@ -29,7 +29,7 @@ #include <eel/eel-glib-extensions.h> #include <eel/eel-gtk-macros.h> #include <eel/eel-string.h> -#include <libnautilus-private/nautilus-preferences.h> +#include <libnautilus-private/nautilus-global-preferences.h> struct NautilusTreeExpansionStateDetails { GHashTable *table; @@ -85,7 +85,7 @@ nautilus_tree_expansion_state_load_from_preferences (NautilusTreeExpansionState { EelStringList *uris; - uris = nautilus_preferences_get_string_list (NAUTILUS_PREFERENCES_TREE_VIEW_EXPANSION_STATE); + uris = eel_preferences_get_string_list (NAUTILUS_PREFERENCES_TREE_VIEW_EXPANSION_STATE); eel_string_list_for_each (uris, expansion_state_load_callback, expansion_state); eel_string_list_free (uris); @@ -124,7 +124,7 @@ nautilus_tree_expansion_state_save_to_preferences (NautilusTreeExpansionState *e glist = eel_g_str_list_alphabetize (glist); uris = eel_string_list_new_from_g_list (glist, TRUE); - nautilus_preferences_set_string_list (NAUTILUS_PREFERENCES_TREE_VIEW_EXPANSION_STATE, uris); + eel_preferences_set_string_list (NAUTILUS_PREFERENCES_TREE_VIEW_EXPANSION_STATE, uris); g_list_free (glist); eel_string_list_free (uris); } diff --git a/components/tree/nautilus-tree-view.c b/components/tree/nautilus-tree-view.c index 709ca6873..1982617b0 100644 --- a/components/tree/nautilus-tree-view.c +++ b/components/tree/nautilus-tree-view.c @@ -245,17 +245,17 @@ nautilus_tree_view_insert_model_node (NautilusTreeView *view, NautilusTreeNode * view->details->inserting_node = TRUE; EEL_CLIST_UNSET_FLAG (EEL_CLIST (view->details->tree), - CLIST_AUTO_SORT); + CLIST_AUTO_SORT); view_node = eel_ctree_insert_node (EEL_CTREE (view->details->tree), - parent_view_node, - NULL, - text, - TREE_SPACING, - closed_pixbuf, open_pixbuf, - ! nautilus_file_is_directory (file), - FALSE); + parent_view_node, + NULL, + text, + TREE_SPACING, + closed_pixbuf, open_pixbuf, + ! nautilus_file_is_directory (file), + FALSE); EEL_CLIST_SET_FLAG (EEL_CLIST (view->details->tree), - CLIST_AUTO_SORT); + CLIST_AUTO_SORT); view->details->inserting_node = FALSE; gdk_pixbuf_unref (closed_pixbuf); @@ -263,8 +263,8 @@ nautilus_tree_view_insert_model_node (NautilusTreeView *view, NautilusTreeNode * eel_ctree_node_set_row_data (EEL_CTREE (view->details->tree), - view_node, - node); + view_node, + node); g_assert (g_hash_table_lookup (view->details->file_to_node_map, file) == NULL); @@ -279,13 +279,13 @@ nautilus_tree_view_insert_model_node (NautilusTreeView *view, NautilusTreeNode * if (!ctree_is_node_expanded (EEL_CTREE (view->details->tree), view_node)) { eel_ctree_expand (EEL_CTREE (view->details->tree), - view_node); + view_node); } } else { if (ctree_is_node_expanded (EEL_CTREE (view->details->tree), view_node)) { eel_ctree_collapse (EEL_CTREE (view->details->tree), - view_node); + view_node); } } } @@ -317,7 +317,7 @@ forget_view_node (NautilusTreeView *view, forget_unparented_node (view, node); eel_ctree_node_set_row_data (EEL_CTREE (view->details->tree), - view_node, NULL); + view_node, NULL); g_hash_table_remove (view->details->file_to_node_map, file); nautilus_file_unref (file); @@ -367,12 +367,12 @@ nautilus_tree_view_remove_model_node (NautilusTreeView *view, NautilusTreeNode * * Note that it would be better to remove the expansion * state of the children, but that breaks renaming.. */ - uri = map_view_node_to_uri (view, view_node); - nautilus_tree_expansion_state_remove_node (view->details->expansion_state, uri); + uri = map_view_node_to_uri (view, view_node); + nautilus_tree_expansion_state_remove_node (view->details->expansion_state, uri); forget_view_node_and_children (view, view_node); eel_ctree_remove_node (EEL_CTREE (view->details->tree), - view_node); + view_node); } nautilus_tree_model_stop_monitoring_node (view->details->model, node, view); @@ -440,14 +440,14 @@ nautilus_tree_view_update_model_node (NautilusTreeView *view, NautilusTreeNode * name = nautilus_file_get_name (file); eel_ctree_set_node_info (EEL_CTREE (view->details->tree), - view_node, - name, - TREE_SPACING, - closed_pixbuf, - open_pixbuf, - ! nautilus_file_is_directory (file), - ctree_is_node_expanded (EEL_CTREE (view->details->tree), - view_node)); + view_node, + name, + TREE_SPACING, + closed_pixbuf, + open_pixbuf, + ! nautilus_file_is_directory (file), + ctree_is_node_expanded (EEL_CTREE (view->details->tree), + view_node)); g_free (name); @@ -463,13 +463,13 @@ nautilus_tree_view_update_model_node (NautilusTreeView *view, NautilusTreeNode * if (!ctree_is_node_expanded (EEL_CTREE (view->details->tree), view_node)) { eel_ctree_expand (EEL_CTREE (view->details->tree), - view_node); + view_node); } } else { if (ctree_is_node_expanded (EEL_CTREE (view->details->tree), view_node)) { eel_ctree_collapse (EEL_CTREE (view->details->tree), - view_node); + view_node); } } @@ -604,11 +604,11 @@ get_selected_row_position (EelCTree *ctree) clist = EEL_CLIST (ctree); selected_row = get_selected_row (ctree); if (eel_clist_row_is_visible (clist, - selected_row) == GTK_VISIBILITY_NONE) { + selected_row) == GTK_VISIBILITY_NONE) { return -1; } if (!eel_clist_get_selection_info (clist, 0, 0, - &top_row, &column)) { + &top_row, &column)) { return -1; } return selected_row - top_row; @@ -811,13 +811,13 @@ filtering_changed_callback (gpointer callback_data) view = NAUTILUS_TREE_VIEW (callback_data); view->details->show_hidden_files = - nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES); + eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES); view->details->show_backup_files = - nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES); + eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES); view->details->show_non_directories = - ! nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES); + ! eel_preferences_get_boolean (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES); /* Reload the whole tree so that the filtering changes take place. */ @@ -833,7 +833,7 @@ update_smooth_graphics_mode (NautilusTreeView *view) gboolean aa_mode, old_aa_mode; if (view->details->tree != NULL) { - aa_mode = nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE); + aa_mode = eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE); old_aa_mode = is_anti_aliased (view); if (old_aa_mode != aa_mode) { @@ -935,15 +935,15 @@ create_tree (NautilusTreeView *view) * to using the standard clist comparison function (a strcmp) */ eel_clist_set_compare_func (EEL_CLIST (view->details->tree), - ctree_compare_rows); + ctree_compare_rows); eel_clist_set_column_auto_resize (EEL_CLIST (view->details->tree), 0, TRUE); eel_clist_columns_autosize (EEL_CLIST (view->details->tree)); eel_clist_set_reorderable (EEL_CLIST (view->details->tree), FALSE); eel_clist_set_row_height (EEL_CLIST (view->details->tree), - MAX (NAUTILUS_ICON_SIZE_FOR_MENUS, - view->details->tree->style->font->ascent - + view->details->tree->style->font->descent)); + MAX (NAUTILUS_ICON_SIZE_FOR_MENUS, + view->details->tree->style->font->ascent + + view->details->tree->style->font->descent)); eel_ctree_set_indent (EEL_CTREE (view->details->tree), 12); gtk_signal_connect (GTK_OBJECT (view->details->tree), @@ -967,19 +967,19 @@ create_tree (NautilusTreeView *view) view); /* Keep track of changes in these prefs to filter files accordingly. */ - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, - filtering_changed_callback, - view); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES, - filtering_changed_callback, - view); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES, - filtering_changed_callback, - view); - - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, - smooth_graphics_mode_changed_callback, - view); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, + filtering_changed_callback, + view); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES, + filtering_changed_callback, + view); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES, + filtering_changed_callback, + view); + + eel_preferences_add_callback (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, + smooth_graphics_mode_changed_callback, + view); view->details->file_to_node_map = g_hash_table_new (NULL, NULL); view->details->view_node_to_uri_map = g_hash_table_new (NULL, NULL); @@ -1037,13 +1037,13 @@ nautilus_tree_view_initialize (NautilusTreeView *view) /* Obtain the filtering preferences */ view->details->show_hidden_files = - nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES); + eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES); view->details->show_backup_files = - nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES); + eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES); view->details->show_non_directories = - ! nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES); + ! eel_preferences_get_boolean (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES); gtk_signal_connect (GTK_OBJECT (view), "load_location", @@ -1117,19 +1117,19 @@ nautilus_tree_view_destroy (GtkObject *object) compare_cached_key = NULL; } - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, - filtering_changed_callback, - view); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES, - filtering_changed_callback, - view); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES, - filtering_changed_callback, - view); - - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, - smooth_graphics_mode_changed_callback, - view); + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, + filtering_changed_callback, + view); + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES, + filtering_changed_callback, + view); + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES, + filtering_changed_callback, + view); + + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, + smooth_graphics_mode_changed_callback, + view); g_hash_table_foreach (view->details->file_to_node_map, free_file_to_node_map_entry, @@ -1170,7 +1170,7 @@ file_to_view_node (NautilusTreeView *view, EelCTreeNode * nautilus_tree_view_model_node_to_view_node (NautilusTreeView *view, - NautilusTreeNode *node) + NautilusTreeNode *node) { EelCTreeNode *view_node; NautilusFile *file; @@ -1192,7 +1192,7 @@ nautilus_tree_view_node_to_model_node (NautilusTreeView *view, NautilusTreeNode *tree_node; tree_node = (NautilusTreeNode *) eel_ctree_node_get_row_data (EEL_CTREE (view->details->tree), - node); + node); return tree_node; } @@ -1310,13 +1310,13 @@ expand_uri_sequence_and_select_end (NautilusTreeView *view) if (!ctree_is_node_expanded (EEL_CTREE (view->details->tree), view_node)) { eel_ctree_expand (EEL_CTREE (view->details->tree), - view_node); + view_node); } } else { g_free (view->details->selected_uri); view->details->selected_uri = g_strdup (uri); eel_ctree_select (EEL_CTREE (view->details->tree), - view_node); + view_node); } } @@ -1362,7 +1362,7 @@ select_current_location (NautilusTreeView *view) * should be used here. */ if (eel_strcmp (view->details->current_main_view_uri, - view->details->selected_uri) == 0) { + view->details->selected_uri) == 0) { return; } diff --git a/libnautilus-private/Makefile.am b/libnautilus-private/Makefile.am index 759fe10f1..d5fd9725b 100644 --- a/libnautilus-private/Makefile.am +++ b/libnautilus-private/Makefile.am @@ -10,6 +10,7 @@ INCLUDES = \ $(NAUTILUS_PRIVATE_CFLAGS) \ $(ESD_CFLAGS) \ $(MEDUSA_CFLAGS) \ + $(LIBRSVG_CFLAGS) \ -DDATADIR=\""$(datadir)"\" \ -DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \ $(NULL) @@ -47,7 +48,6 @@ libnautilus_private_la_SOURCES = \ nautilus-bonobo-extensions.c \ nautilus-bookmark.c \ nautilus-customization-data.c \ - nautilus-dateedit-extensions.c \ nautilus-default-file-icon.c \ nautilus-directory-async.c \ nautilus-directory-background.c \ @@ -65,8 +65,6 @@ libnautilus_private_la_SOURCES = \ nautilus-file-utilities.c \ nautilus-file.c \ nautilus-font-factory.c \ - nautilus-gconf-extensions.c \ - nautilus-generous-bin.c \ nautilus-global-preferences.c \ nautilus-horizontal-splitter.c \ nautilus-icon-canvas-item.c \ @@ -84,11 +82,6 @@ libnautilus_private_la_SOURCES = \ nautilus-metafile.c \ nautilus-mime-actions.c \ nautilus-monitor.c \ - nautilus-preferences-box.c \ - nautilus-preferences-group.c \ - nautilus-preferences-item.c \ - nautilus-preferences-pane.c \ - nautilus-preferences.c \ nautilus-program-chooser.c \ nautilus-program-choosing.c \ nautilus-search-uri.c \ @@ -116,7 +109,6 @@ noinst_HEADERS = \ nautilus-bookmark.h \ nautilus-cdrom-extensions.h \ nautilus-customization-data.h \ - nautilus-dateedit-extensions.h \ nautilus-default-file-icon.h \ nautilus-directory-background.h \ nautilus-directory-metafile-monitor.h \ @@ -137,8 +129,6 @@ noinst_HEADERS = \ nautilus-file-utilities.h \ nautilus-file.h \ nautilus-font-factory.h \ - nautilus-gconf-extensions.h \ - nautilus-generous-bin.h \ nautilus-global-preferences.h \ nautilus-horizontal-splitter.h \ nautilus-icon-canvas-item.h \ @@ -160,11 +150,6 @@ noinst_HEADERS = \ nautilus-metafile.h \ nautilus-mime-actions.h \ nautilus-monitor.h \ - nautilus-preferences-box.h \ - nautilus-preferences-group.h \ - nautilus-preferences-item.h \ - nautilus-preferences-pane.h \ - nautilus-preferences.h \ nautilus-program-chooser.h \ nautilus-program-choosing.h \ nautilus-search-uri.h \ diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c index 5d76ca8f3..47085019f 100644 --- a/libnautilus-private/nautilus-directory-async.c +++ b/libnautilus-private/nautilus-directory-async.c @@ -679,13 +679,13 @@ static gboolean show_backup_files = TRUE; static void show_hidden_files_changed_callback (gpointer callback_data) { - show_hidden_files = nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES); + show_hidden_files = eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES); } static void show_backup_files_changed_callback (gpointer callback_data) { - show_backup_files = nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES); + show_backup_files = eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES); } static GnomeVFSDirectoryFilterOptions @@ -700,9 +700,9 @@ get_filter_options_for_directory_count (void) /* Add the callback once for the life of our process */ if (!show_hidden_files_changed_callback_installed) { - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, - show_hidden_files_changed_callback, - NULL); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, + show_hidden_files_changed_callback, + NULL); show_hidden_files_changed_callback_installed = TRUE; /* Peek for the first time */ @@ -711,9 +711,9 @@ get_filter_options_for_directory_count (void) /* Add the callback once for the life of our process */ if (!show_backup_files_changed_callback_installed) { - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES, - show_backup_files_changed_callback, - NULL); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES, + show_backup_files_changed_callback, + NULL); show_backup_files_changed_callback_installed = TRUE; /* Peek for the first time */ diff --git a/libnautilus-private/nautilus-directory-background.c b/libnautilus-private/nautilus-directory-background.c index e58356504..9a28b6fdf 100644 --- a/libnautilus-private/nautilus-directory-background.c +++ b/libnautilus-private/nautilus-directory-background.c @@ -924,9 +924,9 @@ background_destroyed_callback (EelBackground *background, GTK_SIGNAL_FUNC (saved_settings_changed_callback), background); nautilus_file_monitor_remove (file, background); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, - nautilus_file_background_theme_changed, - background); + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, + nautilus_file_background_theme_changed, + background); } /* key routine that hooks up a background and location */ @@ -963,9 +963,9 @@ nautilus_connect_background_to_file_metadata (GtkWidget *widget, GTK_SIGNAL_FUNC (saved_settings_changed_callback), background); nautilus_file_monitor_remove (old_file, background); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, - nautilus_file_background_theme_changed, - background); + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, + nautilus_file_background_theme_changed, + background); } @@ -1003,8 +1003,8 @@ nautilus_connect_background_to_file_metadata (GtkWidget *widget, g_list_free (attributes); /* arrange for notification when the theme changes */ - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_THEME, - nautilus_file_background_theme_changed, background); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_THEME, + nautilus_file_background_theme_changed, background); } diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c index 7c9a25a81..a5ca85168 100644 --- a/libnautilus-private/nautilus-directory.c +++ b/libnautilus-private/nautilus-directory.c @@ -275,21 +275,21 @@ async_data_preference_changed_callback (gpointer callback_data) static void add_preferences_callbacks (void) { - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, - filtering_changed_callback, - NULL); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES, - filtering_changed_callback, - NULL); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_TEXT_IN_ICONS, - async_data_preference_changed_callback, - NULL); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS, - async_data_preference_changed_callback, - NULL); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_DEFAULT_SMOOTH_FONT, - async_data_preference_changed_callback, - NULL); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, + filtering_changed_callback, + NULL); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES, + filtering_changed_callback, + NULL); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_TEXT_IN_ICONS, + async_data_preference_changed_callback, + NULL); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS, + async_data_preference_changed_callback, + NULL); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_DEFAULT_SMOOTH_FONT, + async_data_preference_changed_callback, + NULL); } char * diff --git a/libnautilus-private/nautilus-entry.c b/libnautilus-private/nautilus-entry.c index a52ffa2e4..91bff7e56 100644 --- a/libnautilus-private/nautilus-entry.c +++ b/libnautilus-private/nautilus-entry.c @@ -66,7 +66,7 @@ emacs_shortcuts_preference_changed_callback (gpointer callback_data) entry = NAUTILUS_ENTRY (callback_data); entry->details->use_emacs_shortcuts = - nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_USE_EMACS_SHORTCUTS); + eel_preferences_get_boolean (NAUTILUS_PREFERENCES_USE_EMACS_SHORTCUTS); } static void @@ -84,9 +84,9 @@ nautilus_entry_initialize (NautilusEntry *entry) nautilus_undo_set_up_nautilus_entry_for_undo (entry); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_USE_EMACS_SHORTCUTS, - emacs_shortcuts_preference_changed_callback, - entry); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_USE_EMACS_SHORTCUTS, + emacs_shortcuts_preference_changed_callback, + entry); emacs_shortcuts_preference_changed_callback (entry); } @@ -114,10 +114,10 @@ nautilus_entry_destroy (GtkObject *object) entry = NAUTILUS_ENTRY (object); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_USE_EMACS_SHORTCUTS, - emacs_shortcuts_preference_changed_callback, - entry); - + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_USE_EMACS_SHORTCUTS, + emacs_shortcuts_preference_changed_callback, + entry); + g_free (entry->details); EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index 010af23f8..6c7b90c23 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -2214,7 +2214,7 @@ confirm_empty_trash (GtkWidget *parent_view) GtkWindow *parent_window; /* Just Say Yes if the preference says not to confirm. */ - if (!nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_CONFIRM_TRASH)) { + if (!eel_preferences_get_boolean (NAUTILUS_PREFERENCES_CONFIRM_TRASH)) { return TRUE; } diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c index a741438cc..a6f079e44 100644 --- a/libnautilus-private/nautilus-file-utilities.c +++ b/libnautilus-private/nautilus-file-utilities.c @@ -139,7 +139,7 @@ nautilus_get_desktop_directory (void) { char *desktop_directory; - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR)) { desktop_directory = g_strdup (g_get_home_dir()); } else { desktop_directory = nautilus_make_path (g_get_home_dir (), DESKTOP_DIRECTORY_NAME); diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c index 56a9ae6a2..134f0b597 100644 --- a/libnautilus-private/nautilus-file.c +++ b/libnautilus-private/nautilus-file.c @@ -2620,13 +2620,13 @@ static NautilusSpeedTradeoffValue show_text_in_icons; static void show_text_in_icons_changed_callback (gpointer callback_data) { - show_text_in_icons = nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_SHOW_TEXT_IN_ICONS); + show_text_in_icons = eel_preferences_get_integer (NAUTILUS_PREFERENCES_SHOW_TEXT_IN_ICONS); } static void show_directory_item_count_changed_callback (gpointer callback_data) { - show_directory_item_count = nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS); + show_directory_item_count = eel_preferences_get_integer (NAUTILUS_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS); } static gboolean @@ -2655,7 +2655,7 @@ nautilus_file_should_show_directory_item_count (NautilusFile *file) /* Add the callback once for the life of our process */ if (!show_directory_item_count_callback_added) { - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS, + eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS, show_directory_item_count_changed_callback, NULL); show_directory_item_count_callback_added = TRUE; @@ -2676,7 +2676,7 @@ nautilus_file_should_get_top_left_text (NautilusFile *file) /* Add the callback once for the life of our process */ if (!show_text_in_icons_callback_added) { - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_TEXT_IN_ICONS, + eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_TEXT_IN_ICONS, show_text_in_icons_changed_callback, NULL); show_text_in_icons_callback_added = TRUE; diff --git a/libnautilus-private/nautilus-font-factory.c b/libnautilus-private/nautilus-font-factory.c index 89fed7b62..7e6fbb552 100644 --- a/libnautilus-private/nautilus-font-factory.c +++ b/libnautilus-private/nautilus-font-factory.c @@ -280,8 +280,8 @@ nautilus_font_factory_get_font_from_preferences (guint size_in_pixels) * instance may yet exist when this is called. */ if (!icon_view_font_auto_value_registered) { - nautilus_preferences_add_auto_string (NAUTILUS_PREFERENCES_ICON_VIEW_FONT, - &icon_view_font_auto_value); + eel_preferences_add_auto_string (NAUTILUS_PREFERENCES_ICON_VIEW_FONT, + &icon_view_font_auto_value); icon_view_font_auto_value_registered = TRUE; } diff --git a/libnautilus-private/nautilus-global-preferences.c b/libnautilus-private/nautilus-global-preferences.c index 91b65e11e..ea9f38add 100644 --- a/libnautilus-private/nautilus-global-preferences.c +++ b/libnautilus-private/nautilus-global-preferences.c @@ -1,6 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* nautilus-prefs-dialog.c - Implementation for preferences dialog. +/* nautilus-global-preferences.c - Nautilus specific preference keys and + functions. Copyright (C) 1999, 2000, 2001 Eazel, Inc. @@ -46,7 +47,7 @@ #define STRING_LIST_DEFAULT_TOKENS_DELIMETER "," #define PREFERENCES_SORT_ORDER_MANUALLY 100 -/* base path for NAUTILUS_PREFERENCES_HTTP_* */ +/* Path for gnome-vfs preferences */ static const char SYSTEM_GNOME_VFS_PATH[] = "/system/gnome-vfs"; /* Forward declarations */ @@ -307,32 +308,32 @@ typedef struct static const PreferenceDefault preference_defaults[] = { { NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_CONFIRM_TRASH, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_ADVANCED, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, + EEL_USER_LEVEL_ADVANCED, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_ENABLE_DELETE, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_ADVANCED, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + EEL_USER_LEVEL_ADVANCED, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_SHOW_TEXT_IN_ICONS, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY) }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY) }, { USER_LEVEL_NONE }, "speed_tradeoff" }, @@ -342,216 +343,216 @@ static const PreferenceDefault preference_defaults[] = { */ { NAUTILUS_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY) }, - { NAUTILUS_USER_LEVEL_INTERMEDIATE, GINT_TO_POINTER (NAUTILUS_SPEED_TRADEOFF_ALWAYS) }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY) }, + { EEL_USER_LEVEL_INTERMEDIATE, GINT_TO_POINTER (NAUTILUS_SPEED_TRADEOFF_ALWAYS) }, "speed_tradeoff" }, { NAUTILUS_PREFERENCES_CLICK_POLICY, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY) }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY) }, { USER_LEVEL_NONE }, "click_policy" }, { NAUTILUS_PREFERENCES_EXECUTABLE_TEXT_ACTIVATION, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_ADVANCED, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_EXECUTABLE_TEXT_ASK) }, + EEL_USER_LEVEL_ADVANCED, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_EXECUTABLE_TEXT_ASK) }, { USER_LEVEL_NONE }, "executable_text_activation" }, { NAUTILUS_PREFERENCES_THEME, PREFERENCE_STRING, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, "default" }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, "default" }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY) }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY) }, { USER_LEVEL_NONE }, "speed_tradeoff" }, { NAUTILUS_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_ADVANCED, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (3145728) }, + EEL_USER_LEVEL_ADVANCED, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (3145728) }, { USER_LEVEL_NONE }, "file_size" }, { NAUTILUS_PREFERENCES_USE_PUBLIC_METADATA, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_ADVANCED, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY) }, + EEL_USER_LEVEL_ADVANCED, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY) }, { USER_LEVEL_NONE }, "speed_tradeoff" }, { NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_PREVIEW_SOUND, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY) }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_SPEED_TRADEOFF_LOCAL_ONLY) }, { USER_LEVEL_NONE }, "speed_tradeoff" }, { NAUTILUS_PREFERENCES_SHOW_SPECIAL_FLAGS, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_ADVANCED, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, - { NAUTILUS_USER_LEVEL_ADVANCED, GINT_TO_POINTER (TRUE) } + EEL_USER_LEVEL_ADVANCED, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + { EEL_USER_LEVEL_ADVANCED, GINT_TO_POINTER (TRUE) } }, { NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_SHOW_DESKTOP, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_ADVANCED, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + EEL_USER_LEVEL_ADVANCED, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_CAN_ADD_CONTENT, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, - { NAUTILUS_USER_LEVEL_INTERMEDIATE, GINT_TO_POINTER (TRUE) } + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + { EEL_USER_LEVEL_INTERMEDIATE, GINT_TO_POINTER (TRUE) } }, { NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_SIMPLE_SEARCH_BAR) }, - { NAUTILUS_USER_LEVEL_INTERMEDIATE, GINT_TO_POINTER (NAUTILUS_COMPLEX_SEARCH_BAR) }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_SIMPLE_SEARCH_BAR) }, + { EEL_USER_LEVEL_INTERMEDIATE, GINT_TO_POINTER (NAUTILUS_COMPLEX_SEARCH_BAR) }, "search_bar_type" }, { NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_ICON_VIEW_CAPTIONS, PREFERENCE_STRING_LIST, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, "size,date_modified,type", }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, "size,date_modified,type", }, { USER_LEVEL_NONE }, "icon_captions" }, { NAUTILUS_PREFERENCES_HIDE_BUILT_IN_BOOKMARKS, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_USE_EMACS_SHORTCUTS, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_ADVANCED, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + EEL_USER_LEVEL_ADVANCED, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, { USER_LEVEL_NONE } }, /* FIXME bugzilla.eazel.com 1245: Saved in pixels instead of in %? */ { NAUTILUS_PREFERENCES_SIDEBAR_WIDTH, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (148) }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (148) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_SEARCH_WEB_URI, PREFERENCE_STRING, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, "http://www.eazel.com/websearch" }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, "http://www.eazel.com/websearch" }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_START_WITH_TOOLBAR, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_START_WITH_STATUS_BAR, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_START_WITH_SIDEBAR, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, { USER_LEVEL_NONE } }, /* Proxy defaults */ { NAUTILUS_PREFERENCES_HTTP_USE_PROXY, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_HTTP_PROXY_PORT, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (8080) }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (8080) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_HTTP_PROXY_USE_AUTH, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, { USER_LEVEL_NONE } }, /* Home URI */ { NAUTILUS_PREFERENCES_HOME_URI, PREFERENCE_STRING, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, NULL, default_home_location_callback, g_free }, - { NAUTILUS_USER_LEVEL_INTERMEDIATE, NULL, default_home_location_callback, g_free }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, NULL, default_home_location_callback, g_free }, + { EEL_USER_LEVEL_INTERMEDIATE, NULL, default_home_location_callback, g_free }, }, /* Default fonts */ { NAUTILUS_PREFERENCES_DEFAULT_FONT, PREFERENCE_STRING, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, NULL, default_font_callback, g_free }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, NULL, default_font_callback, g_free }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_DEFAULT_SMOOTH_FONT, PREFERENCE_STRING, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, NULL, default_smooth_font_callback, g_free }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, NULL, default_smooth_font_callback, g_free }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_DEFAULT_FONT_SIZE, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (12) }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (12) }, { USER_LEVEL_NONE }, "standard_font_size" }, @@ -559,8 +560,8 @@ static const PreferenceDefault preference_defaults[] = { /* View Preferences */ { NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, NULL, default_default_folder_viewer_callback, NULL }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, NULL, default_default_folder_viewer_callback, NULL }, { USER_LEVEL_NONE }, "default_folder_viewer" }, @@ -568,59 +569,59 @@ static const PreferenceDefault preference_defaults[] = { /* Icon View Default Preferences */ { NAUTILUS_PREFERENCES_ICON_VIEW_SMOOTH_FONT, PREFERENCE_STRING, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, NULL, default_smooth_font_callback, g_free }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, NULL, default_smooth_font_callback, g_free }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_ICON_VIEW_FONT, PREFERENCE_STRING, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, NULL, default_font_callback, g_free }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, NULL, default_font_callback, g_free }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL_FONT_SIZE, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (12) }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (12) }, { USER_LEVEL_NONE }, "standard_font_size" }, { NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_FILE_SORT_BY_NAME) }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_FILE_SORT_BY_NAME) }, { USER_LEVEL_NONE }, "default_icon_view_sort_order" }, { NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER_OR_MANUAL_LAYOUT, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_FILE_SORT_BY_NAME) }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_FILE_SORT_BY_NAME) }, { USER_LEVEL_NONE }, "default_icon_view_sort_order" }, { NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_TIGHTER_LAYOUT, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_MANUAL_LAYOUT, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_ZOOM_LEVEL_STANDARD) }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_ZOOM_LEVEL_STANDARD) }, { USER_LEVEL_NONE }, "default_zoom_level" }, @@ -628,34 +629,34 @@ static const PreferenceDefault preference_defaults[] = { /* List View Default Preferences */ { NAUTILUS_PREFERENCES_LIST_VIEW_FONT, PREFERENCE_STRING, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, NULL, default_font_callback, g_free }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, NULL, default_font_callback, g_free }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL_FONT_SIZE, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (12) }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (12) }, { USER_LEVEL_NONE }, "standard_font_size" }, { NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_ORDER, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_FILE_SORT_BY_NAME) }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_FILE_SORT_BY_NAME) }, { USER_LEVEL_NONE }, "default_list_view_sort_order" }, { NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_ZOOM_LEVEL_SMALLER) }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (NAUTILUS_ZOOM_LEVEL_SMALLER) }, { USER_LEVEL_NONE }, "default_zoom_level" }, @@ -663,45 +664,45 @@ static const PreferenceDefault preference_defaults[] = { /* Sidebar panel default */ { nautilus_sidebar_news_enabled_preference_name, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, { USER_LEVEL_NONE } }, { nautilus_sidebar_notes_enabled_preference_name, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, { USER_LEVEL_NONE } }, { nautilus_sidebar_help_enabled_preference_name, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, { USER_LEVEL_NONE } }, { nautilus_sidebar_history_enabled_preference_name, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (TRUE) }, { USER_LEVEL_NONE } }, { nautilus_sidebar_tree_enabled_preference_name, PREFERENCE_BOOLEAN, - NAUTILUS_USER_LEVEL_INTERMEDIATE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, - { NAUTILUS_USER_LEVEL_INTERMEDIATE, GINT_TO_POINTER (TRUE) } + EEL_USER_LEVEL_INTERMEDIATE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (FALSE) }, + { EEL_USER_LEVEL_INTERMEDIATE, GINT_TO_POINTER (TRUE) } }, /* news panel preferences */ { NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (6) }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (6) }, { USER_LEVEL_NONE } }, { NAUTILUS_PREFERENCES_NEWS_UPDATE_INTERVAL, PREFERENCE_INTEGER, - NAUTILUS_USER_LEVEL_NOVICE, - { NAUTILUS_USER_LEVEL_NOVICE, GINT_TO_POINTER (5) }, + EEL_USER_LEVEL_NOVICE, + { EEL_USER_LEVEL_NOVICE, GINT_TO_POINTER (5) }, { USER_LEVEL_NONE } }, @@ -730,8 +731,8 @@ global_preferences_register_enumerations (void) if (eel_strlen (preference_defaults[i].enumeration_id) > 0) { g_assert (preference_defaults[i].type == PREFERENCE_INTEGER || preference_defaults[i].type == PREFERENCE_STRING_LIST); - nautilus_preferences_set_enumeration_id (preference_defaults[i].name, - preference_defaults[i].enumeration_id); + eel_preferences_set_enumeration_id (preference_defaults[i].name, + preference_defaults[i].enumeration_id); } } } @@ -762,30 +763,30 @@ global_preferences_install_one_default (const char *preference_name, switch (preference_type) { case PREFERENCE_BOOLEAN: - nautilus_preferences_default_set_boolean (preference_name, - user_level_default->user_level, - GPOINTER_TO_INT (value)); + eel_preferences_default_set_boolean (preference_name, + user_level_default->user_level, + GPOINTER_TO_INT (value)); break; case PREFERENCE_INTEGER: - nautilus_preferences_default_set_integer (preference_name, - user_level_default->user_level, - GPOINTER_TO_INT (value)); + eel_preferences_default_set_integer (preference_name, + user_level_default->user_level, + GPOINTER_TO_INT (value)); break; case PREFERENCE_STRING: - nautilus_preferences_default_set_string (preference_name, - user_level_default->user_level, - value); + eel_preferences_default_set_string (preference_name, + user_level_default->user_level, + value); break; case PREFERENCE_STRING_LIST: string_list_value = eel_string_list_new_from_tokens (value, STRING_LIST_DEFAULT_TOKENS_DELIMETER, TRUE); - nautilus_preferences_default_set_string_list (preference_name, - user_level_default->user_level, - string_list_value); + eel_preferences_default_set_string_list (preference_name, + user_level_default->user_level, + string_list_value); eel_string_list_free (string_list_value); break; @@ -824,15 +825,15 @@ global_preferences_install_defaults (void) preference_defaults[i].type, &preference_defaults[i].default2); - nautilus_preferences_set_visible_user_level (preference_defaults[i].name, - preference_defaults[i].visible_user_level); + eel_preferences_set_visible_user_level (preference_defaults[i].name, + preference_defaults[i].visible_user_level); } } static gpointer default_font_callback (int user_level) { - g_return_val_if_fail (nautilus_preferences_user_level_is_valid (user_level), NULL); + g_return_val_if_fail (eel_preferences_user_level_is_valid (user_level), NULL); if (eel_dumb_down_for_multi_byte_locale_hack ()) { return g_strdup ("fixed"); @@ -844,7 +845,7 @@ default_font_callback (int user_level) static gpointer default_smooth_font_callback (int user_level) { - g_return_val_if_fail (nautilus_preferences_user_level_is_valid (user_level), NULL); + g_return_val_if_fail (eel_preferences_user_level_is_valid (user_level), NULL); return eel_font_manager_get_default_font (); } @@ -888,16 +889,16 @@ default_home_location_callback (int user_level) char *default_home_location; char *user_main_directory; - g_return_val_if_fail (nautilus_preferences_user_level_is_valid (user_level), NULL); + g_return_val_if_fail (eel_preferences_user_level_is_valid (user_level), NULL); - if (user_level == NAUTILUS_USER_LEVEL_NOVICE) { + if (user_level == EEL_USER_LEVEL_NOVICE) { user_main_directory = nautilus_get_user_main_directory (); default_home_location = gnome_vfs_get_uri_from_local_path (user_main_directory); g_free (user_main_directory); return default_home_location; } - if (user_level == NAUTILUS_USER_LEVEL_INTERMEDIATE) { + if (user_level == EEL_USER_LEVEL_INTERMEDIATE) { return gnome_vfs_get_uri_from_local_path (g_get_home_dir ()); } @@ -985,7 +986,7 @@ smooth_graphics_mode_changed_callback (gpointer callback_data) { gboolean is_smooth; - is_smooth = nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE); + is_smooth = eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE); eel_smooth_widget_global_set_is_smooth (is_smooth); } @@ -1007,7 +1008,7 @@ default_folder_viewer_changed_callback (gpointer callback_data) g_assert (callback_data == NULL); preference_value = - nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER); + eel_preferences_get_integer (NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER); if (preference_value == NAUTILUS_DEFAULT_FOLDER_VIEWER_LIST_VIEW) { viewer_iid = NAUTILUS_LIST_VIEW_IID; @@ -1035,8 +1036,8 @@ nautilus_global_preferences_set_default_folder_viewer (const char *iid) return; } - nautilus_preferences_set_integer (NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER, - viewer_preference); + eel_preferences_set_integer (NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER, + viewer_preference); } /* The icon view uses 2 variables to store the sort order and @@ -1053,10 +1054,10 @@ default_icon_view_sort_order_or_manual_layout_changed_callback (gpointer callbac int default_sort_order; default_sort_order_or_manual_layout = - nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER_OR_MANUAL_LAYOUT); + eel_preferences_get_integer (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER_OR_MANUAL_LAYOUT); - nautilus_preferences_set_boolean (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_MANUAL_LAYOUT, - default_sort_order_or_manual_layout == PREFERENCES_SORT_ORDER_MANUALLY); + eel_preferences_set_boolean (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_MANUAL_LAYOUT, + default_sort_order_or_manual_layout == PREFERENCES_SORT_ORDER_MANUALLY); if (default_sort_order_or_manual_layout != PREFERENCES_SORT_ORDER_MANUALLY) { default_sort_order = default_sort_order_or_manual_layout; @@ -1064,8 +1065,8 @@ default_icon_view_sort_order_or_manual_layout_changed_callback (gpointer callbac g_return_if_fail (default_sort_order >= NAUTILUS_FILE_SORT_BY_NAME); g_return_if_fail (default_sort_order <= NAUTILUS_FILE_SORT_BY_EMBLEMS); - nautilus_preferences_set_integer (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER, - default_sort_order); + eel_preferences_set_integer (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER, + default_sort_order); } } @@ -1080,7 +1081,7 @@ nautilus_global_preferences_initialize (void) initialized = TRUE; - nautilus_preferences_initialize ("/apps/nautilus"); + eel_preferences_initialize ("/apps/nautilus"); /* Install defaults */ global_preferences_install_defaults (); @@ -1088,25 +1089,25 @@ nautilus_global_preferences_initialize (void) global_preferences_register_enumerations (); /* Add the gnome-vfs path to the list of monitored directories - for proxy settings */ - nautilus_preferences_monitor_directory (SYSTEM_GNOME_VFS_PATH); + eel_preferences_monitor_directory (SYSTEM_GNOME_VFS_PATH); /* Set up storage for values accessed in this file */ - nautilus_preferences_add_auto_string (NAUTILUS_PREFERENCES_ICON_VIEW_SMOOTH_FONT, - &icon_view_smooth_font_auto_value); - nautilus_preferences_add_auto_string (NAUTILUS_PREFERENCES_DEFAULT_SMOOTH_FONT, - &default_smooth_font_auto_value); - - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, - smooth_graphics_mode_changed_callback, - NULL); + eel_preferences_add_auto_string (NAUTILUS_PREFERENCES_ICON_VIEW_SMOOTH_FONT, + &icon_view_smooth_font_auto_value); + eel_preferences_add_auto_string (NAUTILUS_PREFERENCES_DEFAULT_SMOOTH_FONT, + &default_smooth_font_auto_value); + + eel_preferences_add_callback (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, + smooth_graphics_mode_changed_callback, + NULL); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER, - default_folder_viewer_changed_callback, - NULL); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER, + default_folder_viewer_changed_callback, + NULL); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER_OR_MANUAL_LAYOUT, - default_icon_view_sort_order_or_manual_layout_changed_callback, - NULL); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER_OR_MANUAL_LAYOUT, + default_icon_view_sort_order_or_manual_layout_changed_callback, + NULL); /* Keep track of smooth graphics mode changes in order to notify the smooth * widget machinery. diff --git a/libnautilus-private/nautilus-global-preferences.h b/libnautilus-private/nautilus-global-preferences.h index b45e22243..e180edc9a 100644 --- a/libnautilus-private/nautilus-global-preferences.h +++ b/libnautilus-private/nautilus-global-preferences.h @@ -1,6 +1,7 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* nautilus-global-prefs.h - Nautilus main preferences api. +/* nautilus-global-preferences.h - Nautilus specific preference keys and + functions. Copyright (C) 1999, 2000, 2001 Eazel, Inc. @@ -25,7 +26,7 @@ #ifndef NAUTILUS_PREFS_GLOBAL_H #define NAUTILUS_PREFS_GLOBAL_H -#include <libnautilus-private/nautilus-preferences.h> +#include <eel/eel-preferences.h> BEGIN_GNOME_DECLS @@ -150,9 +151,6 @@ enum /* searching */ #define NAUTILUS_PREFERENCES_SEARCH_WEB_URI "preferences/search_web_uri" - - - enum { NAUTILUS_CLICK_POLICY_SINGLE, @@ -189,6 +187,7 @@ typedef enum /* Gnome session management */ #define NAUTILUS_PREFERENCES_ADD_TO_SESSION "preferences/add_to_session" + void nautilus_global_preferences_initialize (void); /* Sidebar */ @@ -196,7 +195,7 @@ struct EelScalableFont *nautilus_global_preferences_get_icon_view_smooth_font struct EelScalableFont *nautilus_global_preferences_get_default_smooth_font (void); struct EelScalableFont *nautilus_global_preferences_get_default_smooth_bold_font (void); -void nautilus_global_preferences_set_default_folder_viewer (const char *iid); +void nautilus_global_preferences_set_default_folder_viewer (const char *iid); END_GNOME_DECLS diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c index 6d7c18d0f..1b52995bc 100644 --- a/libnautilus-private/nautilus-icon-canvas-item.c +++ b/libnautilus-private/nautilus-icon-canvas-item.c @@ -287,7 +287,7 @@ nautilus_icon_canvas_item_initialize_class (NautilusIconCanvasItemClass *class) item_class->bounds = nautilus_icon_canvas_item_bounds; item_class->event = nautilus_icon_canvas_item_event; - nautilus_preferences_add_auto_integer (NAUTILUS_PREFERENCES_CLICK_POLICY, + eel_preferences_add_auto_integer (NAUTILUS_PREFERENCES_CLICK_POLICY, &click_policy_auto_value); } diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c index fbfce2692..630416049 100644 --- a/libnautilus-private/nautilus-icon-container.c +++ b/libnautilus-private/nautilus-icon-container.c @@ -2333,7 +2333,7 @@ destroy (GtkObject *object) /* FIXME: The code to extract colors from the theme should be in FMDirectoryView, not here. * The NautilusIconContainer class should simply provide calls to set the colors. */ - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, nautilus_icon_container_theme_changed, container); @@ -3311,7 +3311,7 @@ nautilus_icon_container_initialize_class (NautilusIconContainerClass *class) stipple = gdk_bitmap_create_from_data (NULL, stipple_bits, 2, 2); - nautilus_preferences_add_auto_integer (NAUTILUS_PREFERENCES_CLICK_POLICY, + eel_preferences_add_auto_integer (NAUTILUS_PREFERENCES_CLICK_POLICY, &click_policy_auto_value); } @@ -3386,7 +3386,7 @@ nautilus_icon_container_initialize (NautilusIconContainer *container) */ /* read in theme-dependent data */ nautilus_icon_container_theme_changed (container); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_THEME, nautilus_icon_container_theme_changed, container); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_THEME, nautilus_icon_container_theme_changed, container); } typedef struct { diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c index fbc6c6e53..b317c1f5e 100644 --- a/libnautilus-private/nautilus-icon-factory.c +++ b/libnautilus-private/nautilus-icon-factory.c @@ -287,10 +287,10 @@ EEL_DEFINE_CLASS_BOILERPLATE (NautilusIconFactory, static void destroy_icon_factory (void) { - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, icon_theme_changed_callback, NULL); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT, + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT, thumbnail_limit_changed_callback, NULL); gtk_object_unref (GTK_OBJECT (global_icon_factory)); @@ -307,12 +307,12 @@ get_icon_factory (void) gtk_object_sink (GTK_OBJECT (global_icon_factory)); icon_theme_changed_callback (NULL); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_THEME, + eel_preferences_add_callback (NAUTILUS_PREFERENCES_THEME, icon_theme_changed_callback, NULL); thumbnail_limit_changed_callback (NULL); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT, + eel_preferences_add_callback (NAUTILUS_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT, thumbnail_limit_changed_callback, NULL); @@ -1180,7 +1180,7 @@ icon_theme_changed_callback (gpointer user_data) /* Consult the user preference and the Nautilus theme. In the * long run, we sould just get rid of the user preference. */ - theme_preference = nautilus_preferences_get (NAUTILUS_PREFERENCES_THEME); + theme_preference = eel_preferences_get (NAUTILUS_PREFERENCES_THEME); icon_theme = nautilus_theme_get_theme_data ("icons", "icon_theme"); set_theme (icon_theme == NULL ? theme_preference : icon_theme); @@ -1192,7 +1192,7 @@ icon_theme_changed_callback (gpointer user_data) static void thumbnail_limit_changed_callback (gpointer user_data) { - cached_thumbnail_limit = nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT); + cached_thumbnail_limit = eel_preferences_get_integer (NAUTILUS_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT); /* Tell the world that icons might have changed. We could invent a narrower-scope * signal to mean only "thumbnails might have changed" if this ends up being slow @@ -1390,7 +1390,7 @@ should_display_image_file_as_itself (NautilusFile *file, gboolean optimized_for_ static gboolean show_thumbnail_auto_value_registered; if (!show_thumbnail_auto_value_registered) { - nautilus_preferences_add_auto_integer (NAUTILUS_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS, + eel_preferences_add_auto_integer (NAUTILUS_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS, &show_thumbnails_auto_value); show_thumbnail_auto_value_registered = TRUE; } @@ -2593,7 +2593,7 @@ embed_text (GdkPixbuf *pixbuf_without_text, if (embedded_text_preferences_callbacks_added == FALSE) { embedded_text_preferences_callbacks_added = TRUE; - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_DEFAULT_SMOOTH_FONT, + eel_preferences_add_callback (NAUTILUS_PREFERENCES_DEFAULT_SMOOTH_FONT, embedded_text_font_changed_callback, GINT_TO_POINTER (TRUE)); embedded_text_font_changed_callback (GINT_TO_POINTER (FALSE)); diff --git a/libnautilus-private/nautilus-lib-self-check-functions.h b/libnautilus-private/nautilus-lib-self-check-functions.h index fcc53e5df..7bbdfce48 100644 --- a/libnautilus-private/nautilus-lib-self-check-functions.h +++ b/libnautilus-private/nautilus-lib-self-check-functions.h @@ -39,7 +39,6 @@ void nautilus_run_lib_self_checks (void); */ #define NAUTILUS_LIB_FOR_EACH_SELF_CHECK_FUNCTION(macro) \ - macro (nautilus_self_check_preferences) \ macro (nautilus_self_check_search_uri) \ macro (nautilus_self_check_file_utilities) \ macro (nautilus_self_check_file_operations) \ diff --git a/libnautilus-private/nautilus-link-set.c b/libnautilus-private/nautilus-link-set.c index 1edb038af..3d92eab27 100644 --- a/libnautilus-private/nautilus-link-set.c +++ b/libnautilus-private/nautilus-link-set.c @@ -27,11 +27,10 @@ #include "nautilus-file-utilities.h" #include "nautilus-file.h" -#include <eel/eel-glib-extensions.h> #include "nautilus-global-preferences.h" #include "nautilus-link.h" #include "nautilus-metadata.h" -#include "nautilus-preferences.h" +#include <eel/eel-glib-extensions.h> #include <eel/eel-string.h> #include <eel/eel-xml-extensions.h> #include <gnome-xml/parser.h> diff --git a/libnautilus-private/nautilus-metafile.c b/libnautilus-private/nautilus-metafile.c index eac730a09..1df4b2f2f 100644 --- a/libnautilus-private/nautilus-metafile.c +++ b/libnautilus-private/nautilus-metafile.c @@ -1677,7 +1677,7 @@ can_use_public_metafile (NautilusMetafile *metafile) return FALSE; } - preference_value = nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_USE_PUBLIC_METADATA); + preference_value = eel_preferences_get_integer (NAUTILUS_PREFERENCES_USE_PUBLIC_METADATA); if (preference_value == NAUTILUS_SPEED_TRADEOFF_ALWAYS) { return TRUE; diff --git a/libnautilus-private/nautilus-sidebar-functions.c b/libnautilus-private/nautilus-sidebar-functions.c index e285d674e..f456d6056 100644 --- a/libnautilus-private/nautilus-sidebar-functions.c +++ b/libnautilus-private/nautilus-sidebar-functions.c @@ -25,11 +25,10 @@ #include <config.h> #include "nautilus-sidebar-functions.h" +#include "nautilus-global-preferences.h" +#include "nautilus-view-identifier.h" #include <eel/eel-glib-extensions.h> -#include "nautilus-preferences.h" #include <eel/eel-string.h> -#include "nautilus-view-identifier.h" - #include <liboaf/liboaf.h> #define PREFERENCES_SIDEBAR_PANEL_PREFIX "sidebar-panels" @@ -80,7 +79,7 @@ sidebar_is_sidebar_panel_enabled (NautilusViewIdentifier *panel_identifier) key = sidebar_panel_make_preference_key (panel_identifier->iid); g_return_val_if_fail (key != NULL, FALSE); - enabled = nautilus_preferences_get_boolean (key); + enabled = eel_preferences_get_boolean (key); g_free (key); return enabled; diff --git a/libnautilus-private/nautilus-sound.c b/libnautilus-private/nautilus-sound.c index 80535dfa8..b8d3374c0 100644 --- a/libnautilus-private/nautilus-sound.c +++ b/libnautilus-private/nautilus-sound.c @@ -35,7 +35,7 @@ #endif #include <esd.h> -#include "nautilus-gconf-extensions.h" +#include <eel/eel-gconf-extensions.h> #include "nautilus-sound.h" /* Keep track of the sound playing process */ @@ -49,7 +49,7 @@ kill_sound_if_necessary (void) pid_t sound_process; /* fetch the sound state */ - sound_process = nautilus_gconf_get_integer (CURRENT_SOUND_STATE_KEY); + sound_process = eel_gconf_get_integer (CURRENT_SOUND_STATE_KEY); /* if there was a sound playing, kill it */ if (sound_process > 0) { @@ -63,8 +63,8 @@ kill_sound_if_necessary (void) void nautilus_sound_initialize (void) { - nautilus_gconf_set_integer (CURRENT_SOUND_STATE_KEY, 0); - nautilus_gconf_suggest_sync (); + eel_gconf_set_integer (CURRENT_SOUND_STATE_KEY, 0); + eel_gconf_suggest_sync (); } /* if there is a sound registered, kill it, and register the empty sound */ @@ -75,8 +75,8 @@ nautilus_sound_kill_sound (void) kill_sound_if_necessary (); /* set the process state to quiescent */ - nautilus_gconf_set_integer (CURRENT_SOUND_STATE_KEY, 0); - nautilus_gconf_suggest_sync (); + eel_gconf_set_integer (CURRENT_SOUND_STATE_KEY, 0); + eel_gconf_suggest_sync (); } /* register a new sound process, including kill any old one if necessary */ @@ -87,8 +87,8 @@ nautilus_sound_register_sound (pid_t sound_process) kill_sound_if_necessary (); /* record the new sound process ID */ - nautilus_gconf_set_integer (CURRENT_SOUND_STATE_KEY, sound_process); - nautilus_gconf_suggest_sync (); + eel_gconf_set_integer (CURRENT_SOUND_STATE_KEY, sound_process); + eel_gconf_suggest_sync (); } /* This function does two things. First it checks to see a sound is currently playing. If it is, @@ -102,7 +102,7 @@ nautilus_sound_can_play_sound (void) int sound_process, open_result; /* first see if there's already one in progress; if so, return true */ - sound_process = nautilus_gconf_get_integer (CURRENT_SOUND_STATE_KEY); + sound_process = eel_gconf_get_integer (CURRENT_SOUND_STATE_KEY); if (sound_process > 0) { return TRUE; } diff --git a/libnautilus-private/nautilus-theme.c b/libnautilus-private/nautilus-theme.c index 8263cb4c2..c3aea05ef 100644 --- a/libnautilus-private/nautilus-theme.c +++ b/libnautilus-private/nautilus-theme.c @@ -29,21 +29,20 @@ #include "nautilus-file.h" #include "nautilus-global-preferences.h" #include "nautilus-metadata.h" -#include "nautilus-preferences.h" -#include <eel/eel-glib-extensions.h> #include <eel/eel-gdk-pixbuf-extensions.h> +#include <eel/eel-glib-extensions.h> #include <eel/eel-string-list.h> #include <eel/eel-string.h> #include <eel/eel-vfs-extensions.h> #include <eel/eel-xml-extensions.h> #include <gnome-xml/parser.h> #include <gnome-xml/xmlmemory.h> -#include <libgnome/gnome-util.h> -#include <libgnomevfs/gnome-vfs.h> -#include <librsvg/rsvg.h> #include <libgnome/gnome-defs.h> #include <libgnome/gnome-i18n.h> #include <libgnome/gnome-util.h> +#include <libgnome/gnome-util.h> +#include <libgnomevfs/gnome-vfs.h> +#include <librsvg/rsvg.h> /* static globals to hold the last accessed and default theme files */ static char *last_theme_name = NULL; @@ -59,7 +58,7 @@ static void theme_changed_callback (gpointer callback_data) { g_free (theme_from_preferences); - theme_from_preferences = nautilus_preferences_get (NAUTILUS_PREFERENCES_THEME); + theme_from_preferences = eel_preferences_get (NAUTILUS_PREFERENCES_THEME); } /* return the current theme by asking the preferences machinery */ @@ -70,7 +69,7 @@ nautilus_theme_get_theme (void) /* Add the callback once for the life of our process */ if (!theme_changed_callback_installed) { - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_THEME, + eel_preferences_add_callback (NAUTILUS_PREFERENCES_THEME, theme_changed_callback, NULL); theme_changed_callback_installed = TRUE; @@ -90,7 +89,7 @@ nautilus_theme_set_theme (const char *new_theme) old_theme = nautilus_theme_get_theme (); if (eel_strcmp (old_theme, new_theme)) { - nautilus_preferences_set (NAUTILUS_PREFERENCES_THEME, new_theme); + eel_preferences_set (NAUTILUS_PREFERENCES_THEME, new_theme); } g_free (old_theme); } diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c index a8892938c..b3df8ae50 100644 --- a/src/file-manager/fm-desktop-icon-view.c +++ b/src/file-manager/fm-desktop-icon-view.c @@ -240,7 +240,7 @@ fm_desktop_icon_view_destroy (GtkObject *object) /* Delete all of the link files. */ delete_all_mount_links (); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_HOME_URI, + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_HOME_URI, home_uri_changed, icon_view); @@ -641,7 +641,7 @@ fm_desktop_icon_view_initialize (FMDesktopIconView *desktop_icon_view) GTK_SIGNAL_FUNC (icon_view_handle_uri_list), desktop_icon_view); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_HOME_URI, + eel_preferences_add_callback (NAUTILUS_PREFERENCES_HOME_URI, home_uri_changed, desktop_icon_view); @@ -980,7 +980,7 @@ update_home_link_and_delete_copies (void) */ home_link_name = g_strdup_printf (_("%s's Home"), g_get_user_name ()); - home_uri = nautilus_preferences_get (NAUTILUS_PREFERENCES_HOME_URI); + home_uri = eel_preferences_get (NAUTILUS_PREFERENCES_HOME_URI); if (!update_link_and_delete_copies (nautilus_link_local_is_home_link, NULL, @@ -1262,7 +1262,7 @@ real_update_menus (FMDirectoryView *view) DESKTOP_COMMAND_EMPTY_TRASH_CONDITIONAL, !include_empty_trash); if (include_empty_trash) { - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_CONFIRM_TRASH)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_CONFIRM_TRASH)) { label = g_strdup (_("Empty Trash...")); } else { label = g_strdup (_("Empty Trash")); diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 35f9fce6b..3486b6c8f 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -1086,7 +1086,7 @@ sort_directories_first_changed_callback (gpointer callback_data) view = FM_DIRECTORY_VIEW (callback_data); preference_value = - nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST); + eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST); if (preference_value != view->details->sort_directories_first) { view->details->sort_directories_first = preference_value; @@ -1207,7 +1207,7 @@ fm_directory_view_initialize (FMDirectoryView *view) BONOBO_OBJECT (view->details->zoomable)); view->details->sort_directories_first = - nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST); + eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST); gtk_signal_connect (GTK_OBJECT (view->details->nautilus_view), "stop_loading", @@ -1253,34 +1253,34 @@ fm_directory_view_initialize (FMDirectoryView *view) filtering_changed_callback (view); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW, + eel_preferences_add_callback (NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW, schedule_update_menus_callback, view); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, + eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, filtering_changed_callback, view); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES, + eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES, filtering_changed_callback, view); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_CONFIRM_TRASH, + eel_preferences_add_callback (NAUTILUS_PREFERENCES_CONFIRM_TRASH, schedule_update_menus_callback, view); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_ENABLE_DELETE, + eel_preferences_add_callback (NAUTILUS_PREFERENCES_ENABLE_DELETE, schedule_update_menus_callback, view); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_ICON_VIEW_CAPTIONS, + eel_preferences_add_callback (NAUTILUS_PREFERENCES_ICON_VIEW_CAPTIONS, text_attribute_names_changed_callback, view); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS, + eel_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS, image_display_policy_changed_callback, view); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_CLICK_POLICY, + eel_preferences_add_callback (NAUTILUS_PREFERENCES_CLICK_POLICY, click_policy_changed_callback, view); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, + eel_preferences_add_callback (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, smooth_graphics_mode_changed_callback, view); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST, + eel_preferences_add_callback (NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST, sort_directories_first_changed_callback, view); } @@ -1329,28 +1329,28 @@ fm_directory_view_destroy (GtkObject *object) fm_directory_view_ignore_hidden_file_preferences (view); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW, + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW, schedule_update_menus_callback, view); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_CONFIRM_TRASH, + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_CONFIRM_TRASH, schedule_update_menus_callback, view); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_ENABLE_DELETE, + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_ENABLE_DELETE, schedule_update_menus_callback, view); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_ICON_VIEW_CAPTIONS, + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_ICON_VIEW_CAPTIONS, text_attribute_names_changed_callback, view); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS, + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS, image_display_policy_changed_callback, view); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_CLICK_POLICY, + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_CLICK_POLICY, click_policy_changed_callback, view); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, smooth_graphics_mode_changed_callback, view); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST, + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST, sort_directories_first_changed_callback, view); @@ -4356,7 +4356,7 @@ get_executable_text_file_action (FMDirectoryView *view, NautilusFile *file) g_assert (nautilus_file_contains_text (file)); - preferences_value = nautilus_preferences_get_integer + preferences_value = eel_preferences_get_integer (NAUTILUS_PREFERENCES_EXECUTABLE_TEXT_ACTIVATION); switch (preferences_value) { case NAUTILUS_EXECUTABLE_TEXT_LAUNCH: @@ -5215,13 +5215,13 @@ filtering_changed_callback (gpointer callback_data) directory_view = FM_DIRECTORY_VIEW (callback_data); filtering_actually_changed = FALSE; - new_show_hidden = nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES); + new_show_hidden = eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES); if (new_show_hidden != directory_view->details->show_hidden_files) { filtering_actually_changed = TRUE; directory_view->details->show_hidden_files = new_show_hidden ; } - new_show_backup = nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES); + new_show_backup = eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES); if (new_show_backup != directory_view->details->show_backup_files) { filtering_actually_changed = TRUE; directory_view->details->show_backup_files = new_show_backup; @@ -5243,10 +5243,10 @@ fm_directory_view_ignore_hidden_file_preferences (FMDirectoryView *view) return; } - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, filtering_changed_callback, view); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES, + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES, filtering_changed_callback, view); @@ -5618,10 +5618,10 @@ fm_directory_view_initialize_class (FMDirectoryViewClass *klass) clipboard_atom = gdk_atom_intern ("CLIPBOARD", FALSE); copied_files_atom = gdk_atom_intern ("x-special/gnome-copied-files", FALSE); - nautilus_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_CONFIRM_TRASH, + eel_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_CONFIRM_TRASH, &confirm_trash_auto_value); - nautilus_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_ENABLE_DELETE, + eel_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_ENABLE_DELETE, &show_delete_command_auto_value); - nautilus_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW, + eel_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW, &use_new_window_auto_value); } diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c index ea8262215..4a01af523 100644 --- a/src/file-manager/fm-icon-view.c +++ b/src/file-manager/fm-icon-view.c @@ -617,7 +617,7 @@ get_default_sort_order (void) if (auto_storaged_added == FALSE) { auto_storaged_added = TRUE; - nautilus_preferences_add_auto_integer (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER, + eel_preferences_add_auto_integer (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER, (int *) &default_sort_order); } @@ -687,7 +687,7 @@ get_default_sort_in_reverse_order (void) if (auto_storaged_added == FALSE) { auto_storaged_added = TRUE; - nautilus_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER, + eel_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER, &default_sort_in_reverse_order); } @@ -739,7 +739,7 @@ get_default_directory_manual_layout (void) if (auto_storaged_added == FALSE) { auto_storaged_added = TRUE; - nautilus_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_MANUAL_LAYOUT, + eel_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_MANUAL_LAYOUT, &default_directory_manual_layout); } @@ -811,7 +811,7 @@ get_default_directory_tighter_layout (void) if (auto_storaged_added == FALSE) { auto_storaged_added = TRUE; - nautilus_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_TIGHTER_LAYOUT, + eel_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_TIGHTER_LAYOUT, &default_directory_tighter_layout); } @@ -935,7 +935,7 @@ get_default_zoom_level (void) if (!auto_storage_added) { auto_storage_added = TRUE; - nautilus_preferences_add_auto_integer (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL, + eel_preferences_add_auto_integer (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL, (int *) &default_zoom_level); } @@ -1126,7 +1126,7 @@ fm_icon_view_get_icon_text_attributes_from_preferences (void) static const EelStringList *attributes; if (attributes == NULL) { - nautilus_preferences_add_auto_string_list (NAUTILUS_PREFERENCES_ICON_VIEW_CAPTIONS, + eel_preferences_add_auto_string_list (NAUTILUS_PREFERENCES_ICON_VIEW_CAPTIONS, &attributes); } @@ -2303,7 +2303,7 @@ fm_icon_view_initialize_class (FMIconViewClass *klass) klass->set_directory_tighter_layout = fm_icon_view_real_set_directory_tighter_layout; klass->supports_auto_layout = real_supports_auto_layout; - nautilus_preferences_add_auto_integer (NAUTILUS_PREFERENCES_PREVIEW_SOUND, + eel_preferences_add_auto_integer (NAUTILUS_PREFERENCES_PREVIEW_SOUND, &preview_sound_auto_value); } @@ -2319,35 +2319,35 @@ fm_icon_view_initialize (FMIconView *icon_view) icon_view->details->audio_preview_file = NULL; create_icon_container (icon_view); - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_ICON_VIEW_FONT, + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_ICON_VIEW_FONT, font_changed_callback, icon_view, GTK_OBJECT (icon_view)); - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_ICON_VIEW_SMOOTH_FONT, + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_ICON_VIEW_SMOOTH_FONT, smooth_font_changed_callback, icon_view, GTK_OBJECT (icon_view)); - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL_FONT_SIZE, + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL_FONT_SIZE, default_zoom_level_font_size_changed_callback, icon_view, GTK_OBJECT (icon_view)); - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER, + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER, default_sort_order_changed_callback, icon_view, GTK_OBJECT (icon_view)); - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER, + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER, default_sort_in_reverse_order_changed_callback, icon_view, GTK_OBJECT (icon_view)); - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_TIGHTER_LAYOUT, + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_TIGHTER_LAYOUT, default_use_tighter_layout_changed_callback, icon_view, GTK_OBJECT (icon_view)); - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_MANUAL_LAYOUT, + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_MANUAL_LAYOUT, default_use_manual_layout_changed_callback, icon_view, GTK_OBJECT (icon_view)); - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL, + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL, default_zoom_level_changed_callback, icon_view, GTK_OBJECT (icon_view)); @@ -2414,7 +2414,7 @@ get_default_zoom_level_font_size (void) if (auto_storaged_added == FALSE) { auto_storaged_added = TRUE; - nautilus_preferences_add_auto_integer (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL_FONT_SIZE, + eel_preferences_add_auto_integer (NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL_FONT_SIZE, &default_zoom_level_font_size); } @@ -2504,7 +2504,7 @@ fm_icon_view_update_click_mode (FMIconView *icon_view) icon_container = get_icon_container (icon_view); g_assert (icon_container != NULL); - click_mode = nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_CLICK_POLICY); + click_mode = eel_preferences_get_integer (NAUTILUS_PREFERENCES_CLICK_POLICY); nautilus_icon_container_set_single_click_mode (icon_container, @@ -2520,7 +2520,7 @@ fm_icon_view_update_smooth_graphics_mode (FMIconView *icon_view) icon_container = get_icon_container (icon_view); g_assert (icon_container != NULL); - smooth_graphics_mode = nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE); + smooth_graphics_mode = eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE); nautilus_icon_container_set_anti_aliased_mode (icon_container, smooth_graphics_mode); } diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index 0582dc313..7de4b0ff6 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -250,9 +250,9 @@ fm_list_view_initialize_class (gpointer klass) fm_list_view_class->get_default_sort_attribute = real_get_default_sort_attribute; fm_list_view_class->file_still_belongs = real_file_still_belongs; - nautilus_preferences_add_auto_integer (NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_ORDER, + eel_preferences_add_auto_integer (NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_ORDER, (int *) &default_sort_order_auto_value); - nautilus_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER, + eel_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER, &default_sort_reversed_auto_value); } @@ -280,23 +280,23 @@ fm_list_view_initialize (gpointer object, gpointer klass) update_icons, GTK_OBJECT (list_view)); - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_LIST_VIEW_FONT, + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_LIST_VIEW_FONT, font_or_font_size_changed_callback, list_view, GTK_OBJECT (list_view)); - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_ORDER, + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_ORDER, default_sort_criteria_changed_callback, list_view, GTK_OBJECT (list_view)); - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL, + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL, default_zoom_level_changed_callback, list_view, GTK_OBJECT (list_view)); - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER, + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER, default_sort_criteria_changed_callback, list_view, GTK_OBJECT (list_view)); - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL_FONT_SIZE, + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL_FONT_SIZE, font_or_font_size_changed_callback, list_view, GTK_OBJECT (list_view)); @@ -978,7 +978,7 @@ fm_list_view_update_smooth_graphics_mode (FMDirectoryView *directory_view) g_assert (list != NULL); old_smooth_graphics_mode = eel_list_is_anti_aliased (list); - smooth_graphics_mode = nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE); + smooth_graphics_mode = eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE); if (old_smooth_graphics_mode != smooth_graphics_mode) { eel_list_set_anti_aliased_mode (list, smooth_graphics_mode); @@ -1071,8 +1071,8 @@ fm_list_view_update_font (FMListView *list_view) g_return_if_fail (FM_IS_LIST_VIEW (list_view)); - font_name = nautilus_preferences_get (NAUTILUS_PREFERENCES_LIST_VIEW_FONT); - standard_font_size = nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL_FONT_SIZE); + font_name = eel_preferences_get (NAUTILUS_PREFERENCES_LIST_VIEW_FONT); + standard_font_size = eel_preferences_get_integer (NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL_FONT_SIZE); font_size = standard_font_size + font_size_delta_table[list_view->details->zoom_level]; @@ -1393,7 +1393,7 @@ get_default_zoom_level (void) if (auto_storaged_added == FALSE) { auto_storaged_added = TRUE; - nautilus_preferences_add_auto_integer (NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL, + eel_preferences_add_auto_integer (NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL, (int *) &default_zoom_level); } @@ -2167,7 +2167,7 @@ fm_list_view_update_click_mode (FMDirectoryView *view) g_assert (FM_IS_LIST_VIEW (view)); g_assert (get_list (FM_LIST_VIEW (view)) != NULL); - click_mode = nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_CLICK_POLICY); + click_mode = eel_preferences_get_integer (NAUTILUS_PREFERENCES_CLICK_POLICY); eel_list_set_single_click_mode (get_list (FM_LIST_VIEW (view)), click_mode == NAUTILUS_CLICK_POLICY_SINGLE); diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c index 1118db262..c958feb27 100644 --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -1280,7 +1280,7 @@ append_directory_contents_fields (FMPropertiesWindow *window, window->details->directory_contents_row = last_row; update_visibility_of_item_count_fields (window); - nautilus_preferences_add_callback_while_alive + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS, update_visibility_of_item_count_fields_wrapper, window, @@ -1866,7 +1866,7 @@ update_visibility_of_special_flags_widgets (FMPropertiesWindow *window) { update_visibility_of_table_rows (window->details->permissions_table, - nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_SPECIAL_FLAGS), + eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_SPECIAL_FLAGS), window->details->first_special_flags_row, window->details->num_special_flags_rows, window->details->special_flags_widgets); @@ -1899,7 +1899,7 @@ append_special_execution_flags (FMPropertiesWindow *window, ++window->details->num_special_flags_rows; update_visibility_of_special_flags_widgets (window); - nautilus_preferences_add_callback_while_alive + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_SHOW_SPECIAL_FLAGS, update_visibility_of_special_flags_widgets_wrapper, window, diff --git a/src/file-manager/nautilus-indexing-info.c b/src/file-manager/nautilus-indexing-info.c index 6738444e7..8c625acf0 100644 --- a/src/file-manager/nautilus-indexing-info.c +++ b/src/file-manager/nautilus-indexing-info.c @@ -38,7 +38,6 @@ #include <eel/eel-gtk-extensions.h> #include <eel/eel-label.h> #include <libnautilus-private/nautilus-medusa-support.h> -#include <libnautilus-private/nautilus-preferences.h> #include <eel/eel-stock-dialogs.h> #ifdef HAVE_MEDUSA diff --git a/src/nautilus-application.c b/src/nautilus-application.c index ef41ea48b..60a4e9189 100644 --- a/src/nautilus-application.c +++ b/src/nautilus-application.c @@ -576,19 +576,19 @@ nautilus_application_startup (NautilusApplication *application, } else if (restart_shell) { Nautilus_Shell_restart (shell, &ev); } else { - if (!no_desktop && nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_DESKTOP)) { + if (!no_desktop && eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_DESKTOP)) { Nautilus_Shell_start_desktop (shell, &ev); } /* Monitor the preference to show or hide the desktop */ - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_SHOW_DESKTOP, + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_SHOW_DESKTOP, desktop_changed_callback, application, GTK_OBJECT (application)); /* Monitor the preference to have the desktop */ /* point to the Unix home folder */ - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR, + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR, desktop_location_changed_callback, NULL, GTK_OBJECT (application)); @@ -754,7 +754,7 @@ desktop_changed_callback (gpointer user_data) NautilusApplication *application; application = NAUTILUS_APPLICATION (user_data); - if ( nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_DESKTOP)) { + if ( eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_DESKTOP)) { nautilus_application_open_desktop (application); } else { nautilus_application_close_desktop (); @@ -944,7 +944,7 @@ static void update_session (gpointer callback_data) { set_session_restart (callback_data, - nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_ADD_TO_SESSION) + eel_preferences_get_boolean (NAUTILUS_PREFERENCES_ADD_TO_SESSION) /* Only ever add ourselves to the session * if we have a desktop window. Prevents the * session thrashing that's seen otherwise @@ -967,7 +967,7 @@ init_session (void) (GtkSignalFunc) removed_from_session, NULL); - nautilus_preferences_add_callback + eel_preferences_add_callback (NAUTILUS_PREFERENCES_ADD_TO_SESSION, update_session, client); diff --git a/src/nautilus-first-time-druid.c b/src/nautilus-first-time-druid.c index fe6e425c8..63a8dda63 100644 --- a/src/nautilus-first-time-druid.c +++ b/src/nautilus-first-time-druid.c @@ -227,7 +227,7 @@ druid_finished (GtkWidget *druid_page) druid_set_first_time_file_flag (); /* Do the user level config */ - nautilus_preferences_set_user_level (current_user_level); + eel_preferences_set_user_level (current_user_level); /* Here we check to see if we can resolve hostnames in a timely * fashion. If we can't then we silently tell nautilus to start up @@ -242,7 +242,7 @@ druid_finished (GtkWidget *druid_page) check_network_connectivity (); } - signup_uris[0] = nautilus_preferences_get (NAUTILUS_PREFERENCES_HOME_URI); + signup_uris[0] = eel_preferences_get (NAUTILUS_PREFERENCES_HOME_URI); if (http_is_known_to_work) { signup_uris[1] = EAZEL_SERVICES_URL; @@ -301,7 +301,7 @@ static void update_draw_desktop_checkbox_state (void) { #ifdef TRANSITIONAL_NAUTILUS - if (current_user_level == NAUTILUS_USER_LEVEL_NOVICE) { + if (current_user_level == EEL_USER_LEVEL_NOVICE) { gtk_widget_hide (draw_desktop_checkbox_widget); } else { gtk_widget_show (draw_desktop_checkbox_widget); @@ -422,7 +422,7 @@ make_hbox_user_level_radio_button (int index, GtkWidget *radio_buttons[], hbox = gtk_hbox_new (FALSE, 0); - user_level_name = nautilus_preferences_get_user_level_name_for_display (index); + user_level_name = eel_preferences_get_user_level_name_for_display (index); /* make new box for radiobutton/comment */ comment_vbox = gtk_vbox_new (FALSE, 0); @@ -517,7 +517,7 @@ set_up_user_level_page (NautilusDruidPageEazel *page) message = g_strdup_printf (_("For users who have no previous experience with GNOME\n" "and %s."), operating_system_name); - hbox = make_hbox_user_level_radio_button (NAUTILUS_USER_LEVEL_NOVICE, radio_buttons, "novice.png", + hbox = make_hbox_user_level_radio_button (EEL_USER_LEVEL_NOVICE, radio_buttons, "novice.png", message, NULL); g_free (message); @@ -525,7 +525,7 @@ set_up_user_level_page (NautilusDruidPageEazel *page) message = g_strdup_printf (_("For users who are comfortable with GNOME and %s,\n" "but don't describe themselves as ``technical.''"), operating_system_name); - hbox = make_hbox_user_level_radio_button (NAUTILUS_USER_LEVEL_INTERMEDIATE, + hbox = make_hbox_user_level_radio_button (EEL_USER_LEVEL_INTERMEDIATE, radio_buttons, "intermediate.png", message, @@ -535,7 +535,7 @@ set_up_user_level_page (NautilusDruidPageEazel *page) message = g_strdup_printf (_("For users who have GNOME and %s experience, and\n" "like to see every detail of the operating system."), operating_system_name); - hbox = make_hbox_user_level_radio_button (NAUTILUS_USER_LEVEL_ADVANCED, + hbox = make_hbox_user_level_radio_button (EEL_USER_LEVEL_ADVANCED, radio_buttons, "expert.png", message, @@ -544,12 +544,12 @@ set_up_user_level_page (NautilusDruidPageEazel *page) g_free (operating_system_name); gtk_box_pack_start (GTK_BOX (main_box), hbox, FALSE, FALSE, 2); - g_assert (current_user_level >= NAUTILUS_USER_LEVEL_NOVICE - && current_user_level <= NAUTILUS_USER_LEVEL_ADVANCED); + g_assert (current_user_level >= EEL_USER_LEVEL_NOVICE + && current_user_level <= EEL_USER_LEVEL_ADVANCED); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radio_buttons[current_user_level]), TRUE); - for (index = NAUTILUS_USER_LEVEL_NOVICE; index <= NAUTILUS_USER_LEVEL_ADVANCED; index ++) { + for (index = EEL_USER_LEVEL_NOVICE; index <= EEL_USER_LEVEL_ADVANCED; index ++) { gtk_signal_connect (GTK_OBJECT (radio_buttons[index]), "toggled", GTK_SIGNAL_FUNC (user_level_selection_changed), @@ -1045,7 +1045,7 @@ nautilus_first_time_druid_show (NautilusApplication *application, const char *ur /* remember parameters for later window invocation */ save_application = application; - current_user_level = nautilus_preferences_get_user_level (); + current_user_level = eel_preferences_get_user_level (); dialog = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (dialog), @@ -1385,9 +1385,9 @@ set_http_proxy (const char *proxy_url) port = DEFAULT_HTTP_PROXY_PORT; } - nautilus_preferences_set (GNOME_VFS_PREFERENCES_HTTP_PROXY_HOST, http_proxy_host); - nautilus_preferences_set_integer (GNOME_VFS_PREFERENCES_HTTP_PROXY_PORT, port); - nautilus_preferences_set_boolean (GNOME_VFS_PREFERENCES_USE_HTTP_PROXY, TRUE); + eel_preferences_set (GNOME_VFS_PREFERENCES_HTTP_PROXY_HOST, http_proxy_host); + eel_preferences_set_integer (GNOME_VFS_PREFERENCES_HTTP_PROXY_PORT, port); + eel_preferences_set_boolean (GNOME_VFS_PREFERENCES_USE_HTTP_PROXY, TRUE); return TRUE; } diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c index 3c1585949..411281bfd 100644 --- a/src/nautilus-information-panel.c +++ b/src/nautilus-information-panel.c @@ -66,7 +66,6 @@ #include <libnautilus-private/nautilus-keep-last-vertical-box.h> #include <libnautilus-private/nautilus-metadata.h> #include <libnautilus-private/nautilus-mime-actions.h> -#include <libnautilus-private/nautilus-preferences.h> #include <libnautilus-private/nautilus-program-choosing.h> #include <libnautilus-private/nautilus-sidebar-functions.h> #include <libnautilus-private/nautilus-theme.h> @@ -202,7 +201,7 @@ nautilus_sidebar_initialize_class (GtkObjectClass *object_klass) gtk_object_class_add_signals (object_klass, signals, LAST_SIGNAL); - nautilus_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_CONFIRM_TRASH, + eel_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_CONFIRM_TRASH, &confirm_trash_auto_value); } @@ -285,7 +284,7 @@ nautilus_sidebar_initialize (GtkObject *object) make_button_box (sidebar); /* add a callback for when the theme changes */ - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_THEME, nautilus_sidebar_theme_changed, sidebar); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_THEME, nautilus_sidebar_theme_changed, sidebar); /* prepare ourselves to receive dropped objects */ gtk_drag_dest_set (GTK_WIDGET (sidebar), @@ -316,7 +315,7 @@ nautilus_sidebar_destroy (GtkObject *object) g_free (sidebar->details); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, nautilus_sidebar_theme_changed, sidebar); @@ -423,8 +422,8 @@ toggle_sidebar_panel (GtkWidget *widget, * become out of whack with the number of running sidebar * panels, for example when a panel crashes. */ - nautilus_preferences_set_boolean (preference_key, already_on); - nautilus_preferences_set_boolean (preference_key, !already_on); + eel_preferences_set_boolean (preference_key, already_on); + eel_preferences_set_boolean (preference_key, !already_on); } typedef struct @@ -457,7 +456,7 @@ sidebar_for_each_sidebar_panel (const char *name, * we dont need to create a menu item for it. */ panel_visible = any_panel_matches_iid (data->sidebar, iid); - if (!panel_visible && !nautilus_preferences_is_visible (preference_key)) { + if (!panel_visible && !eel_preferences_is_visible (preference_key)) { return; } @@ -1664,8 +1663,8 @@ nautilus_sidebar_size_allocate (GtkWidget *widget, if (widget->allocation.width != sidebar->details->old_width) { sidebar->details->old_width = widget->allocation.width; - nautilus_preferences_set_integer (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH, - widget->allocation.width); + eel_preferences_set_integer (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH, + widget->allocation.width); } } diff --git a/src/nautilus-link-set-window.c b/src/nautilus-link-set-window.c index f266e84a9..5f4bd77f5 100644 --- a/src/nautilus-link-set-window.c +++ b/src/nautilus-link-set-window.c @@ -29,6 +29,9 @@ #include "nautilus-link-set-window.h" #include "nautilus-window.h" +#include <eel/eel-glib-extensions.h> +#include <eel/eel-string.h> +#include <eel/eel-xml-extensions.h> #include <gnome-xml/parser.h> #include <gnome-xml/xmlmemory.h> #include <gtk/gtkcheckbutton.h> @@ -43,14 +46,10 @@ #include <libgnomeui/gnome-uidefs.h> #include <libgnomevfs/gnome-vfs.h> #include <libnautilus-private/nautilus-file.h> -#include <eel/eel-glib-extensions.h> #include <libnautilus-private/nautilus-global-preferences.h> #include <libnautilus-private/nautilus-link-set.h> #include <libnautilus-private/nautilus-link.h> #include <libnautilus-private/nautilus-metadata.h> -#include <libnautilus-private/nautilus-preferences.h> -#include <eel/eel-string.h> -#include <eel/eel-xml-extensions.h> #include <stdlib.h> /* global to hold the currently allocated link set window, if any */ diff --git a/src/nautilus-main.c b/src/nautilus-main.c index 3b79c9718..d4553971e 100644 --- a/src/nautilus-main.c +++ b/src/nautilus-main.c @@ -248,9 +248,9 @@ main (int argc, char *argv[]) if (!kill_shell) { nautilus_global_preferences_initialize (); if (no_desktop) { - nautilus_preferences_set_is_invisible + eel_preferences_set_is_invisible (NAUTILUS_PREFERENCES_SHOW_DESKTOP, TRUE); - nautilus_preferences_set_is_invisible + eel_preferences_set_is_invisible (NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR, TRUE); } } diff --git a/src/nautilus-navigation-bar.c b/src/nautilus-navigation-bar.c index e7302b626..7932338a1 100644 --- a/src/nautilus-navigation-bar.c +++ b/src/nautilus-navigation-bar.c @@ -27,14 +27,11 @@ */ #include <config.h> - -#include <string.h> -#include <gnome.h> - #include "nautilus-navigation-bar.h" -#include <gtk/gtksignal.h> #include <eel/eel-gtk-macros.h> +#include <gtk/gtksignal.h> +#include <string.h> enum { ACTIVATE, @@ -46,7 +43,7 @@ static guint signals[LAST_SIGNAL]; static void nautilus_navigation_bar_initialize_class (NautilusNavigationBarClass *class); static void nautilus_navigation_bar_initialize (NautilusNavigationBar *bar); -EEL_DEFINE_CLASS_BOILERPLATE (NautilusNavigationBar, nautilus_navigation_bar, NAUTILUS_TYPE_GENEROUS_BIN) +EEL_DEFINE_CLASS_BOILERPLATE (NautilusNavigationBar, nautilus_navigation_bar, EEL_TYPE_GENEROUS_BIN) EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_navigation_bar, get_location) EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_navigation_bar, set_location) diff --git a/src/nautilus-navigation-bar.h b/src/nautilus-navigation-bar.h index d4971380b..0e1b632e9 100644 --- a/src/nautilus-navigation-bar.h +++ b/src/nautilus-navigation-bar.h @@ -29,7 +29,7 @@ #ifndef NAUTILUS_NAVIGATION_BAR_H #define NAUTILUS_NAVIGATION_BAR_H -#include <libnautilus-private/nautilus-generous-bin.h> +#include <eel/eel-generous-bin.h> #define NAUTILUS_TYPE_NAVIGATION_BAR (nautilus_navigation_bar_get_type ()) #define NAUTILUS_NAVIGATION_BAR(obj) \ @@ -40,11 +40,11 @@ GTK_CHECK_TYPE (obj, NAUTILUS_TYPE_NAVIGATION_BAR) typedef struct { - NautilusGenerousBin parent; + EelGenerousBin parent; } NautilusNavigationBar; typedef struct { - NautilusGenerousBinClass parent_class; + EelGenerousBinClass parent_class; /* signals */ void (* location_changed) (NautilusNavigationBar *bar, diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c index a5df98a61..ecdc00b53 100644 --- a/src/nautilus-navigation-window-menus.c +++ b/src/nautilus-navigation-window-menus.c @@ -712,13 +712,13 @@ get_user_level_icon_name (int user_level, gboolean is_selected) char *full_image_name; switch (user_level) { - case NAUTILUS_USER_LEVEL_NOVICE: + case EEL_USER_LEVEL_NOVICE: image_name = "novice"; break; - case NAUTILUS_USER_LEVEL_ADVANCED: + case EEL_USER_LEVEL_ADVANCED: image_name = "expert"; break; - case NAUTILUS_USER_LEVEL_INTERMEDIATE: + case EEL_USER_LEVEL_INTERMEDIATE: default: image_name = "intermediate"; break; @@ -745,12 +745,12 @@ switch_to_user_level (NautilusWindow *window, int new_user_level) return; } - old_user_level = nautilus_preferences_get_user_level (); + old_user_level = eel_preferences_get_user_level (); if (new_user_level == old_user_level) { return; } - nautilus_preferences_set_user_level (new_user_level); + eel_preferences_set_user_level (new_user_level); nautilus_window_ui_freeze (window); @@ -1138,7 +1138,7 @@ refresh_bookmarks_menu (NautilusWindow *window) bonobo_ui_component_freeze (window->details->shell_ui, NULL); nautilus_window_remove_bookmarks_menu_items (window); - if (!nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_HIDE_BUILT_IN_BOOKMARKS)) { + if (!eel_preferences_get_boolean (NAUTILUS_PREFERENCES_HIDE_BUILT_IN_BOOKMARKS)) { append_static_bookmarks (window, MENU_PATH_BUILT_IN_BOOKMARKS_PLACEHOLDER); } @@ -1163,7 +1163,7 @@ nautilus_window_initialize_bookmarks_menu (NautilusWindow *window) /* Recreate static & dynamic part of menu if preference about * showing static bookmarks changes. */ - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_HIDE_BUILT_IN_BOOKMARKS, + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_HIDE_BUILT_IN_BOOKMARKS, nautilus_window_bookmarks_preference_changed_callback, window, GTK_OBJECT (window)); @@ -1216,7 +1216,7 @@ update_user_level_menu_item (NautilusWindow *window, return; } - current_user_level = nautilus_preferences_get_user_level (); + current_user_level = eel_preferences_get_user_level (); icon_name = get_user_level_icon_name (item_user_level, current_user_level == item_user_level); @@ -1242,13 +1242,13 @@ user_level_changed_callback (gpointer callback_data) update_user_level_menu_item (window, NAUTILUS_MENU_PATH_NOVICE_ITEM, - NAUTILUS_USER_LEVEL_NOVICE); + EEL_USER_LEVEL_NOVICE); update_user_level_menu_item (window, NAUTILUS_MENU_PATH_INTERMEDIATE_ITEM, - NAUTILUS_USER_LEVEL_INTERMEDIATE); + EEL_USER_LEVEL_INTERMEDIATE); update_user_level_menu_item (window, NAUTILUS_MENU_PATH_EXPERT_ITEM, - NAUTILUS_USER_LEVEL_ADVANCED); + EEL_USER_LEVEL_ADVANCED); } /** @@ -1331,7 +1331,7 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window) nautilus_window_update_show_hide_menu_items (window); /* Keep track of user level changes to update the user level menu item icons */ - nautilus_preferences_add_callback_while_alive ("user_level", + eel_preferences_add_callback_while_alive ("user_level", user_level_changed_callback, window, GTK_OBJECT (window)); @@ -1537,26 +1537,26 @@ convert_verb_to_user_level (const char *verb) g_assert (verb != NULL); if (strcmp (verb, SWITCH_TO_BEGINNER_VERB) == 0) { - return NAUTILUS_USER_LEVEL_NOVICE; + return EEL_USER_LEVEL_NOVICE; } else if (strcmp (verb, SWITCH_TO_INTERMEDIATE_VERB) == 0) { - return NAUTILUS_USER_LEVEL_INTERMEDIATE; + return EEL_USER_LEVEL_INTERMEDIATE; } else if (strcmp (verb, SWITCH_TO_ADVANCED_VERB) == 0) { - return NAUTILUS_USER_LEVEL_ADVANCED; + return EEL_USER_LEVEL_ADVANCED; } g_assert_not_reached (); - return NAUTILUS_USER_LEVEL_NOVICE; + return EEL_USER_LEVEL_NOVICE; } static const char * convert_user_level_to_path (guint user_level) { switch (user_level) { - case NAUTILUS_USER_LEVEL_NOVICE: + case EEL_USER_LEVEL_NOVICE: return NAUTILUS_MENU_PATH_NOVICE_ITEM; - case NAUTILUS_USER_LEVEL_INTERMEDIATE: + case EEL_USER_LEVEL_INTERMEDIATE: return NAUTILUS_MENU_PATH_INTERMEDIATE_ITEM; - case NAUTILUS_USER_LEVEL_ADVANCED: + case EEL_USER_LEVEL_ADVANCED: return NAUTILUS_MENU_PATH_EXPERT_ITEM; } diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c index a61866ec0..1b64840ad 100644 --- a/src/nautilus-navigation-window.c +++ b/src/nautilus-navigation-window.c @@ -46,6 +46,7 @@ #include <ctype.h> #include <eel/eel-gdk-extensions.h> #include <eel/eel-gdk-pixbuf-extensions.h> +#include <eel/eel-generous-bin.h> #include <eel/eel-gtk-extensions.h> #include <eel/eel-gtk-macros.h> #include <eel/eel-string.h> @@ -68,7 +69,6 @@ #include <libnautilus-private/nautilus-bonobo-extensions.h> #include <libnautilus-private/nautilus-drag-window.h> #include <libnautilus-private/nautilus-file-utilities.h> -#include <libnautilus-private/nautilus-generous-bin.h> #include <libnautilus-private/nautilus-global-preferences.h> #include <libnautilus-private/nautilus-horizontal-splitter.h> #include <libnautilus-private/nautilus-icon-factory.h> @@ -208,7 +208,7 @@ nautilus_window_for_each_sidebar_panel (const char *name, g_return_if_fail (preference_key != NULL); g_return_if_fail (NAUTILUS_IS_WINDOW (callback_data)); - nautilus_preferences_add_callback_while_alive (preference_key, + eel_preferences_add_callback_while_alive (preference_key, sidebar_panels_changed_callback, callback_data, GTK_OBJECT (callback_data)); @@ -741,7 +741,7 @@ nautilus_window_constructed (NautilusWindow *window) * for the desktop window. */ if (NAUTILUS_IS_DESKTOP_WINDOW (window)) { - window->content_hbox = gtk_widget_new (NAUTILUS_TYPE_GENEROUS_BIN, NULL); + window->content_hbox = gtk_widget_new (EEL_TYPE_GENEROUS_BIN, NULL); } else { set_initial_window_geometry (window); @@ -750,7 +750,7 @@ nautilus_window_constructed (NautilusWindow *window) /* FIXME bugzilla.eazel.com 1245: Saved in pixels instead of in %? */ /* FIXME bugzilla.eazel.com 1245: No reality check on the value? */ - sidebar_width = nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH); + sidebar_width = eel_preferences_get_integer (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH); e_paned_set_position (E_PANED (window->content_hbox), sidebar_width); } gtk_widget_show (window->content_hbox); @@ -1011,7 +1011,7 @@ nautilus_window_close (NautilusWindow *window) * we're in every-location-in-its-own-window mode. Otherwise it * would be too apparently random when the stored positions change. */ - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW)) { nautilus_window_save_geometry (window); } @@ -1700,7 +1700,7 @@ nautilus_window_go_web_search (NautilusWindow *window) nautilus_window_set_search_mode (window, FALSE); - search_web_uri = nautilus_preferences_get (NAUTILUS_PREFERENCES_SEARCH_WEB_URI); + search_web_uri = eel_preferences_get (NAUTILUS_PREFERENCES_SEARCH_WEB_URI); g_assert (search_web_uri != NULL); nautilus_window_go_to (window, search_web_uri); @@ -1714,7 +1714,7 @@ nautilus_window_go_home (NautilusWindow *window) nautilus_window_set_search_mode (window, FALSE); - home_uri = nautilus_preferences_get (NAUTILUS_PREFERENCES_HOME_URI); + home_uri = eel_preferences_get (NAUTILUS_PREFERENCES_HOME_URI); g_assert (home_uri != NULL); nautilus_window_go_to (window, home_uri); @@ -2242,25 +2242,25 @@ nautilus_window_show (GtkWidget *widget) /* Initially show or hide views based on preferences; once the window is displayed * these can be controlled on a per-window basis from View menu items. */ - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_TOOLBAR)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_TOOLBAR)) { nautilus_window_show_toolbar (window); } else { nautilus_window_hide_toolbar (window); } - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR)) { nautilus_window_show_location_bar (window); } else { nautilus_window_hide_location_bar (window); } - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_STATUS_BAR)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_STATUS_BAR)) { nautilus_window_show_status_bar (window); } else { nautilus_window_hide_status_bar (window); } - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_SIDEBAR)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_SIDEBAR)) { nautilus_window_show_sidebar (window); } else { nautilus_window_hide_sidebar (window); diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c index a61866ec0..1b64840ad 100644 --- a/src/nautilus-object-window.c +++ b/src/nautilus-object-window.c @@ -46,6 +46,7 @@ #include <ctype.h> #include <eel/eel-gdk-extensions.h> #include <eel/eel-gdk-pixbuf-extensions.h> +#include <eel/eel-generous-bin.h> #include <eel/eel-gtk-extensions.h> #include <eel/eel-gtk-macros.h> #include <eel/eel-string.h> @@ -68,7 +69,6 @@ #include <libnautilus-private/nautilus-bonobo-extensions.h> #include <libnautilus-private/nautilus-drag-window.h> #include <libnautilus-private/nautilus-file-utilities.h> -#include <libnautilus-private/nautilus-generous-bin.h> #include <libnautilus-private/nautilus-global-preferences.h> #include <libnautilus-private/nautilus-horizontal-splitter.h> #include <libnautilus-private/nautilus-icon-factory.h> @@ -208,7 +208,7 @@ nautilus_window_for_each_sidebar_panel (const char *name, g_return_if_fail (preference_key != NULL); g_return_if_fail (NAUTILUS_IS_WINDOW (callback_data)); - nautilus_preferences_add_callback_while_alive (preference_key, + eel_preferences_add_callback_while_alive (preference_key, sidebar_panels_changed_callback, callback_data, GTK_OBJECT (callback_data)); @@ -741,7 +741,7 @@ nautilus_window_constructed (NautilusWindow *window) * for the desktop window. */ if (NAUTILUS_IS_DESKTOP_WINDOW (window)) { - window->content_hbox = gtk_widget_new (NAUTILUS_TYPE_GENEROUS_BIN, NULL); + window->content_hbox = gtk_widget_new (EEL_TYPE_GENEROUS_BIN, NULL); } else { set_initial_window_geometry (window); @@ -750,7 +750,7 @@ nautilus_window_constructed (NautilusWindow *window) /* FIXME bugzilla.eazel.com 1245: Saved in pixels instead of in %? */ /* FIXME bugzilla.eazel.com 1245: No reality check on the value? */ - sidebar_width = nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH); + sidebar_width = eel_preferences_get_integer (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH); e_paned_set_position (E_PANED (window->content_hbox), sidebar_width); } gtk_widget_show (window->content_hbox); @@ -1011,7 +1011,7 @@ nautilus_window_close (NautilusWindow *window) * we're in every-location-in-its-own-window mode. Otherwise it * would be too apparently random when the stored positions change. */ - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW)) { nautilus_window_save_geometry (window); } @@ -1700,7 +1700,7 @@ nautilus_window_go_web_search (NautilusWindow *window) nautilus_window_set_search_mode (window, FALSE); - search_web_uri = nautilus_preferences_get (NAUTILUS_PREFERENCES_SEARCH_WEB_URI); + search_web_uri = eel_preferences_get (NAUTILUS_PREFERENCES_SEARCH_WEB_URI); g_assert (search_web_uri != NULL); nautilus_window_go_to (window, search_web_uri); @@ -1714,7 +1714,7 @@ nautilus_window_go_home (NautilusWindow *window) nautilus_window_set_search_mode (window, FALSE); - home_uri = nautilus_preferences_get (NAUTILUS_PREFERENCES_HOME_URI); + home_uri = eel_preferences_get (NAUTILUS_PREFERENCES_HOME_URI); g_assert (home_uri != NULL); nautilus_window_go_to (window, home_uri); @@ -2242,25 +2242,25 @@ nautilus_window_show (GtkWidget *widget) /* Initially show or hide views based on preferences; once the window is displayed * these can be controlled on a per-window basis from View menu items. */ - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_TOOLBAR)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_TOOLBAR)) { nautilus_window_show_toolbar (window); } else { nautilus_window_hide_toolbar (window); } - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR)) { nautilus_window_show_location_bar (window); } else { nautilus_window_hide_location_bar (window); } - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_STATUS_BAR)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_STATUS_BAR)) { nautilus_window_show_status_bar (window); } else { nautilus_window_hide_status_bar (window); } - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_SIDEBAR)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_SIDEBAR)) { nautilus_window_show_sidebar (window); } else { nautilus_window_hide_sidebar (window); diff --git a/src/nautilus-preferences-dialog.c b/src/nautilus-preferences-dialog.c index d69a7f900..64ccb153c 100644 --- a/src/nautilus-preferences-dialog.c +++ b/src/nautilus-preferences-dialog.c @@ -24,46 +24,45 @@ #include <config.h> #include "nautilus-preferences-dialog.h" -#include "nautilus-theme-selector.h" #include "libnautilus-private/nautilus-global-preferences.h" -#include "libnautilus-private/nautilus-preferences-box.h" #include "libnautilus-private/nautilus-sidebar-functions.h" +#include "nautilus-theme-selector.h" #include <eel/eel-gtk-extensions.h> +#include <eel/eel-preferences-box.h> +#include <gtk/gtksignal.h> #include <libgnome/gnome-i18n.h> #include <libgnome/gnome-util.h> -#include <gtk/gtksignal.h> /* * This file contains the description of the preferences dialog in * Nautilus. If you would like to add an item to the Nautilus * preference dialog, you might want to follow this procedure: * - * 1. Foo - * 2. bar + * 1. Info Coming Soon. * */ -static void preferences_dialog_populate_sidebar_tabs_group (NautilusPreferencesGroup *group); -static void preferences_dialog_populate_themes_group (NautilusPreferencesGroup *group); +static void preferences_dialog_populate_sidebar_tabs_group (EelPreferencesGroup *group); +static void preferences_dialog_populate_themes_group (EelPreferencesGroup *group); static GtkWidget *preferences_dialog; -static NautilusPreferencesItemDescription appearance_items[] = { +static EelPreferencesItemDescription appearance_items[] = { { N_("Smoother Graphics"), NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, N_("Use smoother (but slower) graphics"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN + EEL_PREFERENCE_ITEM_BOOLEAN }, { N_("Fonts"), NAUTILUS_PREFERENCES_DEFAULT_SMOOTH_FONT, N_("Default smooth font:"), - NAUTILUS_PREFERENCE_ITEM_SMOOTH_FONT, + EEL_PREFERENCE_ITEM_SMOOTH_FONT, }, { N_("Fonts"), NAUTILUS_PREFERENCES_DEFAULT_FONT, N_("Default non-smooth font:"), - NAUTILUS_PREFERENCE_ITEM_FONT, + EEL_PREFERENCE_ITEM_FONT, }, { N_("Nautilus Themes"), NULL, @@ -77,51 +76,51 @@ static NautilusPreferencesItemDescription appearance_items[] = { { NULL } }; -static NautilusPreferencesItemDescription windows_and_desktop_items[] = { +static EelPreferencesItemDescription windows_and_desktop_items[] = { { N_("Desktop"), NAUTILUS_PREFERENCES_SHOW_DESKTOP, N_("Use Nautilus to draw the desktop"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN + EEL_PREFERENCE_ITEM_BOOLEAN }, { N_("Desktop"), NAUTILUS_PREFERENCES_DESKTOP_IS_HOME_DIR, N_("Use your home folder as the desktop"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN + EEL_PREFERENCE_ITEM_BOOLEAN }, { N_("Opening New Windows"), NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW, N_("Open each file or folder in a separate window"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN + EEL_PREFERENCE_ITEM_BOOLEAN }, { N_("Opening New Windows"), NAUTILUS_PREFERENCES_START_WITH_TOOLBAR, N_("Display toolbar in new windows"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN + EEL_PREFERENCE_ITEM_BOOLEAN }, { N_("Opening New Windows"), NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR, N_("Display location bar in new windows"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN + EEL_PREFERENCE_ITEM_BOOLEAN }, { N_("Opening New Windows"), NAUTILUS_PREFERENCES_START_WITH_STATUS_BAR, N_("Display status bar in new windows"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN + EEL_PREFERENCE_ITEM_BOOLEAN }, { N_("Opening New Windows"), NAUTILUS_PREFERENCES_START_WITH_SIDEBAR, N_("Display sidebar in new windows"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN + EEL_PREFERENCE_ITEM_BOOLEAN }, { N_("Trash Behavior"), NAUTILUS_PREFERENCES_CONFIRM_TRASH, N_("Ask before emptying the Trash or deleting files"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN + EEL_PREFERENCE_ITEM_BOOLEAN }, { N_("Trash Behavior"), NAUTILUS_PREFERENCES_ENABLE_DELETE, N_("Include a Delete command that bypasses Trash"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN + EEL_PREFERENCE_ITEM_BOOLEAN }, /* FIXME: This group clearly doesn't belong in Windows & * Desktop, but there's no obviously-better place for it and @@ -130,51 +129,51 @@ static NautilusPreferencesItemDescription windows_and_desktop_items[] = { { N_("Keyboard Shortcuts"), NAUTILUS_PREFERENCES_USE_EMACS_SHORTCUTS, N_("Use Emacs-style keyboard shortcuts in text fields"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN + EEL_PREFERENCE_ITEM_BOOLEAN }, { NULL } }; -static NautilusPreferencesItemDescription directory_views_items[] = { +static EelPreferencesItemDescription directory_views_items[] = { { N_("Click Behavior"), NAUTILUS_PREFERENCES_CLICK_POLICY, N_("Click Behavior"), - NAUTILUS_PREFERENCE_ITEM_ENUMERATION_VERTICAL_RADIO + EEL_PREFERENCE_ITEM_ENUMERATION_VERTICAL_RADIO }, { N_("Executable Text Files"), NAUTILUS_PREFERENCES_EXECUTABLE_TEXT_ACTIVATION, N_("Executable Text Files"), - NAUTILUS_PREFERENCE_ITEM_ENUMERATION_VERTICAL_RADIO + EEL_PREFERENCE_ITEM_ENUMERATION_VERTICAL_RADIO }, { N_("Show/Hide Options"), NAUTILUS_PREFERENCES_SHOW_HIDDEN_FILES, N_("Show hidden files (file names start with \".\")"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN + EEL_PREFERENCE_ITEM_BOOLEAN }, { N_("Show/Hide Options"), NAUTILUS_PREFERENCES_SHOW_BACKUP_FILES, N_("Show backup files (file names end with \"~\")"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN + EEL_PREFERENCE_ITEM_BOOLEAN }, { N_("Show/Hide Options"), NAUTILUS_PREFERENCES_SHOW_SPECIAL_FLAGS, N_("Show special flags in Properties window"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN + EEL_PREFERENCE_ITEM_BOOLEAN }, { N_("Sorting Order"), NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST, N_("Always list folders before files"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN + EEL_PREFERENCE_ITEM_BOOLEAN }, { NULL } }; -static NautilusPreferencesItemDescription icon_captions_items[] = { +static EelPreferencesItemDescription icon_captions_items[] = { { N_("Icon Captions"), NAUTILUS_PREFERENCES_ICON_VIEW_CAPTIONS, N_("Choose the order for information to appear beneath icon names.\n" "More information appears as you zoom in closer"), - NAUTILUS_PREFERENCE_ITEM_ENUMERATION_LIST_VERTICAL, + EEL_PREFERENCE_ITEM_ENUMERATION_LIST_VERTICAL, NULL, 0, 0, @@ -184,54 +183,54 @@ static NautilusPreferencesItemDescription icon_captions_items[] = { { NULL } }; -static NautilusPreferencesItemDescription view_preferences_items[] = { +static EelPreferencesItemDescription view_preferences_items[] = { { N_("Default View"), NAUTILUS_PREFERENCES_DEFAULT_FOLDER_VIEWER, N_("View new folders using:"), - NAUTILUS_PREFERENCE_ITEM_ENUMERATION_MENU + EEL_PREFERENCE_ITEM_ENUMERATION_MENU }, /* Icon View Defaults */ { N_("Icon View Defaults"), NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_ORDER_OR_MANUAL_LAYOUT, N_("Lay Out Items:"), - NAUTILUS_PREFERENCE_ITEM_ENUMERATION_MENU + EEL_PREFERENCE_ITEM_ENUMERATION_MENU }, { N_("Icon View Defaults"), NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER, N_("Sort in reversed order"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN + EEL_PREFERENCE_ITEM_BOOLEAN }, { N_("Icon View Defaults"), NAUTILUS_PREFERENCES_ICON_VIEW_FONT, N_("Font:"), - NAUTILUS_PREFERENCE_ITEM_FONT, + EEL_PREFERENCE_ITEM_FONT, NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, - NAUTILUS_PREFERENCE_ITEM_HIDE + EEL_PREFERENCE_ITEM_HIDE }, { N_("Icon View Defaults"), NAUTILUS_PREFERENCES_ICON_VIEW_SMOOTH_FONT, N_("Font:"), - NAUTILUS_PREFERENCE_ITEM_SMOOTH_FONT, + EEL_PREFERENCE_ITEM_SMOOTH_FONT, NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, - NAUTILUS_PREFERENCE_ITEM_SHOW + EEL_PREFERENCE_ITEM_SHOW }, { N_("Icon View Defaults"), NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL, N_("Default zoom level:"), - NAUTILUS_PREFERENCE_ITEM_ENUMERATION_MENU, + EEL_PREFERENCE_ITEM_ENUMERATION_MENU, NULL, 0, 1 }, { N_("Icon View Defaults"), NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_USE_TIGHTER_LAYOUT, N_("Use tighter layout"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN, + EEL_PREFERENCE_ITEM_BOOLEAN, NULL, 0, 1 }, { N_("Icon View Defaults"), NAUTILUS_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL_FONT_SIZE, N_("Font size at default zoom level:"), - NAUTILUS_PREFERENCE_ITEM_ENUMERATION_MENU, + EEL_PREFERENCE_ITEM_ENUMERATION_MENU, NULL, 0, 1 }, @@ -239,142 +238,142 @@ static NautilusPreferencesItemDescription view_preferences_items[] = { { N_("List View Defaults"), NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_ORDER, N_("Lay Out Items:"), - NAUTILUS_PREFERENCE_ITEM_ENUMERATION_MENU + EEL_PREFERENCE_ITEM_ENUMERATION_MENU }, { N_("List View Defaults"), NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_SORT_IN_REVERSE_ORDER, N_("Sort in reversed order"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN + EEL_PREFERENCE_ITEM_BOOLEAN }, { N_("List View Defaults"), NAUTILUS_PREFERENCES_LIST_VIEW_FONT, N_("Font:"), - NAUTILUS_PREFERENCE_ITEM_FONT + EEL_PREFERENCE_ITEM_FONT }, { N_("List View Defaults"), NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL, N_("Default zoom level:"), - NAUTILUS_PREFERENCE_ITEM_ENUMERATION_MENU, + EEL_PREFERENCE_ITEM_ENUMERATION_MENU, NULL, 0, 1 }, { N_("List View Defaults"), "dummy-string", NULL, - NAUTILUS_PREFERENCE_ITEM_PADDING, + EEL_PREFERENCE_ITEM_PADDING, NULL, 0, 1 }, { N_("List View Defaults"), NAUTILUS_PREFERENCES_LIST_VIEW_DEFAULT_ZOOM_LEVEL_FONT_SIZE, N_("Font size at default zoom level:"), - NAUTILUS_PREFERENCE_ITEM_ENUMERATION_MENU, + EEL_PREFERENCE_ITEM_ENUMERATION_MENU, NULL, 0, 1 }, { NULL } }; -static NautilusPreferencesItemDescription search_items[] = { +static EelPreferencesItemDescription search_items[] = { #ifdef HAVE_MEDUSA { N_("Search Complexity Options"), NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE, N_("search type to do by default"), - NAUTILUS_PREFERENCE_ITEM_ENUMERATION_VERTICAL_RADIO + EEL_PREFERENCE_ITEM_ENUMERATION_VERTICAL_RADIO }, #endif { N_("Search Engines"), NAUTILUS_PREFERENCES_SEARCH_WEB_URI, N_("Search Engine Location"), - NAUTILUS_PREFERENCE_ITEM_EDITABLE_STRING + EEL_PREFERENCE_ITEM_EDITABLE_STRING }, { NULL } }; -static NautilusPreferencesItemDescription navigation_items[] = { +static EelPreferencesItemDescription navigation_items[] = { { N_("Home"), NAUTILUS_PREFERENCES_HOME_URI, N_("Location:"), - NAUTILUS_PREFERENCE_ITEM_EDITABLE_STRING + EEL_PREFERENCE_ITEM_EDITABLE_STRING }, { N_("HTTP Proxy Settings"), NAUTILUS_PREFERENCES_HTTP_USE_PROXY, N_("Use HTTP Proxy"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN + EEL_PREFERENCE_ITEM_BOOLEAN }, { N_("HTTP Proxy Settings"), NAUTILUS_PREFERENCES_HTTP_PROXY_HOST, N_("Location:"), - NAUTILUS_PREFERENCE_ITEM_EDITABLE_STRING + EEL_PREFERENCE_ITEM_EDITABLE_STRING }, { N_("HTTP Proxy Settings"), NAUTILUS_PREFERENCES_HTTP_PROXY_PORT, N_("Port:"), - NAUTILUS_PREFERENCE_ITEM_EDITABLE_INTEGER + EEL_PREFERENCE_ITEM_EDITABLE_INTEGER }, { N_("HTTP Proxy Settings"), NAUTILUS_PREFERENCES_HTTP_PROXY_USE_AUTH, N_("Proxy requires a username and password:"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN, + EEL_PREFERENCE_ITEM_BOOLEAN, NAUTILUS_PREFERENCES_HTTP_USE_PROXY, - NAUTILUS_PREFERENCE_ITEM_SHOW + EEL_PREFERENCE_ITEM_SHOW }, { N_("HTTP Proxy Settings"), NAUTILUS_PREFERENCES_HTTP_PROXY_AUTH_USERNAME, N_("Username:"), - NAUTILUS_PREFERENCE_ITEM_EDITABLE_STRING, + EEL_PREFERENCE_ITEM_EDITABLE_STRING, NAUTILUS_PREFERENCES_HTTP_USE_PROXY, - NAUTILUS_PREFERENCE_ITEM_SHOW + EEL_PREFERENCE_ITEM_SHOW }, { N_("HTTP Proxy Settings"), NAUTILUS_PREFERENCES_HTTP_USE_AUTH_PASSWORD, N_("Password:"), - NAUTILUS_PREFERENCE_ITEM_EDITABLE_STRING, + EEL_PREFERENCE_ITEM_EDITABLE_STRING, NAUTILUS_PREFERENCES_HTTP_USE_PROXY, - NAUTILUS_PREFERENCE_ITEM_SHOW + EEL_PREFERENCE_ITEM_SHOW }, { N_("Built-in Bookmarks"), NAUTILUS_PREFERENCES_HIDE_BUILT_IN_BOOKMARKS, N_("Don't include the built-in bookmarks in the Bookmarks menu"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN + EEL_PREFERENCE_ITEM_BOOLEAN }, { NULL } }; -static NautilusPreferencesItemDescription tradeoffs_items[] = { +static EelPreferencesItemDescription tradeoffs_items[] = { { N_("Show Text in Icons"), NAUTILUS_PREFERENCES_SHOW_TEXT_IN_ICONS, NULL, - NAUTILUS_PREFERENCE_ITEM_ENUMERATION_HORIZONTAL_RADIO + EEL_PREFERENCE_ITEM_ENUMERATION_HORIZONTAL_RADIO }, { N_("Show Count of Items in Folders"), NAUTILUS_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS, NULL, - NAUTILUS_PREFERENCE_ITEM_ENUMERATION_HORIZONTAL_RADIO + EEL_PREFERENCE_ITEM_ENUMERATION_HORIZONTAL_RADIO }, { N_("Show Thumbnails for Image Files"), NAUTILUS_PREFERENCES_SHOW_IMAGE_FILE_THUMBNAILS, NULL, - NAUTILUS_PREFERENCE_ITEM_ENUMERATION_HORIZONTAL_RADIO + EEL_PREFERENCE_ITEM_ENUMERATION_HORIZONTAL_RADIO }, { N_("Show Thumbnails for Image Files"), NAUTILUS_PREFERENCES_IMAGE_FILE_THUMBNAIL_LIMIT, N_("Don't make thumbnails for files larger than:"), - NAUTILUS_PREFERENCE_ITEM_ENUMERATION_MENU + EEL_PREFERENCE_ITEM_ENUMERATION_MENU }, { N_("Preview Sound Files"), NAUTILUS_PREFERENCES_PREVIEW_SOUND, NULL, - NAUTILUS_PREFERENCE_ITEM_ENUMERATION_HORIZONTAL_RADIO + EEL_PREFERENCE_ITEM_ENUMERATION_HORIZONTAL_RADIO }, /* FIXME bugzilla.eazel.com 2560: This title phrase needs improvement. */ { N_("Make Folder Appearance Details Public"), NAUTILUS_PREFERENCES_USE_PUBLIC_METADATA, NULL, - NAUTILUS_PREFERENCE_ITEM_ENUMERATION_HORIZONTAL_RADIO + EEL_PREFERENCE_ITEM_ENUMERATION_HORIZONTAL_RADIO }, { NULL } }; -static NautilusPreferencesItemDescription sidebar_items[] = { +static EelPreferencesItemDescription sidebar_items[] = { { N_("Tabs"), NULL, NULL, @@ -387,28 +386,28 @@ static NautilusPreferencesItemDescription sidebar_items[] = { { N_("Tree"), NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES, N_("Show only folders (no files) in the tree"), - NAUTILUS_PREFERENCE_ITEM_BOOLEAN + EEL_PREFERENCE_ITEM_BOOLEAN }, { NULL } }; -static NautilusPreferencesItemDescription news_panel_items[] = { +static EelPreferencesItemDescription news_panel_items[] = { { N_("Maximum items per site"), NAUTILUS_PREFERENCES_NEWS_MAX_ITEMS, N_("Maximum number of items displayed per site"), - NAUTILUS_PREFERENCE_ITEM_EDITABLE_INTEGER + EEL_PREFERENCE_ITEM_EDITABLE_INTEGER }, { N_("Update Minutes"), NAUTILUS_PREFERENCES_NEWS_UPDATE_INTERVAL, N_("Update frequency in minutes"), - NAUTILUS_PREFERENCE_ITEM_EDITABLE_INTEGER + EEL_PREFERENCE_ITEM_EDITABLE_INTEGER }, { NULL } }; -static NautilusPreferencesPaneDescription panes[] = { +static EelPreferencesPaneDescription panes[] = { { N_("View Preferences"), view_preferences_items }, { N_("Appearance"), appearance_items }, { N_("Windows & Desktop"), windows_and_desktop_items }, @@ -445,7 +444,7 @@ preferences_dialog_create (void) { GtkWidget *dialog; - dialog = nautilus_preferences_dialog_new (_("Preferences"), panes); + dialog = eel_preferences_dialog_new (_("Preferences"), panes); gtk_window_set_wmclass (GTK_WINDOW (dialog), "nautilus_preferences", "Nautilus"); @@ -472,24 +471,24 @@ global_preferences_populate_sidebar_panels_callback (const char *name, g_return_if_fail (name != NULL); g_return_if_fail (iid != NULL); g_return_if_fail (preference_key != NULL); - g_return_if_fail (NAUTILUS_IS_PREFERENCES_GROUP (callback_data)); + g_return_if_fail (EEL_IS_PREFERENCES_GROUP (callback_data)); description = g_strdup_printf (_("Display %s tab in sidebar"), name); - nautilus_preferences_set_description (preference_key, description); + eel_preferences_set_description (preference_key, description); - nautilus_preferences_group_add_item (NAUTILUS_PREFERENCES_GROUP (callback_data), - preference_key, - NAUTILUS_PREFERENCE_ITEM_BOOLEAN, - 0); + eel_preferences_group_add_item (EEL_PREFERENCES_GROUP (callback_data), + preference_key, + EEL_PREFERENCE_ITEM_BOOLEAN, + 0); g_free (description); } static void -preferences_dialog_populate_sidebar_tabs_group (NautilusPreferencesGroup *group) +preferences_dialog_populate_sidebar_tabs_group (EelPreferencesGroup *group) { - g_return_if_fail (NAUTILUS_IS_PREFERENCES_GROUP (group)); + g_return_if_fail (EEL_IS_PREFERENCES_GROUP (group)); nautilus_sidebar_for_each_panel (global_preferences_populate_sidebar_panels_callback, group); } @@ -506,7 +505,7 @@ theme_changed_callback (NautilusThemeSelector *theme_selector, selected_theme = nautilus_theme_selector_get_selected_theme (NAUTILUS_THEME_SELECTOR (theme_selector)); g_return_if_fail (selected_theme != NULL); - nautilus_preferences_set (NAUTILUS_PREFERENCES_THEME, selected_theme); + eel_preferences_set (NAUTILUS_PREFERENCES_THEME, selected_theme); g_free (selected_theme); } @@ -515,30 +514,30 @@ theme_changed_callback (NautilusThemeSelector *theme_selector, * with the theme currently stored in preferences */ static void -update_theme_selector_displayed_value_callback (NautilusPreferencesItem *item, - gpointer callback_data) +update_theme_selector_displayed_value_callback (EelPreferencesItem *item, + gpointer callback_data) { char *current_theme_name; - g_return_if_fail (NAUTILUS_IS_PREFERENCES_ITEM (item)); + g_return_if_fail (EEL_IS_PREFERENCES_ITEM (item)); g_return_if_fail (NAUTILUS_IS_THEME_SELECTOR (callback_data)); - current_theme_name = nautilus_preferences_get (NAUTILUS_PREFERENCES_THEME); + current_theme_name = eel_preferences_get (NAUTILUS_PREFERENCES_THEME); nautilus_theme_selector_set_selected_theme (NAUTILUS_THEME_SELECTOR (callback_data), - current_theme_name); + current_theme_name); g_free (current_theme_name); } static void -preferences_dialog_populate_themes_group (NautilusPreferencesGroup *group) +preferences_dialog_populate_themes_group (EelPreferencesGroup *group) { GtkWidget *item; GtkWidget *child; GtkWidget *parent_window; - g_return_if_fail (NAUTILUS_IS_PREFERENCES_GROUP (group)); + g_return_if_fail (EEL_IS_PREFERENCES_GROUP (group)); child = nautilus_theme_selector_new (); @@ -546,14 +545,14 @@ preferences_dialog_populate_themes_group (NautilusPreferencesGroup *group) if (GTK_IS_WINDOW (parent_window)) { nautilus_theme_selector_set_parent_window (NAUTILUS_THEME_SELECTOR (child), - GTK_WINDOW (parent_window)); + GTK_WINDOW (parent_window)); } - item = nautilus_preferences_group_add_custom_item (group, - NAUTILUS_PREFERENCES_THEME, - child, - "theme_changed", - 0); + item = eel_preferences_group_add_custom_item (group, + NAUTILUS_PREFERENCES_THEME, + child, + "theme_changed", + 0); /* Keep track of theme chooser changes */ gtk_signal_connect (GTK_OBJECT (child), "theme_changed", @@ -567,7 +566,7 @@ preferences_dialog_populate_themes_group (NautilusPreferencesGroup *group) "custom_update_displayed_value", GTK_SIGNAL_FUNC (update_theme_selector_displayed_value_callback), child); - update_theme_selector_displayed_value_callback (NAUTILUS_PREFERENCES_ITEM (item), child); + update_theme_selector_displayed_value_callback (EEL_PREFERENCES_ITEM (item), child); } static void diff --git a/src/nautilus-property-browser.c b/src/nautilus-property-browser.c index 0612d8cf9..860014b8d 100644 --- a/src/nautilus-property-browser.c +++ b/src/nautilus-property-browser.c @@ -403,14 +403,14 @@ nautilus_property_browser_initialize (GtkObject *object) property_browser->details->content_frame = NULL; /* add callback for preference changes */ - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_CAN_ADD_CONTENT, - (NautilusPreferencesCallback) nautilus_property_browser_preferences_changed, - property_browser); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_CAN_ADD_CONTENT, + (EelPreferencesCallback) nautilus_property_browser_preferences_changed, + property_browser); /* add a callback for when the theme changes */ - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_THEME, - nautilus_property_browser_theme_changed, - property_browser); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_THEME, + nautilus_property_browser_theme_changed, + property_browser); gtk_signal_connect (GTK_OBJECT (property_browser), "delete_event", GTK_SIGNAL_FUNC (nautilus_property_browser_delete_event_callback), @@ -450,12 +450,12 @@ nautilus_property_browser_destroy (GtkObject *object) g_free (property_browser->details); - nautilus_preferences_remove_callback(NAUTILUS_PREFERENCES_CAN_ADD_CONTENT, - (NautilusPreferencesCallback) nautilus_property_browser_preferences_changed, - NULL); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, - nautilus_property_browser_theme_changed, - property_browser); + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_CAN_ADD_CONTENT, + (EelPreferencesCallback) nautilus_property_browser_preferences_changed, + NULL); + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, + nautilus_property_browser_theme_changed, + property_browser); if (object == GTK_OBJECT (main_browser)) main_browser = NULL; @@ -2015,7 +2015,7 @@ nautilus_property_browser_update_contents (NautilusPropertyBrowser *property_bro /* update the title and button */ - show_buttons = nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_CAN_ADD_CONTENT); + show_buttons = eel_preferences_get_boolean (NAUTILUS_PREFERENCES_CAN_ADD_CONTENT); if (property_browser->details->category == NULL) { eel_label_set_text(EEL_LABEL (property_browser->details->title_label), _("Select A Category:")); diff --git a/src/nautilus-search-bar-criterion.c b/src/nautilus-search-bar-criterion.c index fcca98d09..65253bece 100644 --- a/src/nautilus-search-bar-criterion.c +++ b/src/nautilus-search-bar-criterion.c @@ -29,6 +29,10 @@ #include "nautilus-search-bar-criterion-private.h" #include "nautilus-signaller.h" +#include <eel/eel-dateedit-extensions.h> +#include <eel/eel-gtk-macros.h> +#include <eel/eel-labeled-image.h> +#include <eel/eel-string.h> #include <gtk/gtkentry.h> #include <gtk/gtkeventbox.h> #include <gtk/gtklabel.h> @@ -42,15 +46,11 @@ #include <libgnomeui/gnome-uidefs.h> #include <libgnomevfs/gnome-vfs-utils.h> #include <libnautilus-private/nautilus-customization-data.h> -#include <libnautilus-private/nautilus-dateedit-extensions.h> +#include <libnautilus-private/nautilus-entry.h> #include <libnautilus-private/nautilus-file-utilities.h> -#include <eel/eel-gtk-macros.h> #include <libnautilus-private/nautilus-icon-factory.h> -#include <libnautilus-private/nautilus-entry.h> #include <libnautilus-private/nautilus-search-uri.h> -#include <eel/eel-string.h> #include <libnautilus-private/nautilus-undo-signal-handlers.h> -#include <eel/eel-labeled-image.h> #include <stdio.h> #include <stdlib.h> #include <time.h> @@ -617,7 +617,7 @@ nautilus_search_bar_criterion_get_location (NautilusSearchBarCriterion *criterio } else if (criterion->details->use_value_entry) { value_text = gtk_entry_get_text (GTK_ENTRY (criterion->details->value_entry)); } else if (criterion->details->type == NAUTILUS_DATE_MODIFIED_SEARCH_CRITERION) { - value_text = nautilus_gnome_date_edit_get_date_as_string (criterion->details->date); + value_text = eel_gnome_date_edit_get_date_as_string (criterion->details->date); } switch (name_number) { diff --git a/src/nautilus-shell.c b/src/nautilus-shell.c index 2709acecb..768bd19db 100644 --- a/src/nautilus-shell.c +++ b/src/nautilus-shell.c @@ -31,6 +31,12 @@ #include "nautilus-desktop-window.h" #include "nautilus-main.h" #include "nautilus-shell-interface.h" +#include <eel/eel-glib-extensions.h> +#include <eel/eel-gtk-extensions.h> +#include <eel/eel-gtk-macros.h> +#include <eel/eel-label.h> +#include <eel/eel-stock-dialogs.h> +#include <eel/eel-string.h> #include <gtk/gtkframe.h> #include <gtk/gtkhbox.h> #include <gtk/gtklabel.h> @@ -40,13 +46,7 @@ #include <libgnomeui/gnome-stock.h> #include <libgnomeui/gnome-uidefs.h> #include <libnautilus-private/nautilus-file-utilities.h> -#include <eel/eel-glib-extensions.h> -#include <eel/eel-gtk-extensions.h> -#include <eel/eel-gtk-macros.h> -#include <eel/eel-label.h> -#include <libnautilus-private/nautilus-preferences.h> -#include <eel/eel-stock-dialogs.h> -#include <eel/eel-string.h> +#include <libnautilus-private/nautilus-global-preferences.h> #include <libnautilus/nautilus-bonobo-workarounds.h> #include <stdlib.h> @@ -417,7 +417,7 @@ save_window_states (void) g_free (window_attributes); } - nautilus_preferences_set_string_list (START_STATE_CONFIG, states); + eel_preferences_set_string_list (START_STATE_CONFIG, states); eel_string_list_free (states); } @@ -471,11 +471,11 @@ restore_window_states (NautilusShell *shell) EelStringList *states; gboolean result; - states = nautilus_preferences_get_string_list (START_STATE_CONFIG); + states = eel_preferences_get_string_list (START_STATE_CONFIG); result = eel_string_list_get_length (states) > 0; eel_string_list_for_each (states, restore_one_window_callback, shell); eel_string_list_free (states); - nautilus_preferences_set_string_list (START_STATE_CONFIG, NULL); + eel_preferences_set_string_list (START_STATE_CONFIG, NULL); return result; } diff --git a/src/nautilus-sidebar-tabs.c b/src/nautilus-sidebar-tabs.c index 1ade41b7c..a3352361e 100644 --- a/src/nautilus-sidebar-tabs.c +++ b/src/nautilus-sidebar-tabs.c @@ -303,12 +303,12 @@ nautilus_sidebar_tabs_initialize (NautilusSidebarTabs *sidebar_tabs) nautilus_sidebar_tabs_load_theme_data (sidebar_tabs); /* add callback to be notified for theme changes */ - nautilus_preferences_add_callback(NAUTILUS_PREFERENCES_THEME, - (NautilusPreferencesCallback) nautilus_sidebar_tabs_load_theme_data, - sidebar_tabs); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_DEFAULT_SMOOTH_FONT, - smooth_font_changed_callback, - sidebar_tabs); + eel_preferences_add_callback(NAUTILUS_PREFERENCES_THEME, + (EelPreferencesCallback) nautilus_sidebar_tabs_load_theme_data, + sidebar_tabs); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_DEFAULT_SMOOTH_FONT, + smooth_font_changed_callback, + sidebar_tabs); sidebar_tabs->details->title_prelit = FALSE; } @@ -391,13 +391,13 @@ nautilus_sidebar_tabs_destroy (GtkObject *object) tab_item_destroy_cover, NULL); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, - (NautilusPreferencesCallback) nautilus_sidebar_tabs_load_theme_data, - sidebar_tabs); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_DEFAULT_SMOOTH_FONT, - smooth_font_changed_callback, - sidebar_tabs); - + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, + (EelPreferencesCallback) nautilus_sidebar_tabs_load_theme_data, + sidebar_tabs); + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_DEFAULT_SMOOTH_FONT, + smooth_font_changed_callback, + sidebar_tabs); + g_free (sidebar_tabs->details); EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object)); diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c index 03aa795dd..2109e4190 100644 --- a/src/nautilus-sidebar-title.c +++ b/src/nautilus-sidebar-title.c @@ -107,8 +107,8 @@ nautilus_sidebar_title_initialize_class (NautilusSidebarTitleClass *class) object_class->destroy = nautilus_sidebar_title_destroy; widget_class->size_allocate = nautilus_sidebar_title_size_allocate; - nautilus_preferences_add_auto_string (NAUTILUS_PREFERENCES_DEFAULT_FONT, - &non_smooth_font_name); + eel_preferences_add_auto_string (NAUTILUS_PREFERENCES_DEFAULT_FONT, + &non_smooth_font_name); } static void @@ -228,15 +228,15 @@ nautilus_sidebar_title_initialize (NautilusSidebarTitle *sidebar_title) /* Keep track of changes in graphics trade offs */ update_all (sidebar_title); - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_DEFAULT_FONT, + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_DEFAULT_FONT, non_smooth_font_changed_callback, sidebar_title, GTK_OBJECT (sidebar_title)); - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_DEFAULT_SMOOTH_FONT, + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_DEFAULT_SMOOTH_FONT, smooth_font_changed_callback, sidebar_title, GTK_OBJECT (sidebar_title)); - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_THEME, + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_THEME, nautilus_sidebar_title_theme_changed, sidebar_title, GTK_OBJECT (sidebar_title)); diff --git a/src/nautilus-sidebar.c b/src/nautilus-sidebar.c index 3c1585949..411281bfd 100644 --- a/src/nautilus-sidebar.c +++ b/src/nautilus-sidebar.c @@ -66,7 +66,6 @@ #include <libnautilus-private/nautilus-keep-last-vertical-box.h> #include <libnautilus-private/nautilus-metadata.h> #include <libnautilus-private/nautilus-mime-actions.h> -#include <libnautilus-private/nautilus-preferences.h> #include <libnautilus-private/nautilus-program-choosing.h> #include <libnautilus-private/nautilus-sidebar-functions.h> #include <libnautilus-private/nautilus-theme.h> @@ -202,7 +201,7 @@ nautilus_sidebar_initialize_class (GtkObjectClass *object_klass) gtk_object_class_add_signals (object_klass, signals, LAST_SIGNAL); - nautilus_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_CONFIRM_TRASH, + eel_preferences_add_auto_boolean (NAUTILUS_PREFERENCES_CONFIRM_TRASH, &confirm_trash_auto_value); } @@ -285,7 +284,7 @@ nautilus_sidebar_initialize (GtkObject *object) make_button_box (sidebar); /* add a callback for when the theme changes */ - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_THEME, nautilus_sidebar_theme_changed, sidebar); + eel_preferences_add_callback (NAUTILUS_PREFERENCES_THEME, nautilus_sidebar_theme_changed, sidebar); /* prepare ourselves to receive dropped objects */ gtk_drag_dest_set (GTK_WIDGET (sidebar), @@ -316,7 +315,7 @@ nautilus_sidebar_destroy (GtkObject *object) g_free (sidebar->details); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, nautilus_sidebar_theme_changed, sidebar); @@ -423,8 +422,8 @@ toggle_sidebar_panel (GtkWidget *widget, * become out of whack with the number of running sidebar * panels, for example when a panel crashes. */ - nautilus_preferences_set_boolean (preference_key, already_on); - nautilus_preferences_set_boolean (preference_key, !already_on); + eel_preferences_set_boolean (preference_key, already_on); + eel_preferences_set_boolean (preference_key, !already_on); } typedef struct @@ -457,7 +456,7 @@ sidebar_for_each_sidebar_panel (const char *name, * we dont need to create a menu item for it. */ panel_visible = any_panel_matches_iid (data->sidebar, iid); - if (!panel_visible && !nautilus_preferences_is_visible (preference_key)) { + if (!panel_visible && !eel_preferences_is_visible (preference_key)) { return; } @@ -1664,8 +1663,8 @@ nautilus_sidebar_size_allocate (GtkWidget *widget, if (widget->allocation.width != sidebar->details->old_width) { sidebar->details->old_width = widget->allocation.width; - nautilus_preferences_set_integer (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH, - widget->allocation.width); + eel_preferences_set_integer (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH, + widget->allocation.width); } } diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c index a61866ec0..1b64840ad 100644 --- a/src/nautilus-spatial-window.c +++ b/src/nautilus-spatial-window.c @@ -46,6 +46,7 @@ #include <ctype.h> #include <eel/eel-gdk-extensions.h> #include <eel/eel-gdk-pixbuf-extensions.h> +#include <eel/eel-generous-bin.h> #include <eel/eel-gtk-extensions.h> #include <eel/eel-gtk-macros.h> #include <eel/eel-string.h> @@ -68,7 +69,6 @@ #include <libnautilus-private/nautilus-bonobo-extensions.h> #include <libnautilus-private/nautilus-drag-window.h> #include <libnautilus-private/nautilus-file-utilities.h> -#include <libnautilus-private/nautilus-generous-bin.h> #include <libnautilus-private/nautilus-global-preferences.h> #include <libnautilus-private/nautilus-horizontal-splitter.h> #include <libnautilus-private/nautilus-icon-factory.h> @@ -208,7 +208,7 @@ nautilus_window_for_each_sidebar_panel (const char *name, g_return_if_fail (preference_key != NULL); g_return_if_fail (NAUTILUS_IS_WINDOW (callback_data)); - nautilus_preferences_add_callback_while_alive (preference_key, + eel_preferences_add_callback_while_alive (preference_key, sidebar_panels_changed_callback, callback_data, GTK_OBJECT (callback_data)); @@ -741,7 +741,7 @@ nautilus_window_constructed (NautilusWindow *window) * for the desktop window. */ if (NAUTILUS_IS_DESKTOP_WINDOW (window)) { - window->content_hbox = gtk_widget_new (NAUTILUS_TYPE_GENEROUS_BIN, NULL); + window->content_hbox = gtk_widget_new (EEL_TYPE_GENEROUS_BIN, NULL); } else { set_initial_window_geometry (window); @@ -750,7 +750,7 @@ nautilus_window_constructed (NautilusWindow *window) /* FIXME bugzilla.eazel.com 1245: Saved in pixels instead of in %? */ /* FIXME bugzilla.eazel.com 1245: No reality check on the value? */ - sidebar_width = nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH); + sidebar_width = eel_preferences_get_integer (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH); e_paned_set_position (E_PANED (window->content_hbox), sidebar_width); } gtk_widget_show (window->content_hbox); @@ -1011,7 +1011,7 @@ nautilus_window_close (NautilusWindow *window) * we're in every-location-in-its-own-window mode. Otherwise it * would be too apparently random when the stored positions change. */ - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW)) { nautilus_window_save_geometry (window); } @@ -1700,7 +1700,7 @@ nautilus_window_go_web_search (NautilusWindow *window) nautilus_window_set_search_mode (window, FALSE); - search_web_uri = nautilus_preferences_get (NAUTILUS_PREFERENCES_SEARCH_WEB_URI); + search_web_uri = eel_preferences_get (NAUTILUS_PREFERENCES_SEARCH_WEB_URI); g_assert (search_web_uri != NULL); nautilus_window_go_to (window, search_web_uri); @@ -1714,7 +1714,7 @@ nautilus_window_go_home (NautilusWindow *window) nautilus_window_set_search_mode (window, FALSE); - home_uri = nautilus_preferences_get (NAUTILUS_PREFERENCES_HOME_URI); + home_uri = eel_preferences_get (NAUTILUS_PREFERENCES_HOME_URI); g_assert (home_uri != NULL); nautilus_window_go_to (window, home_uri); @@ -2242,25 +2242,25 @@ nautilus_window_show (GtkWidget *widget) /* Initially show or hide views based on preferences; once the window is displayed * these can be controlled on a per-window basis from View menu items. */ - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_TOOLBAR)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_TOOLBAR)) { nautilus_window_show_toolbar (window); } else { nautilus_window_hide_toolbar (window); } - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR)) { nautilus_window_show_location_bar (window); } else { nautilus_window_hide_location_bar (window); } - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_STATUS_BAR)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_STATUS_BAR)) { nautilus_window_show_status_bar (window); } else { nautilus_window_hide_status_bar (window); } - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_SIDEBAR)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_SIDEBAR)) { nautilus_window_show_sidebar (window); } else { nautilus_window_hide_sidebar (window); diff --git a/src/nautilus-switchable-search-bar.c b/src/nautilus-switchable-search-bar.c index 4adde882f..7ed0a8df7 100644 --- a/src/nautilus-switchable-search-bar.c +++ b/src/nautilus-switchable-search-bar.c @@ -103,7 +103,7 @@ nautilus_switchable_search_bar_destroy (GtkObject *object) bar = NAUTILUS_SWITCHABLE_SEARCH_BAR (object); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE, + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE, search_bar_preference_changed_callback, bar); @@ -156,13 +156,13 @@ nautilus_switchable_search_bar_new (NautilusWindow *window) gtk_widget_show_all (hbox); nautilus_switchable_search_bar_set_mode (bar, - nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE)); - + eel_preferences_get_integer (NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE)); + /* React to future preference changes. */ - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE, - search_bar_preference_changed_callback, - bar); - + eel_preferences_add_callback (NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE, + search_bar_preference_changed_callback, + bar); + return switchable_search_bar; } @@ -283,7 +283,7 @@ nautilus_search_uri_to_search_bar_mode (const char *uri) { NautilusSearchBarMode preferred_mode; - preferred_mode = nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE); + preferred_mode = eel_preferences_get_integer (NAUTILUS_PREFERENCES_SEARCH_BAR_TYPE); if (nautilus_search_uri_is_displayable_by_mode (uri, preferred_mode)) { return preferred_mode; } diff --git a/src/nautilus-theme-selector.c b/src/nautilus-theme-selector.c index f8bb31756..f1c65ed1d 100644 --- a/src/nautilus-theme-selector.c +++ b/src/nautilus-theme-selector.c @@ -606,7 +606,7 @@ theme_selector_update_selected_theme_from_preferences (NautilusThemeSelector *th g_return_if_fail (NAUTILUS_IS_THEME_SELECTOR (theme_selector)); - theme_name = nautilus_preferences_get (NAUTILUS_PREFERENCES_THEME); + theme_name = eel_preferences_get (NAUTILUS_PREFERENCES_THEME); nautilus_theme_selector_set_selected_theme (theme_selector, theme_name); g_free (theme_name); diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c index 25ffb6a35..f838169b7 100644 --- a/src/nautilus-view-frame.c +++ b/src/nautilus-view-frame.c @@ -114,7 +114,7 @@ static guint signals[LAST_SIGNAL]; EEL_DEFINE_CLASS_BOILERPLATE (NautilusViewFrame, nautilus_view_frame, - NAUTILUS_TYPE_GENEROUS_BIN) + EEL_TYPE_GENEROUS_BIN) void nautilus_view_frame_queue_incoming_call (PortableServer_Servant servant, diff --git a/src/nautilus-view-frame.h b/src/nautilus-view-frame.h index 405ecb926..a0d55454b 100644 --- a/src/nautilus-view-frame.h +++ b/src/nautilus-view-frame.h @@ -36,7 +36,7 @@ #include <bonobo/bonobo-object-client.h> #include <bonobo/bonobo-ui-container.h> #include <bonobo/bonobo-zoomable-frame.h> -#include <libnautilus-private/nautilus-generous-bin.h> +#include <eel/eel-generous-bin.h> #include <libnautilus-private/nautilus-undo-manager.h> #include <libnautilus/nautilus-view-component.h> @@ -49,12 +49,12 @@ typedef struct NautilusViewFrameDetails NautilusViewFrameDetails; typedef struct { - NautilusGenerousBin parent; + EelGenerousBin parent; NautilusViewFrameDetails *details; } NautilusViewFrame; typedef struct { - NautilusGenerousBinClass parent_spot; + EelGenerousBinClass parent_spot; /* These roughly correspond to CORBA calls, but in some cases they are higher level. */ diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c index 18bf2ab24..a5ec18c4e 100644 --- a/src/nautilus-window-manage-views.c +++ b/src/nautilus-window-manage-views.c @@ -1146,7 +1146,7 @@ position_and_show_window_callback (NautilusFile *file, window = NAUTILUS_WINDOW (callback_data); - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW)) { geometry_string = nautilus_file_get_metadata (file, NAUTILUS_METADATA_KEY_WINDOW_GEOMETRY, NULL); if (geometry_string != NULL) { @@ -1348,7 +1348,7 @@ determined_initial_view_callback (NautilusDetermineViewHandle *handle, in which case going home would cause an infinite loop, so we better test for that */ - home_uri = nautilus_preferences_get (NAUTILUS_PREFERENCES_HOME_URI); + home_uri = eel_preferences_get (NAUTILUS_PREFERENCES_HOME_URI); if (!eel_uris_match (home_uri, location)) { nautilus_window_go_home (NAUTILUS_WINDOW (window)); } else { diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c index a5df98a61..ecdc00b53 100644 --- a/src/nautilus-window-menus.c +++ b/src/nautilus-window-menus.c @@ -712,13 +712,13 @@ get_user_level_icon_name (int user_level, gboolean is_selected) char *full_image_name; switch (user_level) { - case NAUTILUS_USER_LEVEL_NOVICE: + case EEL_USER_LEVEL_NOVICE: image_name = "novice"; break; - case NAUTILUS_USER_LEVEL_ADVANCED: + case EEL_USER_LEVEL_ADVANCED: image_name = "expert"; break; - case NAUTILUS_USER_LEVEL_INTERMEDIATE: + case EEL_USER_LEVEL_INTERMEDIATE: default: image_name = "intermediate"; break; @@ -745,12 +745,12 @@ switch_to_user_level (NautilusWindow *window, int new_user_level) return; } - old_user_level = nautilus_preferences_get_user_level (); + old_user_level = eel_preferences_get_user_level (); if (new_user_level == old_user_level) { return; } - nautilus_preferences_set_user_level (new_user_level); + eel_preferences_set_user_level (new_user_level); nautilus_window_ui_freeze (window); @@ -1138,7 +1138,7 @@ refresh_bookmarks_menu (NautilusWindow *window) bonobo_ui_component_freeze (window->details->shell_ui, NULL); nautilus_window_remove_bookmarks_menu_items (window); - if (!nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_HIDE_BUILT_IN_BOOKMARKS)) { + if (!eel_preferences_get_boolean (NAUTILUS_PREFERENCES_HIDE_BUILT_IN_BOOKMARKS)) { append_static_bookmarks (window, MENU_PATH_BUILT_IN_BOOKMARKS_PLACEHOLDER); } @@ -1163,7 +1163,7 @@ nautilus_window_initialize_bookmarks_menu (NautilusWindow *window) /* Recreate static & dynamic part of menu if preference about * showing static bookmarks changes. */ - nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_HIDE_BUILT_IN_BOOKMARKS, + eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_HIDE_BUILT_IN_BOOKMARKS, nautilus_window_bookmarks_preference_changed_callback, window, GTK_OBJECT (window)); @@ -1216,7 +1216,7 @@ update_user_level_menu_item (NautilusWindow *window, return; } - current_user_level = nautilus_preferences_get_user_level (); + current_user_level = eel_preferences_get_user_level (); icon_name = get_user_level_icon_name (item_user_level, current_user_level == item_user_level); @@ -1242,13 +1242,13 @@ user_level_changed_callback (gpointer callback_data) update_user_level_menu_item (window, NAUTILUS_MENU_PATH_NOVICE_ITEM, - NAUTILUS_USER_LEVEL_NOVICE); + EEL_USER_LEVEL_NOVICE); update_user_level_menu_item (window, NAUTILUS_MENU_PATH_INTERMEDIATE_ITEM, - NAUTILUS_USER_LEVEL_INTERMEDIATE); + EEL_USER_LEVEL_INTERMEDIATE); update_user_level_menu_item (window, NAUTILUS_MENU_PATH_EXPERT_ITEM, - NAUTILUS_USER_LEVEL_ADVANCED); + EEL_USER_LEVEL_ADVANCED); } /** @@ -1331,7 +1331,7 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window) nautilus_window_update_show_hide_menu_items (window); /* Keep track of user level changes to update the user level menu item icons */ - nautilus_preferences_add_callback_while_alive ("user_level", + eel_preferences_add_callback_while_alive ("user_level", user_level_changed_callback, window, GTK_OBJECT (window)); @@ -1537,26 +1537,26 @@ convert_verb_to_user_level (const char *verb) g_assert (verb != NULL); if (strcmp (verb, SWITCH_TO_BEGINNER_VERB) == 0) { - return NAUTILUS_USER_LEVEL_NOVICE; + return EEL_USER_LEVEL_NOVICE; } else if (strcmp (verb, SWITCH_TO_INTERMEDIATE_VERB) == 0) { - return NAUTILUS_USER_LEVEL_INTERMEDIATE; + return EEL_USER_LEVEL_INTERMEDIATE; } else if (strcmp (verb, SWITCH_TO_ADVANCED_VERB) == 0) { - return NAUTILUS_USER_LEVEL_ADVANCED; + return EEL_USER_LEVEL_ADVANCED; } g_assert_not_reached (); - return NAUTILUS_USER_LEVEL_NOVICE; + return EEL_USER_LEVEL_NOVICE; } static const char * convert_user_level_to_path (guint user_level) { switch (user_level) { - case NAUTILUS_USER_LEVEL_NOVICE: + case EEL_USER_LEVEL_NOVICE: return NAUTILUS_MENU_PATH_NOVICE_ITEM; - case NAUTILUS_USER_LEVEL_INTERMEDIATE: + case EEL_USER_LEVEL_INTERMEDIATE: return NAUTILUS_MENU_PATH_INTERMEDIATE_ITEM; - case NAUTILUS_USER_LEVEL_ADVANCED: + case EEL_USER_LEVEL_ADVANCED: return NAUTILUS_MENU_PATH_EXPERT_ITEM; } diff --git a/src/nautilus-window-toolbars.c b/src/nautilus-window-toolbars.c index 579507563..03c582f8b 100644 --- a/src/nautilus-window-toolbars.c +++ b/src/nautilus-window-toolbars.c @@ -431,7 +431,7 @@ nautilus_window_initialize_toolbars (NautilusWindow *window) set_up_toolbar_images (window); - nautilus_preferences_add_callback + eel_preferences_add_callback (NAUTILUS_PREFERENCES_THEME, theme_changed_callback, window); @@ -442,7 +442,7 @@ nautilus_window_initialize_toolbars (NautilusWindow *window) void nautilus_window_toolbar_remove_theme_callback (NautilusWindow *window) { - nautilus_preferences_remove_callback + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, theme_changed_callback, window); diff --git a/src/nautilus-window.c b/src/nautilus-window.c index a61866ec0..1b64840ad 100644 --- a/src/nautilus-window.c +++ b/src/nautilus-window.c @@ -46,6 +46,7 @@ #include <ctype.h> #include <eel/eel-gdk-extensions.h> #include <eel/eel-gdk-pixbuf-extensions.h> +#include <eel/eel-generous-bin.h> #include <eel/eel-gtk-extensions.h> #include <eel/eel-gtk-macros.h> #include <eel/eel-string.h> @@ -68,7 +69,6 @@ #include <libnautilus-private/nautilus-bonobo-extensions.h> #include <libnautilus-private/nautilus-drag-window.h> #include <libnautilus-private/nautilus-file-utilities.h> -#include <libnautilus-private/nautilus-generous-bin.h> #include <libnautilus-private/nautilus-global-preferences.h> #include <libnautilus-private/nautilus-horizontal-splitter.h> #include <libnautilus-private/nautilus-icon-factory.h> @@ -208,7 +208,7 @@ nautilus_window_for_each_sidebar_panel (const char *name, g_return_if_fail (preference_key != NULL); g_return_if_fail (NAUTILUS_IS_WINDOW (callback_data)); - nautilus_preferences_add_callback_while_alive (preference_key, + eel_preferences_add_callback_while_alive (preference_key, sidebar_panels_changed_callback, callback_data, GTK_OBJECT (callback_data)); @@ -741,7 +741,7 @@ nautilus_window_constructed (NautilusWindow *window) * for the desktop window. */ if (NAUTILUS_IS_DESKTOP_WINDOW (window)) { - window->content_hbox = gtk_widget_new (NAUTILUS_TYPE_GENEROUS_BIN, NULL); + window->content_hbox = gtk_widget_new (EEL_TYPE_GENEROUS_BIN, NULL); } else { set_initial_window_geometry (window); @@ -750,7 +750,7 @@ nautilus_window_constructed (NautilusWindow *window) /* FIXME bugzilla.eazel.com 1245: Saved in pixels instead of in %? */ /* FIXME bugzilla.eazel.com 1245: No reality check on the value? */ - sidebar_width = nautilus_preferences_get_integer (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH); + sidebar_width = eel_preferences_get_integer (NAUTILUS_PREFERENCES_SIDEBAR_WIDTH); e_paned_set_position (E_PANED (window->content_hbox), sidebar_width); } gtk_widget_show (window->content_hbox); @@ -1011,7 +1011,7 @@ nautilus_window_close (NautilusWindow *window) * we're in every-location-in-its-own-window mode. Otherwise it * would be too apparently random when the stored positions change. */ - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_WINDOW_ALWAYS_NEW)) { nautilus_window_save_geometry (window); } @@ -1700,7 +1700,7 @@ nautilus_window_go_web_search (NautilusWindow *window) nautilus_window_set_search_mode (window, FALSE); - search_web_uri = nautilus_preferences_get (NAUTILUS_PREFERENCES_SEARCH_WEB_URI); + search_web_uri = eel_preferences_get (NAUTILUS_PREFERENCES_SEARCH_WEB_URI); g_assert (search_web_uri != NULL); nautilus_window_go_to (window, search_web_uri); @@ -1714,7 +1714,7 @@ nautilus_window_go_home (NautilusWindow *window) nautilus_window_set_search_mode (window, FALSE); - home_uri = nautilus_preferences_get (NAUTILUS_PREFERENCES_HOME_URI); + home_uri = eel_preferences_get (NAUTILUS_PREFERENCES_HOME_URI); g_assert (home_uri != NULL); nautilus_window_go_to (window, home_uri); @@ -2242,25 +2242,25 @@ nautilus_window_show (GtkWidget *widget) /* Initially show or hide views based on preferences; once the window is displayed * these can be controlled on a per-window basis from View menu items. */ - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_TOOLBAR)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_TOOLBAR)) { nautilus_window_show_toolbar (window); } else { nautilus_window_hide_toolbar (window); } - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR)) { nautilus_window_show_location_bar (window); } else { nautilus_window_hide_location_bar (window); } - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_STATUS_BAR)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_STATUS_BAR)) { nautilus_window_show_status_bar (window); } else { nautilus_window_hide_status_bar (window); } - if (nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_SIDEBAR)) { + if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_START_WITH_SIDEBAR)) { nautilus_window_show_sidebar (window); } else { nautilus_window_hide_sidebar (window); diff --git a/src/nautilus-zoom-control.c b/src/nautilus-zoom-control.c index 07dbbb7cf..418f7815f 100644 --- a/src/nautilus-zoom-control.c +++ b/src/nautilus-zoom-control.c @@ -183,7 +183,7 @@ nautilus_zoom_control_destroy (GtkObject *object) /* deallocate pixbufs */ nautilus_zoom_control_unload_images (NAUTILUS_ZOOM_CONTROL (object)); - nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, + eel_preferences_remove_callback (NAUTILUS_PREFERENCES_THEME, nautilus_zoom_control_theme_changed, object); @@ -232,7 +232,7 @@ nautilus_zoom_control_initialize (NautilusZoomControl *zoom_control) gtk_widget_set_usize (GTK_WIDGET (zoom_control), zoom_width, -1); /* add a callback for when the theme changes */ - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_THEME, + eel_preferences_add_callback (NAUTILUS_PREFERENCES_THEME, nautilus_zoom_control_theme_changed, zoom_control); diff --git a/test/test-nautilus-preferences-change.c b/test/test-nautilus-preferences-change.c index 992645cff..5c0bd85de 100644 --- a/test/test-nautilus-preferences-change.c +++ b/test/test-nautilus-preferences-change.c @@ -3,9 +3,7 @@ #include <eel/eel-image.h> #include <eel/eel-image-with-background.h> #include <eel/eel-string-picker.h> -#include <libnautilus-private/nautilus-preferences.h> #include <libnautilus-private/nautilus-global-preferences.h> - #include <unistd.h> static void @@ -20,8 +18,8 @@ user_level_changed_callback (gpointer callback_data) name = eel_caption_get_title_label (EEL_CAPTION (callback_data)); - user_level = nautilus_preferences_get_user_level (); - visible_user_level = nautilus_preferences_get_visible_user_level (name); + user_level = eel_preferences_get_user_level (); + visible_user_level = eel_preferences_get_visible_user_level (name); if (visible_user_level <= user_level) { gtk_widget_show (GTK_WIDGET (callback_data)); @@ -61,7 +59,7 @@ int_picker_changed_callback (EelStringPicker *string_picker, new_value = eel_string_picker_get_index_for_string (string_picker, selected_string); - nautilus_preferences_set_integer ((const char *) callback_data, new_value); + eel_preferences_set_integer ((const char *) callback_data, new_value); g_free (selected_string); } @@ -80,7 +78,7 @@ user_level_picker_changed_callback (EelStringPicker *string_picker, new_user_level = eel_string_picker_get_index_for_string (string_picker, selected_string); - nautilus_preferences_set_user_level (new_user_level); + eel_preferences_set_user_level (new_user_level); g_free (selected_string); } @@ -101,9 +99,9 @@ picker_new (const char *name, eel_string_picker_set_string_list (EEL_STRING_PICKER (string_picker), entries); eel_string_picker_set_selected_string_index (EEL_STRING_PICKER (string_picker), - nautilus_preferences_get_integer (name)); + eel_preferences_get_integer (name)); - nautilus_preferences_add_callback ("user_level", user_level_changed_callback, string_picker); + eel_preferences_add_callback ("user_level", user_level_changed_callback, string_picker); user_level_changed_callback (string_picker); return string_picker; @@ -125,9 +123,9 @@ user_level_picker_new (const char *name, eel_string_picker_set_string_list (EEL_STRING_PICKER (string_picker), entries); eel_string_picker_set_selected_string_index (EEL_STRING_PICKER (string_picker), - nautilus_preferences_get_user_level ()); + eel_preferences_get_user_level ()); - nautilus_preferences_add_callback ("user_level", user_level_changed_callback, string_picker); + eel_preferences_add_callback ("user_level", user_level_changed_callback, string_picker); user_level_changed_callback (string_picker); return string_picker; @@ -160,35 +158,35 @@ main (int argc, char *argv[]) color_entries = eel_string_list_new_from_tokens ("0,1,2,3,4,5,6,7,8,9,10", ",", TRUE); fruits_entries = eel_string_list_new_from_tokens ("0,1,2,3", ",", TRUE); - nautilus_preferences_default_set_string ("user_level", - NAUTILUS_USER_LEVEL_NOVICE, - "advanced"); + eel_preferences_default_set_string ("user_level", + EEL_USER_LEVEL_NOVICE, + "advanced"); - nautilus_preferences_default_set_integer ("green", - NAUTILUS_USER_LEVEL_NOVICE, - 3); - - nautilus_preferences_default_set_integer ("yellow", - NAUTILUS_USER_LEVEL_NOVICE, - 9); - - nautilus_preferences_default_set_integer ("red", - NAUTILUS_USER_LEVEL_NOVICE, - 7); - - nautilus_preferences_default_set_integer ("fruits/apple", - NAUTILUS_USER_LEVEL_NOVICE, - 1); - nautilus_preferences_default_set_integer ("fruits/orange", - NAUTILUS_USER_LEVEL_NOVICE, - 2); - nautilus_preferences_default_set_integer ("fruits/pear", - NAUTILUS_USER_LEVEL_NOVICE, - 3); - - nautilus_preferences_set_visible_user_level ("yellow", 1); - nautilus_preferences_set_visible_user_level ("green", 0); - nautilus_preferences_set_visible_user_level ("red", 2); + eel_preferences_default_set_integer ("green", + EEL_USER_LEVEL_NOVICE, + 3); + + eel_preferences_default_set_integer ("yellow", + EEL_USER_LEVEL_NOVICE, + 9); + + eel_preferences_default_set_integer ("red", + EEL_USER_LEVEL_NOVICE, + 7); + + eel_preferences_default_set_integer ("fruits/apple", + EEL_USER_LEVEL_NOVICE, + 1); + eel_preferences_default_set_integer ("fruits/orange", + EEL_USER_LEVEL_NOVICE, + 2); + eel_preferences_default_set_integer ("fruits/pear", + EEL_USER_LEVEL_NOVICE, + 3); + + eel_preferences_set_visible_user_level ("yellow", 1); + eel_preferences_set_visible_user_level ("green", 0); + eel_preferences_set_visible_user_level ("red", 2); //sleep (10); @@ -218,7 +216,7 @@ main (int argc, char *argv[]) eel_string_list_free (color_entries); eel_string_list_free (fruits_entries); - nautilus_preferences_add_callback ("fruits", fruits_changed_callback, NULL); + eel_preferences_add_callback ("fruits", fruits_changed_callback, NULL); gtk_widget_show (vbox); gtk_widget_show (window); diff --git a/test/test-nautilus-preferences-display.c b/test/test-nautilus-preferences-display.c index 9dfd49585..3cbe33242 100644 --- a/test/test-nautilus-preferences-display.c +++ b/test/test-nautilus-preferences-display.c @@ -3,7 +3,6 @@ #include <eel/eel-image.h> #include <eel/eel-image-with-background.h> #include <eel/eel-text-caption.h> -#include <libnautilus-private/nautilus-preferences.h> #include <libnautilus-private/nautilus-global-preferences.h> static void @@ -16,7 +15,7 @@ text_caption_update (EelTextCaption *text_caption, g_print ("'%s' changed from '%d' to '%d'\n", name, test_text_caption_get_text_as_int (text_caption), - nautilus_preferences_get_integer (name)); + eel_preferences_get_integer (name)); test_text_caption_set_text_for_int_preferences (text_caption, name); } @@ -30,7 +29,7 @@ user_level_caption_update (EelTextCaption *text_caption) g_return_if_fail (EEL_IS_TEXT_CAPTION (text_caption)); old_text = eel_text_caption_get_text (text_caption); - new_text = nautilus_preferences_get ("user_level"); + new_text = eel_preferences_get ("user_level"); g_print ("'%s' changed from '%s' to '%s'\n", "user_level", @@ -127,7 +126,7 @@ user_level_frame_new (void) user_level_hbox = entry_new ("user_level", &user_level_caption, &user_level_default_caption); test_text_caption_set_text_for_string_preferences (EEL_TEXT_CAPTION (user_level_caption), "user_level"); test_text_caption_set_text_for_default_string_preferences (EEL_TEXT_CAPTION (user_level_default_caption), "user_level"); - nautilus_preferences_add_callback ("user_level", user_level_changed_callback, user_level_caption); + eel_preferences_add_callback ("user_level", user_level_changed_callback, user_level_caption); gtk_container_add (GTK_CONTAINER (frame), user_level_hbox); @@ -171,9 +170,9 @@ colors_frame_new (void) test_text_caption_set_text_for_default_int_preferences (EEL_TEXT_CAPTION (yellow_default_caption), "yellow"); test_text_caption_set_text_for_default_int_preferences (EEL_TEXT_CAPTION (red_default_caption), "red"); - nautilus_preferences_add_callback ("green", green_changed_callback, green_caption); - nautilus_preferences_add_callback ("yellow", yellow_changed_callback, yellow_caption); - nautilus_preferences_add_callback ("red", red_changed_callback, red_caption); + eel_preferences_add_callback ("green", green_changed_callback, green_caption); + eel_preferences_add_callback ("yellow", yellow_changed_callback, yellow_caption); + eel_preferences_add_callback ("red", red_changed_callback, red_caption); gtk_box_pack_start (GTK_BOX (vbox), green_hbox, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), yellow_hbox, TRUE, TRUE, 0); @@ -219,9 +218,9 @@ fruits_frame_new (void) test_text_caption_set_text_for_default_int_preferences (EEL_TEXT_CAPTION (orange_default_caption), "fruits/orange"); test_text_caption_set_text_for_default_int_preferences (EEL_TEXT_CAPTION (pear_default_caption), "fruits/pear"); - nautilus_preferences_add_callback ("fruits/apple", apple_changed_callback, apple_caption); - nautilus_preferences_add_callback ("fruits/orange", orange_changed_callback, orange_caption); - nautilus_preferences_add_callback ("fruits/pear", pear_changed_callback, pear_caption); + eel_preferences_add_callback ("fruits/apple", apple_changed_callback, apple_caption); + eel_preferences_add_callback ("fruits/orange", orange_changed_callback, orange_caption); + eel_preferences_add_callback ("fruits/pear", pear_changed_callback, pear_caption); gtk_box_pack_start (GTK_BOX (vbox), apple_hbox, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), orange_hbox, TRUE, TRUE, 0); diff --git a/test/test-nautilus-smooth-graphics.c b/test/test-nautilus-smooth-graphics.c index 0b4ffbfa3..9bb622531 100644 --- a/test/test-nautilus-smooth-graphics.c +++ b/test/test-nautilus-smooth-graphics.c @@ -9,8 +9,8 @@ static void button_toggled (GtkWidget *button, gpointer callback_data) { - nautilus_preferences_set_boolean (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, - GTK_TOGGLE_BUTTON (button)->active); + eel_preferences_set_boolean (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, + GTK_TOGGLE_BUTTON (button)->active); } static void @@ -18,10 +18,10 @@ smooth_graphics_mode_changed_callback (gpointer callback_data) { gboolean is_smooth; - is_smooth = nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE); + is_smooth = eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (callback_data), - nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE)); + eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE)); } static void @@ -46,7 +46,7 @@ main (int argc, char * argv[]) button = gtk_toggle_button_new_with_label ("Smooth Graphics"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), - nautilus_preferences_get_boolean (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE)); + eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE)); gtk_container_add (GTK_CONTAINER (window), button); @@ -55,8 +55,8 @@ main (int argc, char * argv[]) GTK_SIGNAL_FUNC (button_toggled), NULL); - nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, - smooth_graphics_mode_changed_callback, + eel_preferences_add_callback (NAUTILUS_PREFERENCES_SMOOTH_GRAPHICS_MODE, + smooth_graphics_mode_changed_callback, button); gtk_widget_show (button); diff --git a/test/test.c b/test/test.c index b8334f111..af3a0f16c 100644 --- a/test/test.c +++ b/test/test.c @@ -1,7 +1,7 @@ #include "test.h" #include <libart_lgpl/art_rgb.h> -#include <libnautilus-private/nautilus-preferences.h> +#include <eel/eel-preferences.h> void test_init (int *argc, @@ -228,7 +228,7 @@ test_text_caption_set_text_for_int_preferences (EelTextCaption *text_caption, g_return_if_fail (EEL_IS_TEXT_CAPTION (text_caption)); g_return_if_fail (name != NULL); - int_value = nautilus_preferences_get_integer (name); + int_value = eel_preferences_get_integer (name); text = g_strdup_printf ("%d", int_value); @@ -246,7 +246,7 @@ test_text_caption_set_text_for_string_preferences (EelTextCaption *text_caption, g_return_if_fail (EEL_IS_TEXT_CAPTION (text_caption)); g_return_if_fail (name != NULL); - text = nautilus_preferences_get (name); + text = eel_preferences_get (name); eel_text_caption_set_text (EEL_TEXT_CAPTION (text_caption), text); |