=== modified file 'panels/appearance/appearance.ui'
--- panels/appearance/appearance.ui 2013-12-02 02:45:53 +0000
+++ panels/appearance/appearance.ui 2013-12-04 20:12:31 +0000
@@ -883,6 +883,36 @@
+
+
+ False
+ True
+ 3
+
+
+
=== modified file 'panels/appearance/cc-appearance-panel.c'
--- panels/appearance/cc-appearance-panel.c 2013-12-02 02:45:53 +0000
+++ panels/appearance/cc-appearance-panel.c 2013-12-04 22:08:05 +0000
@@ -74,6 +74,7 @@
GSettings *unity_settings;
GSettings *compizcore_settings;
GSettings *unity_own_settings;
+ GSettings *panel_settings;
GnomeDesktopThumbnailFactory *thumb_factory;
@@ -106,6 +107,7 @@
#define UNITY_LAUNCHERHIDE_KEY "launcher-hide-mode"
#define UNITY_LAUNCHERREVEAL_KEY "reveal-trigger"
#define CANONICAL_DESKTOP_INTERFACE "com.canonical.desktop.interface"
+#define UNITY_PANEL_GSETTINGS_SCHEMA "com.canonical.Unity.Panel"
#define COMPIZCORE_GSETTINGS_SCHEMA "org.compiz.core"
#define COMPIZCORE_GSETTINGS_PATH UNITY_PROFILE_PATH"core/"
@@ -1760,6 +1762,8 @@
{
if (g_strcmp0 (*schemas, UNITY_OWN_GSETTINGS_SCHEMA) == 0)
priv->unity_own_settings = g_settings_new (UNITY_OWN_GSETTINGS_SCHEMA);
+ if (g_strcmp0 (*schemas, UNITY_PANEL_GSETTINGS_SCHEMA) == 0)
+ priv->panel_settings = g_settings_new (UNITY_PANEL_GSETTINGS_SCHEMA);
schemas++;
}
schemas = g_settings_list_relocatable_schemas ();
@@ -1772,7 +1776,8 @@
schemas++;
}
- if (!priv->unity_settings || !priv->compizcore_settings || !priv->unity_own_settings)
+ if (!priv->unity_settings || !priv->compizcore_settings ||
+ !priv->unity_own_settings || !priv->panel_settings)
return;
/* Icon size change */
@@ -1838,6 +1843,11 @@
G_CALLBACK (on_enable_showdesktop_changed), self);
enable_showdesktop_widget_refresh (self);
+ /* Always show menubar */
+ g_settings_bind (priv->panel_settings, "menubar-always-visible",
+ WID ("check_always_show_menubar"), "active",
+ G_SETTINGS_BIND_DEFAULT);
+
/* Restore defaut on second page */
g_signal_connect (WID ("button-restore-unitybehavior"), "clicked",
G_CALLBACK (on_restore_defaults_page2_clicked), self);