Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.9, 0.9.1, and 0.9.1.1

merge with stable

Changeset c3ea4b949391…

Parents 7fc45062a3b4…

Parents 887a043dd524…

by Steve Borho

Changes to 4 files · Browse files at c3ea4b949391 Showing diff from parent 7fc45062a3b4 887a043dd524 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​thgconfig.py Stacked
 
978
979
980
 
 
981
982
983
984
985
986
987
988
989
 
978
979
980
981
982
983
984
985
986
 
 
987
988
989
@@ -978,12 +978,12 @@
  f = open(self.fn, "w")   f.write(str(self.ini))   f.close() + self._btn_apply.set_sensitive(False) + self.dirty = False   except IOError, e:   dialog.error_dialog(self, _('Unable to write configuration file'),   str(e))   - self._btn_apply.set_sensitive(False) - self.dirty = False   return 0    def run(ui, *pats, **opts):
Change 1 of 1 Show Entire File win32/​shellext/​IconOverlay.cpp Stacked
 
7
8
9
10
11
 
 
12
 
 
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
 
 
33
34
35
 
36
37
38
 
7
8
9
 
 
10
11
12
13
14
15
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
16
17
18
19
20
21
22
23
24
@@ -7,32 +7,18 @@
 #include <shlwapi.h>     -STDMETHODIMP CShellExt::GetOverlayInfo(LPWSTR pwszIconFile, int cchMax, - int *pIndex, DWORD *pdwFlags) +STDMETHODIMP CShellExt::GetOverlayInfo( + LPWSTR pwszIconFile, int cchMax, int *pIndex, DWORD *pdwFlags)  { + TDEBUG_TRACE("CShellExt::GetOverlayInfo: myTortoiseClass = " << myTortoiseClass); + // icons are determined by TortoiseOverlays shim   *pIndex = 0; - *pdwFlags = ISIOI_ICONFILE; - - // get installation path - std::string dir = GetTHgProgRoot(); - if (dir.empty()) - { - TDEBUG_TRACE("GetOverlayInfo: THG root is empty"); - wcsncpy(pwszIconFile, L"", cchMax); - return S_OK; - } - - // find icon per overlay type - std::wstring dirWide = MultibyteToWide(dir); - wcsncpy(pwszIconFile, dirWide.c_str(), cchMax); - cchMax -= static_cast<int>(dirWide.size()) + 1; - - std::string path = WideToMultibyte(pwszIconFile); - TDEBUG_TRACE("GetOverlayInfo: icon path = " << path); - + *pdwFlags = 0; + *pwszIconFile = 0;   return S_OK;  }   +  STDMETHODIMP CShellExt::GetPriority(int *pPriority)  {   *pPriority = 1;
Change 1 of 1 Show Entire File win32/​shellext/​ShellExt.cpp Stacked
 
39
40
41
42
43
44
45
46
 
39
40
41
 
 
42
43
44
@@ -39,8 +39,6 @@
 extern "C"  int APIENTRY DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)  { - TDEBUG_TRACE("DllMain"); -   if (dwReason == DLL_PROCESS_ATTACH)   {   TDEBUG_TRACE("DllMain: DLL_PROCESS_ATTACH");
Change 1 of 1 Show Entire File win32/​shellext/​Thgstatus.cpp Stacked
 
47
48
49
50
 
51
52
53
 
47
48
49
 
50
51
52
53
@@ -47,7 +47,7 @@
    fSuccess = ::CallNamedPipeA(   pname.c_str(), (void*)request.c_str(), request.size(), 0, 0, &cbRead, - 200 /* ms */ + NMPWAIT_NOWAIT   );     DWORD err = GetLastError();