summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac4
-rw-r--r--gsearchtool/Makefile.am70
-rw-r--r--gsearchtool/data/Makefile.am32
-rw-r--r--gsearchtool/data/mate-search-tool.1 (renamed from gsearchtool/mate-search-tool.1)0
-rw-r--r--gsearchtool/data/mate-search-tool.convert (renamed from gsearchtool/mate-search-tool.convert)0
-rw-r--r--gsearchtool/data/mate-search-tool.desktop.in (renamed from gsearchtool/mate-search-tool.desktop.in)0
-rw-r--r--gsearchtool/data/org.mate.search-tool.gschema.xml.in (renamed from gsearchtool/org.mate.search-tool.gschema.xml.in)0
-rw-r--r--gsearchtool/libeggsmclient/Makefile.am (renamed from libeggsmclient/Makefile.am)0
-rw-r--r--gsearchtool/libeggsmclient/eggdesktopfile.c (renamed from libeggsmclient/eggdesktopfile.c)0
-rw-r--r--gsearchtool/libeggsmclient/eggdesktopfile.h (renamed from libeggsmclient/eggdesktopfile.h)0
-rw-r--r--gsearchtool/libeggsmclient/eggsmclient-private.h (renamed from libeggsmclient/eggsmclient-private.h)0
-rw-r--r--gsearchtool/libeggsmclient/eggsmclient-xsmp.c (renamed from libeggsmclient/eggsmclient-xsmp.c)0
-rw-r--r--gsearchtool/libeggsmclient/eggsmclient.c (renamed from libeggsmclient/eggsmclient.c)0
-rw-r--r--gsearchtool/libeggsmclient/eggsmclient.h (renamed from libeggsmclient/eggsmclient.h)0
-rw-r--r--gsearchtool/src/Makefile.am36
-rw-r--r--gsearchtool/src/gsearchtool-callbacks.c (renamed from gsearchtool/gsearchtool-callbacks.c)0
-rw-r--r--gsearchtool/src/gsearchtool-callbacks.h (renamed from gsearchtool/gsearchtool-callbacks.h)0
-rw-r--r--gsearchtool/src/gsearchtool-support.c (renamed from gsearchtool/gsearchtool-support.c)0
-rw-r--r--gsearchtool/src/gsearchtool-support.h (renamed from gsearchtool/gsearchtool-support.h)0
-rw-r--r--gsearchtool/src/gsearchtool.c (renamed from gsearchtool/gsearchtool.c)0
-rw-r--r--gsearchtool/src/gsearchtool.h (renamed from gsearchtool/gsearchtool.h)0
-rw-r--r--libeggsmclient/README10
-rw-r--r--po/POTFILES.in14
24 files changed, 76 insertions, 91 deletions
diff --git a/Makefile.am b/Makefile.am
index 11538b3d..789c55ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,6 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
SUBDIRS = \
po \
- libeggsmclient \
baobab \
mate-dictionary \
mate-screenshot \
diff --git a/configure.ac b/configure.ac
index 2c320365..dbb306dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -379,8 +379,6 @@ Makefile
po/Makefile.in
-libeggsmclient/Makefile
-
baobab/Makefile
baobab/data/Makefile
baobab/data/org.mate.disk-usage-analyzer.gschema.xml
@@ -401,7 +399,9 @@ logview/src/tests/Makefile
gsearchtool/Makefile
gsearchtool/data/Makefile
gsearchtool/help/Makefile
+gsearchtool/libeggsmclient/Makefile
gsearchtool/libmateui-deprecated/Makefile
+gsearchtool/src/Makefile
mate-dictionary/Makefile
mate-dictionary/libgdict/Makefile
diff --git a/gsearchtool/Makefile.am b/gsearchtool/Makefile.am
index acdf8748..145b98b5 100644
--- a/gsearchtool/Makefile.am
+++ b/gsearchtool/Makefile.am
@@ -1,70 +1,2 @@
-Utilitiesdir = $(datadir)/applications
+SUBDIRS = data help libeggsmclient libmateui-deprecated src
-SUBDIRS = data help libmateui-deprecated
-
-AM_CPPFLAGS = \
- -I$(srcdir)/libmateui-deprecated \
- -I$(top_srcdir)/libeggsmclient \
- $(DISABLE_DEPRECATED) \
- -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- -DLOCALEDIR=\"$(datadir)/locale\" \
- -DDATADIR=\""$(datadir)"\" \
- -DGREP_COMMAND=\""$(GREP_COMMAND)"\"
-
-libmateui_deprecated_LIB = $(builddir)/libmateui-deprecated/libmateui-deprecated.la
-libeggsmclient_LIB = $(top_builddir)/libeggsmclient/libeggsmclient.la
-
-bin_PROGRAMS = mate-search-tool
-
-gsettingsschema_in_files = org.mate.search-tool.gschema.xml.in
-gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
-.PRECIOUS: $(gsettings_SCHEMAS)
-
-
-
-convertdir = $(datadir)/MateConf/gsettings
-convert_DATA = mate-search-tool.convert
-
-mate_search_tool_SOURCES = \
- gsearchtool-support.c \
- gsearchtool-support.h \
- gsearchtool-callbacks.c \
- gsearchtool-callbacks.h \
- gsearchtool.c \
- gsearchtool.h
-
-mate_search_tool_CFLAGS = \
- $(GLIB_CFLAGS) \
- $(GIO_CFLAGS) \
- $(GIO_UNIX_CFLAGS) \
- $(GTK_CFLAGS)
-
-mate_search_tool_LDADD = \
- $(GLIB_LIBS) \
- $(GIO_LIBS) \
- $(GIO_UNIX_LIBS) \
- $(GTK_LIBS) \
- $(libmateui_deprecated_LIB) \
- $(libeggsmclient_LIB)
-
-man_MANS = mate-search-tool.1
-
-Utilities_in_files = mate-search-tool.desktop.in
-Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop)
-
-EXTRA_DIST = \
- $(Utilities_in_files) \
- $(Utilities_DATA) \
- $(convert_DATA) \
- $(gsettingsschema_in_files) \
- $(man_MANS)
-
-CLEANFILES = \
- mate-search-tool.desktop \
- $(gsettings_SCHEMAS)
-
-disthook:
- cd $(distdir) ; rm -f $(CLEANFILES)
diff --git a/gsearchtool/data/Makefile.am b/gsearchtool/data/Makefile.am
index d5a3e9d3..725e18de 100644
--- a/gsearchtool/data/Makefile.am
+++ b/gsearchtool/data/Makefile.am
@@ -1,13 +1,41 @@
icondir = $(datadir)/pixmaps/mate-search-tool
icon_DATA = thumbnail_frame.png
+gsettingsschema_in_files = org.mate.search-tool.gschema.xml.in
+gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
+.PRECIOUS: $(gsettings_SCHEMAS)
+
+
+
+convertdir = $(datadir)/MateConf/gsettings
+convert_DATA = mate-search-tool.convert
+
appdatadir = $(datadir)/appdata
appdata_in_files = mate-search-tool.appdata.xml.in
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-CLEANFILES = mate-search-tool.appdata.xml
+man_MANS = mate-search-tool.1
+
+Utilitiesdir = $(datadir)/applications
+Utilities_in_files = mate-search-tool.desktop.in
+Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop)
EXTRA_DIST = \
$(icon_DATA) \
- $(appdata_in_files)
+ $(appdata_in_files) \
+ $(Utilities_in_files) \
+ $(Utilities_DATA) \
+ $(convert_DATA) \
+ $(gsettingsschema_in_files) \
+ $(man_MANS)
+
+CLEANFILES = \
+ mate-search-tool.appdata.xml \
+ mate-search-tool.desktop \
+ $(gsettings_SCHEMAS)
+
+disthook:
+ cd $(distdir) ; rm -f $(CLEANFILES)
diff --git a/gsearchtool/mate-search-tool.1 b/gsearchtool/data/mate-search-tool.1
index 686a8cc9..686a8cc9 100644
--- a/gsearchtool/mate-search-tool.1
+++ b/gsearchtool/data/mate-search-tool.1
diff --git a/gsearchtool/mate-search-tool.convert b/gsearchtool/data/mate-search-tool.convert
index 44156425..44156425 100644
--- a/gsearchtool/mate-search-tool.convert
+++ b/gsearchtool/data/mate-search-tool.convert
diff --git a/gsearchtool/mate-search-tool.desktop.in b/gsearchtool/data/mate-search-tool.desktop.in
index 56645ceb..56645ceb 100644
--- a/gsearchtool/mate-search-tool.desktop.in
+++ b/gsearchtool/data/mate-search-tool.desktop.in
diff --git a/gsearchtool/org.mate.search-tool.gschema.xml.in b/gsearchtool/data/org.mate.search-tool.gschema.xml.in
index b6a532c4..b6a532c4 100644
--- a/gsearchtool/org.mate.search-tool.gschema.xml.in
+++ b/gsearchtool/data/org.mate.search-tool.gschema.xml.in
diff --git a/libeggsmclient/Makefile.am b/gsearchtool/libeggsmclient/Makefile.am
index cc64b8cb..cc64b8cb 100644
--- a/libeggsmclient/Makefile.am
+++ b/gsearchtool/libeggsmclient/Makefile.am
diff --git a/libeggsmclient/eggdesktopfile.c b/gsearchtool/libeggsmclient/eggdesktopfile.c
index a96e5bd7..a96e5bd7 100644
--- a/libeggsmclient/eggdesktopfile.c
+++ b/gsearchtool/libeggsmclient/eggdesktopfile.c
diff --git a/libeggsmclient/eggdesktopfile.h b/gsearchtool/libeggsmclient/eggdesktopfile.h
index 9a5bd2e7..9a5bd2e7 100644
--- a/libeggsmclient/eggdesktopfile.h
+++ b/gsearchtool/libeggsmclient/eggdesktopfile.h
diff --git a/libeggsmclient/eggsmclient-private.h b/gsearchtool/libeggsmclient/eggsmclient-private.h
index d13035bf..d13035bf 100644
--- a/libeggsmclient/eggsmclient-private.h
+++ b/gsearchtool/libeggsmclient/eggsmclient-private.h
diff --git a/libeggsmclient/eggsmclient-xsmp.c b/gsearchtool/libeggsmclient/eggsmclient-xsmp.c
index 0601cd98..0601cd98 100644
--- a/libeggsmclient/eggsmclient-xsmp.c
+++ b/gsearchtool/libeggsmclient/eggsmclient-xsmp.c
diff --git a/libeggsmclient/eggsmclient.c b/gsearchtool/libeggsmclient/eggsmclient.c
index 0cc3818a..0cc3818a 100644
--- a/libeggsmclient/eggsmclient.c
+++ b/gsearchtool/libeggsmclient/eggsmclient.c
diff --git a/libeggsmclient/eggsmclient.h b/gsearchtool/libeggsmclient/eggsmclient.h
index d87f670a..d87f670a 100644
--- a/libeggsmclient/eggsmclient.h
+++ b/gsearchtool/libeggsmclient/eggsmclient.h
diff --git a/gsearchtool/src/Makefile.am b/gsearchtool/src/Makefile.am
new file mode 100644
index 00000000..58a042ec
--- /dev/null
+++ b/gsearchtool/src/Makefile.am
@@ -0,0 +1,36 @@
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/gsearchtool/libeggsmclient \
+ -I$(top_srcdir)/gsearchtool/libmateui-deprecated \
+ $(DISABLE_DEPRECATED) \
+ -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ -DLOCALEDIR=\"$(datadir)/locale\" \
+ -DDATADIR=\""$(datadir)"\" \
+ -DGREP_COMMAND=\""$(GREP_COMMAND)"\"
+
+libeggsmclient_LIB = $(top_builddir)/gsearchtool/libeggsmclient/libeggsmclient.la
+libmateui_deprecated_LIB = $(top_builddir)/gsearchtool/libmateui-deprecated/libmateui-deprecated.la
+
+bin_PROGRAMS = mate-search-tool
+
+mate_search_tool_SOURCES = \
+ gsearchtool-support.c \
+ gsearchtool-support.h \
+ gsearchtool-callbacks.c \
+ gsearchtool-callbacks.h \
+ gsearchtool.c \
+ gsearchtool.h
+
+mate_search_tool_CFLAGS = \
+ $(GLIB_CFLAGS) \
+ $(GIO_CFLAGS) \
+ $(GIO_UNIX_CFLAGS) \
+ $(GTK_CFLAGS)
+
+mate_search_tool_LDADD = \
+ $(GLIB_LIBS) \
+ $(GIO_LIBS) \
+ $(GIO_UNIX_LIBS) \
+ $(GTK_LIBS) \
+ $(libeggsmclient_LIB) \
+ $(libmateui_deprecated_LIB)
+
diff --git a/gsearchtool/gsearchtool-callbacks.c b/gsearchtool/src/gsearchtool-callbacks.c
index 0c040867..0c040867 100644
--- a/gsearchtool/gsearchtool-callbacks.c
+++ b/gsearchtool/src/gsearchtool-callbacks.c
diff --git a/gsearchtool/gsearchtool-callbacks.h b/gsearchtool/src/gsearchtool-callbacks.h
index b9db03a2..b9db03a2 100644
--- a/gsearchtool/gsearchtool-callbacks.h
+++ b/gsearchtool/src/gsearchtool-callbacks.h
diff --git a/gsearchtool/gsearchtool-support.c b/gsearchtool/src/gsearchtool-support.c
index a120967b..a120967b 100644
--- a/gsearchtool/gsearchtool-support.c
+++ b/gsearchtool/src/gsearchtool-support.c
diff --git a/gsearchtool/gsearchtool-support.h b/gsearchtool/src/gsearchtool-support.h
index 15585d5d..15585d5d 100644
--- a/gsearchtool/gsearchtool-support.h
+++ b/gsearchtool/src/gsearchtool-support.h
diff --git a/gsearchtool/gsearchtool.c b/gsearchtool/src/gsearchtool.c
index 757e8ca2..757e8ca2 100644
--- a/gsearchtool/gsearchtool.c
+++ b/gsearchtool/src/gsearchtool.c
diff --git a/gsearchtool/gsearchtool.h b/gsearchtool/src/gsearchtool.h
index f48c13f2..f48c13f2 100644
--- a/gsearchtool/gsearchtool.h
+++ b/gsearchtool/src/gsearchtool.h
diff --git a/libeggsmclient/README b/libeggsmclient/README
deleted file mode 100644
index 00b60a26..00000000
--- a/libeggsmclient/README
+++ /dev/null
@@ -1,10 +0,0 @@
-MATE-Client in the libmateui library will be removed from the MATE
-software stack [1]. At this time, a replacement for the session
-management client has not been added to GTK+. The code in this
-directory is a copy of the session management source code in the
-libegg library. Hopefully, this will be a temporary solution.
-
-The bugzilla report at bugs.mate.org is #79285, "session management
-support".
-
-[1] http://live.mate.org/LibmateMustDie
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1ce32a0c..85b15eaf 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -15,13 +15,13 @@ baobab/src/baobab-utils.c
baobab/src/baobab-ringschart.c
baobab/src/callbacks.c
gsearchtool/data/mate-search-tool.appdata.xml.in
-gsearchtool/mate-search-tool.desktop.in
-gsearchtool/gsearchtool.c
-gsearchtool/gsearchtool-callbacks.c
-gsearchtool/gsearchtool-support.c
-gsearchtool/org.mate.search-tool.gschema.xml.in
-libeggsmclient/eggdesktopfile.c
-libeggsmclient/eggsmclient.c
+gsearchtool/data/mate-search-tool.desktop.in
+[type: gettext/gsettings]gsearchtool/data/org.mate.search-tool.gschema.xml.in
+gsearchtool/libeggsmclient/eggdesktopfile.c
+gsearchtool/libeggsmclient/eggsmclient.c
+gsearchtool/src/gsearchtool.c
+gsearchtool/src/gsearchtool-callbacks.c
+gsearchtool/src/gsearchtool-support.c
logview/data/mate-system-log.desktop.in.in
[type: gettext/gsettings]logview/data/org.mate.system-log.gschema.xml.in
[type: gettext/glade]logview/data/logview-filter.ui