summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-07-24 15:19:42 +0200
committerStefano Karapetsas <[email protected]>2013-07-24 15:19:42 +0200
commitaa136a012583317cd6b1fa246f1bf16194faf159 (patch)
treea96c19513a4547e5058fea87388588feb5a5518e
parent308e85f6466b282752b6821d6fa785fc48d5e811 (diff)
downloadcaja-aa136a012583317cd6b1fa246f1bf16194faf159.tar.bz2
caja-aa136a012583317cd6b1fa246f1bf16194faf159.tar.xz
Update for mate-desktop changes
-rw-r--r--configure.ac2
-rw-r--r--eel/eel-background.c2
-rw-r--r--eel/eel-background.h2
-rw-r--r--eel/eel-mate-extensions.c2
-rw-r--r--libcaja-private/caja-directory-background.c2
-rw-r--r--libcaja-private/caja-thumbnails.c2
-rw-r--r--src/caja-application.c2
-rw-r--r--src/file-manager/fm-properties-window.c2
8 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac
index cc6d3765..a36be994 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl ===========================================================================
m4_define(glib_minver, 2.28.0)
m4_define(gio_minver, 2.26.0)
-m4_define(mate_desktop_minver, 1.5.0)
+m4_define(mate_desktop_minver, 1.7.1)
m4_define(pango_minver, 1.1.2)
m4_define(gtk_minver, 2.24.0)
m4_define(xml_minver, 2.4.7)
diff --git a/eel/eel-background.c b/eel/eel-background.c
index d8be8225..dc1dc1f5 100644
--- a/eel/eel-background.c
+++ b/eel/eel-background.c
@@ -40,7 +40,7 @@
#include <math.h>
#include <stdio.h>
#define MATE_DESKTOP_USE_UNSTABLE_API
-#include <libmateui/mate-bg.h>
+#include <libmate-desktop/mate-bg.h>
#include <libcaja-private/caja-global-preferences.h>
#if !GTK_CHECK_VERSION(3, 0, 0)
diff --git a/eel/eel-background.h b/eel/eel-background.h
index ce958a64..9303835e 100644
--- a/eel/eel-background.h
+++ b/eel/eel-background.h
@@ -48,7 +48,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#define MATE_DESKTOP_USE_UNSTABLE_API
-#include <libmateui/mate-bg.h>
+#include <libmate-desktop/mate-bg.h>
typedef struct EelBackground EelBackground;
typedef struct EelBackgroundClass EelBackgroundClass;
diff --git a/eel/eel-mate-extensions.c b/eel/eel-mate-extensions.c
index 2af5a941..77f8eaff 100644
--- a/eel/eel-mate-extensions.c
+++ b/eel/eel-mate-extensions.c
@@ -31,7 +31,7 @@
#include "eel-mate-extensions.h"
#include <gtk/gtk.h>
-#include <libmate/mate-desktop-utils.h>
+#include <libmate-desktop/mate-desktop-utils.h>
/* Return a command string containing the path to a terminal on this system. */
diff --git a/libcaja-private/caja-directory-background.c b/libcaja-private/caja-directory-background.c
index 58e78d72..3d7441fc 100644
--- a/libcaja-private/caja-directory-background.c
+++ b/libcaja-private/caja-directory-background.c
@@ -39,7 +39,7 @@
#include <gtk/gtk.h>
#include <string.h>
#define MATE_DESKTOP_USE_UNSTABLE_API
-#include <libmateui/mate-bg.h>
+#include <libmate-desktop/mate-bg.h>
static void caja_background_changed_cb (EelBackground *background,
GdkDragAction action,
diff --git a/libcaja-private/caja-thumbnails.c b/libcaja-private/caja-thumbnails.c
index cbb5f7dc..7e279858 100644
--- a/libcaja-private/caja-thumbnails.c
+++ b/libcaja-private/caja-thumbnails.c
@@ -45,7 +45,7 @@
#include <sys/wait.h>
#include <unistd.h>
#include <signal.h>
-#include <libmateui/mate-desktop-thumbnail.h>
+#include <libmate-desktop/mate-desktop-thumbnail.h>
#include "caja-file-private.h"
diff --git a/src/caja-application.c b/src/caja-application.c
index b4f180f5..3f4282c0 100644
--- a/src/caja-application.c
+++ b/src/caja-application.c
@@ -76,7 +76,7 @@
#include <libcaja-extension/caja-menu-provider.h>
#include <libcaja-private/caja-autorun.h>
#define MATE_DESKTOP_USE_UNSTABLE_API
-#include <libmateui/mate-bg.h>
+#include <libmate-desktop/mate-bg.h>
#include "glibcompat.h" /* for g_list_free_full */
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index a62fbec5..56b07876 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -42,7 +42,7 @@
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
-#include <libmateui/mate-desktop-thumbnail.h>
+#include <libmate-desktop/mate-desktop-thumbnail.h>
#include <libcaja-extension/caja-property-page-provider.h>
#include <libcaja-private/caja-entry.h>
#include <libcaja-private/caja-file-attributes.h>