Author: jmagne
Update of /cvs/dirsec/esc/src/app/xpcom/tray
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10953/src/app/xpcom/tray
Modified Files:
Tag: PKI_8_0_RTM_BRANCH
Makefile.sdk rhMacTray.cpp
Log Message:
Bug 369031 - ESC incompatible with OS X Leopard.
Index: Makefile.sdk
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/Makefile.sdk,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- Makefile.sdk 18 Apr 2009 23:25:14 -0000 1.2
+++ Makefile.sdk 16 Mar 2010 23:12:51 -0000 1.2.2.1
@@ -43,6 +43,7 @@
ifndef GECKO_SDK_PATH
GECKO_SDK_PATH =/Users/jmagne/Desktop/gecko-sdk-mac-universal
endif
+GECKO_SDK_INCLUDE_PATH=$(GECKO_SDK_PATH)/sdk/include
GECKO_INCLUDE_PATH=$(GECKO_SDK_PATH)/include
GECKO_BIN_PATH=$(GECKO_SDK_PATH)/bin
ifndef XUL_FRAMEWORK_PATH
@@ -113,7 +114,7 @@
ifeq ($(OS_ARCH),Darwin)
ifdef PPC_BUILD
-CXX = c++-3.3
+CXX = c++-4.0
CPPFLAGS += -arch ppc
else
CPPFLAGS += -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386
@@ -140,7 +141,7 @@
COOLKEY_LIBS+= -L $(CORE_DIST)/lib -ltraynotify -L/usr/lib $(NOTIFY_LDFLAGS)
ifeq ($(OS_ARCH),Darwin)
-GECKO_LD_LIBS=-W1,dead_strip $(GECKO_SDK_PATH)/lib/libxpcomglue.a
-Wl,-executable_path,$(GECKO_SDK_PATH)/lib -lxpcom -L$(XUL_FRAMEWORK_BIN_PATH) -lssl3
-lnssutil3 -lsqlite3 -lnss3 -lsoftokn3 -lsmime3
+GECKO_LD_LIBS=-W1,dead_strip $(GECKO_SDK_PATH)/lib/libxpcomglue_s.a
-Wl,-executable_path,$(GECKO_SDK_PATH)/lib -lxpcom
endif
ifeq ($(OS_ARCH),WINNT)
@@ -164,7 +165,7 @@
NSPR_INCLUDE = /usr/include/nspr4
-GECKO_INCLUDES = -I $(GECKO_SDK_PATH)/include -I $(GECKO_SDK_INCLUDE_PATH) -I
$(GECKO_INCLUDE_PATH) -I$(GECKO_INCLUDE_PATH)/gfx -I $(NSPR_INCLUDE) -I $(NSS_INCLUDE) -I
$(GECKO_INCLUDE_PATH)/xpcom
+GECKO_INCLUDES = -I $(GECKO_SDK_PATH)/include -I $(GECKO_SDK_INCLUDE_PATH) -I
$(GECKO_INCLUDE_PATH) -I$(GECKO_INCLUDE_PATH)/gfx -I $(NSPR_INCLUDE) -I $(NSS_INCLUDE) -I
$(GECKO_INCLUDE_PATH)/xpcom -I $(GECKO_INCLUDE_PATH)/nspr
COOL_INCLUDES = -I $(CORE_INC)/ckymanager -I $(CORE_INC)/httpchuncked
@@ -200,7 +201,7 @@
endif
-GECKO_LDFLAGS= -lnspr4 \
+GECKO_LDFLAGS= -L$(GECKO_SDK_PATH)/lib -lnspr4 \
-lplds4 -lplc4 -ldl -lpthread \
$(GECKO_LD_LIBS)
Index: rhMacTray.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/rhMacTray.cpp,v
retrieving revision 1.5
retrieving revision 1.5.6.1
diff -u -r1.5 -r1.5.6.1
--- rhMacTray.cpp 24 Feb 2007 02:04:32 -0000 1.5
+++ rhMacTray.cpp 16 Mar 2010 23:12:51 -0000 1.5.6.1
@@ -26,7 +26,6 @@
int rhTray::mInitialized = 0;
WindowRef rhTray::mWnd = NULL;
MenuRef rhTray::mDockMenu = NULL;
-MenuRef rhTray::mRootMenu = NULL;
ProcessSerialNumber rhTray::mPSN;
EventHandlerRef rhTray::mEventHandlerRef=NULL;
EventHandlerUPP rhTray::mEventHandlerUPP=NULL;
@@ -260,43 +259,6 @@
}
}
- MenuRef tGoMenu;
- ::CreateNewMenu(1,0,&tGoMenu);
-
- if(tGoMenu)
- {
- SetMenuID (tGoMenu,GO_MENU_ID);
- }
- else
- {
- return S_OK;
- }
-
- MenuRef tRootMenu;
- ::CreateNewMenu(0, 0, &tRootMenu);
-
- if(!tRootMenu)
- {
- return S_OK;
- }
-
- MenuItemIndex goItem;
-
- ::AppendMenuItemTextWithCFString( tGoMenu, CFSTR("Show Manage Smart
Cards"), 0,MENU_ITEM_ID_BASE , &goItem );
-
- ::SetMenuTitleWithCFString( tGoMenu, CFSTR("Go") );
-
- OSStatus rootResult = ::SetRootMenu(tRootMenu);
-
- if(rootResult == noErr)
- {
- mRootMenu = AcquireRootMenu();
-
- MenuItemIndex myMenuIndex;
- AppendMenuItemTextWithCFString( tRootMenu, NULL, 0, 0, &myMenuIndex );
- SetMenuItemHierarchicalMenu(tRootMenu, myMenuIndex, tGoMenu);
- }
-
mInitialized = 1;
return S_OK;
}
@@ -329,21 +291,16 @@
if(mDockMenu)
{
- ::ReleaseMenu(mDockMenu);
+ ::DisposeMenu(mDockMenu);
}
MenuRef goMenu = GetMenuHandle (GO_MENU_ID);
if(goMenu)
{
- ::ReleaseMenu(goMenu);
+ ::DisposeMenu(goMenu);
}
- if(mRootMenu)
- {
- ::ReleaseMenu(mRootMenu);
- }
-
return S_OK;
}
@@ -755,7 +712,6 @@
case kHICommandQuit:
PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::ApplicationProc App
kHICommandQuit! \n",GetTStamp(tBuff,56)));
-
break;
case MENU_ITEM_ID_BASE: