openoffice-ooo-wrapper.patch

   1 Index: ooo-wrapper.in
   2 ===================================================================
   3 RCS file: /cvs/gnome/ooo-build/bin/ooo-wrapper.in,v
   4 retrieving revision 1.30
   5 retrieving revision 1.34
   6 diff -u -u -r1.30 -r1.34
   7 --- ooo-build.org/bin/ooo-wrapper.in    15 Jul 2004 02:24:03 -0000      1.30
   8 +++ ooo-build/bin/ooo-wrapper.in        31 Aug 2004 09:48:10 -0000      1.34
   9 @@ -394,7 +394,7 @@
  10
  11      unlink $SetupConfig;
  12
  13 -    check_user_installation() || die "Installation of OpenOffice.org $Version was not successfull\n";
  14 +    check_user_installation() || die "Installation of OpenOffice.org $Version was not successfull.\nCheck ~/.openoffice-install-log log file for details.\n";
  15
  16      rewrite_paths();
  17  }
  18 @@ -422,10 +422,29 @@
  19
  20  # select the preferred icons set by the running windowmanager
  21  unless (defined $icons_set) {
  22 -    $icons_set="kde" if (-d "$SystemInstallDir/program/resource.kde" &&
  23 -                         "$ENV{WINDOWMANAGER}" =~ ".*kde\$");
  24 -    $icons_set="gnome" if (-d "$SystemInstallDir/program/resource.gnome" &&
  25 -                         "$ENV{WINDOWMANAGER}" =~ ".*gnome\$");
  26 +    if ((exists $ENV{GNOME_DESKTOP_SESSION_ID}) && (-d "$SystemInstallDir/program/resource.gnome")) {
  27 +        $icons_set="gnome";
  28 +    } elsif ((exists $ENV{KDE_FULL_SESSION}) && (-d "$SystemInstallDir/program/resource.kde")) {
  29 +       $icons_set="kde";
  30 +    }
  31 +
  32 +    if (not defined $icons_set) {
  33 +        if ((exists $ENV{WINDOWMANAGER}) && (-d "$SystemInstallDir/program/resource.kde") &&
  34 +            ("$ENV{WINDOWMANAGER}" =~ ".*kde\$")) {
  35 +                $icons_set="kde";
  36 +        } elsif ((exists $ENV{WINDOWMANAGER}) && (-d "$SystemInstallDir/program/resource.gnome") &&
  37 +            ("$ENV{WINDOWMANAGER}" =~ ".*gnome\$")) {
  38 +                $icons_set="gnome";
  39 +        } elsif (-d "$SystemInstallDir/program/resource.default") {
  40 +            $icons_set="default";
  41 +        } elsif (-d "$SystemInstallDir/program/resource.kde") {
  42 +            $icons_set="kde";
  43 +        } elsif (-d "$SystemInstallDir/program/resource.gnome") {
  44 +            $icons_set="gnome";
  45 +        } else {
  46 +            $icons_set="default";
  47 +        }
  48 +    }
  49  }
  50
  51  if (defined $icons_set) {