94857 2005-06-02 12:02 0000 Patch to fix icons in OpenOffice.Org Quickstarter (oooqs) and openoffice-ximian 2005-09-23 23:46:43 0000 1 1 1 Unclassified Gentoo Linux Applications unspecified All All RESOLVED FIXED P2 minor --- 1 jani-matti.hatinen@iki.fi openoffice@gentoo.org m.debruijne@matrict.nl jani-matti.hatinen@iki.fi 2005-06-02 12:02:06 0000 oooqs-2.0.3-r1 added support for openoffice-ximian, but the patch doesn't handle the different icons of openoffice and openoffice-ximian (in the system tray menu) properly. The attached version of fixxooo.patch fixes the icon issue with openoffice-ximian. jani-matti.hatinen@iki.fi 2005-06-02 12:03:21 0000 Created an attachment (id=60468) Updated version of fixxooo.patch suka@gentoo.org 2005-09-23 23:46:43 0000 Fixed this now, thanks for your patch! 60468 2005-06-02 12:03 0000 Updated version of fixxooo.patch fixxooo.patch text/plain ZGlmZiAtcnUgb29vcXMtMi4wLjMvc3JjL29vb3FzLmNwcCBvb29xcy0yLjAuMy1maXhlZC9zcmMv b29vcXMuY3BwCi0tLSBvb29xcy0yLjAuMy9zcmMvb29vcXMuY3BwCTIwMDUtMDYtMDEgMjA6MDg6 MzAuMDAwMDAwMDAwICswMzAwCisrKyBvb29xcy0yLjAuMy1maXhlZC9zcmMvb29vcXMuY3BwCTIw MDUtMDYtMDEgMjA6MDc6NTUuMDAwMDAwMDAwICswMzAwCkBAIC0zLDYgKzMsNyBAQAogKi8KIAog I2luY2x1ZGUgPHFkaXIuaD4KKyNpbmNsdWRlIDxxZmlsZS5oPgogI2luY2x1ZGUgPHFtYXAuaD4K IAogI2luY2x1ZGUgPGthYm91dGRhdGEuaD4KQEAgLTQ0LDIxICs0NSwzNiBAQAogCSovCiAJS1Bv cHVwTWVudSogbWVudSA9IGNvbnRleHRNZW51KCk7CiAKLQkoIG5ldyBLQWN0aW9uKCBpMThuKCAi VGV4dGRvY3VtZW50IiApLAotCSAgICAgICAgICAgICAgICJvb29fd3JpdGVyIiwgMCwgdGhpcywK LQkgICAgICAgICAgICAgICBTTE9UKCBzdGFydFdyaXRlcigpICksIHRoaXMgKSApIC0+cGx1Zygg bWVudSApOwotCSggbmV3IEtBY3Rpb24oIGkxOG4oICJTcHJlYWRzaGVldCIgKSwKLQkgICAgICAg ICAgICAgICAib29vX2NhbGMiLCAwLCB0aGlzLAotCSAgICAgICAgICAgICAgIFNMT1QoIHN0YXJ0 Q2FsYygpICksIHRoaXMgKSApIC0+cGx1ZyggbWVudSApOwotCSggbmV3IEtBY3Rpb24oIGkxOG4o ICJQcmVzZW50YXRpb24iICksCi0JICAgICAgICAgICAgICAgIm9vb19pbXByZXNzIiwgMCwgdGhp cywKLQkgICAgICAgICAgICAgICBTTE9UKCBzdGFydEltcHJlc3MoKSApLCB0aGlzICkgKSAtPnBs dWcoIG1lbnUgKTsKLQkoIG5ldyBLQWN0aW9uKCBpMThuKCAiRHJhd2luZyIgKSwKLQkgICAgICAg ICAgICAgICAib29vX2RyYXciLCAwLCB0aGlzLAotCSAgICAgICAgICAgICAgIFNMT1QoIHN0YXJ0 RHJhdygpICksIHRoaXMgKSApIC0+cGx1ZyggbWVudSApOwotCSggbmV3IEtBY3Rpb24oIGkxOG4o ICJGcm9tIFRlbXBsYXRlIiApLAotCSAgICAgICAgICAgICAgICJ3aXphcmQiLCAwLCB0aGlzLAot CSAgICAgICAgICAgICAgIFNMT1QoIHN0YXJ0VGVtcGxhdGUoKSApLCB0aGlzICkgKSAtPnBsdWco IG1lbnUgKTsKKwlpZiAoIFFGaWxlOjpleGlzdHMoIFFEaXI6OmhvbWVEaXJQYXRoKCkgKyBRRGly OjpzZXBhcmF0b3IoKSArICIueHZlcnNpb25yYyIgKSApIHsKKwkJKCBuZXcgS0FjdGlvbiggaTE4 biggIlRleHRkb2N1bWVudCIgKSwKKwkJICAgICAgICAgICAgICAgInhpbWlhbi1vcGVub2ZmaWNl LXdyaXRlciIsIDAsIHRoaXMsCisJCSAgICAgICAgICAgICAgIFNMT1QoIHN0YXJ0V3JpdGVyKCkg KSwgdGhpcyApICkgLT5wbHVnKCBtZW51ICk7CisJCSggbmV3IEtBY3Rpb24oIGkxOG4oICJTcHJl YWRzaGVldCIgKSwKKwkJICAgICAgICAgICAgICAgInhpbWlhbi1vcGVub2ZmaWNlLWNhbGMiLCAw LCB0aGlzLAorCQkgICAgICAgICAgICAgICBTTE9UKCBzdGFydENhbGMoKSApLCB0aGlzICkgKSAt PnBsdWcoIG1lbnUgKTsKKwkJKCBuZXcgS0FjdGlvbiggaTE4biggIlByZXNlbnRhdGlvbiIgKSwK KwkJICAgICAgICAgICAgICAgInhpbWlhbi1vcGVub2ZmaWNlLWltcHJlc3MiLCAwLCB0aGlzLAor CQkgICAgICAgICAgICAgICBTTE9UKCBzdGFydEltcHJlc3MoKSApLCB0aGlzICkgKSAtPnBsdWco IG1lbnUgKTsKKwkJKCBuZXcgS0FjdGlvbiggaTE4biggIkRyYXdpbmciICksCisJCSAgICAgICAg ICAgICAgICJ4aW1pYW4tb3Blbm9mZmljZS1kcmF3IiwgMCwgdGhpcywKKwkJICAgICAgICAgICAg ICAgU0xPVCggc3RhcnREcmF3KCkgKSwgdGhpcyApICkgLT5wbHVnKCBtZW51ICk7CisJCX0gZWxz ZSB7CisJCSggbmV3IEtBY3Rpb24oIGkxOG4oICJUZXh0ZG9jdW1lbnQiICksCisJCSAgICAgICAg ICAgICAgICJvb29fd3JpdGVyIiwgMCwgdGhpcywKKwkJICAgICAgICAgICAgICAgU0xPVCggc3Rh cnRXcml0ZXIoKSApLCB0aGlzICkgKSAtPnBsdWcoIG1lbnUgKTsKKwkJKCBuZXcgS0FjdGlvbigg aTE4biggIlNwcmVhZHNoZWV0IiApLAorCQkgICAgICAgICAgICAgICAib29vX2NhbGMiLCAwLCB0 aGlzLAorCQkgICAgICAgICAgICAgICBTTE9UKCBzdGFydENhbGMoKSApLCB0aGlzICkgKSAtPnBs dWcoIG1lbnUgKTsKKwkJKCBuZXcgS0FjdGlvbiggaTE4biggIlByZXNlbnRhdGlvbiIgKSwKKwkJ ICAgICAgICAgICAgICAgIm9vb19pbXByZXNzIiwgMCwgdGhpcywKKwkJICAgICAgICAgICAgICAg U0xPVCggc3RhcnRJbXByZXNzKCkgKSwgdGhpcyApICkgLT5wbHVnKCBtZW51ICk7CisJCSggbmV3 IEtBY3Rpb24oIGkxOG4oICJEcmF3aW5nIiApLAorCQkgICAgICAgICAgICAgICAib29vX2RyYXci LCAwLCB0aGlzLAorCQkgICAgICAgICAgICAgICBTTE9UKCBzdGFydERyYXcoKSApLCB0aGlzICkg KSAtPnBsdWcoIG1lbnUgKTsKKwkJfQorCQkoIG5ldyBLQWN0aW9uKCBpMThuKCAiRnJvbSBUZW1w bGF0ZSIgKSwKKwkJICAgICAgICAgICAgICAgIndpemFyZCIsIDAsIHRoaXMsCisJCSAgICAgICAg ICAgICAgIFNMT1QoIHN0YXJ0VGVtcGxhdGUoKSApLCB0aGlzICkgKSAtPnBsdWcoIG1lbnUgKTsK IAltZW51LT5pbnNlcnRTZXBhcmF0b3IoKTsKIAkoIG5ldyBLQWN0aW9uKCBpMThuKCAiT3BlbiBE b2N1bWVudCIgKSwKIAkgICAgICAgICAgICAgICAiZmlsZW9wZW4iLCAwLCB0aGlzLApAQCAtOTIs OSArMTA4LDE1IEBACiAJVHJ5IHRvIGF1dG9kZXRlY3Qgc2V0dGluZ3MgaWYgdGhleSBhcmVuJ3Qg Zm91bmQgaW4gb3VyIG93biBjb25maWcuCiAJKi8KIAlpZiAoIF9leGVjLmxlbmd0aCgpIDwgMiAp IHsKLQkJb29vQ29uZmlnID0gbmV3IEtTaW1wbGVDb25maWcoCi0JCSAgICAgICAgICAgICAgICBR RGlyOjpob21lRGlyUGF0aCgpICsgUURpcjo6c2VwYXJhdG9yKCkKLQkJICAgICAgICAgICAgICAg ICsgIi5zdmVyc2lvbnJjIiwgdHJ1ZSApOworCQlpZiAoIFFGaWxlOjpleGlzdHMoIFFEaXI6Omhv bWVEaXJQYXRoKCkgKyBRRGlyOjpzZXBhcmF0b3IoKSArICIueHZlcnNpb25yYyIgKSApIHsKKwkJ CW9vb0NvbmZpZyA9IG5ldyBLU2ltcGxlQ29uZmlnKAorCQkJCVFEaXI6OmhvbWVEaXJQYXRoKCkg KyBRRGlyOjpzZXBhcmF0b3IoKQorCQkJCSsgIi54dmVyc2lvbnJjIiwgdHJ1ZSApOworCQkJfSBl bHNlIHsKKwkJCW9vb0NvbmZpZyA9IG5ldyBLU2ltcGxlQ29uZmlnKAorCQkJCVFEaXI6OmhvbWVE aXJQYXRoKCkgKyBRRGlyOjpzZXBhcmF0b3IoKQorCQkJCSsgIi5zdmVyc2lvbnJjIiwgdHJ1ZSAp OworCQl9CiAJCW9vb0NvbmZpZy0+c2V0R3JvdXAoICJWZXJzaW9ucyIgKTsKIAkJdmVyc2lvbnMg PSBvb29Db25maWctPmVudHJ5TWFwKCAiVmVyc2lvbnMiICk7CiAJCS8qKgo=