summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Untz <[email protected]>2011-01-07 17:42:43 -0800
committerBenjamin Valentin <[email protected]>2012-03-26 23:05:55 +0200
commit92ba1e2db39b69340462ce0570bb971154ecdf2d (patch)
tree4768b1e58a1b12a4bef9cf49f140c6ab2c878ec6
parent5b2e5096babd9008c9f29836a93302816e15b68f (diff)
downloadmate-panel-92ba1e2db39b69340462ce0570bb971154ecdf2d.tar.bz2
mate-panel-92ba1e2db39b69340462ce0570bb971154ecdf2d.tar.xz
Change references from matecomponent-applet to external-applet in mateconf
Signed-off-by: Germán Póo-Caamaño <[email protected]>
-rw-r--r--mate-panel/mate-panel-add.in2
-rw-r--r--mate-panel/panel-default-setup.entries12
-rw-r--r--mate-panel/panel-object.schemas.in6
-rw-r--r--mate-panel/panel-profile.c4
4 files changed, 14 insertions, 10 deletions
diff --git a/mate-panel/mate-panel-add.in b/mate-panel/mate-panel-add.in
index 728eebf2..b332ffdb 100644
--- a/mate-panel/mate-panel-add.in
+++ b/mate-panel/mate-panel-add.in
@@ -261,7 +261,7 @@ class PanelAdder:
self.client.set_bool(os.path.join(dir, 'panel_right_stick'), self.right_stick)
if self.type == PANEL_TYPE_APPLET:
- self.client.set_string(os.path.join(dir, 'object_type'), 'matecomponent-applet')
+ self.client.set_string(os.path.join(dir, 'object_type'), 'external-applet')
self.client.set_string(os.path.join(dir, 'applet_iid'), self.applet_iid)
id_list = self._panel_get_list(MATE_PANEL_APPLETS_KEY)
id_list.append(id)
diff --git a/mate-panel/panel-default-setup.entries b/mate-panel/panel-default-setup.entries
index aad2f5d5..c232b4d8 100644
--- a/mate-panel/panel-default-setup.entries
+++ b/mate-panel/panel-default-setup.entries
@@ -334,7 +334,7 @@
<key>applets/window_menu/object_type</key>
<schema_key>/schemas/apps/panel/objects/object_type</schema_key>
<value>
- <string>matecomponent-applet</string>
+ <string>external-applet</string>
</value>
</entry>
<entry>
@@ -388,7 +388,7 @@
<key>applets/clock/object_type</key>
<schema_key>/schemas/apps/panel/objects/object_type</schema_key>
<value>
- <string>matecomponent-applet</string>
+ <string>external-applet</string>
</value>
</entry>
<entry>
@@ -442,7 +442,7 @@
<key>applets/notification_area/object_type</key>
<schema_key>/schemas/apps/panel/objects/object_type</schema_key>
<value>
- <string>matecomponent-applet</string>
+ <string>external-applet</string>
</value>
</entry>
<entry>
@@ -496,7 +496,7 @@
<key>applets/show_desktop_button/object_type</key>
<schema_key>/schemas/apps/panel/objects/object_type</schema_key>
<value>
- <string>matecomponent-applet</string>
+ <string>external-applet</string>
</value>
</entry>
<entry>
@@ -550,7 +550,7 @@
<key>applets/window_list/object_type</key>
<schema_key>/schemas/apps/panel/objects/object_type</schema_key>
<value>
- <string>matecomponent-applet</string>
+ <string>external-applet</string>
</value>
</entry>
<entry>
@@ -604,7 +604,7 @@
<key>applets/workspace_switcher/object_type</key>
<schema_key>/schemas/apps/panel/objects/object_type</schema_key>
<value>
- <string>matecomponent-applet</string>
+ <string>external-applet</string>
</value>
</entry>
<entry>
diff --git a/mate-panel/panel-object.schemas.in b/mate-panel/panel-object.schemas.in
index 2039ee57..7bc2d34f 100644
--- a/mate-panel/panel-object.schemas.in
+++ b/mate-panel/panel-object.schemas.in
@@ -15,7 +15,8 @@
<long>
The type of this panel object. Possible values are
"drawer-object", "menu-object", "launcher-object",
- "matecomponent-applet", "action-applet" and "menu-bar".
+ "external-applet", "action-applet", "menu-bar" and
+ "separator".
</long>
</locale>
</schema>
@@ -105,7 +106,8 @@
<long>
The implementation ID of the applet - e.g.
"ClockAppletFactory::ClockApplet". This key is only
- relevant if the object_type key is "matecomponent-applet".
+ relevant if the object_type key is "external-applet"
+ (or the deprecated "matecomponent-applet").
</long>
</locale>
</schema>
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" },