Commits December 2021

commits@gajim.org

1 participants
197 discussions

[Git][gajim/gajim][mainwindow] AppPage: Improve layout
by Daniel Brötzmann (＠wurstsalat) 02 Dec '21

02 Dec '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 9ed81ea6 by wurstsalat at 2021-12-02T19:51:37+01:00 AppPage: Improve layout - - - - - 1 changed file: - gajim/gtk/app_page.py Changes: ===================================== gajim/gtk/app_page.py ===================================== @@ -35,7 +35,7 @@ class AppPage(Gtk.Box): def __init__(self): Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, - spacing=6) + spacing=18) self.get_style_context().add_class('app-page') self._unread_count = 0 @@ -47,16 +47,13 @@ def __init__(self): status_label.get_style_context().add_class('dim-label') self.add(status_label) - status_box = Gtk.Box(spacing=12) - status_box.set_halign(Gtk.Align.CENTER) self._status_selector = StatusSelector() - status_box.add(self._status_selector) + self._status_selector.set_halign(Gtk.Align.CENTER) + self.add(self._status_selector) self._status_message_selector = StatusMessageSelector() self._status_message_selector.set_halign(Gtk.Align.CENTER) - status_box.add(self._status_message_selector) - - self.add(status_box) + self.add(self._status_message_selector) update_label = Gtk.Label(label=_('Updates')) update_label.get_style_context().add_class('large-header') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9ed81ea6ced11e82e2a9c5ca6271db3f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9ed81ea6ced11e82e2a9c5ca6271db3f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: ContactInfo: Add JID label
by Daniel Brötzmann (＠wurstsalat) 02 Dec '21

02 Dec '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: d3202015 by wurstsalat at 2021-12-02T19:30:20+01:00 ContactInfo: Add JID label - - - - - 6129f010 by wurstsalat at 2021-12-02T19:33:22+01:00 VCardGrid: Don’t set min width for scrolled textview This avoids an un-centered layout of widgets - - - - - 3 changed files: - gajim/data/gui/contact_info.ui - gajim/gtk/contact_info.py - gajim/gtk/vcard_grid.py Changes: ===================================== gajim/data/gui/contact_info.ui ===================================== @@ -147,6 +147,25 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkLabel" id="contact_jid_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-bottom">6</property> + <property name="selectable">True</property> + <property name="ellipsize">end</property> + <property name="single-line-mode">True</property> + <property name="max-width-chars">50</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> <child>  <object class="GtkGrid" id="group_chat_grid"> @@ -186,7 +205,7 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">start</property> + <property name="halign">end</property> <property name="label" translatable="yes">Affiliation</property> <style> <class name="dim-label"/> @@ -212,7 +231,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object> ===================================== gajim/gtk/contact_info.py ===================================== @@ -107,7 +107,15 @@ def __init__(self, account, contact, page=None): self._load_avatar() self._ui.contact_name_label.set_text(contact.name) + self._ui.contact_jid_label.set_text(str(contact.jid)) + self._ui.contact_jid_label.set_tooltip_text(str(contact.jid)) + if contact.is_pm_contact: + if contact.real_jid is not None: + self._ui.contact_jid_label.set_text( + str(contact.real_jid.bare)) + self._ui.contact_jid_label.set_tooltip_text( + str(contact.real_jid.bare)) self._ui.role_label.set_text(get_uf_role(contact.role)) self._ui.affiliation_label.set_text( get_uf_affiliation(contact.affiliation)) ===================================== gajim/gtk/vcard_grid.py ===================================== @@ -604,7 +604,7 @@ def __init__(self, prop, _account): Gtk.PolicyType.AUTOMATIC) self._edit_scrolled.add(self._edit_text_view) self._edit_scrolled.set_valign(Gtk.Align.CENTER) - self._edit_scrolled.set_size_request(350, 100) + self._edit_scrolled.set_size_request(-1, 100) self._edit_scrolled.get_style_context().add_class('profile-scrolled') self._read_text_view = ValueTextView(prop) @@ -617,7 +617,7 @@ def __init__(self, prop, _account): Gtk.PolicyType.AUTOMATIC) self._read_scrolled.add(self._read_text_view) self._read_scrolled.set_valign(Gtk.Align.CENTER) - self._read_scrolled.set_size_request(350, 100) + self._read_scrolled.set_size_request(-1, 100) self._read_scrolled.get_style_context().add_class( 'profile-scrolled-read') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a8720627ce2c5a811c67ba7f8cf3630… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a8720627ce2c5a811c67ba7f8cf3630… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] GroupchatRoster: Correctly get real jid for menu
by Daniel Brötzmann (＠wurstsalat) 02 Dec '21

02 Dec '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: a8720627 by Daniel Brötzmann at 2021-12-02T14:56:55+00:00 GroupchatRoster: Correctly get real jid for menu - - - - - 1 changed file: - gajim/gui_menu_builder.py Changes: ===================================== gajim/gui_menu_builder.py ===================================== @@ -564,7 +564,9 @@ def build_workspaces_submenu(current_workspace_id: str, account: str, def get_groupchat_roster_menu(account, control_id, self_contact, contact): menu = Gtk.Menu() - real_jid = contact.real_jid.bare or '' + real_jid = '' + if contact.real_jid is not None: + real_jid = contact.real_jid.bare item = Gtk.MenuItem(label=_('Information')) action = f'win.contact-information-{control_id}::{contact.name}' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a8720627ce2c5a811c67ba7f8cf3630f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a8720627ce2c5a811c67ba7f8cf3630f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix Add contact for Chatlist and MUC roster
by Daniel Brötzmann (＠wurstsalat) 01 Dec '21

01 Dec '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 287f711a by wurstsalat at 2021-12-01T23:33:36+01:00 Fix Add contact for Chatlist and MUC roster - - - - - 1 changed file: - gajim/gui_menu_builder.py Changes: ===================================== gajim/gui_menu_builder.py ===================================== @@ -520,8 +520,12 @@ def get_chat_list_row_menu(workspace_id: str, account: str, is_self_contact = contact.jid.bare == client.get_own_jid().bare pm_with_jid = contact.is_pm_contact and contact.real_jid is not None if (not contact.is_groupchat and not contact.is_in_roster and - not is_self_contact and pm_with_jid): - menu_items.append(('add-to-roster', _('Add to Contact List…'))) + not is_self_contact): + if contact.is_pm_contact: + if contact.real_jid is not None: + menu_items.append(('add-to-roster', _('Add to Contact List…'))) + else: + menu_items.append(('add-to-roster', _('Add to Contact List…'))) menu = Gio.Menu() for item in menu_items: @@ -560,7 +564,7 @@ def build_workspaces_submenu(current_workspace_id: str, account: str, def get_groupchat_roster_menu(account, control_id, self_contact, contact): menu = Gtk.Menu() - real_jid = contact.real_jid or '' + real_jid = contact.real_jid.bare or '' item = Gtk.MenuItem(label=_('Information')) action = f'win.contact-information-{control_id}::{contact.name}' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/287f711a37460819d2b6bcb802e324c3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/287f711a37460819d2b6bcb802e324c3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix add_contact()
by Philipp Hörist (＠lovetox) 01 Dec '21

01 Dec '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: a3a810d0 by lovetox at 2021-12-01T22:54:52+01:00 Fix add_contact() - - - - - 1 changed file: - gajim/app_actions.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -34,7 +34,9 @@ def on_add_contact_jid(_action, param): - jid = JID.from_string(param.get_string()) + jid = param.get_string() or None + if jid is not None: + jid = JID.from_string(jid) open_window('AddContact', account=None, jid=jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a3a810d0751d22f48e9bb3e85adbcd8f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a3a810d0751d22f48e9bb3e85adbcd8f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix get_active_accounts()
by Philipp Hörist (＠lovetox) 01 Dec '21

01 Dec '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 841d4bf6 by lovetox at 2021-12-01T18:13:48+01:00 Fix get_active_accounts() - - - - - 1 changed file: - gajim/common/settings.py Changes: ===================================== gajim/common/settings.py ===================================== @@ -574,7 +574,7 @@ def get_accounts(self) -> List[str]: def get_active_accounts(self) -> List[str]: active = [] for account, settings in self._account_settings.items(): - if settings['account']['active'] is True: + if self.get_account_setting(account, 'active'): active.append(account) return active View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/841d4bf6468d4b4647b9d43cc24ecd23… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/841d4bf6468d4b4647b9d43cc24ecd23… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Installer: Automatically detect and offer to 'upgrade' previous version
by Daniel Brötzmann (＠wurstsalat) 01 Dec '21

01 Dec '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: e520f4e9 by wurstsalat at 2021-12-01T09:49:41+01:00 Installer: Automatically detect and offer to 'upgrade' previous version - - - - - d9e1b50d by wurstsalat at 2021-12-01T09:51:07+01:00 Portable Installer: Improve cleanup - - - - - 2 changed files: - win/misc/gajim-portable.nsi - win/misc/gajim.nsi Changes: ===================================== win/misc/gajim-portable.nsi ===================================== @@ -16,7 +16,7 @@ InstallDir "$PROFILE\Gajim" RequestExecutionLevel user BrandingText "Gajim Setup" -!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico" +!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\nsis3-install-alt.ico" !define MUI_HEADERIMAGE !define MUI_HEADERIMAGE_BITMAP "..\misc\nsis_header.bmp" !define MUI_WELCOMEFINISHPAGE_BITMAP "..\misc\nsis_wizard.bmp" @@ -115,6 +115,8 @@ Section "Gajim" SecGajim MessageBox MB_YESNO $(INST_NotEmpty) IDYES cleanup Abort cleanup: + ExecWait "TaskKill /IM gajim.exe /F" + ExecWait "TaskKill /IM gajim-debug.exe /F" RMDir /r "$InstDir\bin" RMDir /r "$InstDir\etc" RMDir /r "$InstDir\lib" ===================================== win/misc/gajim.nsi ===================================== @@ -3,6 +3,7 @@ Unicode true !include "MUI2.nsh" !include "LogicLib.nsh" +!include "nsDialogs.nsh" Name "Gajim" OutFile "Gajim.exe" @@ -18,13 +19,12 @@ BrandingText "Gajim Setup" Var StartMenuFolder -!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico" -!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\orange-uninstall.ico" +!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\nsis3-install-alt.ico" +!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\nsis3-uninstall.ico" !define MUI_HEADERIMAGE !define MUI_HEADERIMAGE_BITMAP "..\misc\nsis_header.bmp" !define MUI_WELCOMEFINISHPAGE_BITMAP "..\misc\nsis_wizard.bmp" !define MUI_UNWELCOMEFINISHPAGE_BITMAP "..\misc\nsis_wizard.bmp" -;!define MUI_COMPONENTSPAGE_CHECKBITMAP "${NSISDIR}\Contrib\Graphics\Checks\colorful.bmp" !define MUI_COMPONENTSPAGE_SMALLDESC !define MUI_ABORTWARNING @@ -36,6 +36,7 @@ Var StartMenuFolder !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Gajim" !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder +Page custom CheckForUpgrade StartUpgrade /ENABLECANCEL !insertmacro MUI_PAGE_INSTFILES !define MUI_FINISHPAGE_RUN "$INSTDIR\bin\Gajim.exe" !insertmacro MUI_PAGE_FINISH @@ -69,8 +70,10 @@ LangString DESC_SecGajim ${LANG_ENGLISH} "Installs the main Gajim files." LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "Creates a shortcut for Gajim on your desktop." LangString DESC_SecAutostart ${LANG_ENGLISH} "Starts Gajim automatically when starting Windows." LangString DESC_SecURI ${LANG_ENGLISH} "Enables Gajim to open xmpp links (e.g. a group chat linked on a website)." -LangString STR_Installed ${LANG_ENGLISH} "Apparently, Gajim is already installed. Uninstall it?" -LangString STR_Running ${LANG_ENGLISH} "It appears that Gajim is currently running.$\nPlease quit Gajim and retry." +LangString STR_Installed_Title ${LANG_ENGLISH} "Upgrade" +LangString STR_Installed_Text ${LANG_ENGLISH} "Upgrade Gajim" +LangString STR_Installed_Desc ${LANG_ENGLISH} "Gajim is already installed. Do you want to upgrade Gajim?" +LangString STR_Running ${LANG_ENGLISH} "It appears that Gajim is currently running.$\nPlease quit Gajim and try again." ; French LangString NAME_Emoticons ${LANG_FRENCH} "Emoticônes" @@ -85,8 +88,10 @@ LangString DESC_SecGajim ${LANG_FRENCH} "Installer les fichiers principaux de Ga LangString DESC_SecDesktopIcon ${LANG_FRENCH} "Si selectionné, un raccourci pour Gajim sera créé sur le bureau." LangString DESC_SecAutostart ${LANG_FRENCH} "Si activé, Gajim sera automatiquement lancé au démarrage de Windows." LangString DESC_SecURI ${LANG_FRENCH} "Permet à Gajim d’ouvrir les liens xmpp (par exemple le lien vers un salon sur un site web)." -LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement déjà installé. Lancer la désinstallation ?" -LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lancé.$\nPlease quit Gajim and retry." +LangString STR_Installed_Title ${LANG_FRENCH} "Upgrade" +LangString STR_Installed_Text ${LANG_FRENCH} "Upgrade Gajim" +LangString STR_Installed_Desc ${LANG_FRENCH} "Gajim is already installed. Do you want to upgrade Gajim?" +LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lancé.$\nPlease quit Gajim and try again." ; German LangString NAME_Emoticons ${LANG_GERMAN} "Emojis" @@ -101,7 +106,9 @@ LangString DESC_SecGajim ${LANG_GERMAN} "Installiert die Hauptdateien von Gajim. LangString DESC_SecDesktopIcon ${LANG_GERMAN} "Erstellt ein Icon für Gajim auf dem Desktop." LangString DESC_SecAutostart ${LANG_GERMAN} "Startet Gajim automatisch zusammen mit Windows." LangString DESC_SecURI ${LANG_GERMAN} "Ermöglicht Gajim das Öffnen von xmpp-Links (z.B. verlinkter Gruppenchat auf einer Website)." -LangString STR_Installed ${LANG_GERMAN} "Gajim ist anscheinend bereits installiert. Wollen Sie Gajim deinstallieren?" +LangString STR_Installed_Title ${LANG_GERMAN} "Aktualisieren" +LangString STR_Installed_Text ${LANG_GERMAN} "Gajim aktualisieren" +LangString STR_Installed_Desc ${LANG_GERMAN} "Gajim ist bereits installiert. Wollen sie Gajim aktualisieren?" LangString STR_Running ${LANG_GERMAN} "Gajim läuft zurzeit.$\nBitte beenden Sie Gajim und versuchen es erneut." ; Italian @@ -117,8 +124,10 @@ LangString DESC_SecGajim ${LANG_ITALIAN} "Installa i file principali di Gajim." LangString DESC_SecDesktopIcon ${LANG_ITALIAN} "Se selezionato, un'icona verrà creata sul desktop." LangString DESC_SecAutostart ${LANG_ITALIAN} "Se selezionato, Gajim sarà eseguito all'avvio di Windows." LangString DESC_SecURI ${LANG_ITALIAN} "Enables Gajim to open xmpp links (e.g. a group chat linked on a website)." -LangString STR_Installed ${LANG_ITALIAN} "Gajim is apparently already installed. Uninstall it?" -LangString STR_Running ${LANG_ITALIAN} "It appears that Gajim is currently running.$\nPlease quit Gajim and retry." +LangString STR_Installed_Title ${LANG_ITALIAN} "Upgrade" +LangString STR_Installed_Text ${LANG_ITALIAN} "Upgrade Gajim" +LangString STR_Installed_Desc ${LANG_ITALIAN} "Gajim is already installed. Do you want to upgrade Gajim?" +LangString STR_Running ${LANG_ITALIAN} "It appears that Gajim is currently running.$\nPlease quit Gajim and try again." ; Russian LangString NAME_Emoticons ${LANG_RUSSIAN} "Смайлики" @@ -133,8 +142,10 @@ LangString DESC_SecGajim ${LANG_RUSSIAN} "Установка основных ф LangString DESC_SecDesktopIcon ${LANG_RUSSIAN} "Если отмечено, на рабочем столе будет создан ярлык Gajim." LangString DESC_SecAutostart ${LANG_RUSSIAN} "Если отмечено, Gajim будет автоматически запускаться при загрузке Windows." LangString DESC_SecURI ${LANG_RUSSIAN} "Позволяет Gajim открывать xmpp-ссылки, например, адреса конференций на веб-странице." -LangString STR_Installed ${LANG_RUSSIAN} "Похоже, Gajim уже установлен. Деинсталлировать установленную версию?" -LangString STR_Running ${LANG_RUSSIAN} "Похоже, Gajim уже запущен.$\nPlease quit Gajim and retry." +LangString STR_Installed_Title ${LANG_RUSSIAN} "Upgrade" +LangString STR_Installed_Text ${LANG_RUSSIAN} "Upgrade Gajim" +LangString STR_Installed_Desc ${LANG_RUSSIAN} "Gajim is already installed. Do you want to upgrade Gajim?" +LangString STR_Running ${LANG_RUSSIAN} "Похоже, Gajim уже запущен.$\nPlease quit Gajim and try again." ; Hebrew LangString NAME_Emoticons ${LANG_HEBREW} "רגשונים" @@ -149,8 +160,10 @@ LangString DESC_SecGajim ${LANG_HEBREW} "מתקין קבצי Gajim עיקריי LangString DESC_SecDesktopIcon ${LANG_HEBREW} "במידה ונקבעת, קיצור דרך עבור Gajim יושם על שולחן העבודה." LangString DESC_SecAutostart ${LANG_HEBREW} "במידה ונקבעת, Gajim יופעל אוטומטית כאשר Windows מתחיל." LangString DESC_SecURI ${LANG_HEBREW} "Enables Gajim to open xmpp links (e.g. a group chat linked on a website)." -LangString STR_Installed ${LANG_HEBREW} "כפי הנראה, Gajim כבר מותקן. להסיר אותו?" -LangString STR_Running ${LANG_HEBREW} "נראה שהתוכנית Gajim מורצת כעת.$\nPlease quit Gajim and retry." +LangString STR_Installed_Title ${LANG_HEBREW} "Upgrade" +LangString STR_Installed_Text ${LANG_HEBREW} "Upgrade Gajim" +LangString STR_Installed_Desc ${LANG_HEBREW} "Gajim is already installed. Do you want to upgrade Gajim?" +LangString STR_Running ${LANG_HEBREW} "נראה שהתוכנית Gajim מורצת כעת.$\nPlease quit Gajim and try again." Section "Gajim" SecGajim SectionIn RO @@ -181,7 +194,6 @@ Section "Gajim" SecGajim CreateDirectory "$SMPROGRAMS\$StartMenuFolder" CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" "$INSTDIR\bin\Gajim.exe" !insertmacro MUI_STARTMENU_WRITE_END - SectionEnd Section $(NAME_SecDesktopIcon) SecDesktopIcon @@ -235,22 +247,35 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecURI} $(DESC_SecURI) !insertmacro MUI_FUNCTION_DESCRIPTION_END -Function un.onInit -; Check that Gajim is not running before uninstalling - FindWindow $0 "gdkWindowToplevel" "Gajim" - StrCmp $0 0 StartUninstall - IfSilent ForceQuitGajim - MessageBox MB_ICONEXCLAMATION|MB_RETRYCANCEL $(STR_Running) IDCANCEL Cancel IDRETRY -3 +; Installer +Function StartUpgrade + ; Run uninstaller in silent mode + ReadRegStr $R3 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" + ExecWait '"$R3" /S _?=$INSTDIR' +FunctionEnd -Cancel: - Abort +Function CheckForUpgrade + ; Check if Gajim is already installed + ReadRegStr $R3 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" + ; Show upgrade page only if Gajim is already installed + ${IfNot} ${FileExists} $R3 + Abort + ${EndIf} -ForceQuitGajim: - ExecWait "TaskKill /IM gajim.exe /F" - !insertmacro MUI_UNGETLANGUAGE + !insertmacro MUI_HEADER_TEXT $(STR_Installed_Title) $(STR_Installed_Text) -StartUninstall: - !insertmacro MUI_UNGETLANGUAGE + nsDialogs::Create 1018 + Pop $0 + + ${NSD_CreateLabel} 0 10% 100% 12u "$(STR_Installed_Desc)" + Pop $0 + + ; Change Next Button text + GetDlgItem $0 $HWNDPARENT 1 + ${NSD_SetText} $0 "$(STR_Installed_Title)" + Pop $0 + + nsDialogs::Show FunctionEnd Function .onInit @@ -259,7 +284,7 @@ Function .onInit ; If so don't open another but bring to front System::Call "kernel32::CreateMutexA(i 0, i 0, t '$(^Name)') i .r0 ?e" Pop $0 - StrCmp $0 0 launch + StrCmp $0 0 StartInstall StrLen $0 "$(^Name)" IntOp $0 $0 + 1 FindWindow $1 '#32770' '' 0 $1 @@ -268,30 +293,27 @@ Function .onInit System::Call "user32::SetForegroundWindow(i r1) i." ; Bring to front Abort -launch: -; Check to see if old install (inno setup) is already installed - ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Gajim_is1" "UninstallString" -; remove first and last " char - StrLen $0 $R0 - IntOp $0 $0 - 2 - strcpy $1 $R0 $0 1 - IfFileExists $1 +1 NotInstalled - MessageBox MB_YESNO|MB_DEFBUTTON2|MB_TOPMOST $(STR_Installed) IDNO Quit - StrCmp $R1 2 Quit +1 - ExecWait '$R0 _?=$INSTDIR' $R2 - StrCmp $R2 0 +1 Quit - -NotInstalled: -; Check to see if new installer (NSIS)already installed - ReadRegStr $R3 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" - IfFileExists $R3 +1 ReallyNotInstalled - MessageBox MB_YESNO|MB_DEFBUTTON2|MB_TOPMOST $(STR_Installed) IDNO Quit - StrCmp $R4 2 Quit +1 - ExecWait '$R3 _?=$INSTDIR' $R5 - StrCmp $R5 0 ReallyNotInstalled Quit -Quit: - Quit - -ReallyNotInstalled: +StartInstall: !insertmacro MUI_LANGDLL_DISPLAY ; Open the language selection window FunctionEnd + +; Uninstaller +Function un.onInit +; Check that Gajim is not running before uninstalling + FindWindow $0 "gdkWindowToplevel" "Gajim" + StrCmp $0 0 StartUninstall + IfSilent ForceQuitGajim + MessageBox MB_ICONEXCLAMATION|MB_RETRYCANCEL $(STR_Running) IDCANCEL Cancel IDRETRY -3 + +Cancel: + Abort + +ForceQuitGajim: + ; Hint: Gajim setup should not be named gajim.exe + ExecWait "TaskKill /IM gajim.exe /F" + ExecWait "TaskKill /IM gajim-debug.exe /F" + !insertmacro MUI_UNGETLANGUAGE + +StartUninstall: + !insertmacro MUI_UNGETLANGUAGE ; Open the language selection window +FunctionEnd \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/71f4fdabf7ecaa157a6153d4f212d53… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/71f4fdabf7ecaa157a6153d4f212d53… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2021