From b90041cb958032b3307eb19e0fd37831d54c5d9a Mon Sep 17 00:00:00 2001
From: monsta <monsta@inbox.ru>
Date: Wed, 2 Nov 2016 15:38:24 +0300
Subject: build: require XCursor unconditionally

and drop bundled cursor files (.pcf) - they are not used at all
when XCursor library is in use
---
 capplets/appearance/data/Makefile.am            |   6 ----
 capplets/appearance/data/appearance.ui          |  36 ------------------------
 capplets/appearance/data/cursor-large-white.pcf | Bin 18636 -> 0 bytes
 capplets/appearance/data/cursor-large.pcf       | Bin 17432 -> 0 bytes
 capplets/appearance/data/cursor-white.pcf       | Bin 13848 -> 0 bytes
 5 files changed, 42 deletions(-)
 delete mode 100644 capplets/appearance/data/cursor-large-white.pcf
 delete mode 100644 capplets/appearance/data/cursor-large.pcf
 delete mode 100644 capplets/appearance/data/cursor-white.pcf

(limited to 'capplets/appearance/data')

diff --git a/capplets/appearance/data/Makefile.am b/capplets/appearance/data/Makefile.am
index 72ace798..ff85ab63 100644
--- a/capplets/appearance/data/Makefile.am
+++ b/capplets/appearance/data/Makefile.am
@@ -17,12 +17,6 @@ dist_pixmap_DATA = \
         mouse-cursor-white.png \
         mouse-cursor-white-large.png
 
-cursorfontdir   = $(datadir)/mate/cursor-fonts
-dist_cursorfont_DATA = \
-	cursor-large.pcf		\
-	cursor-white.pcf		\
-	cursor-large-white.pcf
-
 @INTLTOOL_DESKTOP_RULE@
 
 desktopdir = $(datadir)/applications
diff --git a/capplets/appearance/data/appearance.ui b/capplets/appearance/data/appearance.ui
index 91619bb1..bec649ea 100644
--- a/capplets/appearance/data/appearance.ui
+++ b/capplets/appearance/data/appearance.ui
@@ -2586,42 +2586,6 @@
                 <property name="border_width">12</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
-                <child>
-                  <object class="GtkHBox" id="cursor_message_hbox">
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="no_show_all">True</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkImage" id="image3">
-                        <property name="visible">True</property>
-                        <property name="stock">gtk-dialog-info</property>
-                        <property name="icon-size">5</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label5">
-                        <property name="width_request">280</property>
-                        <property name="visible">True</property>
-                        <property name="label" translatable="yes">Changing your cursor theme takes effect the next time you log in.</property>
-                        <property name="wrap">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow8">
                     <property name="height_request">200</property>
diff --git a/capplets/appearance/data/cursor-large-white.pcf b/capplets/appearance/data/cursor-large-white.pcf
deleted file mode 100644
index e1d7b631..00000000
Binary files a/capplets/appearance/data/cursor-large-white.pcf and /dev/null differ
diff --git a/capplets/appearance/data/cursor-large.pcf b/capplets/appearance/data/cursor-large.pcf
deleted file mode 100644
index 6580b33d..00000000
Binary files a/capplets/appearance/data/cursor-large.pcf and /dev/null differ
diff --git a/capplets/appearance/data/cursor-white.pcf b/capplets/appearance/data/cursor-white.pcf
deleted file mode 100644
index bc9932c3..00000000
Binary files a/capplets/appearance/data/cursor-white.pcf and /dev/null differ
-- 
cgit v1.2.1