diff options
| author | Marcel Dijkstra <[email protected]> | 2012-05-23 02:33:19 +0200 |
|---|---|---|
| committer | Marcel Dijkstra <[email protected]> | 2012-05-23 02:33:19 +0200 |
| commit | 13d41840ccb39bebe44b52653ba8d59b0c4985a0 (patch) | |
| tree | 913ab19cfa015a5ec63ff66c37a6d67696c347d1 /mate-panel/panel-profile.c | |
| parent | d3b927a321242e36abdb1e4acc488cde7899800e (diff) | |
| parent | 9af851f0c4f0296eb5654233b9fc251e9377c8b9 (diff) | |
| download | mate-panel-13d41840ccb39bebe44b52653ba8d59b0c4985a0.tar.bz2 mate-panel-13d41840ccb39bebe44b52653ba8d59b0c4985a0.tar.xz | |
Merge remote-tracking branch 'upstream/master' into slave
Diffstat (limited to 'mate-panel/panel-profile.c')
| -rw-r--r-- | mate-panel/panel-profile.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mate-panel/panel-profile.c b/mate-panel/panel-profile.c index 52cb353b..4f2fb931 100644 --- a/mate-panel/panel-profile.c +++ b/mate-panel/panel-profile.c @@ -99,10 +99,12 @@ static MateConfEnumStringPair panel_object_type_map [] = { { PANEL_OBJECT_DRAWER, "drawer-object" }, { PANEL_OBJECT_MENU, "menu-object" }, { PANEL_OBJECT_LAUNCHER, "launcher-object" }, - { PANEL_OBJECT_APPLET, "matecomponent-applet" }, + { PANEL_OBJECT_APPLET, "external-applet" }, { PANEL_OBJECT_ACTION, "action-applet" }, { PANEL_OBJECT_MENU_BAR, "menu-bar" }, { PANEL_OBJECT_SEPARATOR, "separator" }, + /* The following is for backwards compatibility with 2.30.x and earlier */ + { PANEL_OBJECT_APPLET, "matecomponent-applet" }, /* The following two are for backwards compatibility with 2.0.x */ { PANEL_OBJECT_LOCK, "lock-object" }, { PANEL_OBJECT_LOGOUT, "logout-object" }, |