summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--eel/eel-canvas.c1
-rw-r--r--eel/eel-gdk-extensions.c2
-rw-r--r--eel/eel-gtk-extensions.c5
-rw-r--r--eel/eel-stock-dialogs.c2
-rw-r--r--libcaja-private/caja-file-operations.c2
-rw-r--r--libcaja-private/caja-file.c6
-rw-r--r--libcaja-private/caja-icon-container.c18
-rw-r--r--libcaja-private/caja-keep-last-vertical-box.c2
-rw-r--r--libcaja-private/caja-module.c3
-rw-r--r--libcaja-private/caja-open-with-dialog.c1
-rw-r--r--libcaja-private/caja-search-engine-beagle.c1
-rw-r--r--src/caja-bookmarks-sidebar.c6
-rw-r--r--src/caja-file-management-properties.c1
-rw-r--r--src/caja-history-sidebar.c7
-rw-r--r--src/caja-places-sidebar.c2
-rw-r--r--src/caja-sidebar-title.c1
-rw-r--r--src/caja-trash-bar.c3
-rw-r--r--src/file-manager/fm-icon-container.c3
-rw-r--r--src/file-manager/fm-list-model.c3
-rw-r--r--src/file-manager/fm-list-view.c7
-rw-r--r--test/test-eel-image-table.c3
21 files changed, 0 insertions, 79 deletions
diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c
index e72cc7ce..ee70a047 100644
--- a/eel/eel-canvas.c
+++ b/eel/eel-canvas.c
@@ -86,7 +86,6 @@ static void redraw_and_repick_if_mapped (EelCanvasItem *item);
/* Some convenience stuff */
#define GCI_UPDATE_MASK (EEL_CANVAS_UPDATE_REQUESTED | EEL_CANVAS_UPDATE_DEEP)
-#define GCI_EPSILON 1e-18
enum
{
diff --git a/eel/eel-gdk-extensions.c b/eel/eel-gdk-extensions.c
index 1bd367fb..3c4a63db 100644
--- a/eel/eel-gdk-extensions.c
+++ b/eel/eel-gdk-extensions.c
@@ -37,8 +37,6 @@
#include <stdlib.h>
#include <pango/pango.h>
-#define GRADIENT_BAND_SIZE 4
-
/**
* eel_gradient_new
* @start_color: Color for the top or left.
diff --git a/eel/eel-gtk-extensions.c b/eel/eel-gtk-extensions.c
index aecbcc75..350ed596 100644
--- a/eel/eel-gtk-extensions.c
+++ b/eel/eel-gtk-extensions.c
@@ -44,11 +44,6 @@
#include <glib/gi18n-lib.h>
#include <math.h>
-/* This number is fairly arbitrary. Long enough to show a pretty long
- * menu title, but not so long to make a menu grotesquely wide.
- */
-#define MAXIMUM_MENU_TITLE_LENGTH 48
-
/* Used for window position & size sanity-checking. The sizes are big enough to prevent
* at least normal-sized mate panels from obscuring the window at the screen edges.
*/
diff --git a/eel/eel-stock-dialogs.c b/eel/eel-stock-dialogs.c
index d34160ad..15d0d7dc 100644
--- a/eel/eel-stock-dialogs.c
+++ b/eel/eel-stock-dialogs.c
@@ -36,8 +36,6 @@
#define TIMED_WAIT_MINIMUM_DIALOG_WIDTH 300
-#define RESPONSE_DETAILS 1000
-
typedef struct
{
EelCancelCallback cancel_callback;
diff --git a/libcaja-private/caja-file-operations.c b/libcaja-private/caja-file-operations.c
index a8c78028..c3732b09 100644
--- a/libcaja-private/caja-file-operations.c
+++ b/libcaja-private/caja-file-operations.c
@@ -186,9 +186,7 @@ typedef struct {
#define RETRY _("_Retry")
#define DELETE _("_Delete")
#define DELETE_ALL _("Delete _All")
-#define REPLACE _("_Replace")
#define REPLACE_ALL _("Replace _All")
-#define MERGE _("_Merge")
#define MERGE_ALL _("Merge _All")
#define COPY_FORCE _("Copy _Anyway")
diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c
index 69e2b665..be9751d6 100644
--- a/libcaja-private/caja-file.c
+++ b/libcaja-private/caja-file.c
@@ -76,9 +76,6 @@
#include <selinux/selinux.h>
#endif
-/* Time in seconds to cache getpwuid results */
-#define GETPWUID_CACHE_TIME (5*60)
-
#define ICON_NAME_THUMBNAIL_LOADING "image-loading"
#undef CAJA_FILE_DEBUG_REF
@@ -95,9 +92,6 @@
#define SORT_LAST_CHAR1 '.'
#define SORT_LAST_CHAR2 '#'
-/* Name of Caja trash directories */
-#define TRASH_DIRECTORY_NAME ".Trash"
-
#define METADATA_ID_IS_LIST_MASK (1U<<31)
#define SORT_BY_EXTENSION_FOLLOWING_MAX_LENGTH 3
diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c
index f6321564..fbce65d5 100644
--- a/libcaja-private/caja-icon-container.c
+++ b/libcaja-private/caja-icon-container.c
@@ -68,8 +68,6 @@
*/
#define KEYBOARD_ICON_REVEAL_TIMEOUT 10
-#define CONTEXT_MENU_TIMEOUT_INTERVAL 500
-
/* Maximum amount of milliseconds the mouse button is allowed to stay down
* and still be considered a click.
*/
@@ -88,7 +86,6 @@
#define ICON_PAD_LEFT 4
#define ICON_PAD_RIGHT 4
-#define ICON_BASE_WIDTH 96
#define ICON_PAD_TOP 4
#define ICON_PAD_BOTTOM 4
@@ -100,32 +97,17 @@
#define STANDARD_ICON_GRID_WIDTH 155
-#define TEXT_BESIDE_ICON_GRID_WIDTH 205
-
/* Desktop layout mode defines */
#define DESKTOP_PAD_HORIZONTAL 10
#define DESKTOP_PAD_VERTICAL 10
#define SNAP_SIZE_X 78
#define SNAP_SIZE_Y 20
-#define DEFAULT_SELECTION_BOX_ALPHA 0x40
-#define DEFAULT_HIGHLIGHT_ALPHA 0xff
-#define DEFAULT_NORMAL_ALPHA 0xff
-#define DEFAULT_PRELIGHT_ALPHA 0xff
-#define DEFAULT_LIGHT_INFO_COLOR "#AAAAFD"
-#define DEFAULT_DARK_INFO_COLOR "#33337F"
-
-#define MINIMUM_EMBEDDED_TEXT_RECT_WIDTH 20
-#define MINIMUM_EMBEDDED_TEXT_RECT_HEIGHT 20
-
/* If icon size is bigger than this, request large embedded text.
* Its selected so that the non-large text should fit in "normal" icon sizes
*/
#define ICON_SIZE_FOR_LARGE_EMBEDDED_TEXT 55
-/* From caja-icon-canvas-item.c */
-#define MAX_TEXT_WIDTH_BESIDE 90
-
#define SNAP_HORIZONTAL(func,x) ((func ((double)((x) - DESKTOP_PAD_HORIZONTAL) / SNAP_SIZE_X) * SNAP_SIZE_X) + DESKTOP_PAD_HORIZONTAL)
#define SNAP_VERTICAL(func, y) ((func ((double)((y) - DESKTOP_PAD_VERTICAL) / SNAP_SIZE_Y) * SNAP_SIZE_Y) + DESKTOP_PAD_VERTICAL)
diff --git a/libcaja-private/caja-keep-last-vertical-box.c b/libcaja-private/caja-keep-last-vertical-box.c
index 91107c69..441e8a11 100644
--- a/libcaja-private/caja-keep-last-vertical-box.c
+++ b/libcaja-private/caja-keep-last-vertical-box.c
@@ -31,8 +31,6 @@ static void caja_keep_last_vertical_box_size_allocate (GtkWidget *widg
G_DEFINE_TYPE (CajaKeepLastVerticalBox, caja_keep_last_vertical_box, GTK_TYPE_BOX)
-#define parent_class caja_keep_last_vertical_box_parent_class
-
/* Standard class initialization function */
static void
caja_keep_last_vertical_box_class_init (CajaKeepLastVerticalBoxClass *klass)
diff --git a/libcaja-private/caja-module.c b/libcaja-private/caja-module.c
index e7796739..fea4b9b5 100644
--- a/libcaja-private/caja-module.c
+++ b/libcaja-private/caja-module.c
@@ -32,9 +32,6 @@
#define CAJA_TYPE_MODULE (caja_module_get_type ())
#define CAJA_MODULE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAJA_TYPE_MODULE, CajaModule))
-#define CAJA_MODULE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CAJA_TYPE_MODULE, CajaModule))
-#define CAJA_IS_MODULE(obj) (G_TYPE_INSTANCE_CHECK_TYPE ((obj), CAJA_TYPE_MODULE))
-#define CAJA_IS_MODULE_CLASS(klass) (G_TYPE_CLASS_CHECK_CLASS_TYPE ((klass), CAJA_TYPE_MODULE))
typedef struct _CajaModule CajaModule;
typedef struct _CajaModuleClass CajaModuleClass;
diff --git a/libcaja-private/caja-open-with-dialog.c b/libcaja-private/caja-open-with-dialog.c
index 80e68d16..cf0b2984 100644
--- a/libcaja-private/caja-open-with-dialog.c
+++ b/libcaja-private/caja-open-with-dialog.c
@@ -39,7 +39,6 @@
#include "caja-signaller.h"
#define sure_string(s) ((const char *)((s)!=NULL?(s):""))
-#define DESKTOP_ENTRY_GROUP "Desktop Entry"
struct _CajaOpenWithDialogDetails
{
diff --git a/libcaja-private/caja-search-engine-beagle.c b/libcaja-private/caja-search-engine-beagle.c
index aa3ba4ae..a10865db 100644
--- a/libcaja-private/caja-search-engine-beagle.c
+++ b/libcaja-private/caja-search-engine-beagle.c
@@ -51,7 +51,6 @@ struct CajaSearchEngineBeagleDetails
/* We dlopen() all the following from libbeagle at runtime */
#define BEAGLE_HIT(x) ((BeagleHit *)(x))
#define BEAGLE_REQUEST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), beagle_request_get_type(), BeagleRequest))
-#define BEAGLE_QUERY_PART(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), beagle_query_part_get_type(), BeagleQueryPart))
typedef enum
{
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 93a98677..b9c8d1d4 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 781008b1..f48d11c2 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 be9b4c85..7c9bc8dc 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 6d3f011e..5fe42fc4 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 bcff94ae..b896bcc7 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 dc5fd59a..0188f3f1 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 fae87a1e..3c795472 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 396f2d82..c3980b90 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
diff --git a/test/test-eel-image-table.c b/test/test-eel-image-table.c
index 3595cd7c..ba172a9a 100644
--- a/test/test-eel-image-table.c
+++ b/test/test-eel-image-table.c
@@ -7,9 +7,6 @@
static const char pixbuf_name[] = "/usr/share/pixmaps/mate-about-logo.png";
-#define BG_COLOR 0xFFFFFF
-#define BG_COLOR_SPEC "white"
-
static const char *names[] =
{
"Tomaso Albinoni",