[gnome-flashback] desktop-background: remove



commit cfc51b9e96c036e3109071309d4b89722346782f
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Oct 29 02:53:41 2019 +0200

    desktop-background: remove
    
    Next commit will readd background drawing in desktop module.

 configure.ac                                       |   6 -
 data/schemas/Makefile.am                           |   1 -
 ....gnome-flashback.desktop-background.gschema.xml |   9 -
 data/schemas/org.gnome.gnome-flashback.gschema.xml |   7 -
 gnome-flashback/Makefile.am                        |   2 -
 gnome-flashback/gf-application.c                   |   4 -
 gnome-flashback/libdesktop-background/Makefile.am  |  34 ---
 .../libdesktop-background/gf-desktop-background.c  | 239 ---------------------
 .../libdesktop-background/gf-desktop-background.h  |  33 ---
 po/POTFILES.in                                     |   1 -
 10 files changed, 336 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 08253d0..78d565f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,11 +158,6 @@ PKG_CHECK_MODULES([DESKTOP], [
   gtk+-3.0 >= $GTK_REQUIRED
 ])
 
-PKG_CHECK_MODULES([DESKTOP_BACKGROUND], [
-  gtk+-3.0 >= $GTK_REQUIRED
-  gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
-])
-
 PKG_CHECK_MODULES([END_SESSION_DIALOG], [
   gio-unix-2.0 >= $GLIB_REQUIRED
   gtk+-3.0 >= $GTK_REQUIRED
@@ -359,7 +354,6 @@ AC_CONFIG_FILES([
   gnome-flashback/libcommon/Makefile
   gnome-flashback/libclipboard/Makefile
   gnome-flashback/libdesktop/Makefile
-  gnome-flashback/libdesktop-background/Makefile
   gnome-flashback/libend-session-dialog/Makefile
   gnome-flashback/libidle-monitor/Makefile
   gnome-flashback/libinput-settings/Makefile
diff --git a/data/schemas/Makefile.am b/data/schemas/Makefile.am
index 506e1e9..7e75eba 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.gschema.xml \
        org.gnome.gnome-flashback.desktop.background.gschema.xml \
-       org.gnome.gnome-flashback.desktop-background.gschema.xml \
        org.gnome.gnome-flashback.input-sources.gschema.xml \
        $(NULL)
 
diff --git a/data/schemas/org.gnome.gnome-flashback.gschema.xml 
b/data/schemas/org.gnome.gnome-flashback.gschema.xml
index 149576a..3efd816 100644
--- a/data/schemas/org.gnome.gnome-flashback.gschema.xml
+++ b/data/schemas/org.gnome.gnome-flashback.gschema.xml
@@ -33,12 +33,6 @@
       <summary>Desktop</summary>
     </key>
 
-    <key name="desktop-background" type="b">
-      <default>true</default>
-      <summary>Desktop background</summary>
-      <description>If set to true, then GNOME Flashback application will be used to draw the desktop 
background.</description>
-    </key>
-
     <key name="end-session-dialog" type="b">
       <default>true</default>
       <summary>End session dialog</summary>
@@ -117,7 +111,6 @@
     </key>
 
     <child schema="org.gnome.gnome-flashback.desktop" name="desktop" />
-    <child schema="org.gnome.gnome-flashback.desktop-background" name="desktop-background" />
     <child schema="org.gnome.gnome-flashback.input-sources" name="input-sources" />
   </schema>
 </schemalist>
diff --git a/gnome-flashback/Makefile.am b/gnome-flashback/Makefile.am
index 6e1ff49..f7b1f64 100644
--- a/gnome-flashback/Makefile.am
+++ b/gnome-flashback/Makefile.am
@@ -8,7 +8,6 @@ SUBDIRS = \
        libcommon \
        libclipboard \
        libdesktop \
-       libdesktop-background \
        libend-session-dialog \
        libidle-monitor \
        libinput-settings \
@@ -68,7 +67,6 @@ gnome_flashback_LDADD = \
        $(top_builddir)/gnome-flashback/libbluetooth-applet/libbluetooth-applet.la \
        $(top_builddir)/gnome-flashback/libclipboard/libclipboard.la \
        $(top_builddir)/gnome-flashback/libdesktop/libdesktop.la \
-       $(top_builddir)/gnome-flashback/libdesktop-background/libdesktop-background.la \
        $(top_builddir)/gnome-flashback/libend-session-dialog/libend-session-dialog.la \
        $(top_builddir)/gnome-flashback/libidle-monitor/libidle-monitor.la \
        $(top_builddir)/gnome-flashback/libinput-settings/libinput-settings.la \
diff --git a/gnome-flashback/gf-application.c b/gnome-flashback/gf-application.c
index 6b98883..7abbde7 100644
--- a/gnome-flashback/gf-application.c
+++ b/gnome-flashback/gf-application.c
@@ -29,7 +29,6 @@
 #include "libbluetooth-applet/gf-bluetooth-applet.h"
 #include "libclipboard/gf-clipboard.h"
 #include "libdesktop/gf-desktop.h"
-#include "libdesktop-background/gf-desktop-background.h"
 #include "libend-session-dialog/gf-end-session-dialog.h"
 #include "libidle-monitor/flashback-idle-monitor.h"
 #include "libinput-settings/gf-input-settings.h"
@@ -65,7 +64,6 @@ struct _GfApplication
   GfBluetoothApplet       *bluetooth;
   GfClipboard             *clipboard;
   GfDesktop               *desktop;
-  GfDesktopBackground     *background;
   GfEndSessionDialog      *dialog;
   GfInputSettings         *input_settings;
   GfInputSources          *input_sources;
@@ -165,7 +163,6 @@ settings_changed (GSettings   *settings,
   SETTING_CHANGED (audio_device_selection, "audio-device-selection", gf_audio_device_selection_new)
   SETTING_CHANGED (bluetooth, "bluetooth-applet", gf_bluetooth_applet_new)
   SETTING_CHANGED (desktop, "desktop", gf_desktop_new)
-  SETTING_CHANGED (background, "desktop-background", gf_desktop_background_new)
   SETTING_CHANGED (clipboard, "clipboard", gf_clipboard_new)
   SETTING_CHANGED (dialog, "end-session-dialog", gf_end_session_dialog_new)
   SETTING_CHANGED (input_settings, "input-settings", gf_input_settings_new)
@@ -213,7 +210,6 @@ gf_application_dispose (GObject *object)
   g_clear_object (&application->audio_device_selection);
   g_clear_object (&application->bluetooth);
   g_clear_object (&application->desktop);
-  g_clear_object (&application->background);
   g_clear_object (&application->clipboard);
   g_clear_object (&application->dialog);
   g_clear_object (&application->input_settings);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index dc82a7f..a1575ec 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -9,7 +9,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.gschema.xml
 data/schemas/org.gnome.gnome-flashback.desktop.background.gschema.xml
-data/schemas/org.gnome.gnome-flashback.desktop-background.gschema.xml
 data/schemas/org.gnome.gnome-flashback.input-sources.gschema.xml
 data/ui/gf-confirm-display-change-dialog.ui
 data/xsessions/gnome-flashback-compiz.desktop.in.in


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]