[mutter] Remove old, deprecated utilities that nobody has used in a million years
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] Remove old, deprecated utilities that nobody has used in a million years
- Date: Tue, 13 Aug 2013 13:44:46 +0000 (UTC)
commit 8c1c77482db263a7dcc04051a9694f30a852b702
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Wed Jul 17 23:15:02 2013 -0400
Remove old, deprecated utilities that nobody has used in a million years
https://bugzilla.gnome.org/show_bug.cgi?id=704437
configure.ac | 8 -
src/Makefile.am | 12 +-
src/core/display.c | 21 -
src/core/keybindings-private.h | 1 -
src/core/keybindings.c | 25 -
src/core/main.c | 8 +-
src/meta/atomnames.h | 3 -
src/meta/preview-widget.h | 87 ---
src/meta/theme.h | 3 +-
src/tools/.cvsignore | 8 -
src/tools/Makefile.am | 34 -
src/tools/mutter-grayscale.c | 107 ---
src/tools/mutter-mag.c | 299 ---------
src/tools/mutter-message.c | 160 -----
src/tools/mutter-window-demo.c | 1049 -----------------------------
src/tools/mutter-window-demo.png | Bin 3453 -> 0 bytes
src/ui/preview-widget.c | 496 --------------
src/ui/theme-viewer.c | 1365 --------------------------------------
src/ui/theme.c | 3 +-
src/ui/ui.c | 5 +-
src/ui/ui.h | 3 +-
src/wm-tester/.cvsignore | 7 -
src/wm-tester/Makefile.am | 33 -
src/wm-tester/focus-window.c | 37 -
src/wm-tester/main.c | 245 -------
src/wm-tester/test-attached.c | 100 ---
src/wm-tester/test-focus.c | 362 ----------
src/wm-tester/test-gravity.c | 308 ---------
src/wm-tester/test-resizing.c | 257 -------
src/wm-tester/test-size-hints.c | 136 ----
30 files changed, 10 insertions(+), 5172 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index dbb3aca..9baf35b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,9 +118,6 @@ AM_GLIB_GNU_GETTEXT
## here we get the flags we'll actually use
# GRegex requires Glib-2.14.0
PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.14.0)
-# gtk_window_set_icon_name requires gtk2+-2.6.0
-PKG_CHECK_MODULES(MUTTER_MESSAGE, gtk+-3.0)
-PKG_CHECK_MODULES(MUTTER_WINDOW_DEMO, gtk+-3.0)
# Unconditionally use this dir to avoid a circular dep with gnomecc
GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
@@ -307,9 +304,6 @@ if test "x$found_xsync" = "xyes"; then
fi
MUTTER_LIBS="$MUTTER_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
-MUTTER_MESSAGE_LIBS="$MUTTER_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-MUTTER_WINDOW_DEMO_LIBS="$MUTTER_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
-MUTTER_PROPS_LIBS="$MUTTER_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
found_sm=no
case "$MUTTER_LIBS" in
@@ -439,10 +433,8 @@ doc/man/Makefile
doc/reference/Makefile
doc/reference/meta-docs.sgml
src/Makefile
-src/wm-tester/Makefile
src/libmutter.pc
src/mutter-plugins.pc
-src/tools/Makefile
src/compositor/plugins/Makefile
po/Makefile.in
])
diff --git a/src/Makefile.am b/src/Makefile.am
index 22cce62..c936a72 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@
lib_LTLIBRARIES = libmutter.la
-SUBDIRS=wm-tester tools compositor/plugins
+SUBDIRS=compositor/plugins
INCLUDES= \
-DCLUTTER_ENABLE_EXPERIMENTAL_API \
@@ -156,8 +156,6 @@ libmutter_la_SOURCES = \
meta/theme.h \
ui/theme-private.h \
ui/ui.c \
- meta/preview-widget.h \
- ui/preview-widget.c \
$(mutter_built_sources)
libmutter_la_LDFLAGS = -no-undefined
@@ -195,7 +193,6 @@ libmutterinclude_base_headers = \
# Excluded from scanning for introspection but installed
# atomnames.h: macros cause problems for scanning process
libmutterinclude_extra_headers = \
- meta/preview-widget.h \
meta/atomnames.h
libmutterincludedir = $(includedir)/mutter/meta
@@ -204,11 +201,6 @@ libmutterinclude_HEADERS = \
$(libmutterinclude_base_headers) \
$(libmutterinclude_extra_headers)
-mutter_theme_viewer_SOURCES= \
- ui/theme-viewer.c
-
-bin_PROGRAMS=mutter mutter-theme-viewer
-
mutter_SOURCES = core/mutter.c
mutter_LDADD = $(MUTTER_LIBS) libmutter.la
@@ -245,8 +237,6 @@ Meta-$(api_version).gir: libmutter.la
endif
-mutter_theme_viewer_LDADD= $(MUTTER_LIBS) libmutter.la
-
testboxes_SOURCES = core/testboxes.c
testgradient_SOURCES = ui/testgradient.c
testasyncgetprop_SOURCES = core/testasyncgetprop.c
diff --git a/src/core/display.c b/src/core/display.c
index 9d5a87c..e39361e 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -3043,27 +3043,6 @@ event_callback (XEvent *event,
}
}
else if (event->xclient.message_type ==
- display->atom__MUTTER_RELOAD_THEME_MESSAGE)
- {
- meta_verbose ("Received reload theme request\n");
- meta_ui_set_current_theme (meta_prefs_get_theme (),
- TRUE);
- meta_display_retheme_all ();
- }
- else if (event->xclient.message_type ==
- display->atom__MUTTER_SET_KEYBINDINGS_MESSAGE)
- {
- meta_verbose ("Received set keybindings request = %d\n",
- (int) event->xclient.data.l[0]);
- meta_set_keybindings_disabled (!event->xclient.data.l[0]);
- }
- else if (event->xclient.message_type ==
- display->atom__MUTTER_TOGGLE_VERBOSE)
- {
- meta_verbose ("Received toggle verbose message\n");
- meta_set_verbose (!meta_is_verbose ());
- }
- else if (event->xclient.message_type ==
display->atom_WM_PROTOCOLS)
{
meta_verbose ("Received WM_PROTOCOLS message\n");
diff --git a/src/core/keybindings-private.h b/src/core/keybindings-private.h
index c8a12b1..c47aacd 100644
--- a/src/core/keybindings-private.h
+++ b/src/core/keybindings-private.h
@@ -69,7 +69,6 @@ void meta_window_ungrab_all_keys (MetaWindow *window,
gboolean meta_display_process_key_event (MetaDisplay *display,
MetaWindow *window,
XIDeviceEvent *event);
-void meta_set_keybindings_disabled (gboolean setting);
void meta_display_process_mapping_event (MetaDisplay *display,
XEvent *event);
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 135dac5..8439ea8 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -56,8 +56,6 @@
#define SCHEMA_COMMON_KEYBINDINGS "org.gnome.desktop.wm.keybindings"
#define SCHEMA_MUTTER_KEYBINDINGS "org.gnome.mutter.keybindings"
-static gboolean all_bindings_disabled = FALSE;
-
static gboolean add_builtin_keybinding (MetaDisplay *display,
const char *name,
GSettings *settings,
@@ -2046,21 +2044,6 @@ meta_display_process_key_event (MetaDisplay *display,
const char *str;
MetaScreen *screen;
- if (all_bindings_disabled)
- {
- /* In this mode, we try to pretend we don't have grabs, so we
- * immediately replay events and drop the grab. (This still
- * messes up global passive grabs from other clients.) The
- * FALSE return here is a little suspect, but we don't really
- * know if we'll see the event again or not, and it's pretty
- * poorly defined how this mode is supposed to interact with
- * plugins.
- */
- XIAllowEvents (display->xdisplay, event->deviceid,
- XIReplayDevice, event->time);
- return FALSE;
- }
-
/* if key event was on root window, we have a shortcut */
screen = meta_display_screen_for_root (display, event->event);
@@ -4098,14 +4081,6 @@ handle_set_spew_mark (MetaDisplay *display,
meta_verbose ("-- MARK MARK MARK MARK --\n");
}
-void
-meta_set_keybindings_disabled (gboolean setting)
-{
- all_bindings_disabled = setting;
- meta_topic (META_DEBUG_KEYBINDINGS,
- "Keybindings %s\n", all_bindings_disabled ? "disabled" : "enabled");
-}
-
/**
* meta_keybindings_set_custom_handler:
* @name: The name of the keybinding to set
diff --git a/src/core/main.c b/src/core/main.c
index 4bec3d2..767a8b8 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -514,14 +514,14 @@ meta_run (void)
if (g_getenv ("MUTTER_G_FATAL_WARNINGS") != NULL)
g_log_set_always_fatal (G_LOG_LEVEL_MASK);
- meta_ui_set_current_theme (meta_prefs_get_theme (), FALSE);
+ meta_ui_set_current_theme (meta_prefs_get_theme ());
/* Try to find some theme that'll work if the theme preference
* doesn't exist. First try Simple (the default theme) then just
* try anything in the themes directory.
*/
if (!meta_ui_have_a_theme ())
- meta_ui_set_current_theme ("Simple", FALSE);
+ meta_ui_set_current_theme ("Simple");
if (!meta_ui_have_a_theme ())
{
@@ -539,7 +539,7 @@ meta_run (void)
while (((dir_entry = g_dir_read_name (themes_dir)) != NULL) &&
(!meta_ui_have_a_theme ()))
{
- meta_ui_set_current_theme (dir_entry, FALSE);
+ meta_ui_set_current_theme (dir_entry);
}
g_dir_close (themes_dir);
@@ -598,7 +598,7 @@ prefs_changed_callback (MetaPreference pref,
{
case META_PREF_THEME:
case META_PREF_DRAGGABLE_BORDER_WIDTH:
- meta_ui_set_current_theme (meta_prefs_get_theme (), FALSE);
+ meta_ui_set_current_theme (meta_prefs_get_theme ());
meta_display_retheme_all ();
break;
diff --git a/src/meta/atomnames.h b/src/meta/atomnames.h
index 1223151..2a62873 100644
--- a/src/meta/atomnames.h
+++ b/src/meta/atomnames.h
@@ -54,9 +54,6 @@ item(WM_WINDOW_ROLE)
item(UTF8_STRING)
item(WM_ICON_SIZE)
item(_KWM_WIN_ICON)
-item(_MUTTER_RELOAD_THEME_MESSAGE)
-item(_MUTTER_SET_KEYBINDINGS_MESSAGE)
-item(_MUTTER_TOGGLE_VERBOSE)
item(_MUTTER_HINTS)
item(_GTK_THEME_VARIANT)
item(_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED)
diff --git a/src/meta/theme.h b/src/meta/theme.h
index a6aa5d8..5ecb76c 100644
--- a/src/meta/theme.h
+++ b/src/meta/theme.h
@@ -33,8 +33,7 @@
typedef struct _MetaTheme MetaTheme;
MetaTheme* meta_theme_get_current (void);
-void meta_theme_set_current (const char *name,
- gboolean force_reload);
+void meta_theme_set_current (const char *name);
MetaTheme* meta_theme_new (void);
void meta_theme_free (MetaTheme *theme);
diff --git a/src/ui/theme.c b/src/ui/theme.c
index c841a0c..fb11f0d 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -5071,8 +5071,7 @@ meta_theme_set_current (const char *name,
meta_topic (META_DEBUG_THEMES, "Setting current theme to \"%s\"\n", name);
- if (!force_reload &&
- meta_current_theme &&
+ if (meta_current_theme &&
strcmp (name, meta_current_theme->name) == 0)
return;
diff --git a/src/ui/ui.c b/src/ui/ui.c
index 265ecfc..fc6fb4d 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -769,10 +769,9 @@ meta_ui_theme_get_frame_borders (MetaUI *ui,
}
void
-meta_ui_set_current_theme (const char *name,
- gboolean force_reload)
+meta_ui_set_current_theme (const char *name)
{
- meta_theme_set_current (name, force_reload);
+ meta_theme_set_current (name);
meta_invalidate_default_icons ();
}
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 2ea3ca1..e397c43 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -154,8 +154,7 @@ gboolean meta_ui_window_should_not_cause_focus (Display *xdisplay,
char* meta_text_property_to_utf8 (Display *xdisplay,
const XTextProperty *prop);
-void meta_ui_set_current_theme (const char *name,
- gboolean force_reload);
+void meta_ui_set_current_theme (const char *name);
gboolean meta_ui_have_a_theme (void);
/* Not a real key symbol but means "key above the tab key"; this is
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
