summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--UCore.pas11
-rw-r--r--UCoreUtils.pas7
-rw-r--r--UEngines.pas1
-rw-r--r--UFileTypeSettings.pas3
-rw-r--r--UGnome.pas12
-rw-r--r--UMain.pas25
-rw-r--r--URunFromVFS.pas1
-rw-r--r--USearch.pas8
-rw-r--r--UToolTips.pas1
-rw-r--r--UViewer.pas7
-rw-r--r--libgtk_kylix/GTKExtCtrls.pas6
-rw-r--r--vfs/UVFSCore.pas3
12 files changed, 40 insertions, 45 deletions
diff --git a/UCore.pas b/UCore.pas
index cc298ea..447392a 100644
--- a/UCore.pas
+++ b/UCore.pas
@@ -120,7 +120,7 @@ type TWorkerThread = class(TThread)
end;
TOpenDirThread = class(TThread)
- private
+ protected
procedure Execute; override;
public
AEngine: TPanelEngine;
@@ -410,7 +410,6 @@ function ChangeDir(Engine: TPanelEngine; Path: string; var SelItem: string; cons
var APath: string;
Error : integer;
begin
- Result := 1;
try
APath := Engine.Path;
if Path = '..' then GoUp(APath)
@@ -585,6 +584,7 @@ end;
// Return False to break the process
function CopyFilesWorker_ProgressFunc(Sender: Pointer; BytesDone: Int64): boolean; cdecl;
begin
+ Result := True;
// DebugMsg(['*** CopyFilesWorker: ProgressFunc called (Sender=', QWord(Sender), ', BytesDone=', BytesDone, ')']);
try
if Assigned(Sender) and (TObject(Sender) is TWorkerThread) then
@@ -726,6 +726,7 @@ var DefResponse: integer; // Global variables for this function
function LocalCopyFile(SourceFile, DestFile: string; Append: boolean): boolean;
var DataSrc, DataDest: PDataItemSL;
begin
+ Result := False;
try
with SenderThread do begin
if ((SrcEngine is TLocalTreeEngine) and (DestEngine is TLocalTreeEngine)) or
@@ -774,10 +775,10 @@ var DefResponse: integer; // Global variables for this function
function DoOperation(AFileRec: PDataItemSL; const Dst: string; var ErrorKind: integer; const Append: boolean): integer;
begin
- try
ErrorKind := 0;
Result := 0;
- with SenderThread do
+ try
+ with SenderThread do
with AFileRec^ do begin
if IsLnk then begin
// Explicit copy the file
@@ -2698,8 +2699,8 @@ var Handle : PDIR;
StatBuf : Pstat64;
Buf : PChar;
begin
+ Result := True;
try
- Result := True;
APath := IncludeTrailingPathDelimiter(APath);
Handle := opendir(PChar(APath));
if not Assigned(Handle) then begin
diff --git a/UCoreUtils.pas b/UCoreUtils.pas
index ed697d5..8865290 100644
--- a/UCoreUtils.pas
+++ b/UCoreUtils.pas
@@ -1245,6 +1245,7 @@ begin
if Length(Args) = 0 then Exit;
for x := 0 to Length(Args) - 1 do Args[x] := RemoveQuotation(Args[x]);
DebugMsg(['**** Running spawn']);
+ x := -1;
try
x := SpawnProcess(Args[0], Running, Args);
except
@@ -1356,10 +1357,10 @@ begin
// forked PID
else begin
+ args_list := nil;
try
SplitArgs(Parameters, Command);
// Fill the args_list array
- args_list := nil;
if Length(Parameters) > 0 then begin
args_list := malloc((Length(Parameters) + 1) * SizeOf(PChar));
memset(args_list, 0, (Length(Parameters) + 1) * SizeOf(PChar));
@@ -1904,7 +1905,7 @@ end;
(********************************************************************************************************************************)
procedure signal_proc(signal_number: integer); cdecl;
-var pid, status: integer;
+var {pid,} status: integer;
begin
// !!!!!!!!!! Warning
// There should be no debug outputs in this function because it probably cause program freezes after fork
@@ -1923,7 +1924,7 @@ begin
SIGCHLD, SIGUSR1: begin
// DebugMsg(['begin wait']);
// wait(@status);
- pid := waitpid(-1, @status, WNOHANG);
+ {pid :=} waitpid(-1, @status, WNOHANG);
// DebugMsg(['**** waitpid result: pid = ', pid, ', status = ', status]);
// DebugMsg(['end wait']);
if signal_number = SIGUSR1 then ChildExitStatus := status;
diff --git a/UEngines.pas b/UEngines.pas
index 1c51a62..5121947 100644
--- a/UEngines.pas
+++ b/UEngines.pas
@@ -275,7 +275,6 @@ begin
if (Buf <> '.') and (Buf <> '..') and (DirEnt^.d_name[0] <> #0) and
(AddDotFiles or (Length(Buf) = 1) or ((Length(Buf) > 1) and (not ((Buf[0] = '.') and (Buf[1] <> '.'))))) then
begin
- Item := nil;
// DebugMsg(['x5']);
Item := malloc(SizeOf(TDataItem));
// DebugMsg(['x6']);
diff --git a/UFileTypeSettings.pas b/UFileTypeSettings.pas
index 03eda53..89189ab 100644
--- a/UFileTypeSettings.pas
+++ b/UFileTypeSettings.pas
@@ -611,8 +611,7 @@ begin
end;
procedure TFFileTypeSettings.RemoveExtButtonClick(Sender: TObject);
-var s: string;
- i: integer;
+var i: integer;
Assoc: TFileAssoc;
begin
try
diff --git a/UGnome.pas b/UGnome.pas
index 2ed094a..b4070d2 100644
--- a/UGnome.pas
+++ b/UGnome.pas
@@ -717,7 +717,7 @@ terminal_notebook_move_tab (TerminalNotebook *src,
} *)
procedure TEphyNotebook.drag_stop(time: guint32);
-var toplevel, child: PGtkWidget;
+var toplevel{, child}: PGtkWidget;
drag_stop_idx: integer;
begin
DebugMsg(['@######## drag_stop']);
@@ -837,15 +837,15 @@ end;
function toplevel_button_release_cb(widget: PGtkWidget; event: PGdkEventButton; data: gpointer): gboolean; cdecl;
var ntb: TEphyNotebook;
- cur_page_num: integer;
- cur_page: PGtkWidget;
+// cur_page_num: integer;
+// cur_page: PGtkWidget;
begin
DebugMsg(['@######## toplevel_button_release_cb(..., data = 0x', IntToHex(Integer(data), 8), ')']);
ntb := TEphyNotebook(data);
if ntb.drag_in_progress then begin
- cur_page_num := gtk_notebook_get_current_page(GTK_NOTEBOOK(ntb.FWidget));
- cur_page := gtk_notebook_get_nth_page(GTK_NOTEBOOK(ntb.FWidget), cur_page_num);
+// cur_page_num := gtk_notebook_get_current_page(GTK_NOTEBOOK(ntb.FWidget));
+// cur_page := gtk_notebook_get_nth_page(GTK_NOTEBOOK(ntb.FWidget), cur_page_num);
(* if (!is_in_notebook_window (notebook, event->x_root, event->y_root)
&& gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook)) > 1)
@@ -1065,9 +1065,9 @@ function button_press_cb(notebook: PGtkWidget; event: PGdkEventButton; data: gpo
var tab_clicked: integer;
ntb: TEphyNotebook;
begin
+ Result := False;
ntb := TEphyNotebook(data);
if ntb.FBusy then Exit;
- Result := False;
DebugMsg(['@######## button_press_cb(..., data = 0x', IntToHex(Integer(data), 8), ')']);
tab_clicked := ntb.find_tab_num_at_pos(Trunc(event^.x_root), Trunc(event^.y_root));
diff --git a/UMain.pas b/UMain.pas
index fd11934..c1496af 100644
--- a/UMain.pas
+++ b/UMain.pas
@@ -1642,7 +1642,7 @@ procedure TFMain.ChangingDir(LeftPanel: boolean; NewPath: string; HiliString1: s
var ListView: TGTKListView;
Engine: TPanelEngine;
s, ss: string;
- i, Sel, Err: integer;
+ i, Sel: integer;
b, bb: boolean;
tt: TDateTime;
DataList, DirList: TList;
@@ -2173,8 +2173,6 @@ var s: PChar;
AFGColor, ABGColor: PGdkColor;
{ Rect, VisibleRect: TGdkRectangle; }
begin
- AFGColor := nil;
- ABGColor := nil;
if Application.GTKVersion_2_0_5_Up then ColumnIdx := gtk_tree_view_column_get_sort_column_id(tree_column) else
begin
ColumnIdx := 0;
@@ -2496,7 +2494,6 @@ var i: integer;
AWorkingThread: TWorkerThread;
AFProgress: TFProgress;
CurrentEngine, OppositeEngine: TPanelEngine;
- s: string;
p: PChar;
BypassSelAll: boolean;
begin
@@ -3369,10 +3366,6 @@ procedure TFMain.EditViewFile(LeftPanel: boolean; AListView: TGTKListView; View,
var ANewDir: TFNewDir;
Engine: TPanelEngine;
AFile: string;
- Stat: PDataItemSL;
- Error, x: integer;
-// AViewer: TViewerThread;
- AViewer: TFViewer;
begin
try
InternalLock;
@@ -3524,7 +3517,7 @@ begin
end else begin
if Engine is TVFSEngine then begin
HandleRunFromArchive(Path, Engine, Command, FileTypeDesc, False);
- b := True;
+// b := True;
end else
if Application.MessageBox(Format(LANGThereIsNoApplicationAssociatedWithS, [StrToUTF8(ExtractFileName(Path))]), [mbYes, mbNo], mbQuestion, mbNone, mbNo) = mbYes
then miFileTypesClick(Self);
@@ -4280,7 +4273,7 @@ procedure TFMain.FilePopupMenuItemClick(Sender: TObject);
var Engine: TPanelEngine;
DataItem: PDataItemSL;
AListView: TGTKListView;
- FileName, ShortFName, s, APath: string;
+ FileName, ShortFName, s: string;
Error: integer;
b: boolean;
begin
@@ -5703,6 +5696,7 @@ var LeftPanel: boolean;
DontShowAgain: boolean;
dst_no: integer;
begin
+ Result := False;
DontShowAgain := False;
DebugMsg([' *** NotebookMoveTabToAnotherNotebook(SourceTabNo = ', SourceTabNo, ', DestTabNo = ', DestTabNo, ')']);
LeftPanel := Sender = LeftPanelNotebook;
@@ -6208,15 +6202,15 @@ begin
Engine.Path := ExtractFilePath(APath);
// Extract the files
+ LocalEngine := TLocalTreeEngine.Create;
+ AFProgress := TFProgress.Create(Self);
+ AWorkingThread := TWorkerThread.Create;
try
- AWorkingThread := TWorkerThread.Create;
DebugMsg(['TFMain.HandleRunFromArchive: Creating thread...']);
- AFProgress := TFProgress.Create(Self);
AFProgress.Label1.Caption := LANGCopySC;
AFProgress.SetNumBars(True);
AFProgress.ProgressBar.Value := 0;
AWorkingThread.ProgressForm := AFProgress;
- LocalEngine := TLocalTreeEngine.Create;
LocalEngine.SetPath(tmp);
AWorkingThread.ExtractFromVFSMode := True;
AWorkingThread.DestEngine := LocalEngine;
@@ -6248,10 +6242,10 @@ begin
AFProgress.Close;
Result := {(not AWorkingThread.Cancelled) and} (not AWorkingThread.ErrorHappened);
finally
- AFProgress.Free;
DebugMsg(['TFMain.HandleRunFromArchive: Freeing thread...']);
- AWorkingThread.Free;
LocalEngine.Free;
+ AFProgress.Free;
+ AWorkingThread.Free;
end;
DebugMsg(['(II) HandleRunFromArchive: Old path = ', APath]);
@@ -6279,6 +6273,7 @@ end;
function TFMain.HandleSetPassword(Engine: TPanelEngine): boolean;
begin
+ Result := False;
if not (Engine is TVFSEngine) then Exit;
try
FSetPassword := TFSetPassword.Create(Self);
diff --git a/URunFromVFS.pas b/URunFromVFS.pas
index 393fbb9..a1309ff 100644
--- a/URunFromVFS.pas
+++ b/URunFromVFS.pas
@@ -60,7 +60,6 @@ uses ULocale, UConfig;
procedure TFRunFromVFS.FormCreate(Sender: TObject);
-var i: integer;
begin
// SetDefaultSize(55, 40);
Caption := LANGFRunFromVFS_Caption;
diff --git a/USearch.pas b/USearch.pas
index 2859de4..d09c330 100644
--- a/USearch.pas
+++ b/USearch.pas
@@ -557,20 +557,21 @@ begin
end;
procedure TFSearch.ViewButtonClick(Sender: TObject);
-var AViewer: TViewerThread;
- AEngine: TPanelEngine;
+var AEngine: TPanelEngine;
Plugin: TVFSPlugin;
b: boolean;
archive, s: string;
i, j: integer;
begin
if not (Assigned(FileList.Selected) and Assigned(FileList.Selected.AsPointer(0))) then Exit;
+ AEngine := nil;
if Assigned(PDataItem(FileList.Selected.AsPointer(0))^.LnkPointTo) then begin
archive := string(PDataItem(FileList.Selected.AsPointer(0))^.LnkPointTo);
b := False;
s := ANSIUpperCase(Trim(Copy(archive, LastDelimiter('.', archive) + 1, Length(archive) - LastDelimiter('.', archive))));
if (Length(s) > 1) and (s[1] = '.') then Delete(s, 1, 1);
- if PluginList.Count > 0 then
+ if PluginList.Count > 0 then begin
+ Plugin := nil;
for i := 0 to PluginList.Count - 1 do begin
Plugin := TVFSPlugin(PluginList[i]);
if Length(Plugin.Extensions) > 0 then
@@ -587,6 +588,7 @@ begin
(AEngine as TVFSEngine).ArchiveMode := True;
b := b and ((AEngine as TVFSEngine).VFSOpenEx(archive) = 0);
end;
+ end;
end else begin
AEngine := TLocalTreeEngine.Create;
b := True;
diff --git a/UToolTips.pas b/UToolTips.pas
index 2ad128f..d7d2a42 100644
--- a/UToolTips.pas
+++ b/UToolTips.pas
@@ -367,6 +367,7 @@ end;
function tips_button_press_event(widget: PGtkWidget; event: PGdkEventButton; user_data: gpointer): gboolean; cdecl;
var FSelection: PGtkTreeSelection;
begin
+ Result := True;
if not Assigned(data_panel) then Exit;
if not Assigned(data_row) then begin
FileListTipsHide;
diff --git a/UViewer.pas b/UViewer.pas
index ae56d2c..d97a16d 100644
--- a/UViewer.pas
+++ b/UViewer.pas
@@ -143,10 +143,9 @@ end;
procedure smooth_scroll(adj: PGtkAdjustment; dest_value: Double; PageScroll: boolean);
var increment, val: Double;
- i, x: integer;
+ i: gulong;
timer: PGTimer;
- microseconds: gulong;
- dur, st: integer;
+ microseconds, dur, st: gulong;
begin
if gtk_adjustment_get_value(adj) = dest_value then Exit;
if not ConfUseSmoothScrolling then begin
@@ -168,7 +167,6 @@ begin
// DebugMsg(['Start value ', val]);
i := 1;
- x := 0;
g_timer_start(timer);
repeat
g_timer_elapsed(timer, @microseconds);
@@ -179,7 +177,6 @@ begin
Inc(i);
end;
gdk_window_process_all_updates;
- Inc(x);
usleep(100);
until (microseconds div 1000) > dur;
gtk_adjustment_set_value(adj, dest_value);
diff --git a/libgtk_kylix/GTKExtCtrls.pas b/libgtk_kylix/GTKExtCtrls.pas
index 8426d02..2156dcf 100644
--- a/libgtk_kylix/GTKExtCtrls.pas
+++ b/libgtk_kylix/GTKExtCtrls.pas
@@ -1,6 +1,6 @@
(*
GTK-Kylix Library: GTKExtCtrls - Extended visual controls
- Version 0.6.22 (last updated 2004-11-20)
+ Version 0.6.23 (last updated 2008-08-23)
Copyright (C) 2004 Tomas Bzatek <tbzatek@users.sourceforge.net>
This library is free software; you can redistribute it and/or
@@ -142,8 +142,8 @@ type
procedure SetShowBorder(Value: boolean);
procedure SetScrollable(Value: boolean);
public
- constructor Create(AOwner: TComponent); virtual;
- destructor Destroy; virtual;
+ constructor Create(AOwner: TComponent); override;
+ destructor Destroy; override;
function AppendPage(Child: TGTKControl; Caption: string): integer;
procedure RemovePage(PageNo: integer);
function GetCaption(PageNo: integer): string;
diff --git a/vfs/UVFSCore.pas b/vfs/UVFSCore.pas
index eafc2ef..4dd00b1 100644
--- a/vfs/UVFSCore.pas
+++ b/vfs/UVFSCore.pas
@@ -845,6 +845,7 @@ end;
function TVFSEngine.CopyFileOut(Sender: Pointer; SourceFile, DestFile: string; ProgressFunc: TEngineProgressFunc; ErrorFunc: TEngineErrorFunc; Append: boolean): boolean;
var Res: TVFSResult;
begin
+ Result := False;
try
if @FSourcePlugin.FVFSCopyOut <> nil then begin
FSenderThread := Sender;
@@ -877,6 +878,7 @@ end;
function TVFSEngine.CopyFileIn(Sender: Pointer; SourceFile, DestFile: string; ProgressFunc: TEngineProgressFunc; ErrorFunc: TEngineErrorFunc; Append: boolean): boolean;
var Res: TVFSResult;
begin
+ Result := False;
try
if @FSourcePlugin.FVFSCopyIn <> nil then begin
FSenderThread := Sender;
@@ -1012,7 +1014,6 @@ begin
Break;
end;
- ModuleHandler := nil;
if b then DebugMsg(['Module ', s, ' is already loaded --> skipping...']) else begin
ModuleHandler := dlopen(PChar(IncludeTrailingPathDelimiter(s) + Buf), RTLD_LAZY);
if ModuleHandler = nil then DebugMsg([' XXX Error loading module: ', dlerror])
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-12 13:20:56 +0000