Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gajim
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
eta
gajim
Commits
4006306d
Commit
4006306d
authored
16 years ago
by
Yann Leboulanger
Browse files
Options
Downloads
Patches
Plain Diff
typo in windows installer script + french translation
parent
7bc8f160
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
gajim.nsi
+10
-14
10 additions, 14 deletions
gajim.nsi
with
10 additions
and
14 deletions
gajim.nsi
+
10
−
14
View file @
4006306d
...
...
@@ -4,6 +4,8 @@ Name "Gajim"
OutFile "Gajim.exe"
SetCompressor /final /solid lzma
!define myAppName "Gajim"
InstallDir "$PROGRAMFILES\Gajim"
InstallDirRegKey HKCU "Software\Gajim" ""
RequestExecutionLevel admin
...
...
@@ -77,8 +79,8 @@ LangString DESC_SecAutostart ${LANG_FRENCH} "Si activ
LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement dja install."
LangString STR_Uninstall ${LANG_FRENCH} "Lancer la Dsinstallation"
LangString STR_Cancel ${LANG_FRENCH} "Annuler"
LangString STR_Running ${LANG_FRENCH} "
I
t app
e
ar
s that Gajim is currently running
.$\n\
Clos
e
i
t
and restart un
install
e
r."
LangString STR_Running ${LANG_FRENCH} "
Gajim es
t appar
ament lanc
.$\n\
Fermez-l
e
e
t
redmarrez le ds
install
ateu
r."
; German
LangString NAME_Emoticons ${LANG_GERMAN} "Emoticons"
...
...
@@ -782,7 +784,7 @@ Function un.onInit
; Check that Gajim is not running before uninstalling
FindWindow $0 "gdkWindowToplevel" "Gajim"
StrCmp $0 0 Remove
MessageBox MB_ICONSTOP|MB_OK STR_Running
MessageBox MB_ICONSTOP|MB_OK
$(
STR_Running
)
Quit
Remove:
FunctionEnd
...
...
@@ -796,17 +798,11 @@ Function .onInit
StrCmp $0 0 launch
StrLen $0 "$(^Name)"
IntOp $0 $0 + 1
;; loop:
FindWindow $1 '#32770' '' 0 $1
;; IntCmp $1 0 +5
IntCmp $1 0 +4
System::Call "user32::GetWindowText(i r1, t .r2, i r0) i."
;; Don't compare name, it's not "Gajim", it depends on window currently shown
;; Bad because we could open another nsin installer, but that's rare to have several installler running
;; StrCmp $2 "$(^Name)" 0 loop
System::Call "user32::ShowWindow(i r1,i 9) i." ; If minimized then maximize
System::Call "user32::SetForegroundWindow(i r1) i." ; Bring to front
Abort
FindWindow $1 '#32770' '' 0 $1
IntCmp $1 0 +3
System::Call "user32::ShowWindow(i r1,i 9) i." ; If minimized then maximize
System::Call "user32::SetForegroundWindow(i r1) i." ; Bring to front
Abort
launch:
; Check to see if old install (inno setup) is already installed
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment