Commit a596db4e authored by Vincent Untz's avatar Vincent Untz
Browse files

panel: Drop GConf schemas

Woohoo!
parent 5da6a269
......@@ -236,48 +236,16 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
entriesdir = $(GCONF_SCHEMA_FILE_DIR)
entries_DATA = panel-default-setup.entries
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
schemas_in_files = \
panel-global.schemas.in \
panel-general.schemas.in \
panel-toplevel.schemas.in \
panel-object.schemas.in
schemas_DATA = panel-compatibility.schemas $(schemas_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schemas_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnome-panel/$$p ; \
done ; \
$(GCONFTOOL) --direct --config-source=$(GCONF_SCHEMA_CONFIG_SOURCE) --load $(srcdir)/panel-default-setup.entries ; \
$(GCONFTOOL) --direct --config-source=$(GCONF_SCHEMA_CONFIG_SOURCE) --load $(srcdir)/panel-default-setup.entries /apps/panel ; \
fi
uninstall-local:
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(top_builddir)/applets/ngome-panel/$$p ; \
done
endif
EXTRA_DIST = \
$(ui_DATA) \
nothing.cP \
nothing.h \
$(schemas_in_files) \
panel-compatibility.schemas \
panel-marshal.list \
$(entries_DATA) \
$(desktop_in_files) \
gnome-panel-add.in
CLEANFILES = \
$(BUILT_SOURCES) \
$(schemas_in_files:.schemas.in=.schemas) \
$(sys_DATA) \
$(desktop_DATA) \
gnome-panel-add
......
<?xml version="1.0"?>
<gconfschemafile>
<!--
Schemas to maintain compatibility with the 2.0/2.2 configurations.
The problem being addressed here is that because the 2.0/2.2 panel
applies schemas to keys at runtime, existing user configurations
will end up with dangling references to the old schemas unless we
install these old schemas.
For example, a 2.0/2.2 panel will apply the medium/general/panel_id_list
schema to profiles/default/general/panel_id_list. This association
is in the user's configuration, not in the system GConf database.
If the user never changes panel_id_list and logs into a machine without
this schema, then panel_id_list will be empty.
-->
<schemalist>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/general/panel_id_list</key>
<owner>panel</owner>
<type>list</type>
<list_type>string</list_type>
<default>[00000001,00000002]</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/general/applet_id_list</key>
<owner>panel</owner>
<type>list</type>
<list_type>string</list_type>
<default>[00000001,00000002,00000003,00000004,show_desktop_button]</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/general/object_id_list</key>
<owner>panel</owner>
<type>list</type>
<list_type>string</list_type>
<default>[00000001,00000002]</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_type</key>
<owner>panel</owner>
<type>string</type>
<default>edge-panel</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_size</key>
<owner>panel</owner>
<type>string</type>
<default>panel-size-x-small</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_hide_mode</key>
<owner>panel</owner>
<type>int</type>
<default>0</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_hide_state</key>
<owner>panel</owner>
<type>int</type>
<default>0</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000001/screen</key>
<owner>panel</owner>
<type>int</type>
<default>0</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000001/monitor</key>
<owner>panel</owner>
<type>int</type>
<default>0</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000001/screen_edge</key>
<owner>panel</owner>
<type>string</type>
<default>panel-edge-bottom</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000001/hide_buttons_enabled</key>
<owner>panel</owner>
<type>bool</type>
<default>false</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000001/hide_button_pixmaps_enabled</key>
<owner>panel</owner>
<type>bool</type>
<default>false</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_background_type</key>
<owner>panel</owner>
<type>string</type>
<default>no-background</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_background_pixmap</key>
<owner>panel</owner>
<type>string</type>
<default></default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_background_pixmap_fit</key>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_background_pixmap_stretch</key>
<owner>panel</owner>
<type>bool</type>
<default>false</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_background_pixmap_rotate</key>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_background_color</key>
<owner>panel</owner>
<type>string</type>
<default>#ffffff</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000001/panel_background_color_alpha</key>
<owner>panel</owner>
<type>int</type>
<default>65535</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/objects/00000001/object_type</key>
<owner>panel</owner>
<type>string</type>
<default>launcher-object</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/objects/00000001/launcher_location</key>
<owner>panel</owner>
<type>string</type>
<default>applications:///nautilus.desktop</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/objects/00000001/panel_id</key>
<owner>panel</owner>
<type>string</type>
<default>00000002</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/objects/00000001/position</key>
<owner>panel</owner>
<type>int</type>
<default>20</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/objects/00000001/panel_right_stick</key>
<owner>panel</owner>
<type>bool</type>
<default>false</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/objects/00000002/object_type</key>
<owner>panel</owner>
<type>string</type>
<default>launcher-object</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/objects/00000002/launcher_location</key>
<owner>panel</owner>
<type>string</type>
<default>applications:///System/gnome-terminal.desktop</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/objects/00000002/panel_id</key>
<owner>panel</owner>
<type>string</type>
<default>00000002</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/objects/00000002/position</key>
<owner>panel</owner>
<type>int</type>
<default>25</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/objects/00000002/panel_stick</key>
<owner>panel</owner>
<type>bool</type>
<default>false</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/object_type</key>
<owner>panel</owner>
<type>string</type>
<default>bonobo-applet</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/panel_id</key>
<owner>panel</owner>
<type>string</type>
<default>00000001</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/position</key>
<owner>panel</owner>
<type>int</type>
<default>0</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/bonobo_iid</key>
<owner>panel</owner>
<type>string</type>
<default>OAFIID:GNOME_ShowDesktopApplet</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/show_desktop_button/panel_right_stick</key>
<owner>panel</owner>
<type>bool</type>
<default>false</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/00000001/object_type</key>
<owner>panel</owner>
<type>string</type>
<default>bonobo-applet</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/00000001/panel_id</key>
<owner>panel</owner>
<type>string</type>
<default>00000001</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/00000001/position</key>
<owner>panel</owner>
<type>int</type>
<default>1</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/00000001/bonobo_iid</key>
<owner>panel</owner>
<type>string</type>
<default>OAFIID:GNOME_TasklistApplet</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/00000001/panel_right_stick</key>
<owner>panel</owner>
<type>bool</type>
<default>false</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/00000002/object_type</key>
<owner>panel</owner>
<type>string</type>
<default>bonobo-applet</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/00000002/panel_id</key>
<owner>panel</owner>
<type>string</type>
<default>00000001</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/00000002/position</key>
<owner>panel</owner>
<type>int</type>
<default>0</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/00000002/bonobo_iid</key>
<owner>panel</owner>
<type>string</type>
<default>OAFIID:GNOME_PagerApplet</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/00000002/panel_right_stick</key>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/00000003/object_type</key>
<owner>panel</owner>
<type>string</type>
<default>bonobo-applet</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/00000003/panel_id</key>
<owner>panel</owner>
<type>string</type>
<default>00000002</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/00000003/position</key>
<owner>panel</owner>
<type>int</type>
<default>-1</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/00000003/bonobo_iid</key>
<owner>panel</owner>
<type>string</type>
<default>OAFIID:GNOME_MixerApplet</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/00000003/panel_right_stick</key>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/00000004/object_type</key>
<owner>panel</owner>
<type>string</type>
<default>bonobo-applet</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/00000004/panel_id</key>
<owner>panel</owner>
<type>string</type>
<default>00000002</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/00000004/position</key>
<owner>panel</owner>
<type>int</type>
<default>-1</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/00000004/bonobo_iid</key>
<owner>panel</owner>
<type>string</type>
<default>OAFIID:GNOME_ClockApplet</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/applets/00000004/panel_right_stick</key>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000002/panel_type</key>
<owner>panel</owner>
<type>string</type>
<default>menu-panel</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000002/panel_size</key>
<owner>panel</owner>
<type>string</type>
<default>panel-size-x-small</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000002/screen</key>
<owner>panel</owner>
<type>int</type>
<default>0</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000002/monitor</key>
<owner>panel</owner>
<type>int</type>
<default>0</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000002/panel_background_type</key>
<owner>panel</owner>
<type>string</type>
<default>no-background</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000002/panel_background_pixmap</key>
<owner>panel</owner>
<type>string</type>
<default> </default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000002/panel_background_pixmap_fit</key>
<owner>panel</owner>
<type>bool</type>
<default>false</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000002/panel_background_pixmap_stretch</key>
<owner>panel</owner>
<type>bool</type>
<default>false</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000002/panel_background_pixmap_rotate</key>
<owner>panel</owner>
<type>bool</type>
<default>false</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000002/panel_background_color</key>
<owner>panel</owner>
<type>string</type>
<default>#000000</default>
<locale name="C"/>
</schema>
<schema>
<key>/schemas/apps/panel/default_profiles/medium/panels/00000002/clock_format</key>
<owner>panel</owner>
<type>string</type>
<default>%I:%M %p</default>
<locale name="C"/>
</schema>
</schemalist>
</gconfschemafile>
This diff is collapsed.
<?xml version="1.0"?>
<gconfschemafile>
<schemalist>
<schema>
<key>/schemas/apps/panel/general/enable_program_list</key>
<applyto>/apps/panel/general/enable_program_list</applyto>
<owner>panel</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
<short>Deprecated</short>
<long></long>
</locale>
</schema>
<schema>
<key>/schemas/apps/panel/general/show_program_list</key>
<applyto>/apps/panel/general/show_program_list</applyto>
<owner>panel</owner>
<type>bool</type>
<default>false</default>
<locale name="C">
<short>Deprecated</short>
<long></long>
</locale>