Mailing-List: contact ooo-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ooo-dev@incubator.apache.org
Received-SPF: pass (athena.apache.org: domain of
 ariel.constenla.haile@gmail.com designates 209.85.160.175 as permitted
 sender)
Date: Thu, 6 Oct 2011 05:11:56 -0300
From: Ariel Constenla-Haile <ariel.constenla.haile@gmail.com>
To: ooo-dev@incubator.apache.org
Subject: [CODE] gtk system tray icon and libegg
Message-ID: <20111006081156.GA2836@localhost>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="Bn2rw/3z4jIqBvZU"
Content-Disposition: inline
User-Agent: Mutt/1.5.21 (2010-09-15)

--Bn2rw/3z4jIqBvZU
Content-Type: multipart/mixed; boundary="sm4nu43k4a2Rpi4c"
Content-Disposition: inline


--sm4nu43k4a2Rpi4c
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi there,

the GTK system tray is broken:

1) ENABLE_QUICKSTART_APPLET is not defined, so ShutdownIcon::IsQuickstarter=
Installed()
   returns false, instead of trying to load libqstart_gtk.so
   http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/source/appl/s=
hutdownicon.cxx?view=3Dmarkup#l769

2) ENABLE_SYSTRAY_GTK is not defined, so the plugin library name is not
   defined
   http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/source/appl/s=
hutdownicon.cxx?view=3Dmarkup#l96
   http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/source/appl/s=
hutdownicon.cxx?view=3Dmarkup#l159

3) the library name should be modified, due to changes in the DLLPOSTFIX;
   and should not be a string, because it is stringified (or PLUGIN_NAME
   could be defined in the Makefile)

4) the GTK system tray depends on libegg, a LGPL v2+ library. Quite
   strange the library is build but not installed. This causes that the
   libqstart_gtk.so cannot be loaded.
   libegg is copy-left, so it should be replaced by GtkStatusIcon
   (requires at most gtk 2.16)
   http://developer.gnome.org/gtk/2.24/GtkStatusIcon.html
   This looks like an easy task.

5) trunk/main/sfx2/source/appl/shutdowniconunx.cxx has no license
   header. Is this file in the software grant?=20
   Looking at the hg log, it comes from:

changeset:   174966:ddd13100457e
user:        kz
date:        Fri Oct 06 10:39:32 2006 +0000
files:       sfx2/source/appl/shutdowniconunx.cxx
description:
INTEGRATION: CWS gtkquickstart (1.1.2); FILE ADDED
2006/08/01 10:59:27 mmeeks 1.1.2.2: Issue number: i#57872#
Submitted by: mmeeks
Warning fixes.
2006/08/01 10:57:04 mmeeks 1.1.2.1: #i57872#
gtk systray quickstarter

https://issues.apache.org/ooo/show_bug.cgi?id=3D57872
first comment says something about JCAs, but I don't get it.

Attached patch solves (1) and (2) but is useless until knowing the
status of (5) and then fixing (4).

Regards
--=20
Ariel Constenla-Haile
La Plata, Argentina

--sm4nu43k4a2Rpi4c
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="sfx2.gtk.shutdownicon.diff"
Content-Transfer-Encoding: quoted-printable

diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 8c397b2..30460a5 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -266,6 +266,14 @@ $(eval $(call gb_Library_set_defs,sfx,\
 ))
 endif
=20
+ifeq ($(ENABLE_SYSTRAY_GTK),TRUE)
+$(eval $(call gb_Library_set_defs,sfx,\
+	$$(DEFS) \
+	-DENABLE_QUICKSTART_APPLET \
+	-DENABLE_SYSTRAY_GTK \
+))
+endif
+
 ifeq ($(OS),OS2)
 $(eval $(call gb_Library_add_exception_objects,sfx,\
     sfx2/source/appl/shutdowniconOs2.ob \
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdowni=
con.cxx
index 0a78490..92575a5 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -94,7 +94,7 @@ extern "C" { static void SAL_CALL thisModule() {} }
 #endif
=20
 #if defined(UNX) && defined(ENABLE_SYSTRAY_GTK)
-#define PLUGIN_NAME "libqstart_gtkli.so"
+#define PLUGIN_NAME libqstart_gtk.so
 #endif
=20
 class SfxNotificationListener_Impl : public cppu::WeakImplHelper1< XDispat=
chResultListener >
@@ -156,7 +156,7 @@ bool ShutdownIcon::LoadModule( osl::Module **pModule,
=20
 	oslGenericFunction pTmpInit =3D NULL;
 	oslGenericFunction pTmpDeInit =3D NULL;
-	if ( pPlugin->loadRelative( &thisModule, OUString (RTL_CONSTASCII_USTRING=
PARAM( STRING( PLUGIN_NAME ) ) ) ) )
+	if ( pPlugin->loadRelative( &thisModule, OUString( RTL_CONSTASCII_USTRING=
PARAM( STRING( PLUGIN_NAME ) ) ) ) )
 	{
 		pTmpInit =3D pPlugin->getFunctionSymbol(
 			OUString( RTL_CONSTASCII_USTRINGPARAM( "plugin_init_sys_tray" ) ) );

--sm4nu43k4a2Rpi4c--

--Bn2rw/3z4jIqBvZU
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJOjWLMAAoJEMjP1bm45QNWGtQQAKGV60RU3TgmnnNS5lzwyGFx
RIa77K8m2OY12DMwlqCsMAi6+OW2mihLUWasu6DfImvnLmBjHsdhhUiyjclIQZ89
xj6m7vHE5FhP1EFMqI4Scu1c/uKvCtJ3yNfdqmjgO5ID9cDRwAt3vj5y889Ihb/6
R8Qu8MfAxfaQ5ubPOiwRhdo0HOMSq/MguA+iB/5NV2PBsV8mhg2LLcyZ8v+FrjLa
MGVtDP+/k+tcezi7Z+aAppU0IDdi4v51QYIoNfazJQNZjBVYEelhtaof7Msm/0NT
7Pbg9nTsvw6NAJZRVQ8hPHENKdNAnpibaREjADZBQZAwPVz2YnGPa8U4tHDO8hio
A4iBPwfBm8yDsjPigcIVBdIL0XW9MZL1iL+kyTbvsf7p5mkENpNsy/0AsoFJ14s4
/fxOl3iS+p8Q9p8W/TbbnAK0EV0WNNvGe02TCgmHs4bfOSI4AgYud/oPeYEldQaQ
QAXHOqEb2hbvJvM8tzQa6FCP/b/Fv6uDm0X+yTDj0BZwMArH+Jj+WA2FRXE0sOle
xYeWPpCpQAQlimhB+w4Z5wavTI6Iwu4PBTx3ZwzOpfOCtmIKyH0nQxA7ATQBL6HM
iM8J1zNDzFjOZy39wvplaO2bHN+PLr5zJ29nLZsJaMNQ49+idVdKBJu3AA4OpOqV
lSGhUUfMy6Ej7Clxhemx
=1Z2M
-----END PGP SIGNATURE-----

--Bn2rw/3z4jIqBvZU--