9 files changed, 0 insertions, 33 deletions
diff --git a/src/caja-bookmarks-sidebar.c b/src/caja-bookmarks-sidebar.c
index 90ff27c9..2ab9c6d6 100644
--- a/src/caja-bookmarks-sidebar.c
+++ b/src/caja-bookmarks-sidebar.c
@@ -50,12 +50,6 @@
 
 #include "caja-bookmarks-sidebar.h"
 
-#define CAJA_BOOKMARKS_SIDEBAR_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), CAJA_TYPE_BOOKMARKS_SIDEBAR, CajaBookmarksSidebarClass))
-#define CAJA_IS_BOOKMARKS_SIDEBAR(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CAJA_TYPE_BOOKMARKS_SIDEBAR))
-#define CAJA_IS_BOOKMARKS_SIDEBAR_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), CAJA_TYPE_BOOKMARKS_SIDEBAR))
 
 typedef struct
 {
diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c
index d352732a..f7cf5c74 100644
--- a/src/caja-file-management-properties.c
+++ b/src/caja-file-management-properties.c
@@ -63,7 +63,6 @@
 #define CAJA_FILE_MANAGEMENT_PROPERTIES_LABELS_BESIDE_ICONS_WIDGET "labels_beside_icons_checkbutton"
 #define CAJA_FILE_MANAGEMENT_PROPERTIES_ALL_COLUMNS_SAME_WIDTH "all_columns_same_width_checkbutton"
 #define CAJA_FILE_MANAGEMENT_PROPERTIES_ALWAYS_USE_BROWSER_WIDGET "always_use_browser_checkbutton"
-#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_CONFIRM_TRASH_WIDGET "trash_confirm_trash_checkbutton"
 #define CAJA_FILE_MANAGEMENT_PROPERTIES_TRASH_DELETE_WIDGET "trash_delete_checkbutton"
diff --git a/src/caja-history-sidebar.c b/src/caja-history-sidebar.c
index 6e32ac95..1a269375 100644
--- a/src/caja-history-sidebar.c
+++ b/src/caja-history-sidebar.c
@@ -43,13 +43,6 @@
 
 #include "caja-history-sidebar.h"
 
-#define CAJA_HISTORY_SIDEBAR_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), CAJA_TYPE_HISTORY_SIDEBAR, CajaHistorySidebarClass))
-#define CAJA_IS_HISTORY_SIDEBAR(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CAJA_TYPE_HISTORY_SIDEBAR))
-#define CAJA_IS_HISTORY_SIDEBAR_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), CAJA_TYPE_HISTORY_SIDEBAR))
-
 typedef struct
 {
     GtkScrolledWindowClass parent;
diff --git a/src/caja-places-sidebar.c b/src/caja-places-sidebar.c
index 12f26c49..b01bfb87 100644
--- a/src/caja-places-sidebar.c
+++ b/src/caja-places-sidebar.c
@@ -58,7 +58,6 @@
 #include "caja-window.h"
 
 #define EJECT_BUTTON_XPAD 6
-#define ICON_CELL_XPAD 6
 
 typedef struct
 {
@@ -209,7 +208,6 @@ typedef struct
 } CajaShortcutsModelFilterClass;
 
 #define CAJA_SHORTCUTS_MODEL_FILTER_TYPE (_caja_shortcuts_model_filter_get_type ())
-#define CAJA_SHORTCUTS_MODEL_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_SHORTCUTS_MODEL_FILTER_TYPE, CajaShortcutsModelFilter))
 
 GType _caja_shortcuts_model_filter_get_type (void);
 static void caja_shortcuts_model_filter_drag_source_iface_init (GtkTreeDragSourceIface *iface);
diff --git a/src/caja-sidebar-title.c b/src/caja-sidebar-title.c
index 33d5bbc7..38031d50 100644
--- a/src/caja-sidebar-title.c
+++ b/src/caja-sidebar-title.c
@@ -52,7 +52,6 @@
 #define MINIMUM_INFO_WIDTH	32
 #define SIDEBAR_INFO_MARGIN	4
 
-#define MORE_INFO_FONT_SIZE 	 12
 #define MIN_TITLE_FONT_SIZE 	 12
 #define TITLE_PADDING		  4
 
diff --git a/src/caja-trash-bar.c b/src/caja-trash-bar.c
index d9ac20ea..4ce61628 100644
--- a/src/caja-trash-bar.c
+++ b/src/caja-trash-bar.c
@@ -33,9 +33,6 @@
 #include "caja-trash-bar.h"
 #include "caja-window.h"
 
-#define CAJA_TRASH_BAR_GET_PRIVATE(o)\
-	(G_TYPE_INSTANCE_GET_PRIVATE ((o), CAJA_TYPE_TRASH_BAR, CajaTrashBarPrivate))
-
 enum
 {
     PROP_WINDOW = 1,
diff --git a/src/file-manager/fm-icon-container.c b/src/file-manager/fm-icon-container.c
index 325329f2..c83cf783 100644
--- a/src/file-manager/fm-icon-container.c
+++ b/src/file-manager/fm-icon-container.c
@@ -36,9 +36,6 @@
 
 #include "fm-icon-container.h"
 
-#define ICON_TEXT_ATTRIBUTES_NUM_ITEMS		3
-#define ICON_TEXT_ATTRIBUTES_DEFAULT_TOKENS	"size,date_modified,type"
-
 G_DEFINE_TYPE (FMIconContainer, fm_icon_container, CAJA_TYPE_ICON_CONTAINER);
 
 static GQuark attribute_none_q;
diff --git a/src/file-manager/fm-list-model.c b/src/file-manager/fm-list-model.c
index a7b8ce86..a04b27f9 100644
--- a/src/file-manager/fm-list-model.c
+++ b/src/file-manager/fm-list-model.c
@@ -52,9 +52,6 @@ static GQuark attribute_name_q,
        attribute_modification_date_q,
        attribute_date_modified_q;
 
-/* msec delay after Loading... dummy row turns into (empty) */
-#define LOADING_TO_EMPTY_DELAY 100
-
 static guint list_model_signals[LAST_SIGNAL] = { 0 };
 
 static int fm_list_model_file_entry_compare_func (gconstpointer a,
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index bfc29c2c..e544cdd8 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -122,13 +122,6 @@ struct SelectionForeachData
     GtkTreeSelection *selection;
 };
 
-/*
- * The row height should be large enough to not clip emblems.
- * Computing this would be costly, so we just choose a number
- * that works well with the set of emblems we've designed.
- */
-#define LIST_VIEW_MINIMUM_ROW_HEIGHT	28
-
 /* We wait two seconds after row is collapsed to unload the subdirectory */
 #define COLLAPSE_TO_UNLOAD_DELAY 2