From 3c6122df79f4d6e86d7afa0e6c4b64403de7bc44 Mon Sep 17 00:00:00 2001 From: monsta Date: Sun, 21 Aug 2016 03:29:50 +0300 Subject: drop a large amount of completely unused code --- src/caja-file-management-properties.c | 1 - src/caja-navigation-window.c | 16 ---------------- src/caja-window-menus.c | 4 ---- src/file-manager/fm-list-model.c | 26 -------------------------- src/file-manager/fm-list-model.h | 2 -- 5 files changed, 49 deletions(-) (limited to 'src') diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c index f5d9e400..94ce7443 100644 --- a/src/caja-file-management-properties.c +++ b/src/caja-file-management-properties.c @@ -64,7 +64,6 @@ #define CAJA_FILE_MANAGEMENT_PROPERTIES_ALWAYS_USE_LOCATION_ENTRY_WIDGET "always_use_location_entry_checkbutton" #define CAJA_FILE_MANAGEMENT_PROPERTIES_TRASH_CONFIRM_WIDGET "trash_confirm_checkbutton" #define CAJA_FILE_MANAGEMENT_PROPERTIES_TRASH_DELETE_WIDGET "trash_delete_checkbutton" -#define CAJA_FILE_MANAGEMENT_PROPERTIES_OPEN_NEW_WINDOW_WIDGET "new_window_checkbutton" #define CAJA_FILE_MANAGEMENT_PROPERTIES_SHOW_HIDDEN_WIDGET "hidden_files_checkbutton" #define CAJA_FILE_MANAGEMENT_PROPERTIES_TREE_VIEW_FOLDERS_WIDGET "treeview_folders_checkbutton" #define CAJA_FILE_MANAGEMENT_PROPERTIES_MEDIA_AUTOMOUNT_OPEN "media_automount_open_checkbutton" diff --git a/src/caja-navigation-window.c b/src/caja-navigation-window.c index 8c1db6a8..5d0fdf47 100644 --- a/src/caja-navigation-window.c +++ b/src/caja-navigation-window.c @@ -69,26 +69,10 @@ #include #include - -/* FIXME bugzilla.gnome.org 41243: - * We should use inheritance instead of these special cases - * for the desktop window. - */ -#include "caja-desktop-window.h" - #define MAX_TITLE_LENGTH 180 #define MENU_PATH_BOOKMARKS_PLACEHOLDER "/MenuBar/Other Menus/Bookmarks/Bookmarks Placeholder" -enum -{ - ARG_0, - ARG_APP_ID, - ARG_APP -}; - - - /* Forward and back buttons on the mouse */ static gboolean mouse_extra_buttons = TRUE; static int mouse_forward_button = 9; diff --git a/src/caja-window-menus.c b/src/caja-window-menus.c index edf1bd71..d0fc2254 100644 --- a/src/caja-window-menus.c +++ b/src/caja-window-menus.c @@ -54,9 +54,6 @@ #include #include #include - -#define MATE_DESKTOP_USE_UNSTABLE_API - #include #define MENU_PATH_EXTENSION_ACTIONS "/MenuBar/File/Extension Actions" @@ -64,7 +61,6 @@ #define NETWORK_URI "network:" #define COMPUTER_URI "computer:" -#define BURN_CD_URI "burn:" /* Struct that stores all the info necessary to activate a bookmark. */ typedef struct diff --git a/src/file-manager/fm-list-model.c b/src/file-manager/fm-list-model.c index 1bf2d599..f33da35d 100644 --- a/src/file-manager/fm-list-model.c +++ b/src/file-manager/fm-list-model.c @@ -1593,32 +1593,6 @@ fm_list_model_add_column (FMListModel *model, return FM_LIST_MODEL_NUM_COLUMNS + (model->details->columns->len - 1); } -int -fm_list_model_get_column_number (FMListModel *model, - const char *column_name) -{ - int i; - - for (i = 0; i < model->details->columns->len; i++) - { - CajaColumn *column; - char *name; - - column = model->details->columns->pdata[i]; - - g_object_get (G_OBJECT (column), "name", &name, NULL); - - if (!strcmp (name, column_name)) - { - g_free (name); - return FM_LIST_MODEL_NUM_COLUMNS + i; - } - g_free (name); - } - - return -1; -} - static void fm_list_model_dispose (GObject *object) { diff --git a/src/file-manager/fm-list-model.h b/src/file-manager/fm-list-model.h index 2d4ff88b..33b5add7 100644 --- a/src/file-manager/fm-list-model.h +++ b/src/file-manager/fm-list-model.h @@ -127,8 +127,6 @@ int fm_list_model_compare_func (FMListModel *model, int fm_list_model_add_column (FMListModel *model, CajaColumn *column); -int fm_list_model_get_column_number (FMListModel *model, - const char *column_name); void fm_list_model_subdirectory_done_loading (FMListModel *model, CajaDirectory *directory); -- cgit v1.2.1