[gnumeric] conf: fix win32 to deal with gsettings changes (I hope)

[Morten Welinder <mortenw src gnome org>]

commit 3f286630f93f78af823e51b407aa1f644292163d
Author: Morten Welinder <terra gnome org>
Date:   Fri Oct 28 11:29:15 2011 -0400

    conf: fix win32 to deal with gsettings changes (I hope)

 schemas/Makefile.am         |    6 +++---
 tools/win32/gnumeric.nsi.in |   12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index 50f9870..02ec7a5 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -1,4 +1,4 @@
-SUFFIXES = .schemas.in .reg .hkcu.reg .xml.in .xml.in.in
+SUFFIXES = .schemas.in .reg .hkcu.reg .xml.in .xml.in.in .gschema.xml.in
 
 gschema_inin_files = \
 	org.gnome.gnumeric.gschema.xml.in.in	\
@@ -31,8 +31,8 @@ endif
 
 # The resulting .reg files are only useful on win32 but we can produce them
 # on any system.
-.xml.in.reg:
+.gschema.xml.in.reg:
 	@PERL@ $(top_srcdir)/tools/handle-conf-options --reg $< >$(abs_builddir)/$@
 
-.xml.in.hkcu.reg:
+.gschema.xml.in.hkcu.reg:
 	@PERL@ $(top_srcdir)/tools/handle-conf-options --hkcu-reg $< >$(abs_builddir)/$@
diff --git a/tools/win32/gnumeric.nsi.in b/tools/win32/gnumeric.nsi.in
index 3c9539f..241bd29 100644
--- a/tools/win32/gnumeric.nsi.in
+++ b/tools/win32/gnumeric.nsi.in
@@ -120,13 +120,13 @@ Section "Gnumeric (required)" SEC01
 
     GetFullPathName /SHORT $SHORTINSTDIR ${GNM_ROOT}
     StrCmp $ISADMIN "1" 0 +5
-	ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\gnumeric-dialogs.reg"
-	ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\gnumeric-general.reg"
-	ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\gnumeric-plugins.reg"
+	ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\org.gnome.gnumeric.dialogs.reg"
+	ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\org.gnome.gnumeric.reg"
+	ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\org.gnome.gnumeric.plugin.reg"
     Goto +4
-	ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\gnumeric-dialogs.hkcu.reg"
-	ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\gnumeric-general.hkcu.reg"
-	ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\gnumeric-plugins.hkcu.reg"
+	ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\org.gnome.gnumeric.dialogs.hkcu.reg"
+	ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\org.gnome.gnumeric.hkcu.reg"
+	ExecWait "regedit /s $SHORTINSTDIR\etc\win32\reg\org.gnome.gnumeric.plugin.hkcu.reg"
 
     ;ExecWait "${GNM_ROOT}\bin\gdk-pixbuf-query-loaders.exe >${GNM_ROOT}\etc\gtk-2.0\gdk-pixbuf.loaders"
     ;ExecWait "${GNM_ROOT}\gtk-update-icon-cache.exe ${GNM_ROOT}\share\icons\gnome"