Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

merge with Adrian

Changeset a77b80f99a18…

Parents 800a8c5b63d8…

Parents ad76bdbc5ceb…

by Steve Borho

Changes to 3 files · Browse files at a77b80f99a18 Showing diff from parent 800a8c5b63d8 ad76bdbc5ceb Diff from another changeset...

Change 1 of 1 Show Entire File thgtaskbar.py Stacked
 
317
318
319
 
 
320
321
 
322
323
324
 
317
318
319
320
321
322
 
323
324
325
326
@@ -317,8 +317,10 @@
  update(args, hwnd)   elif cmd == 'remove':   remove(args) + elif cmd == 'error': + logger.msg("**** Error: %s" % args[0])   else: - logger.msg("Error: unknown request '%s'" % req) + logger.msg("**** Error: unknown request '%s'" % req)    class Updater(threading.Thread):   def __init__(self, hwnd):
Change 1 of 2 Show Entire File win32/​shellext/​InitStatus.cpp Stacked
 
17
18
19
 
20
21
22
 
51
52
53
54
55
 
 
 
56
57
58
 
17
18
19
20
21
22
23
 
52
53
54
 
 
55
56
57
58
59
60
@@ -17,6 +17,7 @@
 #include "stdafx.h"    #include "InitStatus.h" +#include "Thgstatus.h"      InitStatus& InitStatus::inst() @@ -51,8 +52,9 @@
  if (missing.empty())   return "";   - std::string res = "InitStatus: error: uninitialized handlers: "; - res += missing; + std::string reason = "uninitialized handlers: " + missing; + Thgstatus::error(reason); + std::string res = "InitStatus: error: " + reason;   TDEBUG_TRACE("***** " << res);   return res;  }
Change 1 of 1 Show Entire File win32/​shellext/​Thgstatus.h Stacked
 
30
31
32
 
 
 
33
34
35
 
30
31
32
33
34
35
36
37
38
@@ -30,6 +30,9 @@
  static int remove(const std::string& path) {   return SendRequest("remove|" + path);   } + static int error(const std::string& text) { + return SendRequest("error|" + text); + }  };    #endif