[ooo-build-commit] .: 2 commits - bin/g patches/dev300

[Jan Holesovsky]

 bin/g                                            |    2 -
 patches/dev300/apply                             |    5 ----
 patches/dev300/tango-prefer-over-industrial.diff |   28 -----------------------
 3 files changed, 1 insertion(+), 34 deletions(-)

New commits:
commit 34b55f66e5786934e708154ec5644a9160ed4af6
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Aug 25 11:35:05 2010 +0200

    Remove tango-prefer-over-industrial.diff, it has been moved to the repos.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4736d94..48a1b5e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1148,11 +1148,6 @@ default-no-style-dialog.diff, michael
 # pestering people serves no useful purpose
 default-no-registration.diff, michael
 
-# The Industrial OOo icon theme is too old. The OOo Tango icon
-# theme is closer to the current GNOME Industrial theme rules.
-# => Tango should be preferred over Industrial.
-tango-prefer-over-industrial.diff, n#304615, pmladek
-
 # no Help->registration dialog by default
 default-no-registration-menu.diff, michael
 
diff --git a/patches/dev300/tango-prefer-over-industrial.diff b/patches/dev300/tango-prefer-over-industrial.diff
deleted file mode 100644
index 1df0eaf..0000000
--- a/patches/dev300/tango-prefer-over-industrial.diff
+++ /dev/null
@@ -1,28 +0,0 @@
----
- vcl/source/app/settings.cxx |   10 +++++++++-
- 1 files changed, 9 insertions(+), 1 deletions(-)
-
-diff --git vcl/source/app/settings.cxx vcl/source/app/settings.cxx
-index 149b1fe..432624e 100755
---- vcl/source/app/settings.cxx
-+++ vcl/source/app/settings.cxx
-@@ -752,7 +752,15 @@ void StyleSettings::SetPreferredSymbolsStyleName( const ::rtl::OUString &rName )
- 
-         for( sal_uInt32 n = 0; n <= STYLE_SYMBOLS_THEMES_MAX; n++ )
-             if ( rNameLowCase.indexOf( ImplSymbolsStyleToName( n ) ) != -1 )
--                SetPreferredSymbolsStyle( n );
-+            {
-+                if (n == STYLE_SYMBOLS_INDUSTRIAL)
-+                    // The Industrial OOo icon theme is too old.
-+                    // The OOo Tango icon theme is closer to the current GNOME Industrial theme rules.
-+                    SetPreferredSymbolsStyle( STYLE_SYMBOLS_TANGO );
-+                else
-+                    SetPreferredSymbolsStyle( n );
-+                return;
-+            }
-     }
- }
- 
--- 
-1.7.0.1
-
commit 82e439e49d0affa90c586e9dd389aec4d5445ff2
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Wed Aug 25 11:15:55 2010 +0200

    When doing g diff, don't show the repos, it is not necessary.

diff --git a/bin/g b/bin/g
index 67a1522..790ef9e 100755
--- a/bin/g
+++ b/bin/g
@@ -125,7 +125,7 @@ for DIR in * ; do
                     ;;
             esac
 
-            echo "===== $DIR ====="
+            [ "$COMMAND" != 'diff' ] && echo "===== $DIR ====="
             git $PAGER "$COMMAND" $EXTRA "${FILES[@]}"
             RETURN=$?