[gnome-control-center/extensible-shell: 3/7] Remove libslab
- From: William Jon McCann <mccann src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-control-center/extensible-shell: 3/7] Remove libslab
- Date: Sat, 16 Jan 2010 10:12:27 +0000 (UTC)
commit f0767d491e2dd5b26cfc99df481fea4d977018ca
Author: William Jon McCann <jmccann redhat com>
Date: Sat Jan 16 00:08:29 2010 -0500
Remove libslab
libslab is not used by the shell rewrite.
configure.ac | 27 -
libslab/.gitignore | 15 -
libslab/Makefile.am | 98 ---
libslab/app-resizer.c | 315 --------
libslab/app-resizer.h | 72 --
libslab/app-shell.c | 1409 ------------------------------------
libslab/app-shell.h | 141 ----
libslab/application-tile.c | 886 ----------------------
libslab/application-tile.h | 66 --
libslab/bookmark-agent.c | 1238 -------------------------------
libslab/bookmark-agent.h | 89 ---
libslab/directory-tile.c | 669 -----------------
libslab/directory-tile.h | 57 --
libslab/document-tile.c | 1099 ----------------------------
libslab/document-tile.h | 63 --
libslab/double-click-detector.c | 85 ---
libslab/double-click-detector.h | 58 --
libslab/gnome-utils.c | 346 ---------
libslab/gnome-utils.h | 40 -
libslab/libslab-utils.c | 716 ------------------
libslab/libslab-utils.h | 42 --
libslab/nameplate-tile.c | 290 --------
libslab/nameplate-tile.h | 55 --
libslab/nld-marshal.list | 1 -
libslab/recent-files.c | 294 --------
libslab/recent-files.h | 80 --
libslab/search-bar.c | 361 ---------
libslab/search-bar.h | 72 --
libslab/search-context-picker.c | 196 -----
libslab/search-context-picker.h | 58 --
libslab/search-entry-watermark.svg | 58 --
libslab/search-entry.c | 145 ----
libslab/search-entry.h | 50 --
libslab/shell-window.c | 148 ----
libslab/shell-window.h | 65 --
libslab/slab-gnome-util.c | 471 ------------
libslab/slab-gnome-util.h | 76 --
libslab/slab-section.c | 194 -----
libslab/slab-section.h | 71 --
libslab/slab.h | 45 --
libslab/system-tile.c | 285 --------
libslab/system-tile.h | 53 --
libslab/themed-icon.c | 165 -----
libslab/themed-icon.h | 53 --
libslab/tile-action.c | 108 ---
libslab/tile.c | 621 ----------------
libslab/tile.h | 143 ----
po/POTFILES.in | 7 -
shell/Makefile.am | 12 +-
49 files changed, 1 insertions(+), 11707 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 158d141..2594aac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,32 +112,6 @@ GTK_ENGINE_DIR="$gtk_lib_dir/gtk-2.0/$gtk_binary_version/engines"
AC_SUBST(GTK_ENGINE_DIR)
dnl
-dnl Check dependencies of libslab
-dnl
-PKG_CHECK_MODULES(EXTERNAL_LIBSLAB, [libslab], have_libslab=yes, have_libslab=no)
-
-if test $have_libslab = no; then
- PKG_CHECK_MODULES(LIBSLAB, [
- gio-2.0 gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango gconf-2.0
- ],
- have_libslab_deps=yes,
- have_libslab_deps=no)
- WARN_CFLAGS="-Wall"
-else
- have_libslab_deps=no
-fi
-
-AC_SUBST(EXTERNAL_LIBSLAB_CFLAGS)
-AC_SUBST(EXTERNAL_LIBSLAB_LIBS)
-AC_SUBST(LIBSLAB_CFLAGS)
-AC_SUBST(LIBSLAB_LIBS)
-AC_SUBST(WARN_CFLAGS)
-
-AM_CONDITIONAL(HAVE_LIBSLAB, [test $have_libslab = yes -o $have_libslab_deps = yes])
-AM_CONDITIONAL(HAVE_LIBSLAB_DEPS, [test $have_libslab_deps = yes])
-AM_CONDITIONAL(LIBSLAB_FOR_INTERNAL_USE, test "yes" = "yes")
-
-dnl
dnl Check for Xft version 2; we build in extra functionality to the font capplet
dnl when we have it.
dnl
@@ -339,7 +313,6 @@ help/Makefile
libwindow-settings/Makefile
libwindow-settings/gnome-window-settings-2.0.pc
po/Makefile.in
-libslab/Makefile
shell/Makefile
shell/gnomecc.desktop.in
typing-break/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ccf81df..9caccb4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -85,10 +85,3 @@ font-viewer/fontilus.schemas.in
font-viewer/font-view.c
font-viewer/gnome-font-viewer.desktop.in.in
font-viewer/font-thumbnailer.c
-libslab/app-shell.c
-libslab/application-tile.c
-libslab/bookmark-agent.c
-libslab/directory-tile.c
-libslab/document-tile.c
-libslab/search-bar.c
-libslab/system-tile.c
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 411bef0..b7c4919 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,14 +1,5 @@
-if HAVE_LIBSLAB_DEPS
-REAL_LIBSLAB_CFLAGS = -I$(top_srcdir)/libslab
-REAL_LIBSLAB_LIBS = $(top_builddir)/libslab/libslab.la
-else
-REAL_LIBSLAB_CFLAGS = $(EXTERNAL_LIBSLAB_CFLAGS)
-REAL_LIBSLAB_LIBS = $(EXTERNAL_LIBSLAB_LIBS)
-endif
-
INCLUDES = \
-I$(top_srcdir) \
- $(REAL_LIBSLAB_CFLAGS) \
$(GNOMECC_SHELL_CFLAGS)
bin_PROGRAMS = gnome-control-center
@@ -23,8 +14,7 @@ gnome_control_center_SOURCES = \
control-center.c
gnome_control_center_LDADD = \
- $(GNOMECC_SHELL_LIBS) \
- $(REAL_LIBSLAB_LIBS)
+ $(GNOMECC_SHELL_LIBS)
AM_CPPFLAGS = \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]