diff options
| author |   Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-02-29 13:51:10 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-15 17:52:25 +0100 |
| commit | 0c32b6e9585a39b14002a5da230222d2fe01ddff (patch) | |
| tree | 6c51ce24ce822224ac3ab8f7fe6e1468a6a787af /meta/recipes-sato/matchbox-sato/matchbox-session-sato | |
| parent | ab2d5e397d30999929108c9d929767205fee9db4 (diff) | |
| download | openembedded-core-0c32b6e9585a39b14002a5da230222d2fe01ddff.tar.gz | |
matchbox-session-sato: Update session startup
* Use Adwaita Gtk+ theme
* sato-gtk-engine is no longer needed with Adwaita
* GTK_CSD tricks are no longer needed since the panel
does not draw on top windows
* Add meta-theme index file: it used to be provided by gtk-sato-engine
and is used by matchbox-config-gtk only (to be able to show a single
selection for Gtk+, icon and Matchbox themes). This is a more
logical place for it.
* Set matchbox-theme gconf key (just to be explicit, this is the
default already)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-sato/matchbox-sato/matchbox-session-sato')
| -rw-r--r-- | meta/recipes-sato/matchbox-sato/matchbox-session-sato/index.theme | 7 | ||||
| -rw-r--r-- | meta/recipes-sato/matchbox-sato/matchbox-session-sato/session | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/index.theme b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/index.theme new file mode 100644 index 0000000000..c9260cfd8d --- /dev/null +++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/index.theme @@ -0,0 +1,7 @@ +[X-GNOME-Metatheme] +Encoding=UTF-8 +Type=X-GNOME-Metatheme +Name=Sato +GtkTheme=Adwaita +IconTheme=Sato +MatchboxTheme=Sato diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session index 42ce483d35..f6313bdebe 100644 --- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session +++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session @@ -14,11 +14,6 @@ else KEYBOARD_APPLET="keyboard" fi -# Tell GTK+3 we really want server side decorations, even with -# GtkHeaderBar using applications: Without that mb-panel will render -# on top of the client side decorations. -export GTK_CSD=0 - matchbox-desktop & # Lines containing feature-[foo] are removed at build time if the machine @@ -28,6 +23,6 @@ START_APPLETS=showdesktop,windowselector END_APPLETS=clock,battery,$KEYBOARD_APPLET,systray,startup-notify,notify END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone -matchbox-panel --titlebar --start-applets $START_APPLETS --end-applets $END_APPLETS & +matchbox-panel --start-applets $START_APPLETS --end-applets $END_APPLETS & -exec matchbox-window-manager -theme Sato -use_desktop_mode decorated -use_cursor $SHOWCURSOR $@ +exec matchbox-window-manager -theme Sato -use_cursor $SHOWCURSOR $@ |