Commits

commits@gajim.org

17632 discussions

gajim-plugins: Add own device fingerprints to fingerprint window
by Gajim Plugins 20 Jul '16

20 Jul '16

changeset 9536517d946f in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=9536517d946f description: Add own device fingerprints to fingerprint window diffstat: omemo/fpr_dialog.ui | 200 ++++++++++++++++++++++++++++++++++++++++----------- omemo/ui.py | 65 ++++++++++----- 2 files changed, 198 insertions(+), 67 deletions(-) diffs (truncated from 359 to 300 lines): diff -r fafe86698a1d -r 9536517d946f omemo/fpr_dialog.ui --- a/omemo/fpr_dialog.ui Tue Jul 19 19:40:52 2016 +0200 +++ b/omemo/fpr_dialog.ui Tue Jul 19 23:00:17 2016 +0200 @@ -23,6 +23,7 @@ <object class="GtkNotebook" id="notebook1"> <property name="visible">True</property> <property name="can_focus">True</property> + <signal name="switch-page" handler="update_context_list" after="yes" swapped="no"/> <child> <object class="GtkVBox" id="vbox4"> <property name="visible">True</property> @@ -30,47 +31,6 @@ <property name="border_width">12</property> <property name="spacing">10</property> <child> - <object class="GtkHBox" id="hbox2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">10</property> - <child> - <object class="GtkLabel" id="fingerprint_label_desc"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" comments="Descriptive label">Own Fingerprint:</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="fingerprint_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label"><tt>-------- -------- -------- -------- -------- </tt></property> - <property name="use_markup">True</property> - <property name="selectable">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="height_request">100</property> <property name="visible">True</property> @@ -127,7 +87,7 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> @@ -154,7 +114,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> @@ -163,12 +123,164 @@ <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" comments="tab label">Known Fingerprints</property> + <property name="label" translatable="yes" comments="tab label">Contact</property> </object> <packing> <property name="tab_fill">False</property> </packing> </child> + <child> + <object class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">12</property> + <property name="spacing">10</property> + <child> + <object class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">10</property> + <child> + <object class="GtkLabel" id="fingerprint_label_desc1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" comments="Descriptive label">Own Fingerprint:</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="fingerprint_label_own"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label"><tt>-------- -------- -------- -------- -------- </tt></property> + <property name="use_markup">True</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow2"> + <property name="height_request">100</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <object class="GtkTreeView" id="fingerprint_view_own"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="has_tooltip">True</property> + <property name="model">fingerprint_store</property> + <property name="headers_clickable">False</property> + <property name="search_column">0</property> + <property name="tooltip_column">3</property> + <signal name="button-press-event" handler="fpr_button_pressed_cb" swapped="no"/> + <child> + <object class="GtkTreeViewColumn" id="name_column1"> + <property name="resizable">True</property> + <property name="title">Name</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="trust_column1"> + <property name="resizable">True</property> + <property name="title">Trust</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertoggle2"/> + <attributes> + <attribute name="text">2</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="fingerprint_column1"> + <property name="resizable">True</property> + <property name="title">Fingerprint</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext3"/> + <attributes> + <attribute name="markup">3</attribute> + </attributes> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">5</property> + <child> + <object class="GtkButton" id="trust_button1"> + <property name="label" translatable="yes" comments="button">Verify Fingerprint</property> + <property name="width_request">150</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="trust_button_clicked_cb" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Own Devices</property> + </object> + <packing> + <property name="position">1</property> + <property name="tab_fill">False</property> + </packing> + </child> </object> <object class="GtkMenu" id="fprclipboard_menu"> <property name="visible">True</property> diff -r fafe86698a1d -r 9536517d946f omemo/ui.py --- a/omemo/ui.py Tue Jul 19 19:40:52 2016 +0200 +++ b/omemo/ui.py Tue Jul 19 23:00:17 2016 +0200 @@ -413,21 +413,36 @@ self.fpr_view.set_model(self.fpr_model) self.fpr_view.get_selection().set_mode(gtk.SELECTION_MULTIPLE) - self.child.pack_start(self.B.get_object('notebook1')) + self.fpr_view_own = self.B.get_object('fingerprint_view_own') + self.fpr_view_own.set_model(self.fpr_model) + self.fpr_view_own.get_selection().set_mode(gtk.SELECTION_MULTIPLE) + + self.notebook = self.B.get_object('notebook1') + + self.child.pack_start(self.notebook) self.B.connect_signals(self) + self.account = self.contact.account.name + self.omemostate = self.plugin.get_omemo_state(self.account) + + ownfpr = binascii.hexlify(self.omemostate.store.getIdentityKeyPair() + .getPublicKey().serialize()) + ownfpr = self.human_hash(ownfpr[2:]) + + self.B.get_object('fingerprint_label_own').set_markup('<tt>%s</tt>' + % ownfpr) + self.update_context_list() def on_close_button_clicked(self, widget): self.hide() def trust_button_clicked_cb(self, button, *args): - account = self.contact.account.name - - state = self.plugin.get_omemo_state(account) - - mod, paths = self.fpr_view.get_selection().get_selected_rows() + if self.notebook.get_current_page() == 1: + mod, paths = self.fpr_view_own.get_selection().get_selected_rows() + else: + mod, paths = self.fpr_view.get_selection().get_selected_rows() for path in paths: it = mod.get_iter(path) @@ -439,20 +454,23 @@ gtk.STOCK_NO, gtk.RESPONSE_NO)) l = gtk.Label() l.set_markup('Do you want to trust the following ' - 'fingerprint for the contact %s on the account %s?' - '\n\n<tt>%s</tt>' % (user, account, fpr)) + 'fingerprint for the contact %s ' + 'on the account %s?' + '\n\n<tt>%s</tt>' % (user, self.account, fpr)) l.set_line_wrap(True) dlg.vbox.pack_start(l)

1 0

gajim-plugins: Update Manifest & Changelog
by Gajim Plugins 20 Jul '16

20 Jul '16

changeset b374cf0c5089 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=b374cf0c5089 description: Update Manifest & Changelog diffstat: omemo/CHANGELOG | 7 +++++++ omemo/manifest.ini | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diffs (27 lines): diff -r 9536517d946f -r b374cf0c5089 omemo/CHANGELOG --- a/omemo/CHANGELOG Tue Jul 19 23:00:17 2016 +0200 +++ b/omemo/CHANGELOG Wed Jul 20 19:12:55 2016 +0200 @@ -1,3 +1,10 @@ +0.7.5 / 2016-20-07 +================ +- Announcing of Support right after Plugin activation +- New Context Menu for Gajim Compact View +- Own Device Fingerprints are now available in the Fingerprint Window +- Small bugfixes + 0.7 / 2016-16-07 ================ - Reworked publishing Devicelist diff -r 9536517d946f -r b374cf0c5089 omemo/manifest.ini --- a/omemo/manifest.ini Tue Jul 19 23:00:17 2016 +0200 +++ b/omemo/manifest.ini Wed Jul 20 19:12:55 2016 +0200 @@ -1,7 +1,7 @@ [info] -name: OMEMO Multi-End Message and Object Encryption +name: OMEMO short_name: omemo -version: 0.7.0 +version: 0.7.5 description: OMEMO is an XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption based on Axolotl and PEP. You need to install python-axolotl via pip to run this plugin. authors: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> Daniel Gultsch <daniel(a)gultsch.de>

1 0

gajim: Added empty appveyor.yml
by Gajim 18 Jul '16

18 Jul '16

changeset 1d8d3d27d84f in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1d8d3d27d84f description: Added empty appveyor.yml

1 0

gajim: forgot to import defs in the last commit
by Gajim 17 Jul '16

17 Jul '16

changeset f161efd21ce1 in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f161efd21ce1 description: forgot to import defs in the last commit diffstat: src/dialogs.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 39bc01c577a5 -r f161efd21ce1 src/dialogs.py --- a/src/dialogs.py Sun Jul 17 14:29:53 2016 +0200 +++ b/src/dialogs.py Sun Jul 17 14:34:55 2016 +0200 @@ -45,6 +45,7 @@ import message_control import dataforms_widget +from common import defs from random import randrange from common import pep from common import ged

1 0

gajim: Some more bugfixes (see 0.16 branch)
by Gajim 17 Jul '16

17 Jul '16

changeset 39bc01c577a5 in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=39bc01c577a5 description: Some more bugfixes (see 0.16 branch) diffstat: src/common/connection.py | 4 ++-- src/dialogs.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diffs (28 lines): diff -r 8e864acec622 -r 39bc01c577a5 src/common/connection.py --- a/src/common/connection.py Sun Jul 17 14:24:13 2016 +0200 +++ b/src/common/connection.py Sun Jul 17 14:29:53 2016 +0200 @@ -479,8 +479,8 @@ # chatstates - if peer supports xep85, send chatstates # please note that the only valid tag inside a message containing a # <body> tag is the active event - if chatstate and contact and contact.supports(NS_CHATSTATES): - msg_iq.setTag(chatstate, namespace=NS_CHATSTATES) + if chatstate and contact and contact.supports(nbxmpp.NS_CHATSTATES): + msg_iq.setTag(chatstate, namespace=nbxmpp.NS_CHATSTATES) # XEP-0184 if msgtxt and gajim.config.get_per('accounts', self.name, diff -r 8e864acec622 -r 39bc01c577a5 src/dialogs.py --- a/src/dialogs.py Sun Jul 17 14:24:13 2016 +0200 +++ b/src/dialogs.py Sun Jul 17 14:29:53 2016 +0200 @@ -1366,8 +1366,8 @@ """ Where can we find this Credits file? """ - if os.path.isfile(os.path.join(gajim.defs.docdir, filename)): - return os.path.join(gajim.defs.docdir, filename) + if os.path.isfile(os.path.join(defs.docdir, filename)): + return os.path.join(defs.docdir, filename) elif os.path.isfile('../' + filename): return ('../' + filename) else:

1 0

gajim: fix about window not opening
by Gajim 17 Jul '16

17 Jul '16

changeset f769137e5867 in /home/hg/repos/gajim author: Philipp Hoerist branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=f769137e5867 description: fix about window not opening diffstat: src/dialogs.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (22 lines): diff -r f670dd475da6 -r f769137e5867 src/dialogs.py --- a/src/dialogs.py Sun Jul 17 00:44:41 2016 +0200 +++ b/src/dialogs.py Sun Jul 17 00:41:34 2016 +0200 @@ -56,6 +56,7 @@ from gajim_themes_window import GajimThemesWindow from advanced_configuration_window import AdvancedConfigurationWindow +from common import defs from common import gajim from common import helpers from common import i18n @@ -1337,8 +1338,8 @@ """ Where can we find this Credits file? """ - if os.path.isfile(os.path.join(gajim.defs.docdir, filename)): - return os.path.join(gajim.defs.docdir, filename) + if os.path.isfile(os.path.join(defs.docdir, filename)): + return os.path.join(defs.docdir, filename) elif os.path.isfile('../' + filename): return ('../' + filename) else:

1 0

gajim: fix not defined NS_CHATSTATES variable
by Gajim 17 Jul '16

17 Jul '16

changeset f670dd475da6 in /home/hg/repos/gajim author: Philipp Hoerist branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=f670dd475da6 description: fix not defined NS_CHATSTATES variable diffstat: src/common/connection.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 4f26d28d7943 -r f670dd475da6 src/common/connection.py --- a/src/common/connection.py Thu Jul 14 22:29:21 2016 +0200 +++ b/src/common/connection.py Sun Jul 17 00:44:41 2016 +0200 @@ -495,8 +495,8 @@ # chatstates - if peer supports xep85, send chatstates # please note that the only valid tag inside a message containing a # <body> tag is the active event - if chatstate and contact and contact.supports(NS_CHATSTATES): - msg_iq.setTag(chatstate, namespace=NS_CHATSTATES) + if chatstate and contact and contact.supports(nbxmpp.NS_CHATSTATES): + msg_iq.setTag(chatstate, namespace=nbxmpp.NS_CHATSTATES) # XEP-0184 if msgtxt and gajim.config.get_per('accounts', self.name,

1 0

gajim: Small bugfix for encrypted conversations
by Gajim 17 Jul '16

17 Jul '16

changeset 7a0d0931cb36 in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=7a0d0931cb36 description: Small bugfix for encrypted conversations diffstat: src/session.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 756d78be6ab2 -r 7a0d0931cb36 src/session.py --- a/src/session.py Tue Apr 19 23:48:10 2016 +0200 +++ b/src/session.py Sun Jul 17 14:23:22 2016 +0200 @@ -83,7 +83,7 @@ self.control.change_resource(self.resource) if obj.mtype == 'chat': - if not obj.stanza.getTag('body') and obj.chatstate is None: + if not obj.msgtxt and obj.chatstate is None: return log_type = 'chat_msg'

1 0

gajim: merge
by Gajim 17 Jul '16

17 Jul '16

changeset 8e864acec622 in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8e864acec622 description: merge diffstat: build.bat | 29 +--- gajim.nsi | 275 ++----------------------------------------- launch.bat | 2 +- setup_win32.py | 129 ++++++++++++++++---- src/chat_control.py | 26 +-- src/command_system/tools.py | 2 +- src/common/crypto.py | 4 +- src/common/events.py | 4 +- src/common/resolver.py | 1 + src/dialogs.py | 9 - src/features_window.py | 2 - src/filetransfers_window.py | 4 - src/gajim-remote.py | 2 +- src/gajim.py | 52 ++----- src/gtkgui_helpers.py | 25 ---- src/gtkspell.py | 15 ++- src/plugins/plugin.py | 2 +- src/profile_window.py | 2 +- src/roster_window.py | 2 +- src/vcard.py | 2 +- 20 files changed, 180 insertions(+), 409 deletions(-) diffs (truncated from 1047 to 300 lines): diff -r 7a0d0931cb36 -r 8e864acec622 build.bat --- a/build.bat Sun Jul 17 14:23:22 2016 +0200 +++ b/build.bat Sun Jul 17 14:24:13 2016 +0200 @@ -5,35 +5,20 @@ xcopy ..\gajim-plugins\plugin_installer gajim_built\plugins\plugin_installer /e /i copy msgfmt.exe gajim_built -copy gettextsrc.dll gajim_built -copy gettextlib.dll gajim_built -copy msvcr90.dll gajim_built +copy msvcr100.dll gajim_built cd gajim_built -REM for libglade-2.0.0.dll -PATH=..\src\gtk\bin;%PATH% +for %%l in (po\*.po) do mkdir po\%%~nl & mkdir po\%%~nl\LC_MESSAGES & msgfmt -o po\%%~nl\LC_MESSAGES\gajim.mo %%l -c:\python27\python.exe setup_win32.py build_exe +c:\python34\python.exe setup_win32.py build_exe -move build\exe.win32-2.7 . -rename exe.win32-2.7 bin - -copy ..\LIBEAY32.dll bin -copy ..\SSLEAY32.dll bin +move build\exe.win32-3.4 . +rmdir build +rename exe.win32-3.4 build REM for snarl plugin -xcopy ..\win32com bin\win32com /e /i - -mkdir bin\gtk -cd ../src/gtk -hg archive ..\..\gajim_built\bin\gtk -cd ../../gajim_built/ - -REM for msgfmt -PATH=bin\gtk\bin;%PATH% - -for %%l in (po\*.po) do mkdir po\%%~nl & mkdir po\%%~nl\LC_MESSAGES & msgfmt -o po\%%~nl\LC_MESSAGES\gajim.mo %%l +xcopy ..\win32com build\win32com /e /i "C:\Program Files (x86)\NSIS\makensis" gajim.nsi diff -r 7a0d0931cb36 -r 8e864acec622 gajim.nsi --- a/gajim.nsi Sun Jul 17 14:23:22 2016 +0200 +++ b/gajim.nsi Sun Jul 17 14:24:13 2016 +0200 @@ -31,7 +31,7 @@ !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder !insertmacro MUI_PAGE_INSTFILES -!define MUI_FINISHPAGE_RUN "$INSTDIR\bin\Gajim.exe" +!define MUI_FINISHPAGE_RUN "$INSTDIR\build\Gajim.exe" !insertmacro MUI_PAGE_FINISH !insertmacro MUI_UNPAGE_WELCOME @@ -59,7 +59,6 @@ LangString NAME_SecDesktopIcon ${LANG_ENGLISH} "Create icon on desktop" LangString NAME_SecAutostart ${LANG_ENGLISH} "Start Gajim when Windows starts" LangString DESC_SecGajim ${LANG_ENGLISH} "Installs the main Gajim files." -LangString DESC_SecGtk ${LANG_ENGLISH} "Installs Gtk+ 2 (necessary to run Gajim)." LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "If set, a shortcut for Gajim will be created on the desktop." LangString DESC_SecAutostart ${LANG_ENGLISH} "If set, Gajim will be automatically started when Windows starts." LangString STR_Installed ${LANG_ENGLISH} "Apparently, Gajim is already installed. Uninstall it?" @@ -75,7 +74,6 @@ LangString NAME_SecDesktopIcon ${LANG_FRENCH} "Créer une icône sur le bureau" LangString NAME_SecAutostart ${LANG_FRENCH} "Lancer Gajim au démarrage de Windows" LangString DESC_SecGajim ${LANG_FRENCH} "Installer les fichiers principaux de Gajim." -LangString DESC_SecGtk ${LANG_FRENCH} "Installer Gtk+ 2 (nécessaire à Gajim)." 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 STR_Installed ${LANG_FRENCH} "Gajim est apparement déjà installé. Lancer la désinstallation ?" @@ -91,7 +89,6 @@ LangString NAME_SecDesktopIcon ${LANG_GERMAN} "Desktop-Icon erstellen" LangString NAME_SecAutostart ${LANG_GERMAN} "Gajim mit Windows starten" LangString DESC_SecGajim ${LANG_GERMAN} "Installiert die Hauptdateien von Gajim." -LangString DESC_SecGtk ${LANG_GERMAN} "Installert Gtk+ 2 (notwendig um Gajim zu benutzen)." LangString DESC_SecDesktopIcon ${LANG_GERMAN} "Wenn dies aktiviert wird, wird ein Icon für Gajim auf dem Desktop erstellt." LangString DESC_SecAutostart ${LANG_GERMAN} "Gajim wird automatisch gestartet, sowie Windows startet, wenn dies aktivier wird." LangString STR_Installed ${LANG_GERMAN} "Gajim is apparently already installed. Uninstall it?" @@ -107,7 +104,6 @@ LangString NAME_SecDesktopIcon ${LANG_ITALIAN} "Crea un'icona sul desktop" LangString NAME_SecAutostart ${LANG_ITALIAN} "Lancia Gajim quando parte Windows" LangString DESC_SecGajim ${LANG_ITALIAN} "Installa i file principali di Gajim." -LangString DESC_SecGtk ${LANG_ITALIAN} "Installa Gtk+ 2 (necessario per eseguire 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 STR_Installed ${LANG_ITALIAN} "Gajim is apparently already installed. Uninstall it?" @@ -123,7 +119,6 @@ LangString NAME_SecDesktopIcon ${LANG_RUSSIAN} "Ñîçäàòü ÿðëûê íà ðàáî÷åì ñòîëå" LangString NAME_SecAutostart ${LANG_RUSSIAN} "Çàïóñêàòü Gajim ïðè çàãðóçêå Windows" LangString DESC_SecGajim ${LANG_RUSSIAN} "Óñòàíîâêà îñíîâíûõ ôàéëîâ Gajim." -LangString DESC_SecGtk ${LANG_RUSSIAN} "Óñòàíîâêà Gtk+ 2 (íåîáõîäèìî äëÿ ðàáîòû Gajim)." LangString DESC_SecDesktopIcon ${LANG_RUSSIAN} "Åñëè îòìå÷åíî, íà ðàáî÷åì ñòîëå áóäåò ñîçäàí ÿðëûê Gajim." LangString DESC_SecAutostart ${LANG_RUSSIAN} "Åñëè îòìå÷åíî, Gajim áóäåò àâòîìàòè÷åñêè çàïóñêàòüñÿ ïðè çàãðóçêå Windows." LangString STR_Installed ${LANG_RUSSIAN} "Ïîõîæå, Gajim óæå óñòàíîâëåí. Äåèíñòàëëèðîâàòü óñòàíîâëåííóþ âåðñèþ?" @@ -138,7 +133,6 @@ LangString NAME_SecDesktopIcon ${LANG_HEBREW} "öåø ñîì áùåìçï òáåãä" LangString NAME_SecAutostart ${LANG_HEBREW} "äôòì àú Gajim ëàùø Windows îúçéì" LangString DESC_SecGajim ${LANG_HEBREW} "îú÷éï ÷áöé Gajim òé÷øééí." -LangString DESC_SecGtk ${LANG_HEBREW} "îú÷éï Gtk+ 2 (ðçåöä ìäøöú Gajim)." LangString DESC_SecDesktopIcon ${LANG_HEBREW} "áîéãä åð÷áòú, ÷éöåø ãøê òáåø Gajim éåùí òì ùåìçï äòáåãä." LangString DESC_SecAutostart ${LANG_HEBREW} "áîéãä åð÷áòú, Gajim éåôòì àåèåîèéú ëàùø Windows îúçéì." LangString STR_Installed ${LANG_HEBREW} "ëôé äðøàä, Gajim ëáø îåú÷ï. ìäñéø àåúå?" @@ -153,79 +147,25 @@ File "COPYING" File "THANKS" File "THANKS.artists" - - SetOutPath "$INSTDIR\bin" - File "bin\_bsddb.pyd" - File "bin\_cffi_backend.pyd" - File "bin\_ctypes.pyd" - File "bin\_hashlib.pyd" - File "bin\_socket.pyd" - File "bin\_sqlite3.pyd" - File "bin\_ssl.pyd" - File "bin\atk.pyd" - File "bin\bz2.pyd" - File "bin\cairo._cairo.pyd" - File "bin\Crypto.Cipher._AES.pyd" - File "bin\Crypto.Cipher._DES.pyd" - File "bin\Crypto.Cipher._DES3.pyd" - File "bin\Crypto.Hash._SHA256.pyd" - File "bin\Crypto.Random.OSRNG.winrandom.pyd" - File "bin\Crypto.Util._counter.pyd" - File "bin\Crypto.Util.strxor.pyd" - File "bin\cryptography.hazmat.bindings._constant_time.pyd" - File "bin\cryptography.hazmat.bindings._openssl.pyd" - File "bin\cryptography.hazmat.bindings._padding.pyd" - File "bin\farstream.pyd" - File "bin\gajim.exe" - File "bin\gio._gio.pyd" - File "bin\glib._glib.pyd" - File "bin\gobject._gobject.pyd" - File "bin\goocanvas.pyd" - File "bin\gst._gst.pyd" - File "bin\gst.interfaces.pyd" - File "bin\gtk._gtk.pyd" - File "bin\history_manager.exe" - File "bin\libeay32.dll" - File "bin\libgoocanvas-3.dll" - File "bin\library.zip" - File "bin\libxml2mod.pyd" - File "bin\libxmlmods.libxml2mod.pyd" - File "bin\pangocairo.pyd" - File "bin\pango.pyd" - File "bin\pycurl.pyd" - File "bin\pyexpat.pyd" - File "bin\python27.dll" - File "bin\pythoncom27.dll" - File "bin\pywintypes27.dll" - File "bin\select.pyd" - File "bin\sqlite3.dll" - File "bin\ssleay32.dll" - File "bin\unicodedata.pyd" - File "bin\win32api.pyd" - File "bin\win32file.pyd" - File "bin\win32pipe.pyd" - File "bin\win32ui.pyd" - File "bin\winsound.pyd" - File "msvcr90.dll" - File /r "bin\win32com" + File /r "build" + SetOutPath "$INSTDIR\build" + File "msvcr100.dll" WriteRegStr HKCU "Software\Gajim" "" $INSTDIR WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.5" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\build\Gajim.exe" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.4" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" !insertmacro MUI_STARTMENU_WRITE_BEGIN Application SetShellVarContext current CreateDirectory "$SMPROGRAMS\$StartMenuFolder" - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" "$INSTDIR\bin\Gajim.exe" - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Change Theme.lnk" "$INSTDIR\bin\gtk\bin\gtkthemeselector.exe" + CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" "$INSTDIR\build\Gajim.exe" SetShellVarContext all CreateDirectory "$SMPROGRAMS\$StartMenuFolder" - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" "$INSTDIR\bin\Gajim.exe" - CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Change Theme.lnk" "$INSTDIR\bin\gtk\bin\gtkthemeselector.exe" + CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Gajim.lnk" "$INSTDIR\build\Gajim.exe" !insertmacro MUI_STARTMENU_WRITE_END SetOutPath "$INSTDIR\data" @@ -240,15 +180,6 @@ File /r "icons\hicolor" SectionEnd -Section "Gtk+ 2" SecGtk - SectionIn RO - SetOutPath "$INSTDIR\bin\gtk" - File /r "bin\gtk\bin" - File /r "bin\gtk\etc" - File /r "bin\gtk\lib" - File /r "bin\gtk\share" -SectionEnd - Section "Plugins" SecPlugins SetOutPath "$INSTDIR\plugins" File /r "plugins\plugin_installer" @@ -325,43 +256,31 @@ Section "English (UK)" SecLanguagesEnglishUK SetOutPath "$INSTDIR\po" File /r "po\en_GB" - SetOutPath "$INSTDIR\bin\gtk\share\locale" - File /r "bin\gtk\share\locale\en_GB" SectionEnd Section "French" SecLanguagesFrench SetOutPath "$INSTDIR\po" File /r "po\fr" - SetOutPath "$INSTDIR\bin\gtk\share\locale" - File /r "bin\gtk\share\locale\fr" SectionEnd Section "German" SecLanguagesGerman SetOutPath "$INSTDIR\po" File /r "po\de" - SetOutPath "$INSTDIR\bin\gtk\share\locale" - File /r "bin\gtk\share\locale\de" SectionEnd Section "Italian" SecLanguagesItalian SetOutPath "$INSTDIR\po" File /r "po\it" - SetOutPath "$INSTDIR\bin\gtk\share\locale" - File /r "bin\gtk\share\locale\it" SectionEnd Section "Spanish" SecLanguagesSpanish SetOutPath "$INSTDIR\po" File /r "po\es" - SetOutPath "$INSTDIR\bin\gtk\share\locale" - File /r "bin\gtk\share\locale\es" SectionEnd Section "Russian" SecLanguagesRussian SetOutPath "$INSTDIR\po" File /r "po\ru" - SetOutPath "$INSTDIR\bin\gtk\share\locale" - File /r "bin\gtk\share\locale\ru" SectionEnd Section $(NAME_SecLanguagesOther) SecLanguagesOther @@ -391,159 +310,25 @@ File /r "po\sv" File /r "po\uk" File /r "po\zh_CN" - SetOutPath "$INSTDIR\bin\gtk\share\locale" - File /r "bin\gtk\share\locale\af" - File /r "bin\gtk\share\locale\am" - File /r "bin\gtk\share\locale\ang" - File /r "bin\gtk\share\locale\ar" - File /r "bin\gtk\share\locale\as" - File /r "bin\gtk\share\locale\az" - File /r "bin\gtk\share\locale\az_IR" - File /r "bin\gtk\share\locale\be" - File /r "bin\gtk\share\locale\be@latin" - File /r "bin\gtk\share\locale\bg" - File /r "bin\gtk\share\locale\bn" - File /r "bin\gtk\share\locale\bn_IN" - File /r "bin\gtk\share\locale\br" - File /r "bin\gtk\share\locale\bs" - File /r "bin\gtk\share\locale\ca" - File /r "bin\gtk\share\locale\ca@valencia" - File /r "bin\gtk\share\locale\cs" - File /r "bin\gtk\share\locale\cy" - File /r "bin\gtk\share\locale\da" - File /r "bin\gtk\share\locale\dz" - File /r "bin\gtk\share\locale\el" - File /r "bin\gtk\share\locale\en_CA" - File /r "bin\gtk\share\locale\eo" - File /r "bin\gtk\share\locale\et" - File /r "bin\gtk\share\locale\eu" - File /r "bin\gtk\share\locale\fa" - File /r "bin\gtk\share\locale\fi" - File /r "bin\gtk\share\locale\ga" - File /r "bin\gtk\share\locale\gl" - File /r "bin\gtk\share\locale\gu" - File /r "bin\gtk\share\locale\he" - File /r "bin\gtk\share\locale\hi" - File /r "bin\gtk\share\locale\hr" - File /r "bin\gtk\share\locale\hu" - File /r "bin\gtk\share\locale\hy" - File /r "bin\gtk\share\locale\ia" - File /r "bin\gtk\share\locale\id" - File /r "bin\gtk\share\locale\io" - File /r "bin\gtk\share\locale\is" - File /r "bin\gtk\share\locale\ja" - File /r "bin\gtk\share\locale\ka" - File /r "bin\gtk\share\locale\kn"

1 0

gajim-plugins: Missing exception variable & removed str conv.
by Gajim Plugins 16 Jul '16

16 Jul '16

changeset 30885eb6658e in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chello.at> branches: details:gajim-plugins?cmd=changeset;node=30885eb6658e description: Missing exception variable & removed str conv. diffstat: omemo/omemo/state.py | 6 +++--- omemo/ui.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diffs (35 lines): diff -r 9d4eec8dda39 -r 30885eb6658e omemo/omemo/state.py --- a/omemo/omemo/state.py Sun Jun 26 22:02:33 2016 +0200 +++ b/omemo/omemo/state.py Mon Jun 27 00:55:33 2016 +0200 @@ -188,8 +188,8 @@ key = self.handleWhisperMessage(sender_jid, sid, encrypted_key) except (NoSessionException, InvalidMessageException) as e: log.error('No Session found ' + e.message) - log.error('sender_jid => ' + str(sender_jid) + ' sid =>' + str( - sid)) + log.error('sender_jid => ' + str(sender_jid) + ' sid =>' + + str(sid)) return except (DuplicateMessageException) as e: log.error('Duplicate message found ' + str(e.args)) @@ -197,7 +197,7 @@ ' sid => ' + str(sid)) return - except (DuplicateMessageException): + except (DuplicateMessageException) as e: log.error('Duplicate message found ' + e.message) log.error('sender_jid => ' + str(sender_jid) + ' sid => ' + str(sid)) diff -r 9d4eec8dda39 -r 30885eb6658e omemo/ui.py --- a/omemo/ui.py Sun Jun 26 22:02:33 2016 +0200 +++ b/omemo/ui.py Mon Jun 27 00:55:33 2016 +0200 @@ -126,7 +126,7 @@ _add_widget(self.omemobutton, self.chat_control) def encryption_active(self): - return self.state.encryption.is_active(str(self.contact)) + return self.state.encryption.is_active(self.contact.jid) def activate_omemo(self): self.omemobutton.menu.set_active(0)

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