[svn] GpgEX - r8 - trunk/src

[svn author marcus]

Author: marcus
Date: 2007-08-31 23:59:38 +0200 (Fri, 31 Aug 2007)
New Revision: 8

Modified:
   trunk/src/ChangeLog
   trunk/src/gpgex.cc
Log:
2007-08-31  Marcus Brinkmann  <marcus at g10code.de>

	* gpgex.cc (gpgex_t::QueryContextMenu): Fix menu separators.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2007-08-30 15:48:38 UTC (rev 7)
+++ trunk/src/ChangeLog	2007-08-31 21:59:38 UTC (rev 8)
@@ -1,3 +1,7 @@
+2007-08-31  Marcus Brinkmann  <marcus at g10code.de>
+
+	* gpgex.cc (gpgex_t::QueryContextMenu): Fix menu separators.
+
 2007-08-30  Marcus Brinkmann  <marcus at g10code.de>
 
 	* gpgex.h (ID_CMD_HELP, ID_CMD_VERIFY_DECRYPT)

Modified: trunk/src/gpgex.cc
===================================================================
--- trunk/src/gpgex.cc	2007-08-30 15:48:38 UTC (rev 7)
+++ trunk/src/gpgex.cc	2007-08-31 21:59:38 UTC (rev 8)
@@ -237,9 +237,7 @@
   if (uFlags & CMF_DEFAULTONLY)
     return TRACE_RES (MAKE_HRESULT (SEVERITY_SUCCESS, FACILITY_NULL, 0));
 
-  /* Windows puts a separator after our entries, but not before.  */
-  /* FIXME: Check error.  */
-  res = InsertMenu (hMenu, indexMenu++, MF_SEPARATOR | MF_BYPOSITION, 0, NULL);
+  res = InsertMenu (hMenu, indexMenu++, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
   if (! res)
     return TRACE_RES (HRESULT_FROM_WIN32 (GetLastError ()));
   
@@ -280,6 +278,10 @@
       return TRACE_RES (HRESULT_FROM_WIN32 (last_error));
     }
 
+  res = InsertMenu (hMenu, indexMenu++, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
+  if (! res)
+    return TRACE_RES (HRESULT_FROM_WIN32 (GetLastError ()));
+
   res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_STRING,
 		    idCmdFirst + ID_CMD_VERIFY_DECRYPT,
 		    ID_CMD_STR_VERIFY_DECRYPT);
@@ -295,11 +297,10 @@
     res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_STRING,
 		      idCmdFirst + ID_CMD_IMPORT, ID_CMD_STR_IMPORT);
   if (res)
-    res = InsertMenu (hMenu, idx++, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
+    res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
   if (res)
     res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_STRING,
 		      idCmdFirst + ID_CMD_HELP, ID_CMD_STR_HELP);
-
   if (! res)
     return TRACE_RES (HRESULT_FROM_WIN32 (GetLastError ()));