diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/caja-connect-server-dialog-main.c | 2 | ||||
| -rw-r--r-- | src/caja-file-management-properties-main.c | 3 | ||||
| -rw-r--r-- | src/caja-file-management-properties.c | 23 | ||||
| -rw-r--r-- | src/caja-history-sidebar.c | 1 | ||||
| -rw-r--r-- | src/caja-navigation-window-pane.c | 2 | ||||
| -rw-r--r-- | src/caja-pathbar.c | 1 | ||||
| -rw-r--r-- | src/caja-places-sidebar.c | 1 | ||||
| -rw-r--r-- | src/caja-window-menus.c | 1 | ||||
| -rw-r--r-- | src/file-manager/fm-tree-view.c | 1 |
9 files changed, 2 insertions, 33 deletions
diff --git a/src/caja-connect-server-dialog-main.c b/src/caja-connect-server-dialog-main.c index 83ae92b7..44c57980 100644 --- a/src/caja-connect-server-dialog-main.c +++ b/src/caja-connect-server-dialog-main.c @@ -33,7 +33,6 @@ #include <stdlib.h> -#include <eel/eel-preferences.h> #include <eel/eel-stock-dialogs.h> #include <libcaja-private/caja-icon-names.h> @@ -205,7 +204,6 @@ main (int argc, char *argv[]) g_option_context_free (context); - eel_preferences_init ("/apps/caja"); caja_global_preferences_init (); gtk_window_set_default_icon_name (CAJA_ICON_FOLDER); diff --git a/src/caja-file-management-properties-main.c b/src/caja-file-management-properties-main.c index 41bf34af..6a407b71 100644 --- a/src/caja-file-management-properties-main.c +++ b/src/caja-file-management-properties-main.c @@ -30,8 +30,6 @@ #include <libcaja-private/caja-module.h> #include <libcaja-private/caja-global-preferences.h> -#include <eel/eel-preferences.h> - #include "caja-file-management-properties.h" static void @@ -53,7 +51,6 @@ main (int argc, char *argv[]) gtk_init (&argc, &argv); - eel_preferences_init ("/apps/caja"); caja_global_preferences_init (); caja_module_setup (); diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c index 0caed348..438ce08a 100644 --- a/src/caja-file-management-properties.c +++ b/src/caja-file-management-properties.c @@ -33,9 +33,7 @@ #include <glib/gi18n.h> -#include <eel/eel-mateconf-extensions.h> #include <eel/eel-glib-extensions.h> -#include <eel/eel-preferences.h> #include <libcaja-private/caja-column-chooser.h> #include <libcaja-private/caja-column-utilities.h> @@ -269,11 +267,6 @@ caja_file_management_properties_dialog_response_cb (GtkDialog *parent, } else if (response_id == GTK_RESPONSE_CLOSE) { - /* remove mateconf monitors */ - eel_mateconf_monitor_remove ("/apps/caja/icon_view"); - eel_mateconf_monitor_remove ("/apps/caja/list_view"); - eel_mateconf_monitor_remove ("/apps/caja/preferences"); - eel_mateconf_monitor_remove ("/desktop/mate/file_views"); g_signal_handlers_disconnect_by_func (caja_media_preferences, caja_file_management_properties_dialog_update_media_sensitivity, builder); @@ -424,7 +417,7 @@ update_caption_combo_box (GtkBuilder *builder, } static void -update_icon_captions_from_mateconf (GtkBuilder *builder) +update_icon_captions_from_settings (GtkBuilder *builder) { char **captions; int i, j; @@ -485,7 +478,7 @@ caja_file_management_properties_dialog_setup_icon_caption_page (GtkBuilder *buil caja_column_list_free (columns); - update_icon_captions_from_mateconf (builder); + update_icon_captions_from_settings (builder); } static void @@ -943,18 +936,6 @@ caja_file_management_properties_dialog_setup (GtkBuilder *builder, GtkWindow *wi { GtkWidget *dialog; - /* setup mateconf stuff */ - eel_mateconf_monitor_add ("/apps/caja/icon_view"); - eel_mateconf_preload_cache ("/apps/caja/icon_view", MATECONF_CLIENT_PRELOAD_ONELEVEL); - eel_mateconf_monitor_add ("/apps/caja/compact_view"); - eel_mateconf_preload_cache ("/apps/caja/compact_view", MATECONF_CLIENT_PRELOAD_ONELEVEL); - eel_mateconf_monitor_add ("/apps/caja/list_view"); - eel_mateconf_preload_cache ("/apps/caja/list_view", MATECONF_CLIENT_PRELOAD_ONELEVEL); - eel_mateconf_monitor_add ("/apps/caja/preferences"); - eel_mateconf_preload_cache ("/apps/caja/preferences", MATECONF_CLIENT_PRELOAD_ONELEVEL); - eel_mateconf_monitor_add ("/desktop/mate/file_views"); - eel_mateconf_preload_cache ("/desktop/mate/file_views", MATECONF_CLIENT_PRELOAD_ONELEVEL); - /* setup UI */ caja_file_management_properties_size_group_create (builder, "views_label", diff --git a/src/caja-history-sidebar.c b/src/caja-history-sidebar.c index bdcb7c33..2375a046 100644 --- a/src/caja-history-sidebar.c +++ b/src/caja-history-sidebar.c @@ -30,7 +30,6 @@ #include <eel/eel-debug.h> #include <eel/eel-gtk-extensions.h> #include <eel/eel-glib-extensions.h> -#include <eel/eel-preferences.h> #include <gtk/gtk.h> #include <glib/gi18n.h> #include <libcaja-private/caja-bookmark.h> diff --git a/src/caja-navigation-window-pane.c b/src/caja-navigation-window-pane.c index 627fcc06..b4b6ceaf 100644 --- a/src/caja-navigation-window-pane.c +++ b/src/caja-navigation-window-pane.c @@ -35,8 +35,6 @@ #include <libcaja-private/caja-view-factory.h> #include <libcaja-private/caja-entry.h> -#include <eel/eel-preferences.h> - static void caja_navigation_window_pane_init (CajaNavigationWindowPane *pane); static void caja_navigation_window_pane_class_init (CajaNavigationWindowPaneClass *class); diff --git a/src/caja-pathbar.c b/src/caja-pathbar.c index e3e2a1a8..279f4cd5 100644 --- a/src/caja-pathbar.c +++ b/src/caja-pathbar.c @@ -23,7 +23,6 @@ #include <eel/eel-debug.h> #include <eel/eel-gtk-extensions.h> #include <eel/eel-glib-extensions.h> -#include <eel/eel-preferences.h> #include <eel/eel-string.h> #include <gtk/gtk.h> #include <glib/gi18n.h> diff --git a/src/caja-places-sidebar.c b/src/caja-places-sidebar.c index ae63fa25..13f06966 100644 --- a/src/caja-places-sidebar.c +++ b/src/caja-places-sidebar.c @@ -26,7 +26,6 @@ #include <eel/eel-debug.h> #include <eel/eel-gtk-extensions.h> #include <eel/eel-glib-extensions.h> -#include <eel/eel-preferences.h> #include <eel/eel-string.h> #include <eel/eel-stock-dialogs.h> #include <gdk/gdkkeysyms.h> diff --git a/src/caja-window-menus.c b/src/caja-window-menus.c index 06aa51ff..ca37ccbb 100644 --- a/src/caja-window-menus.c +++ b/src/caja-window-menus.c @@ -43,7 +43,6 @@ #include <gio/gio.h> #include <glib/gi18n.h> #include <eel/eel-gtk-extensions.h> -#include <eel/eel-preferences.h> #include <libcaja-extension/caja-menu-provider.h> #include <libcaja-private/caja-file-utilities.h> #include <libcaja-private/caja-global-preferences.h> diff --git a/src/file-manager/fm-tree-view.c b/src/file-manager/fm-tree-view.c index c7fa3d21..71ec5a95 100644 --- a/src/file-manager/fm-tree-view.c +++ b/src/file-manager/fm-tree-view.c @@ -38,7 +38,6 @@ #include <eel/eel-alert-dialog.h> #include <eel/eel-glib-extensions.h> #include <eel/eel-gtk-extensions.h> -#include <eel/eel-preferences.h> #include <eel/eel-stock-dialogs.h> #include <gtk/gtk.h> #include <glib/gi18n.h> |