Browse Source

Misc.

master
boisso 7 years ago
parent
commit
ed8eae6abd
  1. 5
      k-meleon/BrowserGlue.cpp
  2. 2
      k-meleon/KMeleonConst.h
  3. 8
      k-meleon/KmSkin.cpp
  4. 2
      k-meleon/Plugins.cpp
  5. 24
      k-meleon/op_hotlist/op_file.cpp

5
k-meleon/BrowserGlue.cpp

@ -611,6 +611,11 @@ bool CBrowserGlue::performXULCommand(LPCWSTR id, LPCTSTR siteUri)
mpBrowserFrame->SendMessage(WM_COMMAND, (WPARAM)nid, 0L);
return true;
}
nsCOMPtr<nsICommandManager> manager(do_GetService(NS_COMMAND_MANAGER_CONTRACTID));
nsCOMPtr<nsIDOMWindow> dom = mpBrowserView->GetBrowserWrapper()->GetContentWindow();
if (NS_SUCCEEDED(manager->DoCommand(CStringToNSUTF8String(id).get(), nullptr, dom)))
return true;
}
return false;

2
k-meleon/KMeleonConst.h

@ -17,7 +17,7 @@
*/
#define KMELEON_VERSION 0x02010004
#define KMELEON_VERSION 0x02010006
#define MOZILLA_BUILDID 20140105
#define KMELEON_BUILDID 7500
#define KMELEON_UVERSION 75.0

8
k-meleon/KmSkin.cpp

@ -206,6 +206,14 @@ bool KmSkin::FindSkinFile( CString& szSkinFile, LPCTSTR filename, LPCTSTR skin,
// Fallback to shared
if (searchUser) {
file = theApp.GetFolder(UserSkinsFolder) + _T("\\shared\\") + filename;
hFile = FindFirstFile(file, &FindData);
if(hFile != INVALID_HANDLE_VALUE) {
FindClose(hFile);
szSkinFile = file;
return true;
}
file = theApp.GetFolder(SkinsFolder) + _T("\\shared\\") + filename;
hFile = FindFirstFile(file, &FindData);
if(hFile != INVALID_HANDLE_VALUE) {

2
k-meleon/Plugins.cpp

@ -1939,7 +1939,7 @@ bool SetButton(const char* name, UINT id, kmeleonButton* button)
b->mColdImage = A2CT(button->coldimage);
t->Refresh();
}
theApp.PostThreadMessage(WM_KICKIDLE, 0, 0);
return true;
}

24
k-meleon/op_hotlist/op_file.cpp

@ -517,19 +517,27 @@ int SaveHotlist(FILE *bmFile, CBookmarkNode *node)
if (type == BOOKMARK_FOLDER) {
char *pszTmp;
fprintf(bmFile, "#FOLDER%s", EOL);
if (child->id_opera>0)
fprintf(bmFile, "\tID=%ld%s", child->id_opera, EOL);
if (child->id_opera>0) {
fprintf(bmFile, "\tID=%ld", child->id_opera);
fprintf(bmFile, EOL);
}
pszTmp = kPlugin.kFuncs->EncodeUTF8((char*)child->text.c_str());
fprintf(bmFile, "\tNAME=%s%s", (pszTmp && *pszTmp) ? pszTmp : (char*)child->text.c_str(), EOL);
if (pszTmp)
free(pszTmp);
if (child->addDate>0)
fprintf(bmFile, "\tCREATED=%ld%s", child->addDate, EOL);
if (child->lastVisit>0)
fprintf(bmFile, "\tVISITED=%ld%s", child->lastVisit, EOL);
if (child->order!=-1)
fprintf(bmFile, "\tORDER=%ld%s", child->order, EOL);
if (child->addDate>0) {
fprintf(bmFile, "\tCREATED=%ld", child->addDate);
fprintf(bmFile, EOL);
}
if (child->lastVisit>0) {
fprintf(bmFile, "\tVISITED=%ld", child->lastVisit);
fprintf(bmFile, EOL);
}
if (child->order!=-1) {
fprintf(bmFile, "\tORDER=%ld", child->order);
fprintf(bmFile, EOL);
}
if (child->desc.length()>0 && (pszTmp = kPlugin.kFuncs->EncodeUTF8((char*)child->desc.c_str()))) {
fprintf(bmFile, "\tDESCRIPTION=%s%s", pszTmp, EOL);

Loading…
Cancel
Save