From 69b2ca0559b7caa73fd4a53048188f9ce2007f15 Mon Sep 17 00:00:00 2001 From: Voker57 Date: Wed, 25 Jun 2008 18:15:22 +0000 Subject: Up-porting fixes from 3.4 git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1948 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/spaste/libkvispaste.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/modules/spaste/libkvispaste.cpp') 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; -- cgit v1.3.1-10-gc9f91