[gnome-flashback] workarounds: remove
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-flashback] workarounds: remove
- Date: Sat, 17 Nov 2018 20:54:54 +0000 (UTC)
commit ef01fa15797e489d3ec38f40940c35551d15c8ed
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sat Nov 17 22:43:31 2018 +0200
workarounds: remove
GNOME Settings Daemon no longer sets Gtk/ShellShowsAppMenu to TRUE:
https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/b3354d55de82
configure.ac | 7 -
data/schemas/Makefile.am | 1 -
data/schemas/org.gnome.gnome-flashback.gschema.xml | 6 -
...g.gnome.gnome-flashback.workarounds.gschema.xml | 9 -
gnome-flashback/Makefile.am | 2 -
gnome-flashback/gf-application.c | 4 -
gnome-flashback/libworkarounds/Makefile.am | 33 -
gnome-flashback/libworkarounds/gf-workarounds.c | 684 ---------------------
gnome-flashback/libworkarounds/gf-workarounds.h | 32 -
po/POTFILES.in | 1 -
10 files changed, 779 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9a5adff..a92b40d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,12 +247,6 @@ PKG_CHECK_MODULES([STATUS_NOTIFIER_WATCHER], [
gio-unix-2.0 >= $GLIB_REQUIRED
])
-PKG_CHECK_MODULES([WORKAROUNDS], [
- glib-2.0 >= $GLIB_REQUIRED
- gtk+-3.0 >= $GTK_REQUIRED
- x11
-])
-
dnl **************************************************************************
dnl Define XKB base directory
dnl **************************************************************************
@@ -318,7 +312,6 @@ AC_CONFIG_FILES([
gnome-flashback/libsound-applet/Makefile
gnome-flashback/libsound-applet/gvc/Makefile
gnome-flashback/libstatus-notifier-watcher/Makefile
- gnome-flashback/libworkarounds/Makefile
po/Makefile.in
])
diff --git a/data/schemas/Makefile.am b/data/schemas/Makefile.am
index ec0bbb9..95d3c63 100644
--- a/data/schemas/Makefile.am
+++ b/data/schemas/Makefile.am
@@ -7,7 +7,6 @@ gsettings_SCHEMAS = \
org.gnome.gnome-flashback.gschema.xml \
org.gnome.gnome-flashback.desktop-background.gschema.xml \
org.gnome.gnome-flashback.input-sources.gschema.xml \
- org.gnome.gnome-flashback.workarounds.gschema.xml \
$(NULL)
@GSETTINGS_RULES@
diff --git a/data/schemas/org.gnome.gnome-flashback.gschema.xml
b/data/schemas/org.gnome.gnome-flashback.gschema.xml
index 529ae34..9aeee18 100644
--- a/data/schemas/org.gnome.gnome-flashback.gschema.xml
+++ b/data/schemas/org.gnome.gnome-flashback.gschema.xml
@@ -105,11 +105,5 @@
<summary>Status Notifier Watcher</summary>
<description>If set to true, then GNOME Flashback application will be used as Status Notifier
Watcher.</description>
</key>
-
- <key name="workarounds" type="b">
- <default>true</default>
- <summary>Workarounds</summary>
- <description>If set to true, then GNOME Flashback application will use workarounds to fix
bugs.</description>
- </key>
</schema>
</schemalist>
diff --git a/gnome-flashback/Makefile.am b/gnome-flashback/Makefile.am
index 7fc52aa..fc0e3ab 100644
--- a/gnome-flashback/Makefile.am
+++ b/gnome-flashback/Makefile.am
@@ -20,7 +20,6 @@ SUBDIRS = \
libshell \
libsound-applet \
libstatus-notifier-watcher \
- libworkarounds \
$(NULL)
bin_PROGRAMS = \
@@ -79,7 +78,6 @@ gnome_flashback_LDADD = \
$(top_builddir)/gnome-flashback/libshell/libshell.la \
$(top_builddir)/gnome-flashback/libsound-applet/libsound-applet.la \
$(top_builddir)/gnome-flashback/libstatus-notifier-watcher/libstatus-notifier-watcher.la \
- $(top_builddir)/gnome-flashback/libworkarounds/libworkarounds.la \
$(NULL)
gf-resources.c: flashback.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)
--generate-dependencies $(srcdir)/flashback.gresource.xml)
diff --git a/gnome-flashback/gf-application.c b/gnome-flashback/gf-application.c
index d065f4c..40567ae 100644
--- a/gnome-flashback/gf-application.c
+++ b/gnome-flashback/gf-application.c
@@ -41,7 +41,6 @@
#include "libshell/flashback-shell.h"
#include "libsound-applet/gf-sound-applet.h"
#include "libstatus-notifier-watcher/gf-status-notifier-watcher.h"
-#include "libworkarounds/gf-workarounds.h"
struct _GfApplication
{
@@ -73,7 +72,6 @@ struct _GfApplication
GfScreenshot *screenshot;
GfSoundApplet *sound;
GfStatusNotifierWatcher *status_notifier_watcher;
- GfWorkarounds *workarounds;
GtkWidget *display_change_dialog;
};
@@ -173,7 +171,6 @@ settings_changed (GSettings *settings,
SETTING_CHANGED (screenshot, "screenshot", gf_screenshot_new)
SETTING_CHANGED (sound, "sound-applet", gf_sound_applet_new)
SETTING_CHANGED (status_notifier_watcher, "status-notifier-watcher", gf_status_notifier_watcher_new)
- SETTING_CHANGED (workarounds, "workarounds", gf_workarounds_new)
#undef SETTING_CHANGED
@@ -220,7 +217,6 @@ gf_application_dispose (GObject *object)
g_clear_object (&application->screensaver);
g_clear_object (&application->sound);
g_clear_object (&application->status_notifier_watcher);
- g_clear_object (&application->workarounds);
g_clear_pointer (&application->display_change_dialog, gtk_widget_destroy);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3367e17..19c8f4d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,7 +10,6 @@ data/directories/X-GNOME-Flashback-Settings-System.directory.desktop.in
data/schemas/org.gnome.gnome-flashback.gschema.xml
data/schemas/org.gnome.gnome-flashback.desktop-background.gschema.xml
data/schemas/org.gnome.gnome-flashback.input-sources.gschema.xml
-data/schemas/org.gnome.gnome-flashback.workarounds.gschema.xml
data/ui/gf-confirm-display-change-dialog.ui
data/xsessions/gnome-flashback-compiz.desktop.in.in
data/xsessions/gnome-flashback-metacity.desktop.in.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]