Clean and unify the Makefiles. Clean configure.in

2001-07-18 Chema Celorio <chema@celorio.com> * Clean and unify the Makefiles. Clean configure.in
2001-07-19 02:06:34 +00:00 · 2001-07-19 02:06:34 +00:00 · 5852ff8de2
commit 5852ff8de2
parent 81d30f0b82
28 changed files with 1069 additions and 99 deletions
--- a/capplets/desktop-links/Advanced.directory.in.in
+++ b/capplets/desktop-links/Advanced.directory.in.in
@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=Advanced
+Comment=Advanced Settings
+Type=Directory
+Icon=advanced-directory.png
--- a/capplets/desktop-links/cd.desktop.in.in
+++ b/capplets/desktop-links/cd.desktop.in.in
@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=CD Properties
+_Comment=Configure handling of CD devices
+Icon=cd-capplet.png
+Exec=cd-capplet
+Terminal=0
+Type=Application
--- a/capplets/desktop-links/legacy-applications-capplet.png
+++ b/capplets/desktop-links/legacy-applications-capplet.png
--- a/capplets/desktop-links/legacy-applications.desktop.in.in
+++ b/capplets/desktop-links/legacy-applications.desktop.in.in
@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=Legacy Applications
+_Comment=Legacy applications settings (grdb)
+Exec=grdb-capplet
+Terminal=0
+Type=Application
+Icon=legacy-applications-capplet.png
--- a/capplets/desktop-links/panel.desktop.in.in
+++ b/capplets/desktop-links/panel.desktop.in.in
@ -0,0 +1,8 @@
+[Desktop Entry]
+_Name=Panel
+_Comment=Global panel properties
+Exec=gnome-panel-properties-capplet
+Icon=panel-capplet.png
+Terminal=0
+Type=Application
+DocPath=panel/globalpanelprefs.html
--- a/capplets/file-types/.cvsignore
+++ b/capplets/file-types/.cvsignore
@ -3,4 +3,5 @@ Makefile.in
 .deps
 .libs
 file-types-capplet
-file-types-capplet.desktop
+file-types.desktop
+file-types.desktop.in
--- a/capplets/file-types/Makefile.am
+++ b/capplets/file-types/Makefile.am
@ -1,54 +1,37 @@
-NULL =
-
 SUBDIRS = libuuid

-INCLUDES = -I. 						\
-	-I$(top_srcdir) 				\
-	-I$(srcdir) 					\
-	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
-	-I$(top_srcdir)/libgnomevfs			\
-	@VFS_CAPPLET_CFLAGS@				\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	-I$(includedir)					\
-	$(WERROR)					\
-	$(NULL)
-
-
+cappletname = file-types
+cappletgroup = "Advanced/"
 bin_PROGRAMS = file-types-capplet

+file_types_capplet_LDADD = $(VFS_CAPPLET_LIBS) libuuid/libuuid.a
+
 file_types_capplet_SOURCES =		\
 	file-types-capplet.h 		\
 	file-types-capplet-dialogs.h 	\
 	file-types-icon-entry.h		\
 	file-types-capplet.c		\
 	file-types-capplet-dialogs.c 	\
-	file-types-icon-entry.c		\
-	$(NULL)
+	file-types-icon-entry.c

+pixmap_DATA = 

-file_types_capplet_LDADD =						\
-			@VFS_CAPPLET_LIBS@				\
-			$(INTLLIBS) 					\
-			-lgdk_pixbuf					\
-			$/libuuid/libuuid.a				\
-			$(NULL)
-
-
-sysdir = $(datadir)/control-center/capplets/Advanced/
-sys_in_files = file-types-capplet.desktop.in 
-sys_DATA = $(sys_in_files:.desktop.in=.desktop)
-
-settingsdir = $(datadir)/gnome/apps/Settings/Advanced
-settings_DATA = $(sys_DATA)
-
-desktop_in_file = file-types-capplet.desktop.in
-
-desktop_file = $(desktop_in_file:.desktop.in=.desktop)
-
+##
+## You should not need to modify anything below this line
+##
@XML_I18N_MERGE_DESKTOP_RULE@
+@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@

-EXTRA_DIST = \
-	$(sys_DATA) $(desktop_in_file)
+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) $(VFS_CAPPLET_CFLAGS)
+CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
+iconsdir   = $(GNOMECC_ICONS_DIR)
+Gladedir   = $(GNOMECC_GLADE_DIR)
+pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
+Glade_DATA = $(cappletname)-properties.glade
+icons_DATA = $(cappletname)-capplet.png
+desktop    = $(cappletname).desktop
+all-local: $(desktop)



--- a/capplets/file-types/file-types-capplet.png
+++ b/capplets/file-types/file-types-capplet.png
--- a/capplets/file-types/file-types-properties.glade
+++ b/capplets/file-types/file-types-properties.glade
--- a/capplets/file-types/file-types.desktop.in.in
+++ b/capplets/file-types/file-types.desktop.in.in
@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=File Types and Programs
+Comment=Specify which programs are used to open or view each file type
+Icon=gnome-ccmime.png
+Exec=file-types-capplet
+Terminal=0
+Type=Application
--- a/capplets/file-types/file-types.desktop.in.in-10478
+++ b/capplets/file-types/file-types.desktop.in.in-10478
@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=File Types and Programs
+Comment=Specify which programs are used to open or view each file type
+Icon=gnome-ccmime.png
+Exec=file-types-capplet
+Terminal=0
+Type=Application
--- a/capplets/theme-switcher/.cvsignore
+++ b/capplets/theme-switcher/.cvsignore
@ -2,4 +2,6 @@ Makefile.in
 Makefile
 .deps
 .libs
-theme-selector-capplet
+gtk-theme-selector-capplet
+gtk-theme-selector.desktop
+gtk-theme-selector.desktop.in
--- a/capplets/theme-switcher/Makefile.am
+++ b/capplets/theme-switcher/Makefile.am
@ -1,11 +1,10 @@
-INCLUDES = -I. -I$(srcdir) 				\
-	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
-	-I$(srcdir)/../../libcapplet		\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	@CAPPLET_CFLAGS@
+SUBDIRS =

+cappletname = gtk-theme-selector
+cappletgroup = "Advanced/"
 bin_PROGRAMS = gtk-theme-selector-capplet

+gtk_theme_selector_capplet_LDADD = $(GNOMECC_CAPPLETS_LIBS)
 gtk_theme_selector_capplet_SOURCES = \
 	da.h			\
 	file.c		\
@ -17,13 +16,21 @@ gtk_theme_selector_capplet_SOURCES = \
 	gui.c		\
 	install.c

-gtk_theme_selector_capplet_LDADD = @CAPPLET_LIBS@
+pixmap_DATA = 

-EXTRA_DIST = \
-	gtk-theme-selector.desktop
+##
+## You should not need to modify anything below this line
+##
+@XML_I18N_MERGE_DESKTOP_RULE@
+@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@

-sysdir = $(datadir)/control-center/capplets/Advanced
-sys_DATA = gtk-theme-selector.desktop
-
-psysdir = $(datadir)/gnome/apps/Settings/Advanced
-psys_DATA = gtk-theme-selector.desktop
+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
+CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
+iconsdir   = $(GNOMECC_ICONS_DIR)
+Gladedir   = $(GNOMECC_GLADE_DIR)
+pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
+Glade_DATA = $(cappletname)-properties.glade
+icons_DATA = $(cappletname)-capplet.png
+desktop    = $(cappletname).desktop
+all-local: $(desktop)
--- a/capplets/theme-switcher/gtk-theme-selector-capplet.png
+++ b/capplets/theme-switcher/gtk-theme-selector-capplet.png
--- a/capplets/theme-switcher/gtk-theme-selector-properties.glade
+++ b/capplets/theme-switcher/gtk-theme-selector-properties.glade
--- a/capplets/theme-switcher/gtk-theme-selector-properties.glade-56055
+++ b/capplets/theme-switcher/gtk-theme-selector-properties.glade-56055
--- a/capplets/theme-switcher/gtk-theme-selector.desktop.in.in
+++ b/capplets/theme-switcher/gtk-theme-selector.desktop.in.in
@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=Gtk+ Theme Selector
+_Comment=Select which gtk+ theme to use
+Exec=gtk-theme-selector-capplet
+Icon=gnome-ccthemes.png
+Terminal=0
+Type=Application
--- a/capplets/theme-switcher/gtk-theme-selector.desktop_HAS_TRANSLATIONS
+++ b/capplets/theme-switcher/gtk-theme-selector.desktop_HAS_TRANSLATIONS
--- a/capplets/ui-properties/.cvsignore
+++ b/capplets/ui-properties/.cvsignore
@ -5,4 +5,6 @@ Makefile.in
 *.lo
 *.la
 *.o
-ui-properties-capplet
+behavior-properties
+*.desktop
+*.desktop.in
--- a/capplets/ui-properties/Makefile.am
+++ b/capplets/ui-properties/Makefile.am
@ -1,34 +1,29 @@
-Applicationsdir = $(datadir)/control-center/capplets/Advanced/
-Applications_DATA = behavior.desktop
+cappletname = behavior
+cappletgroup = "Advanced/"
+bin_PROGRAMS = behavior-properties

-pApplicationsdir = $(datadir)/gnome/apps/Settings/Advanced
-pApplications_DATA = behavior.desktop
-
-Gladedir = $(datadir)/control-center-data
-Glade_DATA = \
-	ui-properties.glade	\
-	gnome-warning.png
-
-glade_msgs = \
-	ui-properties.glade.h
-
-EXTRA_DIST = $(Applications_DATA) $(Glade_DATA) $(glade_msgs)
-
-INCLUDES = \
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
-	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"	\
-	-DG_LOG_DOMAIN=\"ui-properties\"		\
-	-DGLADE_DATADIR=\""$(Gladedir)"\"		\
-	@CAPPLET_CFLAGS@				\
-	-I$(top_srcdir)/				\
-	-I$(top_srcdir)/intl				
-
-bin_PROGRAMS = ui-properties-capplet
-
-ui_properties_capplet_SOURCES = \
-	prefs-widget.c prefs-widget.h \
-	prefs-widget-app.c prefs-widget-app.h \
-	preferences.c preferences.h \
+behavior_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS)
+behavior_properties_SOURCES = \
+	prefs-widget.c		prefs-widget.h\
+	prefs-widget-app.c	prefs-widget-app.h\
+	preferences.c		preferences.h\
 	main.c

-ui_properties_capplet_LDADD = @CAPPLET_LIBS@
+pixmap_DATA = 
+
+##
+## You should not need to modify anything below this line
+##
+@XML_I18N_MERGE_DESKTOP_RULE@
+@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
+
+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
+CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
+iconsdir   = $(GNOMECC_ICONS_DIR)
+Gladedir   = $(GNOMECC_GLADE_DIR)
+pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
+Glade_DATA = $(cappletname)-properties.glade
+icons_DATA = $(cappletname)-capplet.png
+desktop    = $(cappletname).desktop
+all-local: $(desktop)
--- a/capplets/ui-properties/behavior-properties.glade
+++ b/capplets/ui-properties/behavior-properties.glade
@ -0,0 +1,924 @@
+<?xml version="1.0"?>
+<GTK-Interface>
+
+<project>
+  <name>New-ui-properties</name>
+  <program_name>new-ui-properties</program_name>
+  <directory></directory>
+  <source_directory>src</source_directory>
+  <pixmaps_directory>.</pixmaps_directory>
+  <language>C</language>
+  <gnome_support>True</gnome_support>
+  <gettext_support>True</gettext_support>
+  <output_translatable_strings>True</output_translatable_strings>
+  <translatable_strings_file>ui-properties.glade.h</translatable_strings_file>
+</project>
+
+<widget>
+  <class>GtkWindow</class>
+  <name>window4</name>
+  <title>window4</title>
+  <type>GTK_WINDOW_TOPLEVEL</type>
+  <position>GTK_WIN_POS_NONE</position>
+  <modal>False</modal>
+  <allow_shrink>False</allow_shrink>
+  <allow_grow>True</allow_grow>
+  <auto_shrink>False</auto_shrink>
+
+  <widget>
+    <class>GtkVBox</class>
+    <name>prefs_widget</name>
+    <homogeneous>False</homogeneous>
+    <spacing>0</spacing>
+
+    <widget>
+      <class>GtkNotebook</class>
+      <name>notebook1</name>
+      <can_focus>True</can_focus>
+      <show_tabs>True</show_tabs>
+      <show_border>True</show_border>
+      <tab_pos>GTK_POS_TOP</tab_pos>
+      <scrollable>False</scrollable>
+      <tab_hborder>2</tab_hborder>
+      <tab_vborder>2</tab_vborder>
+      <popup_enable>False</popup_enable>
+      <child>
+	<padding>0</padding>
+	<expand>False</expand>
+	<fill>False</fill>
+      </child>
+
+      <widget>
+	<class>GtkTable</class>
+	<name>table3</name>
+	<border_width>4</border_width>
+	<rows>2</rows>
+	<columns>2</columns>
+	<homogeneous>True</homogeneous>
+	<row_spacing>4</row_spacing>
+	<column_spacing>4</column_spacing>
+
+	<widget>
+	  <class>GtkFrame</class>
+	  <name>frame7</name>
+	  <label>Menus</label>
+	  <label_xalign>0</label_xalign>
+	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>1</right_attach>
+	    <top_attach>1</top_attach>
+	    <bottom_attach>2</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>True</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>True</yfill>
+	  </child>
+
+	  <widget>
+	    <class>GtkVBox</class>
+	    <name>vbox2</name>
+	    <border_width>4</border_width>
+	    <homogeneous>False</homogeneous>
+	    <spacing>0</spacing>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>menubar_detachable_toggle</name>
+	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>toggled_cb</handler>
+		<last_modification_time>Sun, 24 Sep 2000 02:48:47 GMT</last_modification_time>
+	      </signal>
+	      <label>Menu bars are detachable</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>menubar_relief_toggle</name>
+	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>toggled_cb</handler>
+		<last_modification_time>Sun, 24 Sep 2000 02:48:53 GMT</last_modification_time>
+	      </signal>
+	      <label>Menu bars have a border</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>menus_have_tearoff_toggle</name>
+	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>toggled_cb</handler>
+		<last_modification_time>Sun, 24 Sep 2000 02:49:03 GMT</last_modification_time>
+	      </signal>
+	      <label>Menus can be torn off</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>menus_have_icons_toggle</name>
+	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>toggled_cb</handler>
+		<last_modification_time>Sun, 24 Sep 2000 02:49:11 GMT</last_modification_time>
+	      </signal>
+	      <label>Menu items have icons</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+	  </widget>
+	</widget>
+
+	<widget>
+	  <class>GtkFrame</class>
+	  <name>frame8</name>
+	  <label>Status Bar</label>
+	  <label_xalign>0</label_xalign>
+	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	  <child>
+	    <left_attach>1</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>1</top_attach>
+	    <bottom_attach>2</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>True</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>True</yfill>
+	  </child>
+
+	  <widget>
+	    <class>GtkVBox</class>
+	    <name>vbox3</name>
+	    <border_width>4</border_width>
+	    <homogeneous>False</homogeneous>
+	    <spacing>0</spacing>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>statusbar_not_dialog_toggle</name>
+	      <visible>False</visible>
+	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>toggled_cb</handler>
+		<last_modification_time>Sun, 24 Sep 2000 05:09:02 GMT</last_modification_time>
+	      </signal>
+	      <label>Use status bar instead of dialog when possible</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>statusbar_is_interactive_toggle</name>
+	      <visible>False</visible>
+	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>toggled_cb</handler>
+		<last_modification_time>Sun, 24 Sep 2000 02:49:20 GMT</last_modification_time>
+	      </signal>
+	      <label>Status bar is interactive when possible</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkHSeparator</class>
+	      <name>hseparator1</name>
+	      <visible>False</visible>
+	      <child>
+		<padding>2</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkRadioButton</class>
+	      <name>statusbar_meter_on_left_toggle</name>
+	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>toggled_cb</handler>
+		<last_modification_time>Fri, 08 Dec 2000 20:02:09 GMT</last_modification_time>
+	      </signal>
+	      <label>Progress bar is on the left</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <group>progressbar</group>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkRadioButton</class>
+	      <name>statusbar_meter_on_right_toggle</name>
+	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>toggled_cb</handler>
+		<last_modification_time>Fri, 08 Dec 2000 20:02:15 GMT</last_modification_time>
+	      </signal>
+	      <label>Progress bar is on the right</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <group>progressbar</group>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+	  </widget>
+	</widget>
+
+	<widget>
+	  <class>GtkFrame</class>
+	  <name>frame6</name>
+	  <label>Tool Bars</label>
+	  <label_xalign>0</label_xalign>
+	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	  <child>
+	    <left_attach>0</left_attach>
+	    <right_attach>2</right_attach>
+	    <top_attach>0</top_attach>
+	    <bottom_attach>1</bottom_attach>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	    <xexpand>True</xexpand>
+	    <yexpand>False</yexpand>
+	    <xshrink>False</xshrink>
+	    <yshrink>False</yshrink>
+	    <xfill>True</xfill>
+	    <yfill>True</yfill>
+	  </child>
+
+	  <widget>
+	    <class>GtkTable</class>
+	    <name>table4</name>
+	    <border_width>4</border_width>
+	    <rows>4</rows>
+	    <columns>2</columns>
+	    <homogeneous>True</homogeneous>
+	    <row_spacing>0</row_spacing>
+	    <column_spacing>0</column_spacing>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>toolbar_relief_toggle</name>
+	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>toggled_cb</handler>
+		<last_modification_time>Sun, 24 Sep 2000 02:49:42 GMT</last_modification_time>
+	      </signal>
+	      <label>Tool bars have a border</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>1</top_attach>
+		<bottom_attach>2</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>toolbar_relief_btn_toggle</name>
+	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>toggled_cb</handler>
+		<last_modification_time>Sun, 24 Sep 2000 02:49:48 GMT</last_modification_time>
+	      </signal>
+	      <label>Tool bar buttons pop up on mouse over</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>3</top_attach>
+		<bottom_attach>4</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>toolbar_lines_toggle</name>
+	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>toggled_cb</handler>
+		<last_modification_time>Sun, 24 Sep 2000 02:49:53 GMT</last_modification_time>
+	      </signal>
+	      <label>Tool bars have line separators</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>2</top_attach>
+		<bottom_attach>3</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>toolbar_detachable_toggle</name>
+	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>toggled_cb</handler>
+		<last_modification_time>Sun, 24 Sep 2000 02:49:38 GMT</last_modification_time>
+	      </signal>
+	      <label>Tool bars are detachable</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>True</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkRadioButton</class>
+	      <name>toolbar_icons_only_toggle</name>
+	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>toggled_cb</handler>
+		<last_modification_time>Fri, 08 Dec 2000 19:27:09 GMT</last_modification_time>
+	      </signal>
+	      <label>Tool bar buttons are icons only</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <group>toolbar_icons</group>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>2</right_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkRadioButton</class>
+	      <name>toolbar_text_below_toggle</name>
+	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>toggled_cb</handler>
+		<last_modification_time>Fri, 08 Dec 2000 19:27:18 GMT</last_modification_time>
+	      </signal>
+	      <label>Tool bar buttons are text below icons</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <group>toolbar_icons</group>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>2</right_attach>
+		<top_attach>1</top_attach>
+		<bottom_attach>2</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+	  </widget>
+	</widget>
+      </widget>
+
+      <widget>
+	<class>GtkLabel</class>
+	<child_name>Notebook:tab</child_name>
+	<name>label6</name>
+	<label>Interface</label>
+	<justify>GTK_JUSTIFY_CENTER</justify>
+	<wrap>False</wrap>
+	<xalign>0.5</xalign>
+	<yalign>0.5</yalign>
+	<xpad>0</xpad>
+	<ypad>0</ypad>
+      </widget>
+
+      <widget>
+	<class>GtkVBox</class>
+	<name>vbox8</name>
+	<border_width>4</border_width>
+	<homogeneous>False</homogeneous>
+	<spacing>4</spacing>
+
+	<widget>
+	  <class>GtkFrame</class>
+	  <name>frame9</name>
+	  <label>Dialogs</label>
+	  <label_xalign>0</label_xalign>
+	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
+
+	  <widget>
+	    <class>GtkVBox</class>
+	    <name>vbox9</name>
+	    <border_width>4</border_width>
+	    <homogeneous>False</homogeneous>
+	    <spacing>0</spacing>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>dialog_icons_toggle</name>
+	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>toggled_cb</handler>
+		<last_modification_time>Sun, 24 Sep 2000 05:08:48 GMT</last_modification_time>
+	      </signal>
+	      <label>Dialog buttons have icons</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkCheckButton</class>
+	      <name>dialog_centered_toggle</name>
+	      <can_focus>True</can_focus>
+	      <signal>
+		<name>toggled</name>
+		<handler>toggled_cb</handler>
+		<last_modification_time>Sun, 24 Sep 2000 05:09:12 GMT</last_modification_time>
+	      </signal>
+	      <label>Place dialogs over application window when possible</label>
+	      <active>False</active>
+	      <draw_indicator>True</draw_indicator>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkTable</class>
+	      <name>table5</name>
+	      <rows>3</rows>
+	      <columns>2</columns>
+	      <homogeneous>False</homogeneous>
+	      <row_spacing>4</row_spacing>
+	      <column_spacing>4</column_spacing>
+	      <child>
+		<padding>0</padding>
+		<expand>False</expand>
+		<fill>False</fill>
+	      </child>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label2</name>
+		<label>Dialogs open</label>
+		<justify>GTK_JUSTIFY_RIGHT</justify>
+		<wrap>False</wrap>
+		<xalign>0</xalign>
+		<yalign>0.5</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <left_attach>0</left_attach>
+		  <right_attach>1</right_attach>
+		  <top_attach>0</top_attach>
+		  <bottom_attach>1</bottom_attach>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <xexpand>False</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkOptionMenu</class>
+		<name>dialog_position_select</name>
+		<can_focus>True</can_focus>
+		<items>Wherever the Window Manager places them
+At the center of the screen
+At the mouse pointer
+</items>
+		<initial_choice>0</initial_choice>
+		<child>
+		  <left_attach>1</left_attach>
+		  <right_attach>2</right_attach>
+		  <top_attach>0</top_attach>
+		  <bottom_attach>1</bottom_attach>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <xexpand>False</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label3</name>
+		<label>Dialogs are treated</label>
+		<justify>GTK_JUSTIFY_RIGHT</justify>
+		<wrap>False</wrap>
+		<xalign>0</xalign>
+		<yalign>0</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <left_attach>0</left_attach>
+		  <right_attach>1</right_attach>
+		  <top_attach>1</top_attach>
+		  <bottom_attach>2</bottom_attach>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <xexpand>False</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkOptionMenu</class>
+		<name>dialog_type_select</name>
+		<can_focus>True</can_focus>
+		<items>Like any other window
+Specially by the window manager
+</items>
+		<initial_choice>0</initial_choice>
+		<child>
+		  <left_attach>1</left_attach>
+		  <right_attach>2</right_attach>
+		  <top_attach>1</top_attach>
+		  <bottom_attach>2</bottom_attach>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <xexpand>False</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkLabel</class>
+		<name>label1</name>
+		<label>Dialog Buttons</label>
+		<justify>GTK_JUSTIFY_CENTER</justify>
+		<wrap>False</wrap>
+		<xalign>0</xalign>
+		<yalign>0.5</yalign>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<child>
+		  <left_attach>0</left_attach>
+		  <right_attach>1</right_attach>
+		  <top_attach>2</top_attach>
+		  <bottom_attach>3</bottom_attach>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <xexpand>False</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
+
+	      <widget>
+		<class>GtkOptionMenu</class>
+		<name>dialog_buttons_style_select</name>
+		<can_focus>True</can_focus>
+		<items>Default  (Spread out - big)
+Spread out
+Spread out (big)
+Left aligned
+Right aligned
+</items>
+		<initial_choice>0</initial_choice>
+		<child>
+		  <left_attach>1</left_attach>
+		  <right_attach>2</right_attach>
+		  <top_attach>2</top_attach>
+		  <bottom_attach>3</bottom_attach>
+		  <xpad>0</xpad>
+		  <ypad>0</ypad>
+		  <xexpand>False</xexpand>
+		  <yexpand>False</yexpand>
+		  <xshrink>False</xshrink>
+		  <yshrink>False</yshrink>
+		  <xfill>True</xfill>
+		  <yfill>False</yfill>
+		</child>
+	      </widget>
+	    </widget>
+	  </widget>
+	</widget>
+
+	<widget>
+	  <class>GtkFrame</class>
+	  <name>frame10</name>
+	  <label>Multiple Documents</label>
+	  <label_xalign>0</label_xalign>
+	  <shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
+
+	  <widget>
+	    <class>GtkTable</class>
+	    <name>table2</name>
+	    <border_width>5</border_width>
+	    <rows>2</rows>
+	    <columns>2</columns>
+	    <homogeneous>False</homogeneous>
+	    <row_spacing>5</row_spacing>
+	    <column_spacing>5</column_spacing>
+
+	    <widget>
+	      <class>GtkOptionMenu</class>
+	      <name>mdi_mode_select</name>
+	      <can_focus>True</can_focus>
+	      <items>Notebook tabs
+Seperate windows
+The same window
+</items>
+	      <initial_choice>0</initial_choice>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>2</right_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkOptionMenu</class>
+	      <name>mdi_tab_pos_select</name>
+	      <can_focus>True</can_focus>
+	      <items>Left
+Right
+Top
+Bottom
+</items>
+	      <initial_choice>0</initial_choice>
+	      <child>
+		<left_attach>1</left_attach>
+		<right_attach>2</right_attach>
+		<top_attach>1</top_attach>
+		<bottom_attach>2</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>label8</name>
+	      <label>When opening Multiple documents, use</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>0</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>0</top_attach>
+		<bottom_attach>1</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+
+	    <widget>
+	      <class>GtkLabel</class>
+	      <name>label9</name>
+	      <label>When using Notebook tabs, place the tabs on the</label>
+	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <wrap>False</wrap>
+	      <xalign>0</xalign>
+	      <yalign>0.5</yalign>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <child>
+		<left_attach>0</left_attach>
+		<right_attach>1</right_attach>
+		<top_attach>1</top_attach>
+		<bottom_attach>2</bottom_attach>
+		<xpad>0</xpad>
+		<ypad>0</ypad>
+		<xexpand>False</xexpand>
+		<yexpand>False</yexpand>
+		<xshrink>False</xshrink>
+		<yshrink>False</yshrink>
+		<xfill>True</xfill>
+		<yfill>False</yfill>
+	      </child>
+	    </widget>
+	  </widget>
+	</widget>
+      </widget>
+
+      <widget>
+	<class>GtkLabel</class>
+	<child_name>Notebook:tab</child_name>
+	<name>label7</name>
+	<label>Miscellaneous</label>
+	<justify>GTK_JUSTIFY_CENTER</justify>
+	<wrap>False</wrap>
+	<xalign>0.5</xalign>
+	<yalign>0.5</yalign>
+	<xpad>0</xpad>
+	<ypad>0</ypad>
+      </widget>
+    </widget>
+
+    <widget>
+      <class>GtkHBox</class>
+      <name>hbox2</name>
+      <homogeneous>False</homogeneous>
+      <spacing>0</spacing>
+      <child>
+	<padding>0</padding>
+	<expand>False</expand>
+	<fill>False</fill>
+      </child>
+
+      <widget>
+	<class>GnomePixmap</class>
+	<name>pixmap1</name>
+	<filename>gnome-warning.png</filename>
+	<child>
+	  <padding>0</padding>
+	  <expand>False</expand>
+	  <fill>False</fill>
+	</child>
+      </widget>
+
+      <widget>
+	<class>GtkLabel</class>
+	<name>label10</name>
+	<label>Settings will not take effect until applications restart</label>
+	<justify>GTK_JUSTIFY_CENTER</justify>
+	<wrap>False</wrap>
+	<xalign>0.5</xalign>
+	<yalign>0.5</yalign>
+	<xpad>0</xpad>
+	<ypad>0</ypad>
+	<child>
+	  <padding>0</padding>
+	  <expand>False</expand>
+	  <fill>False</fill>
+	</child>
+      </widget>
+    </widget>
+  </widget>
+</widget>
+
+</GTK-Interface>
--- a/capplets/ui-properties/behavior.desktop.in.in
+++ b/capplets/ui-properties/behavior.desktop.in.in
@ -0,0 +1,7 @@
+[Desktop Entry]
+_Name=Behavior
+_Comment=Sets the default behavior of GNOME applications
+Exec=ui-properties
+Icon=gnome-applications.png
+Terminal=0
+Type=Application
--- a/capplets/ui-properties/behavior.desktop_WITH_TRANSLATIONS
+++ b/capplets/ui-properties/behavior.desktop_WITH_TRANSLATIONS
--- a/capplets/ui-properties/main.c
+++ b/capplets/ui-properties/main.c
@ -245,7 +245,7 @@ main (int argc, char **argv)
 		token = 1;
 	}

-	gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-applications.png");
+	gnome_window_icon_set_default_from_file (GNOMECC_ICONS_DIR"/gnome-applications.png");

 #ifdef HAVE_XIMIAN_ARCHIVER
 	archive = ARCHIVE (archive_load (FALSE));
--- a/capplets/ui-properties/prefs-widget-app.c
+++ b/capplets/ui-properties/prefs-widget-app.c
@ -98,7 +98,7 @@ prefs_widget_app_new (Preferences *prefs)

 	g_return_val_if_fail (prefs == NULL || IS_PREFERENCES (prefs), NULL);

-	dialog_data = glade_xml_new (GLADE_DATADIR "/ui-properties.glade",
+	dialog_data = glade_xml_new (GNOMECC_GLADE_DIR "/behavior-properties.glade",
 						    "prefs_widget_app");

 	widget = gtk_widget_new (prefs_widget_app_get_type (),
--- a/capplets/ui-properties/prefs-widget-dialogs.c
+++ b/capplets/ui-properties/prefs-widget-dialogs.c
@ -94,7 +94,7 @@ prefs_widget_dialogs_new (Preferences *prefs)
 	g_return_val_if_fail (prefs == NULL || IS_PREFERENCES (prefs), NULL);

 	dialog_data = 
-		glade_xml_new (GLADE_DATADIR "/ui-properties.glade",
+		glade_xml_new (GNOMECC_GLADE_DIR "/behavior-properties.glade",
 					"prefs_widget_dialogs");

 	widget = gtk_widget_new (prefs_widget_dialogs_get_type (),
--- a/capplets/ui-properties/prefs-widget-mdi.c
+++ b/capplets/ui-properties/prefs-widget-mdi.c
@ -90,7 +90,7 @@ prefs_widget_mdi_new (Preferences *prefs)
 	g_return_val_if_fail (prefs == NULL || IS_PREFERENCES (prefs), NULL);

 	dialog_data = 
-		glade_xml_new (GLADE_DATADIR "/ui-properties.glade",
+		glade_xml_new (GNOMECC_GLADE_DIR "/behavior-properties.glade",
 			       "prefs_widget_mdi");

 	widget = gtk_widget_new (prefs_widget_mdi_get_type (),
--- a/capplets/ui-properties/prefs-widget.c
+++ b/capplets/ui-properties/prefs-widget.c
@ -259,7 +259,8 @@ prefs_widget_new (Preferences *prefs)

 	g_return_val_if_fail (prefs == NULL || IS_PREFERENCES (prefs), NULL);

-	dialog_data = glade_xml_new (GLADE_DATADIR"/ui-properties.glade", "prefs_widget");
+	dialog_data = glade_xml_new (GNOMECC_GLADE_DIR "/behavior-properties.glade",
+						    "prefs_widget");

 	widget = gtk_widget_new (prefs_widget_get_type (),
 				 "preferences", prefs,