diff options
| author | Pedro Giffuni <pfg@apache.org> | 2011-10-27 01:45:30 +0000 |
|---|---|---|
| committer | Pedro Giffuni <pfg@apache.org> | 2011-10-27 01:45:30 +0000 |
| commit | c9ecfb4ca3779258019cfaea3f1da9f6b403166f (patch) | |
| tree | 3f09333492f448aa10159fc98a86700a62a4a59b /scp2 | |
| parent | 472995097c3ab0dc237c877ab92054dbf94e3f5e (diff) | |
i118519 - gtk quickstarter: use GtkStatusIcon instead of libegg. Patch by Ariel Constenla-Haile
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 22 | ||||
| -rwxr-xr-x | scp2/source/ooo/file_library_ooo.scp | 31 |
2 files changed, 23 insertions, 30 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 88807d27a599..5af86803ea87 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -98,7 +98,7 @@ Module gid_Module_Root_Brand gid_Brand_File_Share_Xdg_JavaFilter, gid_Brand_File_Share_Xdg_Math, gid_Brand_File_Share_Xdg_Printeradmin, -// gid_Brand_File_Share_Xdg_QStart, + gid_Brand_File_Share_Xdg_QStart, gid_Brand_File_Share_Xdg_StartCenter, gid_Brand_File_Share_Xdg_Writer, gid_Brand_File_Txt_Package); @@ -738,16 +738,16 @@ File gid_Brand_File_Share_Xdg_Printeradmin End #endif -//#if defined UNX && ! defined MACOSX -//#ifdef ENABLE_GTK -//File gid_Brand_File_Share_Xdg_QStart -// TXT_FILE_BODY; -// Dir = gid_Brand_Dir_Share_Xdg; -// Styles = (PACKED,SCPZIP_REPLACE); -// Name = "qstart.desktop"; -//End -//#endif -//#endif +#if defined UNX && ! defined MACOSX +#ifdef ENABLE_GTK +File gid_Brand_File_Share_Xdg_QStart + TXT_FILE_BODY; + Dir = gid_Brand_Dir_Share_Xdg; + Styles = (PACKED,SCPZIP_REPLACE); + Name = "qstart.desktop"; +End +#endif +#endif #if defined UNX && ! defined MACOSX File gid_Brand_File_Share_Xdg_Writer diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 52a7d62a0584..808fdf2cdefd 100755 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -208,25 +208,18 @@ End #endif -//#ifdef UNX -//#ifdef ENABLE_GTK -//#ifdef ENABLE_SYSTRAY_GTK -//File gid_File_Lib_Egg_Tray -// TXT_FILE_BODY; -// Styles = (PACKED); -// Dir = SCP2_OOO_BIN_DIR; -// Name = STRING(CONCAT3(libeggtray,DLLPOSTFIX,UNXSUFFIX)); -//End -// -//File gid_File_Lib_QStart_Gtk -// Name = LIBNAME(qstart_gtk); -// TXT_FILE_BODY; -// Styles = (PACKED); -// Dir = SCP2_OOO_BIN_DIR; -//End -//#endif -//#endif -//#endif +#ifdef UNX +#ifdef ENABLE_GTK +#ifdef ENABLE_SYSTRAY_GTK +File gid_File_Lib_QStart_Gtk + Name = LIBNAME(qstart_gtk); + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; +End +#endif +#endif +#endif STD_LIB_FILE( gid_File_Lib_Dba, dba) |