summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--capplets/about-me/mate-about-me.c2
-rw-r--r--capplets/appearance/appearance-desktop.c4
-rw-r--r--capplets/appearance/appearance-themes.c2
-rw-r--r--capplets/appearance/appearance.h2
-rw-r--r--capplets/appearance/mate-wp-info.h2
-rw-r--r--capplets/appearance/mate-wp-item.h4
-rw-r--r--capplets/common/mate-theme-info.c2
-rw-r--r--capplets/common/mate-theme-test.c2
-rw-r--r--capplets/display/xrandr-capplet.c6
-rw-r--r--configure.ac5
-rw-r--r--libslab/app-resizer.c2
-rw-r--r--libslab/app-shell.c2
-rw-r--r--libslab/app-shell.h2
-rw-r--r--libslab/application-tile.h2
-rw-r--r--libslab/libslab-utils.h4
-rw-r--r--libslab/mate-utils.h2
-rw-r--r--libslab/shell-window.h2
-rw-r--r--libslab/slab-mate-util.h2
-rw-r--r--libslab/system-tile.h2
-rw-r--r--libwindow-settings/mate-window-manager.h2
-rw-r--r--shell/control-center.c2
21 files changed, 28 insertions, 27 deletions
diff --git a/capplets/about-me/mate-about-me.c b/capplets/about-me/mate-about-me.c
index 22bb2f14..6e125d3c 100644
--- a/capplets/about-me/mate-about-me.c
+++ b/capplets/about-me/mate-about-me.c
@@ -29,7 +29,7 @@
#include <dbus/dbus-glib-bindings.h>
#define MATE_DESKTOP_USE_UNSTABLE_API
-#include <libmateui/mate-desktop-thumbnail.h>
+#include <libmate-desktop/mate-desktop-thumbnail.h>
#include "e-image-chooser.h"
#include "mate-about-me-password.h"
diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c
index 86bf75ce..24282ab5 100644
--- a/capplets/appearance/appearance-desktop.c
+++ b/capplets/appearance/appearance-desktop.c
@@ -27,8 +27,8 @@
#include <glib/gi18n.h>
#include <gio/gio.h>
#include <string.h>
-#include <libmateui/mate-desktop-thumbnail.h>
-#include <libmateui/mate-bg.h>
+#include <libmate-desktop/mate-desktop-thumbnail.h>
+#include <libmate-desktop/mate-bg.h>
enum {
TARGET_URI_LIST,
diff --git a/capplets/appearance/appearance-themes.c b/capplets/appearance/appearance-themes.c
index b2dfbb1b..b07f7aa7 100644
--- a/capplets/appearance/appearance-themes.c
+++ b/capplets/appearance/appearance-themes.c
@@ -30,7 +30,7 @@
#include <glib/gi18n.h>
#include <libwindow-settings/mate-wm-manager.h>
#include <string.h>
-#include <libmateui/mate-desktop-thumbnail.h>
+#include <libmate-desktop/mate-desktop-thumbnail.h>
#define CUSTOM_THEME_NAME "__custom__"
diff --git a/capplets/appearance/appearance.h b/capplets/appearance/appearance.h
index 3e69a109..2091324c 100644
--- a/capplets/appearance/appearance.h
+++ b/capplets/appearance/appearance.h
@@ -23,7 +23,7 @@
#include <glib.h>
#include <gtk/gtk.h>
#include <gio/gio.h>
-#include <libmateui/mate-desktop-thumbnail.h>
+#include <libmate-desktop/mate-desktop-thumbnail.h>
#include "mate-theme-info.h"
diff --git a/capplets/appearance/mate-wp-info.h b/capplets/appearance/mate-wp-info.h
index f1ca2698..f5989c16 100644
--- a/capplets/appearance/mate-wp-info.h
+++ b/capplets/appearance/mate-wp-info.h
@@ -22,7 +22,7 @@
#define _MATE_WP_INFO_H_
#include <glib.h>
-#include <libmateui/mate-desktop-thumbnail.h>
+#include <libmate-desktop/mate-desktop-thumbnail.h>
typedef struct _MateWPInfo {
char* uri;
diff --git a/capplets/appearance/mate-wp-item.h b/capplets/appearance/mate-wp-item.h
index 0bfaab0b..a6e13f24 100644
--- a/capplets/appearance/mate-wp-item.h
+++ b/capplets/appearance/mate-wp-item.h
@@ -22,8 +22,8 @@
#include <gio/gio.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtk/gtk.h>
-#include <libmateui/mate-desktop-thumbnail.h>
-#include <libmateui/mate-bg.h>
+#include <libmate-desktop/mate-desktop-thumbnail.h>
+#include <libmate-desktop/mate-bg.h>
#include "mate-wp-info.h"
diff --git a/capplets/common/mate-theme-info.c b/capplets/common/mate-theme-info.c
index a0a30104..7d2d1b9d 100644
--- a/capplets/common/mate-theme-info.c
+++ b/capplets/common/mate-theme-info.c
@@ -35,7 +35,7 @@
#include <gdk/gdkx.h>
#include <gio/gio.h>
#include <string.h>
-#include <libmate/mate-desktop-item.h>
+#include <libmate-desktop/mate-desktop-item.h>
#include "mate-theme-info.h"
#include "gtkrc-utils.h"
diff --git a/capplets/common/mate-theme-test.c b/capplets/common/mate-theme-test.c
index 0c3c51f9..a92243cd 100644
--- a/capplets/common/mate-theme-test.c
+++ b/capplets/common/mate-theme-test.c
@@ -1,7 +1,7 @@
#include <config.h>
#include <gtk/gtk.h>
#include <string.h>
-#include <libmate/mate-desktop-item.h>
+#include <libmate-desktop/mate-desktop-item.h>
#include "mate-theme-info.h"
int
diff --git a/capplets/display/xrandr-capplet.c b/capplets/display/xrandr-capplet.c
index 7b3d2057..d5d4f83c 100644
--- a/capplets/display/xrandr-capplet.c
+++ b/capplets/display/xrandr-capplet.c
@@ -27,9 +27,9 @@
#include <gtk/gtk.h>
#include "scrollarea.h"
#define MATE_DESKTOP_USE_UNSTABLE_API
-#include <libmateui/mate-rr.h>
-#include <libmateui/mate-rr-config.h>
-#include <libmateui/mate-rr-labeler.h>
+#include <libmate-desktop/mate-rr.h>
+#include <libmate-desktop/mate-rr-config.h>
+#include <libmate-desktop/mate-rr-labeler.h>
#include <gdk/gdkx.h>
#include <X11/Xlib.h>
#include <glib/gi18n.h>
diff --git a/configure.ac b/configure.ac
index 1d917d45..12381c58 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,6 +113,7 @@ AC_CHECK_LIB(m, floor)
dnl ==============================================
dnl Check that we meet the dependencies
dnl ==============================================
+MATE_DESKTOP_REQUIRED=1.7.1
PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""])
COMMON_MODULES="gtk+-2.0 >= 2.20.0 dnl
@@ -122,12 +123,12 @@ COMMON_MODULES="gtk+-2.0 >= 2.20.0 dnl
gio-2.0 dnl
gio-unix-2.0 dnl
libxml-2.0 dnl
- mate-desktop-2.0 >= 1.5.2"
+ mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED"
PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
PKG_CHECK_MODULES(MATECC, $COMMON_MODULES libmate-menu >= 1.1.0)
PKG_CHECK_MODULES(MATECC_SHELL, $COMMON_MODULES libmate-menu unique-1.0)
PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1)
-PKG_CHECK_MODULES(MATE_DESKTOP, mate-desktop-2.0)
+PKG_CHECK_MODULES(MATE_DESKTOP, mate-desktop-2.0 >= MATE_DESKTOP_REQUIRED)
PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
PKG_CHECK_MODULES(MARCO, libmarco-private >= 1.5.0)
PKG_CHECK_MODULES(TYPING, $GMODULE_ADD glib-2.0 > 2.11 gio-2.0 gtk+-2.0)
diff --git a/libslab/app-resizer.c b/libslab/app-resizer.c
index 8734cd86..e7e3043f 100644
--- a/libslab/app-resizer.c
+++ b/libslab/app-resizer.c
@@ -19,7 +19,7 @@
*/
#include <gtk/gtk.h>
-#include <libmate/mate-desktop-item.h>
+#include <libmate-desktop/mate-desktop-item.h>
#include "app-shell.h"
#include "app-resizer.h"
diff --git a/libslab/app-shell.c b/libslab/app-shell.c
index 5f4af234..0559d4f0 100644
--- a/libslab/app-shell.c
+++ b/libslab/app-shell.c
@@ -22,7 +22,7 @@
#include <config.h>
#endif
-#include <libmate/mate-desktop-item.h>
+#include <libmate-desktop/mate-desktop-item.h>
#include <gio/gio.h>
#include <gdk/gdkkeysyms.h>
#include <sys/types.h>
diff --git a/libslab/app-shell.h b/libslab/app-shell.h
index d5f08564..ab944dbe 100644
--- a/libslab/app-shell.h
+++ b/libslab/app-shell.h
@@ -26,7 +26,7 @@
#include <gio/gio.h>
#define MATEMENU_I_KNOW_THIS_IS_UNSTABLE
#include <matemenu-tree.h>
-#include <libmate/mate-desktop-item.h>
+#include <libmate-desktop/mate-desktop-item.h>
#include <libslab/slab-section.h>
#include <libslab/tile.h>
diff --git a/libslab/application-tile.h b/libslab/application-tile.h
index dc2eb8b0..31511857 100644
--- a/libslab/application-tile.h
+++ b/libslab/application-tile.h
@@ -23,7 +23,7 @@
#include <libslab/nameplate-tile.h>
-#include <libmate/mate-desktop-item.h>
+#include <libmate-desktop/mate-desktop-item.h>
#ifdef __cplusplus
extern "C" {
diff --git a/libslab/libslab-utils.h b/libslab/libslab-utils.h
index 507de7b4..9819f901 100644
--- a/libslab/libslab-utils.h
+++ b/libslab/libslab-utils.h
@@ -3,9 +3,9 @@
#include <glib.h>
#include <gtk/gtk.h>
-#include <libmate/mate-desktop-item.h>
+#include <libmate-desktop/mate-desktop-item.h>
#define MATE_DESKTOP_USE_UNSTABLE_API 1
-#include <libmateui/mate-desktop-thumbnail.h>
+#include <libmate-desktop/mate-desktop-thumbnail.h>
#ifdef __cplusplus
extern "C" {
diff --git a/libslab/mate-utils.h b/libslab/mate-utils.h
index 294e20ec..900c92d4 100644
--- a/libslab/mate-utils.h
+++ b/libslab/mate-utils.h
@@ -22,7 +22,7 @@
#define __MATE_UTILS_H__
#include <gtk/gtk.h>
-#include <libmate/mate-desktop-item.h>
+#include <libmate-desktop/mate-desktop-item.h>
#ifdef __cplusplus
extern "C" {
diff --git a/libslab/shell-window.h b/libslab/shell-window.h
index 9ce2063d..a9ee85c0 100644
--- a/libslab/shell-window.h
+++ b/libslab/shell-window.h
@@ -23,7 +23,7 @@
#include <glib.h>
#include <gtk/gtk.h>
-#include <libmate/mate-desktop-item.h>
+#include <libmate-desktop/mate-desktop-item.h>
#include <libslab/app-shell.h>
diff --git a/libslab/slab-mate-util.h b/libslab/slab-mate-util.h
index b3dcb506..0ffa8c1e 100644
--- a/libslab/slab-mate-util.h
+++ b/libslab/slab-mate-util.h
@@ -23,7 +23,7 @@
#include <glib.h>
#include <gtk/gtk.h>
-#include <libmate/mate-desktop-item.h>
+#include <libmate-desktop/mate-desktop-item.h>
#ifdef __cplusplus
extern "C" {
diff --git a/libslab/system-tile.h b/libslab/system-tile.h
index a44012d6..71f11654 100644
--- a/libslab/system-tile.h
+++ b/libslab/system-tile.h
@@ -23,7 +23,7 @@
#include <libslab/nameplate-tile.h>
-#include <libmate/mate-desktop-item.h>
+#include <libmate-desktop/mate-desktop-item.h>
#ifdef __cplusplus
extern "C" {
diff --git a/libwindow-settings/mate-window-manager.h b/libwindow-settings/mate-window-manager.h
index 9bed52e4..6abc2b96 100644
--- a/libwindow-settings/mate-window-manager.h
+++ b/libwindow-settings/mate-window-manager.h
@@ -28,7 +28,7 @@
#include <glib-object.h>
-#include <libmate/mate-desktop-item.h>
+#include <libmate-desktop/mate-desktop-item.h>
/* Increment if backward-incompatible changes are made, so we get a clean
* error. In principle the libtool versioning handles this, but
diff --git a/shell/control-center.c b/shell/control-center.c
index 56201b1f..85aa42c0 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 <libmate/mate-desktop-item.h>
+#include <libmate-desktop/mate-desktop-item.h>
#include <unique/unique.h>
#include <libslab/slab.h>
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-02 18:38:07 +0000