[Fedora-directory-commits] esc/src/app/xpcom/tray rhTray.cpp, 1.6, 1.7

[Jack Magne (jmagne)]

Author: jmagne

Update of /cvs/dirsec/esc/src/app/xpcom/tray
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27477

Modified Files:
	rhTray.cpp 
Log Message:
Fix for Vista tray icon issue. #239755.



Index: rhTray.cpp
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xpcom/tray/rhTray.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rhTray.cpp	24 Feb 2007 02:05:13 -0000	1.6
+++ rhTray.cpp	9 Oct 2007 22:18:58 -0000	1.7
@@ -192,6 +192,7 @@
 /* void settooltipmsg (in string aMessage); */
 NS_IMETHODIMP rhTray::Settooltipmsg(const char *aMessage)
 {
+
     char tBuff[56];
     PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::Settooltipmsg %s  \n",GetTStamp(tBuff,56),aMessage));
 
@@ -467,7 +468,7 @@
 
                 PR_LOG( trayLog, PR_LOG_DEBUG, ("%s rhTray::WindowProc: WM_RBUTTONDOWN \n",GetTStamp(tBuff,56)));
 
-                HRESULT res = rhTray::ShowPopupMenu (IDR_MENU1);
+                HRESULT res =  rhTray::ShowPopupMenu (IDR_MENU1);
 
 
                 switch(res)
@@ -592,8 +593,10 @@
         unsigned int menuItemID = 0;
 
         int i = 0;
+
+        char buffer[256];
  
-        if(numItems == numMenuItems)
+        if(numItems == numMenuItems )
         {     
             for (i = 0 ;i < numMenuItems; i++)
             {
@@ -618,15 +621,18 @@
 
                    if( GetMenuItemInfo(hPopup,menuItemID,FALSE,&mii))
                    {
-                       char *tmpBuff = NULL;
-
-                       tmpBuff = strdup(itemText);
+                       buffer[0] = 0;
 
-                       mii.cch=strlen(itemText);
-                       mii.dwTypeData=tmpBuff;
+                       if(strlen(itemText) < 256)
+                       {
+                           strcpy(buffer,itemText);
+                       }
+
+                       mii.cch=strlen(buffer);
+                       mii.fType = MFT_STRING;
+                       mii.dwTypeData= buffer;
                        SetMenuItemInfo(hPopup,menuItemID,FALSE,&mii);
 
-                       free(tmpBuff);
                    }
                    else
                    {