Remove libslab library

libslab is only used in mate-c-c and there is no need to provide a library
author: zhuyaliang <[email protected]> 2023-10-25 21:43:03 +0800
committer: raveit65 <[email protected]> 2023-11-05 12:00:50 +0100
commit: c2e94e1925f3c7acfa3fd3352dc8fdafe6375adc (patch)
tree: 3ba609bf57b7bb3eab18d35d78bd1dc86773fba6
parent: 23fc7b675ebac7a9b02257a31203974d72f584b1 (diff)
download: mate-control-center-c2e94e1925f3c7acfa3fd3352dc8fdafe6375adc.tar.bz2
mate-control-center-c2e94e1925f3c7acfa3fd3352dc8fdafe6375adc.tar.xz
38 files changed, 55 insertions, 120 deletions
diff --git a/Makefile.am b/Makefile.am
index 134c64ad..39d34639 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,15 +3,9 @@ PO_SUBDIR = po
 endif
 
 SUBDIRS = $(PO_SUBDIR) capplets font-viewer help man
-DIST_SUBDIRS = po capplets font-viewer help libslab shell typing-break man
+DIST_SUBDIRS = po capplets font-viewer help shell typing-break man
 
-if HAVE_LIBMATESLAB
-SUBDIRS += libslab
-endif
-
-if HAVE_LIBMATESLAB
 SUBDIRS += shell
-endif
 
 if HAVE_TYPING_BREAK
 SUBDIRS += typing-break
diff --git a/configure.ac b/configure.ac
index 30ff9ca3..a4272e1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,7 +111,7 @@ COMMON_MODULES="gtk+-3.0 >= $GTK_REQUIRED dnl
 mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED"
 PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
 PKG_CHECK_MODULES(MATECC, $COMMON_MODULES libmate-menu >= 1.21.0)
-PKG_CHECK_MODULES(MATECC_SHELL, $COMMON_MODULES libmate-menu)
+PKG_CHECK_MODULES(MATECC_SHELL, $COMMON_MODULES libmate-menu librsvg-2.0 pango)
 
 PKG_CHECK_MODULES(POLKIT, polkit-gobject-1)
 PKG_CHECK_MODULES(MATE_DESKTOP, mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED)
@@ -136,20 +136,8 @@ AC_SUBST(GTK_ENGINE_DIR)
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED $GMODULE_ADD)
 
-dnl
-dnl Check dependencies of libmate-slab
-dnl
-PKG_CHECK_MODULES(LIBSLAB, [
- gio-2.0 mate-desktop-2.0 librsvg-2.0 libmate-menu pango
- ],
- have_libmateslab=yes,
- have_libmateslab=no)
-
-AC_SUBST(LIBMATESLAB_CFLAGS)
-AC_SUBST(LIBMATESLAB_LIBS)
-AC_SUBST(WARN_CFLAGS)
 
-AM_CONDITIONAL(HAVE_LIBMATESLAB, [test $have_libmateslab = yes])
+AC_SUBST(LIBMATECC_SHELL_CFLAGS)
 
 dnl
 dnl Check dependencies of accountsservice
@@ -301,8 +289,6 @@ font-viewer/Makefile
 help/Makefile
 man/Makefile
 po/Makefile.in
-libslab/mate-slab.pc
-libslab/Makefile
 shell/Makefile
 typing-break/Makefile
 ])
@@ -328,7 +314,6 @@ Configure summary:
 Ayatana AppIndicator (preferred) $(test "x$enable_appindicator" = xyes && echo no || echo yes)
 Ubuntu AppIndicator (legacy) $(test "x$enable_appindicator" = xyes && echo yes || echo no)
 
- Libmate-slab: ${have_libmateslab}
 Accountsservice: ${have_accountsservice}
 Native Language support: ${USE_NLS}
 "
diff --git a/libslab/Makefile.am b/libslab/Makefile.am
deleted file mode 100644
index df720566..00000000
--- a/libslab/Makefile.am
+++ /dev/null
@@ -1,71 +0,0 @@
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = mate-slab.pc
-
-AM_CPPFLAGS = \
- -DG_LOG_DOMAIN=\"libslab\" \
- -I$(top_srcdir) \
- $(LIBSLAB_CFLAGS) \
- $(WARN_CFLAGS)
-
-HEADER_FILES= \
- $(BUILT_SOURCES) \
- app-resizer.h \
- app-shell.h \
- application-tile.h \
- bookmark-agent.h \
- double-click-detector.h \
- mate-utils.h \
- libslab-utils.h \
- nameplate-tile.h \
- search-bar.h \
- shell-window.h \
- slab-mate-util.h \
- slab-section.h \
- slab.h \
- tile.h
-
-lib_LTLIBRARIES = libmate-slab.la
-
-libmate_slab_la_SOURCES = \
- $(MARSHAL_GENERATED) \
- app-resizer.c \
- app-shell.c \
- application-tile.c \
- bookmark-agent.c \
- double-click-detector.c \
- mate-utils.c \
- libslab-utils.c \
- nameplate-tile.c \
- search-bar.c \
- shell-window.c \
- slab-mate-util.c \
- slab-section.c \
- themed-icon.c \
- themed-icon.h \
- tile-action.c \
- tile.c
-
-libmate_slab_includedir = $(includedir)/libmate-slab
-libmate_slab_include_HEADERS = $(HEADER_FILES)
-libmate_slab_la_LIBADD = $(LIBSLAB_LIBS)
-
-MARSHAL_GENERATED = nld-marshal.c nld-marshal.h
-
-nld-marshal.h: nld-marshal.list
- ( @GLIB_GENMARSHAL@ --prefix=nld_marshal $(srcdir)/nld-marshal.list --header > nld-marshal.tmp \
- && mv nld-marshal.tmp nld-marshal.h ) \
- || ( rm -f nld-marshal.tmp && exit 1 )
-
-nld-marshal.c: nld-marshal.h
- ( (echo '#include "nld-marshal.h"'; @GLIB_GENMARSHAL@ --prefix=nld_marshal $(srcdir)/nld-marshal.list --body) > nld-marshal.tmp \
- && mv nld-marshal.tmp nld-marshal.c ) \
- || ( rm -f nld-marshal.tmp && exit 1 )
-
-
-BUILT_SOURCES = $(MARSHAL_GENERATED)
-
-CLEANFILES = $(MARSHAL_GENERATED)
-
-EXTRA_DIST = nld-marshal.list
-
--include $(top_srcdir)/git.mk
diff --git a/libslab/mate-slab.pc.in b/libslab/mate-slab.pc.in
deleted file mode 100644
index 074fa8f2..00000000
--- a/libslab/mate-slab.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: mate-slab
-Description: Beautiful App Slab
-Requires: glib-2.0 gobject-2.0 gio-2.0 gtk+-3.0 mate-desktop-2.0 libmate-menu
-Requires.private: gdk-3.0 librsvg-2.0
-Version: @VERSION@
-Libs: -L${libdir} -lmate-slab
-Cflags: -I${includedir}/libmate-slab
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 02c194ae..41edb47a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -90,7 +90,7 @@ typing-break/main.c
 font-viewer/font-view.c
 font-viewer/mate-font-viewer.desktop.in
 font-viewer/font-thumbnailer.c
-libslab/app-shell.c
-libslab/application-tile.c
-libslab/bookmark-agent.c
-libslab/search-bar.c
+shell/app-shell.c
+shell/application-tile.c
+shell/bookmark-agent.c
+shell/search-bar.c
diff --git a/shell/Makefile.am b/shell/Makefile.am
index d3e4d8bd..5f0b5f7d 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,21 +1,48 @@
-REAL_LIBSLAB_CFLAGS = -I$(top_srcdir)/libslab
-REAL_LIBSLAB_LIBS = $(top_builddir)/libslab/libmate-slab.la
-
 AM_CPPFLAGS = \
 -I$(top_srcdir) \
 $(WARN_CFLAGS) \
- $(REAL_LIBSLAB_CFLAGS) \
 $(MATECC_SHELL_CFLAGS) \
 -DMATELOCALEDIR="\"$(datadir)/locale\""
 
 bin_PROGRAMS = mate-control-center
 
 mate_control_center_SOURCES = \
- control-center.c
+ $(MARSHAL_GENERATED) \
+ app-resizer.c \
+ app-shell.c \
+ application-tile.c \
+ bookmark-agent.c \
+ control-center.c \
+ double-click-detector.c \
+ mate-utils.c \
+ libslab-utils.c \
+ nameplate-tile.c \
+ search-bar.c \
+ shell-window.c \
+ slab-mate-util.c \
+ slab-section.c \
+ themed-icon.c \
+ themed-icon.h \
+ tile-action.c \
+ tile.c \
+ application-tile.h \
+ app-resizer.h \
+ app-shell.h \
+ bookmark-agent.h \
+ double-click-detector.h \
+ libslab-utils.h \
+ mate-utils.h \
+ nameplate-tile.h \
+ search-bar.h \
+ shell-window.h \
+ slab.h \
+ slab-mate-util.h \
+ slab-section.h \
+ themed-icon.h \
+ tile.h
 
 mate_control_center_LDADD = \
- $(MATECC_SHELL_LIBS) \
- $(REAL_LIBSLAB_LIBS)
+ $(MATECC_SHELL_LIBS)
 
 sysdir = $(datadir)/applications
 sys_in_files = matecc.desktop.in
@@ -37,10 +64,22 @@ else
 $(AM_V_GEN) sed '/^# Translators/d' < $< > $@
 endif
 
+MARSHAL_GENERATED = nld-marshal.c nld-marshal.h
+
+nld-marshal.h: nld-marshal.list
+ ( @GLIB_GENMARSHAL@ --prefix=nld_marshal $(srcdir)/nld-marshal.list --header > nld-marshal.tmp \
+ && mv nld-marshal.tmp nld-marshal.h ) \
+ || ( rm -f nld-marshal.tmp && exit 1 )
+
+nld-marshal.c: nld-marshal.h
+ ( (echo '#include "nld-marshal.h"'; @GLIB_GENMARSHAL@ --prefix=nld_marshal $(srcdir)/nld-marshal.list --body) > nld-marshal.tmp \
+ && mv nld-marshal.tmp nld-marshal.c ) \
+ || ( rm -f nld-marshal.tmp && exit 1 )
+
 menudir = $(sysconfdir)/xdg/menus
 menu_DATA = matecc.menu
 
-EXTRA_DIST = $(sys_in_files) matecc.directory.desktop.in matecc.menu
+EXTRA_DIST = $(sys_in_files) matecc.directory.desktop.in matecc.menu nld-marshal.list
 
 DISTCLEANFILES = $(sys_DATA) matecc.directory
 
diff --git a/libslab/app-resizer.c b/shell/app-resizer.c
index 0e1a15b8..0e1a15b8 100644
--- a/libslab/app-resizer.c
+++ b/shell/app-resizer.c
diff --git a/libslab/app-resizer.h b/shell/app-resizer.h
index 1c65f533..1c65f533 100644
--- a/libslab/app-resizer.h
+++ b/shell/app-resizer.h
diff --git a/libslab/app-shell.c b/shell/app-shell.c
index 0e681c2e..0e681c2e 100644
--- a/libslab/app-shell.c
+++ b/shell/app-shell.c
diff --git a/libslab/app-shell.h b/shell/app-shell.h
index 97e22b60..97e22b60 100644
--- a/libslab/app-shell.h
+++ b/shell/app-shell.h
diff --git a/libslab/application-tile.c b/shell/application-tile.c
index ab1b4cf5..ab1b4cf5 100644
--- a/libslab/application-tile.c
+++ b/shell/application-tile.c
diff --git a/libslab/application-tile.h b/shell/application-tile.h
index dea0bde9..dea0bde9 100644
--- a/libslab/application-tile.h
+++ b/shell/application-tile.h
diff --git a/libslab/bookmark-agent.c b/shell/bookmark-agent.c
index 0f5f1bee..0f5f1bee 100644
--- a/libslab/bookmark-agent.c
+++ b/shell/bookmark-agent.c
diff --git a/libslab/bookmark-agent.h b/shell/bookmark-agent.h
index f54415bf..f54415bf 100644
--- a/libslab/bookmark-agent.h
+++ b/shell/bookmark-agent.h
diff --git a/shell/control-center.c b/shell/control-center.c
index 2bdc741c..f0f391c4 100644
--- a/shell/control-center.c
+++ b/shell/control-center.c
@@ -23,7 +23,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gio/gio.h>
-#include <libslab/slab.h>
+#include "slab.h"
 
 void handle_static_action_clicked(Tile* tile, TileEvent* event, gpointer data);
 static GSList* get_actions_list(void);
diff --git a/libslab/double-click-detector.c b/shell/double-click-detector.c
index e6874d11..e6874d11 100644
--- a/libslab/double-click-detector.c
+++ b/shell/double-click-detector.c
diff --git a/libslab/double-click-detector.h b/shell/double-click-detector.h
index 4a745d8e..4a745d8e 100644
--- a/libslab/double-click-detector.h
+++ b/shell/double-click-detector.h
diff --git a/libslab/libslab-utils.c b/shell/libslab-utils.c
index 5ee4d09c..5ee4d09c 100644
--- a/libslab/libslab-utils.c
+++ b/shell/libslab-utils.c
diff --git a/libslab/libslab-utils.h b/shell/libslab-utils.h
index 069ff3c7..069ff3c7 100644
--- a/libslab/libslab-utils.h
+++ b/shell/libslab-utils.h
diff --git a/libslab/mate-utils.c b/shell/mate-utils.c
index e42d02c4..e42d02c4 100644
--- a/libslab/mate-utils.c
+++ b/shell/mate-utils.c
diff --git a/libslab/mate-utils.h b/shell/mate-utils.h
index 0fa4cd3f..0fa4cd3f 100644
--- a/libslab/mate-utils.h
+++ b/shell/mate-utils.h
diff --git a/libslab/nameplate-tile.c b/shell/nameplate-tile.c
index 7d14452c..7d14452c 100644
--- a/libslab/nameplate-tile.c
+++ b/shell/nameplate-tile.c
diff --git a/libslab/nameplate-tile.h b/shell/nameplate-tile.h
index d51ff40f..d51ff40f 100644
--- a/libslab/nameplate-tile.h
+++ b/shell/nameplate-tile.h
diff --git a/libslab/nld-marshal.list b/shell/nld-marshal.list
index 30ba5d8d..30ba5d8d 100644
--- a/libslab/nld-marshal.list
+++ b/shell/nld-marshal.list
diff --git a/libslab/search-bar.c b/shell/search-bar.c
index f560f649..f560f649 100644
--- a/libslab/search-bar.c
+++ b/shell/search-bar.c
diff --git a/libslab/search-bar.h b/shell/search-bar.h
index fca5216d..fca5216d 100644
--- a/libslab/search-bar.h
+++ b/shell/search-bar.h
diff --git a/libslab/shell-window.c b/shell/shell-window.c
index 19f3c5e8..19f3c5e8 100644
--- a/libslab/shell-window.c
+++ b/shell/shell-window.c
diff --git a/libslab/shell-window.h b/shell/shell-window.h
index 2aa51e3f..2aa51e3f 100644
--- a/libslab/shell-window.h
+++ b/shell/shell-window.h
diff --git a/libslab/slab-mate-util.c b/shell/slab-mate-util.c
index b036de18..b036de18 100644
--- a/libslab/slab-mate-util.c
+++ b/shell/slab-mate-util.c
diff --git a/libslab/slab-mate-util.h b/shell/slab-mate-util.h
index 211e76c4..211e76c4 100644
--- a/libslab/slab-mate-util.h
+++ b/shell/slab-mate-util.h
diff --git a/libslab/slab-section.c b/shell/slab-section.c
index f86820cf..f86820cf 100644
--- a/libslab/slab-section.c
+++ b/shell/slab-section.c
diff --git a/libslab/slab-section.h b/shell/slab-section.h
index 04288a87..04288a87 100644
--- a/libslab/slab-section.h
+++ b/shell/slab-section.h
diff --git a/libslab/slab.h b/shell/slab.h
index 721943a0..721943a0 100644
--- a/libslab/slab.h
+++ b/shell/slab.h
diff --git a/libslab/themed-icon.c b/shell/themed-icon.c
index aabf4b89..aabf4b89 100644
--- a/libslab/themed-icon.c
+++ b/shell/themed-icon.c
diff --git a/libslab/themed-icon.h b/shell/themed-icon.h
index d4604430..d4604430 100644
--- a/libslab/themed-icon.h
+++ b/shell/themed-icon.h
diff --git a/libslab/tile-action.c b/shell/tile-action.c
index c1d5906c..c1d5906c 100644
--- a/libslab/tile-action.c
+++ b/shell/tile-action.c
diff --git a/libslab/tile.c b/shell/tile.c
index 96ff2120..96ff2120 100644
--- a/libslab/tile.c
+++ b/shell/tile.c
diff --git a/libslab/tile.h b/shell/tile.h
index 9c8d3f2a..9c8d3f2a 100644
--- a/libslab/tile.h
+++ b/shell/tile.h
author	zhuyaliang <[email protected]>	2023-10-25 21:43:03 +0800
committer	raveit65 <[email protected]>	2023-11-05 12:00:50 +0100
commit	c2e94e1925f3c7acfa3fd3352dc8fdafe6375adc (patch)
tree	3ba609bf57b7bb3eab18d35d78bd1dc86773fba6
parent	23fc7b675ebac7a9b02257a31203974d72f584b1 (diff)
download	mate-control-center-c2e94e1925f3c7acfa3fd3352dc8fdafe6375adc.tar.bz2 mate-control-center-c2e94e1925f3c7acfa3fd3352dc8fdafe6375adc.tar.xz