[gnome-flashback] sound-applet: remove
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-flashback] sound-applet: remove
- Date: Fri, 27 Dec 2019 19:45:00 +0000 (UTC)
commit c9a6926cd06b67ae5aa1f91d40ea83edbed1a51c
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Fri Dec 27 21:37:41 2019 +0200
sound-applet: remove
configure.ac | 7 -
data/schemas/org.gnome.gnome-flashback.gschema.xml | 6 -
gnome-flashback/Makefile.am | 2 -
gnome-flashback/gf-application.c | 4 -
gnome-flashback/libsound-applet/Makefile.am | 39 -
gnome-flashback/libsound-applet/gf-sound-applet.c | 294 --------
gnome-flashback/libsound-applet/gf-sound-applet.h | 33 -
gnome-flashback/libsound-applet/gvc-channel-bar.c | 642 -----------------
gnome-flashback/libsound-applet/gvc-channel-bar.h | 71 --
.../libsound-applet/gvc-stream-status-icon.c | 788 ---------------------
.../libsound-applet/gvc-stream-status-icon.h | 61 --
po/POTFILES.in | 3 -
12 files changed, 1950 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f2578da..9f1b5d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -242,12 +242,6 @@ PKG_CHECK_MODULES([SHELL], [
gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
])
-PKG_CHECK_MODULES([SOUND_APPLET], [
- gtk+-3.0 >= $GTK_REQUIRED
- libcanberra-gtk3 >= $CANBERRA_REQUIRED
- glib-2.0 >= $GLIB_REQUIRED
-])
-
PKG_CHECK_MODULES([STATUS_NOTIFIER_WATCHER], [
glib-2.0 >= $GLIB_REQUIRED
gio-unix-2.0 >= $GLIB_REQUIRED
@@ -421,7 +415,6 @@ AC_CONFIG_FILES([
gnome-flashback/libscreensaver/Makefile
gnome-flashback/libscreenshot/Makefile
gnome-flashback/libshell/Makefile
- gnome-flashback/libsound-applet/Makefile
gnome-flashback/libstatus-notifier-watcher/Makefile
gvc/Makefile
diff --git a/data/schemas/org.gnome.gnome-flashback.gschema.xml
b/data/schemas/org.gnome.gnome-flashback.gschema.xml
index 7d76ea7..d737a1b 100644
--- a/data/schemas/org.gnome.gnome-flashback.gschema.xml
+++ b/data/schemas/org.gnome.gnome-flashback.gschema.xml
@@ -91,12 +91,6 @@
<description>If set to true, then GNOME Flashback application will be used as a shell.</description>
</key>
- <key name="sound-applet" type="b">
- <default>true</default>
- <summary>Sound applet</summary>
- <description>If set to true, then GNOME Flashback application will be used to show a sound applet.
This is the same sound applet that used to be a part of GNOME Control Center.</description>
- </key>
-
<key name="status-notifier-watcher" type="b">
<default>true</default>
<summary>Status Notifier Watcher</summary>
diff --git a/gnome-flashback/Makefile.am b/gnome-flashback/Makefile.am
index ef17c90..32f4ca1 100644
--- a/gnome-flashback/Makefile.am
+++ b/gnome-flashback/Makefile.am
@@ -18,7 +18,6 @@ SUBDIRS = \
libscreensaver \
libscreenshot \
libshell \
- libsound-applet \
libstatus-notifier-watcher \
$(NULL)
@@ -76,7 +75,6 @@ gnome_flashback_LDADD = \
$(top_builddir)/gnome-flashback/libscreensaver/libscreensaver.la \
$(top_builddir)/gnome-flashback/libscreenshot/libscreenshot.la \
$(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 \
$(NULL)
diff --git a/gnome-flashback/gf-application.c b/gnome-flashback/gf-application.c
index f33b18b..8b212ed 100644
--- a/gnome-flashback/gf-application.c
+++ b/gnome-flashback/gf-application.c
@@ -39,7 +39,6 @@
#include "libscreensaver/gf-screensaver.h"
#include "libscreenshot/gf-screenshot.h"
#include "libshell/flashback-shell.h"
-#include "libsound-applet/gf-sound-applet.h"
#include "libstatus-notifier-watcher/gf-status-notifier-watcher.h"
struct _GfApplication
@@ -70,7 +69,6 @@ struct _GfApplication
GfScreencast *screencast;
GfScreensaver *screensaver;
GfScreenshot *screenshot;
- GfSoundApplet *sound;
GfStatusNotifierWatcher *status_notifier_watcher;
GtkWidget *display_change_dialog;
@@ -226,7 +224,6 @@ settings_changed (GSettings *settings,
SETTING_CHANGED (screencast, "screencast", gf_screencast_new)
SETTING_CHANGED (screensaver, "screensaver", gf_screensaver_new)
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)
#undef SETTING_CHANGED
@@ -272,7 +269,6 @@ gf_application_dispose (GObject *object)
g_clear_object (&application->screencast);
g_clear_object (&application->screenshot);
g_clear_object (&application->screensaver);
- g_clear_object (&application->sound);
g_clear_object (&application->status_notifier_watcher);
g_clear_pointer (&application->display_change_dialog, gtk_widget_destroy);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d958076..fbde18b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -38,9 +38,6 @@ gnome-flashback/libpolkit/flashback-listener.c
gnome-flashback/libpolkit/flashback-polkit-dialog.c
gnome-flashback/libpolkit/flashback-polkit-dialog.ui
gnome-flashback/libscreensaver/gf-auth.c
-gnome-flashback/libsound-applet/gf-sound-applet.c
-gnome-flashback/libsound-applet/gvc-channel-bar.c
-gnome-flashback/libsound-applet/gvc-stream-status-icon.c
gvc/gvc/gvc-mixer-control.c
system-indicators/si-bluetooth.c
system-indicators/si-desktop-menu-item.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]