[Xfce4-commits] [apps/xfce4-screensaver] 351/425: Bulk rename MATE -> XFCE
noreply at xfce.org
noreply at xfce.org
Mon Oct 15 01:53:18 CEST 2018
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository apps/xfce4-screensaver.
commit 711ffbaaf4c4c25a8feb087d3b46ade1e9541a63
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Wed Oct 3 22:22:44 2018 -0400
Bulk rename MATE -> XFCE
---
.github/issue_template.md | 2 +-
.gitignore | 6 +-
autogen.sh | 8 +-
configure.ac | 48 ++---
data/Makefile.am | 6 +-
data/images/cosmos/Makefile.am | 2 +-
data/images/cosmos/cosmos.xml.in.in | 2 +-
....service.in => org.xfce.ScreenSaver.service.in} | 2 +-
data/org.xfce.background.gschema.xml.in | 62 +++++++
data/org.xfce.lockdown.gschema.xml.in | 49 +++++
....xml.in => org.xfce.screensaver.gschema.xml.in} | 6 +-
data/org.xfce.session.gschema.xml.in | 68 +++++++
data/xfce4-screensaver-command.1 | 4 +-
data/xfce4-screensaver-preferences.1 | 10 +-
data/xfce4-screensaver-preferences.desktop.in | 8 +-
data/xfce4-screensaver.1 | 10 +-
data/xfce4-screensaver.directory.in | 2 +-
data/xfce4-screensaver.pc.in | 2 +-
data/xscreensaver-config.xsl | 2 +-
doc/dbus-interface.xml | 28 +--
doc/xfce4-screensaver.xml.in | 2 +-
po/POTFILES.in | 2 +-
savers/Makefile.am | 12 +-
savers/cosmos-slideshow.desktop.in.in | 2 +-
savers/floaters.c | 2 +-
savers/footlogo-floaters.desktop.in.in | 6 +-
savers/gnomelogo-floaters.desktop.in.in | 2 +-
savers/personal-slideshow.desktop.in.in | 2 +-
savers/popsquares.c | 2 +-
savers/popsquares.desktop.in.in | 2 +-
savers/slideshow.c | 2 +-
src/Makefile.am | 34 ++--
src/debug-screensaver.sh | 2 +-
src/desktop-entries.c | 32 ++--
src/desktop-entries.h | 2 +-
src/gs-listener-dbus.c | 14 +-
src/gs-lock-plug.c | 2 +-
src/gs-prefs.c | 6 +-
src/gs-theme-manager.c | 10 +-
src/menu-monitor.c | 26 +--
src/menu-monitor.h | 16 +-
src/test-fade.c | 2 +-
src/test-passwd.c | 2 +-
src/test-watcher.c | 2 +-
src/test-window.c | 2 +-
src/xfce-bg.c | 4 +-
src/xfce-bg.h | 12 +-
src/xfce-desktop-utils.c | 10 +-
src/xfce-desktop-utils.h | 10 +-
src/xfce-rr.c | 8 +-
src/xfce-rr.h | 8 +-
src/xfce4-screensaver-command.c | 8 +-
src/xfce4-screensaver-dialog.c | 2 +-
src/xfce4-screensaver-gl-helper.c | 2 +-
src/xfce4-screensaver-preferences.c | 14 +-
src/xfce4-screensaver.c | 2 +-
src/xfce4-screensaver.desktop.in.in | 14 +-
src/xfce4-screensaver.h | 4 +-
src/xfcekbd-config-private.h | 2 +-
src/xfcekbd-indicator-config.c | 6 +-
src/xfcekbd-indicator.c | 4 +-
src/xfcemenu-tree.c | 204 ++++++++++-----------
src/xfcemenu-tree.h | 50 ++---
63 files changed, 529 insertions(+), 350 deletions(-)
diff --git a/.github/issue_template.md b/.github/issue_template.md
index 831d46d..f8aed07 100644
--- a/.github/issue_template.md
+++ b/.github/issue_template.md
@@ -7,7 +7,7 @@
#### Steps to reproduce the behaviour
-#### MATE general version
+#### XFCE general version
#### Package version
diff --git a/.gitignore b/.gitignore
index 7eed966..e1b3b12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,9 +37,9 @@ data/images/cosmos/Makefile
data/images/cosmos/background-1.xml
data/images/cosmos/cosmos.xml
data/images/cosmos/cosmos.xml.in
-data/org.mate.ScreenSaver.service
-data/org.mate.screensaver.gschema.valid
-data/org.mate.screensaver.gschema.xml
+data/org.xfce.ScreenSaver.service
+*.gschema.valid
+*.gschema.xml
data/xfce4-screensaver-preferences.desktop
data/xfce4-screensaver.directory
data/xfce4-screensaver.pc
diff --git a/autogen.sh b/autogen.sh
index 5b6eca0..c7dde67 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -12,13 +12,13 @@ PKG_NAME="xfce4-screensaver"
exit 1
}
-which mate-autogen || {
- echo "You need to install mate-common from the MATE Git"
+which xdt-autogen || {
+ echo "You need to install xdt-autogen from the XFCE Git"
exit 1
}
REQUIRED_AUTOMAKE_VERSION=1.9
-MATE_DATADIR="$mate_datadir"
+XFCE_DATADIR="$xfce_datadir"
-. mate-autogen
+. xdt-autogen
diff --git a/configure.ac b/configure.ac
index 4981f60..7182983 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,7 @@ fi
AC_SUBST(RANDR_PACKAGE)
AC_CHECK_FUNCS([setresuid setenv unsetenv clearenv])
-PKG_CHECK_MODULES(MATE_SCREENSAVER,
+PKG_CHECK_MODULES(XFCE_SCREENSAVER,
x11 >= $X11_REQUIRED_VERSION
xscrnsaver
gtk+-3.0 >= $GTK_REQUIRED_VERSION
@@ -83,28 +83,28 @@ PKG_CHECK_MODULES(MATE_SCREENSAVER,
gio-2.0 >= $GLIB_REQUIRED_VERSION
libxklavier >= $LIBXKLAVIER_REQUIRED
$RANDR_PACKAGE)
-AC_SUBST(MATE_SCREENSAVER_CFLAGS)
-AC_SUBST(MATE_SCREENSAVER_LIBS)
+AC_SUBST(XFCE_SCREENSAVER_CFLAGS)
+AC_SUBST(XFCE_SCREENSAVER_LIBS)
-PKG_CHECK_MODULES(MATE_SCREENSAVER_DIALOG,
+PKG_CHECK_MODULES(XFCE_SCREENSAVER_DIALOG,
gio-2.0 >= $GLIB_REQUIRED_VERSION
gthread-2.0
gtk+-3.0 >= $GTK_REQUIRED_VERSION)
-AC_SUBST(MATE_SCREENSAVER_DIALOG_CFLAGS)
-AC_SUBST(MATE_SCREENSAVER_DIALOG_LIBS)
+AC_SUBST(XFCE_SCREENSAVER_DIALOG_CFLAGS)
+AC_SUBST(XFCE_SCREENSAVER_DIALOG_LIBS)
-PKG_CHECK_MODULES(MATE_SCREENSAVER_CAPPLET,
+PKG_CHECK_MODULES(XFCE_SCREENSAVER_CAPPLET,
gio-2.0 >= $GLIB_REQUIRED_VERSION
gtk+-3.0 >= $GTK_REQUIRED_VERSION
libxklavier >= $LIBXKLAVIER_REQUIRED)
-AC_SUBST(MATE_SCREENSAVER_CAPPLET_CFLAGS)
-AC_SUBST(MATE_SCREENSAVER_CAPPLET_LIBS)
+AC_SUBST(XFCE_SCREENSAVER_CAPPLET_CFLAGS)
+AC_SUBST(XFCE_SCREENSAVER_CAPPLET_LIBS)
-PKG_CHECK_MODULES(MATE_SCREENSAVER_COMMAND,
+PKG_CHECK_MODULES(XFCE_SCREENSAVER_COMMAND,
gobject-2.0 >= $GLIB_REQUIRED_VERSION
dbus-glib-1 >= $DBUS_REQUIRED_VERSION)
-AC_SUBST(MATE_SCREENSAVER_COMMAND_CFLAGS)
-AC_SUBST(MATE_SCREENSAVER_COMMAND_LIBS)
+AC_SUBST(XFCE_SCREENSAVER_COMMAND_CFLAGS)
+AC_SUBST(XFCE_SCREENSAVER_COMMAND_LIBS)
AC_PATH_XTRA
@@ -119,7 +119,7 @@ MATE_COMPILE_WARNINGS(yes)
# Solaris requires libresolv for daemon()
case "$host" in
*-*-solaris*)
- AC_CHECK_LIB(resolv, daemon, [MATE_SCREENSAVER_LIBS="$MATE_SCREENSAVER_LIBS -lresolv"])
+ AC_CHECK_LIB(resolv, daemon, [XFCE_SCREENSAVER_LIBS="$XFCE_SCREENSAVER_LIBS -lresolv"])
;;
esac
@@ -127,9 +127,9 @@ esac
SAVER_MODULES="gthread-2.0 gtk+-3.0 >= $GTK_REQUIRED_VERSION gobject-2.0 >= $GLIB_REQUIRED_VERSION"
-PKG_CHECK_MODULES(MATE_SCREENSAVER_SAVER, $SAVER_MODULES)
-AC_SUBST(MATE_SCREENSAVER_SAVER_CFLAGS)
-AC_SUBST(MATE_SCREENSAVER_SAVER_LIBS)
+PKG_CHECK_MODULES(XFCE_SCREENSAVER_SAVER, $SAVER_MODULES)
+AC_SUBST(XFCE_SCREENSAVER_SAVER_CFLAGS)
+AC_SUBST(XFCE_SCREENSAVER_SAVER_LIBS)
# Find out where the session service file goes
# The sad sed hack is recomended by section 27.10 of the automake manual.
@@ -154,11 +154,11 @@ AC_SUBST(PAM_PREFIX)
# Desktop entry handling
-PKG_CHECK_MODULES(LIB_MATE_MENU,
+PKG_CHECK_MODULES(LIB_XFCE_MENU,
gtk+-3.0 >= $GTK_REQUIRED_VERSION)
-AC_SUBST(LIB_MATE_MENU_CFLAGS)
-AC_SUBST(LIB_MATE_MENU_LIBS)
+AC_SUBST(LIB_XFCE_MENU_CFLAGS)
+AC_SUBST(LIB_XFCE_MENU_LIBS)
dnl ---------------------------------------------------------------------------
dnl - Where should we put documentation ?
@@ -1113,8 +1113,8 @@ AC_SUBST(FLOATERS_FOOT_GNOME_LOGO_IMAGE)
# Menu stuff
-MATE_SCREENSAVER_THEMES_DIR="${EXPANDED_DATADIR}/applications/screensavers"
-AC_SUBST(MATE_SCREENSAVER_THEMES_DIR)
+XFCE_SCREENSAVER_THEMES_DIR="${EXPANDED_DATADIR}/applications/screensavers"
+AC_SUBST(XFCE_SCREENSAVER_THEMES_DIR)
# Special directories
# Used for .pc.in file
@@ -1139,8 +1139,8 @@ src/xfce4-screensaver.desktop.in
data/Makefile
data/xfce4-screensavers.menu
data/xfce4-screensaver.pc
-data/org.mate.ScreenSaver.service
-data/org.mate.screensaver.gschema.xml
+data/org.xfce.ScreenSaver.service
+data/org.xfce.screensaver.gschema.xml
data/images/Makefile
data/images/cosmos/Makefile
savers/Makefile
@@ -1163,7 +1163,7 @@ echo "
source code location: ${srcdir}
compiler: ${CC}
cflags: ${CFLAGS}
- Base libs: ${MATE_SCREENSAVER_LIBS}
+ Base libs: ${XFCE_SCREENSAVER_LIBS}
Extension libs: ${SAVER_LIBS}
Maintainer mode: ${USE_MAINTAINER_MODE}
Docs enabled: ${enable_docbook_docs}
diff --git a/data/Makefile.am b/data/Makefile.am
index b9b423e..c8f6d3f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -38,12 +38,12 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xfce4-screensaver.pc
dbussessionservicedir = $(DBUS_SESSION_SERVICE_DIR)
-dbussessionservice_DATA = org.mate.ScreenSaver.service
+dbussessionservice_DATA = org.xfce.ScreenSaver.service
@GSETTINGS_RULES@
@INTLTOOL_XML_NOMERGE_RULE@
-gsettingsschema_in_files = org.mate.screensaver.gschema.xml.in
+gsettingsschema_in_files = org.xfce.screensaver.gschema.xml.in org.xfce.lockdown.gschema.xml.in org.xfce.session.gschema.xml.in org.xfce.background.gschema.xml.in
gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
EXTRA_DIST = \
@@ -54,7 +54,7 @@ EXTRA_DIST = \
$(man_MANS) \
xfce4-screensaver \
xfce4-screensaver.pc.in \
- org.mate.ScreenSaver.service.in\
+ org.xfce.ScreenSaver.service.in\
xscreensaver-config.xsl \
migrate-xscreensaver-config.sh \
$(NULL)
diff --git a/data/images/cosmos/Makefile.am b/data/images/cosmos/Makefile.am
index 6cc80d8..6f1167b 100644
--- a/data/images/cosmos/Makefile.am
+++ b/data/images/cosmos/Makefile.am
@@ -25,7 +25,7 @@ background-1.xml: background-1.xml.in Makefile
$(edit) $< >$@
metadata_in_files = cosmos.xml.in
-metadatadir = $(datadir)/mate-background-properties
+metadatadir = $(datadir)/xfce-background-properties
metadata_DATA = $(metadata_in_files:.xml.in=.xml)
@INTLTOOL_XML_RULE@
diff --git a/data/images/cosmos/cosmos.xml.in.in b/data/images/cosmos/cosmos.xml.in.in
index b9cf666..5deffe4 100644
--- a/data/images/cosmos/cosmos.xml.in.in
+++ b/data/images/cosmos/cosmos.xml.in.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE wallpapers SYSTEM "mate-wp-list.dtd">
+<!DOCTYPE wallpapers SYSTEM "xfce-wp-list.dtd">
<wallpapers>
<wallpaper deleted="false">
<!-- Translators: This is the name of a desktop background image that shows outer space images.
diff --git a/data/org.mate.ScreenSaver.service.in b/data/org.xfce.ScreenSaver.service.in
similarity index 72%
rename from data/org.mate.ScreenSaver.service.in
rename to data/org.xfce.ScreenSaver.service.in
index 6928190..5a5142c 100644
--- a/data/org.mate.ScreenSaver.service.in
+++ b/data/org.xfce.ScreenSaver.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=org.mate.ScreenSaver
+Name=org.xfce.ScreenSaver
Exec=@EXPANDED_BINDIR@/xfce4-screensaver --no-daemon
diff --git a/data/org.xfce.background.gschema.xml.in b/data/org.xfce.background.gschema.xml.in
new file mode 100644
index 0000000..51b52f2
--- /dev/null
+++ b/data/org.xfce.background.gschema.xml.in
@@ -0,0 +1,62 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+ <enum id="org.xfce.background.picture-options-enum">
+ <value nick="wallpaper" value="0"/>
+ <value nick="zoom" value="1"/>
+ <value nick="centered" value="2"/>
+ <value nick="scaled" value="3"/>
+ <value nick="stretched" value="4"/>
+ <value nick="spanned" value="5"/>
+ </enum>
+ <enum id="org.xfce.background.color-shading-type-enum">
+ <value nick="solid" value="0"/>
+ <value nick="horizontal-gradient" value="1"/>
+ <value nick="vertical-gradient" value="2"/>
+ </enum>
+ <schema id="org.xfce.background" path="/org/xfce/desktop/background/">
+ <key name="draw-background" type="b">
+ <default>true</default>
+ <summary>Draw Desktop Background</summary>
+ <description>Have xfce draw the desktop background.</description>
+ </key>
+ <key name="show-desktop-icons" type="b">
+ <default>true</default>
+ <summary>Show Desktop Icons</summary>
+ <description>Have xfce file manager (Caja) draw the desktop icons.</description>
+ </key>
+ <key name="background-fade" type="b">
+ <default>true</default>
+ <summary>Fade the background on change</summary>
+ <description>If set to true, then xfce will change the desktop background with a fading effect.</description>
+ </key>
+ <key name="picture-options" enum="org.xfce.background.picture-options-enum">
+ <default>'zoom'</default>
+ <summary>Picture Options</summary>
+ <description>Determines how the image set by wallpaper_filename is rendered. Possible values are "wallpaper", "centered", "scaled", "stretched", "zoom", "spanned".</description>
+ </key>
+ <key name="picture-filename" type="s">
+ <default>'@datadir@/backgrounds/xfce/desktop/Stripes.png'</default>
+ <summary>Picture Filename</summary>
+ <description>File to use for the background image.</description>
+ </key>
+ <key name="picture-opacity" type="i">
+ <default>100</default>
+ <summary>Picture Opacity</summary>
+ <description>Opacity with which to draw the background picture.</description>
+ </key>
+ <key name="primary-color" type="s">
+ <default>'#5891BC'</default>
+ <summary>Primary Color</summary>
+ <description>Left or Top color when drawing gradients, or the solid color.</description>
+ </key>
+ <key name="secondary-color" type="s">
+ <default>'#3C8F25'</default>
+ <summary>Secondary Color</summary>
+ <description>Right or Bottom color when drawing gradients, not used for solid color.</description>
+ </key>
+ <key name="color-shading-type" enum="org.xfce.background.color-shading-type-enum">
+ <default>'vertical-gradient'</default>
+ <summary>Color Shading Type</summary>
+ <description>How to shade the background color. Possible values are "horizontal-gradient", "vertical-gradient", and "solid".</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/data/org.xfce.lockdown.gschema.xml.in b/data/org.xfce.lockdown.gschema.xml.in
new file mode 100644
index 0000000..65c0a1a
--- /dev/null
+++ b/data/org.xfce.lockdown.gschema.xml.in
@@ -0,0 +1,49 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+ <schema id="org.xfce.lockdown" path="/org/xfce/desktop/lockdown/">
+ <key name="disable-command-line" type="b">
+ <default>false</default>
+ <summary>Disable command line</summary>
+ <description>Prevent the user from accessing the terminal or specifying a command line to be executed. For example, this would disable access to the panel's "Run Application" dialog.</description>
+ </key>
+ <key name="disable-save-to-disk" type="b">
+ <default>false</default>
+ <summary>Disable saving files to disk</summary>
+ <description>Prevent the user from saving files to disk. For example, this would disable access to all applications' "Save as" dialogs.</description>
+ </key>
+ <key name="disable-printing" type="b">
+ <default>false</default>
+ <summary>Disable printing</summary>
+ <description>Prevent the user from printing. For example, this would disable access to all applications' "Print" dialogs.</description>
+ </key>
+ <key name="disable-print-setup" type="b">
+ <default>false</default>
+ <summary>Disable print setup</summary>
+ <description>Prevent the user from modifying print settings. For example, this would disable access to all applications' "Print Setup" dialogs.</description>
+ </key>
+ <key name="disable-user-switching" type="b">
+ <default>false</default>
+ <summary>Disable user switching</summary>
+ <description>Prevent the user from switching to another account while his session is active.</description>
+ </key>
+ <key name="disable-lock-screen" type="b">
+ <default>false</default>
+ <summary>Disable lock screen</summary>
+ <description>Prevent the user from locking the screen.</description>
+ </key>
+ <key name="disable-application-handlers" type="b">
+ <default>false</default>
+ <summary>Disable URL and MIME type handlers</summary>
+ <description>Prevent running any URL or MIME type handler applications.</description>
+ </key>
+ <key name="disable-theme-settings" type="b">
+ <default>false</default>
+ <summary>Disable theme settings</summary>
+ <description>Prevent the user from changing theme settings.</description>
+ </key>
+ <key name="disable-log-out" type="b">
+ <default>false</default>
+ <summary>Disable log out</summary>
+ <description>Prevent the user from logging out.</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/data/org.mate.screensaver.gschema.xml.in b/data/org.xfce.screensaver.gschema.xml.in
similarity index 96%
rename from data/org.mate.screensaver.gschema.xml.in
rename to data/org.xfce.screensaver.gschema.xml.in
index 7671144..e806236 100644
--- a/data/org.mate.screensaver.gschema.xml.in
+++ b/data/org.xfce.screensaver.gschema.xml.in
@@ -1,10 +1,10 @@
<schemalist gettext-domain="@GETTEXT_PACKAGE@">
- <enum id="org.mate.screensaver.Mode">
+ <enum id="org.xfce.screensaver.Mode">
<value nick="blank-only" value="0"/>
<value nick="random" value="1"/>
<value nick="single" value="2"/>
</enum>
- <schema id="org.mate.screensaver" path="/org/mate/screensaver/">
+ <schema id="org.xfce.screensaver" path="/org/xfce/screensaver/">
<key name="idle-activation-enabled" type="b">
<default>true</default>
<summary>Activate when idle</summary>
@@ -15,7 +15,7 @@
<summary>Lock on activation</summary>
<description>Set this to TRUE to lock the screen when the screensaver goes active.</description>
</key>
- <key name="mode" enum="org.mate.screensaver.Mode">
+ <key name="mode" enum="org.xfce.screensaver.Mode">
<default>'blank-only'</default>
<summary>Screensaver theme selection mode</summary>
<description>The selection mode used by screensaver. May be "blank-only" to enable the screensaver without using any theme on activation, "single" to enable screensaver using only one theme on activation (specified in "themes" key), and "random" to enable the screensaver using a random theme on activation.</description>
diff --git a/data/org.xfce.session.gschema.xml.in b/data/org.xfce.session.gschema.xml.in
new file mode 100644
index 0000000..2d2916e
--- /dev/null
+++ b/data/org.xfce.session.gschema.xml.in
@@ -0,0 +1,68 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+ <schema id="org.xfce.session" path="/org/xfce/desktop/session/">
+ <key name="session-start" type="i">
+ <default>0</default>
+ <summary>Current session start time</summary>
+ <description>Unix time of the start of the current session.</description>
+ </key>
+ <key name="auto-save-session" type="b">
+ <default>false</default>
+ <summary>Save sessions</summary>
+ <description>If enabled, xfce-session will save the session automatically.</description>
+ </key>
+ <key name="logout-prompt" type="b">
+ <default>true</default>
+ <summary>Logout prompt</summary>
+ <description>If enabled, xfce-session will prompt the user before ending a session.</description>
+ </key>
+ <key name="logout-timeout" type="i">
+ <default>60</default>
+ <range min="0" max="300"/>
+ <summary>Logout timeout</summary>
+ <description>If logout prompt is enabled, this set the timeout in seconds before logout automatically. If 0, automatic logout is disabled.</description>
+ </key>
+ <key name="idle-delay" type="i">
+ <default>5</default>
+ <summary>Time before session is considered idle</summary>
+ <description>The number of minutes of inactivity before the session is considered idle.</description>
+ </key>
+ <key name="default-session" type="as">
+ <default>[ 'xfce-settings-daemon' ]</default>
+ <summary>Default session</summary>
+ <description>List of applications that are part of the default session.</description>
+ </key>
+ <key name="required-components-list" type="as">
+ <default>[ 'windowmanager', 'panel', 'filemanager', 'dock' ]</default>
+ <summary>Required session components</summary>
+ <description>List of components that are required as part of the session. (Each element names a key under "/org/xfce/desktop/session/required_components"). The Startup Applications preferences tool will not normally allow users to remove a required component from the session, and the session manager will automatically add the required components back to the session at login time if they do get removed.</description>
+ </key>
+ <key name="gnome-compat-startup" type="as">
+ <default>[ 'keyring', 'smproxy' ]</default>
+ <summary>Control gnome compatibility component startup</summary>
+ <description>Control which compatibility components to start.</description>
+ </key>
+ <child name="required-components" schema="org.xfce.session.required-components"/>
+ </schema>
+ <schema id="org.xfce.session.required-components" path="/org/xfce/desktop/session/required-components/">
+ <key name="windowmanager" type="s">
+ <default>'marco'</default>
+ <summary>Window Manager</summary>
+ <description>The window manager is the program that draws the title bar and borders around windows, and allows you to move and resize windows.</description>
+ </key>
+ <key name="panel" type="s">
+ <default>'xfce-panel'</default>
+ <summary>Panel</summary>
+ <description>The panel provides the bar at the top or bottom of the screen containing menus, the window list, status icons, the clock, etc.</description>
+ </key>
+ <key name="filemanager" type="s">
+ <default>'caja'</default>
+ <summary>File Manager</summary>
+ <description>The file manager provides the desktop icons and allows you to interact with your saved files.</description>
+ </key>
+ <key name="dock" type="s">
+ <default>''</default>
+ <summary>Dock</summary>
+ <description>A dock provides a dockable area, similar to a panel, for launching and switching applications.</description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/data/xfce4-screensaver-command.1 b/data/xfce4-screensaver-command.1
index e7808b3..bb54aa5 100644
--- a/data/xfce4-screensaver-command.1
+++ b/data/xfce4-screensaver-command.1
@@ -13,9 +13,9 @@
.\"You should have received a copy of the GNU General Public License along
.\"with this program; if not, write to the Free Software Foundation, Inc.,
.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-.TH xfce4-screensaver-command 1 "2007\-09\-27" "MATE"
+.TH xfce4-screensaver-command 1 "2007\-09\-27" "XFCE"
.SH NAME
-xfce4-screensaver-command \- controls MATE screensaver
+xfce4-screensaver-command \- controls XFCE screensaver
.SH SYNOPSIS
.B xfce4-screensaver-command
.RI [ OPTION... ]
diff --git a/data/xfce4-screensaver-preferences.1 b/data/xfce4-screensaver-preferences.1
index c88be77..f5ff4f7 100644
--- a/data/xfce4-screensaver-preferences.1
+++ b/data/xfce4-screensaver-preferences.1
@@ -14,20 +14,20 @@
.\"with this program; if not, write to the Free Software Foundation, Inc.,
.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
.\"
-.TH MATE-SCREENSAVER-PREFERENCES 1 "13 February 2014" "MATE Desktop Environment"
+.TH XFCE-SCREENSAVER-PREFERENCES 1 "13 February 2014" "XFCE Desktop Environment"
.\" Please adjust this date whenever revising the manpage.
.\"
.SH NAME
-xfce4-screensaver-preferences \- Configure MATE Screensaver
+xfce4-screensaver-preferences \- Configure XFCE Screensaver
.SH SYNOPSIS
.B xfce4-screensaver-preferences [ OPTIONS]
.SH DESCRIPTION
-Manages preferences for the MATE Screensaver.
+Manages preferences for the XFCE Screensaver.
.SH OPTIONS
This program only accepts the standard GTK options.
.SH "BUGS"
.SS Should you encounter any bugs, they may be reported at:
-http://github.com/mate-desktop/xfce4-screensaver/issues
+http://github.com/xfce-desktop/xfce4-screensaver/issues
.SH "AUTHORS"
.SS xfce4-screensaver is maintained by:
.nf
@@ -37,7 +37,7 @@ Stefano Karapetsas <stefano at karapetsas.com>
.fi
.SS This manual page was originally written by:
Sven Arvidsson <sa at whiz.se> (2007)
-.SS It has been updated for the MATE Desktop Environment by:
+.SS It has been updated for the XFCE Desktop Environment by:
Adam Erdman <hekel at archlinux.info> (2014)
.SH "HISTORY"
.SS gnome-screensaver was written by William Jon McCann <mccann at jhu.edu>
diff --git a/data/xfce4-screensaver-preferences.desktop.in b/data/xfce4-screensaver-preferences.desktop.in
index 671066e..24ca0f2 100644
--- a/data/xfce4-screensaver-preferences.desktop.in
+++ b/data/xfce4-screensaver-preferences.desktop.in
@@ -6,8 +6,8 @@ Exec=xfce4-screensaver-preferences
Terminal=false
Type=Application
Categories=GTK;Settings;DesktopSettings;
-OnlyShowIn=MATE;
+OnlyShowIn=XFCE;
StartupNotify=true
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=xfce4-screensaver
-X-MATE-Bugzilla-Component=general
+X-XFCE-Bugzilla-Bugzilla=XFCE
+X-XFCE-Bugzilla-Product=xfce4-screensaver
+X-XFCE-Bugzilla-Component=general
diff --git a/data/xfce4-screensaver.1 b/data/xfce4-screensaver.1
index 809707a..9959644 100644
--- a/data/xfce4-screensaver.1
+++ b/data/xfce4-screensaver.1
@@ -14,15 +14,15 @@
.\"with this program; if not, write to the Free Software Foundation, Inc.,
.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
.\"
-.TH MATE-SCREENSAVER 1 "13 February 2014" "MATE Desktop Environment"
+.TH XFCE-SCREENSAVER 1 "13 February 2014" "XFCE Desktop Environment"
.\" Please adjust this date whenever revising the manpage.
.\"
.SH "NAME"
-xfce4-screensaver \- The MATE Desktop Screensaver and Locker
+xfce4-screensaver \- The XFCE Desktop Screensaver and Locker
.SH "SYNOPSIS"
.B xfce4-screensaver [OPTIONS]
.SH "DESCRIPTION"
-MATE Screensaver is the default screen saver and locker for the MATE Desktop. It is designed with simplicity and security in mind. \fBxfce4-screensaver\fP integrates well with the MATE desktop, and it supports User Switching and the ability to lock down configuration settings.
+XFCE Screensaver is the default screen saver and locker for the XFCE Desktop. It is designed with simplicity and security in mind. \fBxfce4-screensaver\fP integrates well with the XFCE desktop, and it supports User Switching and the ability to lock down configuration settings.
.SH "OPTIONS"
.TP
\fB\-\-display=DISPLAY\fR
@@ -46,7 +46,7 @@ Print all command line options.
This program also accepts the standard GTK options.
.SH "BUGS"
.SS Should you encounter any bugs, they may be reported at:
-http://github.com/mate-desktop/xfce4-screensaver/issues
+http://github.com/xfce-desktop/xfce4-screensaver/issues
.SH "AUTHORS"
.SS xfce4-screensaver is maintained by:
.nf
@@ -54,7 +54,7 @@ Perberos <perberos at gmail.com>
Steve Zesch <stevezesch2 at gmail.com>
Stefano Karapetsas <stefano at karapetsas.com>
.fi
-.SS This Man Page has been updated for the MATE Desktop Environment by:
+.SS This Man Page has been updated for the XFCE Desktop Environment by:
Adam Erdman <hekel at archlinux.info> (2014)
.SH "HISTORY"
.SS gnome-screensaver was written by William Jon McCann <mccann at jhu.edu>
diff --git a/data/xfce4-screensaver.directory.in b/data/xfce4-screensaver.directory.in
index 3733bbd..ad34012 100644
--- a/data/xfce4-screensaver.directory.in
+++ b/data/xfce4-screensaver.directory.in
@@ -4,5 +4,5 @@ _Name=Screensavers
_Comment=Screensaver themes
Icon=screensaver
Type=Directory
-OnlyShowIn=MATE;
+OnlyShowIn=XFCE;
NoDisplay=false
diff --git a/data/xfce4-screensaver.pc.in b/data/xfce4-screensaver.pc.in
index 9fab7e6..d664194 100644
--- a/data/xfce4-screensaver.pc.in
+++ b/data/xfce4-screensaver.pc.in
@@ -11,7 +11,7 @@ privdatadir=@privdatadir@
themesdir=@themesdir@
Name: xfce4-screensaver
-Description: MATE Screensaver
+Description: XFCE Screensaver
Version: @VERSION@
Requires:
Libs:
diff --git a/data/xscreensaver-config.xsl b/data/xscreensaver-config.xsl
index 089193b..2afa72f 100644
--- a/data/xscreensaver-config.xsl
+++ b/data/xscreensaver-config.xsl
@@ -21,7 +21,7 @@ StartupNotify=false
Terminal=false
Type=Application
Categories=Screensaver;
-OnlyShowIn=MATE;
+OnlyShowIn=XFCE;
</xsl:template>
</xsl:stylesheet>
diff --git a/doc/dbus-interface.xml b/doc/dbus-interface.xml
index d245bf1..1776493 100644
--- a/doc/dbus-interface.xml
+++ b/doc/dbus-interface.xml
@@ -10,11 +10,11 @@
<sect1 id="gs-intro">
<title>Introduction</title>
<para>
- MATE Screensaver exposes a DBUS API for programs to obtain information about
+ XFCE Screensaver exposes a DBUS API for programs to obtain information about
the screensaver state and to interact with the screensaver in limited ways.
</para>
<para>
- The following constants are used to uniquely refer to the MateScreensaver
+ The following constants are used to uniquely refer to the XfceScreensaver
object when making DBUS method calls:
</para>
<informaltable>
@@ -22,15 +22,15 @@
<tbody>
<row>
<entry>DBUS Service:</entry>
- <entry><literal>org.mate.ScreenSaver</literal></entry>
+ <entry><literal>org.xfce.ScreenSaver</literal></entry>
</row>
<row>
<entry>DBUS Object Path:</entry>
- <entry><literal>/org/mate/ScreenSaver</literal></entry>
+ <entry><literal>/org/xfce/ScreenSaver</literal></entry>
</row>
<row>
<entry>DBUS Interface:</entry>
- <entry><literal>org.mate.ScreenSaver</literal></entry>
+ <entry><literal>org.xfce.ScreenSaver</literal></entry>
</row>
</tbody>
</tgroup>
@@ -163,7 +163,7 @@
<row>
<entry>in</entry>
<entry>string</entry>
- <entry>the application name, e.g. "mate-power-manager"</entry>
+ <entry>the application name, e.g. "xfce-power-manager"</entry>
</row>
<row>
<entry>in</entry>
@@ -438,24 +438,24 @@
</para>
<screen>
dbus-send --session \
- --dest=org.mate.ScreenSaver \
+ --dest=org.xfce.ScreenSaver \
--type=method_call \
--print-reply \
--reply-timeout=20000 \
- /org/mate/ScreenSaver \
- org.mate.ScreenSaver.GetSessionIdleTime
+ /org/xfce/ScreenSaver \
+ org.xfce.ScreenSaver.GetSessionIdleTime
</screen>
<para>
You can activate the screensaver like so:
</para>
<screen>
dbus-send --session \
- --dest=org.mate.ScreenSaver \
+ --dest=org.xfce.ScreenSaver \
--type=method_call \
--print-reply \
--reply-timeout=20000 \
- /org/mate/ScreenSaver \
- org.mate.ScreenSaver.SetActive \
+ /org/xfce/ScreenSaver \
+ org.xfce.ScreenSaver.SetActive \
boolean:true
</screen>
@@ -464,7 +464,7 @@ dbus-send --session \
</para>
<screen>
dbus-monitor --session \
- "type='signal',interface='org.mate.ScreenSaver'"
+ "type='signal',interface='org.xfce.ScreenSaver'"
</screen>
<para>
@@ -472,7 +472,7 @@ dbus-monitor --session \
</para>
<screen>
dbus-monitor --session \
- "type='signal',interface='org.mate.ScreenSaver',member='SessionIdleChanged'"
+ "type='signal',interface='org.xfce.ScreenSaver',member='SessionIdleChanged'"
</screen>
</sect1>
diff --git a/doc/xfce4-screensaver.xml.in b/doc/xfce4-screensaver.xml.in
index 51a747a..1a34a4b 100644
--- a/doc/xfce4-screensaver.xml.in
+++ b/doc/xfce4-screensaver.xml.in
@@ -3,7 +3,7 @@
<book id="index">
<bookinfo>
- <title>MATE Screensaver @VERSION@ Documentation</title>
+ <title>XFCE Screensaver @VERSION@ Documentation</title>
<releaseinfo>Version @VERSION@</releaseinfo>
<date>6 June, 2006</date>
<authorgroup>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7c90801..ab3c1be 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,7 +5,7 @@ data/xfce4-screensaver-preferences.desktop.in
data/xfce4-screensaver.directory.in
data/images/cosmos/cosmos.xml.in.in
[type: gettext/glade]data/lock-dialog-default.ui
-[type: gettext/gsettings]data/org.mate.screensaver.gschema.xml.in
+[type: gettext/gsettings]data/org.xfce.screensaver.gschema.xml.in
savers/cosmos-slideshow.desktop.in.in
savers/footlogo-floaters.desktop.in.in
savers/gnomelogo-floaters.desktop.in.in
diff --git a/savers/Makefile.am b/savers/Makefile.am
index bfdd874..4bb6a6e 100644
--- a/savers/Makefile.am
+++ b/savers/Makefile.am
@@ -6,10 +6,10 @@ NULL =
AM_CPPFLAGS = \
-I. \
-I$(srcdir) \
- $(MATE_SCREENSAVER_SAVER_CFLAGS) \
+ $(XFCE_SCREENSAVER_SAVER_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
-DLIBEXECDIR=\""$(libexecdir)"\" \
- -DMATELOCALEDIR=\""$(datadir)/locale"\" \
+ -DXFCELOCALEDIR=\""$(datadir)/locale"\" \
-DDATADIR=\""$(datadir)"\" \
$(WARN_CFLAGS) \
$(NULL)
@@ -67,7 +67,7 @@ noinst_LIBRARIES = \
libgs-theme-engine.a
libgs_theme_engine_a_CPPFLAGS = \
- $(MATE_SCREENSAVER_SAVER_CFLAGS) \
+ $(XFCE_SCREENSAVER_SAVER_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
$(NULL)
@@ -92,7 +92,7 @@ floaters_SOURCES = \
floaters_LDADD = \
libgs-theme-engine.a \
- $(MATE_SCREENSAVER_SAVER_LIBS) \
+ $(XFCE_SCREENSAVER_SAVER_LIBS) \
-lm \
$(NULL)
@@ -104,7 +104,7 @@ popsquares_SOURCES = \
popsquares_LDADD = \
libgs-theme-engine.a \
- $(MATE_SCREENSAVER_SAVER_LIBS) \
+ $(XFCE_SCREENSAVER_SAVER_LIBS) \
$(NULL)
slideshow_SOURCES = \
@@ -117,7 +117,7 @@ slideshow_SOURCES = \
slideshow_LDADD = \
libgs-theme-engine.a \
- $(MATE_SCREENSAVER_SAVER_LIBS) \
+ $(XFCE_SCREENSAVER_SAVER_LIBS) \
$(NULL)
EXTRA_DIST = \
diff --git a/savers/cosmos-slideshow.desktop.in.in b/savers/cosmos-slideshow.desktop.in.in
index c626926..2ac4aaf 100644
--- a/savers/cosmos-slideshow.desktop.in.in
+++ b/savers/cosmos-slideshow.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
Terminal=false
Type=Application
Categories=Screensaver;
-OnlyShowIn=MATE;
+OnlyShowIn=XFCE;
diff --git a/savers/floaters.c b/savers/floaters.c
index fc83fae..493d67a 100644
--- a/savers/floaters.c
+++ b/savers/floaters.c
@@ -1171,7 +1171,7 @@ main (int argc,
error = NULL;
- bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, XFCELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
diff --git a/savers/footlogo-floaters.desktop.in.in b/savers/footlogo-floaters.desktop.in.in
index af3798b..ba14650 100644
--- a/savers/footlogo-floaters.desktop.in.in
+++ b/savers/footlogo-floaters.desktop.in.in
@@ -1,10 +1,10 @@
[Desktop Entry]
-_Name=Floating MATE
-_Comment=Bubbles the MATE logo around the screen
+_Name=Floating XFCE
+_Comment=Bubbles the XFCE logo around the screen
Exec=@SAVERDIR@/floaters @FLOATERS_FOOT_LOGO_IMAGE@
TryExec=@SAVERDIR@/floaters
StartupNotify=false
Terminal=false
Type=Application
Categories=Screensaver;
-OnlyShowIn=MATE;
+OnlyShowIn=XFCE;
diff --git a/savers/gnomelogo-floaters.desktop.in.in b/savers/gnomelogo-floaters.desktop.in.in
index 06dba48..f5098af 100644
--- a/savers/gnomelogo-floaters.desktop.in.in
+++ b/savers/gnomelogo-floaters.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
Terminal=false
Type=Application
Categories=Screensaver;
-OnlyShowIn=MATE;
+OnlyShowIn=XFCE;
diff --git a/savers/personal-slideshow.desktop.in.in b/savers/personal-slideshow.desktop.in.in
index 2446563..15bbbf7 100644
--- a/savers/personal-slideshow.desktop.in.in
+++ b/savers/personal-slideshow.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
Terminal=false
Type=Application
Categories=Screensaver;
-OnlyShowIn=MATE;
+OnlyShowIn=XFCE;
diff --git a/savers/popsquares.c b/savers/popsquares.c
index 6b9b8f7..1289c48 100644
--- a/savers/popsquares.c
+++ b/savers/popsquares.c
@@ -38,7 +38,7 @@ main (int argc, char **argv)
GtkWidget *window;
GError *error;
- bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, XFCELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
diff --git a/savers/popsquares.desktop.in.in b/savers/popsquares.desktop.in.in
index 49dc2e7..8f3f6d2 100644
--- a/savers/popsquares.desktop.in.in
+++ b/savers/popsquares.desktop.in.in
@@ -7,4 +7,4 @@ StartupNotify=false
Terminal=false
Type=Application
Categories=Screensaver;
-OnlyShowIn=MATE;
+OnlyShowIn=XFCE;
diff --git a/savers/slideshow.c b/savers/slideshow.c
index 24dc394..cbbbce0 100644
--- a/savers/slideshow.c
+++ b/savers/slideshow.c
@@ -69,7 +69,7 @@ main (int argc, char **argv)
{ NULL }
};
- bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, XFCELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
diff --git a/src/Makefile.am b/src/Makefile.am
index 5b253d1..33487b4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,10 +9,10 @@ themesdir = $(pkgdatadir)/themes
AM_CPPFLAGS = \
-I. \
-I$(srcdir) \
- -DMATEMENU_I_KNOW_THIS_IS_UNSTABLE \
- $(MATE_SCREENSAVER_CFLAGS) \
- $(MATE_SCREENSAVER_DIALOG_CFLAGS) \
- $(MATE_SCREENSAVER_CAPPLET_CFLAGS) \
+ -DXFCEMENU_I_KNOW_THIS_IS_UNSTABLE \
+ $(XFCE_SCREENSAVER_CFLAGS) \
+ $(XFCE_SCREENSAVER_DIALOG_CFLAGS) \
+ $(XFCE_SCREENSAVER_CAPPLET_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
-DPREFIX=\""$(prefix)"\" \
-DBINDIR=\""$(bindir)"\" \
@@ -20,7 +20,7 @@ AM_CPPFLAGS = \
-DLIBEXECDIR=\""$(libexecdir)"\" \
-DDATADIR=\""$(datadir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DMATELOCALEDIR=\""$(datadir)/locale"\" \
+ -DXFCELOCALEDIR=\""$(datadir)/locale"\" \
-DSAVERDIR=\""$(saverdir)"\" \
-DTHEMESDIR=\""$(themesdir)"\" \
-DGTKBUILDERDIR=\"$(pkgdatadir)\" \
@@ -29,7 +29,7 @@ AM_CPPFLAGS = \
$(AUTH_CFLAGS) \
$(DEBUG_CFLAGS) \
$(DBUS_CFLAGS) \
- $(LIBMATEKBDUI_CFLAGS) \
+ $(LIBXFCEKBDUI_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
$(LIBXKLAVIER_CFLAGS) \
$(SYSTEMD_CFLAGS) \
@@ -63,7 +63,7 @@ xfce4_screensaver_command_SOURCES = \
$(NULL)
xfce4_screensaver_command_LDADD = \
- $(MATE_SCREENSAVER_COMMAND_LIBS) \
+ $(XFCE_SCREENSAVER_COMMAND_LIBS) \
$(NULL)
AUTH_SOURCES = \
@@ -82,7 +82,7 @@ test_fade_SOURCES = \
$(NULL)
test_fade_LDADD = \
- $(MATE_SCREENSAVER_LIBS) \
+ $(XFCE_SCREENSAVER_LIBS) \
$(SAVER_LIBS) \
$(NULL)
@@ -96,7 +96,7 @@ test_passwd_SOURCES = \
$(NULL)
test_passwd_LDADD = \
- $(MATE_SCREENSAVER_DIALOG_LIBS)\
+ $(XFCE_SCREENSAVER_DIALOG_LIBS)\
$(AUTH_LIBS) \
$(NULL)
@@ -111,7 +111,7 @@ test_watcher_SOURCES = \
$(NULL)
test_watcher_LDADD = \
- $(MATE_SCREENSAVER_LIBS) \
+ $(XFCE_SCREENSAVER_LIBS) \
$(SAVER_LIBS) \
$(NULL)
@@ -130,7 +130,7 @@ test_window_SOURCES = \
$(NULL)
test_window_LDADD = \
- $(MATE_SCREENSAVER_LIBS) \
+ $(XFCE_SCREENSAVER_LIBS) \
$(SAVER_LIBS) \
$(NULL)
@@ -201,11 +201,11 @@ EXTRA_xfce4_screensaver_dialog_SOURCES = \
$(NULL)
xfce4_screensaver_dialog_LDADD = \
- $(MATE_SCREENSAVER_DIALOG_LIBS)\
- $(MATE_SCREENSAVER_LIBS)\
+ $(XFCE_SCREENSAVER_DIALOG_LIBS)\
+ $(XFCE_SCREENSAVER_LIBS)\
$(SAVER_LIBS) \
$(AUTH_LIBS) \
- $(LIBMATEKBDUI_LIBS) \
+ $(LIBXFCEKBDUI_LIBS) \
$(LIBNOTIFY_LIBS) \
$(NULL)
@@ -282,7 +282,7 @@ xfce4_screensaver_SOURCES = \
$(NULL)
xfce4_screensaver_gl_helper_LDADD = \
- $(MATE_SCREENSAVER_LIBS) \
+ $(XFCE_SCREENSAVER_LIBS) \
$(GL_LIBS) \
$(NULL)
@@ -293,7 +293,7 @@ xfce4_screensaver_gl_helper_SOURCES = \
$(NULL)
xfce4_screensaver_LDADD = \
- $(MATE_SCREENSAVER_LIBS) \
+ $(XFCE_SCREENSAVER_LIBS) \
$(SAVER_LIBS) \
$(SYSTEMD_LIBS) \
$(NULL)
@@ -340,7 +340,7 @@ xfce4_screensaver_preferences_SOURCES = \
$(NULL)
xfce4_screensaver_preferences_LDADD = \
- $(MATE_SCREENSAVER_CAPPLET_LIBS) \
+ $(XFCE_SCREENSAVER_CAPPLET_LIBS) \
$(NULL)
EXTRA_DIST = \
diff --git a/src/debug-screensaver.sh b/src/debug-screensaver.sh
index 64a3437..a067d4e 100755
--- a/src/debug-screensaver.sh
+++ b/src/debug-screensaver.sh
@@ -3,7 +3,7 @@
# This is probably linux only at the moment
if [ -z "${DBUS_SESSION_BUS_ADDRESS}" ]; then
- pid=`pgrep -u $USER "mate-session|x-session-manager"`
+ pid=`pgrep -u $USER "xfce-session|x-session-manager"`
if [ "x$pid" != "x" ]; then
env_address=`(cat /proc/$pid/environ; echo) | tr "\000" "\n" | grep '^DBUS_SESSION_BUS_ADDRESS='`
env_display=`(cat /proc/$pid/environ; echo) | tr "\000" "\n" | grep '^DISPLAY='`
diff --git a/src/desktop-entries.c b/src/desktop-entries.c
index b66521b..513ce7a 100644
--- a/src/desktop-entries.c
+++ b/src/desktop-entries.c
@@ -31,7 +31,7 @@
enum {
DESKTOP_ENTRY_NO_DISPLAY = 1 << 0,
DESKTOP_ENTRY_HIDDEN = 1 << 1,
- DESKTOP_ENTRY_SHOW_IN_MATE = 1 << 2,
+ DESKTOP_ENTRY_SHOW_IN_XFCE = 1 << 2,
DESKTOP_ENTRY_TRYEXEC_FAILED = 1 << 3
};
@@ -69,7 +69,7 @@ static guint get_flags_from_key_file(DesktopEntry* entry, GKeyFile* key_file, co
char **strv;
gboolean no_display;
gboolean hidden;
- gboolean show_in_mate;
+ gboolean show_in_xfce;
gboolean tryexec_failed;
char *tryexec;
guint flags;
@@ -97,7 +97,7 @@ static guint get_flags_from_key_file(DesktopEntry* entry, GKeyFile* key_file, co
g_error_free (error);
}
- show_in_mate = TRUE;
+ show_in_xfce = TRUE;
strv = g_key_file_get_string_list (key_file,
desktop_entry_group,
"OnlyShowIn",
@@ -105,12 +105,12 @@ static guint get_flags_from_key_file(DesktopEntry* entry, GKeyFile* key_file, co
NULL);
if (strv)
{
- show_in_mate = FALSE;
+ show_in_xfce = FALSE;
for (i = 0; strv[i]; i++)
{
- if (!strcmp (strv[i], "MATE"))
+ if (!strcmp (strv[i], "XFCE"))
{
- show_in_mate = TRUE;
+ show_in_xfce = TRUE;
break;
}
}
@@ -124,12 +124,12 @@ static guint get_flags_from_key_file(DesktopEntry* entry, GKeyFile* key_file, co
NULL);
if (strv)
{
- show_in_mate = TRUE;
+ show_in_xfce = TRUE;
for (i = 0; strv[i]; i++)
{
- if (!strcmp (strv[i], "MATE"))
+ if (!strcmp (strv[i], "XFCE"))
{
- show_in_mate = FALSE;
+ show_in_xfce = FALSE;
}
}
}
@@ -158,8 +158,8 @@ static guint get_flags_from_key_file(DesktopEntry* entry, GKeyFile* key_file, co
flags |= DESKTOP_ENTRY_NO_DISPLAY;
if (hidden)
flags |= DESKTOP_ENTRY_HIDDEN;
- if (show_in_mate)
- flags |= DESKTOP_ENTRY_SHOW_IN_MATE;
+ if (show_in_xfce)
+ flags |= DESKTOP_ENTRY_SHOW_IN_XFCE;
if (tryexec_failed)
flags |= DESKTOP_ENTRY_TRYEXEC_FAILED;
@@ -277,7 +277,7 @@ static DesktopEntry* desktop_entry_load(DesktopEntry* entry)
retval->name = GET_LOCALE_STRING ("Name");
retval->generic_name = GET_LOCALE_STRING ("GenericName");
- retval->full_name = GET_LOCALE_STRING ("X-MATE-FullName");
+ retval->full_name = GET_LOCALE_STRING ("X-XFCE-FullName");
retval->comment = GET_LOCALE_STRING ("Comment");
retval->icon = GET_LOCALE_STRING ("Icon");
retval->flags = get_flags_from_key_file (retval, key_file, desktop_entry_group);
@@ -291,7 +291,7 @@ static DesktopEntry* desktop_entry_load(DesktopEntry* entry)
#undef GET_LOCALE_STRING
- menu_verbose ("Desktop entry \"%s\" (%s, %s, %s, %s, %s) flags: NoDisplay=%s, Hidden=%s, ShowInMATE=%s, TryExecFailed=%s\n",
+ menu_verbose ("Desktop entry \"%s\" (%s, %s, %s, %s, %s) flags: NoDisplay=%s, Hidden=%s, ShowInXFCE=%s, TryExecFailed=%s\n",
retval->basename,
retval->name,
retval->generic_name ? retval->generic_name : "(null)",
@@ -300,7 +300,7 @@ static DesktopEntry* desktop_entry_load(DesktopEntry* entry)
retval->icon ? retval->icon : "(null)",
retval->flags & DESKTOP_ENTRY_NO_DISPLAY ? "(true)" : "(false)",
retval->flags & DESKTOP_ENTRY_HIDDEN ? "(true)" : "(false)",
- retval->flags & DESKTOP_ENTRY_SHOW_IN_MATE ? "(true)" : "(false)",
+ retval->flags & DESKTOP_ENTRY_SHOW_IN_XFCE ? "(true)" : "(false)",
retval->flags & DESKTOP_ENTRY_TRYEXEC_FAILED ? "(true)" : "(false)");
out:
@@ -508,9 +508,9 @@ gboolean desktop_entry_get_no_display(DesktopEntry* entry)
return (entry->flags & DESKTOP_ENTRY_NO_DISPLAY) != 0;
}
-gboolean desktop_entry_get_show_in_mate(DesktopEntry* entry)
+gboolean desktop_entry_get_show_in_xfce(DesktopEntry* entry)
{
- return (entry->flags & DESKTOP_ENTRY_SHOW_IN_MATE) != 0;
+ return (entry->flags & DESKTOP_ENTRY_SHOW_IN_XFCE) != 0;
}
gboolean desktop_entry_get_tryexec_failed(DesktopEntry* entry)
diff --git a/src/desktop-entries.h b/src/desktop-entries.h
index 73b7419..b0e1dff 100644
--- a/src/desktop-entries.h
+++ b/src/desktop-entries.h
@@ -51,7 +51,7 @@ const char* desktop_entry_get_exec(DesktopEntry* entry);
gboolean desktop_entry_get_hidden(DesktopEntry* entry);
gboolean desktop_entry_get_no_display(DesktopEntry* entry);
-gboolean desktop_entry_get_show_in_mate(DesktopEntry* entry);
+gboolean desktop_entry_get_show_in_xfce(DesktopEntry* entry);
gboolean desktop_entry_get_tryexec_failed(DesktopEntry* entry);
gboolean desktop_entry_has_categories(DesktopEntry* entry);
diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
index 80e001f..5898cab 100644
--- a/src/gs-listener-dbus.c
+++ b/src/gs-listener-dbus.c
@@ -52,9 +52,9 @@ static DBusHandlerResult gs_listener_message_handler (DBusConnection *connec
DBusMessage *message,
void *user_data);
-#define GS_LISTENER_SERVICE "org.mate.ScreenSaver"
-#define GS_LISTENER_PATH "/org/mate/ScreenSaver"
-#define GS_LISTENER_INTERFACE "org.mate.ScreenSaver"
+#define GS_LISTENER_SERVICE "org.xfce.ScreenSaver"
+#define GS_LISTENER_PATH "/org/xfce/ScreenSaver"
+#define GS_LISTENER_INTERFACE "org.xfce.ScreenSaver"
#define HAL_DEVICE_INTERFACE "org.freedesktop.Hal.Device"
@@ -776,7 +776,7 @@ listener_add_ref_entry (GSListener *listener,
if (entry_type == REF_ENTRY_TYPE_INHIBIT)
{
- /* proxy inhibit over to mate session */
+ /* proxy inhibit over to xfce session */
add_session_inhibit (listener, entry);
}
@@ -810,7 +810,7 @@ listener_remove_ref_entry (GSListener *listener,
if (entry_type == REF_ENTRY_TYPE_INHIBIT)
{
- /* remove inhibit from mate session */
+ /* remove inhibit from xfce session */
remove_session_inhibit (listener, entry);
}
@@ -1074,7 +1074,7 @@ listener_ref_entry_remove_for_connection (GSListener *listener,
if (entry->entry_type == REF_ENTRY_TYPE_INHIBIT)
{
- /* remove inhibit from mate session */
+ /* remove inhibit from xfce session */
remove_session_inhibit (listener, entry);
}
@@ -1370,7 +1370,7 @@ do_introspect (DBusConnection *connection,
/* ScreenSaver interface */
xml = g_string_append (xml,
- " <interface name=\"org.mate.ScreenSaver\">\n"
+ " <interface name=\"org.xfce.ScreenSaver\">\n"
" <method name=\"Lock\">\n"
" </method>\n"
" <method name=\"Cycle\">\n"
diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
index 956ef33..6e3f942 100644
--- a/src/gs-lock-plug.c
+++ b/src/gs-lock-plug.c
@@ -54,7 +54,7 @@
#include "gs-debug.h"
-#define GSETTINGS_SCHEMA "org.mate.screensaver"
+#define GSETTINGS_SCHEMA "org.xfce.screensaver"
#define KEY_LOCK_DIALOG_THEME "lock-dialog-theme"
diff --git a/src/gs-prefs.c b/src/gs-prefs.c
index df1267c..1ce4687 100644
--- a/src/gs-prefs.c
+++ b/src/gs-prefs.c
@@ -34,14 +34,14 @@ static void gs_prefs_class_init (GSPrefsClass *klass);
static void gs_prefs_init (GSPrefs *prefs);
static void gs_prefs_finalize (GObject *object);
-#define LOCKDOWN_SETTINGS_SCHEMA "org.mate.lockdown"
+#define LOCKDOWN_SETTINGS_SCHEMA "org.xfce.lockdown"
#define KEY_LOCK_DISABLE "disable-lock-screen"
#define KEY_USER_SWITCH_DISABLE "disable-user-switching"
-#define SESSION_SETTINGS_SCHEMA "org.mate.session"
+#define SESSION_SETTINGS_SCHEMA "org.xfce.session"
#define KEY_IDLE_DELAY "idle-delay"
-#define GSETTINGS_SCHEMA "org.mate.screensaver"
+#define GSETTINGS_SCHEMA "org.xfce.screensaver"
#define KEY_IDLE_ACTIVATION_ENABLED "idle-activation-enabled"
#define KEY_LOCK_ENABLED "lock-enabled"
#define KEY_MODE "mode"
diff --git a/src/gs-theme-manager.c b/src/gs-theme-manager.c
index e35956b..af025f3 100644
--- a/src/gs-theme-manager.c
+++ b/src/gs-theme-manager.c
@@ -281,7 +281,7 @@ find_info_for_id (XfceMenuTree *tree,
for (l = items; l; l = l->next)
{
if (info == NULL
- && xfcemenu_tree_item_get_type (l->data) == MATEMENU_TREE_ITEM_ENTRY)
+ && xfcemenu_tree_item_get_type (l->data) == XFCEMENU_TREE_ITEM_ENTRY)
{
XfceMenuTreeEntry *entry = l->data;
const char *file_id;
@@ -346,12 +346,12 @@ make_theme_list (GSList **parent_list,
switch (xfcemenu_tree_item_get_type (l->data))
{
- case MATEMENU_TREE_ITEM_ENTRY:
+ case XFCEMENU_TREE_ITEM_ENTRY:
theme_prepend_entry (parent_list, l->data, filename);
break;
- case MATEMENU_TREE_ITEM_ALIAS:
- case MATEMENU_TREE_ITEM_DIRECTORY:
+ case XFCEMENU_TREE_ITEM_ALIAS:
+ case XFCEMENU_TREE_ITEM_DIRECTORY:
default:
break;
}
@@ -402,7 +402,7 @@ get_themes_tree (void)
and since this is only run once we'll do it here */
add_known_engine_locations_to_path ();
- themes_tree = xfcemenu_tree_lookup ("xfce4-screensavers.menu", MATEMENU_TREE_FLAGS_NONE);
+ themes_tree = xfcemenu_tree_lookup ("xfce4-screensavers.menu", XFCEMENU_TREE_FLAGS_NONE);
return themes_tree;
}
diff --git a/src/menu-monitor.c b/src/menu-monitor.c
index 48215c5..bf6130d 100644
--- a/src/menu-monitor.c
+++ b/src/menu-monitor.c
@@ -51,8 +51,8 @@ typedef struct {
guint refcount;
} MenuMonitorNotify;
-static MenuMonitorNotify* mate_menu_monitor_notify_ref(MenuMonitorNotify* notify);
-static void mate_menu_monitor_notify_unref(MenuMonitorNotify* notify);
+static MenuMonitorNotify* xfce_menu_monitor_notify_ref(MenuMonitorNotify* notify);
+static void xfce_menu_monitor_notify_unref(MenuMonitorNotify* notify);
static GHashTable* monitors_registry = NULL;
static guint events_idle_handler = 0;
@@ -65,7 +65,7 @@ static void invoke_notifies(MenuMonitor* monitor, MenuMonitorEvent event, const
copy = g_slist_copy (monitor->notifies);
g_slist_foreach (copy,
- (GFunc) mate_menu_monitor_notify_ref,
+ (GFunc) xfce_menu_monitor_notify_ref,
NULL);
tmp = copy;
@@ -79,7 +79,7 @@ static void invoke_notifies(MenuMonitor* monitor, MenuMonitorEvent event, const
notify->notify_func (monitor, event, path, notify->user_data);
}
- mate_menu_monitor_notify_unref(notify);
+ xfce_menu_monitor_notify_unref(notify);
tmp = next;
}
@@ -102,7 +102,7 @@ static gboolean emit_events_in_idle(void)
{
MenuMonitorEventInfo *event_info = tmp->data;
- mate_menu_monitor_ref(event_info->monitor);
+ xfce_menu_monitor_ref(event_info->monitor);
tmp = tmp->next;
}
@@ -258,11 +258,11 @@ static MenuMonitor* lookup_monitor(const char* path, gboolean is_directory)
{
g_free (registry_key);
- return mate_menu_monitor_ref(retval);
+ return xfce_menu_monitor_ref(retval);
}
}
-MenuMonitor* mate_menu_monitor_file_get(const char* path)
+MenuMonitor* xfce_menu_monitor_file_get(const char* path)
{
g_return_val_if_fail(path != NULL, NULL);
@@ -276,7 +276,7 @@ MenuMonitor* menu_get_directory_monitor(const char* path)
return lookup_monitor (path, TRUE);
}
-MenuMonitor* mate_menu_monitor_ref(MenuMonitor* monitor)
+MenuMonitor* xfce_menu_monitor_ref(MenuMonitor* monitor)
{
g_return_val_if_fail(monitor != NULL, NULL);
g_return_val_if_fail(monitor->refcount > 0, NULL);
@@ -340,7 +340,7 @@ void menu_monitor_unref(MenuMonitor* monitor)
monitor->monitor = NULL;
}
- g_slist_foreach (monitor->notifies, (GFunc) mate_menu_monitor_notify_unref, NULL);
+ g_slist_foreach (monitor->notifies, (GFunc) xfce_menu_monitor_notify_unref, NULL);
g_slist_free (monitor->notifies);
monitor->notifies = NULL;
@@ -352,7 +352,7 @@ void menu_monitor_unref(MenuMonitor* monitor)
g_free (monitor);
}
-static MenuMonitorNotify* mate_menu_monitor_notify_ref(MenuMonitorNotify* notify)
+static MenuMonitorNotify* xfce_menu_monitor_notify_ref(MenuMonitorNotify* notify)
{
g_return_val_if_fail(notify != NULL, NULL);
g_return_val_if_fail(notify->refcount > 0, NULL);
@@ -362,7 +362,7 @@ static MenuMonitorNotify* mate_menu_monitor_notify_ref(MenuMonitorNotify* notify
return notify;
}
-static void mate_menu_monitor_notify_unref(MenuMonitorNotify* notify)
+static void xfce_menu_monitor_notify_unref(MenuMonitorNotify* notify)
{
g_return_if_fail(notify != NULL);
g_return_if_fail(notify->refcount > 0);
@@ -407,7 +407,7 @@ void menu_monitor_add_notify(MenuMonitor* monitor, MenuMonitorNotifyFunc notify_
}
}
-void mate_menu_monitor_notify_remove(MenuMonitor* monitor, MenuMonitorNotifyFunc notify_func, gpointer user_data)
+void xfce_menu_monitor_notify_remove(MenuMonitor* monitor, MenuMonitorNotifyFunc notify_func, gpointer user_data)
{
GSList* tmp = monitor->notifies;
@@ -421,7 +421,7 @@ void mate_menu_monitor_notify_remove(MenuMonitor* monitor, MenuMonitorNotifyFunc
notify->notify_func = NULL;
notify->user_data = NULL;
- mate_menu_monitor_notify_unref(notify);
+ xfce_menu_monitor_notify_unref(notify);
monitor->notifies = g_slist_delete_link(monitor->notifies, tmp);
}
diff --git a/src/menu-monitor.h b/src/menu-monitor.h
index 8180c68..ad411be 100644
--- a/src/menu-monitor.h
+++ b/src/menu-monitor.h
@@ -52,16 +52,16 @@ void menu_monitor_remove_notify(MenuMonitor* monitor, MenuMonitorNotifyFunc noti
/* Izquierda a derecha
*/
-#define mate_menu_monitor_file_get menu_get_file_monitor
-#define mate_menu_monitor_directory_get menu_get_directory_monitor
+#define xfce_menu_monitor_file_get menu_get_file_monitor
+#define xfce_menu_monitor_directory_get menu_get_directory_monitor
-#define mate_menu_monitor_ref menu_monitor_ref
-#define mate_menu_monitor_unref menu_monitor_unref
+#define xfce_menu_monitor_ref menu_monitor_ref
+#define xfce_menu_monitor_unref menu_monitor_unref
-#define mate_menu_monitor_notify_add menu_monitor_add_notify
-#define mate_menu_monitor_notify_remove menu_monitor_remove_notify
-#define mate_menu_monitor_notify_ref menu_monitor_notify_ref /* private */
-#define mate_menu_monitor_notify_unref menu_monitor_notify_unref /* private */
+#define xfce_menu_monitor_notify_add menu_monitor_add_notify
+#define xfce_menu_monitor_notify_remove menu_monitor_remove_notify
+#define xfce_menu_monitor_notify_ref menu_monitor_notify_ref /* private */
+#define xfce_menu_monitor_notify_unref menu_monitor_notify_unref /* private */
#ifdef __cplusplus
}
diff --git a/src/test-fade.c b/src/test-fade.c
index 6a82d21..7a417fd 100644
--- a/src/test-fade.c
+++ b/src/test-fade.c
@@ -81,7 +81,7 @@ main (int argc,
int op, event, err;
#ifdef ENABLE_NLS
- bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, XFCELOCALEDIR);
# ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
# endif
diff --git a/src/test-passwd.c b/src/test-passwd.c
index 9359fb1..80e0ab1 100644
--- a/src/test-passwd.c
+++ b/src/test-passwd.c
@@ -230,7 +230,7 @@ main (int argc,
char *nolock_reason = NULL;
#ifdef ENABLE_NLS
- bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, XFCELOCALEDIR);
# ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
# endif
diff --git a/src/test-watcher.c b/src/test-watcher.c
index 9b56063..35f5951 100644
--- a/src/test-watcher.c
+++ b/src/test-watcher.c
@@ -80,7 +80,7 @@ main (int argc,
GError *error = NULL;
#ifdef ENABLE_NLS
- bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, XFCELOCALEDIR);
# ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
# endif
diff --git a/src/test-window.c b/src/test-window.c
index 92166d1..6fb4507 100644
--- a/src/test-window.c
+++ b/src/test-window.c
@@ -146,7 +146,7 @@ main (int argc,
GError *error = NULL;
#ifdef ENABLE_NLS
- bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, XFCELOCALEDIR);
# ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
# endif
diff --git a/src/xfce-bg.c b/src/xfce-bg.c
index dab363f..8ec37f2 100644
--- a/src/xfce-bg.c
+++ b/src/xfce-bg.c
@@ -1,6 +1,6 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
-matebg.c: Object for the desktop background.
+xfcebg.c: Object for the desktop background.
Copyright (C) 2000 Eazel, Inc.
Copyright (C) 2007-2008 Red Hat, Inc.
@@ -47,7 +47,7 @@ Authors: Soren Sandmann <sandmann at redhat.com>
# include <cairo-xlib.h>
-#define XFCE_BG_CACHE_DIR "mate/background"
+#define XFCE_BG_CACHE_DIR "xfce/background"
/* We keep the large pixbufs around if the next update
in the slideshow is less than 60 seconds away */
diff --git a/src/xfce-bg.h b/src/xfce-bg.h
index 68f4065..a1cb925 100644
--- a/src/xfce-bg.h
+++ b/src/xfce-bg.h
@@ -3,20 +3,20 @@
Copyright (C) 2007 Red Hat, Inc.
Copyright (C) 2012 Jasmine Hassan <jasmine.aura at gmail.com>
- This file is part of the Mate Library.
+ This file is part of the Xfce Library.
- The Mate Library is free software; you can redistribute it and/or
+ The Xfce Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- The Mate Library is distributed in the hope that it will be useful,
+ The Xfce Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
- License along with the Mate Library; see the file COPYING.LIB. If not,
+ License along with the Xfce Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
Boston, MA 02110-1301, USA.
@@ -40,12 +40,12 @@ G_BEGIN_DECLS
#define XFCE_IS_BG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFCE_TYPE_BG))
#define XFCE_BG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFCE_TYPE_BG, XfceBGClass))
-#define XFCE_BG_SCHEMA "org.mate.background"
+#define XFCE_BG_SCHEMA "org.xfce.background"
/* whether to draw the desktop bg */
#define XFCE_BG_KEY_DRAW_BACKGROUND "draw-background"
-/* whether Caja or mate-settings-daemon draw the desktop */
+/* whether Caja or xfce-settings-daemon draw the desktop */
#define XFCE_BG_KEY_SHOW_DESKTOP "show-desktop-icons"
/* whether to fade when changing background (By Caja/m-s-d) */
diff --git a/src/xfce-desktop-utils.c b/src/xfce-desktop-utils.c
index 099fa39..17a33c6 100644
--- a/src/xfce-desktop-utils.c
+++ b/src/xfce-desktop-utils.c
@@ -1,23 +1,23 @@
/* -*- Mode: C; c-set-style: linux indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* xfce-desktop-utils.c - Utilities for the MATE Desktop
+/* xfce-desktop-utils.c - Utilities for the XFCE Desktop
Copyright (C) 1998 Tom Tromey
All rights reserved.
- This file is part of the Mate Library.
+ This file is part of the Xfce Library.
- The Mate Library is free software; you can redistribute it and/or
+ The Xfce Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- The Mate Library is distributed in the hope that it will be useful,
+ The Xfce Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
- License along with the Mate Library; see the file COPYING.LIB. If not,
+ License along with the Xfce Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
Boston, MA 02110-1301, USA. */
/*
diff --git a/src/xfce-desktop-utils.h b/src/xfce-desktop-utils.h
index f4ccd17..7d984e8 100644
--- a/src/xfce-desktop-utils.h
+++ b/src/xfce-desktop-utils.h
@@ -1,23 +1,23 @@
/* -*- Mode: C; c-set-style: linux indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mate-ditem.h - Utilities for the MATE Desktop
+/* xfce-ditem.h - Utilities for the XFCE Desktop
Copyright (C) 1998 Tom Tromey
All rights reserved.
- This file is part of the Mate Library.
+ This file is part of the Xfce Library.
- The Mate Library is free software; you can redistribute it and/or
+ The Xfce Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
- The Mate Library is distributed in the hope that it will be useful,
+ The Xfce Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
- License along with the Mate Library; see the file COPYING.LIB. If not,
+ License along with the Xfce Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
Boston, MA 02110-1301, USA. */
/*
diff --git a/src/xfce-rr.c b/src/xfce-rr.c
index 4cbbe8b..3d514b7 100644
--- a/src/xfce-rr.c
+++ b/src/xfce-rr.c
@@ -2,20 +2,20 @@
*
* Copyright 2007, 2008, Red Hat, Inc.
*
- * This file is part of the Mate Library.
+ * This file is part of the Xfce Library.
*
- * The Mate Library is free software; you can redistribute it and/or
+ * The Xfce Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
- * The Mate Library is distributed in the hope that it will be useful,
+ * The Xfce Library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Mate Library; see the file COPYING.LIB. If not,
+ * License along with the Xfce Library; see the file COPYING.LIB. If not,
* write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*
diff --git a/src/xfce-rr.h b/src/xfce-rr.h
index d1981f0..9a0a87f 100644
--- a/src/xfce-rr.h
+++ b/src/xfce-rr.h
@@ -2,20 +2,20 @@
*
* Copyright 2007, 2008, Red Hat, Inc.
*
- * This file is part of the Mate Library.
+ * This file is part of the Xfce Library.
*
- * The Mate Library is free software; you can redistribute it and/or
+ * The Xfce Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
- * The Mate Library is distributed in the hope that it will be useful,
+ * The Xfce Library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with the Mate Library; see the file COPYING.LIB. If not,
+ * License along with the Xfce Library; see the file COPYING.LIB. If not,
* write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*
diff --git a/src/xfce4-screensaver-command.c b/src/xfce4-screensaver-command.c
index 11feb8b..5fa2790 100644
--- a/src/xfce4-screensaver-command.c
+++ b/src/xfce4-screensaver-command.c
@@ -33,9 +33,9 @@
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
-#define GS_SERVICE "org.mate.ScreenSaver"
-#define GS_PATH "/org/mate/ScreenSaver"
-#define GS_INTERFACE "org.mate.ScreenSaver"
+#define GS_SERVICE "org.xfce.ScreenSaver"
+#define GS_PATH "/org/xfce/ScreenSaver"
+#define GS_INTERFACE "org.xfce.ScreenSaver"
static gboolean do_quit = FALSE;
static gboolean do_lock = FALSE;
@@ -487,7 +487,7 @@ main (int argc,
GError *error = NULL;
#ifdef ENABLE_NLS
- bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, XFCELOCALEDIR);
# ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
# endif
diff --git a/src/xfce4-screensaver-dialog.c b/src/xfce4-screensaver-dialog.c
index 0d3120c..686ea62 100644
--- a/src/xfce4-screensaver-dialog.c
+++ b/src/xfce4-screensaver-dialog.c
@@ -547,7 +547,7 @@ int main(int argc, char** argv)
char* nolock_reason = NULL;
#ifdef ENABLE_NLS
- bindtextdomain(GETTEXT_PACKAGE, MATELOCALEDIR);
+ bindtextdomain(GETTEXT_PACKAGE, XFCELOCALEDIR);
#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
#endif
diff --git a/src/xfce4-screensaver-gl-helper.c b/src/xfce4-screensaver-gl-helper.c
index 472aefd..c297d0d 100644
--- a/src/xfce4-screensaver-gl-helper.c
+++ b/src/xfce4-screensaver-gl-helper.c
@@ -40,7 +40,7 @@ main (int argc,
GError *error = NULL;
#ifdef ENABLE_NLS
- bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, XFCELOCALEDIR);
# ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
# endif
diff --git a/src/xfce4-screensaver-preferences.c b/src/xfce4-screensaver-preferences.c
index 952f29c..327ffd9 100644
--- a/src/xfce4-screensaver-preferences.c
+++ b/src/xfce4-screensaver-preferences.c
@@ -48,13 +48,13 @@
#define GTK_BUILDER_FILE "xfce4-screensaver-preferences.ui"
-#define LOCKDOWN_SETTINGS_SCHEMA "org.mate.lockdown"
+#define LOCKDOWN_SETTINGS_SCHEMA "org.xfce.lockdown"
#define KEY_LOCK_DISABLE "disable-lock-screen"
-#define SESSION_SETTINGS_SCHEMA "org.mate.session"
+#define SESSION_SETTINGS_SCHEMA "org.xfce.session"
#define KEY_IDLE_DELAY "idle-delay"
-#define GSETTINGS_SCHEMA "org.mate.screensaver"
+#define GSETTINGS_SCHEMA "org.xfce.screensaver"
#define KEY_LOCK "lock-enabled"
#define KEY_IDLE_ACTIVATION_ENABLED "idle-activation-enabled"
#define KEY_MODE "mode"
@@ -62,7 +62,7 @@
#define KEY_CYCLE_DELAY "cycle-delay"
#define KEY_THEMES "themes"
-#define GPM_COMMAND "mate-power-preferences"
+#define GPM_COMMAND "xfce-power-preferences"
enum
{
@@ -387,7 +387,7 @@ help_display (void)
error = NULL;
gtk_show_uri_on_window (NULL,
- "help:mate-user-guide/prefs-screensaver",
+ "help:xfce-user-guide/prefs-screensaver",
GDK_CURRENT_TIME,
&error);
@@ -844,7 +844,7 @@ drag_leave_cb (GtkWidget *widget,
gtk_widget_queue_draw (widget);
}
-/* GIO has no version of mate_vfs_uri_list_parse(), so copy from MateVFS
+/* GIO has no version of xfce_vfs_uri_list_parse(), so copy from XfceVFS
* and re-work to create GFiles.
**/
static GList *
@@ -1714,7 +1714,7 @@ main (int argc,
{
#ifdef ENABLE_NLS
- bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
+ bindtextdomain (GETTEXT_PACKAGE, XFCELOCALEDIR);
# ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
# endif
diff --git a/src/xfce4-screensaver.c b/src/xfce4-screensaver.c
index 56a337e..eabf423 100644
--- a/src/xfce4-screensaver.c
+++ b/src/xfce4-screensaver.c
@@ -59,7 +59,7 @@ int main(int argc, char **argv)
};
#ifdef ENABLE_NLS
- bindtextdomain(GETTEXT_PACKAGE, MATELOCALEDIR);
+ bindtextdomain(GETTEXT_PACKAGE, XFCELOCALEDIR);
#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
#endif
diff --git a/src/xfce4-screensaver.desktop.in.in b/src/xfce4-screensaver.desktop.in.in
index 7f33b2f..17e94cf 100644
--- a/src/xfce4-screensaver.desktop.in.in
+++ b/src/xfce4-screensaver.desktop.in.in
@@ -4,11 +4,11 @@ _Name=Screensaver
_Comment=Launch screensaver and locker program
Icon=preferences-desktop-screensaver
Exec=xfce4-screensaver
-OnlyShowIn=MATE;
+OnlyShowIn=XFCE;
NoDisplay=true
-X-MATE-Autostart-Phase=Application
-X-MATE-Autostart-Notify=true
-X-MATE-Bugzilla-Bugzilla=MATE
-X-MATE-Bugzilla-Product=xfce4-screensaver
-X-MATE-Bugzilla-Component=general
-X-MATE-Bugzilla-Version=@VERSION@
+X-XFCE-Autostart-Phase=Application
+X-XFCE-Autostart-Notify=true
+X-XFCE-Bugzilla-Bugzilla=XFCE
+X-XFCE-Bugzilla-Product=xfce4-screensaver
+X-XFCE-Bugzilla-Component=general
+X-XFCE-Bugzilla-Version=@VERSION@
diff --git a/src/xfce4-screensaver.h b/src/xfce4-screensaver.h
index 572eb08..d0d9cbc 100644
--- a/src/xfce4-screensaver.h
+++ b/src/xfce4-screensaver.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef __MATE_SCREENSAVER_H
-#define __MATE_SCREENSAVER_H
+#ifndef __XFCE_SCREENSAVER_H
+#define __XFCE_SCREENSAVER_H
#include <glib.h>
diff --git a/src/xfcekbd-config-private.h b/src/xfcekbd-config-private.h
index 0986ad8..1a6f230 100644
--- a/src/xfcekbd-config-private.h
+++ b/src/xfcekbd-config-private.h
@@ -23,7 +23,7 @@
#include "xfcekbd-desktop-config.h"
#include "xfcekbd-keyboard-config.h"
-#define XFCEKBD_CONFIG_SCHEMA "org.mate.peripherals-keyboard-xkb"
+#define XFCEKBD_CONFIG_SCHEMA "org.xfce.peripherals-keyboard-xkb"
/**
* General config functions (private)
diff --git a/src/xfcekbd-indicator-config.c b/src/xfcekbd-indicator-config.c
index 8200eba..40070ff 100644
--- a/src/xfcekbd-indicator-config.c
+++ b/src/xfcekbd-indicator-config.c
@@ -45,7 +45,7 @@ const gchar XFCEKBD_INDICATOR_CONFIG_KEY_FONT_FAMILY[] = "font-family";
const gchar XFCEKBD_INDICATOR_CONFIG_KEY_FOREGROUND_COLOR[] = "foreground-color";
const gchar XFCEKBD_INDICATOR_CONFIG_KEY_BACKGROUND_COLOR[] = "background-color";
-#define SYSTEM_FONT_SCHEMA "org.mate.interface"
+#define SYSTEM_FONT_SCHEMA "org.xfce.interface"
#define SYSTEM_FONT_KEY "font-name"
/*
@@ -72,7 +72,7 @@ xfcekbd_indicator_config_load_font (XfcekbdIndicatorConfig * ind_config)
gtk_style_context_set_state (context, GTK_STATE_FLAG_NORMAL);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_DEFAULT);
gtk_style_context_add_class (context, "gnome-panel-menu-bar");
- gtk_style_context_add_class (context, "mate-panel-menu-bar");
+ gtk_style_context_add_class (context, "xfce-panel-menu-bar");
gtk_style_context_get (context, GTK_STATE_FLAG_NORMAL,
GTK_STYLE_PROPERTY_FONT, &fd, NULL);
@@ -110,7 +110,7 @@ xfcekbd_indicator_config_load_colors (XfcekbdIndicatorConfig * ind_config)
gtk_style_context_set_state (context, GTK_STATE_FLAG_NORMAL);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_DEFAULT);
gtk_style_context_add_class (context, "gnome-panel-menu-bar");
- gtk_style_context_add_class (context, "mate-panel-menu-bar");
+ gtk_style_context_add_class (context, "xfce-panel-menu-bar");
gtk_style_context_get_color (context,
GTK_STATE_FLAG_NORMAL, &fg_color);
diff --git a/src/xfcekbd-indicator.c b/src/xfcekbd-indicator.c
index dddedb9..9c9e54b 100644
--- a/src/xfcekbd-indicator.c
+++ b/src/xfcekbd-indicator.c
@@ -712,7 +712,7 @@ xfcekbd_indicator_finalize (GObject * obj)
{
XfcekbdIndicator *gki = XFCEKBD_INDICATOR (obj);
xkl_debug (100,
- "Starting the mate-kbd-indicator widget shutdown process for %p\n",
+ "Starting the xfce-kbd-indicator widget shutdown process for %p\n",
gki);
/* remove BEFORE all termination work is finished */
@@ -722,7 +722,7 @@ xfcekbd_indicator_finalize (GObject * obj)
xfcekbd_indicator_cleanup (gki);
xkl_debug (100,
- "The instance of mate-kbd-indicator successfully finalized\n");
+ "The instance of xfce-kbd-indicator successfully finalized\n");
g_free (gki->priv);
diff --git a/src/xfcemenu-tree.c b/src/xfcemenu-tree.c
index a7f74a2..fbfdcd2 100644
--- a/src/xfcemenu-tree.c
+++ b/src/xfcemenu-tree.c
@@ -38,8 +38,8 @@
typedef enum
{
- MATEMENU_TREE_ABSOLUTE = 0,
- MATEMENU_TREE_BASENAME = 1
+ XFCEMENU_TREE_ABSOLUTE = 0,
+ XFCEMENU_TREE_BASENAME = 1
} XfceMenuTreeType;
struct XfceMenuTree
@@ -188,11 +188,11 @@ get_cache_key (XfceMenuTree *tree,
switch (tree->type)
{
- case MATEMENU_TREE_ABSOLUTE:
+ case XFCEMENU_TREE_ABSOLUTE:
tree_name = tree->canonical ? tree->canonical_path : tree->absolute_path;
break;
- case MATEMENU_TREE_BASENAME:
+ case XFCEMENU_TREE_BASENAME:
tree_name = tree->basename;
break;
@@ -456,7 +456,7 @@ xfcemenu_tree_lookup_absolute (const char *absolute,
if ((tree = xfcemenu_tree_lookup_from_cache (canonical_path, flags)) != NULL)
return tree;
- tree = xfcemenu_tree_new (MATEMENU_TREE_ABSOLUTE, canonical_path, canonical, flags);
+ tree = xfcemenu_tree_new (XFCEMENU_TREE_ABSOLUTE, canonical_path, canonical, flags);
g_free (freeme);
@@ -474,7 +474,7 @@ xfcemenu_tree_lookup_basename (const char *basename,
if ((tree = xfcemenu_tree_lookup_from_cache (basename, flags)) != NULL)
return tree;
- return xfcemenu_tree_new (MATEMENU_TREE_BASENAME, basename, FALSE, flags);
+ return xfcemenu_tree_new (XFCEMENU_TREE_BASENAME, basename, FALSE, flags);
}
static gboolean
@@ -539,11 +539,11 @@ static gboolean xfcemenu_tree_canonicalize_path(XfceMenuTree* tree)
g_assert(tree->canonical_path == NULL);
- if (tree->type == MATEMENU_TREE_BASENAME)
+ if (tree->type == XFCEMENU_TREE_BASENAME)
{
xfcemenu_tree_remove_menu_file_monitors (tree);
- if (strcmp(tree->basename, "mate-applications.menu") == 0 && g_getenv("XDG_MENU_PREFIX"))
+ if (strcmp(tree->basename, "xfce-applications.menu") == 0 && g_getenv("XDG_MENU_PREFIX"))
{
char* prefixed_basename;
prefixed_basename = g_strdup_printf("%s%s", g_getenv("XDG_MENU_PREFIX"), tree->basename);
@@ -559,7 +559,7 @@ static gboolean xfcemenu_tree_canonicalize_path(XfceMenuTree* tree)
else
menu_verbose("Failed to look up menu_file for \"%s\"\n", tree->basename);
}
- else /* if (tree->type == MATEMENU_TREE_ABSOLUTE) */
+ else /* if (tree->type == XFCEMENU_TREE_ABSOLUTE) */
{
tree->canonical_path = menu_canonicalize_file_name(tree->absolute_path, FALSE);
@@ -610,7 +610,7 @@ XfceMenuTree* xfcemenu_tree_lookup(const char* menu_file, XfceMenuTreeFlags flag
g_return_val_if_fail (menu_file != NULL, NULL);
- flags &= MATEMENU_TREE_FLAGS_MASK;
+ flags &= XFCEMENU_TREE_FLAGS_MASK;
if (g_path_is_absolute (menu_file))
retval = xfcemenu_tree_lookup_absolute (menu_file, flags);
@@ -636,9 +636,9 @@ xfcemenu_tree_new (XfceMenuTreeType type,
tree->flags = flags;
tree->refcount = 1;
- tree->sort_key = MATEMENU_TREE_SORT_NAME;
+ tree->sort_key = XFCEMENU_TREE_SORT_NAME;
- if (tree->type == MATEMENU_TREE_BASENAME)
+ if (tree->type == XFCEMENU_TREE_BASENAME)
{
g_assert (canonical == FALSE);
tree->basename = g_strdup (menu_file);
@@ -870,13 +870,13 @@ xfcemenu_tree_directory_new (XfceMenuTreeDirectory *parent,
root = g_new0 (XfceMenuTreeDirectoryRoot, 1);
- retval = MATEMENU_TREE_DIRECTORY (root);
+ retval = XFCEMENU_TREE_DIRECTORY (root);
retval->is_root = TRUE;
}
- retval->item.type = MATEMENU_TREE_ITEM_DIRECTORY;
+ retval->item.type = XFCEMENU_TREE_ITEM_DIRECTORY;
retval->item.parent = parent;
retval->item.refcount = 1;
@@ -953,7 +953,7 @@ xfcemenu_tree_separator_new (XfceMenuTreeDirectory *parent)
retval = g_new0 (XfceMenuTreeSeparator, 1);
- retval->item.type = MATEMENU_TREE_ITEM_SEPARATOR;
+ retval->item.type = XFCEMENU_TREE_ITEM_SEPARATOR;
retval->item.parent = parent;
retval->item.refcount = 1;
@@ -968,13 +968,13 @@ xfcemenu_tree_header_new (XfceMenuTreeDirectory *parent,
retval = g_new0 (XfceMenuTreeHeader, 1);
- retval->item.type = MATEMENU_TREE_ITEM_HEADER;
+ retval->item.type = XFCEMENU_TREE_ITEM_HEADER;
retval->item.parent = parent;
retval->item.refcount = 1;
retval->directory = xfcemenu_tree_item_ref (directory);
- xfcemenu_tree_item_set_parent (MATEMENU_TREE_ITEM (retval->directory), NULL);
+ xfcemenu_tree_item_set_parent (XFCEMENU_TREE_ITEM (retval->directory), NULL);
return retval;
}
@@ -998,17 +998,17 @@ xfcemenu_tree_alias_new (XfceMenuTreeDirectory *parent,
retval = g_new0 (XfceMenuTreeAlias, 1);
- retval->item.type = MATEMENU_TREE_ITEM_ALIAS;
+ retval->item.type = XFCEMENU_TREE_ITEM_ALIAS;
retval->item.parent = parent;
retval->item.refcount = 1;
retval->directory = xfcemenu_tree_item_ref (directory);
- if (item->type != MATEMENU_TREE_ITEM_ALIAS)
+ if (item->type != XFCEMENU_TREE_ITEM_ALIAS)
retval->aliased_item = xfcemenu_tree_item_ref (item);
else
- retval->aliased_item = xfcemenu_tree_item_ref (xfcemenu_tree_alias_get_item (MATEMENU_TREE_ALIAS (item)));
+ retval->aliased_item = xfcemenu_tree_item_ref (xfcemenu_tree_alias_get_item (XFCEMENU_TREE_ALIAS (item)));
- xfcemenu_tree_item_set_parent (MATEMENU_TREE_ITEM (retval->directory), NULL);
+ xfcemenu_tree_item_set_parent (XFCEMENU_TREE_ITEM (retval->directory), NULL);
xfcemenu_tree_item_set_parent (retval->aliased_item, NULL);
return retval;
@@ -1039,7 +1039,7 @@ xfcemenu_tree_entry_new (XfceMenuTreeDirectory *parent,
retval = g_new0 (XfceMenuTreeEntry, 1);
- retval->item.type = MATEMENU_TREE_ITEM_ENTRY;
+ retval->item.type = XFCEMENU_TREE_ITEM_ENTRY;
retval->item.parent = parent;
retval->item.refcount = 1;
@@ -1068,14 +1068,14 @@ static int
xfcemenu_tree_entry_compare_by_id (XfceMenuTreeItem *a,
XfceMenuTreeItem *b)
{
- if (a->type == MATEMENU_TREE_ITEM_ALIAS)
- a = MATEMENU_TREE_ALIAS (a)->aliased_item;
+ if (a->type == XFCEMENU_TREE_ITEM_ALIAS)
+ a = XFCEMENU_TREE_ALIAS (a)->aliased_item;
- if (b->type == MATEMENU_TREE_ITEM_ALIAS)
- b = MATEMENU_TREE_ALIAS (b)->aliased_item;
+ if (b->type == XFCEMENU_TREE_ITEM_ALIAS)
+ b = XFCEMENU_TREE_ALIAS (b)->aliased_item;
- return strcmp (MATEMENU_TREE_ENTRY (a)->desktop_file_id,
- MATEMENU_TREE_ENTRY (b)->desktop_file_id);
+ return strcmp (XFCEMENU_TREE_ENTRY (a)->desktop_file_id,
+ XFCEMENU_TREE_ENTRY (b)->desktop_file_id);
}
gpointer xfcemenu_tree_item_ref(gpointer itemp)
@@ -1104,23 +1104,23 @@ xfcemenu_tree_item_unref (gpointer itemp)
{
switch (item->type)
{
- case MATEMENU_TREE_ITEM_DIRECTORY:
- xfcemenu_tree_directory_finalize (MATEMENU_TREE_DIRECTORY (item));
+ case XFCEMENU_TREE_ITEM_DIRECTORY:
+ xfcemenu_tree_directory_finalize (XFCEMENU_TREE_DIRECTORY (item));
break;
- case MATEMENU_TREE_ITEM_ENTRY:
- xfcemenu_tree_entry_finalize (MATEMENU_TREE_ENTRY (item));
+ case XFCEMENU_TREE_ITEM_ENTRY:
+ xfcemenu_tree_entry_finalize (XFCEMENU_TREE_ENTRY (item));
break;
- case MATEMENU_TREE_ITEM_SEPARATOR:
+ case XFCEMENU_TREE_ITEM_SEPARATOR:
break;
- case MATEMENU_TREE_ITEM_HEADER:
- xfcemenu_tree_header_finalize (MATEMENU_TREE_HEADER (item));
+ case XFCEMENU_TREE_ITEM_HEADER:
+ xfcemenu_tree_header_finalize (XFCEMENU_TREE_HEADER (item));
break;
- case MATEMENU_TREE_ITEM_ALIAS:
- xfcemenu_tree_alias_finalize (MATEMENU_TREE_ALIAS (item));
+ case XFCEMENU_TREE_ITEM_ALIAS:
+ xfcemenu_tree_alias_finalize (XFCEMENU_TREE_ALIAS (item));
break;
default:
@@ -1162,21 +1162,21 @@ xfcemenu_tree_item_compare_get_name_helper (XfceMenuTreeItem *item,
switch (item->type)
{
- case MATEMENU_TREE_ITEM_DIRECTORY:
- if (MATEMENU_TREE_DIRECTORY (item)->directory_entry)
- name = desktop_entry_get_name (MATEMENU_TREE_DIRECTORY (item)->directory_entry);
+ case XFCEMENU_TREE_ITEM_DIRECTORY:
+ if (XFCEMENU_TREE_DIRECTORY (item)->directory_entry)
+ name = desktop_entry_get_name (XFCEMENU_TREE_DIRECTORY (item)->directory_entry);
else
- name = MATEMENU_TREE_DIRECTORY (item)->name;
+ name = XFCEMENU_TREE_DIRECTORY (item)->name;
break;
- case MATEMENU_TREE_ITEM_ENTRY:
+ case XFCEMENU_TREE_ITEM_ENTRY:
switch (sort_key)
{
- case MATEMENU_TREE_SORT_NAME:
- name = desktop_entry_get_name (MATEMENU_TREE_ENTRY (item)->desktop_entry);
+ case XFCEMENU_TREE_SORT_NAME:
+ name = desktop_entry_get_name (XFCEMENU_TREE_ENTRY (item)->desktop_entry);
break;
- case MATEMENU_TREE_SORT_DISPLAY_NAME:
- name = xfcemenu_tree_entry_get_display_name (MATEMENU_TREE_ENTRY (item));
+ case XFCEMENU_TREE_SORT_DISPLAY_NAME:
+ name = xfcemenu_tree_entry_get_display_name (XFCEMENU_TREE_ENTRY (item));
break;
default:
g_assert_not_reached ();
@@ -1184,16 +1184,16 @@ xfcemenu_tree_item_compare_get_name_helper (XfceMenuTreeItem *item,
}
break;
- case MATEMENU_TREE_ITEM_ALIAS:
+ case XFCEMENU_TREE_ITEM_ALIAS:
{
XfceMenuTreeItem *dir;
- dir = MATEMENU_TREE_ITEM (MATEMENU_TREE_ALIAS (item)->directory);
+ dir = XFCEMENU_TREE_ITEM (XFCEMENU_TREE_ALIAS (item)->directory);
name = xfcemenu_tree_item_compare_get_name_helper (dir, sort_key);
}
break;
- case MATEMENU_TREE_ITEM_SEPARATOR:
- case MATEMENU_TREE_ITEM_HEADER:
+ case XFCEMENU_TREE_ITEM_SEPARATOR:
+ case XFCEMENU_TREE_ITEM_HEADER:
default:
g_assert_not_reached ();
break;
@@ -1482,7 +1482,7 @@ static gboolean load_parent_merge_file(XfceMenuTree* tree, GHashTable* loaded_me
found = FALSE;
menu_file = g_strconcat(menu_name, ".menu", NULL);
- if (strcmp(menu_file, "mate-applications.menu") == 0 && g_getenv("XDG_MENU_PREFIX"))
+ if (strcmp(menu_file, "xfce-applications.menu") == 0 && g_getenv("XDG_MENU_PREFIX"))
{
char* prefixed_basename;
prefixed_basename = g_strdup_printf("%s%s", g_getenv("XDG_MENU_PREFIX"), menu_file);
@@ -1672,8 +1672,8 @@ static MenuLayoutNode* add_directory_dir(XfceMenuTree* tree, MenuLayoutNode* bef
return tmp;
}
-/* According to desktop spec, since our menu file is called 'mate-applications', our
- * merged menu folders need to be called 'mate-applications-merged'. We'll setup the folder
+/* According to desktop spec, since our menu file is called 'xfce-applications', our
+ * merged menu folders need to be called 'xfce-applications-merged'. We'll setup the folder
* 'applications-merged' if it doesn't exist yet, and a symlink pointing to it in the
* ~/.config/menus directory
*/
@@ -1688,7 +1688,7 @@ setup_merge_dir_symlink(void)
g_file_make_directory_with_parents (merge_file, NULL, NULL);
- sym_path = g_build_filename (user_config, "menus", "mate-applications-merged", NULL);
+ sym_path = g_build_filename (user_config, "menus", "xfce-applications-merged", NULL);
sym_file = g_file_new_for_path (sym_path);
if (!g_file_query_exists (sym_file, NULL)) {
g_file_make_symbolic_link (sym_file, merge_path, NULL, NULL);
@@ -1717,8 +1717,8 @@ resolve_default_directory_dirs (XfceMenuTree *tree,
i = 0;
while (system_data_dirs[i] != NULL)
{
- /* Parche para tomar las carpetas /mate/ */
- char* path = g_build_filename(system_data_dirs[i], "mate", NULL);
+ /* Parche para tomar las carpetas /xfce/ */
+ char* path = g_build_filename(system_data_dirs[i], "xfce", NULL);
before = add_directory_dir(tree, before, path);
g_free(path);
/* /fin parche */
@@ -2509,7 +2509,7 @@ xfcemenu_tree_load_layout (XfceMenuTree *tree)
error = NULL;
tree->layout = menu_layout_load (tree->canonical_path,
- tree->type == MATEMENU_TREE_BASENAME ?
+ tree->type == XFCEMENU_TREE_BASENAME ?
tree->basename : NULL,
&error);
if (tree->layout == NULL)
@@ -2855,7 +2855,7 @@ process_layout (XfceMenuTree *tree,
entries = desktop_entry_set_new ();
allocated_set = desktop_entry_set_new ();
- if (tree->flags & MATEMENU_TREE_FLAGS_INCLUDE_EXCLUDED)
+ if (tree->flags & XFCEMENU_TREE_FLAGS_INCLUDE_EXCLUDED)
excluded_set = desktop_entry_set_new ();
else
excluded_set = NULL;
@@ -3040,7 +3040,7 @@ process_layout (XfceMenuTree *tree,
{
directory->is_nodisplay = TRUE;
- if (!(tree->flags & MATEMENU_TREE_FLAGS_INCLUDE_NODISPLAY))
+ if (!(tree->flags & XFCEMENU_TREE_FLAGS_INCLUDE_NODISPLAY))
{
menu_verbose ("Not showing menu %s because NoDisplay=true\n",
desktop_entry_get_name (directory->directory_entry));
@@ -3048,9 +3048,9 @@ process_layout (XfceMenuTree *tree,
}
}
- if (!desktop_entry_get_show_in_mate (directory->directory_entry))
+ if (!desktop_entry_get_show_in_xfce (directory->directory_entry))
{
- menu_verbose ("Not showing menu %s because OnlyShowIn!=MATE or NotShowIn=MATE\n",
+ menu_verbose ("Not showing menu %s because OnlyShowIn!=XFCE or NotShowIn=XFCE\n",
desktop_entry_get_name (directory->directory_entry));
deleted = TRUE;
}
@@ -3102,7 +3102,7 @@ process_layout (XfceMenuTree *tree,
delete = TRUE;
}
- if (!(tree->flags & MATEMENU_TREE_FLAGS_INCLUDE_NODISPLAY) &&
+ if (!(tree->flags & XFCEMENU_TREE_FLAGS_INCLUDE_NODISPLAY) &&
desktop_entry_get_no_display (entry->desktop_entry))
{
menu_verbose ("Deleting %s because NoDisplay=true\n",
@@ -3110,9 +3110,9 @@ process_layout (XfceMenuTree *tree,
delete = TRUE;
}
- if (!desktop_entry_get_show_in_mate (entry->desktop_entry))
+ if (!desktop_entry_get_show_in_xfce (entry->desktop_entry))
{
- menu_verbose ("Deleting %s because OnlyShowIn!=MATE or NotShowIn=MATE\n",
+ menu_verbose ("Deleting %s because OnlyShowIn!=XFCE or NotShowIn=XFCE\n",
desktop_entry_get_name (entry->desktop_entry));
delete = TRUE;
}
@@ -3215,7 +3215,7 @@ get_layout_info (XfceMenuTreeDirectory *directory,
return iter->default_layout_info;
}
- iter = MATEMENU_TREE_ITEM (iter)->parent;
+ iter = XFCEMENU_TREE_ITEM (iter)->parent;
}
return NULL;
@@ -3285,7 +3285,7 @@ preprocess_layout_info_subdir_helper (XfceMenuTree *tree,
if (subdir->subdirs == NULL && subdir->entries == NULL)
{
- if (!(tree->flags & MATEMENU_TREE_FLAGS_SHOW_EMPTY) &&
+ if (!(tree->flags & XFCEMENU_TREE_FLAGS_SHOW_EMPTY) &&
!layout_values->show_empty)
{
menu_verbose ("Not showing empty menu '%s'\n", subdir->name);
@@ -3311,14 +3311,14 @@ preprocess_layout_info_subdir_helper (XfceMenuTree *tree,
else
list = subdir->entries;
- item = MATEMENU_TREE_ITEM (list->data);
+ item = XFCEMENU_TREE_ITEM (list->data);
menu_verbose ("Inline aliasing '%s' to '%s'\n",
- item->type == MATEMENU_TREE_ITEM_ENTRY ?
- xfcemenu_tree_entry_get_name (MATEMENU_TREE_ENTRY (item)) :
- (item->type == MATEMENU_TREE_ITEM_DIRECTORY ?
- xfcemenu_tree_directory_get_name (MATEMENU_TREE_DIRECTORY (item)) :
- xfcemenu_tree_directory_get_name (MATEMENU_TREE_ALIAS (item)->directory)),
+ item->type == XFCEMENU_TREE_ITEM_ENTRY ?
+ xfcemenu_tree_entry_get_name (XFCEMENU_TREE_ENTRY (item)) :
+ (item->type == XFCEMENU_TREE_ITEM_DIRECTORY ?
+ xfcemenu_tree_directory_get_name (XFCEMENU_TREE_DIRECTORY (item)) :
+ xfcemenu_tree_directory_get_name (XFCEMENU_TREE_ALIAS (item)->directory)),
subdir->name);
alias = xfcemenu_tree_alias_new (directory, subdir, item);
@@ -3330,7 +3330,7 @@ preprocess_layout_info_subdir_helper (XfceMenuTree *tree,
subdir->subdirs = NULL;
subdir->entries = NULL;
- if (item->type == MATEMENU_TREE_ITEM_DIRECTORY)
+ if (item->type == XFCEMENU_TREE_ITEM_DIRECTORY)
directory->subdirs = g_slist_append (directory->subdirs, alias);
else
directory->entries = g_slist_append (directory->entries, alias);
@@ -3481,7 +3481,7 @@ preprocess_layout_info (XfceMenuTree *tree,
}
directory->subdirs = g_slist_remove (directory->subdirs, subdir);
- xfcemenu_tree_item_unref_and_unset_parent (MATEMENU_TREE_ITEM (subdir));
+ xfcemenu_tree_item_unref_and_unset_parent (XFCEMENU_TREE_ITEM (subdir));
}
}
@@ -3510,7 +3510,7 @@ preprocess_layout_info (XfceMenuTree *tree,
if (should_remove)
{
tmp = g_slist_delete_link (tmp, tmp->next);
- xfcemenu_tree_item_unref_and_unset_parent (MATEMENU_TREE_ITEM (subdir));
+ xfcemenu_tree_item_unref_and_unset_parent (XFCEMENU_TREE_ITEM (subdir));
}
else
tmp = tmp->next;
@@ -3534,14 +3534,14 @@ preprocess_layout_info (XfceMenuTree *tree,
XfceMenuTreeItem *a = tmp->data;
XfceMenuTreeItem *b = tmp->next->data;
- if (a->type == MATEMENU_TREE_ITEM_ALIAS)
- a = MATEMENU_TREE_ALIAS (a)->aliased_item;
+ if (a->type == XFCEMENU_TREE_ITEM_ALIAS)
+ a = XFCEMENU_TREE_ALIAS (a)->aliased_item;
- if (b->type == MATEMENU_TREE_ITEM_ALIAS)
- b = MATEMENU_TREE_ALIAS (b)->aliased_item;
+ if (b->type == XFCEMENU_TREE_ITEM_ALIAS)
+ b = XFCEMENU_TREE_ALIAS (b)->aliased_item;
- if (strcmp (MATEMENU_TREE_ENTRY (a)->desktop_file_id,
- MATEMENU_TREE_ENTRY (b)->desktop_file_id) == 0)
+ if (strcmp (XFCEMENU_TREE_ENTRY (a)->desktop_file_id,
+ XFCEMENU_TREE_ENTRY (b)->desktop_file_id) == 0)
{
tmp = g_slist_delete_link (tmp, tmp->next);
xfcemenu_tree_item_unref (b);
@@ -3578,9 +3578,9 @@ merge_alias (XfceMenuTree *tree,
menu_verbose ("Merging alias '%s' in directory '%s'\n",
alias->directory->name, directory->name);
- if (alias->aliased_item->type == MATEMENU_TREE_ITEM_DIRECTORY)
+ if (alias->aliased_item->type == XFCEMENU_TREE_ITEM_DIRECTORY)
{
- process_layout_info (tree, MATEMENU_TREE_DIRECTORY (alias->aliased_item));
+ process_layout_info (tree, XFCEMENU_TREE_DIRECTORY (alias->aliased_item));
}
check_pending_separator (directory);
@@ -3618,7 +3618,7 @@ merge_subdir (XfceMenuTree *tree,
subdir->contents = NULL;
subdir->will_inline_header = G_MAXUINT16;
- xfcemenu_tree_item_set_parent (MATEMENU_TREE_ITEM (subdir), NULL);
+ xfcemenu_tree_item_set_parent (XFCEMENU_TREE_ITEM (subdir), NULL);
}
else
{
@@ -3645,7 +3645,7 @@ merge_subdir_by_name (XfceMenuTree *tree,
/* if it's an alias, then it cannot be affected by
* the Merge nodes in the layout */
- if (MATEMENU_TREE_ITEM (subdir)->type == MATEMENU_TREE_ITEM_ALIAS)
+ if (XFCEMENU_TREE_ITEM (subdir)->type == XFCEMENU_TREE_ITEM_ALIAS)
continue;
if (!strcmp (subdir->name, subdir_name))
@@ -3690,7 +3690,7 @@ merge_entry_by_id (XfceMenuTree *tree,
/* if it's an alias, then it cannot be affected by
* the Merge nodes in the layout */
- if (MATEMENU_TREE_ITEM (entry)->type == MATEMENU_TREE_ITEM_ALIAS)
+ if (XFCEMENU_TREE_ITEM (entry)->type == XFCEMENU_TREE_ITEM_ALIAS)
continue;
if (!strcmp (entry->desktop_file_id, file_id))
@@ -3734,16 +3734,16 @@ merge_subdirs (XfceMenuTree *tree,
subdirs = g_slist_sort_with_data (subdirs,
(GCompareDataFunc) xfcemenu_tree_item_compare,
- GINT_TO_POINTER (MATEMENU_TREE_SORT_NAME));
+ GINT_TO_POINTER (XFCEMENU_TREE_SORT_NAME));
tmp = subdirs;
while (tmp != NULL)
{
XfceMenuTreeDirectory *subdir = tmp->data;
- if (MATEMENU_TREE_ITEM (subdir)->type == MATEMENU_TREE_ITEM_ALIAS)
+ if (XFCEMENU_TREE_ITEM (subdir)->type == XFCEMENU_TREE_ITEM_ALIAS)
{
- merge_alias (tree, directory, MATEMENU_TREE_ALIAS (subdir));
+ merge_alias (tree, directory, XFCEMENU_TREE_ALIAS (subdir));
xfcemenu_tree_item_unref (subdir);
}
else if (!find_name_in_list (subdir->name, except))
@@ -3786,9 +3786,9 @@ merge_entries (XfceMenuTree *tree,
{
XfceMenuTreeEntry *entry = tmp->data;
- if (MATEMENU_TREE_ITEM (entry)->type == MATEMENU_TREE_ITEM_ALIAS)
+ if (XFCEMENU_TREE_ITEM (entry)->type == XFCEMENU_TREE_ITEM_ALIAS)
{
- merge_alias (tree, directory, MATEMENU_TREE_ALIAS (entry));
+ merge_alias (tree, directory, XFCEMENU_TREE_ALIAS (entry));
xfcemenu_tree_item_unref (entry);
}
else if (!find_name_in_list (entry->desktop_file_id, except))
@@ -3838,38 +3838,38 @@ merge_subdirs_and_entries (XfceMenuTree *tree,
type = xfcemenu_tree_item_get_type (item);
- if (type == MATEMENU_TREE_ITEM_ALIAS)
+ if (type == XFCEMENU_TREE_ITEM_ALIAS)
{
- merge_alias (tree, directory, MATEMENU_TREE_ALIAS (item));
+ merge_alias (tree, directory, XFCEMENU_TREE_ALIAS (item));
xfcemenu_tree_item_unref (item);
}
- else if (type == MATEMENU_TREE_ITEM_DIRECTORY)
+ else if (type == XFCEMENU_TREE_ITEM_DIRECTORY)
{
- if (!find_name_in_list (MATEMENU_TREE_DIRECTORY (item)->name, except_subdirs))
+ if (!find_name_in_list (XFCEMENU_TREE_DIRECTORY (item)->name, except_subdirs))
{
merge_subdir (tree,
directory,
- MATEMENU_TREE_DIRECTORY (item));
+ XFCEMENU_TREE_DIRECTORY (item));
xfcemenu_tree_item_unref (item);
}
else
{
menu_verbose ("Not merging directory '%s' yet\n",
- MATEMENU_TREE_DIRECTORY (item)->name);
+ XFCEMENU_TREE_DIRECTORY (item)->name);
directory->subdirs = g_slist_append (directory->subdirs, item);
}
}
- else if (type == MATEMENU_TREE_ITEM_ENTRY)
+ else if (type == XFCEMENU_TREE_ITEM_ENTRY)
{
- if (!find_name_in_list (MATEMENU_TREE_ENTRY (item)->desktop_file_id, except_entries))
+ if (!find_name_in_list (XFCEMENU_TREE_ENTRY (item)->desktop_file_id, except_entries))
{
- merge_entry (tree, directory, MATEMENU_TREE_ENTRY (item));
+ merge_entry (tree, directory, XFCEMENU_TREE_ENTRY (item));
xfcemenu_tree_item_unref (item);
}
else
{
menu_verbose ("Not merging entry '%s' yet\n",
- MATEMENU_TREE_ENTRY (item)->desktop_file_id);
+ XFCEMENU_TREE_ENTRY (item)->desktop_file_id);
directory->entries = g_slist_append (directory->entries, item);
}
}
@@ -3987,7 +3987,7 @@ process_layout_info (XfceMenuTree *tree,
* the separators now, and instead make it pending. This way, we
* won't show two consecutive separators nor will we show a
* separator at the end of a menu. */
- if (tree->flags & MATEMENU_TREE_FLAGS_SHOW_ALL_SEPARATORS)
+ if (tree->flags & XFCEMENU_TREE_FLAGS_SHOW_ALL_SEPARATORS)
{
directory->layout_pending_separator = TRUE;
check_pending_separator (directory);
diff --git a/src/xfcemenu-tree.h b/src/xfcemenu-tree.h
index 59da734..f91167f 100644
--- a/src/xfcemenu-tree.h
+++ b/src/xfcemenu-tree.h
@@ -17,8 +17,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __MATEMENU_TREE_H__
-#define __MATEMENU_TREE_H__
+#ifndef __XFCEMENU_TREE_H__
+#define __XFCEMENU_TREE_H__
#include <glib.h>
@@ -37,35 +37,35 @@ typedef struct XfceMenuTreeAlias XfceMenuTreeAlias;
typedef void (*XfceMenuTreeChangedFunc) (XfceMenuTree* tree, gpointer user_data);
typedef enum {
- MATEMENU_TREE_ITEM_INVALID = 0,
- MATEMENU_TREE_ITEM_DIRECTORY,
- MATEMENU_TREE_ITEM_ENTRY,
- MATEMENU_TREE_ITEM_SEPARATOR,
- MATEMENU_TREE_ITEM_HEADER,
- MATEMENU_TREE_ITEM_ALIAS
+ XFCEMENU_TREE_ITEM_INVALID = 0,
+ XFCEMENU_TREE_ITEM_DIRECTORY,
+ XFCEMENU_TREE_ITEM_ENTRY,
+ XFCEMENU_TREE_ITEM_SEPARATOR,
+ XFCEMENU_TREE_ITEM_HEADER,
+ XFCEMENU_TREE_ITEM_ALIAS
} XfceMenuTreeItemType;
-#define MATEMENU_TREE_ITEM(i) ((XfceMenuTreeItem*)(i))
-#define MATEMENU_TREE_DIRECTORY(i) ((XfceMenuTreeDirectory*)(i))
-#define MATEMENU_TREE_ENTRY(i) ((XfceMenuTreeEntry*)(i))
-#define MATEMENU_TREE_SEPARATOR(i) ((XfceMenuTreeSeparator*)(i))
-#define MATEMENU_TREE_HEADER(i) ((XfceMenuTreeHeader*)(i))
-#define MATEMENU_TREE_ALIAS(i) ((XfceMenuTreeAlias*)(i))
+#define XFCEMENU_TREE_ITEM(i) ((XfceMenuTreeItem*)(i))
+#define XFCEMENU_TREE_DIRECTORY(i) ((XfceMenuTreeDirectory*)(i))
+#define XFCEMENU_TREE_ENTRY(i) ((XfceMenuTreeEntry*)(i))
+#define XFCEMENU_TREE_SEPARATOR(i) ((XfceMenuTreeSeparator*)(i))
+#define XFCEMENU_TREE_HEADER(i) ((XfceMenuTreeHeader*)(i))
+#define XFCEMENU_TREE_ALIAS(i) ((XfceMenuTreeAlias*)(i))
typedef enum {
- MATEMENU_TREE_FLAGS_NONE = 0,
- MATEMENU_TREE_FLAGS_INCLUDE_EXCLUDED = 1 << 0,
- MATEMENU_TREE_FLAGS_SHOW_EMPTY = 1 << 1,
- MATEMENU_TREE_FLAGS_INCLUDE_NODISPLAY = 1 << 2,
- MATEMENU_TREE_FLAGS_SHOW_ALL_SEPARATORS = 1 << 3,
- MATEMENU_TREE_FLAGS_MASK = 0x0f
+ XFCEMENU_TREE_FLAGS_NONE = 0,
+ XFCEMENU_TREE_FLAGS_INCLUDE_EXCLUDED = 1 << 0,
+ XFCEMENU_TREE_FLAGS_SHOW_EMPTY = 1 << 1,
+ XFCEMENU_TREE_FLAGS_INCLUDE_NODISPLAY = 1 << 2,
+ XFCEMENU_TREE_FLAGS_SHOW_ALL_SEPARATORS = 1 << 3,
+ XFCEMENU_TREE_FLAGS_MASK = 0x0f
} XfceMenuTreeFlags;
typedef enum {
- #define MATEMENU_TREE_SORT_FIRST MATEMENU_TREE_SORT_NAME
- MATEMENU_TREE_SORT_NAME = 0,
- MATEMENU_TREE_SORT_DISPLAY_NAME
- #define MATEMENU_TREE_SORT_LAST MATEMENU_TREE_SORT_DISPLAY_NAME
+ #define XFCEMENU_TREE_SORT_FIRST XFCEMENU_TREE_SORT_NAME
+ XFCEMENU_TREE_SORT_NAME = 0,
+ XFCEMENU_TREE_SORT_DISPLAY_NAME
+ #define XFCEMENU_TREE_SORT_LAST XFCEMENU_TREE_SORT_DISPLAY_NAME
} XfceMenuTreeSortKey;
XfceMenuTree* xfcemenu_tree_lookup(const char* menu_file, XfceMenuTreeFlags flags);
@@ -89,4 +89,4 @@ const char* xfcemenu_tree_entry_get_desktop_file_id(XfceMenuTreeEntry* entry);
}
#endif
-#endif /* __MATEMENU_TREE_H__ */
+#endif /* __XFCEMENU_TREE_H__ */
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list