[Winpt-commits] r104 - trunk/Src

[scm-commit at wald.intevation.org]

Author: twoaday
Date: 2005-11-29 10:48:43 +0100 (Tue, 29 Nov 2005)
New Revision: 104

Modified:
   trunk/Src/wptKeyManagerDlg.cpp
Log:
Forgot one localized string.
Fix compiler warnings.



Modified: trunk/Src/wptKeyManagerDlg.cpp
===================================================================
--- trunk/Src/wptKeyManagerDlg.cpp	2005-11-29 08:59:23 UTC (rev 103)
+++ trunk/Src/wptKeyManagerDlg.cpp	2005-11-29 09:48:43 UTC (rev 104)
@@ -752,16 +752,17 @@
         km_groups_load( gc );
 	#endif
 	SetClassLong (dlg, GCL_HICON, (LONG)LoadIcon (glob_hinst, (LPCTSTR)IDI_WINPT));
-        SetForegroundWindow (dlg);
 
 	kmi->statbar = setup_status_bar (dlg, kmi->lv);
-
         SetWindowLong (dlg, GWL_USERDATA, (LONG)kmi);
         kmi->toolbar = load_toolbar (dlg, kmi);
 
 	do_center_window (dlg, kmi);
         do_resize_window (dlg, kmi);
         update_ui_items (dlg, kmi->lv);
+	
+	SetDlgItemText (dlg, IDC_KEYMISC_GTEXT, _("Groups"));
+	SetForegroundWindow (dlg);
         return TRUE;
         
     case WM_DESTROY:
@@ -991,9 +992,9 @@
 
         case LVN_COLUMNCLICK:
 	    if (notify->idFrom == IDC_KEYMISC_KEYLIST) {
-                NMLISTVIEW * p = (LPNMLISTVIEW) lparam;
+                NMLISTVIEW * nml = (LPNMLISTVIEW) lparam;
                 int sortby = 0;
-                switch (p->iSubItem) {
+                switch (nml->iSubItem) {
                 case 0:  sortby = KEY_SORT_USERID; break;
                 case 1:  sortby = KEY_SORT_KEYID; break;
                 case 2:  sortby = KEY_SORT_IS_SECRET; break;
@@ -1039,8 +1040,8 @@
 
     case WM_INITMENUPOPUP:
 	if ((UINT)LOWORD (lparam) == 3) {
-	    HMENU hm = (HMENU)wparam;
-	    set_menu_text_bypos (hm, 0, _("New"));
+	    HMENU m = (HMENU)wparam;
+	    set_menu_text_bypos (m, 0, _("New"));
 	}
 	return FALSE;
 
@@ -1103,10 +1104,11 @@
             }
             
             {
-                char t[128];
-                listview_get_item_text( kmi->lv, idx, 5, t, sizeof t -1 );
-                if( strchr( t, 'R' ) ) {
-                    msg_box( dlg, _("Key already revoked!"), _("Key Manager"), MB_INFO );
+                char rinf[128];
+                listview_get_item_text (kmi->lv, idx, 5, rinf, sizeof (rinf) -1);
+                if (strchr (rinf, 'R')) {
+                    msg_box (dlg, _("Key already revoked!"), 
+			     _("Key Manager"), MB_INFO);
                     return TRUE;
                 }
             }
@@ -1184,15 +1186,15 @@
             
         case ID_KEYMISC_RECACHE:
             /* If there is already a reload request, don't bother the user with a message. */
-            if( keycache_get_reload() == 1 )
+            if (keycache_get_reload () == 1)
                 idx = IDYES;
             else {
-                char t[256];
-                _snprintf( t, sizeof t -1,
+                char inf[256];
+                _snprintf (inf, sizeof (inf) -1,
                            _("This is only useful when the keyring has been "
                              "modified (sign a key...).\n"
-                             "Do you really want to reload the keycache?") );
-                idx = msg_box( dlg, t, _("Key Manager"), MB_YESNO );
+                             "Do you really want to reload the keycache?"));
+                idx = msg_box (dlg, inf, _("Key Manager"), MB_YESNO);
             }
             if( idx == IDYES ) {
                 rcs.kr_reload = rcs.kr_update = 1;