diff options
| author |  Voker57 | 2008-06-25 18:15:22 +0000 |
|---|---|---|
| committer | Voker57 | 2008-06-25 18:15:22 +0000 |
| commit | 69b2ca0559b7caa73fd4a53048188f9ce2007f15 (patch) | |
| tree | 4ff230bd8fdd69cb49302f138f2c8825302ddf5e /src/modules/spaste/libkvispaste.cpp | |
| parent | more tree taskbar porting; all features should work except selection highligh... (diff) | |
| download | KVIrc-69b2ca0559b7caa73fd4a53048188f9ce2007f15.tar.gz KVIrc-69b2ca0559b7caa73fd4a53048188f9ce2007f15.tar.bz2 KVIrc-69b2ca0559b7caa73fd4a53048188f9ce2007f15.zip | |
Up-porting fixes from 3.4
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1948 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/spaste/libkvispaste.cpp')
| -rw-r--r-- | src/modules/spaste/libkvispaste.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp index fc6a76c0c..d6281399d 100644 --- a/src/modules/spaste/libkvispaste.cpp +++ b/src/modules/spaste/libkvispaste.cpp @@ -100,8 +100,8 @@ static bool spaste_kvs_cmd_file(KviKvsModuleCommandCall * c) KVSM_PARAMETERS_END(c) KviWindow * window = spaste_kvs_find_window(szWindow,c); - if( (!window) || window->console()->isNotConnected())return false; - + if(!window)return false; + // FIXME //if(szFile.isEmpty() || (!KviFileUtils::fileExists(szFile.toAscii()))) if(szFile.isEmpty() || (!KviFileUtils::fileExists(szFile))) @@ -158,8 +158,8 @@ static bool spaste_kvs_cmd_clipboard(KviKvsModuleCommandCall * c) KVSM_PARAMETER("window",KVS_PT_STRING,KVS_PF_OPTIONAL,szWindow) KVSM_PARAMETERS_END(c) KviWindow * window = spaste_kvs_find_window(szWindow,c); - if( (!window) || window->console()->isNotConnected())return false; - + if(!window)return false; + SPasteController * controller = spaste_find_controller(window); if(!controller)controller = new SPasteController(window,++ctrlId); controller->pasteClipboardInit(); @@ -227,7 +227,7 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c) } } else { //Delete the spaste with the given id - while( (item = it.current()) != 0) + while( (item = it.current()) != 0) { ++it; if(item->getId() == iId)delete item; @@ -307,7 +307,7 @@ static bool spaste_kvs_cmd_setdelay(KviKvsModuleCommandCall * c) return true; } -//------------------------------------------------- +//------------------------------------------------- static bool spaste_module_init(KviModule * m) { g_pControllerList = new KviPointerList<SPasteController>; |