diff options
| -rw-r--r-- | capplets/common/mate-theme-apply.c | 1 | ||||
| -rw-r--r-- | capplets/common/mate-theme-info.c | 1 | ||||
| -rw-r--r-- | capplets/keybindings/eggcellrendererkeys.c | 13 | ||||
| -rw-r--r-- | capplets/windows/mate-window-properties.c | 3 | ||||
| -rw-r--r-- | font-viewer/font-view.c | 1 | ||||
| -rw-r--r-- | libslab/app-shell.c | 1 | ||||
| -rw-r--r-- | libslab/shell-window.c | 2 | ||||
| -rw-r--r-- | libwindow-settings/marco-window-manager.c | 1 | ||||
| -rw-r--r-- | typing-break/drwright.c | 3 |
9 files changed, 2 insertions, 24 deletions
diff --git a/capplets/common/mate-theme-apply.c b/capplets/common/mate-theme-apply.c index f1de6bd9..48b40bc0 100644 --- a/capplets/common/mate-theme-apply.c +++ b/capplets/common/mate-theme-apply.c @@ -31,7 +31,6 @@ #define GTK_THEME_KEY "gtk-theme" #define COLOR_SCHEME_KEY "gtk-color-scheme" #define ICON_THEME_KEY "icon-theme" -#define FONT_KEY "font-name" #define MARCO_SCHEMA "org.mate.Marco.general" #define MARCO_THEME_KEY "theme" diff --git a/capplets/common/mate-theme-info.c b/capplets/common/mate-theme-info.c index 5e5db12a..91359f5e 100644 --- a/capplets/common/mate-theme-info.c +++ b/capplets/common/mate-theme-info.c @@ -50,7 +50,6 @@ #define CURSOR_THEME_KEY "X-GNOME-Metatheme/CursorTheme" #define NOTIFICATION_THEME_KEY "X-GNOME-Metatheme/NotificationTheme" #define CURSOR_SIZE_KEY "X-GNOME-Metatheme/CursorSize" -#define SOUND_THEME_KEY "X-GNOME-Metatheme/SoundTheme" #define APPLICATION_FONT_KEY "X-GNOME-Metatheme/ApplicationFont" #define DOCUMENTS_FONT_KEY "X-GNOME-Metatheme/DocumentsFont" #define DESKTOP_FONT_KEY "X-GNOME-Metatheme/DesktopFont" diff --git a/capplets/keybindings/eggcellrendererkeys.c b/capplets/keybindings/eggcellrendererkeys.c index 0a8789d0..e6feca22 100644 --- a/capplets/keybindings/eggcellrendererkeys.c +++ b/capplets/keybindings/eggcellrendererkeys.c @@ -1,21 +1,12 @@ #include <config.h> -#include <libintl.h> +#include <glib.h> +#include <glib/gi18n.h> #include <gtk/gtk.h> #include <gdk/gdkx.h> #include <gdk/gdkkeysyms.h> #include "eggcellrendererkeys.h" #include "eggaccelerators.h" -#ifndef EGG_COMPILATION - #ifndef _ - #define _(x) dgettext (GETTEXT_PACKAGE, x) - #define N_(x) x - #endif -#else - #define _(x) x - #define N_(x) x -#endif - #define EGG_CELL_RENDERER_TEXT_PATH "egg-cell-renderer-text" #define TOOLTIP_TEXT _("New shortcut...") diff --git a/capplets/windows/mate-window-properties.c b/capplets/windows/mate-window-properties.c index d8e3f565..ee9eb541 100644 --- a/capplets/windows/mate-window-properties.c +++ b/capplets/windows/mate-window-properties.c @@ -40,10 +40,7 @@ #include "capplet-util.h" #define MARCO_SCHEMA "org.mate.Marco.general" -#define MARCO_THEME_KEY "theme" -#define MARCO_FONT_KEY "titlebar-font" #define MARCO_FOCUS_KEY "focus-mode" -#define MARCO_USE_SYSTEM_FONT_KEY "titlebar-uses-system-font" #define MARCO_AUTORAISE_KEY "auto-raise" #define MARCO_AUTORAISE_DELAY_KEY "auto-raise-delay" #define MARCO_MOUSE_MODIFIER_KEY "mouse-button-modifier" diff --git a/font-viewer/font-view.c b/font-viewer/font-view.c index f24a7d8e..ad9c2078 100644 --- a/font-viewer/font-view.c +++ b/font-viewer/font-view.c @@ -95,7 +95,6 @@ static const gchar *app_menu = " <menu>" "</interface>"; -#define VIEW_ITEM_WIDTH 140 #define VIEW_ITEM_WRAP_WIDTH 128 #define VIEW_COLUMN_SPACING 36 #define VIEW_MARGIN 16 diff --git a/libslab/app-shell.c b/libslab/app-shell.c index ac846019..3cebc120 100644 --- a/libslab/app-shell.c +++ b/libslab/app-shell.c @@ -45,7 +45,6 @@ #include "themed-icon.h" #define TILE_EXEC_NAME "Tile_desktop_exec_name" -#define SECONDS_IN_DAY 86400 #define CC_SCHEMA "org.mate.control-center" #define EXIT_SHELL_ON_ACTION_START "cc-exit-shell-on-action-start" #define EXIT_SHELL_ON_ACTION_HELP "cc-exit-shell-on-action-help" diff --git a/libslab/shell-window.c b/libslab/shell-window.c index a42da069..19f3c5e8 100644 --- a/libslab/shell-window.c +++ b/libslab/shell-window.c @@ -25,8 +25,6 @@ #include "app-resizer.h" -#define SHELL_WINDOW_BORDER_WIDTH 6 - G_DEFINE_TYPE (ShellWindow, shell_window, GTK_TYPE_FRAME); static void diff --git a/libwindow-settings/marco-window-manager.c b/libwindow-settings/marco-window-manager.c index d5f0d840..d57be74b 100644 --- a/libwindow-settings/marco-window-manager.c +++ b/libwindow-settings/marco-window-manager.c @@ -36,7 +36,6 @@ #define MARCO_THEME_KEY "theme" #define MARCO_FONT_KEY "titlebar-font" #define MARCO_FOCUS_KEY "focus-mode" -#define MARCO_USE_SYSTEM_FONT_KEY "titlebar-uses-system-font" #define MARCO_AUTORAISE_KEY "auto-raise" #define MARCO_AUTORAISE_DELAY_KEY "auto-raise-delay" #define MARCO_MOUSE_MODIFIER_KEY "mouse-button-modifier" diff --git a/typing-break/drwright.c b/typing-break/drwright.c index 00c741c0..b4f1b368 100644 --- a/typing-break/drwright.c +++ b/typing-break/drwright.c @@ -49,9 +49,6 @@ #define BLINK_TIMEOUT_FACTOR 100 #endif /* HAVE_APP_INDICATOR */ -#define POPUP_ITEM_ENABLED 1 -#define POPUP_ITEM_BREAK 2 - typedef enum { STATE_START, STATE_RUNNING, |