ensure the window is shown on startup.

* shell/rb-shell.c: (rb_shell_constructor): ensure the window is shown
  on startup.

ChangeLog

@@ -1,3 +1,8 @@
+2006-02-21  James Livingston  <[email protected]>
+
+	* shell/rb-shell.c: (rb_shell_constructor): ensure the window is shown
+	on startup.
+
 2006-02-21  James Livingston  <[email protected]>
 
 	* NEWS: update with recent changes

omf.make

@@ -1,15 +1,14 @@
 # 
-# arch-tag: Makefile rules for using Scrollkeeper to install OMF files
 # No modifications of this Makefile should be necessary.
 #
 # This file contains the build instructions for installing OMF files.  It is
 # generally called from the makefiles for particular formats of documentation.
 #
-# Note that you must configure your package with --localstatedir=/var/lib
+# Note that you must configure your package with --localstatedir=/var
 # so that the scrollkeeper-update command below will update the database
 # in the standard scrollkeeper directory.
 #
-# If it is impossible to configure with --localstatedir=/var/lib, then
+# If it is impossible to configure with --localstatedir=/var, then
 # modify the definition of scrollkeeper_localstate_dir so that
 # it points to the correct location. Note that you must still use 
 # $(localstatedir) in this or when people build RPMs it will update
@@ -20,35 +19,43 @@
 #       and the makefiles for these formats should also include this file.
 #
 # About this file:
-#	This file was taken from scrollkeeper_example2, a package illustrating
-#	how to install documentation and OMF files for use with ScrollKeeper
-#	0.3.x and 0.4.x.  For more information, see:
+#	This file was derived from scrollkeeper_example2, a package
+#	illustrating how to install documentation and OMF files for use with
+#	ScrollKeeper 0.3.x and 0.4.x.  For more information, see:
 #		http://scrollkeeper.sourceforge.net/	
-# 	Version: 0.1.2 (last updated: March 20, 2002)
+# 	Version: 0.1.3 (last updated: March 20, 2002)
 #
 
 omf_dest_dir=$(datadir)/omf/@PACKAGE@
 scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
 
+# At some point, it may be wise to change to something like this:
+# scrollkeeper_localstate_dir = @SCROLLKEEPER_STATEDIR@
+
 omf: omf_timestamp
 
 omf_timestamp: $(omffile)
 	-for file in $(omffile); do \
 	  scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
-	done
+	done; \
 	touch omf_timestamp
 
 install-data-hook-omf:
 	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
 	for file in $(omffile); do \
 		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
 	done
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
+	-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
 
 uninstall-local-omf:
 	-for file in $(srcdir)/*.omf; do \
 		basefile=`basename $$file`; \
 		rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \
 	done
-	-rmdir $(omf_dest_dir)
-	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
+	-rmdir $(DESTDIR)$(omf_dest_dir)
+	-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir)
+
+clean-local-omf:
+	-for file in $(omffile); do \
+		rm -f $$file.out; \
+	done

shell/rb-shell.c

@@ -1320,6 +1320,8 @@ rb_shell_constructor (GType type,
 				  shell);
 
 		gtk_widget_show_all (GTK_WIDGET (druid));
+	} else {
+		gtk_widget_show_all (GTK_WIDGET (shell->priv->window));
 	}
 
 	return G_OBJECT (shell);

xmldocs.make

@@ -1,5 +1,4 @@
 #
-# arch-tag: Makefile rules for building GNOMEish Docbook documentation
 # No modifications of this Makefile should be necessary.
 #
 # To use this template:
@@ -34,23 +33,26 @@
 #
 
 
-# ************* Begin of section some packagers may need to modify  **************
+# **********  Begin of section some packagers may need to modify  **********
 # This variable (docdir) specifies where the documents should be installed.
 # This default value should work for most packages.
-# docdir = $(datadir)/@PACKAGE@/doc/$(docname)/$(lang)
 docdir = $(datadir)/gnome/help/$(docname)/$(lang)
 
-# **************  You should not have to edit below this line  *******************
+# **********  You should not have to edit below this line  **********
 xml_files = $(entities) $(docname).xml
 
 EXTRA_DIST = $(xml_files) $(omffile)
 CLEANFILES = omf_timestamp
 
-# If the following file is in a subdir (like help/) you need to add that to the path
 include $(top_srcdir)/omf.make
 
 all: omf
 
+$(docname).xml: $(entities)
+	-ourdir=`pwd`;  \
+	cd $(srcdir);   \
+	cp $(entities) $$ourdir
+
 app-dist-hook:
 	if test "$(figdir)"; then \
 	  $(mkinstalldirs) $(distdir)/$(figdir); \
@@ -90,3 +92,10 @@ uninstall-local-doc:
 	done
 	-rmdir $(DESTDIR)$(docdir)
 
+clean-local: clean-local-doc clean-local-omf
+
+# for non-srcdir builds, remove the copied entities.
+clean-local-doc:
+	if test $(srcdir) != .; then \
+	  rm -f $(entities); \
+	fi