[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 215/473: Add support for loading default settings from a file.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

gottcode pushed a commit to branch master
in repository panel-plugins/xfce4-whiskermenu-plugin.

commit ad7adcbe0b095645e35ed7f1ca481da4fda7bd1c
Author: Graeme Gott <graeme at gottcode.org>
Date:   Sat Nov 2 12:48:25 2013 -0400

    Add support for loading default settings from a file.
---
 panel-plugin/CMakeLists.txt |    1 +
 panel-plugin/plugin.cpp     |    1 +
 2 files changed, 2 insertions(+)

diff --git a/panel-plugin/CMakeLists.txt b/panel-plugin/CMakeLists.txt
index c831aeb..88c5deb 100644
--- a/panel-plugin/CMakeLists.txt
+++ b/panel-plugin/CMakeLists.txt
@@ -38,6 +38,7 @@ link_directories(
 add_definitions(
 	-DGETTEXT_PACKAGE="xfce4-whiskermenu-plugin"
 	-DPACKAGE_LOCALE_DIR="${CMAKE_INSTALL_FULL_LOCALEDIR}"
+	-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}"
 	-DG_LOG_DOMAIN="whiskermenu"
 	-DGSEAL_ENABLE
 	-DGDK_DISABLE_SINGLE_INCLUDES
diff --git a/panel-plugin/plugin.cpp b/panel-plugin/plugin.cpp
index affe0fb..9e82097 100644
--- a/panel-plugin/plugin.cpp
+++ b/panel-plugin/plugin.cpp
@@ -47,6 +47,7 @@ Plugin::Plugin(XfcePanelPlugin* plugin) :
 	// Load settings
 	wm_settings = new Settings;
 	wm_settings->button_title = get_button_title_default();
+	wm_settings->load(g_strconcat(DATADIR, "/xfce4/whiskermenu/defaults.rc", NULL));
 	wm_settings->load(xfce_panel_plugin_lookup_rc_file(m_plugin));
 
 	// Prevent empty panel button

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.