diff options
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | gsettings-desktop-schemas.pc.in | 6 | ||||
| -rw-r--r-- | headers/Makefile.am | 2 | ||||
| -rw-r--r-- | headers/gdesktop-enums.h | 44 | ||||
| -rw-r--r-- | schemas/Makefile.am | 3 |
6 files changed, 62 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 4bbf59f..7ce2f0c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ NULL = -SUBDIRS = schemas po +SUBDIRS = headers schemas po ACLOCAL_AMFLAGS = -I m4 @@ -21,4 +21,7 @@ MAINTAINERCLEANFILES = \ `find "$(srcdir)" -type f -name Makefile.in -print` \ $(srcdir)/configure +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = gsettings-desktop-schemas.pc + -include $(top_srcdir)/git.mk diff --git a/configure.ac b/configure.ac index 7574b52..26f18f2 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ(2.53) AC_INIT([gsettings-desktop-schemas], [0.0.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas]) -AC_CONFIG_SRCDIR(schemas/org.gnome.Desktop.default-applications.gschema.xml) +AC_CONFIG_SRCDIR(schemas/org.gnome.desktop.default-applications.gschema.xml) AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_MACRO_DIR([m4]) @@ -22,6 +22,8 @@ IT_PROG_INTLTOOL([0.40.0]) AC_OUTPUT([ Makefile +gsettings-desktop-schemas.pc +headers/Makefile schemas/Makefile po/Makefile.in ]) diff --git a/gsettings-desktop-schemas.pc.in b/gsettings-desktop-schemas.pc.in new file mode 100644 index 0000000..4cdcabd --- /dev/null +++ b/gsettings-desktop-schemas.pc.in @@ -0,0 +1,6 @@ +prefix=@prefix@ + +Name: gsettings-desktop-schemas +Description: Common GNOME desktop GSettings schemas and headers +Version: @VERSION@ +Cflags: -I@includedir@/gsettings-desktop-schemas diff --git a/headers/Makefile.am b/headers/Makefile.am new file mode 100644 index 0000000..a556a71 --- /dev/null +++ b/headers/Makefile.am @@ -0,0 +1,2 @@ +gdesktopincludedir = $(includedir)/gsettings-desktop-schemas +gdesktopinclude_HEADERS = gdesktop-enums.h diff --git a/headers/gdesktop-enums.h b/headers/gdesktop-enums.h new file mode 100644 index 0000000..ed675eb --- /dev/null +++ b/headers/gdesktop-enums.h @@ -0,0 +1,44 @@ +#ifndef __gdesktop_enums_h__ +#define __gdesktop_enums_h__ + +typedef enum +{ + G_DESKTOP_PROXY_MODE_NONE, + G_DESKTOP_PROXY_MODE_MANUAL, + G_DESKTOP_PROXY_MODE_AUTO +} GDesktopProxyMode; + +typedef enum +{ + G_DESKTOP_TOOLBAR_STYLE_BOTH, + G_DESKTOP_TOOLBAR_STYLE_BOTH_HORIZ, + G_DESKTOP_TOOLBAR_STYLE_ICONS, + G_DESKTOP_TOOLBAR_STYLE_TEXT +} GDesktopToolbarStyle; + +typedef enum +{ + G_DESKTOP_TOOLBAR_ICON_SIZE_SMALL, + G_DESKTOP_TOOLBAR_ICON_SIZE_LARGE +} GDesktopToolbarIconSize; + +typedef enum +{ + G_DESKTOP_BACKGROUND_STYLE_NONE, + G_DESKTOP_BACKGROUND_STYLE_WALLPAPER, + G_DESKTOP_BACKGROUND_STYLE_CENTERED, + G_DESKTOP_BACKGROUND_STYLE_SCALED, + G_DESKTOP_BACKGROUND_STYLE_STRETCHED, + G_DESKTOP_BACKGROUND_STYLE_ZOOM, + G_DESKTOP_BACKGROUND_STYLE_SPANNED +} GDesktopBackgroundStyle; + +typedef enum +{ + G_DESKTOP_BACKGROUND_SHADING_TYPE_NONE, + G_DESKTOP_BACKGROUND_SHADING_TYPE_VERTICAL, + G_DESKTOP_BACKGROUND_SHADING_TYPE_HORIZONTAL +} GDesktopBackgroundShadingType; + + +#endif /* __gdesktop_enums_h__ */ diff --git a/schemas/Makefile.am b/schemas/Makefile.am index f842b25..abeefc6 100644 --- a/schemas/Makefile.am +++ b/schemas/Makefile.am @@ -14,6 +14,9 @@ desktop_gschemas_in = \ desktop_gschemas_in_processed = $(desktop_gschemas_in:.gschema.xml.in=.gschema.xml) +gsettings_ENUM_NAMESPACE = org.gnome.desktop +gsettings_ENUM_FILES = $(top_srcdir)/headers/*.h + gsettings_SCHEMAS = \ $(desktop_gschemas) \ $(desktop_gschemas_in_processed) \ |