diff options
25 files changed, 43 insertions, 52 deletions
diff --git a/configure.ac b/configure.ac index efca89e..e430d41 100644 --- a/configure.ac +++ b/configure.ac @@ -292,8 +292,6 @@ Makefile mate-about/Makefile mate-about/mate-about.desktop.in libmate-desktop/Makefile -libmate-desktop/libmate/Makefile -libmate-desktop/libmateui/Makefile libmate-desktop/mate-desktop-2.0.pc libmate-desktop/mate-desktop-2.0-uninstalled.pc docs/Makefile diff --git a/docs/reference/mate-desktop/Makefile.am b/docs/reference/mate-desktop/Makefile.am index d6a8fdc..7ebb5ba 100644 --- a/docs/reference/mate-desktop/Makefile.am +++ b/docs/reference/mate-desktop/Makefile.am @@ -42,7 +42,7 @@ FIXXREF_OPTIONS= # Used for dependencies. The docs will be rebuilt if any of these change. # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c -HFILE_GLOB=$(top_srcdir)/libmate-desktop/libmate/*.h $(top_srcdir)/libmate-desktop/libmateui/*.h +HFILE_GLOB=$(top_srcdir)/libmate-desktop/*.h CFILE_GLOB=$(top_srcdir)/libmate-desktop/*.c # Header files to ignore when scanning. diff --git a/docs/reference/mate-desktop/mate-desktop-sections.txt b/docs/reference/mate-desktop/mate-desktop-sections.txt index 09e2b94..ceb33ec 100644 --- a/docs/reference/mate-desktop/mate-desktop-sections.txt +++ b/docs/reference/mate-desktop/mate-desktop-sections.txt @@ -1,5 +1,5 @@ <SECTION> -<INCLUDE>libmateui/mate-bg.h</INCLUDE> +<INCLUDE>mate-bg.h</INCLUDE> <FILE>mate-bg</FILE> <TITLE>MateBG</TITLE> MateBG @@ -35,7 +35,7 @@ MateBGClass </SECTION> <SECTION> -<INCLUDE>libmateui/mate-rr.h</INCLUDE> +<INCLUDE>mate-rr.h</INCLUDE> <FILE>mate-rr-screen</FILE> <TITLE></TITLE> MateRRScreen @@ -55,7 +55,7 @@ mate_rr_screen_get_ranges </SECTION> <SECTION> -<INCLUDE>libmateui/mate-rr.h</INCLUDE> +<INCLUDE>mate-rr.h</INCLUDE> <FILE>mate-rr-output</FILE> <TITLE></TITLE> MateRROutput @@ -77,7 +77,7 @@ mate_rr_output_can_clone </SECTION> <SECTION> -<INCLUDE>libmateui/mate-rr.h</INCLUDE> +<INCLUDE>mate-rr.h</INCLUDE> <FILE>mate-rr-crtc</FILE> <TITLE></TITLE> MateRRCrtc @@ -93,7 +93,7 @@ mate_rr_crtc_get_rotations </SECTION> <SECTION> -<INCLUDE>libmateui/mate-rr.h</INCLUDE> +<INCLUDE>mate-rr.h</INCLUDE> <FILE>mate-rr-mode</FILE> <TITLE></TITLE> MateRRMode @@ -104,7 +104,7 @@ mate_rr_mode_get_freq </SECTION> <SECTION> -<INCLUDE>libmateui/mate-rr-config.h</INCLUDE> +<INCLUDE>mate-rr-config.h</INCLUDE> <FILE>mate-rr-config</FILE> <TITLE></TITLE> MateOutputInfo @@ -122,7 +122,7 @@ mate_rr_config_applicable </SECTION> <SECTION> -<INCLUDE>libmateui/mate-rr-labeler.h</INCLUDE> +<INCLUDE>mate-rr-labeler.h</INCLUDE> <FILE>mate-rr-labeler</FILE> <TITLE>MateRRLabeler</TITLE> MateRRLabeler @@ -142,7 +142,7 @@ MateRRLabelerClass </SECTION> <SECTION> -<INCLUDE>libmate/mate-desktop-item.h</INCLUDE> +<INCLUDE>mate-desktop-item.h</INCLUDE> <FILE>mate-desktop-item</FILE> <TITLE>MateDesktopItem</TITLE> MateDesktopItemType @@ -233,7 +233,7 @@ mate_desktop_item_error_quark </SECTION> <SECTION> -<INCLUDE>libmateui/mate-thumbnail.h</INCLUDE> +<INCLUDE>mate-thumbnail.h</INCLUDE> <FILE>mate-desktop-thumbnail</FILE> <TITLE>Miscellaneous Thumbnail Functions</TITLE> mate_desktop_thumbnail_has_uri @@ -244,7 +244,7 @@ mate_desktop_thumbnail_scale_down_pixbuf </SECTION> <SECTION> -<INCLUDE>libmateui/mate-thumbnail.h</INCLUDE> +<INCLUDE>mate-thumbnail.h</INCLUDE> <FILE>mate-desktop-thumbnail-factory</FILE> <TITLE>MateDesktopThumbnailFactory</TITLE> MateDesktopThumbnailFactory @@ -269,7 +269,7 @@ MateDesktopThumbnailFactoryClass </SECTION> <SECTION> -<INCLUDE>libmate/mate-desktop-utils.h</INCLUDE> +<INCLUDE>mate-desktop-utils.h</INCLUDE> <FILE>mate-desktop-utils</FILE> <TITLE>Miscellaneous Functions</TITLE> mate_desktop_prepend_terminal_to_vector diff --git a/docs/reference/mate-desktop/mate-desktop.types b/docs/reference/mate-desktop/mate-desktop.types index ec85392..b1707bf 100644 --- a/docs/reference/mate-desktop/mate-desktop.types +++ b/docs/reference/mate-desktop/mate-desktop.types @@ -1,7 +1,7 @@ -#include <libmate/mate-desktop-item.h> -#include <libmateui/mate-bg.h> -#include <libmateui/mate-desktop-thumbnail.h> -#include <libmateui/mate-rr-labeler.h> +#include <mate-desktop-item.h> +#include <mate-bg.h> +#include <mate-desktop-thumbnail.h> +#include <mate-rr-labeler.h> mate_desktop_item_get_type mate_bg_get_type diff --git a/libmate-desktop/Makefile.am b/libmate-desktop/Makefile.am index 878303d..0c0b3e2 100644 --- a/libmate-desktop/Makefile.am +++ b/libmate-desktop/Makefile.am @@ -1,4 +1,13 @@ -SUBDIRS = libmate libmateui +libmate_desktopdir = $(includedir)/mate-desktop-2.0/ +libmate_desktop_HEADERS = \ + mate-desktop-utils.h \ + mate-desktop-item.h \ + mate-bg.h \ + mate-bg-crossfade.h \ + mate-desktop-thumbnail.h \ + mate-rr.h \ + mate-rr-config.h \ + mate-rr-labeler.h lib_LTLIBRARIES = libmate-desktop-2.la diff --git a/libmate-desktop/libmate/Makefile.am b/libmate-desktop/libmate/Makefile.am deleted file mode 100644 index 6c080f7..0000000 --- a/libmate-desktop/libmate/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -libmate_desktopdir = $(includedir)/mate-desktop-2.0/libmate -libmate_desktop_HEADERS = \ - mate-desktop-utils.h \ - mate-desktop-item.h - --include $(top_srcdir)/git.mk diff --git a/libmate-desktop/libmateui/Makefile.am b/libmate-desktop/libmateui/Makefile.am deleted file mode 100644 index 413fee0..0000000 --- a/libmate-desktop/libmateui/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -libmateui_desktopdir = $(includedir)/mate-desktop-2.0/libmateui -libmateui_desktop_HEADERS = \ - mate-bg.h \ - mate-bg-crossfade.h \ - mate-desktop-thumbnail.h \ - mate-rr.h \ - mate-rr-config.h \ - mate-rr-labeler.h - --include $(top_srcdir)/git.mk diff --git a/libmate-desktop/mate-bg-crossfade.c b/libmate-desktop/mate-bg-crossfade.c index 3c870f1..3242004 100644 --- a/libmate-desktop/mate-bg-crossfade.c +++ b/libmate-desktop/mate-bg-crossfade.c @@ -35,8 +35,8 @@ #include <cairo-xlib.h> #define MATE_DESKTOP_USE_UNSTABLE_API -#include <libmateui/mate-bg.h> -#include "libmateui/mate-bg-crossfade.h" +#include <mate-bg.h> +#include "mate-bg-crossfade.h" #if !GTK_CHECK_VERSION(3, 0, 0) #define cairo_surface_t GdkPixmap diff --git a/libmate-desktop/libmateui/mate-bg-crossfade.h b/libmate-desktop/mate-bg-crossfade.h index 28c1e28..28c1e28 100644 --- a/libmate-desktop/libmateui/mate-bg-crossfade.h +++ b/libmate-desktop/mate-bg-crossfade.h diff --git a/libmate-desktop/mate-bg.c b/libmate-desktop/mate-bg.c index b2cfcbf..83efcd3 100644 --- a/libmate-desktop/mate-bg.c +++ b/libmate-desktop/mate-bg.c @@ -44,8 +44,8 @@ Authors: Soren Sandmann <[email protected]> #include <cairo.h> #define MATE_DESKTOP_USE_UNSTABLE_API -#include <libmateui/mate-bg.h> -#include <libmateui/mate-bg-crossfade.h> +#include <mate-bg.h> +#include <mate-bg-crossfade.h> #if GTK_CHECK_VERSION (3, 0, 0) # include <cairo-xlib.h> diff --git a/libmate-desktop/libmateui/mate-bg.h b/libmate-desktop/mate-bg.h index d909ec4..ed8b7af 100644 --- a/libmate-desktop/libmateui/mate-bg.h +++ b/libmate-desktop/mate-bg.h @@ -33,8 +33,8 @@ #include <gdk/gdk.h> #include <gio/gio.h> -#include <libmateui/mate-desktop-thumbnail.h> -#include <libmateui/mate-bg-crossfade.h> +#include <mate-desktop-thumbnail.h> +#include <mate-bg-crossfade.h> #ifdef __cplusplus extern "C" { diff --git a/libmate-desktop/mate-desktop-item.c b/libmate-desktop/mate-desktop-item.c index c1304be..eb004d9 100644 --- a/libmate-desktop/mate-desktop-item.c +++ b/libmate-desktop/mate-desktop-item.c @@ -56,8 +56,8 @@ #define MATE_DESKTOP_USE_UNSTABLE_API #undef MATE_DISABLE_DEPRECATED -#include <libmate/mate-desktop-item.h> -#include <libmate/mate-desktop-utils.h> +#include <mate-desktop-item.h> +#include <mate-desktop-utils.h> #include "private.h" diff --git a/libmate-desktop/libmate/mate-desktop-item.h b/libmate-desktop/mate-desktop-item.h index 2f9ff9b..2f9ff9b 100644 --- a/libmate-desktop/libmate/mate-desktop-item.h +++ b/libmate-desktop/mate-desktop-item.h diff --git a/libmate-desktop/mate-desktop-thumbnail.c b/libmate-desktop/mate-desktop-thumbnail.c index 45b29a1..734334b 100644 --- a/libmate-desktop/mate-desktop-thumbnail.c +++ b/libmate-desktop/mate-desktop-thumbnail.c @@ -41,7 +41,7 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #define MATE_DESKTOP_USE_UNSTABLE_API -#include "libmateui/mate-desktop-thumbnail.h" +#include "mate-desktop-thumbnail.h" #include <glib/gstdio.h> #include <glib-unix.h> diff --git a/libmate-desktop/libmateui/mate-desktop-thumbnail.h b/libmate-desktop/mate-desktop-thumbnail.h index 775348b..775348b 100644 --- a/libmate-desktop/libmateui/mate-desktop-thumbnail.h +++ b/libmate-desktop/mate-desktop-thumbnail.h diff --git a/libmate-desktop/mate-desktop-utils.c b/libmate-desktop/mate-desktop-utils.c index 8b19a60..4d6d170 100644 --- a/libmate-desktop/mate-desktop-utils.c +++ b/libmate-desktop/mate-desktop-utils.c @@ -30,7 +30,7 @@ #include <glib/gi18n-lib.h> #define MATE_DESKTOP_USE_UNSTABLE_API -#include <libmate/mate-desktop-utils.h> +#include <mate-desktop-utils.h> #include "private.h" diff --git a/libmate-desktop/libmate/mate-desktop-utils.h b/libmate-desktop/mate-desktop-utils.h index f2e659f..f2e659f 100644 --- a/libmate-desktop/libmate/mate-desktop-utils.h +++ b/libmate-desktop/mate-desktop-utils.h diff --git a/libmate-desktop/mate-rr-config.c b/libmate-desktop/mate-rr-config.c index aa4f423..b126f46 100644 --- a/libmate-desktop/mate-rr-config.c +++ b/libmate-desktop/mate-rr-config.c @@ -35,7 +35,7 @@ #include <gdk/gdkx.h> #undef MATE_DISABLE_DEPRECATED -#include "libmateui/mate-rr-config.h" +#include "mate-rr-config.h" #include "edid.h" #include "mate-rr-private.h" diff --git a/libmate-desktop/libmateui/mate-rr-config.h b/libmate-desktop/mate-rr-config.h index 039da01..71caa7f 100644 --- a/libmate-desktop/libmateui/mate-rr-config.h +++ b/libmate-desktop/mate-rr-config.h @@ -28,7 +28,7 @@ #error mate-rr-config.h is unstable API. You must define MATE_DESKTOP_USE_UNSTABLE_API before including mate-rr-config.h #endif -#include <libmateui/mate-rr.h> +#include <mate-rr.h> #include <glib.h> typedef struct MateOutputInfo MateOutputInfo; diff --git a/libmate-desktop/mate-rr-labeler.c b/libmate-desktop/mate-rr-labeler.c index 7ca57fa..2b33526 100644 --- a/libmate-desktop/mate-rr-labeler.c +++ b/libmate-desktop/mate-rr-labeler.c @@ -29,7 +29,7 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include "libmateui/mate-rr-labeler.h" +#include "mate-rr-labeler.h" #include <gtk/gtk.h> #include <X11/Xproto.h> diff --git a/libmate-desktop/libmateui/mate-rr-labeler.h b/libmate-desktop/mate-rr-labeler.h index 1b18ae7..e3214d5 100644 --- a/libmate-desktop/libmateui/mate-rr-labeler.h +++ b/libmate-desktop/mate-rr-labeler.h @@ -30,7 +30,7 @@ #error MateRR is unstable API. You must define MATE_DESKTOP_USE_UNSTABLE_API before including materr.h #endif -#include <libmateui/mate-rr-config.h> +#include <mate-rr-config.h> #define MATE_TYPE_RR_LABELER (mate_rr_labeler_get_type ()) #define MATE_RR_LABELER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MATE_TYPE_RR_LABELER, MateRRLabeler)) diff --git a/libmate-desktop/mate-rr.c b/libmate-desktop/mate-rr.c index d61dd45..197d75b 100644 --- a/libmate-desktop/mate-rr.c +++ b/libmate-desktop/mate-rr.c @@ -38,7 +38,7 @@ #include <X11/Xatom.h> #undef MATE_DISABLE_DEPRECATED -#include "libmateui/mate-rr.h" +#include "mate-rr.h" #include "private.h" #include "mate-rr-private.h" diff --git a/libmate-desktop/libmateui/mate-rr.h b/libmate-desktop/mate-rr.h index 3559560..3559560 100644 --- a/libmate-desktop/libmateui/mate-rr.h +++ b/libmate-desktop/mate-rr.h diff --git a/libmate-desktop/mate-thumbnail-pixbuf-utils.c b/libmate-desktop/mate-thumbnail-pixbuf-utils.c index 8b22239..32b6292 100644 --- a/libmate-desktop/mate-thumbnail-pixbuf-utils.c +++ b/libmate-desktop/mate-thumbnail-pixbuf-utils.c @@ -30,7 +30,7 @@ #include <glib.h> #define MATE_DESKTOP_USE_UNSTABLE_API -#include "libmateui/mate-desktop-thumbnail.h" +#include "mate-desktop-thumbnail.h" #define LOAD_BUFFER_SIZE 65536 diff --git a/libmate-desktop/test-ditem.c b/libmate-desktop/test-ditem.c index d17f6d7..d5cac2d 100644 --- a/libmate-desktop/test-ditem.c +++ b/libmate-desktop/test-ditem.c @@ -20,7 +20,7 @@ #include <string.h> #include <unistd.h> -#include <libmate/mate-desktop-item.h> +#include <mate-desktop-item.h> #include <locale.h> #include <stdlib.h> |