|
 |
f35d1b |
diff -up ./esc/coreconf/Linux3.9.mk.fix17 ./esc/coreconf/Linux3.9.mk
|
|
|
f35d1b |
--- ./esc/coreconf/Linux3.9.mk.fix17 2013-06-17 18:52:29.341000000 -0400
|
|
|
f35d1b |
+++ ./esc/coreconf/Linux3.9.mk 2013-06-17 18:52:48.988000000 -0400
|
|
|
f35d1b |
@@ -0,0 +1,35 @@
|
|
|
f35d1b |
+# BEGIN COPYRIGHT BLOCK
|
|
|
f35d1b |
+# This Program is free software; you can redistribute it and/or modify it under
|
|
|
f35d1b |
+# the terms of the GNU General Public License as published by the Free Software
|
|
|
f35d1b |
+# Foundation; version 2 of the License.
|
|
|
f35d1b |
+#
|
|
|
f35d1b |
+# This Program is distributed in the hope that it will be useful, but WITHOUT
|
|
|
f35d1b |
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
|
|
f35d1b |
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
|
|
f35d1b |
+#
|
|
|
f35d1b |
+# You should have received a copy of the GNU General Public License along with
|
|
|
f35d1b |
+# this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
|
|
|
f35d1b |
+# Place, Suite 330, Boston, MA 02111-1307 USA.
|
|
|
f35d1b |
+#
|
|
|
f35d1b |
+# Copyright (C) 2005 Red Hat, Inc.
|
|
|
f35d1b |
+# All rights reserved.
|
|
|
f35d1b |
+# END COPYRIGHT BLOCK
|
|
|
f35d1b |
+
|
|
|
f35d1b |
+#
|
|
|
f35d1b |
+# Config stuff for Linux 3.9 (ELF)
|
|
|
f35d1b |
+#
|
|
|
f35d1b |
+
|
|
|
f35d1b |
+include $(CORE_DEPTH)/coreconf/Linux.mk
|
|
|
f35d1b |
+
|
|
|
f35d1b |
+OS_REL_CFLAGS += -DLINUX2_1
|
|
|
f35d1b |
+MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
|
|
|
f35d1b |
+ifdef BUILD_OPT
|
|
|
f35d1b |
+ OPTIMIZER = -O2
|
|
|
f35d1b |
+endif
|
|
|
f35d1b |
+
|
|
|
f35d1b |
+ifdef MAPFILE
|
|
|
f35d1b |
+ MKSHLIB += -Wl,--version-script,$(MAPFILE)
|
|
|
f35d1b |
+endif
|
|
|
f35d1b |
+PROCESS_MAP_FILE = grep -v ';-' $(LIBRARY_NAME).def | \
|
|
|
f35d1b |
+ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
|
|
|
f35d1b |
+
|
|
|
f35d1b |
diff -up ./esc/src/app/xpcom/rhCoolKey.cpp.fix17 ./esc/src/app/xpcom/rhCoolKey.cpp
|
|
|
f35d1b |
--- ./esc/src/app/xpcom/rhCoolKey.cpp.fix17 2013-06-17 18:48:27.263000000 -0400
|
|
|
f35d1b |
+++ ./esc/src/app/xpcom/rhCoolKey.cpp 2013-06-17 18:48:27.328000000 -0400
|
|
|
f35d1b |
@@ -1383,7 +1383,7 @@ NS_IMETHODIMP rhCoolKey::GetCoolKeyGetAp
|
|
|
f35d1b |
|
|
|
f35d1b |
*_retval = ver;
|
|
|
f35d1b |
|
|
|
f35d1b |
- return S_OK;
|
|
|
f35d1b |
+ return NS_OK;
|
|
|
f35d1b |
}
|
|
|
f35d1b |
|
|
|
f35d1b |
/* boolean rhCoolKeyIsEnrolled (in unsigned long aKeyType, in string aKeyID); */
|
|
|
f35d1b |
diff -up ./esc/src/app/xpcom/tray/rhLinuxTray.cpp.fix17 ./esc/src/app/xpcom/tray/rhLinuxTray.cpp
|
|
|
f35d1b |
--- ./esc/src/app/xpcom/tray/rhLinuxTray.cpp.fix17 2013-06-17 18:48:27.267000000 -0400
|
|
|
f35d1b |
+++ ./esc/src/app/xpcom/tray/rhLinuxTray.cpp 2013-06-17 18:48:27.329000000 -0400
|
|
|
f35d1b |
@@ -152,7 +152,10 @@ NS_IMETHODIMP rhTray::Unsetwindnotifycal
|
|
|
f35d1b |
NS_IMETHODIMP rhTray::Add(nsIBaseWindow *aWindow)
|
|
|
f35d1b |
{
|
|
|
f35d1b |
char tBuff[56];
|
|
|
f35d1b |
- NS_ENSURE_ARG(aWindow);
|
|
|
f35d1b |
+
|
|
|
f35d1b |
+ if ( aWindow == NULL) {
|
|
|
f35d1b |
+ return NS_ERROR_FAILURE;
|
|
|
f35d1b |
+ }
|
|
|
f35d1b |
|
|
|
f35d1b |
PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Add %p \n",GetTStamp(tBuff,56),aWindow));
|
|
|
f35d1b |
HRESULT res = Initialize();
|
|
|
f35d1b |
@@ -509,7 +512,7 @@ HRESULT rhTray::AddListener(nsIBaseWindo
|
|
|
f35d1b |
nsresult rv;
|
|
|
f35d1b |
|
|
|
f35d1b |
PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::AddListener %p \n",GetTStamp(tBuff,56),aWindow));
|
|
|
f35d1b |
- NS_ENSURE_ARG(aWindow);
|
|
|
f35d1b |
+ //NS_ENSURE_ARG(aWindow);
|
|
|
f35d1b |
|
|
|
f35d1b |
nativeWindow aNativeWindow;
|
|
|
f35d1b |
rv = aWindow->GetParentNativeWindow( &aNativeWindow );
|
|
|
f35d1b |
@@ -635,13 +638,13 @@ NS_IMETHODIMP rhTray::Setmenuitemtext(PR
|
|
|
f35d1b |
PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Setmenuitemtext: index: %d text %s. \n",GetTStamp(tBuff,56),aIndex,aText));
|
|
|
f35d1b |
|
|
|
f35d1b |
if(!aText)
|
|
|
f35d1b |
- return S_OK;
|
|
|
f35d1b |
+ return NS_OK;
|
|
|
f35d1b |
|
|
|
f35d1b |
if(!mIconMenu)
|
|
|
f35d1b |
- return S_OK;
|
|
|
f35d1b |
+ return NS_OK;
|
|
|
f35d1b |
|
|
|
f35d1b |
if(aIndex < 0 || aIndex > 10)
|
|
|
f35d1b |
- return S_OK;
|
|
|
f35d1b |
+ return NS_OK;
|
|
|
f35d1b |
|
|
|
f35d1b |
GList *iterate = NULL;
|
|
|
f35d1b |
|
|
|
f35d1b |
@@ -670,7 +673,7 @@ NS_IMETHODIMP rhTray::Setmenuitemtext(PR
|
|
|
f35d1b |
i++;
|
|
|
f35d1b |
}
|
|
|
f35d1b |
|
|
|
f35d1b |
- return S_OK;
|
|
|
f35d1b |
+ return NS_OK;
|
|
|
f35d1b |
}
|
|
|
f35d1b |
|
|
|
f35d1b |
//rhTrayWindNotify methods
|
|
|
f35d1b |
diff -up ./esc/src/app/xul/esc/application.ini.fix17 ./esc/src/app/xul/esc/application.ini
|
|
|
f35d1b |
--- ./esc/src/app/xul/esc/application.ini.fix17 2013-06-17 18:48:27.243000000 -0400
|
|
|
f35d1b |
+++ ./esc/src/app/xul/esc/application.ini 2013-06-17 18:48:27.330000000 -0400
|
|
|
f35d1b |
@@ -25,11 +25,11 @@ Vendor=RedHat
|
|
|
f35d1b |
Name=ESC
|
|
|
f35d1b |
;
|
|
|
f35d1b |
; This field specifies your application's version. This field is optional.
|
|
|
f35d1b |
-Version=1.1.0-16
|
|
|
f35d1b |
+Version=1.1.0-19
|
|
|
f35d1b |
;
|
|
|
f35d1b |
; This field specifies your application's build ID (timestamp). This field is
|
|
|
f35d1b |
; required.
|
|
|
f35d1b |
-BuildID=0000001017
|
|
|
f35d1b |
+BuildID=0000001019
|
|
|
f35d1b |
;
|
|
|
f35d1b |
; This ID is just an example. Every XUL app ought to have it's own unique ID.
|
|
|
f35d1b |
; You can use the microsoft "guidgen" or "uuidgen" tools, or go on
|
|
|
f35d1b |
@@ -47,6 +47,6 @@ MinVersion=6.0.0
|
|
|
f35d1b |
; application requires. It should be specified if your application uses
|
|
|
f35d1b |
; unfrozen interfaces. Specifying 1.8 matches all releases with a version
|
|
|
f35d1b |
; prefixed by 1.8 (e.g., 1.8a4, 1.8b, 1.8.2).
|
|
|
f35d1b |
-MaxVersion=20.0.0
|
|
|
f35d1b |
+MaxVersion=22.0.0
|
|
|
f35d1b |
|
|
|
f35d1b |
[Shell]
|