[gnumeric] win32: fix registry file generation.



commit 49457f0ba7943ebf41d2f57cdbc8d2785aa4b82e
Author: Morten Welinder <terra gnome org>
Date:   Wed Nov 13 21:17:15 2013 -0500

    win32: fix registry file generation.

 NEWS                      |    1 +
 tools/ChangeLog           |    5 +++++
 tools/handle-conf-options |    3 +++
 3 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/NEWS b/NEWS
index ae6f5bc..69b198b 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ Morten:
        * Fix fuzzed file crash.  [#708091]
        * Restore sheet reordering by drag.
        * Fix BETA on win32.
+       * Fix win32 registry initialization.
 
 Xabier Rodríguez Calvar:
        * Fix dialog button order. [#710378]
diff --git a/tools/ChangeLog b/tools/ChangeLog
index beb7faf..30414c0 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-13  Morten Welinder  <terra gnome org>
+
+       * handle-conf-options (create_reg): Avoid double backslashes.
+       Remove /org/gnome prefix.
+
 2013-11-01  Morten Welinder  <terra gnome org>
 
        * process-amath.pl: When parsing a variable assignment fails,
diff --git a/tools/handle-conf-options b/tools/handle-conf-options
index 5d927bd..399e837 100644
--- a/tools/handle-conf-options
+++ b/tools/handle-conf-options
@@ -676,10 +676,13 @@ sub create_reg {
        # Outdated; keys now start with /org/
        # next unless $key =~ s{^/apps/}{};
 
+       next unless $key =~ s{^/org/gnome/}{};
+
        my $wkey = $prefix;
        my @items = split ('/', $key);
        my $var = pop @items;
        foreach my $item (@items) {
+           next if $item eq '';
            $wkey .= "\\$item";
            if (!exists $dirs{$wkey}) {
                print "\n[$wkey]\n";


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]